From a7b2925db438b9ee791860290c68afd22a89aacd Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Fri, 13 Sep 2019 11:01:54 +0530 Subject: [PATCH 1/3] Fixed issue #1452 --- .github/ISSUE_TEMPLATE/3_Support_question.md | 1 + packages/Webkul/Admin/src/Resources/lang/en/app.php | 1 + .../src/Resources/views/catalog/categories/create.blade.php | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/3_Support_question.md b/.github/ISSUE_TEMPLATE/3_Support_question.md index 076335070..38ecd44b6 100644 --- a/.github/ISSUE_TEMPLATE/3_Support_question.md +++ b/.github/ISSUE_TEMPLATE/3_Support_question.md @@ -10,4 +10,5 @@ This repository is only for reporting bugs or issues. If you need support, pleas 2. Create support ticket on https://bagisto.uvdesk.com +3. Visit forums to get support from our community (https://forms.bagisto.com) Thanks! \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 250caacd3..b0e9939db 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -31,6 +31,7 @@ return [ 'channel-based' => 'Channel based', 'status' => 'Status', 'select-option' => 'Select option', + 'category' => 'Category', 'common' => [ 'no-result-found' => 'We could not find any records.', diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php index 41f0c11b2..e2fdb0889 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php @@ -20,7 +20,7 @@
From d02c9034709fa7fde8c9b25618aa6d329582ac4f Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Fri, 13 Sep 2019 11:37:00 +0530 Subject: [PATCH 2/3] Support request template --- .github/ISSUE_TEMPLATE/3_Support_question.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ISSUE_TEMPLATE/3_Support_question.md b/.github/ISSUE_TEMPLATE/3_Support_question.md index 38ecd44b6..1532a6e6d 100644 --- a/.github/ISSUE_TEMPLATE/3_Support_question.md +++ b/.github/ISSUE_TEMPLATE/3_Support_question.md @@ -11,4 +11,5 @@ This repository is only for reporting bugs or issues. If you need support, pleas 2. Create support ticket on https://bagisto.uvdesk.com 3. Visit forums to get support from our community (https://forms.bagisto.com) + Thanks! \ No newline at end of file From 685aedf5289b79c497ec666af3036495622e7089 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Fri, 13 Sep 2019 12:22:50 +0530 Subject: [PATCH 3/3] getEligble items in action fixed as its was not working as boolean expression --- packages/Webkul/Discount/src/Actions/Action.php | 2 +- packages/Webkul/Discount/src/Actions/Cart/FixedAmount.php | 2 +- packages/Webkul/Discount/src/Actions/Cart/PercentOfProduct.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/Webkul/Discount/src/Actions/Action.php b/packages/Webkul/Discount/src/Actions/Action.php index 66f95b620..308267c43 100644 --- a/packages/Webkul/Discount/src/Actions/Action.php +++ b/packages/Webkul/Discount/src/Actions/Action.php @@ -26,7 +26,7 @@ abstract class Action foreach ($items as $item) { foreach ($matchingIDs as $matchingID) { - if ($matchingID == $item->child ? $item->child->product_id : $item->product_id) { + if ($matchingID == ($item->child ? $item->child->product_id : $item->product_id)) { $matchedItems->push($item); } } diff --git a/packages/Webkul/Discount/src/Actions/Cart/FixedAmount.php b/packages/Webkul/Discount/src/Actions/Cart/FixedAmount.php index 6e469a10b..4fcfb59c8 100644 --- a/packages/Webkul/Discount/src/Actions/Cart/FixedAmount.php +++ b/packages/Webkul/Discount/src/Actions/Cart/FixedAmount.php @@ -23,7 +23,7 @@ class FixedAmount extends Action foreach ($matchIDs as $matchID) { foreach ($eligibleItems as $item) { - if ($item->child ? $item->child->product_id : $item->product_id == $matchID) { + if (($item->child ? $item->child->product_id : $item->product_id) == $matchID) { return true; } } diff --git a/packages/Webkul/Discount/src/Actions/Cart/PercentOfProduct.php b/packages/Webkul/Discount/src/Actions/Cart/PercentOfProduct.php index 55e601dcd..adfd27a10 100644 --- a/packages/Webkul/Discount/src/Actions/Cart/PercentOfProduct.php +++ b/packages/Webkul/Discount/src/Actions/Cart/PercentOfProduct.php @@ -30,7 +30,7 @@ class PercentOfProduct extends Action foreach ($matchIDs as $matchID) { foreach ($eligibleItems as $item) { - if ($item->child ? $item->child->product_id : $item->product_id == $matchID) { + if (($item->child ? $item->child->product_id : $item->product_id) == $matchID) { return true; } }