Commit Graph

114 Commits

Author SHA1 Message Date
Yan
5798a612d7 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-14 17:19:39 +06:30
Aung Myo
035d0851ee update checking booking 2017-12-14 17:10:05 +06:30
phyusin
ed429b2d4b change checkout time and free time 2017-12-14 16:40:29 +06:30
phyusin
5bfe9ef31e change checkin api 2017-12-08 14:39:14 +06:30
phyusin
495dcf1dcf change login user 2017-12-08 12:05:36 +06:30
phyusin
ede4851257 change get_Cashier to current_login_emp in checkin api 2017-12-08 11:48:04 +06:30
phyusin
46bbd90df5 add fun: for checkin and checkout 2017-12-08 10:14:28 +06:30
phyusin
51ecc653f1 add current login name in checkin process 2017-12-07 16:26:11 +06:30
Yan
970b6f857e checkin get update 2017-12-07 13:38:41 +06:30
Yan
69b786a91d shift update 2017-12-07 12:07:06 +06:30
Aung Myo
04b27489dd update bill controler 2017-12-07 08:59:39 +06:30
Yan
2cd86890fa checkin get method update 2017-12-05 18:10:01 +06:30
Yan
765e08fd15 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-04 19:36:23 +06:30
Aung Myo
3354733e41 update call waiter 2017-12-04 19:23:37 +06:30
Yan
840e260c28 add for ygn bbq 2017-12-04 18:44:18 +06:30
phyusin
b09061d9c2 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-11-16 18:19:05 +06:30
phyusin
d648bbf100 dashboard ui and checkin checkout process 2017-11-16 18:17:40 +06:30
Yan
d1765ca32c fix for oqs and add instance code to assign order item 2017-11-15 16:19:44 +06:30
Yan
c61c7ac98f print bill by cashier zone 2017-10-23 18:39:05 +06:30
Yan
707cae4cf8 add multi cashier logic 2017-10-23 18:10:15 +06:30
yamin
1aea52619a UI change 2017-10-23 11:38:10 +06:30
Yan
8ceaf8be05 edited order 2017-10-20 17:06:34 +06:30
Yan
ba39284f93 merge with origin 2017-10-20 14:31:01 +06:30
Yan
25bc6f1c26 parallel incoming req 2017-10-20 13:25:24 +06:30
Aung Myo
bbcce13a2e update addorder 2017-09-13 09:21:35 +06:30
Yan
f67d4197ec add bill channel for req bill 2017-09-07 15:35:00 +06:30
Aung Myo
84d483cad2 update addorder 2017-08-30 18:41:54 +06:30
Aung Myo
2522950019 update create order function 2017-08-25 18:55:34 +06:30
Yan
1a091929b0 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-23 19:51:55 +06:30
Yan
55f041a252 add checksum for menu sync 2017-08-23 18:59:23 +06:30
Nweni
de769f3faf promotion 2017-08-23 17:37:13 +06:30
Nweni
eedf6c39a1 promotion + merge with master 2017-08-23 10:12:41 +06:30
Yan
48461da9ea add fields for Menu Sync 2017-08-18 11:24:38 +06:30
Yan
3160aab399 merge with addorder 2017-08-17 18:59:22 +06:30
Yan
29b3f94573 add menu api 2017-08-17 18:55:13 +06:30
Aung Myo
7f2bfa2348 update add order and calculate subtotal 2017-08-17 13:51:01 +06:30
Aung Myo
50a878349d update add order 2017-07-26 15:08:44 +06:30
Aung Myo
83b8d72632 update add order 2017-07-26 15:04:35 +06:30
superuser
ca797b8d9c update conflict file 2017-07-02 14:37:21 +06:30
Nweni
acca5b5a1d Update 2017-07-02 11:22:49 +06:30
superuser
f23bbd6936 merge with origin master 2017-06-30 19:33:04 +06:30
superuser
60dee30046 api/bill_controller edited 2017-06-30 19:29:09 +06:30
Yan
34166a1387 merge with origin master 2017-06-30 13:39:52 +06:30
Yan
9c1a324eff add other charges 2017-06-30 13:29:55 +06:30
Nweni
5e3935f176 update shift 2017-06-30 13:10:28 +06:30
Yan
dd95b29d7d control order to logout 2017-06-29 19:09:01 +06:30
Yan
fbeab17b3c merge with origin master 2017-06-29 14:08:20 +06:30
Nweni
cf851327b3 fixed conflict 2017-06-29 13:52:55 +06:30
Nweni
e3c2f02c81 fixed conflict 2017-06-29 13:39:37 +06:30
Nweni
618a89472a shift open/close 2017-06-29 13:35:09 +06:30