From 5706671445730d2c6a6cdf4e7618cebe0cdf0b49 Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Fri, 6 May 2022 12:54:09 +0530
Subject: [PATCH 1/2] Fixed Address Delete Issue

---
 .../views/shop/customers/account/address/index.blade.php  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/index.blade.php
index fd2729f40..2018960b5 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/index.blade.php
@@ -52,11 +52,11 @@
                                         {{ __('shop::app.customer.account.address.index.edit') }}
                                     </a>
 
-                                    <a class="card-link" href="javascript:void(0);" onclick="deleteAddress('{{ __('shop::app.customer.account.address.index.confirm-delete') }}')">
+                                    <a class="card-link" href="javascript:void(0);" onclick="deleteAddress('{{ __('shop::app.customer.account.address.index.confirm-delete') }}', '{{ $address->id }}')">
                                         {{ __('shop::app.customer.account.address.index.delete') }}
                                     </a>
 
-                                    <form id="deleteAddressForm" action="{{ route('address.delete', $address->id) }}" method="post">
+                                    <form id="deleteAddressForm{{ $address->id }}" action="{{ route('address.delete', $address->id) }}" method="post">
                                         @method('delete')
 
                                         @csrf
@@ -74,12 +74,12 @@
 
 @push('scripts')
     <script>
-        function deleteAddress(message) {
+        function deleteAddress(message, addressId) {
             if (! confirm(message)) {
                 return;
             }
 
-            $('#deleteAddressForm').submit();
+            $(`#deleteAddressForm${addressId}`).submit();
         }
     </script>
 @endpush

From 60994928b73a438aa6b8d4f7a39f6093a4437143 Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Fri, 6 May 2022 13:09:00 +0530
Subject: [PATCH 2/2] Default Theme Fixed

---
 .../views/customers/account/address/index.blade.php    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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 3eca7279c..2887a64d0 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
@@ -85,13 +85,13 @@
                                     </span>
 
                                     <span>
-                                        <a href="javascript:void(0);" onclick="deleteAddress('{{ __('shop::app.customer.account.address.index.confirm-delete') }}')">
+                                        <a href="javascript:void(0);" onclick="deleteAddress('{{ __('shop::app.customer.account.address.index.confirm-delete') }}', '{{ $address->id }}')">
                                             {{ __('shop::app.customer.account.address.index.delete') }}
                                         </a>
 
-                                        <form id="deleteAddressForm" action="{{ route('address.delete', $address->id) }}" method="post">
+                                        <form id="deleteAddressForm{{ $address->id }}" action="{{ route('address.delete', $address->id) }}" method="post">
                                             @method('delete')
-                                            
+
                                             @csrf
                                         </form>
                                     </span>
@@ -109,12 +109,12 @@
 
 @push('scripts')
     <script>
-        function deleteAddress(message) {
+        function deleteAddress(message, addressId) {
             if (! confirm(message)) {
                 return;
             }
 
-            $('#deleteAddressForm').submit();
+            $(`#deleteAddressForm${addressId}`).submit();
         }
     </script>
 @endpush