Aung Myo
|
e90178cfdc
|
finished CRM and customer
|
2017-06-12 14:23:20 +06:30 |
|
Aung Myo
|
0943808ac8
|
finished order and sales in setting
|
2017-06-12 00:45:59 +06:30 |
|
Aung Myo
|
eb001275c7
|
fixed conflict
|
2017-06-11 18:09:00 +06:30 |
|
Aung Myo
|
d65882ac5b
|
crm update
|
2017-06-11 18:00:34 +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
|
f6d14de461
|
fixed conflict
|
2017-06-11 16:58:18 +06:30 |
|
Nweni
|
05286ce7a6
|
payment
|
2017-06-11 16:57:31 +06:30 |
|
Moe Su
|
ee197dba05
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty
|
2017-06-11 16:12:23 +06:30 |
|
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 |
|
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 |
|
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 |
|
Nweni
|
8b99f4844e
|
bill api return updated
|
2017-06-09 13:33:12 +06:30 |
|
Aung Myo
|
406172c6ff
|
fixed conflict
|
2017-06-09 12:04:36 +06:30 |
|
Aung Myo
|
ba9ebe12de
|
update customer
|
2017-06-09 12:00:46 +06:30 |
|
Aung Myo
|
e2e8045d0f
|
update crm layout
|
2017-06-09 11:55:50 +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
|
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 |
|
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
|
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 |
|
Moe Su
|
664fe2f6e1
|
Adding Redeem at payment
|
2017-06-08 15:17:26 +06:30 |
|
Aung Myo
|
26598e2731
|
for origami view file
|
2017-06-08 14:57:01 +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
|
be7d448c30
|
update gem file
|
2017-06-07 18:09:56 +06:30 |
|
Yan
|
df138d94ba
|
merged master
|
2017-06-07 17:45:40 +06:30 |
|
Aung Myo
|
bd345dbc3f
|
fixed conflict
|
2017-06-07 17:15:51 +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 |
|
Aung Myo
|
387ffa996b
|
finished customer and join membership in crm
|
2017-06-07 16:38:24 +06:30 |
|