Commit Graph

1179 Commits

Author SHA1 Message Date
phyusin
f9aa3310fa check ability in booking 2018-03-23 19:37:32 +06:30
phyusin
ebadfff25b add tax in charges 2018-03-22 11:09:12 +06:30
phyusin
7063d937e3 latest Aston req from OPT team 2018-03-21 17:45:55 +06:30
phyusin
0977363518 check tax profile process 2018-03-21 11:53:27 +06:30
phyusin
b77435be48 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-20 18:08:38 +06:30
phyusin
d2da43de75 check print error in payment 2018-03-20 18:08:27 +06:30
Aung Myo
eab5dff7d2 Merge branch 'adminbsb_material_ui' 2018-03-20 17:43:27 +06:30
Aung Myo
fd12af244d update menu import and export 2018-03-20 17:42:19 +06:30
phyusin
f354e32e31 SQA feedback 2018-03-20 15:55:00 +06:30
phyusin
27a3026c2a oqs edit 2018-03-19 19:41:32 +06:30
phyusin
bf84392ef8 SQA feedback 2018-03-19 19:34:34 +06:30
phyusin
25b6458450 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-19 18:41:50 +06:30
Aung Myo
8f2aa994b5 update addorder sytle 2018-03-19 18:22:15 +06:30
Aung Myo
9836e3690e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-03-19 18:14:04 +06:30
Aung Myo
ca817197d9 update menu import and export 2018-03-19 18:13:38 +06:30
Yan
0c61a98150 merge with master 2018-03-19 14:41:40 +06:30
Yan
259778a891 add junctionpay(vaap) 2018-03-19 14:38:55 +06:30
phyusin
a9c8eb4e93 check tax profile 2018-03-19 11:35:43 +06:30
Yan
fa125df355 add junction pay 2018-03-16 18:37:54 +06:30
phyusin
7524ab75ad Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-16 18:07:46 +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
acc5d737fa tax profiles 2018-03-16 10:57:32 +06:30
phyusin
8cea60ec02 SQA urgent issues 2018-03-16 09:42:56 +06:30
Yan
c982da4264 add printer brand and api and type 2018-03-15 18:56:29 +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
a2d1fc06be Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-03-15 10:31:38 +06:30
phyusin
68a27ffcc7 check customer lightbox 2018-03-14 17:42:24 +06:30
phyusin
0edc92d066 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-03-14 09:16:14 +06:30
Aung Myo
69fcdb7e03 Merge branch 'adminbsb_material_ui' 2018-03-13 17:39:36 +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
9f0bef732e update change version v3 for api paymal 2018-03-13 14:23:23 +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
92401ab4f9 merge with old_town_aston req 2018-03-12 12:10:52 +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
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
b3ec34aa64 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-09 09:49:33 +06:30
phyusin
7dd0f71894 check and fixed SQA feedback 2018-03-09 09:49:19 +06:30
Aung Myo
798bf8d4a8 Merge branch 'adminbsb_material_ui' 2018-03-08 18:09:14 +06:30
Aung Myo
3de5c173b5 update remove sidekiq 2018-03-08 18:08:36 +06:30