From b0891492680ab333f69557e4fd7e3ee15ad1e466 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Thu, 12 Sep 2019 16:21:03 +0530 Subject: [PATCH 1/6] Fixed issue #1428 --- .../src/Resources/views/catalog/categories/create.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 374c1efb3..41f0c11b2 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 6dfa36871e295fb219ea72fb244583317883a9e1 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Fri, 13 Sep 2019 00:37:58 +0530 Subject: [PATCH 2/6] github template added for support, bugs/issues, feature and security vulnerabilities. --- ISSUE_TEMPLATE.md => .github/1_Bug_report.md | 11 +++- .github/2_Feature_request.md | 12 ++++ .github/3_Support_question.md | 13 ++++ .github/4_Security_vulnerabilities.md | 9 +++ FEATURE_REQUEST_TEMPLATE.md | 66 -------------------- README.md | 5 +- SUPPORT_TEMPLATE.md | 48 -------------- 7 files changed, 46 insertions(+), 118 deletions(-) rename ISSUE_TEMPLATE.md => .github/1_Bug_report.md (56%) create mode 100644 .github/2_Feature_request.md create mode 100644 .github/3_Support_question.md create mode 100644 .github/4_Security_vulnerabilities.md delete mode 100644 FEATURE_REQUEST_TEMPLATE.md delete mode 100644 SUPPORT_TEMPLATE.md diff --git a/ISSUE_TEMPLATE.md b/.github/1_Bug_report.md similarity index 56% rename from ISSUE_TEMPLATE.md rename to .github/1_Bug_report.md index 8dc67d40e..a6b049288 100644 --- a/ISSUE_TEMPLATE.md +++ b/.github/1_Bug_report.md @@ -1,12 +1,17 @@ +--- +name: "🐛 Bug Report" +about: 'Report a general library issue.' +--- + # Bug report ### Title - **Title is a vital part of bug report for developer and triager to quickly identify a unique issue.** + **Just a quick sentence to brief your trouble with Bagisto or something associated with it.** - A well written title should contain a clear, brief explanation of the issue, making emphasis on the most important points. + Please be calm, short and emaphasize on points. ### Issue Description - **Bug description helps the developer to understand the bug.It describes the problem encountered.** + **Description helps the developers to understand the bug. It describes the problem encountered or some after effect of some kind.** ### Preconditions **Please provide as detailed information about your environment as possible.** diff --git a/.github/2_Feature_request.md b/.github/2_Feature_request.md new file mode 100644 index 000000000..489c97281 --- /dev/null +++ b/.github/2_Feature_request.md @@ -0,0 +1,12 @@ +--- +name: "💡 Feature Request" +about: 'For ideas or feature requests, please make a pull request, or open an issue' +--- + +This repository is only for reporting bugs or issues. If you need support, please use the forums: + +- https://forums.bagisto.com/ + +Alternatively, you may use Facebook (https://www.facebook.com/groups/bagisto/). + +We promise that more channels are coming soon!!! diff --git a/.github/3_Support_question.md b/.github/3_Support_question.md new file mode 100644 index 000000000..076335070 --- /dev/null +++ b/.github/3_Support_question.md @@ -0,0 +1,13 @@ +--- +name: "🧐 Support Question" +about: 'This repository is only for reporting bugs or problems. If you need help, see: + https://github.com/bagisto/bagisto#documentation' +--- + +This repository is only for reporting bugs or issues. If you need support, please use: + +1. Write an email - mailto:support@bagisto.com + +2. Create support ticket on https://bagisto.uvdesk.com + +Thanks! \ No newline at end of file diff --git a/.github/4_Security_vulnerabilities.md b/.github/4_Security_vulnerabilities.md new file mode 100644 index 000000000..f0b6fe77c --- /dev/null +++ b/.github/4_Security_vulnerabilities.md @@ -0,0 +1,9 @@ +--- +name: "🔒 Security Vulnerabilities" +about: 'For reporting security-related issues, see: https://github.com/bagito/bagisto#security-vulnerabilities' +--- + +PLEASE DON'T DISCLOSE SECURITY-RELATED ISSUES PUBLICLY, SEE BELOW. + +If you have security vulnerability to address related to Bagisto then please write a mail to us: +**support@bagisto.com** \ No newline at end of file diff --git a/FEATURE_REQUEST_TEMPLATE.md b/FEATURE_REQUEST_TEMPLATE.md deleted file mode 100644 index 72ac44d98..000000000 --- a/FEATURE_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,66 +0,0 @@ - - - Feature - - - - -
-

Title

-
-

- - A well written title should contain a clear, brief explanation of the Feature, making emphasis on the most important points. -

-
- -
-

Preconditions

-
-

Please provide as detailed information about your environment as possible.

-
    -
  • framework Version:
    • -
  • Commit id:
    • -
-
- -
-

Description

-
-

Description helps the developer to understand the Feature. -

-
- -
-

Steps to reproduce

-
-

It is important to provide a set of clear steps to that location where feature need to be added. If relevant please include code samples.

-
    -
  1. step1
    2. -
  2. step2
    3. -
-
- - - - - - - - - - - - - - - - - - - diff --git a/README.md b/README.md index 26df06e31..38f99db58 100755 --- a/README.md +++ b/README.md @@ -16,7 +16,8 @@ 3. [Requirements](#requirements) 4. [Installation & Configuration](#installation-and-configuration) 5. [License](#license) -6. [Miscellaneous](#miscellaneous) +6. [Security Vulnerabilities](#security-vulnerabilities) +7. [Miscellaneous](#miscellaneous) ### Introduction @@ -176,6 +177,8 @@ password:admin123 ### License Bagisto is a truly opensource E-Commerce framework which will always be free under the [MIT License](https://github.com/bagisto/bagisto/blob/master/LICENSE). +### Security Vulnerabilities +Please don't disclose security vulnerabilities publicly. If you find any security vulnerability in Bagisto then please write us mail: mailto:support@bagisto.com. ### Miscellaneous diff --git a/SUPPORT_TEMPLATE.md b/SUPPORT_TEMPLATE.md deleted file mode 100644 index f692a9498..000000000 --- a/SUPPORT_TEMPLATE.md +++ /dev/null @@ -1,48 +0,0 @@ - - - Support - - - - -
-

Title

-
-

- Title is a vital part of bug report for developer and triager to quickly identify a unique issue. -
- A well written title should contain a clear, brief explanation of the issue, making emphasis on the most important points. -

-
- -
-

Preconditions

-
-

Please provide as detailed information about your environment as possible.

-
    -
  • framework Version:
    • -
  • Commit id:
    • -
-
- -
-

Description

-
-

Description helps the developer to understand the exact scenario.It describes the problem encountered.

-
- -
-

Steps to reproduce

-
-

It is important to provide a set of clear steps to reproduce that scenario. If relevant please include code samples.

-
    -
  1. step1
    2. -
  2. step2
    3. -
-
- From fa1af6f8e018e770ed6bae244fdfca8ae5e6fd60 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Fri, 13 Sep 2019 00:40:42 +0530 Subject: [PATCH 3/6] Templates moved in ISSUE_TEMPLATE directory --- .github/{ => ISSUE_TEMPLATE}/1_Bug_report.md | 0 .github/{ => ISSUE_TEMPLATE}/2_Feature_request.md | 0 .github/{ => ISSUE_TEMPLATE}/3_Support_question.md | 0 .github/{ => ISSUE_TEMPLATE}/4_Security_vulnerabilities.md | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename .github/{ => ISSUE_TEMPLATE}/1_Bug_report.md (100%) rename .github/{ => ISSUE_TEMPLATE}/2_Feature_request.md (100%) rename .github/{ => ISSUE_TEMPLATE}/3_Support_question.md (100%) rename .github/{ => ISSUE_TEMPLATE}/4_Security_vulnerabilities.md (100%) diff --git a/.github/1_Bug_report.md b/.github/ISSUE_TEMPLATE/1_Bug_report.md similarity index 100% rename from .github/1_Bug_report.md rename to .github/ISSUE_TEMPLATE/1_Bug_report.md diff --git a/.github/2_Feature_request.md b/.github/ISSUE_TEMPLATE/2_Feature_request.md similarity index 100% rename from .github/2_Feature_request.md rename to .github/ISSUE_TEMPLATE/2_Feature_request.md diff --git a/.github/3_Support_question.md b/.github/ISSUE_TEMPLATE/3_Support_question.md similarity index 100% rename from .github/3_Support_question.md rename to .github/ISSUE_TEMPLATE/3_Support_question.md diff --git a/.github/4_Security_vulnerabilities.md b/.github/ISSUE_TEMPLATE/4_Security_vulnerabilities.md similarity index 100% rename from .github/4_Security_vulnerabilities.md rename to .github/ISSUE_TEMPLATE/4_Security_vulnerabilities.md From a7b2925db438b9ee791860290c68afd22a89aacd Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Fri, 13 Sep 2019 11:01:54 +0530 Subject: [PATCH 4/6] 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 5/6] 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 6/6] 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; } }