Commit Graph

600 Commits

Author SHA1 Message Date
Yan
6507ad1eb5 Merge branch 'master' into cloud 2017-12-13 18:30:39 +06:30
Yan
974c5df830 is taxable for other charges 2017-12-13 18:29:07 +06:30
Yan
b3b443735a merge with master 2017-12-13 11:43:22 +06:30
Yan
ebf46e856d Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-13 11:07:16 +06:30
Aung Myo
f908c8e036 update add subcategory in addorder 2017-12-13 11:04:54 +06:30
Yan
c660097d28 no print for cloud 2017-12-12 18:51:13 +06:30
Yan
dcb3a37a81 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-12-12 17:50:33 +06:30
Yan
bbf30ed26f dashboard hourly sale and license code clean 2017-12-12 17:41:35 +06:30
phyusin
450a27b4f0 change redeem amt for nett 2017-12-12 15:46:53 +06:30
phyusin
685fbf1e83 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-12-12 11:06:18 +06:30
phyusin
59fbe1ed17 change customer UI 2017-12-12 10:51:58 +06:30
Yan
196746bd4f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-12-12 10:45:02 +06:30
Aung Myo
66964a6926 update crm addore 2017-12-11 18:01:19 +06:30
phyusin
e727b8b22e check table status for late data and check pending showing when there is no item in origami 2017-12-11 17:39:19 +06:30
phyusin
4f7a6b0825 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-12-08 18:29:50 +06:30
Yan
2d2b7ecb4c Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-08 16:46:01 +06:30
phyusin
9310baa81a add checkin checkout time in origami 2017-12-08 16:42:53 +06:30
Aung Myo
e4a4c7aba4 update receipt no report 2017-12-08 16:07:10 +06:30
phyusin
deda2dd0c7 add double click event for all payment 2017-12-08 11:20:30 +06:30
phyusin
2faf5ba386 change checkout fun: in UI 2017-12-08 10:40:57 +06:30
phyusin
46bbd90df5 add fun: for checkin and checkout 2017-12-08 10:14:28 +06:30
phyusin
abecd08ba2 control double click event 2017-12-07 18:18:32 +06:30
Yan
daf3554826 table status color 2017-12-07 17:04:55 +06:30
phyusin
25473f33bf change alert for checkin process 2017-12-07 14:25:39 +06:30
Aung Myo
97bb6ae211 update sale item xls 2017-12-05 16:28:21 +06:30
Aung Myo
20a86b86f5 update call waiter channel 2017-12-05 10:24:01 +06:30
Yan
070ab18832 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-01 18:54:32 +06:30
Aung Myo
83ed7abbde update rounding adj for foc 2017-12-01 18:51:09 +06:30
Aung Myo
bbfa6450d6 update rounding adj for foc 2017-12-01 17:39:10 +06:30
phyusin
62c0bc5836 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-12-01 14:15:13 +06:30
phyusin
534999b461 check foc when click Discount 2017-12-01 14:14:59 +06:30
Yan
b1217c19a2 add order for subcat 2017-12-01 13:57:56 +06:30
Yan
5257117e12 sub cat for add order 2017-12-01 13:22:01 +06:30
Aung Myo
5b9182c1d1 update rounding adj 2017-11-30 15:44:48 +06:30
Aung Myo
6cb7c1e0c4 update rounding adj 2017-11-30 12:05:01 +06:30
Aung Myo
7ce71a1960 update inventory hide and cancan update 2017-11-30 11:19:15 +06:30
Yan
93db6130a1 some wrong in memberdiscount and no pay if any card payment 2017-11-28 15:57:19 +06:30
Yan
2e1ba833e8 remove recent amount in credit payment index 2017-11-28 15:05:02 +06:30
Yan
7a28dc1ddc Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-27 17:50:06 +06:30
Yan
0c084a1816 credit payment fix when visa assign 2017-11-27 14:24:34 +06:30
Aung Myo
20d580b2ab update foc and void for authorized 2017-11-27 13:54:21 +06:30
Yan
87a27250b7 fix minus addorder.js and void and other origami 2017-11-26 22:23:37 +06:30
Yan
5beb427dfe Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-24 13:12:16 +06:30
Aung Myo
479a6b5a61 update search data in transaction 2017-11-24 13:09:22 +06:30
phyusin
1bbeba8485 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-11-24 11:56:23 +06:30
phyusin
cb8aa0c8c9 change UI for other payment 2017-11-24 11:56:06 +06:30
Yan
a34706dd49 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-24 10:43:14 +06:30
Aung Myo
b8df371a93 update addorder 2017-11-24 10:42:18 +06:30
phyusin
8277473185 change UI for sale_edit and customer in origami 2017-11-24 10:32:31 +06:30
Yan
502b92fb98 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-23 12:15:01 +06:30