Commit Graph

289 Commits

Author SHA1 Message Date
Phyo
80362f87fe Rebate Option 2017-06-20 13:22:27 +06:30
Phyo
90be2b8d63 OQS edit bug fix 2017-06-19 18:54:19 +06:30
Phyo
c02e305c30 Zone Created_at Bug Fix 2017-06-19 16:24:44 +06:30
Phyo
184dcb53a1 Conflict fix din settings_backend 2017-06-19 15:24:15 +06:30
Phyo
2dbbb17634 Add extra fields to accounts 2017-06-19 12:21:54 +06:30
Yan
6d0cfd17ac merge with origin master 2017-06-18 12:50:07 +06:30
Yan
0e7042f00f merge with settings_backend 2017-06-18 12:30:06 +06:30
Yan
74c6f3cebc Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant into staging 2017-06-18 12:10:30 +06:30
Yan
f33f11df64 rescue member call and update oqs and js route bug 2017-06-18 03:20:19 +06:30
Yan
80320b6d3e oqs updated 2017-06-18 00:45:39 +06:30
Aung Myo
b62d5349c6 assign queue and other bug 2017-06-18 00:03:09 +06:30
Phyo
b093a993ba Zone and OQS 2017-06-17 18:00:59 +06:30
Nweni
e55ab32fad Update 2017-06-17 16:00:56 +06:30
Yan
420e1b9cbc all info details in oqs 2017-06-17 14:15:08 +06:30
Nweni
b2ed77947e Update 2017-06-17 13:32:16 +06:30
Nweni
1b7f90ccfe Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-17 11:35:26 +06:30
Nweni
29b76adba7 Update 2017-06-17 11:35:17 +06:30
Yan
9f3acad10d update order for oqs 2017-06-16 19:26:21 +06:30
Yan
38ae8f8f86 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant into staging 2017-06-16 13:45:23 +06:30
Yan
c40a2c78e7 oqs autoprint developing 2017-06-16 13:44:39 +06:30
Aung Myo
bec59a1d7b update queue no print 2017-06-16 13:23:05 +06:30
Aung Myo
4cf9ce79ec update receipt print member info 2017-06-16 10:51:50 +06:30
Aung Myo
0e21117f05 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-16 10:22:21 +06:30
Aung Myo
f06235c2cf Merge branch 'crm' 2017-06-16 10:21:56 +06:30
Aung Myo
09a96372c8 update void and complete sale 2017-06-16 10:20:20 +06:30
Nweni
d92a0b0378 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-16 09:27:50 +06:30
Nweni
998ec1bd01 update api 2017-06-16 09:27:39 +06:30
Aung Myo
f0ea6f3c56 finish reprint 2017-06-15 19:07:33 +06:30
Yan
5eafe7094a Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 18:35:00 +06:30
Aung Myo
b5743eb7a7 update customer bolder 2017-06-15 18:18:35 +06:30
Yan
03feae5b0f fix get_order_items_details method in order_item and add taxes in receipt 2017-06-15 17:57:58 +06:30
Aung Myo
4098c99509 update membership in sale detail 2017-06-15 17:13:11 +06:30
Yan
ffafec0105 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 16:47:25 +06:30
Aung Myo
f0d3f30d88 update order queue , sale void 2017-06-15 16:24:00 +06:30
Yan
2484378de9 booking order for api fixed 2017-06-15 14:55:33 +06:30
Nweni
11b948e6c4 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 14:53:02 +06:30
Nweni
0bdecb737c udpate 2017-06-15 14:52:52 +06:30
Yan
5040404725 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 14:52:50 +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
Phyo
aa4391af7d Request bill from mobile 2017-06-15 14:07:43 +06:30
Yan
bd94e808d4 print format 2017-06-15 13:24:37 +06:30
Aung Myo
ed3f97a2af upadte customer and sale void 2017-06-15 13:17:58 +06:30
Yan
41572d5360 add sale reason in seed 2017-06-15 11:12:50 +06:30
Yan
2efd6fc410 merge with origin master 2017-06-15 10:53:42 +06:30
Yan
e133595d49 authentication fixed 2017-06-15 10:48:32 +06:30
Aung Myo
8cb40783a4 update requestby in sail 2017-06-15 10:20:26 +06:30
Nweni
8d557cf7eb remove put 2017-06-15 09:39:30 +06:30
Yan
0eb8ac7087 fixing pagination 2017-06-14 19:54:11 +06:30
Yan
17c5a6cdf8 merge with master 2017-06-14 19:43:05 +06:30