Commit Graph

619 Commits

Author SHA1 Message Date
Nweni
e19dc3313d fixed conflict 2017-12-27 16:45:15 +06:30
Nweni
ede876ea27 index / home 2017-12-27 16:42:37 +06:30
phyusin
3d235f9d69 add alert_time_min in api/checkin and check for waiter login 2017-12-27 10:30:22 +06:30
phyusin
d969f3d3eb change js format for localStorage 2017-12-26 15:10:18 +06:30
Aung Myo
5bd1daa152 update payment and memberdiscoun 2017-12-22 17:51:02 +06:30
phyusin
9094d46209 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-22 09:27:05 +06:30
Aung Myo
a10a41f3ed update romm show page 2017-12-21 19:16:53 +06:30
phyusin
a3e15bf68c check Add oth charges data 2017-12-21 18:04:27 +06:30
phyusin
483d45b8e6 add receipt no for member 2017-12-21 16:46:59 +06:30
phyusin
11b8466e10 check first bill or not 2017-12-21 15:11:11 +06:30
Aung Myo
e0d97470cc update membership discount firstbill 2017-12-21 10:35:09 +06:30
Aung Myo
0121ae910e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-12-20 17:12:01 +06:30
Aung Myo
802b51eab4 update roundign adj and member discount in first bill 2017-12-20 17:11:27 +06:30
phyusin
d7a3ba7004 change alert to swal in origami/Add to Existing 2017-12-19 16:01:45 +06:30
phyusin
60a58bc948 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-15 15:18:25 +06:30
Aung Myo
0ff76ca98a update osaka discoun 5% 2017-12-15 15:15:40 +06:30
Aung Myo
c0170104c9 update member discount for 5% 2017-12-15 13:57:54 +06:30
phyusin
20ae953af2 cahnge foc process 2017-12-15 11:50:05 +06:30
Yan
5e6d7bb958 merge with aung myo 2017-12-14 13:49:55 +06:30
Aung Myo
95f500ae24 table show in complete sale 2017-12-14 12:07:36 +06:30
Aung Myo
de4f63aabc price 0 in table and room show 2017-12-14 11:36:20 +06:30
Yan
974c5df830 is taxable for other charges 2017-12-13 18:29:07 +06:30
Aung Myo
f497957a56 update add subcategory in addorder 2017-12-13 13:18:53 +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
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