From b6e0621e9e4720572427771633f877146bdc03b7 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Fri, 12 Feb 2021 19:14:53 +0530
Subject: [PATCH 1/6] For Add And Edit Product Index Route Added

---
 .../Admin/src/Resources/views/catalog/products/create.blade.php | 2 +-
 .../Admin/src/Resources/views/catalog/products/edit.blade.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php
index b68dd27e1..d419a77b7 100755
--- a/packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php
@@ -26,7 +26,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.catalog.products.index') }}'"></i>
 
                         {{ __('admin::app.catalog.products.add-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php
index 21a9385d0..71daa0b7b 100755
--- a/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php
@@ -26,7 +26,7 @@
                 <div class="page-title">
                     <h1>
                         <i class="icon angle-left-icon back-link"
-                           onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                           onclick="window.location = '{{ route('admin.catalog.products.index') }}'"></i>
 
                         {{ __('admin::app.catalog.products.edit-title') }}
                     </h1>

From d66438289a29a74a8b2e2b4ca3c5d62040b5b447 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Fri, 12 Feb 2021 20:08:35 +0530
Subject: [PATCH 2/6] Core Config Check Added

---
 packages/Webkul/Core/src/Core.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/Webkul/Core/src/Core.php b/packages/Webkul/Core/src/Core.php
index 16c174c1d..bb2a03f3e 100755
--- a/packages/Webkul/Core/src/Core.php
+++ b/packages/Webkul/Core/src/Core.php
@@ -709,6 +709,12 @@ class Core
 
         if (null === $locale) {
             $locale = request()->get('locale') ?: app()->getLocale();
+
+            $channelLocales = $this->channelRepository->findOneByField('code', $channel)->locales;
+
+            if (! $channelLocales->contains('code', $locale)) {
+                $locale = config('app.fallback_locale');
+            }
         }
 
         $fields = $this->getConfigField($field);

From ff343b9e6d9a75319a9364914f7fcf6b6159c250 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Fri, 12 Feb 2021 20:56:21 +0530
Subject: [PATCH 3/6] Routes Added

---
 .../src/Resources/views/catalog/attributes/create.blade.php   | 2 +-
 .../src/Resources/views/catalog/attributes/edit.blade.php     | 2 +-
 .../src/Resources/views/catalog/categories/create.blade.php   | 2 +-
 .../src/Resources/views/catalog/categories/edit.blade.php     | 2 +-
 .../src/Resources/views/catalog/families/create.blade.php     | 2 +-
 .../Admin/src/Resources/views/catalog/families/edit.blade.php | 2 +-
 .../Webkul/Admin/src/Resources/views/cms/create.blade.php     | 2 +-
 packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php  | 2 +-
 .../src/Resources/views/customers/addresses/create.blade.php  | 2 +-
 .../views/customers/addresses/orders/index.blade.php          | 2 +-
 .../src/Resources/views/customers/confirm-password.blade.php  | 2 +-
 .../Admin/src/Resources/views/customers/create.blade.php      | 2 +-
 .../Webkul/Admin/src/Resources/views/customers/edit.blade.php | 2 +-
 .../src/Resources/views/customers/groups/create.blade.php     | 2 +-
 .../Admin/src/Resources/views/customers/groups/edit.blade.php | 2 +-
 .../Webkul/Admin/src/Resources/views/customers/note.blade.php | 2 +-
 .../src/Resources/views/customers/reviews/edit.blade.php      | 2 +-
 .../marketing/email-marketing/campaigns/create.blade.php      | 2 +-
 .../views/marketing/email-marketing/campaigns/edit.blade.php  | 2 +-
 .../views/marketing/email-marketing/events/create.blade.php   | 2 +-
 .../views/marketing/email-marketing/events/edit.blade.php     | 2 +-
 .../marketing/email-marketing/subscribers/edit.blade.php      | 2 +-
 .../marketing/email-marketing/templates/create.blade.php      | 4 ++--
 .../views/marketing/email-marketing/templates/edit.blade.php  | 4 ++--
 .../views/marketing/promotions/cart-rules/create.blade.php    | 2 +-
 .../views/marketing/promotions/cart-rules/edit.blade.php      | 2 +-
 .../views/marketing/promotions/catalog-rules/create.blade.php | 2 +-
 .../views/marketing/promotions/catalog-rules/edit.blade.php   | 2 +-
 .../Admin/src/Resources/views/sales/invoices/create.blade.php | 2 +-
 .../Admin/src/Resources/views/sales/invoices/view.blade.php   | 2 +-
 .../Admin/src/Resources/views/sales/orders/view.blade.php     | 2 +-
 .../Admin/src/Resources/views/sales/refunds/create.blade.php  | 2 +-
 .../Admin/src/Resources/views/sales/refunds/view.blade.php    | 2 +-
 .../src/Resources/views/sales/shipments/create.blade.php      | 2 +-
 .../Admin/src/Resources/views/sales/shipments/view.blade.php  | 2 +-
 .../src/Resources/views/settings/channels/create.blade.php    | 2 +-
 .../src/Resources/views/settings/channels/edit.blade.php      | 2 +-
 .../src/Resources/views/settings/currencies/create.blade.php  | 2 +-
 .../src/Resources/views/settings/currencies/edit.blade.php    | 2 +-
 .../Resources/views/settings/exchange_rates/create.blade.php  | 2 +-
 .../Resources/views/settings/exchange_rates/edit.blade.php    | 2 +-
 .../views/settings/inventory_sources/create.blade.php         | 2 +-
 .../Resources/views/settings/inventory_sources/edit.blade.php | 2 +-
 .../src/Resources/views/settings/locales/create.blade.php     | 2 +-
 .../Admin/src/Resources/views/settings/locales/edit.blade.php | 2 +-
 .../src/Resources/views/settings/sliders/create.blade.php     | 2 +-
 .../Admin/src/Resources/views/settings/sliders/edit.blade.php | 2 +-
 .../src/Resources/views/tax/tax-categories/create.blade.php   | 2 +-
 .../src/Resources/views/tax/tax-categories/edit.blade.php     | 2 +-
 .../Admin/src/Resources/views/tax/tax-rates/create.blade.php  | 2 +-
 .../Admin/src/Resources/views/tax/tax-rates/edit.blade.php    | 2 +-
 .../Admin/src/Resources/views/users/roles/create.blade.php    | 2 +-
 .../Admin/src/Resources/views/users/roles/edit.blade.php      | 2 +-
 .../Admin/src/Resources/views/users/users/create.blade.php    | 2 +-
 .../Admin/src/Resources/views/users/users/edit.blade.php      | 2 +-
 55 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php
index a73cca8bb..1c2ae527d 100755
--- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.catalog.attributes.index') }}'"></i>
 
                         {{ __('admin::app.catalog.attributes.add-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php
index b7c380ad3..913423fb2 100755
--- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.catalog.attributes.index') }}'"></i>
 
                         {{ __('admin::app.catalog.attributes.edit-title') }}
                     </h1>
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 d3b532b7d..24c777adb 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
@@ -12,7 +12,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.catalog.categories.index') }}'"></i>
 
                         {{ __('admin::app.catalog.categories.add-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php
index eb56ab80a..7c30bc150 100755
--- a/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php
@@ -13,7 +13,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.catalog.categories.index') }}'"></i>
 
                         {{ __('admin::app.catalog.categories.edit-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/families/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/families/create.blade.php
index c00e5cbd8..940d40ae3 100755
--- a/packages/Webkul/Admin/src/Resources/views/catalog/families/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/families/create.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.catalog.families.index') }}'"></i>
 
                         {{ __('admin::app.catalog.families.add-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php
index 1ab4bef11..e34d06cae 100755
--- a/packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.catalog.families.index') }}'"></i>
 
                         {{ __('admin::app.catalog.families.edit-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/cms/create.blade.php b/packages/Webkul/Admin/src/Resources/views/cms/create.blade.php
index 27e3d7cc1..dc0e729f0 100644
--- a/packages/Webkul/Admin/src/Resources/views/cms/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/cms/create.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.cms.index') }}'"></i>
 
                         {{ __('admin::app.cms.pages.add-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php
index 5ba8671a8..fce0c238c 100644
--- a/packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php
@@ -13,7 +13,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.cms.index') }}'"></i>
 
                         {{ __('admin::app.cms.pages.edit-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/addresses/create.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/addresses/create.blade.php
index f5d2c90b3..d95436362 100644
--- a/packages/Webkul/Admin/src/Resources/views/customers/addresses/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/addresses/create.blade.php
@@ -14,7 +14,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.customer.index') }}'"></i>
 
                         {{ __('admin::app.customers.addresses.create-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/addresses/orders/index.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/addresses/orders/index.blade.php
index 603110401..c524233c9 100644
--- a/packages/Webkul/Admin/src/Resources/views/customers/addresses/orders/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/addresses/orders/index.blade.php
@@ -10,7 +10,7 @@
         <div class="page-header">
             <div class="page-title">
                 <h1>
-                    <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                    <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.customer.index') }}'"></i>
 
                     {{ __('address::app.admin.addresses.title-orders', ['customer_name' => $customer->first_name . ' ' . $customer->last_name]) }}
                 </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/confirm-password.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/confirm-password.blade.php
index 2c03674da..318d4a3eb 100755
--- a/packages/Webkul/Admin/src/Resources/views/customers/confirm-password.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/confirm-password.blade.php
@@ -9,7 +9,7 @@
         <div class="page-header">
             <div class="page-title">
                 <h1>
-                    <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                    <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.customer.index') }}'"></i>
                     {{ __('admin::app.users.users.confirm-delete-title') }}
                 </h1>
             </div>
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php
index f34f71a67..12757d884 100755
--- a/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.customer.index') }}'"></i>
 
                         {{ __('admin::app.customers.customers.title') }}
 
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
index c0a1cb7c0..d7fed327c 100755
--- a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
@@ -9,7 +9,7 @@
         <div class="page-header">
             <div class="page-title">
                 <h1>
-                    <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                    <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.customer.index') }}'"></i>
                     {{ $customer->first_name . " " . $customer->last_name }}
                 </h1>
             </div>
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/groups/create.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/groups/create.blade.php
index ca6a8b590..db6c059d9 100755
--- a/packages/Webkul/Admin/src/Resources/views/customers/groups/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/groups/create.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.groups.index') }}'"></i>
 
                         {{ __('admin::app.customers.groups.add-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/groups/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/groups/edit.blade.php
index 7cbb7d8f1..a015efe97 100755
--- a/packages/Webkul/Admin/src/Resources/views/customers/groups/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/groups/edit.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.groups.index') }}'"></i>
 
                         {{ __('admin::app.customers.groups.edit-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/note.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/note.blade.php
index 26ad96e6f..010119b99 100644
--- a/packages/Webkul/Admin/src/Resources/views/customers/note.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/note.blade.php
@@ -10,7 +10,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.customer.index') }}'"></i>
 
                         {{ __('admin::app.customers.note.title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/reviews/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/reviews/edit.blade.php
index 302a27efb..ff28f0c32 100755
--- a/packages/Webkul/Admin/src/Resources/views/customers/reviews/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/reviews/edit.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.customer.review.index') }}'"></i>
 
                         {{ __('admin::app.customers.reviews.edit-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/create.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/create.blade.php
index 9a97c1120..56ea739e0 100755
--- a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/create.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.customer.review.index') }}'"></i>
 
                         {{ __('admin::app.marketing.campaigns.add-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/edit.blade.php
index c3f814b53..4d81917c1 100755
--- a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/edit.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.campaigns.index') }}'"></i>
 
                         {{ __('admin::app.marketing.campaigns.edit-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/events/create.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/events/create.blade.php
index 8d9ab628f..6d53ceafe 100755
--- a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/events/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/events/create.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.events.index') }}'"></i>
 
                         {{ __('admin::app.marketing.events.add-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/events/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/events/edit.blade.php
index a42f8bcc5..061c348fc 100755
--- a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/events/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/events/edit.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.events.index') }}'"></i>
 
                         {{ __('admin::app.marketing.events.edit-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/subscribers/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/subscribers/edit.blade.php
index 00afe9b09..3c455f3b5 100755
--- a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/subscribers/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/subscribers/edit.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.customers.subscribers.index') }}'"></i>
 
                         {{ __('admin::app.customers.subscribers.title-edit') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/templates/create.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/templates/create.blade.php
index cc247ff6d..99d1b835f 100755
--- a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/templates/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/templates/create.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.email-templates.index') }}'"></i>
 
                         {{ __('admin::app.marketing.templates.add-title') }}
                     </h1>
@@ -61,7 +61,7 @@
                             </div>
                         </div>
                     </accordian>
-                            
+
                     {!! view_render_event('bagisto.admin.marketing.templates.create.after') !!}
 
                 </div>
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/templates/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/templates/edit.blade.php
index 7835c2500..aa965606a 100755
--- a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/templates/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/templates/edit.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.email-templates.index') }}'"></i>
 
                         {{ __('admin::app.marketing.templates.edit-title') }}
                     </h1>
@@ -62,7 +62,7 @@
                             </div>
                         </div>
                     </accordian>
-                            
+
                     {!! view_render_event('bagisto.admin.marketing.templates.create.after') !!}
 
                 </div>
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/create.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/create.blade.php
index 77ea9518a..4ca9056db 100644
--- a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/create.blade.php
@@ -22,7 +22,7 @@
                     <div class="page-title">
                         <h1>
                             <i class="icon angle-left-icon back-link"
-                            onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                            onclick="window.location = '{{ route('admin.cart-rules.index') }}'"></i>
 
                             {{ __('admin::app.promotions.cart-rules.add-title') }}
                         </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/edit.blade.php
index c223579d7..e132e7cad 100644
--- a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/edit.blade.php
@@ -27,7 +27,7 @@
                     <div class="page-title">
                         <h1>
                             <i class="icon angle-left-icon back-link"
-                            onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                            onclick="window.location = '{{ route('admin.cart-rules.index') }}'"></i>
 
                             {{ __('admin::app.promotions.cart-rules.edit-title') }}
                         </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/create.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/create.blade.php
index f9c3df14d..2aaf78171 100644
--- a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/create.blade.php
@@ -22,7 +22,7 @@
                     <div class="page-title">
                         <h1>
                         <i class="icon angle-left-icon back-link"
-                            onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                            onclick="window.location = '{{ route('admin.catalog-rules.index') }}'"></i>
 
                             {{ __('admin::app.promotions.catalog-rules.add-title') }}
                         </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/edit.blade.php
index d747b43f2..054c16942 100644
--- a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/edit.blade.php
@@ -22,7 +22,7 @@
                     <div class="page-title">
                         <h1>
                         <i class="icon angle-left-icon back-link"
-                            onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                            onclick="window.location = '{{ route('admin.catalog-rules.index') }}'"></i>
 
                             {{ __('admin::app.promotions.catalog-rules.edit-title') }}
                         </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php
index 7103aac9b..75662dc6f 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php
@@ -12,7 +12,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.sales.invoices.index') }}'"></i>
 
                         {{ __('admin::app.sales.invoices.add-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php
index 4771de1c6..0d27ad1ae 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php
@@ -14,7 +14,7 @@
                 <h1>
                     {!! view_render_event('sales.invoice.title.before', ['order' => $order]) !!}
 
-                    <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                    <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.sales.invoices.index') }}'"></i>
 
                     {{ __('admin::app.sales.invoices.view-title', ['invoice_id' => $invoice->id]) }}
 
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
index 9c2a871d9..6ac4b515e 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
@@ -14,7 +14,7 @@
                 <h1>
                     {!! view_render_event('sales.order.title.before', ['order' => $order]) !!}
 
-                    <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                    <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.sales.orders.index') }}'"></i>
 
                     {{ __('admin::app.sales.orders.view-title', ['order_id' => $order->increment_id]) }}
 
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/refunds/create.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/refunds/create.blade.php
index 3707af232..7e7cea01c 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/refunds/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/refunds/create.blade.php
@@ -12,7 +12,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.sales.refunds.index') }}'"></i>
 
                         {{ __('admin::app.sales.refunds.add-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/refunds/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/refunds/view.blade.php
index a3a153407..9c9d2f0b0 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/refunds/view.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/refunds/view.blade.php
@@ -12,7 +12,7 @@
         <div class="page-header">
             <div class="page-title">
                 <h1>
-                    <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                    <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.sales.refunds.index') }}'"></i>
 
                     {{ __('admin::app.sales.refunds.view-title', ['refund_id' => $refund->id]) }}
                 </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php
index 50ae141b7..1d89217fd 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php
@@ -12,7 +12,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.sales.shipments.index') }}'"></i>
 
                         {{ __('admin::app.sales.shipments.add-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/shipments/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/shipments/view.blade.php
index c0ca4b790..fcbb526ef 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/shipments/view.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/shipments/view.blade.php
@@ -11,7 +11,7 @@
         <div class="page-header">
             <div class="page-title">
                 <h1>
-                    <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                    <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.sales.shipments.index') }}'"></i>
 
                     {{ __('admin::app.sales.shipments.view-title', ['shipment_id' => $shipment->id]) }}
                 </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
index 83bb134bf..0910fb587 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.channels.index') }}'"></i>
 
                         {{ __('admin::app.settings.channels.add-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
index c6445c776..bfc22db99 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
@@ -12,7 +12,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.channels.index') }}'"></i>
 
                         {{ __('admin::app.settings.channels.edit-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/currencies/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/currencies/create.blade.php
index 98a5fe699..9d761167b 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/currencies/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/currencies/create.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.currencies.index') }}'"></i>
 
                         {{ __('admin::app.settings.currencies.add-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php
index 165553bde..f5a2f197d 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.currencies.index') }}'"></i>
 
                         {{ __('admin::app.settings.currencies.edit-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/create.blade.php
index d25c694e8..b932c84f9 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/create.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.exchange_rates.index') }}'"></i>
 
                         {{ __('admin::app.settings.exchange_rates.add-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/edit.blade.php
index 2c05f0398..960d41a69 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/edit.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.exchange_rates.index') }}'"></i>
 
                         {{ __('admin::app.settings.exchange_rates.edit-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php
index 0f698d7dd..577eb2d6c 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.inventory_sources.index') }}'"></i>
 
                         {{ __('admin::app.settings.inventory_sources.add-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php
index feb7769b0..1dd58ad15 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.inventory_sources.index') }}'"></i>
 
                         {{ __('admin::app.settings.inventory_sources.edit-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php
index 0375712ef..1dda219fe 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.locales.index') }}'"></i>
 
                         {{ __('admin::app.settings.locales.add-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php
index 731c78038..88f8747ca 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.locales.index') }}'"></i>
 
                         {{ __('admin::app.settings.locales.edit-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php
index 5666d60ac..6a98a73ee 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php
@@ -15,7 +15,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.sliders.index') }}'"></i>
 
                         {{ __('admin::app.settings.sliders.add-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php
index 1bc0f2e4b..3bafcf1b1 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php
@@ -12,7 +12,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.sliders.index') }}'"></i>
 
                         {{ __('admin::app.settings.sliders.edit-title') }}
 
diff --git a/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/create.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/create.blade.php
index 0710a1ef6..753f101b9 100755
--- a/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/create.blade.php
@@ -10,7 +10,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.tax-categories.index') }}'"></i>
 
                         {{ __('admin::app.settings.tax-categories.add-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/edit.blade.php
index 4eac06074..8af25b2b2 100755
--- a/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/edit.blade.php
@@ -10,7 +10,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.tax-categories.index') }}'"></i>
 
                         {{ __('admin::app.settings.tax-categories.edit.title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php
index 5b90f5e3c..fdeee14f2 100755
--- a/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php
@@ -10,7 +10,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.tax-rates.index') }}'"></i>
 
                         {{ __('admin::app.settings.tax-rates.add-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/edit.blade.php
index a70b7523f..066e4b910 100755
--- a/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/edit.blade.php
@@ -10,7 +10,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.tax-rates.index') }}'"></i>
 
                         {{ __('admin::app.settings.tax-rates.edit.title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/users/roles/create.blade.php b/packages/Webkul/Admin/src/Resources/views/users/roles/create.blade.php
index 0a85c37a6..1a7c63008 100755
--- a/packages/Webkul/Admin/src/Resources/views/users/roles/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/users/roles/create.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.roles.index') }}'"></i>
 
                         {{ __('admin::app.users.roles.add-role-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/users/roles/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/users/roles/edit.blade.php
index 6e55b3113..ad1ff5e0b 100755
--- a/packages/Webkul/Admin/src/Resources/views/users/roles/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/users/roles/edit.blade.php
@@ -11,7 +11,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.roles.index') }}'"></i>
 
                         {{ __('admin::app.users.roles.edit-role-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/users/users/create.blade.php b/packages/Webkul/Admin/src/Resources/views/users/users/create.blade.php
index 065be26ed..0352f0cbc 100755
--- a/packages/Webkul/Admin/src/Resources/views/users/users/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/users/users/create.blade.php
@@ -10,7 +10,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.users.index') }}'"></i>
 
                         {{ __('admin::app.users.users.add-user-title') }}
                     </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php
index 7c0ca0558..816105976 100755
--- a/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php
@@ -10,7 +10,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = history.length > 1 ? document.referrer : '{{ route('admin.dashboard.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.users.index') }}'"></i>
 
                         {{ __('admin::app.users.users.edit-user-title') }}
                     </h1>

From 6e42efbb1854240190140a23e7a737e8fe7ac1f7 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Fri, 12 Feb 2021 21:08:32 +0530
Subject: [PATCH 4/6] Fixed One Route

---
 .../src/Resources/views/customers/addresses/create.blade.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/customers/addresses/create.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/addresses/create.blade.php
index d95436362..4f2418c44 100644
--- a/packages/Webkul/Admin/src/Resources/views/customers/addresses/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/addresses/create.blade.php
@@ -14,7 +14,7 @@
             <div class="page-header">
                 <div class="page-title">
                     <h1>
-                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.customer.index') }}'"></i>
+                        <i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.customer.addresses.index', ['id' => $customer->id]) }}'"></i>
 
                         {{ __('admin::app.customers.addresses.create-title') }}
                     </h1>

From 61959d6727ce3de7a8b203fc190e4661d05f1c07 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Fri, 12 Feb 2021 21:24:42 +0530
Subject: [PATCH 5/6] Blank Channel Name On Slider Fixed

---
 .../Admin/src/Resources/views/settings/sliders/create.blade.php | 2 +-
 .../Admin/src/Resources/views/settings/sliders/edit.blade.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php
index 5666d60ac..46e1ffc3b 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php
@@ -60,7 +60,7 @@
                         <select class="control" id="channel_id" name="channel_id" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.settings.sliders.channels') }}&quot;">
                             @foreach ($channels as $channel)
                                 <option value="{{ $channel->id }}" @if ($channel->id == old('channel_id')) selected @endif>
-                                    {{ __($channel->name) }}
+                                    {{ __(core()->getChannelName($channel)) }}
                                 </option>
                             @endforeach
                         </select>
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php
index 1bc0f2e4b..20bb3a0ec 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php
@@ -49,7 +49,7 @@
                         <select class="control" id="channel_id" name="channel_id" data-vv-as="&quot;{{ __('admin::app.settings.sliders.channels') }}&quot;" value="" v-validate="'required'">
                             @foreach ($channels as $channel)
                                 <option value="{{ $channel->id }}" @if ($channel->id == $slider->channel_id) selected @endif>
-                                    {{ __($channel->name) }}
+                                    {{ __(core()->getChannelName($channel)) }}
                                 </option>
                             @endforeach
                         </select>

From b1464eb91a4ee9d925c56e5e6df06b1bf5025c9b Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Mon, 15 Feb 2021 13:47:27 +0530
Subject: [PATCH 6/6] Issue #4624 fixed

---
 .../src/Repositories/BookingProductEventTicketRepository.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/BookingProduct/src/Repositories/BookingProductEventTicketRepository.php b/packages/Webkul/BookingProduct/src/Repositories/BookingProductEventTicketRepository.php
index e43dd10f2..57e0e3a3c 100644
--- a/packages/Webkul/BookingProduct/src/Repositories/BookingProductEventTicketRepository.php
+++ b/packages/Webkul/BookingProduct/src/Repositories/BookingProductEventTicketRepository.php
@@ -73,12 +73,12 @@ class BookingProductEventTicketRepository extends Repository
                 $savedTickets[$ticketId]['ticket'] = $ticket;
                 $savedTickets[$ticketId]['ticketInputs'] = $ticketInputs;
             }
+
+            Event::dispatch('booking_product.booking.event-ticket.save.after', ['tickets' => $savedTickets]);
         }
 
         foreach ($previousTicketIds as $previousTicketId) {
             $this->delete($previousTicketId);
         }
-
-        Event::dispatch('booking_product.booking.event-ticket.save.after', ['tickets' => $savedTickets]);
     }
 }
\ No newline at end of file