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
|
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
|
26598e2731
|
for origami view file
|
2017-06-08 14:57:01 +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 |
|
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 |
|
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 |
|
Nweni
|
4323da6589
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-07 14:45:22 +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 |
|
PhyoTheingi
|
52cc294696
|
merge with master
|
2017-06-07 10:33:30 +06:30 |
|
Nweni
|
c18b57eca8
|
payment
|
2017-06-07 10:29:00 +06:30 |
|
Aung Myo
|
9e3eaaf214
|
finished Customer save and return data from membership in crm
|
2017-06-06 18:07:38 +06:30 |
|
PhyoTheingi
|
59434e2c3a
|
Menu item with Accout
|
2017-06-06 17:29:34 +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
|
8fd23bfd87
|
conflict file
|
2017-06-06 14:49:25 +06:30 |
|
Aung Myo
|
e76296bb77
|
checkout crm
|
2017-06-06 14:44:25 +06:30 |
|
PhyoTheingi
|
2abc2e5f3d
|
Assign Order Item Bug ix
|
2017-06-06 14:33:14 +06:30 |
|
Aung Myo
|
d2ce74f648
|
bootstrap datepicker and customer save
|
2017-06-06 14:16:40 +06:30 |
|
Nweni
|
b847cde62c
|
sale query updated
|
2017-06-06 14:03:21 +06:30 |
|
PhyoTheingi
|
231eec6a01
|
Payment delete bug fix
|
2017-06-06 10:50:51 +06:30 |
|
Nweni
|
eaec6a39b4
|
fixed conflict
|
2017-06-06 09:47:33 +06:30 |
|
Nweni
|
0cc378f318
|
fixed conflict
|
2017-06-06 09:43:16 +06:30 |
|
Yan
|
64f5dd65bd
|
merged settings_backend
|
2017-06-06 09:42:53 +06:30 |
|
Aung Myo
|
b54a19cfff
|
update query data for origami
|
2017-06-06 09:18:01 +06:30 |
|
PhyoTheingi
|
7b457400b2
|
Delete Fix for parent child process in Menu
|
2017-06-05 18:31:56 +06:30 |
|