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 |
|
PhyoTheingi
|
59434e2c3a
|
Menu item with Accout
|
2017-06-06 17:29:34 +06:30 |
|
Nweni
|
1c5c5e194c
|
added sale order
|
2017-06-06 16:47:43 +06:30 |
|
Nweni
|
2318d83adf
|
update
|
2017-06-06 16:19:14 +06:30 |
|
Nweni
|
3c756949d1
|
payment
|
2017-06-06 15:32:24 +06:30 |
|
PhyoTheingi
|
2abc2e5f3d
|
Assign Order Item Bug ix
|
2017-06-06 14:33:14 +06:30 |
|
Nweni
|
b847cde62c
|
sale query updated
|
2017-06-06 14:03:21 +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 |
|
PhyoTheingi
|
231eec6a01
|
Payment delete bug fix
|
2017-06-06 10:50:51 +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 |
|
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 |
|
Aung Myo
|
b54a19cfff
|
update query data for origami
|
2017-06-06 09:18:01 +06:30 |
|
Yan
|
d9f7b391ec
|
del puts line in oqs
|
2017-06-05 18:54:17 +06:30 |
|
Yan
|
f1877408be
|
fixed for pm key changed
|
2017-06-05 18:52:19 +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 |
|
Aung Myo
|
68e51c98c3
|
update origamitable,room query
|
2017-06-05 15:07:44 +06:30 |
|
Yan
|
f004db9b19
|
updated migration code
|
2017-06-05 15:06:34 +06:30 |
|
Yan
|
b332d6a525
|
postfix length 16 to 12 for limit 16
|
2017-06-05 13:37:07 +06:30 |
|
Yan
|
b528da3d9b
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into oqs
|
2017-06-05 13:29:01 +06:30 |
|
Yan
|
1dbe133b79
|
update for db changed
|
2017-06-05 13:28:40 +06:30 |
|
Yan
|
c4e6f917f4
|
modified in order model
|
2017-06-05 10:22:12 +06:30 |
|
PhyoTheingi
|
42ba2d9ae4
|
comment the conflict in creating menu item instances with account and item attribute validate
|
2017-06-05 10:00:32 +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 |
|
Aung Myo
|
e309b35669
|
fixed conflictsale item order order item
|
2017-06-04 16:51:38 +06:30 |
|
Aung Myo
|
d058b1b1b8
|
fixed conflict gem
|
2017-06-04 16:42:18 +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 |
|
Min Zeya Phyo
|
ad44d9d0e3
|
move login_from from model folder to form folder
|
2017-06-04 16:28:29 +06:30 |
|
Min Zeya Phyo
|
4fc511d531
|
custom primary key for transaction
|
2017-06-04 16:27:14 +06:30 |
|
Aung Myo
|
af02a63263
|
fixed conflict request_bill and order model
|
2017-06-04 16:25:25 +06:30 |
|
Aung Myo
|
3679fe10b8
|
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant into crm
|
2017-06-04 16:15:02 +06:30 |
|
Aung Myo
|
9b334a20fa
|
fixed receipt bill print view
|
2017-06-04 16:13:15 +06:30 |
|
Cherry
|
e3f9d62bce
|
Sale Save
|
2017-06-04 16:02:55 +06:30 |
|
Nweni
|
db904739ac
|
setting update
|
2017-06-04 15:55:06 +06:30 |
|
Nweni
|
9624d4df3e
|
update
|
2017-06-04 15:47:03 +06:30 |
|
Nweni
|
9bb7eb7f17
|
fixed
|
2017-06-04 15:36:38 +06:30 |
|