Commit Graph

182 Commits

Author SHA1 Message Date
Nweni
a96444518a fixed conflict 2017-06-12 13:28:16 +06:30
Nweni
d2caba3f03 fixed conflict 2017-06-12 13:27:33 +06:30
Nweni
ee208a5dcd Update 2017-06-12 13:26:09 +06:30
Yan
ca2dc181d6 add receipt no report and bug fixing 2017-06-12 12:04:12 +06:30
Yan
c5e9d7afd5 merge with crm 2017-06-12 10:25:07 +06:30
Yan
09f9a29cde merge with master 2017-06-12 10:01:36 +06:30
Nweni
3f3d37756d update 2017-06-12 09:20:38 +06:30
Yan
f834911587 to do req_bill_format and status changed after pay 2017-06-12 00:45:26 +06:30
Aung Myo
d65882ac5b crm update 2017-06-11 18:00:34 +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
33cc576f1e edit membership setting , otherpayment page 2017-06-11 15:48:53 +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
Yan
518e15f5d1 update crm 2017-06-09 13:54:39 +06:30
Nweni
82de95ca22 update 2017-06-09 13:52:36 +06:30
Yan
4c29aad299 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-09 13:47:19 +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
Aung Myo
406172c6ff fixed conflict 2017-06-09 12:04:36 +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
Aung Myo
35277ac000 queue and crm view updated 2017-06-09 09:29:25 +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
43debf4b7e merged with crm 2017-06-08 19:04:48 +06:30
Yan
1cbbe9d672 Merge branch 'discount' 2017-06-08 18:58:28 +06:30
Yan
71e09ef452 comment for cable and add print seed 2017-06-08 18:57:53 +06:30
Yan
568c5fbf68 Merge branch 'loyalty' of bitbucket.org:code2lab/sxrestaurant 2017-06-08 18:03:59 +06:30
Yan
907764b3e4 update discount 2017-06-08 18:02:40 +06:30
Moe Su
0bcd612bc2 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty 2017-06-08 17:57:43 +06:30
Moe Su
74b0550c30 payment_setting 2017-06-08 17:57:29 +06:30
Aung Myo
ea4f50e779 update print 2017-06-08 16:52:50 +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
5768a0db6f fixed conflict file 2017-06-08 13:49:30 +06:30
Aung Myo
8a5fcadb69 finished customer to sale assign in crm 2017-06-08 13:41:11 +06:30
Moe Su
26f2dce142 For Pull 2017-06-08 09:53:04 +06:30
Yan
4d4c40cc17 a little change for setup 2017-06-08 09:48:24 +06:30
Aung Myo
7f8d3381b2 fixed conflict order 2017-06-07 22:31:49 +06:30
Aung Myo
44382d284f fixed conflict 2017-06-07 22:29:43 +06:30
Aung Myo
f9c8dbc03e fixed conflict route and request bill 2017-06-07 22:21:42 +06:30
Aung Myo
234ef9bc15 change crm booking 2017-06-07 22:17:12 +06:30