Commit Graph

352 Commits

Author SHA1 Message Date
Yan
ecc9ab53ec Merge branch 'cancan' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 09:59:16 +06:30
Yan
560ea343a6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 09:55:56 +06:30
Nweni
69f24101f9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 06:28:23 +06:30
Nweni
c65c466399 edit 2017-06-26 06:28:09 +06:30
Yan
a91816bb4e qty edit in oqs 2017-06-25 22:41:26 +06:30
Yan
30df25d78a Merge branch 'master' into oqs 2017-06-23 19:22:07 +06:30
Yan
1f6a0eb1f6 fix with merge 2017-06-23 19:20:00 +06:30
Yan
9ed6b510c4 updating oqs 2017-06-23 19:01:33 +06:30
Yan
e01ecc6e0f merge origin master 2017-06-23 17:53:53 +06:30
Yan
a996ccc7ee Merge branch 'discount' of bitbucket.org:code2lab/sxrestaurant 2017-06-23 17:51:46 +06:30
Yan
27ff8b89e7 merge with crm 2017-06-23 17:51:09 +06:30
Nweni
81c50f220a edit invoice 2017-06-23 17:37:08 +06:30
Yan
3a0e26b2ea accounts and discount updated 2017-06-23 17:05:08 +06:30
Aung Myo
f5f0f9e077 update crm customer and bind customer and queue 2017-06-23 17:03:52 +06:30
Aung Myo
01e5b7ba6c update authorize 2017-06-23 09:41:48 +06:30
Yan
139c3c997a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 18:05:38 +06:30
Yan
7bf2499e83 add options in oqs 2017-06-22 17:32:13 +06:30
Nweni
0c0e44c808 move table 2017-06-22 16:31:41 +06:30
Yan
b30d81508c add options in oqs 2017-06-22 16:12:21 +06:30
Aung Myo
25b6a893f2 first cancan 2017-06-22 15:33:55 +06:30
Yan
cb40f06854 fixed for customer 2017-06-22 15:01:13 +06:30
Yan
f44abd5192 Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 14:58:17 +06:30
Nweni
09252ba055 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 14:27:12 +06:30
Nweni
0ea2b778d1 multiple sale and order 2017-06-22 14:26:23 +06:30
Aung Myo
3d838bc989 update report and customer 2017-06-22 13:35:20 +06:30
Phyo
f8cab803f8 Redeem amount bug fic 2017-06-22 13:31:54 +06:30
Aung Myo
187caa5253 update customre 2017-06-22 11:58:16 +06:30
Yan
b13b0afa6c discuont updated for show 2017-06-22 11:31:05 +06:30
Aung Myo
54526230aa update customerbind in origami 2017-06-22 10:25:40 +06:30
Yan
de8f577786 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 09:53:04 +06:30
Yan
3f15e7bc6f Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 09:51:22 +06:30
Nweni
0ff10f2f32 move multiple order and sales 2017-06-22 05:51:42 +06:30
Nweni
168c571a23 multiple invoice 2017-06-22 05:24:31 +06:30
Yan
2525bfbdd9 discount updated 2017-06-21 20:30:12 +06:30
Aung Myo
3ba836b446 update customer transaction 2017-06-21 18:29:02 +06:30
Nweni
c7139609c4 move table 2017-06-21 18:26:03 +06:30
Aung Myo
d9d07a1cdc update reprint 2017-06-21 18:19:44 +06:30
Nweni
64210f30ac move table 2017-06-21 17:53:44 +06:30
Aung Myo
d2549df2e9 update receipt bill payment 2017-06-21 17:37:16 +06:30
Aung Myo
7c5456d712 assign table ,membership transaction and queue 2017-06-21 16:22:53 +06:30
Yan
9137436b70 bind origami show to action 2017-06-21 11:38:28 +06:30
Aung Myo
6c4c817453 fixed fonflict 2017-06-21 10:22:43 +06:30
Aung Myo
4ab5c311eb update crm 2017-06-21 10:05:07 +06:30
Nweni
b889603ce6 update 2017-06-21 09:33:39 +06:30
Nweni
895e028e7c added cashier station time 2017-06-21 05:55:45 +06:30
Nweni
fa309fb89a move whole table 2017-06-21 05:36:58 +06:30
Yan
6207f1ce24 editing discount 2017-06-20 19:28:21 +06:30
Nweni
f69bee9b03 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-20 19:00:02 +06:30
Nweni
a9e1d8c3d1 origami 2017-06-20 18:59:34 +06:30
Yan
242eb80081 defaults json in oqs for create 2017-06-20 18:25:45 +06:30