Commit Graph

2272 Commits

Author SHA1 Message Date
Aung Myo
ddeb2f2582 update production commission 2018-05-23 14:53:11 +06:30
San Wai Lwin
40bce7f598 Add Void button in Transaction/sales 2018-05-23 13:57:45 +06:30
San Wai Lwin
dbfc00435b pull from master 23.5.2018 2018-05-23 09:36:49 +06:30
phyusin
95684aa942 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-22 19:20:55 +06:30
phyusin
ec50fbdac2 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-22 19:20:16 +06:30
phyusin
6ecab8074e change dashboard query 2018-05-22 19:19:46 +06:30
Aung Myo
9e56ece056 Merge branch 'adminbsb_material_ui' 2018-05-22 16:55:02 +06:30
Aung Myo
ec4a0a3f81 update employee active , addorder view 2018-05-22 16:54:18 +06:30
phyusin
70b7ec784f add base url for cloud mode 2018-05-22 14:15:31 +06:30
San Wai Lwin
f1733d9f06 Pull from master 2018-05-22 13:26:23 +06:30
San Wai Lwin
574f320dfd Export excel in Survey Report 2018-05-22 11:37:08 +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
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
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
San Wai Lwin
c1525be826 Pull from master 2018-05-18 16:26:03 +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
95faa6fdb4 update edit controller for update qty without assigne items 2018-05-16 13:54:14 +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
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
086ddd2ab5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-15 18:31:55 +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
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
835f4aded1 added product sale for sale item report 2018-05-15 11:25: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