Commit Graph

1555 Commits

Author SHA1 Message Date
phyusin
6d6b6c6791 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-02 11:59:58 +06:30
phyusin
7c6d842a31 change UI and add expected waiting time 2018-05-02 11:59:35 +06:30
Aung Myo
bf00eceba0 Merge branch 'adminbsb_material_ui' 2018-04-30 15:37:43 +06:30
Aung Myo
ff4cdfa158 update member discount and tax 2018-04-30 15:16:07 +06:30
phyusin
027550121e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-30 09:46:04 +06:30
phyusin
929919ba0f change order reservation 2018-04-30 09:45:37 +06:30
Aung Myo
57607d0e8b update addorder controller 2018-04-27 16:17:55 +06:30
phyusin
11473c7fcd change order reservation 2018-04-27 13:47:54 +06:30
Aung Myo
36f097d4cf Merge branch 'adminbsb_material_ui' 2018-04-27 10:40:17 +06:30
Aung Myo
eb61e94909 update addorder get menu and sub menu 2018-04-27 10:39:29 +06:30
Aung Myo
390c9b2dca Merge branch 'adminbsb_material_ui' 2018-04-26 13:35:41 +06:30
Aung Myo
3a85481dcd update dinga and paymal 2018-04-26 13:07:31 +06:30
phyusin
81407cf95e change query for sale items 2018-04-25 15:33:54 +06:30
phyusin
c14960fc96 remove conflict data 2018-04-25 15:10:10 +06:30
phyusin
b41c85132d add order and reservation, quick service in lookups and add date and order by in order reservation 2018-04-25 15:07:43 +06:30
Aung Myo
9b0a564b9a update cable for cloud 2018-04-25 13:18:54 +06:30
phyusin
3f13bb6c74 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-23 19:21:20 +06:30
phyusin
e62ba4d6c2 change params 2018-04-23 19:20:03 +06:30
Nweni
285f5d4cd0 fixed conflict 2018-04-23 18:21:47 +06:30
Yan
86199ab4b4 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-23 16:23:35 +06:30
Yan
403f70480d api cloud update 2018-04-23 16:23:00 +06:30
phyusin
3d39e398df remove actioncable 2018-04-23 16:16:41 +06:30
Aung Myo
6e3a5300a6 close cable in cloud mode 2018-04-23 15:39:56 +06:30
Aung Myo
31ee7f05fe Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-23 14:43:41 +06:30
Aung Myo
5ea950f5aa update addore cable for second display closed 2018-04-23 14:43:27 +06:30
phyusin
9b12ed0254 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-23 14:41:18 +06:30
phyusin
b92889fb23 change base url settings 2018-04-23 14:41:07 +06:30
Aung Myo
cbb7a14621 update action cable for cloud 2018-04-23 14:17:56 +06:30
Aung Myo
8806027793 update bugs for demo 2018-04-22 16:38:52 +06:30
Aung Myo
1fe48b57d0 update action cable for order resservation 2018-04-22 14:11:04 +06:30
Yan
268cae09f5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-20 20:27:31 +06:30
Yan
835231bd61 edit api cntr 2018-04-20 20:27:08 +06:30
Aung Myo
983baa88c9 update discount member message 2018-04-20 13:00:48 +06:30
Aung Myo
f8687b5010 update cloud mode off for order and queue 2018-04-20 09:23:11 +06:30
Aung Myo
830dc1b4d2 udpate order 2018-04-19 19:02:21 +06:30
Aung Myo
095a62f143 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-19 16:55:58 +06:30
Aung Myo
ed025800c4 update addor for set instance api for addorder and paymal paymant 2018-04-19 16:55:49 +06:30
Yan
1187ddba37 move check license to action controler 2018-04-19 16:40:59 +06:30
Yan
3db2db093b menu export import update and print setting update 2018-04-19 15:17:59 +06:30
Yan
458da62c66 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-18 18:12:16 +06:30
Yan
28a79fe60f pdf viewer add and menu export testing 2018-04-18 18:12:01 +06:30
Aung Myo
2a26abff9a finished dinga and paymal payment 2018-04-18 16:47:38 +06:30
Aung Myo
5816a48d32 update dinga and paymal 2018-04-18 14:40:53 +06:30
Yan
fc523ca390 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-18 14:17:52 +06:30
Yan
c22fc3e86e add pdf viewer and test doemal 2018-04-18 14:17:37 +06:30
phyusin
de5bbb27f7 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-12 16:19:27 +06:30
San Wai Lwin
859080d4a1 Edit MoveTablePdf for cloud 2018-04-12 15:28:10 +06:30
phyusin
b12d4b8bf8 token checked for doemal 2018-04-12 14:30:25 +06:30
phyusin
4137026c16 order reservation updated 2018-04-12 14:28:44 +06:30
phyusin
b4ccd02fc2 change order reservation 2018-04-12 11:05:10 +06:30