Commit Graph

1708 Commits

Author SHA1 Message Date
San Wai Lwin
8f9d5665ca Condition in shop 2018-06-01 17:18:31 +06:30
San Wai Lwin
794ff7c26f pull from master 2018-06-01 16:43:13 +06:30
San Wai Lwin
e0785c5cad Add Order Audio 2018-06-01 16:41:22 +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
3527ef17d9 Merge branch 'adminbsb_material_ui' 2018-05-29 10:44:49 +06:30
Aung Myo
a062c5574a update sale receipt no repoet 2018-05-29 10:39:09 +06:30
phyusin
bf9bb1c58a transactions for order reservation and api for tax profile 2018-05-28 18:08:30 +06:30
phyusin
c4cefb05ae conflict data 2018-05-28 10:46:04 +06:30
EikhantMon
7ddbd7d78a conflit modified changes 2018-05-25 17:44:36 +06:30
San Wai Lwin
3c8e3c5326 Add Order Set Pdf 2018-05-25 17:06:45 +06:30
EikhantMon
1ae55f1af2 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into doemal_ordering 2018-05-25 16:23:42 +06:30
EikhantMon
6c26dc4d5a item_slim_customise_pdf 2018-05-25 16:23:24 +06:30
San Wai Lwin
578c14ccc3 Pull from master 2018-05-25 16:22:30 +06:30
San Wai Lwin
f906134fbf Remove lookup settings in Order Pdf 2018-05-25 16:06:10 +06:30
phyusin
b3e0e7e453 check survey params 2018-05-25 15:01:15 +06:30
phyusin
5feea91584 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-25 13:27:18 +06:30
phyusin
49453a22c0 change tax profile overide 2018-05-25 13:26:55 +06:30
Aung Myo
7f6b0e0bdf update order api 2018-05-25 13:16:41 +06:30
Aung Myo
b7c6614537 upadte api order create process order 2018-05-25 13:14:57 +06:30
San Wai Lwin
d910c4078b Add Order item & summary customise font pdf 2018-05-24 17:02:54 +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
phyusin
ed8f9978b6 remove paginate in surveys 2018-05-23 17:55:17 +06:30
Aung Myo
0ec4b6cb12 update addorder 2018-05-23 17:50:13 +06:30
phyusin
3a93830c94 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-23 17:41:35 +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
phyusin
917b4e0eed Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-23 17:00:34 +06:30
phyusin
85b997ddbe change receipt no report ui and add sale taxes for dining charges 2018-05-23 16:57:41 +06:30
Aung Myo
6236e06558 update commitssion 2018-05-23 16:33:20 +06:30
San Wai Lwin
512aad06bc Pull from master 2018-05-23 15:50:14 +06:30
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