Commit Graph

1051 Commits

Author SHA1 Message Date
phyusin
c1961720c8 change action cable issue for quick service 2018-05-31 10:29:38 +06:30
phyusin
a9070ebe0d add override sale tax for member discount 2018-05-30 10:20:36 +06:30
phyusin
776479a74e remove conflict data 2018-05-29 14:32:37 +06:30
phyusin
930e8d29d5 add new payment for aston request 2018-05-29 14:29:38 +06:30
Aung Myo
a062c5574a update sale receipt no repoet 2018-05-29 10:39:09 +06:30
phyusin
49453a22c0 change tax profile overide 2018-05-25 13:26:55 +06:30
phyusin
445f98cf7c payment tax UI 2018-05-24 15:30:44 +06:30
Aung Myo
dbdeb07f18 Merge branch 'adminbsb_material_ui' 2018-05-24 14:09:42 +06:30
Aung Myo
6d6d90050f update commission && report 2018-05-24 14:03:49 +06:30
phyusin
0970b0022e check shift open or not 2018-05-24 11:36:35 +06:30
Aung Myo
cf5c5bb4fa Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-05-23 17:59:30 +06:30
Aung Myo
0ec4b6cb12 update addorder 2018-05-23 17:50:13 +06:30
phyusin
770ef87678 remove action cable comment 2018-05-23 17:28:41 +06:30
phyusin
992914ee46 check multiple items in split bill 2018-05-23 17:23:38 +06:30
Aung Myo
6236e06558 update commitssion 2018-05-23 16:33:20 +06:30
Aung Myo
ddeb2f2582 update production commission 2018-05-23 14:53:11 +06:30
phyusin
6ecab8074e change dashboard query 2018-05-22 19:19:46 +06:30
Aung Myo
1b5f657d0c update commission 2018-05-22 10:53:06 +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
Aung Myo
7e8b69aa7c update action cable and other bugs 2018-05-21 13:00:55 +06:30
phyusin
75d7999f76 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-18 18:17:36 +06:30
Aung Myo
e722ab88e9 Merge branch 'adminbsb_material_ui' 2018-05-18 17:38:17 +06:30
Aung Myo
d7992cd4b8 update access code for void foc and edit 2018-05-18 16:57:34 +06:30
Yan
0d2f609b07 ac test 2018-05-18 14:38:31 +06:30
phyusin
cf4978fca0 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-17 14:12:37 +06:30
phyusin
aede22e976 check rounding adj in all_void 2018-05-17 14:07:19 +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
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
29434f2df9 update void paymal search 2018-05-16 14:20:20 +06:30
Aung Myo
800ea01f23 bugs fixed 2018-05-16 13:17:52 +06:30
phyusin
33d5a0ad80 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-16 09:57:44 +06:30
Aung Myo
c08c72d0cb update cash in and out for shift 2018-05-16 09:23:10 +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
San Wai Lwin
8fda04372d Add total waste and spoil in close cashier and Closing Balance မွာ Character ေတြ ရိုက္လို႕ရေန 2018-05-14 15:31:00 +06:30
San Wai Lwin
49319d80cc Pull from master 2018-05-14 11:38:39 +06:30
phyusin
6e5064cf9f remove confilct data 2018-05-14 10:17:26 +06:30
phyusin
0a07b3479d check shop code for new order 2018-05-11 17:03:53 +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
Aung Myo
5e0bdf1e36 update bugs 2018-05-11 09:57:26 +06:30