From 6694acd41202e4d05e18d81e83988cf358200c27 Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Thu, 3 Sep 2020 14:39:21 +0530
Subject: [PATCH 1/3] Added Previous URL Route To File

---
 .../views/customers/account/address/create.blade.php          | 2 +-
 .../Resources/views/customers/account/address/edit.blade.php  | 2 +-
 .../Resources/views/customers/account/address/index.blade.php | 3 +--
 .../customers/account/downloadable_products/index.blade.php   | 4 ++--
 .../Resources/views/customers/account/orders/index.blade.php  | 4 ++--
 .../Resources/views/customers/account/orders/view.blade.php   | 2 +-
 .../Resources/views/customers/account/profile/edit.blade.php  | 2 +-
 .../Resources/views/customers/account/profile/index.blade.php | 2 +-
 .../Resources/views/customers/account/reviews/index.blade.php | 2 +-
 9 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
index 51fafa894..8645e5349 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
@@ -12,7 +12,7 @@
 
         <div class="account-layout">
             <div class="account-head mb-15">
-                <span class="back-icon"><a href="{{ route('customer.account.index') }}"><i class="icon icon-menu-back"></i></a></span>
+                <span class="back-icon"><a href="{{ url()->previous() }}"><i class="icon icon-menu-back"></i></a></span>
                 <span class="account-heading">{{ __('shop::app.customer.account.address.create.title') }}</span>
                 <span></span>
             </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
index 3d08ec0ec..74b1974eb 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
@@ -12,7 +12,7 @@
         <div class="account-layout">
 
             <div class="account-head mb-15">
-                <span class="back-icon"><a href="{{ route('customer.account.index') }}"><i class="icon icon-menu-back"></i></a></span>
+                <span class="back-icon"><a href="{{ url()->previous() }}"><i class="icon icon-menu-back"></i></a></span>
                 <span class="account-heading">{{ __('shop::app.customer.account.address.edit.title') }}</span>
                 <span></span>
             </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/index.blade.php
index b4ab4861d..29479e314 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/index.blade.php
@@ -13,8 +13,7 @@
         <div class="account-layout">
 
             <div class="account-head">
-                <span class="back-icon"><a href="{{ route('customer.account.index') }}"><i
-                            class="icon icon-menu-back"></i></a></span>
+                <span class="back-icon"><a href="{{ url()->previous() }}"><i class="icon icon-menu-back"></i></a></span>
                 <span
                     class="account-heading">{{ __('shop::app.customer.account.address.index.title') }}</span>
 
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/downloadable_products/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/downloadable_products/index.blade.php
index 07a531267..03f4ca2cb 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/downloadable_products/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/downloadable_products/index.blade.php
@@ -12,7 +12,7 @@
         <div class="account-layout">
 
             <div class="account-head mb-10">
-                <span class="back-icon"><a href="{{ route('customer.account.index') }}"><i class="icon icon-menu-back"></i></a></span>
+                <span class="back-icon"><a href="{{ url()->previous() }}"><i class="icon icon-menu-back"></i></a></span>
                 <span class="account-heading">
                     {{ __('shop::app.customer.account.downloadable_products.title') }}
                 </span>
@@ -26,7 +26,7 @@
                 <div class="account-table-content">
 
                     {!! app('Webkul\Shop\DataGrids\DownloadableProductDataGrid')->render() !!}
-                    
+
                 </div>
             </div>
 
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/index.blade.php
index 0baabcd78..05eb85bdd 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/index.blade.php
@@ -12,7 +12,7 @@
         <div class="account-layout">
 
             <div class="account-head mb-10">
-                <span class="back-icon"><a href="{{ route('customer.account.index') }}"><i class="icon icon-menu-back"></i></a></span>
+                <span class="back-icon"><a href="{{ url()->previous() }}"><i class="icon icon-menu-back"></i></a></span>
                 <span class="account-heading">
                     {{ __('shop::app.customer.account.order.index.title') }}
                 </span>
@@ -26,7 +26,7 @@
                 <div class="account-table-content">
 
                     {!! app('Webkul\Shop\DataGrids\OrderDataGrid')->render() !!}
-                    
+
                 </div>
             </div>
 
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
index 644c76d37..3b99cf5b8 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
@@ -12,7 +12,7 @@
         <div class="account-layout">
 
             <div class="account-head">
-                <span class="back-icon"><a href="{{ route('customer.account.index') }}"><i class="icon icon-menu-back"></i></a></span>
+                <span class="back-icon"><a href="{{ url()->previous() }}"><i class="icon icon-menu-back"></i></a></span>
 
                 <span class="account-heading">
                     {{ __('shop::app.customer.account.order.view.page-tile', ['order_id' => $order->increment_id]) }}
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php
index 3c21a3a2c..7cb9839f5 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php
@@ -12,7 +12,7 @@
         <div class="account-layout">
 
             <div class="account-head mb-10">
-                <span class="back-icon"><a href="{{ route('customer.account.index') }}"><i class="icon icon-menu-back"></i></a></span>
+                <span class="back-icon"><a href="{{ url()->previous() }}"><i class="icon icon-menu-back"></i></a></span>
 
                 <span class="account-heading">{{ __('shop::app.customer.account.profile.edit-profile.title') }}</span>
 
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
index 892fef8bd..d72b3acf7 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
@@ -14,7 +14,7 @@
 
         <div class="account-head">
 
-            <span class="back-icon"><a href="{{ route('customer.account.index') }}"><i class="icon icon-menu-back"></i></a></span>
+            <span class="back-icon"><a href="{{ url()->previous() }}"><i class="icon icon-menu-back"></i></a></span>
 
             <span class="account-heading">{{ __('shop::app.customer.account.profile.index.title') }}</span>
 
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php
index 06a9d7fce..4065493d8 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php
@@ -13,7 +13,7 @@
         <div class="account-layout">
 
             <div class="account-head">
-                <span class="back-icon"><a href="{{ route('customer.account.index') }}"><i class="icon icon-menu-back"></i></a></span>
+                <span class="back-icon"><a href="{{ url()->previous() }}"><i class="icon icon-menu-back"></i></a></span>
 
                 <span class="account-heading">{{ __('shop::app.customer.account.review.index.title') }}</span>
 

From ef19d5c58b3581105d2e767d30020285ef544c7e Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Thu, 3 Sep 2020 15:02:59 +0530
Subject: [PATCH 2/3] Replaced Back URL With Profile URL

---
 .../Resources/views/customers/account/address/create.blade.php  | 2 +-
 .../Resources/views/customers/account/address/edit.blade.php    | 2 +-
 .../Resources/views/customers/account/address/index.blade.php   | 2 +-
 .../customers/account/downloadable_products/index.blade.php     | 2 +-
 .../Resources/views/customers/account/orders/index.blade.php    | 2 +-
 .../src/Resources/views/customers/account/orders/view.blade.php | 2 +-
 .../Resources/views/customers/account/profile/edit.blade.php    | 2 +-
 .../Resources/views/customers/account/profile/index.blade.php   | 2 +-
 .../Resources/views/customers/account/reviews/index.blade.php   | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
index 8645e5349..76b6cb39f 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
@@ -12,7 +12,7 @@
 
         <div class="account-layout">
             <div class="account-head mb-15">
-                <span class="back-icon"><a href="{{ url()->previous() }}"><i class="icon icon-menu-back"></i></a></span>
+                <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
                 <span class="account-heading">{{ __('shop::app.customer.account.address.create.title') }}</span>
                 <span></span>
             </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
index 74b1974eb..4de4eee0f 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
@@ -12,7 +12,7 @@
         <div class="account-layout">
 
             <div class="account-head mb-15">
-                <span class="back-icon"><a href="{{ url()->previous() }}"><i class="icon icon-menu-back"></i></a></span>
+                <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
                 <span class="account-heading">{{ __('shop::app.customer.account.address.edit.title') }}</span>
                 <span></span>
             </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/index.blade.php
index 29479e314..b099f377b 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/index.blade.php
@@ -13,7 +13,7 @@
         <div class="account-layout">
 
             <div class="account-head">
-                <span class="back-icon"><a href="{{ url()->previous() }}"><i class="icon icon-menu-back"></i></a></span>
+                <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
                 <span
                     class="account-heading">{{ __('shop::app.customer.account.address.index.title') }}</span>
 
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/downloadable_products/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/downloadable_products/index.blade.php
index 03f4ca2cb..583ebe97e 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/downloadable_products/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/downloadable_products/index.blade.php
@@ -12,7 +12,7 @@
         <div class="account-layout">
 
             <div class="account-head mb-10">
-                <span class="back-icon"><a href="{{ url()->previous() }}"><i class="icon icon-menu-back"></i></a></span>
+                <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
                 <span class="account-heading">
                     {{ __('shop::app.customer.account.downloadable_products.title') }}
                 </span>
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/index.blade.php
index 05eb85bdd..6c53d4602 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/index.blade.php
@@ -12,7 +12,7 @@
         <div class="account-layout">
 
             <div class="account-head mb-10">
-                <span class="back-icon"><a href="{{ url()->previous() }}"><i class="icon icon-menu-back"></i></a></span>
+                <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
                 <span class="account-heading">
                     {{ __('shop::app.customer.account.order.index.title') }}
                 </span>
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
index 3b99cf5b8..4aa5a1bab 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
@@ -12,7 +12,7 @@
         <div class="account-layout">
 
             <div class="account-head">
-                <span class="back-icon"><a href="{{ url()->previous() }}"><i class="icon icon-menu-back"></i></a></span>
+                <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
 
                 <span class="account-heading">
                     {{ __('shop::app.customer.account.order.view.page-tile', ['order_id' => $order->increment_id]) }}
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php
index 7cb9839f5..b6cd773a2 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php
@@ -12,7 +12,7 @@
         <div class="account-layout">
 
             <div class="account-head mb-10">
-                <span class="back-icon"><a href="{{ url()->previous() }}"><i class="icon icon-menu-back"></i></a></span>
+                <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
 
                 <span class="account-heading">{{ __('shop::app.customer.account.profile.edit-profile.title') }}</span>
 
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
index d72b3acf7..6ad256cd7 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
@@ -14,7 +14,7 @@
 
         <div class="account-head">
 
-            <span class="back-icon"><a href="{{ url()->previous() }}"><i class="icon icon-menu-back"></i></a></span>
+            <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
 
             <span class="account-heading">{{ __('shop::app.customer.account.profile.index.title') }}</span>
 
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php
index 4065493d8..119b0fdec 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php
@@ -13,7 +13,7 @@
         <div class="account-layout">
 
             <div class="account-head">
-                <span class="back-icon"><a href="{{ url()->previous() }}"><i class="icon icon-menu-back"></i></a></span>
+                <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
 
                 <span class="account-heading">{{ __('shop::app.customer.account.review.index.title') }}</span>
 

From 72f09ecfc558ee55c344819c857b169fa12eec72 Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Thu, 3 Sep 2020 15:09:14 +0530
Subject: [PATCH 3/3] Added Back Routes

---
 .../Resources/views/customers/account/address/create.blade.php  | 2 +-
 .../Resources/views/customers/account/address/edit.blade.php    | 2 +-
 .../src/Resources/views/customers/account/orders/view.blade.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
index 76b6cb39f..f7ecf22ef 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
@@ -12,7 +12,7 @@
 
         <div class="account-layout">
             <div class="account-head mb-15">
-                <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
+                <span class="back-icon"><a href="{{ route('customer.address.index') }}"><i class="icon icon-menu-back"></i></a></span>
                 <span class="account-heading">{{ __('shop::app.customer.account.address.create.title') }}</span>
                 <span></span>
             </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
index 4de4eee0f..aa7bcbd34 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
@@ -12,7 +12,7 @@
         <div class="account-layout">
 
             <div class="account-head mb-15">
-                <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
+                <span class="back-icon"><a href="{{ route('customer.address.index') }}"><i class="icon icon-menu-back"></i></a></span>
                 <span class="account-heading">{{ __('shop::app.customer.account.address.edit.title') }}</span>
                 <span></span>
             </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
index 4aa5a1bab..d005bb939 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
@@ -12,7 +12,7 @@
         <div class="account-layout">
 
             <div class="account-head">
-                <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
+                <span class="back-icon"><a href="{{ route('customer.orders.index') }}"><i class="icon icon-menu-back"></i></a></span>
 
                 <span class="account-heading">
                     {{ __('shop::app.customer.account.order.view.page-tile', ['order_id' => $order->increment_id]) }}