Commit Graph

420 Commits

Author SHA1 Message Date
Yan
6207f1ce24 editing discount 2017-06-20 19:28:21 +06:30
Nweni
f69bee9b03 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-20 19:00:02 +06:30
Nweni
a9e1d8c3d1 origami 2017-06-20 18:59:34 +06:30
Aung Myo
0e619f3f2a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-20 17:59:14 +06:30
Aung Myo
33cb8b64a3 finished customer form and update 2017-06-20 17:57:50 +06:30
Yan
dd2a2e54a4 Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant into staging 2017-06-20 14:21:58 +06:30
Phyo
80362f87fe Rebate Option 2017-06-20 13:22:27 +06:30
Aung Myo
faae996d5d Rebate balance in receipt 2017-06-20 11:31:02 +06:30
Nweni
a71ee3657a origami changes 2017-06-20 07:36:38 +06:30
Yan
7fe36e8ef4 merge with settings 2017-06-19 19:14:58 +06:30
Phyo
90be2b8d63 OQS edit bug fix 2017-06-19 18:54:19 +06:30
Yan
9089eab196 temp remove options in oqs 2017-06-19 17:36:39 +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
Aung Myo
e693927016 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-19 11:55:01 +06:30
Aung Myo
675d83c80f sale item report and rebate balance 2017-06-19 11:54:34 +06:30
Yan
566cc2f3c1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-19 11:28:19 +06:30
Yan
b747845cbf merge with settings_backend 2017-06-19 11:15:28 +06:30
Yan
cf5854c2bb Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-19 11:06:39 +06:30
Nweni
f8dd7d9400 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-19 09:47:04 +06:30
Nweni
e25ef17308 payment 2017-06-19 09:46:51 +06:30
Aung Myo
faa6beb243 update sale report 2017-06-18 20:23:39 +06:30
Aung Myo
6ffa73fa6f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-18 20:18:12 +06:30
Yan
b65d127fd0 bill print format and tax fix 2017-06-18 20:07:28 +06:30
Aung Myo
7881ae4dfa daily sale report 2017-06-18 16:38:46 +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
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
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
cd6ec67b94 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-06-16 19:28:37 +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
741a7d0d64 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging 2017-06-16 18:23:12 +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