Commit Graph

3581 Commits

Author SHA1 Message Date
phyusin
6890b3a01e check report and change alert for order reservation 2018-05-17 17:51:47 +06:30
phyusin
a276646a03 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-17 16:42:16 +06:30
phyusin
3838ee29e0 change func: for receipt bill 2018-05-17 16:39:59 +06:30
phyusin
1c366839db Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-17 14:09:10 +06:30
phyusin
34fd712f5e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-17 14:08:25 +06:30
phyusin
aede22e976 check rounding adj in all_void 2018-05-17 14:07:19 +06:30
phyusin
7b97135645 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-17 11:43:38 +06:30
phyusin
234ab26644 check survey issue 2018-05-17 11:43:04 +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
942380afff update discount with junctionpay 2018-05-17 10:40:29 +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
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
29434f2df9 update void paymal search 2018-05-16 14:20:20 +06:30
Aung Myo
95faa6fdb4 update edit controller for update qty without assigne items 2018-05-16 13:54:14 +06:30
Aung Myo
695461d2c5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-05-16 13:18:04 +06:30
Aung Myo
800ea01f23 bugs fixed 2018-05-16 13:17:52 +06:30
phyusin
e679160e41 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-16 09:53:42 +06:30
phyusin
486694a5e4 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-16 09:50:57 +06:30
phyusin
d6a3c949f0 comment remark for order reservation 2018-05-16 09:49:49 +06:30
Aung Myo
7c72d4b9a8 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-05-16 09:23:33 +06:30
Aung Myo
c08c72d0cb update cash in and out for shift 2018-05-16 09:23:10 +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
1eb6cd5bcf Merge branch 'adminbsb_material_ui' 2018-05-15 17:29:35 +06:30
Aung Myo
0680fa4090 update daily sale and receipt report 2018-05-15 17:28:47 +06:30
Aung Myo
e09fab1fed update migrate for checksum 2018-05-15 14:41:24 +06:30
Yan
9e6ac7811a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-05-15 13:19:52 +06:30
Yan
8acfe654eb update menu imp/exp 2018-05-15 13:19:27 +06:30
Yan
c7a33e5322 update menu imp/exp 2018-05-15 11:53:48 +06:30
Aung Myo
e2206508a7 open action controller 2018-05-15 11:27:49 +06:30
Aung Myo
dd5b0a76c5 Merge branch 'adminbsb_material_ui' 2018-05-15 11:26:51 +06:30
Aung Myo
835f4aded1 added product sale for sale item report 2018-05-15 11:25:10 +06:30
phyusin
eaa013c10f change status to doemal 2018-05-15 10:28:05 +06:30
phyusin
6b3c5e5fcf Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-15 09:58:13 +06:30
phyusin
e6883fbf5f Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-14 18:15:13 +06:30
phyusin
188976d2bf Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-14 18:14:45 +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