Commit Graph

61 Commits

Author SHA1 Message Date
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
Yan
a236c94910 mobile bill updated 2017-06-26 20:58:12 +06:30
Yan
3a0e26b2ea accounts and discount updated 2017-06-23 17:05:08 +06:30
Nweni
0ea2b778d1 multiple sale and order 2017-06-22 14:26:23 +06:30
Nweni
64210f30ac move table 2017-06-21 17:53:44 +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
Nweni
8b99f4844e bill api return updated 2017-06-09 13:33:12 +06:30
Aung Myo
406172c6ff fixed conflict 2017-06-09 12:04:36 +06:30
Aung Myo
35277ac000 queue and crm view updated 2017-06-09 09:29:25 +06:30
Moe Su
7702c50675 Add membership action 2017-06-09 02:23:16 +06:30
Nweni
0cc378f318 fixed conflict 2017-06-06 09:43:16 +06:30
Nweni
faca7295f7 added new image upload file 2017-06-05 17:14:07 +06:30
Yan
f004db9b19 updated migration code 2017-06-05 15:06:34 +06:30
Yan
622ca05c9e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-03 13:27:11 +06:30
Yan
4313032875 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-02 14:00:23 +06:30
Aung Myo
ed6de14412 update booking controller in crm 2017-06-02 13:17:09 +06:30
Nweni
a9259ca845 order 2017-06-02 11:30:10 +06:30
Aung Myo
c9782bf84a update booking with cancel and assign 2017-06-02 10:52:46 +06:30
Aung Myo
acbd8acf04 Append Order Detail view finished 2017-06-01 18:47:08 +06:30
Cherry
b3b2e9bd8d order controller updated 2017-05-31 16:24:34 +06:30
Min Zeya Phyo
0a97947259 api integrated 2017-04-19 19:39:58 +06:30
Min Zeya Phyo
c4e76c53b2 emenu api integrated 2017-04-19 18:37:07 +06:30
Min Zeya Phyo
dbad900cd4 payment api 2017-04-18 11:01:10 +06:30
Min Zeya Phyo
6a84a34a9f sale receipt generation and bill api 2017-04-17 13:09:54 +06:30
Min Zeya Phyo
30774b4efd order submission and order queue submission basic done 2017-04-16 16:52:04 +06:30
Min Zeya Phyo
63c5c97f24 menu and menu item categories 2017-04-15 17:33:45 +06:30
Min Zeya Phyo
355f4fadb0 API login/logout with http header token 2017-04-15 12:52:40 +06:30