Commit Graph

1234 Commits

Author SHA1 Message Date
phyusin
679d3f838c Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-17 17:52:49 +06:30
phyusin
6890b3a01e check report and change alert for order reservation 2018-05-17 17:51:47 +06:30
Aung Myo
fb5cfc9bd7 Merge branch 'adminbsb_material_ui' 2018-05-17 17:02:04 +06:30
Aung Myo
a3f7e21120 update touch start in print 2018-05-17 17:01:18 +06:30
phyusin
45d50180a1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-17 11:46:37 +06:30
phyusin
234ab26644 check survey issue 2018-05-17 11:43:04 +06:30
Aung Myo
3dc2863c4f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-17 10:44:37 +06:30
Aung Myo
942380afff update discount with junctionpay 2018-05-17 10:40:29 +06:30
San Wai Lwin
9dc6aa289c Edit in Survey form javascript 2018-05-17 10:16:04 +06:30
Aung Myo
e5ea6a90e8 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-05-17 09:29:41 +06:30
Aung Myo
ca360c75d6 update cash in and out for quick service 2018-05-16 18:01:47 +06:30
phyusin
02ff79a68c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-16 17:16:23 +06:30
phyusin
95e94bd0fd Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-16 17:15:43 +06:30
phyusin
fa4c5d075e check menu is_available, survey id and check status with sale items SUM in receipBill 2018-05-16 17:08:00 +06:30
Aung Myo
c386fcfa03 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-16 14:23:36 +06:30
Aung Myo
800ea01f23 bugs fixed 2018-05-16 13:17:52 +06:30
phyusin
086ddd2ab5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-15 18:31:55 +06:30
phyusin
0a290d47d8 check customer back url 2018-05-15 18:30:13 +06:30
Aung Myo
3d99082f2a update conflict payment detail 2018-05-14 17:37:48 +06:30
Aung Myo
08a7c700d7 Merge branch 'r-1804001-01' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-14 17:34:40 +06:30
Aung Myo
7d1498931c update payment detail 2018-05-14 17:30:15 +06:30
Aung Myo
32b81bf16f Merge branch 'sqa-1804-001' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-14 17:27:52 +06:30
Aung Myo
763991ed93 update payment detail 2018-05-14 17:27:37 +06:30
phyusin
185ba2eaed Merge branch 'sqa-1804-001' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-05-14 17:05:23 +06:30
phyusin
cef2249214 change modal close function 2018-05-14 16:38:40 +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
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
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