Commit Graph

761 Commits

Author SHA1 Message Date
phyusin
9ff3018323 add alert for new,send_to_kitchen and ready_to_delivery 2018-05-03 17:22:59 +06:30
phyusin
7c6d842a31 change UI and add expected waiting time 2018-05-02 11:59:35 +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
Nweni
285f5d4cd0 fixed conflict 2018-04-23 18:21:47 +06:30
Aung Myo
6e3a5300a6 close cable in cloud mode 2018-04-23 15:39:56 +06:30
Aung Myo
5ea950f5aa update addore cable for second display closed 2018-04-23 14:43:27 +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
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
ed025800c4 update addor for set instance api for addorder and paymal paymant 2018-04-19 16:55:49 +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
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
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
phyusin
49ebc6c0dc order reservation 2018-04-12 11:01:13 +06:30
San Wai Lwin
4a0995c7ba Pull from master 2018-04-12 10:04:28 +06:30
Aung Myo
c1a6ff7230 Merge branch 'doemal_ordering' 2018-04-11 18:06:55 +06:30
Aung Myo
4d92d71b5c update doemal ordering 2018-04-11 18:05:49 +06:30
phyusin
2ac629f6e0 conflict 2018-04-11 18:01:46 +06:30
phyusin
0413d56a83 add paymal and dinga with account no 2018-04-11 16:18:42 +06:30
phyusin
27e70f1a86 modify api and change rounding adj 2018-04-11 10:28:33 +06:30
San Wai Lwin
41d897d5c2 Edit Move Table Pdf 2018-04-10 18:18:08 +06:30
Yan
70cd6576b1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-10 18:10:53 +06:30
Yan
0ff340cac2 shop upate for 20 files 2018-04-10 18:10:40 +06:30
Aung Myo
8e243564ac Merge branch 'doemal_ordering' 2018-04-10 17:30:54 +06:30
Aung Myo
0e5269c66f update request bill msg box error 2018-04-10 17:29:02 +06:30
Aung Myo
b9d0881913 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into doemal_ordering 2018-04-09 15:34:20 +06:30
Aung Myo
66df760323 update order & reservation 2018-04-09 11:51:39 +06:30
phyusin
85b0378b6b change redeem payment process for dinga 2018-04-09 11:33:36 +06:30
phyusin
c5c6fdd6ac Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-09 10:12:33 +06:30
phyusin
2e19d34ced add dinga payment and new payment type in report 2018-04-09 09:40:08 +06:30
phyusin
edaef54b0e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes 2018-04-06 17:54:03 +06:30
San Wai Lwin
ee3121b7c2 Pull From Master 2018-04-06 13:42:11 +06:30
phyusin
818f441529 check mobile 2018-04-06 13:15:32 +06:30
phyusin
0b869ccb89 cehck mobile 2018-04-06 12:00:45 +06:30