Commit Graph

98 Commits

Author SHA1 Message Date
Nweni
a9259ca845 order 2017-06-02 11:30:10 +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
Nweni
ad38a0a708 gem lock 2017-06-01 17:13:30 +06:30
PhyoTheingi
89c6228c31 UI phrase 1 2017-06-01 17:10:04 +06:30
PhyoTheingi
a7d7260157 Bug Fix 2017-06-01 14:00:08 +06:30
Nweni
584d745301 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-01 13:21:09 +06:30
Nweni
0a223a03f5 remove order_queue_item 2017-06-01 13:12:36 +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
PhyoTheingi
03bf799708 Set_item Create 2017-06-01 10:03:07 +06:30
Yan
82d7d7ffcc merge crm 2017-06-01 09:59:43 +06:30
Cherry
47469cf466 Origami update commit 2017-06-01 09:27:37 +06:30
Min Zeya Phyo
4271681638 Support both mysql and pg 2017-06-01 10:49:20 +08:00
Min Zeya Phyo
0189c01e04 Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant 2017-05-31 23:50:06 +08:00
Yan
44c4dd0d78 nothing change 2017-05-31 22:16:55 +06:30
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
Cherry
44e7d2452f tables origami 2017-05-31 18:19:17 +06:30
Cherry
9cc0165cf5 fixed conflict 2017-05-31 16:28:39 +06:30
Cherry
b3b2e9bd8d order controller updated 2017-05-31 16:24:34 +06:30
Aung Myo
8847cf8bf3 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-05-31 14:01:15 +06:30
Aung Myo
9156763ccb crm home view 2017-05-31 14:01:00 +06:30
Yan
1ed15e2e0d pull master 2017-05-31 13:54:01 +06:30
Yan
314372ef75 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into oqs 2017-05-31 13:52:51 +06:30
Yan
a86ab147c8 ignore gems 2017-05-31 13:47:55 +06:30
Yan
0b8ec22976 deleted queue_items 2017-05-31 13:42:44 +06:30
Nweni
0a000761fb Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into settings_backend 2017-05-31 13:41:00 +06:30
Nweni
7e7b89e143 added order_queue_item 2017-05-31 13:40:48 +06:30
Aung Myo
2703f59d8c bookings tab view 2017-05-31 11:25:24 +06:30
Aung Myo
136a52c4ac bookings tab view 2017-05-31 11:24:12 +06:30
Nweni
1d8b03b6ab update 2017-05-31 10:26:16 +06:30
Nweni
85b9ffaf20 gem lock 2017-05-31 10:04:37 +06:30
PhyoTheingi
fda69012da Menu Category path fixing 2017-05-31 09:36:10 +06:30
Cherry
fd4bf6912f for checkout new branch 2017-05-31 09:13:01 +06:30
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
Min Zeya Phyo
c7a4adc7cc sale voucher wrong spelling 2017-05-29 18:46:03 +06:30
Min Zeya Phyo
de29de486f menu items 2017-05-29 15:27:22 +06:30
Min Zeya Phyo
08f993d621 Order queue stations 2017-05-28 13:30:30 +06:30
Min Zeya Phyo
112fe8b56b rails 5.1 updates 2017-05-22 15:27:34 +06:30
Yan
d94f9611ad rename ruby-version 2017-05-11 15:05:42 +06:30
Min Zeya Phyo
56a465448a dashboard 2017-05-11 14:14:29 +06:30
Min Zeya Phyo
c1c72eca30 more controller for cashier/waiter view 2017-05-10 01:10:21 +06:30
Min Zeya Phyo
62e8615f12 receipt update 2017-04-22 00:09:07 +06:30
Min Zeya Phyo
f860954a7f final format 2017-04-21 23:46:38 +06:30