From 5d3f6745a48ea7a54ed70e8cc946d19ab5e9be1d Mon Sep 17 00:00:00 2001
From: Abhishek Kathuria <abhishekkathuria.oc522@webkul.com>
Date: Tue, 19 Jul 2022 15:14:42 +0530
Subject: [PATCH 1/4] Fixed issue #6371

---
 .../Webkul/Shop/src/Http/Controllers/OnepageController.php | 7 +++++++
 packages/Webkul/Shop/src/Resources/lang/en/app.php         | 1 +
 2 files changed, 8 insertions(+)

diff --git a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
index c472c3dbb..c2e6d85fd 100755
--- a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
@@ -59,6 +59,13 @@ class OnepageController extends Controller
 
         $cart = Cart::getCart();
 
+        if (
+            $cart->applied_cart_rule_ids != ""
+            || $cart->coupon_code == ""
+        ) {
+            session()->flash('success', trans('shop::app.checkout.cart.rule-applied'));
+        }
+
         if (
             (
                 ! auth()->guard('customer')->check()
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index 435b8bcc2..befb5e282 100755
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -543,6 +543,7 @@ return [
             'check-billing-address'     => 'Please check billing address.',
             'specify-shipping-method'   => 'Please specify shipping method.',
             'specify-payment-method'    => 'Please specify payment method.',
+            'rule-applied'              => 'Cart or Catalog rule applied',
         ],
 
         'onepage' => [

From f9f7b37933c6c7e45d871ecf428a145d48b23ca6 Mon Sep 17 00:00:00 2001
From: Abhishek Kathuria <abhishekkathuria.oc522@webkul.com>
Date: Sat, 23 Jul 2022 17:17:10 +0530
Subject: [PATCH 2/4] Fixed issue #6371

---
 .../Webkul/Shop/src/Http/Controllers/OnepageController.php | 7 ++-----
 packages/Webkul/Shop/src/Resources/lang/en/app.php         | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
index c2e6d85fd..7dcd50ae3 100755
--- a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
@@ -58,11 +58,8 @@ class OnepageController extends Controller
         }
 
         $cart = Cart::getCart();
-
-        if (
-            $cart->applied_cart_rule_ids != ""
-            || $cart->coupon_code == ""
-        ) {
+        
+        if ( $cart->applied_cart_rule_ids != "" ) {
             session()->flash('success', trans('shop::app.checkout.cart.rule-applied'));
         }
 
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index befb5e282..b41f80f72 100755
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -543,7 +543,7 @@ return [
             'check-billing-address'     => 'Please check billing address.',
             'specify-shipping-method'   => 'Please specify shipping method.',
             'specify-payment-method'    => 'Please specify payment method.',
-            'rule-applied'              => 'Cart or Catalog rule applied',
+            'rule-applied'              => 'Cart rule applied',
         ],
 
         'onepage' => [

From 6e78c383b5f0d391e0d04c127958565abbd8d189 Mon Sep 17 00:00:00 2001
From: Devansh <68321766+devansh-webkul@users.noreply.github.com>
Date: Sat, 23 Jul 2022 17:30:57 +0530
Subject: [PATCH 3/4] Update OnepageController.php

---
 packages/Webkul/Shop/src/Http/Controllers/OnepageController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
index 7dcd50ae3..0566a1b51 100755
--- a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
@@ -59,7 +59,7 @@ class OnepageController extends Controller
 
         $cart = Cart::getCart();
         
-        if ( $cart->applied_cart_rule_ids != "" ) {
+        if ($cart->applied_cart_rule_ids != "") {
             session()->flash('success', trans('shop::app.checkout.cart.rule-applied'));
         }
 

From 7fb76c507e74f14ca308958d050cb548a6ba3dd4 Mon Sep 17 00:00:00 2001
From: Abhishek Kathuria <abhishekkathuria.oc522@webkul.com>
Date: Sat, 23 Jul 2022 18:13:37 +0530
Subject: [PATCH 4/4] fixed formatting

---
 packages/Webkul/Shop/src/Http/Controllers/OnepageController.php | 2 +-
 packages/Webkul/Shop/src/Resources/lang/ar/app.php              | 1 +
 packages/Webkul/Shop/src/Resources/lang/ben/app.php             | 1 +
 packages/Webkul/Shop/src/Resources/lang/de/app.php              | 1 +
 packages/Webkul/Shop/src/Resources/lang/es/app.php              | 1 +
 packages/Webkul/Shop/src/Resources/lang/fa/app.php              | 1 +
 packages/Webkul/Shop/src/Resources/lang/fr/app.php              | 1 +
 packages/Webkul/Shop/src/Resources/lang/he/app.php              | 1 +
 packages/Webkul/Shop/src/Resources/lang/hi_IN/app.php           | 1 +
 packages/Webkul/Shop/src/Resources/lang/it/app.php              | 1 +
 packages/Webkul/Shop/src/Resources/lang/ja/app.php              | 1 +
 packages/Webkul/Shop/src/Resources/lang/nl/app.php              | 1 +
 packages/Webkul/Shop/src/Resources/lang/pl/app.php              | 1 +
 packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php           | 1 +
 packages/Webkul/Shop/src/Resources/lang/ru/app.php              | 1 +
 packages/Webkul/Shop/src/Resources/lang/sin/app.php             | 1 +
 packages/Webkul/Shop/src/Resources/lang/tr/app.php              | 1 +
 packages/Webkul/Shop/src/Resources/lang/zh_CN/app.php           | 1 +
 18 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
index 7dcd50ae3..0a788d627 100755
--- a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
@@ -59,7 +59,7 @@ class OnepageController extends Controller
 
         $cart = Cart::getCart();
         
-        if ( $cart->applied_cart_rule_ids != "" ) {
+        if ($cart->applied_cart_rule_ids != '') {
             session()->flash('success', trans('shop::app.checkout.cart.rule-applied'));
         }
 
diff --git a/packages/Webkul/Shop/src/Resources/lang/ar/app.php b/packages/Webkul/Shop/src/Resources/lang/ar/app.php
index 3eab31df2..99d8fc4a7 100644
--- a/packages/Webkul/Shop/src/Resources/lang/ar/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/ar/app.php
@@ -544,6 +544,7 @@ return [
             'check-billing-address'     => 'يرجى التحقق من عنوان الفواتير.',
             'specify-shipping-method'   => 'الرجاء تحديد طريقة الشحن.',
             'specify-payment-method'    => 'الرجاء تحديد طريقة الدفع.',
+            'rule-applied'              => 'Cart rule applied',
         ],
 
         'onepage' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/ben/app.php b/packages/Webkul/Shop/src/Resources/lang/ben/app.php
index f23591ff6..a11b779b4 100644
--- a/packages/Webkul/Shop/src/Resources/lang/ben/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/ben/app.php
@@ -538,6 +538,7 @@ return [
             'check-billing-address'     => 'বিলিং ঠিকানা চেক করুন।',
             'specify-shipping-method'   => 'অনুগ্রহ করে শিপিং পদ্ধতি উল্লেখ করুন।',
             'specify-payment-method'    => 'অনুগ্রহ করে অর্থপ্রদানের পদ্ধতি উল্লেখ করুন।',
+            'rule-applied'              => 'Cart rule applied',
         ],
 
         'onepage' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/de/app.php b/packages/Webkul/Shop/src/Resources/lang/de/app.php
index 05862ff4c..fccc9d96e 100755
--- a/packages/Webkul/Shop/src/Resources/lang/de/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/de/app.php
@@ -536,6 +536,7 @@ return [
             'check-billing-address'     => 'Please check billing address.',
             'specify-shipping-method'   => 'Please specify shipping method.',
             'specify-payment-method'    => 'Please specify payment method.',
+            'rule-applied'              => 'Cart rule applied',
         ],
 
         'onepage' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/es/app.php b/packages/Webkul/Shop/src/Resources/lang/es/app.php
index 8ae086a3a..043028f8f 100644
--- a/packages/Webkul/Shop/src/Resources/lang/es/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/es/app.php
@@ -541,6 +541,7 @@ return [
             'check-billing-address'     => 'Please check billing address.',
             'specify-shipping-method'   => 'Please specify shipping method.',
             'specify-payment-method'    => 'Please specify payment method.',
+            'rule-applied'              => 'Cart rule applied',
         ],
 
         'onepage' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/fa/app.php b/packages/Webkul/Shop/src/Resources/lang/fa/app.php
index 847db274a..bf248cc52 100644
--- a/packages/Webkul/Shop/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/fa/app.php
@@ -539,6 +539,7 @@ return [
             'check-billing-address'     => 'Please check billing address.',
             'specify-shipping-method'   => 'Please specify shipping method.',
             'specify-payment-method'    => 'Please specify payment method.',
+            'rule-applied'              => 'Cart rule applied',
         ],
 
         'onepage' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/fr/app.php b/packages/Webkul/Shop/src/Resources/lang/fr/app.php
index 16de4aa10..1982451d9 100755
--- a/packages/Webkul/Shop/src/Resources/lang/fr/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/fr/app.php
@@ -542,6 +542,7 @@ return [
             'check-billing-address'     => 'Please check billing address.',
             'specify-shipping-method'   => 'Please specify shipping method.',
             'specify-payment-method'    => 'Please specify payment method.',
+            'rule-applied'              => 'Cart rule applied',
         ],
 
         'onepage' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/he/app.php b/packages/Webkul/Shop/src/Resources/lang/he/app.php
index 8bbbc2904..782089626 100644
--- a/packages/Webkul/Shop/src/Resources/lang/he/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/he/app.php
@@ -537,6 +537,7 @@ return [
             'check-billing-address'     => 'אנא בדוק את כתובת החיוב.',
             'specify-shipping-method'   => 'אנא ציין את שיטת המשלוח.',
             'specify-payment-method'    => 'אנא ציין אמצעי תשלום.',
+            'rule-applied'              => 'Cart rule applied',
         ],
 
         'onepage' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/hi_IN/app.php b/packages/Webkul/Shop/src/Resources/lang/hi_IN/app.php
index 66ec0c9c9..b23e3923b 100644
--- a/packages/Webkul/Shop/src/Resources/lang/hi_IN/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/hi_IN/app.php
@@ -541,6 +541,7 @@ return [
             'check-billing-address'     => 'कृपया बिलिंग पता जांचें।',
             'specify-shipping-method'   => 'कृपया शिपिंग विधि निर्दिष्ट करें।',
             'specify-payment-method'    => 'कृपया भुगतान विधि निर्दिष्ट करें।',
+            'rule-applied'              => 'Cart rule applied',
         ],
 
         'onepage' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/it/app.php b/packages/Webkul/Shop/src/Resources/lang/it/app.php
index 9372c36cc..7aff25b90 100644
--- a/packages/Webkul/Shop/src/Resources/lang/it/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/it/app.php
@@ -539,6 +539,7 @@ return [
             'check-billing-address'     => 'Please check billing address.',
             'specify-shipping-method'   => 'Please specify shipping method.',
             'specify-payment-method'    => 'Please specify payment method.',
+            'rule-applied'              => 'Cart rule applied',
         ],
 
         'onepage' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/ja/app.php b/packages/Webkul/Shop/src/Resources/lang/ja/app.php
index d79e17d23..7bc7d45af 100644
--- a/packages/Webkul/Shop/src/Resources/lang/ja/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/ja/app.php
@@ -500,6 +500,7 @@ return [
             'check-billing-address'     => 'Please check billing address.',
             'specify-shipping-method'   => 'Please specify shipping method.',
             'specify-payment-method'    => 'Please specify payment method.',
+            'rule-applied'              => 'Cart rule applied',
         ],
 
         'onepage' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/nl/app.php b/packages/Webkul/Shop/src/Resources/lang/nl/app.php
index 8e6b28717..da96cfeee 100644
--- a/packages/Webkul/Shop/src/Resources/lang/nl/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/nl/app.php
@@ -546,6 +546,7 @@ return [
             'check-billing-address'     => 'Please check billing address.',
             'specify-shipping-method'   => 'Please specify shipping method.',
             'specify-payment-method'    => 'Please specify payment method.',
+            'rule-applied'              => 'Cart rule applied',
         ],
 
         'onepage' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/pl/app.php b/packages/Webkul/Shop/src/Resources/lang/pl/app.php
index 10ac475ee..37630e227 100644
--- a/packages/Webkul/Shop/src/Resources/lang/pl/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/pl/app.php
@@ -539,6 +539,7 @@ return [
             'check-billing-address'     => 'Please check billing address.',
             'specify-shipping-method'   => 'Please specify shipping method.',
             'specify-payment-method'    => 'Please specify payment method.',
+            'rule-applied'              => 'Cart rule applied',
         ],
 
         'onepage' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
index 06d21b026..f181b7dc4 100755
--- a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
@@ -532,6 +532,7 @@ return [
             'check-billing-address'     => 'Please check billing address.',
             'specify-shipping-method'   => 'Please specify shipping method.',
             'specify-payment-method'    => 'Please specify payment method.',
+            'rule-applied'              => 'Cart rule applied',
         ],
 
         'onepage' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/ru/app.php b/packages/Webkul/Shop/src/Resources/lang/ru/app.php
index a0a9c50cc..5d7068db1 100644
--- a/packages/Webkul/Shop/src/Resources/lang/ru/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/ru/app.php
@@ -538,6 +538,7 @@ return [
             'check-billing-address'     => 'Пожалуйста, проверьте платежный адрес.',
             'specify-shipping-method'   => '«Укажите способ доставки».',
             'specify-payment-method'    => 'Укажите способ оплаты.',
+            'rule-applied'              => 'Cart rule applied',
         ],
 
         'onepage' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/sin/app.php b/packages/Webkul/Shop/src/Resources/lang/sin/app.php
index 3c9dfc5b3..d4555ca28 100644
--- a/packages/Webkul/Shop/src/Resources/lang/sin/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/sin/app.php
@@ -537,6 +537,7 @@ return [
             'check-billing-address'     => 'කරුණාකර බිල්පත් ලිපිනය පරීක්ෂා කරන්න.',
             'specify-shipping-method'   => 'කරුණාකර නැව්ගත කිරීමේ ක්‍රමය සඳහන් කරන්න.',
             'specify-payment-method'    => 'කරුණාකර ගෙවීමේ ක්‍රමය සඳහන් කරන්න.',
+            'rule-applied'              => 'Cart rule applied',
         ],
 
         'onepage' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/tr/app.php b/packages/Webkul/Shop/src/Resources/lang/tr/app.php
index 80ae5eb4d..958712db0 100644
--- a/packages/Webkul/Shop/src/Resources/lang/tr/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/tr/app.php
@@ -540,6 +540,7 @@ return [
             'check-billing-address'     => 'Please check billing address.',
             'specify-shipping-method'   => 'Please specify shipping method.',
             'specify-payment-method'    => 'Please specify payment method.',
+            'rule-applied'              => 'Cart rule applied',
         ],
 
         'onepage' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/zh_CN/app.php b/packages/Webkul/Shop/src/Resources/lang/zh_CN/app.php
index 7bc15875a..4ec9e950b 100644
--- a/packages/Webkul/Shop/src/Resources/lang/zh_CN/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/zh_CN/app.php
@@ -540,6 +540,7 @@ return [
             'check-billing-address'     => '请检查帐单地址.',
             'specify-shipping-method'   => '请指定送货方式.',
             'specify-payment-method'    => '请指定付款方式.',
+            'rule-applied'              => 'Cart rule applied',
         ],
 
         'onepage' => [