Commit Graph

3541 Commits

Author SHA1 Message Date
Aung Myo
835f4aded1 added product sale for sale item report 2018-05-15 11:25:10 +06:30
phyusin
e6883fbf5f Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-14 18:15:13 +06:30
phyusin
af9efb5fa0 hide popup modal in order reservation 2018-05-14 18:14:23 +06:30
Aung Myo
7d1498931c update payment detail 2018-05-14 17:30:15 +06:30
phyusin
522ccae378 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-14 16:39:24 +06:30
phyusin
c86696c2c9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-14 16:38:59 +06:30
phyusin
cef2249214 change modal close function 2018-05-14 16:38:40 +06:30
phyusin
25d3f335a0 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-14 16:01:09 +06:30
phyusin
6004b894ec Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-14 16:00:27 +06:30
phyusin
5101d7c103 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-14 15:59:03 +06:30
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
83a068f1a3 change waste to spoile in close cashier 2018-05-14 15:53: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
e264e7a32b update addorder js and css 2018-05-14 15:23:15 +06:30
Aung Myo
57c9cd4d6f updaate loading menu cache 2018-05-14 14:49:21 +06:30
Aung Myo
fdf4c6b95e Merge branch 'adminbsb_material_ui' 2018-05-14 13:35:20 +06:30
Aung Myo
0b104b021b update add ordr 2018-05-14 13:34:14 +06:30
Yan
568a94182a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-05-14 11:47:31 +06:30
Yan
3c1ed265f5 update menu import export 2018-05-14 11:47:06 +06:30
San Wai Lwin
49319d80cc Pull from master 2018-05-14 11:38:39 +06:30
phyusin
aeba71b646 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-14 11:35:20 +06:30
phyusin
cc0178eb65 check code in mp3 file 2018-05-14 11:34:33 +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
9900ea385a change token,action,secrets 2018-05-12 16:33:28 +06:30
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