Commit Graph

622 Commits

Author SHA1 Message Date
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
d78327f906 Membership Setting UI 2017-06-19 16:22:39 +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
Phyo
33128d26a2 add Back Button in Redeem 2017-06-19 12:17:08 +06:30
Phyo
a204afda6a Discount added in Rebate 2017-06-18 13:19:07 +06:30
Yan
5906dde741 uncomment for sale taxes 2017-06-18 13:18:53 +06:30
Phyo
3a1fba2c6f Other Payments Bug fix 2017-06-18 13:18:23 +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
Phyo
e6cef8ef93 Redeem amount not cut bug Fix 2017-06-18 11:57:14 +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
064f132906 Update 2017-06-17 12:13:38 +06:30
Yan
1d2fb7b6ab dump.rdb 2017-06-17 12:13:01 +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
2cf9c6947c print for oqs 2017-06-16 21:06:33 +06:30
Yan
cd6ec67b94 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-06-16 19:28:37 +06:30
Yan
885662fbe6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-16 19:28:07 +06:30
Yan
9f3acad10d update order for oqs 2017-06-16 19:26:21 +06:30
Aung Myo
c7efcb85d3 update sale 2017-06-16 19:19:33 +06:30
Aung Myo
b029cabeba update show detail and order 2017-06-16 19:04:25 +06:30
Yan
0a496f2274 update order for oqs 2017-06-16 18:55:14 +06:30
Yan
741a7d0d64 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging 2017-06-16 18:23:12 +06:30
Yan
841f74b406 update footer in req bill 2017-06-16 18:22:18 +06:30
Nweni
49768900a9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-16 18:22:13 +06:30
Nweni
9ff5122b72 Update 2017-06-16 18:21:57 +06:30
Aung Myo
cb43afc405 update bug sale 2017-06-16 18:04:39 +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
cd804a3d18 update queue no print 2017-06-16 13:28:28 +06:30
Aung Myo
bec59a1d7b update queue no print 2017-06-16 13:23:05 +06:30
Yan
58bc13e8b6 add auto_print field to migration 2017-06-16 11:14:47 +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
Yan
87c3546974 merge with master 2017-06-16 09:59:35 +06:30
Yan
15682a3d49 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-16 09:57:34 +06:30
Yan
73cf45a9c7 dump.rdb 2017-06-16 09:54:47 +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