Commit Graph

912 Commits

Author SHA1 Message Date
Aung Myo
1fe48b57d0 update action cable for order resservation 2018-04-22 14:11:04 +06:30
Aung Myo
97ec370a8f update order and reserve and receipt rake 2018-04-20 17:03:18 +06:30
Aung Myo
ed025800c4 update addor for set instance api for addorder and paymal paymant 2018-04-19 16:55:49 +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
0413d56a83 add paymal and dinga with account no 2018-04-11 16:18:42 +06:30
phyusin
9b2312d3ba change ordr reservation api 2018-04-11 14:38:16 +06:30
Aung Myo
0e5269c66f update request bill msg box error 2018-04-10 17:29:02 +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
a258a77c46 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes 2018-04-09 10:09:52 +06:30
phyusin
b3e17f6936 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-09 09:48:35 +06:30
phyusin
2e19d34ced add dinga payment and new payment type in report 2018-04-09 09:40:08 +06:30
Aung Myo
a9b9342f42 Merge branch 'adminbsb_material_ui' 2018-04-07 16:45:45 +06:30
Aung Myo
7b28d56738 update addorder js after git issuse fixed 2018-04-07 14:23:11 +06:30
San Wai Lwin
460ed991af Edit Addorder.js and Shop name 2018-04-06 18:16:20 +06:30
San Wai Lwin
30da4f37b3 Add Shop Name in Login Page 2018-04-06 17:51:00 +06:30
San Wai Lwin
ee3121b7c2 Pull From Master 2018-04-06 13:42:11 +06:30
phyusin
6c172eae8e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-05 19:00:30 +06:30
phyusin
a44e86ed21 check orgami js 2018-04-05 19:00:13 +06:30
Aung Myo
3bbb55b919 Merge branch 'adminbsb_material_ui' 2018-04-05 17:53:22 +06:30
Aung Myo
85b92fd3a7 addorder js for product 2018-04-05 17:52:33 +06:30
Yan
76da718a78 merge master 2018-04-05 16:10:59 +06:30
phyusin
a2e4863c9d check user agent and token when webview is loaded 2018-04-06 15:36:08 +06:30
phyusin
dac1a58b64 print settings 2018-04-06 10:45:14 +06:30
phyusin
55e2a06422 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-06 09:40:49 +06:30
phyusin
7c15dac2aa webview 2018-04-05 17:30:44 +06:30
Yan
09594f83f2 print setting for jade print 2018-04-05 16:08:20 +06:30
Aung Myo
5b155f729f update addorder 2018-04-05 14:55:32 +06:30
San Wai Lwin
fc8b2d3b73 Pull from master 2018-04-05 11:49:42 +06:30
Aung Myo
00c23b38df update merge with admibbsb-materi for multiple set item and report 2018-04-04 17:55:27 +06:30
Aung Myo
9136e9de07 update addorder set multiple 2018-04-04 17:51:51 +06:30
Aung Myo
03e8ba99a6 update add 2018-04-04 17:20:49 +06:30
Aung Myo
f5be9661c4 Merge branch 'adminbsb_material_ui' 2018-04-02 14:36:14 +06:30
Aung Myo
3e0742c660 reduce scroll speed in wIter app 2018-04-02 14:06:22 +06:30
Aung Myo
1cb6701055 Merge branch 'adminbsb_material_ui' 2018-04-02 11:44:11 +06:30
Aung Myo
e6d11644bb update menu astron for no option 2018-04-02 11:40:18 +06:30
phyusin
fc8d8eea4a add paymal payment 2018-03-30 16:53:38 +06:30
phyusin
ac5987fbb5 Merge branch 'topup_payment' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-30 16:38:00 +06:30
phyusin
298fc9a3f0 merge with second display 2018-03-30 15:48:55 +06:30
phyusin
8e14d93c4c merge with master 2018-03-30 15:36:41 +06:30
phyusin
df93563e6f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes 2018-03-30 15:29:26 +06:30
phyusin
6a9fd67bff check payment method 2018-03-30 15:24:51 +06:30
San Wai Lwin
3ced0f2590 Pull from master 2018-03-29 18:17:10 +06:30
San Wai Lwin
ff19f20a18 Edit UI design for shop images 2018-03-28 14:52:57 +06:30
Aung Myo
a75d3e08df update scroll speed 2018-03-23 16:22:35 +06:30
Aung Myo
65345d1add update scroll for menu 2018-03-23 14:51:14 +06:30