Commit Graph

3510 Commits

Author SHA1 Message Date
phyusin
1909a73fe0 add docker data 2018-05-12 16:19:18 +06:30
phyusin
050d3379c0 check api issue 2018-05-12 15:20:57 +06:30
phyusin
8457ebc08e add space 2018-05-12 13:34:02 +06:30
phyusin
577ceb73cd check shop code 2018-05-12 12:28:59 +06:30
phyusin
d77d774a6f check token 2018-05-12 12:25:11 +06:30
phyusin
e2a4d456f1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-12 11:38:59 +06:30
phyusin
c7c32ffff4 change order reservation 2018-05-12 11:38:43 +06:30
Aung Myo
79625d7f91 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-05-11 18:25:23 +06:30
Aung Myo
8894bce132 update survey min 1 2018-05-11 18:25:07 +06:30
phyusin
34e2bdb0d1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-11 17:53:15 +06:30
phyusin
7d45e6ca81 check token for cloud 2018-05-11 17:52:52 +06:30
Aung Myo
cb974ef558 Merge branch 'adminbsb_material_ui' 2018-05-11 17:32:44 +06:30
Aung Myo
6ee5e9f1af update daily sale for totaltax 2018-05-11 17:31:57 +06:30
phyusin
c65bf1c163 check shop code in order reservation 2018-05-11 17:14:42 +06:30
phyusin
e618cd6e6d Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-11 17:04:33 +06:30
phyusin
efbf1fe619 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-11 17:04:15 +06:30
phyusin
0a07b3479d check shop code for new order 2018-05-11 17:03:53 +06:30
San Wai Lwin
bcf66d6c30 Edit with the photo without shop_code 2018-05-11 16:28:40 +06:30
Aung Myo
9c1f29aa19 Merge branch 'adminbsb_material_ui' 2018-05-11 16:07:16 +06:30
Aung Myo
8dc789e546 update void in room tab 2018-05-11 16:06:32 +06:30
phyusin
a896617a4d Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-11 15:31:42 +06:30
San Wai Lwin
33e71f63a3 Edit Dining Queue in CRM 2018-05-11 15:29:06 +06:30
Aung Myo
329af02a0a add cable .yml 2018-05-11 14:36:40 +06:30
Aung Myo
800fa41abb Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes 2018-05-11 14:09:56 +06:30
Aung Myo
c970a6fb47 Merge branch 'adminbsb_material_ui' 2018-05-11 14:07:42 +06:30
Aung Myo
d141947eb0 update oqs and addorder qty 0 2018-05-11 14:06:23 +06:30
phyusin
baac2c33ea move customer func: from doemal 2018-05-11 13:45:04 +06:30
phyusin
a76f9068da check nil for cus info 2018-05-11 13:39:32 +06:30
phyusin
9daf8235a7 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes 2018-05-11 13:06:13 +06:30
phyusin
dcd654a885 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes 2018-05-11 13:04:57 +06:30
phyusin
ae5ced251b remove conflict 2018-05-11 12:01:27 +06:30
phyusin
760c7685df fixed some issue 2018-05-11 11:59:30 +06:30
Aung Myo
87913956f1 fixed first bill with discount 2018-05-11 11:54:53 +06:30
San Wai Lwin
12f79ded6d Edit Customer form 2018-05-11 11:40:27 +06:30
Aung Myo
5e0bdf1e36 update bugs 2018-05-11 09:57:26 +06:30
Aung Myo
80f353ba3c update void edit with access code 2018-05-10 16:31:39 +06:30
phyusin
39d4a6ae48 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-10 15:51:00 +06:30
phyusin
9fe77bb283 chagne notification modal 2018-05-10 15:50:46 +06:30
Aung Myo
f239a3f87c update pdf view height 2018-05-10 15:40:56 +06:30
San Wai Lwin
f52537b509 Edit Photo name in commissioner,customers,employee,menu,product and shop 2018-05-10 15:08:57 +06:30
phyusin
70b3e88b0e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-10 14:34:26 +06:30
Aung Myo
7aada60807 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-10 14:33:51 +06:30
Aung Myo
6f8cae303e update route conflict for addorder 2018-05-10 14:31:24 +06:30
Aung Myo
7b5c04c797 update add order cache menu 2018-05-10 14:28:28 +06:30
phyusin
d7d3765875 add sale_status for waste and spoile 2018-05-10 14:22:37 +06:30
phyusin
a2e7ef0e5a change print settings for cloud 2018-05-10 13:59:19 +06:30
phyusin
1e24eedac0 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-10 12:49:30 +06:30
phyusin
d1baaaa78f remove comment 2018-05-10 12:48:00 +06:30
phyusin
0d89cf0291 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-10 12:40:11 +06:30
phyusin
e9c661f98b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-10 12:37:29 +06:30