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 |
|
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 |
|
Min Zeya Phyo
|
4fc511d531
|
custom primary key for transaction
|
2017-06-04 16:27:14 +06:30 |
|
Nweni
|
69d188d4c1
|
..
|
2017-06-04 15:28:48 +06:30 |
|
Nweni
|
f5b6445a21
|
update
|
2017-06-04 14:46:00 +06:30 |
|
Nweni
|
aa295c3a12
|
fixed conflict
|
2017-06-04 13:12:02 +06:30 |
|
Nweni
|
fa34d1db8f
|
fixed conflict
|
2017-06-04 10:23:38 +06:30 |
|
Nweni
|
3161c87a95
|
Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant into settings_backend
|
2017-06-04 10:21:54 +06:30 |
|
Nweni
|
e5e14aaa62
|
fixed conflict
|
2017-06-04 10:19:35 +06:30 |
|
Nweni
|
3ab3fa71a8
|
fixed conflict
|
2017-06-04 10:16:23 +06:30 |
|
Nweni
|
e3e41bd64e
|
Update
|
2017-06-04 10:12:33 +06:30 |
|
PhyoTheingi
|
a01c4bd9cf
|
Menu Item instances and OQS json saving
|
2017-06-03 17:09:56 +06:30 |
|
Aung Myo
|
a2c9996b76
|
Finished Request Bill print function
|
2017-06-03 17:04:17 +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
|
bf8679c201
|
Merge branch 'shop_setup'
|
2017-06-03 14:26:45 +06:30 |
|
Aung Myo
|
138850fb24
|
origin pull master
|
2017-06-03 13:44:10 +06:30 |
|
Aung Myo
|
7529d23147
|
update booking status and view
|
2017-06-03 13:32:13 +06:30 |
|
Yan
|
622ca05c9e
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-03 13:27:11 +06:30 |
|
Yan
|
03ae60d2e6
|
merge all 03062017
|
2017-06-03 12:50:08 +06:30 |
|
Yan
|
2e2bda168c
|
print developing
|
2017-06-03 12:41:24 +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
|
022a2e005f
|
initial print setup
|
2017-06-02 16:22:15 +06:30 |
|
Yan
|
5d608b8a57
|
Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-02 14:03:40 +06:30 |
|
Nweni
|
a9259ca845
|
order
|
2017-06-02 11:30:10 +06:30 |
|
PhyoTheingi
|
7020d4957a
|
constraint to min_qty
|
2017-06-01 18:44:30 +06:30 |
|
Nweni
|
926c54c079
|
Merge branch 'settings_backend'
|
2017-06-01 17:14:57 +06:30 |
|
Nweni
|
e200dcd438
|
Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant into settings_backend
|
2017-06-01 17:14:35 +06:30 |
|
PhyoTheingi
|
a7d7260157
|
Bug Fix
|
2017-06-01 14:00:08 +06:30 |
|
Yan
|
356923a9d8
|
pull master
|
2017-06-01 12:11:23 +06:30 |
|
Yan
|
2a323c8d0d
|
deleted order queue item
|
2017-06-01 12:07:27 +06:30 |
|
Yan
|
2d511cc63e
|
Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-01 10:09:22 +06:30 |
|
Yan
|
6b2a496830
|
merged origami
|
2017-06-01 10:08:55 +06:30 |
|
Cherry
|
47469cf466
|
Origami update commit
|
2017-06-01 09:27:37 +06:30 |
|
Min Zeya Phyo
|
0189c01e04
|
Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant
|
2017-05-31 23:50:06 +08:00 |
|
Yan
|
5a564abca9
|
oqs sample
|
2017-05-31 22:14:46 +06:30 |
|
PhyoTheingi
|
a67c76d945
|
Menu 2nd Phrase
|
2017-05-31 18:27:31 +06:30 |
|
Aung Myo
|
f036274f5e
|
finished order tab view and customer tab
|
2017-05-31 18:19:51 +06:30 |
|
Yan
|
314372ef75
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into oqs
|
2017-05-31 13:52:51 +06:30 |
|
Nweni
|
7e7b89e143
|
added order_queue_item
|
2017-05-31 13:40:48 +06:30 |
|
Min Zeya Phyo
|
516b854fba
|
shop_setup branch
|
2017-05-30 23:46:22 +08:00 |
|
Yan
|
e46fe1ec7c
|
add cable but not complete
|
2017-05-30 19:02:40 +06:30 |
|
Min Zeya Phyo
|
9361e24a8a
|
remove sale_discount from model list
|
2017-05-30 12:42:50 +06:30 |
|
Min Zeya Phyo
|
d7d29e4d16
|
sales listing under transacitons
|
2017-05-29 18:55:34 +06:30 |
|