Commit Graph

312 Commits

Author SHA1 Message Date
Moe Su
29cdcfb28d For Pull 2017-06-11 16:11:44 +06:30
Nweni
a809818324 other payment 2017-06-11 16:10:50 +06:30
Nweni
31cc75462b fixed conflict 2017-06-11 15:52:13 +06:30
Nweni
b7bd68a461 payment keypad 2017-06-11 15:51:22 +06:30
Moe Su
33cc576f1e edit membership setting , otherpayment page 2017-06-11 15:48:53 +06:30
Moe Su
596c16d274 edit redeem 2017-06-11 14:09:19 +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
7ab9874b80 remove migration files 2017-06-11 13:20:26 +06:30
Nweni
aa8068ad10 Update 2017-06-11 13:02:03 +06:30
Moe Su
9f9c83ab7f pay par payment 2017-06-11 13:01:03 +06:30
Nweni
82de95ca22 update 2017-06-09 13:52:36 +06:30
Yan
367a8694b1 update payment 2017-06-09 11:57:05 +06:30
Yan
fe60ac818f update assets 2017-06-09 11:33:21 +06:30
Nweni
6171b00dc7 cash payment complete 2017-06-09 11:25:30 +06:30
Yan
39c20b221e updated miss origami css and js filename 2017-06-09 10:35:19 +06:30
Moe Su
5f5e6470c7 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty 2017-06-09 02:40:48 +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
Yan
c11b4b7fe0 Merge branch 'loyalty' of bitbucket.org:code2lab/sxrestaurant 2017-06-08 19:05:46 +06:30
Yan
43debf4b7e merged with crm 2017-06-08 19:04:48 +06:30
Yan
71e09ef452 comment for cable and add print seed 2017-06-08 18:57:53 +06:30
Moe Su
451804366c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty 2017-06-08 18:22:27 +06:30
Moe Su
54e14e02f4 Add payment method 2017-06-08 18:22:19 +06:30
Yan
907764b3e4 update discount 2017-06-08 18:02:40 +06:30
Aung Myo
ea4f50e779 update print 2017-06-08 16:52:50 +06:30
Yan
e0e512b76b editing discount 2017-06-08 15:40:59 +06:30
Yan
5203a9f4a5 merge crm 2017-06-08 15:29:37 +06:30
Yan
fbc00bc3e4 merged loyalty 2017-06-08 15:28:09 +06:30
Yan
9866acf198 editing discout 2017-06-08 15:21:53 +06:30
Moe Su
664fe2f6e1 Adding Redeem at payment 2017-06-08 15:17:26 +06:30
Aung Myo
8388192a81 delete view origami file 2017-06-08 14:46:35 +06:30
Aung Myo
8a5fcadb69 finished customer to sale assign in crm 2017-06-08 13:41:11 +06:30
Yan
612f037fe8 index ui for discount 2017-06-08 10:40:06 +06:30
Moe Su
26f2dce142 For Pull 2017-06-08 09:53:04 +06:30
Aung Myo
44382d284f fixed conflict 2017-06-07 22:29:43 +06:30
Moe Su
6cc2e29e30 For pull 2017-06-07 18:13:12 +06:30
Moe Su
e2ecfaeaad For pull 2017-06-07 18:11:03 +06:30
Yan
df138d94ba merged master 2017-06-07 17:45:40 +06:30
Moe Su
5264f9cf14 Paypar payment 2017-06-07 17:14:22 +06:30
Yan
114c4ee14d all changed for index in origami 2017-06-07 17:13:27 +06:30
Aung Myo
9ad04323f0 fixed conflict request_bill_con and origami index 2017-06-07 16:48:28 +06:30
Nweni
810a6d8afc update sale_payment database 2017-06-07 14:45:03 +06:30
Nweni
9a23716c23 others payment 2017-06-07 13:02:12 +06:30
Nweni
c18b57eca8 payment 2017-06-07 10:29:00 +06:30
Yan
ed45c2dc1e merged for payment 2017-06-06 17:03:47 +06:30
Yan
c482318b1a req bill bugs fixing 2017-06-06 16:37:42 +06:30
Nweni
2318d83adf update 2017-06-06 16:19:14 +06:30
Nweni
3c756949d1 payment 2017-06-06 15:32:24 +06:30
Aung Myo
e76296bb77 checkout crm 2017-06-06 14:44:25 +06:30