Moe Su
|
33cc576f1e
|
edit membership setting , otherpayment page
|
2017-06-11 15:48:53 +06:30 |
|
Nweni
|
6171b00dc7
|
cash payment complete
|
2017-06-09 11:25:30 +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 |
|
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
|
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 |
|
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 |
|
Yan
|
df138d94ba
|
merged master
|
2017-06-07 17:45:40 +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
|
9a23716c23
|
others payment
|
2017-06-07 13:02:12 +06:30 |
|
Yan
|
ed45c2dc1e
|
merged for payment
|
2017-06-06 17:03:47 +06:30 |
|
Yan
|
fbf312f71c
|
change show to print method in req bills controller
|
2017-06-06 17:01:15 +06:30 |
|
Nweni
|
3c756949d1
|
payment
|
2017-06-06 15:32:24 +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 |
|
PhyoTheingi
|
7b457400b2
|
Delete Fix for parent child process in Menu
|
2017-06-05 18:31:56 +06:30 |
|
Nweni
|
faca7295f7
|
added new image upload file
|
2017-06-05 17:14:07 +06:30 |
|
Yan
|
9b90e3bd7e
|
pulled master at 4
|
2017-06-04 18:29:58 +06:30 |
|
Yan
|
8d4086d5e9
|
oqs printing
|
2017-06-04 18:25:09 +06:30 |
|
Min Zeya Phyo
|
eb74eb2a2d
|
Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant
# Conflicts:
# app/models/order_item.rb
|
2017-06-04 16:37:13 +06:30 |
|
Nweni
|
fa34d1db8f
|
fixed conflict
|
2017-06-04 10:23:38 +06:30 |
|
Min Zeya Phyo
|
394d2ed938
|
change transactional primary key to custom ID for better portability
|
2017-06-03 19:12:35 +06:30 |
|
Min Zeya Phyo
|
9dddd2fc78
|
Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant
|
2017-06-03 15:05:25 +06:30 |
|
Min Zeya Phyo
|
eab356233c
|
add new model - shop - it will be use to define what is setup
|
2017-06-03 15:04:53 +06:30 |
|
Yan
|
03ae60d2e6
|
merge all 03062017
|
2017-06-03 12:50:08 +06:30 |
|
PhyoTheingi
|
2716b913f2
|
Setting Instances Update
|
2017-06-03 11:59:29 +06:30 |
|
Aung Myo
|
030d3ffb0f
|
confict clear
|
2017-06-02 19:22:01 +06:30 |
|
Aung Myo
|
01fefe3b79
|
account working
|
2017-06-02 19:16:14 +06:30 |
|
Yan
|
ea082f0d43
|
creating order queue printer
|
2017-06-02 19:01:28 +06:30 |
|
Yan
|
63be238e09
|
uncomplete print, need for print_settings
|
2017-06-02 18:26:44 +06:30 |
|
Cherry
|
9afe39b7e2
|
commit for sales
|
2017-06-02 17:48:03 +06:30 |
|
Yan
|
6d705e2860
|
merge with master
|
2017-06-02 16:52:58 +06:30 |
|
Yan
|
98a7c31ffa
|
initial setup for print
|
2017-06-02 16:21:47 +06:30 |
|
Yan
|
5d608b8a57
|
Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-02 14:03:40 +06:30 |
|
Yan
|
4313032875
|
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-02 14:00:23 +06:30 |
|
Aung Myo
|
ed6de14412
|
update booking controller in crm
|
2017-06-02 13:17:09 +06:30 |
|
Yan
|
95fd260c76
|
updated ui
|
2017-06-02 11:28:07 +06:30 |
|
Aung Myo
|
c9782bf84a
|
update booking with cancel and assign
|
2017-06-02 10:52:46 +06:30 |
|
Aung Myo
|
acbd8acf04
|
Append Order Detail view finished
|
2017-06-01 18:47:08 +06:30 |
|
Nweni
|
926c54c079
|
Merge branch 'settings_backend'
|
2017-06-01 17:14:57 +06:30 |
|