Commit Graph

994 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Aung Myo
0e619f3f2a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-20 17:59:14 +06:30
Aung Myo
33cb8b64a3 finished customer form and update 2017-06-20 17:57:50 +06:30
Phyo
80362f87fe Rebate Option 2017-06-20 13:22:27 +06:30
Aung Myo
faae996d5d Rebate balance in receipt 2017-06-20 11:31:02 +06:30
Nweni
a71ee3657a origami changes 2017-06-20 07:36:38 +06:30
Yan
6d0cfd17ac merge with origin master 2017-06-18 12:50:07 +06:30
Yan
f33f11df64 rescue member call and update oqs and js route bug 2017-06-18 03:20:19 +06:30
Nweni
b2ed77947e Update 2017-06-17 13:32:16 +06:30
Nweni
29b76adba7 Update 2017-06-17 11:35:17 +06:30
Aung Myo
4cf9ce79ec update receipt print member info 2017-06-16 10:51:50 +06:30
Aung Myo
0e21117f05 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-16 10:22:21 +06:30
Aung Myo
f06235c2cf Merge branch 'crm' 2017-06-16 10:21:56 +06:30
Aung Myo
f0ea6f3c56 finish reprint 2017-06-15 19:07:33 +06:30
Yan
03feae5b0f fix get_order_items_details method in order_item and add taxes in receipt 2017-06-15 17:57:58 +06:30
Phyo
aa4391af7d Request bill from mobile 2017-06-15 14:07:43 +06:30
Aung Myo
ed3f97a2af upadte customer and sale void 2017-06-15 13:17:58 +06:30
Yan
17c5a6cdf8 merge with master 2017-06-14 19:43:05 +06:30
Yan
8cfa2bc5c5 payment bill added and origami bug fixed 2017-06-14 19:41:32 +06:30
Yan
dd9863025f prepare for payment bill 2017-06-14 18:15:01 +06:30
Aung Myo
2da2edc5ec update sale and customer 2017-06-14 18:13:13 +06:30
Phyo
3b99016f80 Limit paid amount for JCB, Visa and Master Card 2017-06-14 17:13:43 +06:30
Yan
41e9aec389 add cashier in sale and origami ui updated 2017-06-14 16:51:25 +06:30
Phyo
5cff9c891b Other Payment shown by type 2017-06-14 12:02:52 +06:30