Commit Graph

2058 Commits

Author SHA1 Message Date
San Wai Lwin
11bae95ac6 Edit Jcb and master in ShiftSale 2018-05-14 15:58:02 +06:30
Aung Myo
25a138e27e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-05-14 15:54:32 +06:30
Aung Myo
d80a17d987 update payment detal for discount 2018-05-14 15:54:22 +06:30
phyusin
5ddfad7ef8 conflict data remove 2018-05-14 15:46:34 +06:30
phyusin
39dce3424e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-14 15:42:35 +06:30
phyusin
1c8ea30efa change popup ui 2018-05-14 15:42:11 +06:30
San Wai Lwin
8fda04372d Add total waste and spoil in close cashier and Closing Balance မွာ Character ေတြ ရိုက္လို႕ရေန 2018-05-14 15:31:00 +06:30
Aung Myo
57c9cd4d6f updaate loading menu cache 2018-05-14 14:49:21 +06:30
Aung Myo
0b104b021b update add ordr 2018-05-14 13:34:14 +06:30
Aung Myo
4baff5918c update addorder sale item xls 2018-05-14 10:50:04 +06:30
Aung Myo
34141e1284 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-05-14 10:24:43 +06:30
Aung Myo
ea914ec860 update addorder menu 2018-05-14 10:24:30 +06:30
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
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
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
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
San Wai Lwin
33e71f63a3 Edit Dining Queue in CRM 2018-05-11 15:29:06 +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
a2e7ef0e5a change print settings for cloud 2018-05-10 13:59:19 +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