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 |
|
Yan
|
8045bb31e9
|
merge with discount
|
2017-06-29 11:41:29 +06:30 |
|
Yan
|
9991970203
|
add first bill
|
2017-06-29 11:34:13 +06:30 |
|
Yan
|
50091e4016
|
updated for api bill controller
|
2017-06-28 16:56:43 +06:30 |
|
Yan
|
d35aa23e34
|
still dev to respond code for order
|
2017-06-28 16:17:56 +06:30 |
|
Yan
|
464e72012b
|
waiter and cashier in api/bill_controller
|
2017-06-27 15:26:02 +06:30 |
|
Nweni
|
df722de0e7
|
billed
|
2017-06-27 14:02:44 +06:30 |
|
superuser
|
e85f22fb79
|
update for bill
|
2017-06-27 12:11:07 +06:30 |
|
superuser
|
c743fac296
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 20:59:45 +06:30 |
|
Yan
|
a236c94910
|
mobile bill updated
|
2017-06-26 20:58:12 +06:30 |
|
superuser
|
4dbc9b6134
|
:q
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-23 18:00:18 +06:30 |
|
Yan
|
3a0e26b2ea
|
accounts and discount updated
|
2017-06-23 17:05:08 +06:30 |
|
superuser
|
ea74d52a6f
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-22 18:26:36 +06:30 |
|
Nweni
|
0ea2b778d1
|
multiple sale and order
|
2017-06-22 14:26:23 +06:30 |
|
superuser
|
e0af272690
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-22 11:39:56 +06:30 |
|
superuser
|
27b0ba72d7
|
changed in server master
|
2017-06-22 11:38:42 +06:30 |
|