Commit Graph

64 Commits

Author SHA1 Message Date
Nweni
9a23716c23 others payment 2017-06-07 13:02:12 +06:30
Nweni
3c756949d1 payment 2017-06-06 15:32:24 +06:30
Nweni
eaec6a39b4 fixed conflict 2017-06-06 09:47:33 +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
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
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
Nweni
fa34d1db8f fixed conflict 2017-06-04 10:23:38 +06:30
Min Zeya Phyo
394d2ed938 change transactional primary key to custom ID for better portability 2017-06-03 19:12:35 +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
eab356233c add new model - shop - it will be use to define what is setup 2017-06-03 15:04:53 +06:30
Yan
03ae60d2e6 merge all 03062017 2017-06-03 12:50:08 +06:30
PhyoTheingi
2716b913f2 Setting Instances Update 2017-06-03 11:59:29 +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
6d705e2860 merge with master 2017-06-02 16:52:58 +06:30
Yan
98a7c31ffa initial setup for print 2017-06-02 16:21:47 +06:30
Yan
5d608b8a57 Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant 2017-06-02 14:03:40 +06:30
Yan
4313032875 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-02 14:00:23 +06:30
Aung Myo
ed6de14412 update booking controller in crm 2017-06-02 13:17:09 +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
Aung Myo
acbd8acf04 Append Order Detail view finished 2017-06-01 18:47:08 +06:30
Nweni
926c54c079 Merge branch 'settings_backend' 2017-06-01 17:14:57 +06:30
PhyoTheingi
89c6228c31 UI phrase 1 2017-06-01 17:10:04 +06:30
Yan
356923a9d8 pull master 2017-06-01 12:11:23 +06:30
Yan
e46fe1ec7c add cable but not complete 2017-05-30 19:02:40 +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
Min Zeya Phyo
c1c72eca30 more controller for cashier/waiter view 2017-05-10 01:10:21 +06:30
Min Zeya Phyo
db3b50a496 frontend view layout 2017-04-21 05:07:00 +06:30
Min Zeya Phyo
e1e102fd15 user role scoped layout and controller 2017-04-20 22:29:39 +06:30
Min Zeya Phyo
b16089e876 .ruby-verions should not be check in 2017-04-20 20:29:28 +06:30
Min Zeya Phyo
0af7d78c3c scaffold models 2017-04-20 17:01:14 +06:30
Min Zeya Phyo
c4e76c53b2 emenu api integrated 2017-04-19 18:37:07 +06:30
Min Zeya Phyo
a717791a7c settings controllers 2017-04-18 13:01:05 +06:30
Min Zeya Phyo
dbad900cd4 payment api 2017-04-18 11:01:10 +06:30
Min Zeya Phyo
6a84a34a9f sale receipt generation and bill api 2017-04-17 13:09:54 +06:30
Min Zeya Phyo
3e9a2a0ce7 order submission and order queue submission basic done 2017-04-16 16:52:08 +06:30
Min Zeya Phyo
30774b4efd order submission and order queue submission basic done 2017-04-16 16:52:04 +06:30
Min Zeya Phyo
63c5c97f24 menu and menu item categories 2017-04-15 17:33:45 +06:30