Commit Graph

53 Commits

Author SHA1 Message Date
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
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
Phyo
184dcb53a1 Conflict fix din settings_backend 2017-06-19 15:24:15 +06:30
Yan
dd3c429301 control paypar url and oqs fix 2017-06-19 11:56:26 +06:30
Yan
b747845cbf merge with settings_backend 2017-06-19 11:15:28 +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
Phyo
c6f976bab3 Payment via card Bug fix 2017-06-15 09:49:44 +06:30
Phyo
541907d204 Merchant Id 2017-06-14 20:08:44 +06:30
Phyo
57f7f1037d Change Amount Bug Fix 2017-06-13 19:41:51 +06:30
Moe Su
3db3b8c7e7 add auth_token 2017-06-13 19:01:14 +06:30
Aung Myo
7f7d579d2f add auth token:
exit
2017-06-13 18:28:22 +06:30
Phyo
99d00f6d2a Redeem amount validation 2017-06-13 12:04:31 +06:30
Moe Su
59d53816bd Change style and redeem 2017-06-13 10:45:56 +06:30
Phyo
29acbd9bfa Rebate Redeem amount detect 2017-06-12 20:32:12 +06:30
Phyo
4bbf651040 Rebate Bug Fix 2017-06-12 19:31:01 +06:30
Phyo
796d511f2e Rebate add 2017-06-12 19:02:20 +06:30
Moe Su
2db2be56d8 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-12 18:18:32 +06:30
Moe Su
b47c983886 Edit Redim 2017-06-12 18:18:24 +06:30
Nweni
7a3957181c update 2017-06-12 18:15:19 +06:30
Moe Su
870dc22249 add merchant uid 2017-06-12 16:26:50 +06:30
Nweni
59520bf7ec table status update 2017-06-12 14:35:59 +06:30
Nweni
b12b52d754 update table status 2017-06-12 14:23:18 +06:30
Nweni
ee208a5dcd Update 2017-06-12 13:26:09 +06:30
Nweni
3f3d37756d update 2017-06-12 09:20:38 +06:30
Nweni
6d4ef8e2ad Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-11 17:49:17 +06:30
Nweni
fc3893f048 payment 2017-06-11 17:49:06 +06:30
Moe Su
7ac89829d1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-11 17:40:53 +06:30
Moe Su
7341657477 redeem process 2017-06-11 17:40:44 +06:30
Nweni
05286ce7a6 payment 2017-06-11 16:57:31 +06:30
Moe Su
1d24099abc For Pull 2017-06-11 13:58:34 +06:30
Moe Su
d49dc3f8c8 change route 2017-06-11 13:55:14 +06:30
Nweni
82de95ca22 update 2017-06-09 13:52:36 +06:30
Nweni
8b99f4844e bill api return updated 2017-06-09 13:33:12 +06:30
Nweni
9dd96c7187 fixed conflict 2017-06-09 13:13:54 +06:30
Nweni
56ffd1f063 update sale order talble 2017-06-09 13:13:20 +06:30
Yan
367a8694b1 update payment 2017-06-09 11:57:05 +06:30
Nweni
6171b00dc7 cash payment complete 2017-06-09 11:25:30 +06:30
Moe Su
c23f726cb3 redeem process 2017-06-09 02:40:35 +06:30
Moe Su
7702c50675 Add membership action 2017-06-09 02:23:16 +06:30
Moe Su
74b0550c30 payment_setting 2017-06-08 17:57:29 +06:30
Moe Su
664fe2f6e1 Adding Redeem at payment 2017-06-08 15:17:26 +06:30
Moe Su
e2ecfaeaad For pull 2017-06-07 18:11:03 +06:30
Moe Su
5264f9cf14 Paypar payment 2017-06-07 17:14:22 +06:30
Nweni
810a6d8afc update sale_payment database 2017-06-07 14:45:03 +06:30
Yan
f1877408be fixed for pm key changed 2017-06-05 18:52:19 +06:30
Min Zeya Phyo
4fc511d531 custom primary key for transaction 2017-06-04 16:27:14 +06:30
Min Zeya Phyo
516b854fba shop_setup branch 2017-05-30 23:46:22 +08:00