Commit Graph

3016 Commits

Author SHA1 Message Date
Aung Myo
ca817197d9 update menu import and export 2018-03-19 18:13:38 +06:30
Aung Myo
919846ef5c Merge branch 'adminbsb_material_ui' 2018-03-16 17:42:25 +06:30
Aung Myo
e956b54886 update option and menu export csv single 2018-03-16 17:41:30 +06:30
phyusin
8cea60ec02 SQA urgent issues 2018-03-16 09:42:56 +06:30
phyusin
6ccf315242 remove JSON parse in set item options 2018-03-15 16:14:15 +06:30
phyusin
dcac662c8e change set menu item format in api and origami 2018-03-15 15:51:12 +06:30
phyusin
50c1ca9fd6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-15 15:00:48 +06:30
Aung Myo
f8b134b48c Merge branch 'adminbsb_material_ui' 2018-03-15 14:38:27 +06:30
Aung Myo
f0e81caad0 update addorder option for set 2018-03-15 14:35:25 +06:30
phyusin
af2f3045cf change order items api 2018-03-15 14:25:19 +06:30
phyusin
0a7ced35ab Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-15 11:15:53 +06:30
phyusin
c7f11c2a33 fixed set menu item update and individual payment 2018-03-15 11:15:43 +06:30
Aung Myo
e2ad592007 update start import and export menu 2018-03-15 10:53:17 +06:30
phyusin
a2d1fc06be Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-03-15 10:31:38 +06:30
Aung Myo
6ec03e3454 update today issue 2018-03-14 17:52:23 +06:30
phyusin
68a27ffcc7 check customer lightbox 2018-03-14 17:42:24 +06:30
phyusin
70e400c3b9 change UI in payment page 2018-03-14 15:08:26 +06:30
Aung Myo
cf5a85fa5c update migrate for sale audit remark 2018-03-14 13:51:31 +06:30
phyusin
b836bffb90 change payment member UI 2018-03-14 12:15:56 +06:30
phyusin
0edc92d066 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-03-14 09:16:14 +06:30
San Wai Lwin
84fe089568 Active tab in dashboard, Manager Tab, Union Payment 2018-03-13 17:53:04 +06:30
Aung Myo
69fcdb7e03 Merge branch 'adminbsb_material_ui' 2018-03-13 17:39:36 +06:30
Aung Myo
44389d485a update request bill reload in quick service 2018-03-13 17:38:25 +06:30
Aung Myo
bf1b7ecb56 update payment controller if member 2018-03-13 14:59:23 +06:30
San Wai Lwin
a0c6c363fd Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes 2018-03-13 14:53:07 +06:30
San Wai Lwin
0a9294ed60 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes 2018-03-13 14:51:53 +06:30
San Wai Lwin
9228168ebc route changes 2018-03-13 14:51:07 +06:30
San Wai Lwin
694feb9c06 For pull 2018-03-13 14:46:07 +06:30
Aung Myo
a95fc4d07a update payment controller if member 2018-03-13 14:43:58 +06:30
Aung Myo
9f0bef732e update change version v3 for api paymal 2018-03-13 14:23:23 +06:30
phyusin
a9afa4e317 action controller 2018-03-13 11:48:55 +06:30
phyusin
30a2e7755b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-13 11:47:52 +06:30
phyusin
371a736eaf add shop detail in product sale 2018-03-13 11:47:42 +06:30
Aung Myo
900223ca21 Merge branch 'adminbsb_material_ui' 2018-03-13 11:46:05 +06:30
Aung Myo
df781395c8 update oqs and read me 2018-03-13 11:40:05 +06:30
phyusin
30bfb060df check payment and ability for split bill 2018-03-13 10:58:06 +06:30
phyusin
2282bf52f8 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-13 10:32:16 +06:30
Aung Myo
40d55ae546 Merge branch 'adminbsb_material_ui' 2018-03-13 10:31:03 +06:30
Aung Myo
5b99a8cf65 update reload second display 2018-03-13 10:26:18 +06:30
phyusin
f051022ab4 check reload issue 2018-03-12 17:50:51 +06:30
Aung Myo
b65849a11a Merge branch 'adminbsb_material_ui' 2018-03-12 17:26:56 +06:30
Aung Myo
428b9a4b64 update option add set and second display 2018-03-12 17:25:01 +06:30
Aung Myo
68f20a5535 update options for addorder 2018-03-12 16:03:44 +06:30
phyusin
92401ab4f9 merge with old_town_aston req 2018-03-12 12:10:52 +06:30
Aung Myo
6e9ecd342b update second display 2018-03-12 10:42:29 +06:30
Aung Myo
04b053d2b7 fixed conflix payment page 2018-03-11 16:37:33 +06:30
Aung Myo
4ea2337fae update second display 2018-03-11 16:14:44 +06:30
phyusin
400c8fa06a remove conflict data 2018-03-09 14:47:30 +06:30
phyusin
cfcd067b59 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-03-09 14:27:11 +06:30
phyusin
a21b181f7f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-03-09 14:26:44 +06:30