Commit Graph

3229 Commits

Author SHA1 Message Date
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
phyusin
f7de959c78 add receipt in .gitignore 2018-03-09 14:23:48 +06:30
phyusin
01556b915e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes 2018-03-09 14:20:20 +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
df76988f01 add seed_generator current and next data in clear:data 2018-03-09 10:21:40 +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
Aung Myo
1503462cea update sym file for cusotmer and taxprofiles 2018-03-08 16:26:50 +06:30
Aung Myo
6fd58ebb94 update conflix addorder 2018-03-08 15:38:52 +06:30
Aung Myo
3fcdbfb8df update receipt ranke file 2018-03-08 15:30:18 +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
2942ceab71 remove receipts files 2018-03-07 15:37:47 +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
5cc369114b Remove config 2018-03-06 18:31:09 +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
Aung Myo
d8256a93f6 Merge branch 'adminbsb_material_ui' 2018-03-05 17:02:09 +06:30
phyusin
8dbe7e20c4 check dining facility in transactions 2018-03-05 16:58:11 +06:30
phyusin
85431d09c7 comment employee crete in seed 2018-03-05 16:40:16 +06:30
Aung Myo
981aef32ba update license check offline 2018-03-05 16:35:50 +06:30
phyusin
ebf01a5d95 change action 2018-03-05 16:28:34 +06:30
phyusin
779ef9a4ba remove conflict data 2018-03-05 16:26:19 +06:30
phyusin
bd06e80b37 remove conflict data 2018-03-05 16:24:45 +06:30