Commit Graph

2643 Commits

Author SHA1 Message Date
Yan
36a30e73ab Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-12-14 16:49:44 +06:30
Yan
708a81c792 checkin checking 2017-12-14 16:49:20 +06:30
phyusin
ed429b2d4b change checkout time and free time 2017-12-14 16:40:29 +06:30
Yan
fc45198542 bill foc add remark for original 2017-12-14 14:47:10 +06:30
Yan
d2f79b8950 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-14 14:36:49 +06:30
Yan
697aabc0bd Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-12-14 14:31:08 +06:30
Yan
2c24b13344 bill foc 2017-12-14 14:30:30 +06:30
Aung Myo
5b3031aac5 update pronter receipt for void and foc 2017-12-14 14:11:05 +06:30
Yan
f4edc495a9 comment for cable production 2017-12-14 14:00:47 +06:30
Yan
5e6d7bb958 merge with aung myo 2017-12-14 13:49:55 +06:30
Yan
3fb3fdfe3f update secrets 2017-12-14 13:46:48 +06:30
Yan
14d102f4fe shops json 2017-12-14 12:20:07 +06:30
Yan
a735f66c33 nothing 2017-12-14 12:18:23 +06:30
Yan
b9296c68f3 nothing 2017-12-14 12:18:09 +06:30
Aung Myo
736d336a77 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-12-14 12:08:19 +06:30
Aung Myo
95f500ae24 table show in complete sale 2017-12-14 12:07:36 +06:30
phyusin
ed7bd07164 cahnge int for foc 2017-12-14 12:07:00 +06:30
Yan
48f08d00af nothing 2017-12-14 12:04:31 +06:30
phyusin
c86d91054b change query for dashboard 2017-12-14 12:02:50 +06:30
Yan
4d81ee85ce Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-12-14 11:52:43 +06:30
Yan
e8c5cd1219 call waiter css 2017-12-14 11:51:44 +06:30
Aung Myo
de4f63aabc price 0 in table and room show 2017-12-14 11:36:20 +06:30
Aung Myo
4baa273f8e update call waiter 2017-12-14 11:06:06 +06:30
Yan
342bd54780 Merge branch 'master' into cloud 2017-12-14 10:25:41 +06:30
Yan
9def0756b3 add cipher type 2017-12-14 10:25:31 +06:30
Yan
6507ad1eb5 Merge branch 'master' into cloud 2017-12-13 18:30:39 +06:30
phyusin
00615a4443 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-12-13 18:30:27 +06:30
phyusin
32dac8e9a8 change query for dashboard and time for checkin channel 2017-12-13 18:30:04 +06:30
Yan
974c5df830 is taxable for other charges 2017-12-13 18:29:07 +06:30
Yan
18bc28b1a1 auto checkin color change 2017-12-13 16:50:40 +06:30
phyusin
211db16311 add channel for checkin process 2017-12-13 15:58:44 +06:30
Yan
6b49e04589 clean seed 2017-12-13 15:37:05 +06:30
Aung Myo
f497957a56 update add subcategory in addorder 2017-12-13 13:18:53 +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
fef4d4caa1 no print for cloud 2017-12-12 18:51:56 +06:30
Yan
c660097d28 no print for cloud 2017-12-12 18:51:13 +06:30
Aung Myo
15bfe11fc0 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-12-12 18:06:52 +06:30
Aung Myo
fa5a9053ac update discount by card payment 5% 2017-12-12 17:56:46 +06:30
Aung Myo
0b46206b62 update rebate double and old balance 2017-12-12 17:52:05 +06:30
Yan
dcb3a37a81 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-12-12 17:50:33 +06:30
Yan
d39896af82 remove padding in dashboard 2017-12-12 17:49:44 +06:30
Yan
bbf30ed26f dashboard hourly sale and license code clean 2017-12-12 17:41:35 +06:30
phyusin
5ba010c1e6 change card sale data 2017-12-12 16:46:14 +06:30
phyusin
112c4d9228 change dashboard data 2017-12-12 16:24:31 +06:30
phyusin
3ef122b8f3 check card in dashboard 2017-12-12 16:11:32 +06:30
phyusin
0ade612b97 change dashboard data 2017-12-12 16:06:04 +06:30
phyusin
450a27b4f0 change redeem amt for nett 2017-12-12 15:46:53 +06:30
phyusin
8611489ecb change dashboard data 2017-12-12 15:43:56 +06:30