Commit Graph

100 Commits

Author SHA1 Message Date
Aung Myo
0943808ac8 finished order and sales in setting 2017-06-12 00:45:59 +06:30
Yan
f834911587 to do req_bill_format and status changed after pay 2017-06-12 00:45:26 +06:30
Aung Myo
eb001275c7 fixed conflict 2017-06-11 18:09:00 +06:30
Nweni
31cc75462b fixed conflict 2017-06-11 15:52:13 +06:30
Nweni
b7bd68a461 payment keypad 2017-06-11 15:51:22 +06:30
Moe Su
33cc576f1e edit membership setting , otherpayment page 2017-06-11 15:48:53 +06:30
Aung Myo
406172c6ff fixed conflict 2017-06-09 12:04:36 +06:30
Yan
fe60ac818f update assets 2017-06-09 11:33:21 +06:30
Yan
54ef701482 updated miss origami css and js filename 2017-06-09 10:36:07 +06:30
Yan
39c20b221e updated miss origami css and js filename 2017-06-09 10:35:19 +06:30
Aung Myo
35277ac000 queue and crm view updated 2017-06-09 09:29:25 +06:30
Moe Su
0bcd612bc2 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty 2017-06-08 17:57:43 +06:30
Moe Su
74b0550c30 payment_setting 2017-06-08 17:57:29 +06:30
Yan
fbc00bc3e4 merged loyalty 2017-06-08 15:28:09 +06:30
Yan
9866acf198 editing discout 2017-06-08 15:21:53 +06:30
Moe Su
6cc2e29e30 For pull 2017-06-07 18:13:12 +06:30
Moe Su
e2ecfaeaad For pull 2017-06-07 18:11:03 +06:30
Yan
be7d448c30 update gem file 2017-06-07 18:09:56 +06:30
Yan
df138d94ba merged master 2017-06-07 17:45:40 +06:30
Aung Myo
bd345dbc3f fixed conflict 2017-06-07 17:15:51 +06:30
Yan
114c4ee14d all changed for index in origami 2017-06-07 17:13:27 +06:30
Nweni
c18b57eca8 payment 2017-06-07 10:29:00 +06:30
Nweni
3c756949d1 payment 2017-06-06 15:32:24 +06:30
Aung Myo
d2ce74f648 bootstrap datepicker and customer save 2017-06-06 14:16:40 +06:30
Nweni
faca7295f7 added new image upload file 2017-06-05 17:14:07 +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
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
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
Min Zeya Phyo
0189c01e04 Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant 2017-05-31 23:50:06 +08:00
PhyoTheingi
fda69012da Menu Category path fixing 2017-05-31 09:36:10 +06:30
Min Zeya Phyo
d7d29e4d16 sales listing under transacitons 2017-05-29 18:55:34 +06:30
Min Zeya Phyo
08f993d621 Order queue stations 2017-05-28 13:30:30 +06:30
Min Zeya Phyo
c1c72eca30 more controller for cashier/waiter view 2017-05-10 01:10:21 +06:30
Min Zeya Phyo
e1e102fd15 user role scoped layout and controller 2017-04-20 22:29:39 +06:30
Min Zeya Phyo
a717791a7c settings controllers 2017-04-18 13:01:05 +06:30
Min Zeya Phyo
0ddc7bdb44 basic layout template 2017-04-05 08:24:21 +06:30
Min Zeya Phyo
bcdce092cc order api - WIP & db structure change 2017-04-04 12:18:17 +06:30
Min Zeya Phyo
7595ed183b bootstrap basic layout 2017-04-04 02:29:03 +06:30
Min Zeya Phyo
efd0398baa bootstrap and simpleform 2017-04-04 02:00:34 +06:30
Min Zeya Phyo
a247cd44eb add zone test-rspec 2017-03-24 21:28:57 +06:30
Min Zeya Phyo
3efee9ed8c init project commit 2017-03-24 19:58:23 +06:30