Commit Graph

1049 Commits

Author SHA1 Message Date
phyusin
6e5064cf9f remove confilct data 2018-05-14 10:17:26 +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
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
7d45e6ca81 check token for cloud 2018-05-11 17:52:52 +06:30
phyusin
c65bf1c163 check shop code in order reservation 2018-05-11 17:14:42 +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
Aung Myo
8dc789e546 update void in room tab 2018-05-11 16:06: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
ae5ced251b remove conflict 2018-05-11 12:01:27 +06:30
phyusin
760c7685df fixed some issue 2018-05-11 11:59:30 +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
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
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
9c4b8c0fef add void modal function 2018-05-10 13:31:01 +06:30
phyusin
abbff492e8 add API for order reservation 2018-05-10 12:37:17 +06:30
phyusin
4d2e872c7d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-10 09:13:29 +06:30
phyusin
0127b23e93 change order reservation data 2018-05-09 19:10:11 +06:30
Aung Myo
1a56109d66 update conflict with addorderjs 2018-05-09 19:01:38 +06:30
Aung Myo
5d870df7f5 update addorder cache 2018-05-09 18:59:37 +06:30
Aung Myo
efa5350883 cache menu 2018-05-09 16:46:54 +06:30
phyusin
0f1ce09416 change customer and sale tax for takeaway 2018-05-09 15:40:13 +06:30
phyusin
fe306dc26b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-09 15:07:29 +06:30
phyusin
58513dc08a change report 2018-05-09 15:07:19 +06:30
Aung Myo
c06cc1be6d update access code for admin,manager and superviso 2018-05-09 14:06:43 +06:30
Aung Myo
2cdb18d338 menu cache for menu category 2018-05-09 13:56:37 +06:30
phyusin
4faee913f3 change order reservation -not finished 2018-05-09 11:28:01 +06:30
phyusin
313f1b2909 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-08 17:28:19 +06:30
phyusin
1716d14df3 change order reservation 2018-05-08 17:28:09 +06:30
Aung Myo
42a15d3023 update cache menu 2018-05-08 15:54:15 +06:30
Aung Myo
2d73e63e7b update cache menu 2018-05-08 15:47:11 +06:30
phyusin
391cc19117 check order reservation 2018-05-07 13:32:58 +06:30
Aung Myo
be9218dd79 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-05-04 18:10:14 +06:30
Aung Myo
d0b14cf81b update access code in spereat view 2018-05-04 18:10:00 +06:30
San Wai Lwin
bb4c004406 pull from master 2018-05-04 18:00:44 +06:30
phyusin
6eecd2bdb7 change rounding adj: error 2018-05-04 14:59:15 +06:30
phyusin
fcbd240e5e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-04 14:30:28 +06:30
phyusin
621596690e change UI in order reservation 2018-05-04 14:30:17 +06:30
Aung Myo
4a9f73f006 Merge branch 'adminbsb_material_ui' 2018-05-04 14:19:55 +06:30
Aung Myo
727070a1b8 update void access code 2018-05-04 14:19:17 +06:30
phyusin
0ef0c859b9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-04 14:10:08 +06:30