Commit Graph

113 Commits

Author SHA1 Message Date
Yan
63be238e09 uncomplete print, need for print_settings 2017-06-02 18:26:44 +06:30
Yan
6d705e2860 merge with master 2017-06-02 16:52:58 +06:30
Yan
7e46e3c634 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-02 14:58:29 +06:30
Aung Myo
92a82f6e7f missing bookings controller adding 2017-06-02 14:52:14 +06:30
Yan
840bb52365 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-02 14:48:11 +06:30
Yan
7d5e5e7129 update menu item instance 2017-06-02 14:47:34 +06:30
Yan
5d608b8a57 Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant 2017-06-02 14:03:40 +06:30
Aung Myo
4e36cad341 update booking complete and cancle in crm 2017-06-02 14:02:54 +06:30
PhyoTheingi
f89a4237df Menu Item Instance 2017-06-02 14:02:03 +06:30
Yan
4313032875 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-02 14:00:23 +06:30
Aung Myo
165317a536 update booking complete and cancle in crm 2017-06-02 13:59:45 +06:30
Yan
17206001c4 updated oqs ui 2017-06-02 13:58:35 +06:30
Aung Myo
ed6de14412 update booking controller in crm 2017-06-02 13:17:09 +06:30
PhyoTheingi
0c82c16293 Order Queue Station Bug Fix 2017-06-02 11:38:46 +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
PhyoTheingi
0fa9cd0cac Sub Menu Item Showing 2017-06-02 09:50:48 +06:30
Aung Myo
acbd8acf04 Append Order Detail view finished 2017-06-01 18:47:08 +06:30
PhyoTheingi
7020d4957a constraint to min_qty 2017-06-01 18:44:30 +06:30
Yan
f28f0bf292 UI updated 2017-06-01 18:37:15 +06:30
PhyoTheingi
166e416277 Menu Item Option Route Fix 2017-06-01 17:56:56 +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
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