Commit Graph

34 Commits

Author SHA1 Message Date
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
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
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
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
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
bd94e808d4 print format 2017-06-15 13:24:37 +06:30
Nweni
c904451110 update 2017-06-12 19:35:05 +06:30
Nweni
8b99f4844e bill api return updated 2017-06-09 13:33:12 +06:30
Nweni
faca7295f7 added new image upload file 2017-06-05 17:14:07 +06:30
Min Zeya Phyo
c4e76c53b2 emenu api integrated 2017-04-19 18:37:07 +06:30
Min Zeya Phyo
6a84a34a9f sale receipt generation and bill api 2017-04-17 13:09:54 +06:30
Min Zeya Phyo
63c5c97f24 menu and menu item categories 2017-04-15 17:33:45 +06:30