Commit Graph

1668 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
b0c35baf50 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-09 14:19:13 +06:30
phyusin
9a96f066e9 change print popup function 2018-03-09 14:17:40 +06:30
Aung Myo
1f4ea558c6 Merge branch 'adminbsb_material_ui' 2018-03-09 14:05:39 +06:30
phyusin
9c89bce25d change take away customer for quick service 2018-03-09 14:05:18 +06:30
Aung Myo
8ce14f8c99 update queui chang 2018-03-09 14:04:26 +06:30
phyusin
91e76c7381 check click event for logout 2018-03-09 13:29:24 +06:30
phyusin
21d39349d3 check shift update data 2018-03-09 11:54:35 +06:30
phyusin
d7d5f8afc7 check manager account login error in dashboard 2018-03-09 10:55:28 +06:30
phyusin
7dd0f71894 check and fixed SQA feedback 2018-03-09 09:49:19 +06:30
phyusin
fcc076a19e change route in other payment 2018-03-08 15:16:39 +06:30
phyusin
23be4771fd add function for member card and qr code in payment 2018-03-08 14:57:45 +06:30
phyusin
d9a7e341fa cadd print pdf in payment page 2018-03-08 10:01:54 +06:30
San Wai Lwin
9ec8c4d18c Photo Field in Customer,Employee and Commissionor 2018-03-07 17:50:23 +06:30
phyusin
5d8ba3c416 remove comment in action controller 2018-03-07 15:55:55 +06:30
phyusin
aedd79376f receipt no and print pdf 2018-03-07 15:36:05 +06:30
San Wai Lwin
9f29bbef5a To add image field in shop 2018-03-07 12:41:49 +06:30
San Wai Lwin
6cc2ba5110 To add only Other Payment Name beside SX Resturant 2018-03-06 18:24:19 +06:30
San Wai Lwin
80a0cba537 For Pull from master 2018-03-06 11:19:19 +06:30
San Wai Lwin
1d15c9ed76 Add First active tab action in login_dashboard.html.erb 2018-03-06 10:48:34 +06:30
phyusin
8dbe7e20c4 check dining facility in transactions 2018-03-05 16:58:11 +06:30
phyusin
bd06e80b37 remove conflict data 2018-03-05 16:24:45 +06:30