Merge pull request #6573 from akathuria289/issue_fixed_6371

Fixed issue #6371
2022-07-23 18:26:22 +05:30 · 2022-07-23 18:26:22 +05:30 · 4cbed4a4db
parent 95e284e0d7 03f67eb95a
commit 4cbed4a4db
19 changed files with 22 additions and 0 deletions
--- a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
@ -58,6 +58,10 @@ class OnepageController extends Controller
        }

        $cart = Cart::getCart();
+        
+        if ($cart->applied_cart_rule_ids != '') {
+            session()->flash('success', trans('shop::app.checkout.cart.rule-applied'));
+        }

        if (
            (
--- 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' => [
--- 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' => [
--- 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' => [
--- 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 rule applied',
        ],

        'onepage' => [
--- 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' => [
--- 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' => [
--- 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' => [
--- 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' => [
--- 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' => [
--- 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' => [
--- 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' => [
--- 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' => [
--- 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' => [
--- 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' => [
--- 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' => [
--- 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' => [
--- 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' => [
--- 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' => [