Commit Graph

82 Commits

Author SHA1 Message Date
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
Nweni
64210f30ac move table 2017-06-21 17:53:44 +06:30
superuser
64db775dd3 edited api/bill_controller 2017-06-20 16:13:13 +06:30
Yan
6d0cfd17ac merge with origin master 2017-06-18 12:50:07 +06:30
Yan
f33f11df64 rescue member call and update oqs and js route bug 2017-06-18 03:20:19 +06:30
Nweni
b2ed77947e Update 2017-06-17 13:32:16 +06:30
Yan
9f3acad10d update order for oqs 2017-06-16 19:26:21 +06:30
Nweni
998ec1bd01 update api 2017-06-16 09:27:39 +06:30
Yan
2484378de9 booking order for api fixed 2017-06-15 14:55:33 +06:30
Nweni
0bdecb737c udpate 2017-06-15 14:52:52 +06:30
Yan
18e855f5f9 new order for booking fixed 2017-06-15 14:52:23 +06:30
Yan
0778df4e80 order fix for booking 2017-06-15 14:44:27 +06:30
Yan
bd94e808d4 print format 2017-06-15 13:24:37 +06:30
Nweni
f00bd9df37 update 2017-06-14 16:06:11 +06:30
Nweni
0e86b12ecd order controller update 2017-06-13 19:06:50 +06:30
Nweni
c904451110 update 2017-06-12 19:35:05 +06:30
Nweni
ee208a5dcd Update 2017-06-12 13:26:09 +06:30
Yan
518e15f5d1 update crm 2017-06-09 13:54:39 +06:30