Commit Graph

1129 Commits

Author SHA1 Message Date
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
San Wai Lwin
8e7fd2d747 Edit in Reference No in CB 2018-04-26 17:23:01 +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
314058282e puma deleted by sqa-1804-001 2018-04-25 15:14:40 +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
Nweni
285f5d4cd0 fixed conflict 2018-04-23 18:21:47 +06:30
Aung Myo
39c7cec32b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-22 16:42:52 +06:30
Aung Myo
8806027793 update bugs for demo 2018-04-22 16:38:52 +06:30
Aung Myo
5f95bf5f4d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-22 14:12:33 +06:30
Aung Myo
1fe48b57d0 update action cable for order resservation 2018-04-22 14:11:04 +06:30
Aung Myo
e1cf95ea60 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-20 17:04:18 +06:30
Aung Myo
cc4fdf2384 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-20 17:03:34 +06:30
Aung Myo
97ec370a8f update order and reserve and receipt rake 2018-04-20 17:03:18 +06:30
Yan
0aa080573c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-20 13:53:56 +06:30
Yan
223404a3b0 fix childplay code and qr code 2018-04-20 11:51:33 +06:30
Aung Myo
ed958b622d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-20 10:37:24 +06:30
Aung Myo
8720ffd195 update discuount view 2018-04-20 10:36:34 +06:30
Aung Myo
e640f4b0a0 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-19 16:56:30 +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
8d3946fede update dinga and paymal view for tabcap 2018-04-19 15:49:38 +06:30
Aung Myo
f638837f81 update dinga and paymal view for tabcap 2018-04-19 15:48:39 +06:30
Yan
f8a247c61a print pdf btn ui change 2018-04-19 15:41:22 +06:30
Yan
46f572e2ae merge with ui ux and add public menus in gitignore 2018-04-19 15:26:57 +06:30
Aung Myo
1913ada8e5 update 2018-04-19 15:23:08 +06:30
Yan
527cafc772 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-19 15:18:11 +06:30
Yan
3db2db093b menu export import update and print setting update 2018-04-19 15:17:59 +06:30
San Wai Lwin
0241d209ac Pull from master 2018-04-19 10:49:25 +06:30
Aung Myo
4837d27964 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-19 10:17:29 +06:30
Aung Myo
ed8e9836fe check and update qrcode payment 2018-04-19 10:16:38 +06:30
Yan
458da62c66 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-18 18:12:16 +06:30
San Wai Lwin
70ec80a1d5 Manager level can not edit Administrator's password and id 2018-04-18 16:57:02 +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
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
San Wai Lwin
36eab44f8b edit Total Customer in survey 2018-04-12 09:59:34 +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
San Wai Lwin
b11480a90c Add Total Customer 2018-04-11 17:53:57 +06:30
Yan
6889c879ec Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-11 17:20:29 +06:30