Commit Graph

2007 Commits

Author SHA1 Message Date
phyusin
aa3da073bd back btn for pending 2018-05-22 10:59:56 +06:30
Aung Myo
80e9f4fc36 update menu json for unscope4 2018-05-21 15:59:42 +06:30
Aung Myo
f5ad727c08 update menu cateogry and myanmar font in xls 2018-05-21 15:30:15 +06:30
Aung Myo
38e89674e9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-21 13:05:09 +06:30
phyusin
ea01290a19 remove back btn 2018-05-21 12:39:34 +06:30
San Wai Lwin
cfc672dc31 Pull from master 2018-05-21 11:12:12 +06:30
phyusin
75d7999f76 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-18 18:17:36 +06:30
phyusin
5316f23ba7 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-18 18:02:40 +06:30
phyusin
e1bb01c029 change dashboard query and report 2018-05-18 18:01:44 +06:30
San Wai Lwin
fa160c8292 Pull from master 2018-05-18 09:49:47 +06:30
phyusin
fbb80c3f01 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-17 17:53:29 +06:30
phyusin
679d3f838c Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-17 17:52:49 +06:30
phyusin
e609e33246 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-17 17:52:14 +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
phyusin
01a545b9ec Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-17 11:23:23 +06:30
phyusin
b44d2845ef Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-17 11:22:38 +06:30
phyusin
b7c65dd0ca Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-17 11:22:01 +06:30
phyusin
62dec82bd8 change dailysale report and check tax in add to existing 2018-05-17 11:21:38 +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
dc23df673f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-16 17:15:17 +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
phyusin
a72ae34a46 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-15 17:36:05 +06:30
phyusin
de05c4423a check unclose shift in filter 2018-05-15 17:35:10 +06:30
Aung Myo
0680fa4090 update daily sale and receipt report 2018-05-15 17:28:47 +06:30
Aung Myo
835f4aded1 added product sale for sale item report 2018-05-15 11:25:10 +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
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