Aung Myo
|
fd1c53432c
|
account model updated
|
2017-06-07 17:13:27 +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
|
ad5d41768d
|
Fix conflict
|
2017-06-07 11:02:53 +06:30 |
|
PhyoTheingi
|
608cd5bb21
|
update seed
|
2017-06-07 10:53:15 +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 |
|
Min Zeya Phyo
|
4afb630b95
|
Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant
|
2017-06-06 21:39:13 +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
|
fbf312f71c
|
change show to print method in req bills controller
|
2017-06-06 17:01:15 +06:30 |
|
Moe Su
|
50185bc376
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty
|
2017-06-06 16:53:12 +06:30 |
|
Nweni
|
1c5c5e194c
|
added sale order
|
2017-06-06 16:47:43 +06:30 |
|
Yan
|
c482318b1a
|
req bill bugs fixing
|
2017-06-06 16:37:42 +06:30 |
|
Moe Su
|
12cdf65a06
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty
|
2017-06-06 16:19:55 +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 |
|
Yan
|
d28449a9c9
|
updated for bill print
|
2017-06-06 14:34:24 +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 |
|
Moe Su
|
802ff02fb4
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty
|
2017-06-06 14:05:37 +06:30 |
|
Nweni
|
b847cde62c
|
sale query updated
|
2017-06-06 14:03:21 +06:30 |
|
Min Zeya Phyo
|
48d1c60703
|
Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant
|
2017-06-06 12:05:06 +06:30 |
|
Min Zeya Phyo
|
8c47371fa7
|
seed generator
|
2017-06-06 12:04:56 +06:30 |
|
Nweni
|
c2952c4600
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-06 11:08:51 +06:30 |
|
Nweni
|
c461cb94f2
|
fixed
|
2017-06-06 11:08:43 +06:30 |
|
Moe Su
|
0a62b46253
|
For Pull
|
2017-06-06 10:56:28 +06:30 |
|
PhyoTheingi
|
231eec6a01
|
Payment delete bug fix
|
2017-06-06 10:50:51 +06:30 |
|
Moe Su
|
7ccc50b7ed
|
For Pull
|
2017-06-06 10:34:13 +06:30 |
|
Yan
|
dcb8217824
|
updated order.rb for order_items_id
|
2017-06-06 10:32:38 +06:30 |
|
Yan
|
e66dd33c1a
|
updated order.rb
|
2017-06-06 10:27:59 +06:30 |
|
Yan
|
bb68063f33
|
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-06 10:26:56 +06:30 |
|
Yan
|
187a050c19
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-06 10:26:01 +06:30 |
|
Yan
|
038a3c1696
|
oqs print query update
|
2017-06-06 10:25:14 +06:30 |
|
Yan
|
820b1d5e96
|
update query in order queue printer
|
2017-06-06 10:19:15 +06:30 |
|
Aung Myo
|
324f1e3b24
|
update query in order model for origami
|
2017-06-06 10:10:47 +06:30 |
|
Aung Myo
|
fa0b434888
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-06 10:01:36 +06:30 |
|
Aung Myo
|
792001a5f3
|
fixed conflict gem and gemfile lock
|
2017-06-06 10:01:21 +06:30 |
|
Nweni
|
eaec6a39b4
|
fixed conflict
|
2017-06-06 09:47:33 +06:30 |
|
Aung Myo
|
6ecf791673
|
update coutomer controller
|
2017-06-06 09:47:24 +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 |
|
Yan
|
b24e667e9e
|
merged crm
|
2017-06-06 09:41:06 +06:30 |
|