From 33a2441c5d4ca3b9eca79ea4b6cd278a0b822528 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Tue, 6 Jul 2021 10:22:15 +0530
Subject: [PATCH 01/11] Some Extra Fields Added

---
 .../Admin/src/Resources/views/sales/refunds/create.blade.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 7e7cea01c..f9f082e09 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
@@ -230,6 +230,7 @@
                         <tr>
                             <th>{{ __('admin::app.sales.orders.SKU') }}</th>
                             <th>{{ __('admin::app.sales.orders.product-name') }}</th>
+                            <th>{{ __('admin::app.sales.orders.price') }}</th>
                             <th>{{ __('admin::app.sales.orders.item-status') }}</th>
                             <th>{{ __('admin::app.sales.orders.subtotal') }}</th>
                             <th>{{ __('admin::app.sales.orders.tax-amount') }}</th>
@@ -261,6 +262,8 @@
                                     @endif
                                 </td>
 
+                                <td>{{ core()->formatBasePrice($item->base_price) }}</td>
+
                                 <td>
                                     <span class="qty-row">
                                         {{ $item->qty_ordered ? __('admin::app.sales.orders.item-ordered', ['qty_ordered' => $item->qty_ordered]) : '' }}
@@ -283,7 +286,7 @@
                                     </span>
                                 </td>
 
-                                <td>{{ core()->formatBasePrice($item->base_price) }}</td>
+                                <td>{{ core()->formatBasePrice($item->base_total) }}</td>
 
                                 <td>{{ core()->formatBasePrice($item->base_tax_amount) }}</td>
 

From 3bd237e65674ad5b0437fe221e95501c0bda100d Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Tue, 6 Jul 2021 13:11:59 +0530
Subject: [PATCH 02/11] Address Endpoint Fixed

---
 packages/Webkul/Shop/src/Http/routes.php      |  2 +-
 .../customers/account/address/index.blade.php | 30 ++++++++++++-------
 .../customers/account/address/index.blade.php | 19 +++++++-----
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php
index c9e3fe892..6ba874c9b 100755
--- a/packages/Webkul/Shop/src/Http/routes.php
+++ b/packages/Webkul/Shop/src/Http/routes.php
@@ -247,7 +247,7 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function
                 Route::get('addresses/default/{id}', 'Webkul\Customer\Http\Controllers\AddressController@makeDefault')->name('make.default.address');
 
                 //Customer Address Delete
-                Route::get('addresses/delete/{id}', 'Webkul\Customer\Http\Controllers\AddressController@destroy')->name('address.delete');
+                Route::delete('addresses/delete/{id}', 'Webkul\Customer\Http\Controllers\AddressController@destroy')->name('address.delete');
 
                 /* Wishlist route */
                 //Customer wishlist(listing)
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 b099f377b..89e0d2278 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
@@ -77,18 +77,22 @@
                                     </ul>
 
                                     <div class="control-links mt-20">
-                                    <span>
-                                        <a href="{{ route('customer.address.edit', $address->id) }}">
-                                            {{ __('shop::app.customer.account.address.index.edit') }}
-                                        </a>
-                                    </span>
+                                        <span>
+                                            <a href="{{ route('customer.address.edit', $address->id) }}">
+                                                {{ __('shop::app.customer.account.address.index.edit') }}
+                                            </a>
+                                        </span>
 
                                         <span>
-                                        <a href="{{ route('address.delete', $address->id) }}"
-                                           onclick="deleteAddress('{{ __('shop::app.customer.account.address.index.confirm-delete') }}')">
-                                            {{ __('shop::app.customer.account.address.index.delete') }}
-                                        </a>
-                                    </span>
+                                            <a href="javascript:void(0);" onclick="deleteAddress('{{ __('shop::app.customer.account.address.index.confirm-delete') }}')">
+                                                {{ __('shop::app.customer.account.address.index.delete') }}
+                                            </a>
+
+                                            <form id="deleteAddressForm" action="{{ route('address.delete', $address->id) }}" method="post">
+                                                @method('delete')
+                                                @csrf
+                                            </form>
+                                        </span>
                                     </div>
                                 </div>
                             </div>
@@ -105,8 +109,12 @@
 @push('scripts')
     <script>
         function deleteAddress(message) {
-            if (!confirm(message))
+            if (! confirm(message)) {
                 event.preventDefault();
+                return;
+            }
+
+            $('#deleteAddressForm').submit();
         }
     </script>
 @endpush
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 243272120..224b3447f 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
@@ -56,13 +56,14 @@
                                         {{ __('shop::app.customer.account.address.index.edit') }}
                                     </a>
 
-                                    <a
-                                        class="card-link"
-                                        href="{{ route('address.delete', $address->id) }}"
-                                        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') }}')">
                                         {{ __('shop::app.customer.account.address.index.delete') }}
                                     </a>
+
+                                    <form id="deleteAddressForm" action="{{ route('address.delete', $address->id) }}" method="post">
+                                        @method('delete')
+                                        @csrf
+                                    </form>
                                 </div>
                             </div>
                         </div>
@@ -77,8 +78,12 @@
 @push('scripts')
     <script>
         function deleteAddress(message) {
-            if (!confirm(message))
-            event.preventDefault();
+            if (! confirm(message)) {
+                event.preventDefault();
+                return;
+            }
+
+            $('#deleteAddressForm').submit();
         }
     </script>
 @endpush

From b8ccf82246bcedc6ec7d6863d19d1841da66afd3 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Tue, 6 Jul 2021 13:29:41 +0530
Subject: [PATCH 03/11] Customer's Cancer Order Endpoint Fixed

---
 packages/Webkul/Shop/src/Http/routes.php      |  2 +-
 .../customers/account/orders/view.blade.php   | 19 ++++++++++++++++-
 .../customers/account/orders/view.blade.php   | 21 +++++++++++++++++--
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php
index 6ba874c9b..cf34723d7 100755
--- a/packages/Webkul/Shop/src/Http/routes.php
+++ b/packages/Webkul/Shop/src/Http/routes.php
@@ -281,7 +281,7 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function
                     'view' => 'shop::customers.account.orders.print'
                 ])->name('customer.orders.print');
 
-                Route::get('/orders/cancel/{id}', 'Webkul\Shop\Http\Controllers\OrderController@cancel')->name('customer.orders.cancel');
+                Route::post('/orders/cancel/{id}', 'Webkul\Shop\Http\Controllers\OrderController@cancel')->name('customer.orders.cancel');
 
                 /* Reviews route */
                 //Customer reviews
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 c848f65bc..b171265d4 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
@@ -21,7 +21,11 @@
 
 
                 @if ($order->canCancel())
-                    <a href="{{ route('customer.orders.cancel', $order->id) }}" class="btn btn-lg btn-primary" v-alert:message="'{{ __('shop::app.customer.account.order.view.cancel-confirm-msg') }}'" style="float: right;">
+                    <form id="cancelOrderForm" action="{{ route('customer.orders.cancel', $order->id) }}" method="post">
+                        @csrf
+                    </form>
+
+                    <a href="javascript:void(0);" class="btn btn-lg btn-primary" onclick="cancelOrder('{{ __('shop::app.customer.account.order.view.cancel-confirm-msg') }}')" style="float: right;">
                         {{ __('shop::app.customer.account.order.view.cancel-btn-title') }}
                     </a>
                 @endif
@@ -560,3 +564,16 @@
     </div>
 
 @endsection
+
+@push('scripts')
+    <script>
+        function cancelOrder(message) {
+            if (! confirm(message)) {
+                event.preventDefault();
+                return;
+            }
+
+            $('#cancelOrderForm').submit();
+        }
+    </script>
+@endpush
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php
index b90a46b23..7ef89531b 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php
@@ -28,7 +28,11 @@
 
                 @if ($order->canCancel())
                     <span class="account-action">
-                        <a href="{{ route('customer.orders.cancel', $order->id) }}" class="theme-btn light unset float-right" v-alert:message="'{{ __('shop::app.customer.account.order.view.cancel-confirm-msg') }}'" style="float: right">
+                        <form id="cancelOrderForm" action="{{ route('customer.orders.cancel', $order->id) }}" method="post">
+                            @csrf
+                        </form>
+
+                        <a href="javascript:void(0);" class="theme-btn light unset float-right" onclick="cancelOrder('{{ __('shop::app.customer.account.order.view.cancel-confirm-msg') }}')" style="float: right">
                             {{ __('shop::app.customer.account.order.view.cancel-btn-title') }}
                         </a>
                     </span>
@@ -579,4 +583,17 @@
             {!! view_render_event('bagisto.shop.customers.account.orders.view.after', ['order' => $order]) !!}
         </div>
     </div>
-@endsection
\ No newline at end of file
+@endsection
+
+@push('scripts')
+    <script>
+        function cancelOrder(message) {
+            if (! confirm(message)) {
+                event.preventDefault();
+                return;
+            }
+
+            $('#cancelOrderForm').submit();
+        }
+    </script>
+@endpush
\ No newline at end of file

From 51b0f5d7e09ecf93198187522920a4bebedb6f55 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Tue, 6 Jul 2021 14:00:06 +0530
Subject: [PATCH 04/11] Review Endpoint Fixed

---
 packages/Webkul/Shop/src/Http/routes.php      |  2 +-
 .../customers/account/reviews/index.blade.php | 21 +++++++++++++++++--
 .../customers/account/reviews/index.blade.php | 17 ++++++++++++++-
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php
index cf34723d7..d4b68577b 100755
--- a/packages/Webkul/Shop/src/Http/routes.php
+++ b/packages/Webkul/Shop/src/Http/routes.php
@@ -290,7 +290,7 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function
                 ])->name('customer.reviews.index');
 
                 //Customer review delete
-                Route::get('reviews/delete/{id}', 'Webkul\Shop\Http\Controllers\ReviewController@destroy')->defaults('_config', [
+                Route::delete('reviews/delete/{id}', 'Webkul\Shop\Http\Controllers\ReviewController@destroy')->defaults('_config', [
                     'redirect' => 'customer.reviews.index'
                 ])->name('customer.review.delete');
 
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 540a3b88d..45126df2c 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
@@ -57,7 +57,12 @@
                             </div>
 
                             <div class="operations">
-                                <a class="mb-50" href="{{ route('customer.review.delete', $review->id) }}"><span class="icon trash-icon"></span></a>
+                                <form id="deleteReviewForm" action="{{ route('customer.review.delete', $review->id) }}" method="post">
+                                    @method('delete')
+                                    @csrf
+                                </form>
+
+                                <a class="mb-50" href="javascript:void(0);" onclick="deleteReview('{{ __('shop::app.customer.account.review.delete.confirmation-message') }}')"><span class="icon trash-icon"></span></a>
                             </div>
                         </div>
                         <div class="horizontal-rule mb-10 mt-10"></div>
@@ -77,4 +82,16 @@
             {!! view_render_event('bagisto.shop.customers.account.reviews.list.after', ['reviews' => $reviews]) !!}
         </div>
     </div>
-@endsection
\ No newline at end of file
+@endsection
+
+@push('scripts')
+    <script>
+        function deleteReview(message) {
+            if (! confirm(message)) {
+                return;
+            }
+
+            $('#deleteReviewForm').submit();
+        }
+    </script>
+@endpush
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/reviews/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/reviews/index.blade.php
index 9affd9951..99ba7f53f 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/reviews/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/reviews/index.blade.php
@@ -59,7 +59,12 @@
                         </div>
 
                         <div class="col-2">
-                            <a class="unset" href="{{ route('customer.review.delete', $review->id) }}">
+                            <form id="deleteReviewForm" action="{{ route('customer.review.delete', $review->id) }}" method="post">
+                                @method('delete')
+                                @csrf
+                            </form>
+
+                            <a class="unset" href="javacript:void(0);" onclick="deleteReview('{{ __('shop::app.customer.account.review.delete.confirmation-message') }}')">
                                 <span class="rango-delete fs24"></span>
                                 <span class="align-vertical-top">{{ __('shop::app.checkout.cart.remove') }}</span>
                             </a>
@@ -84,6 +89,16 @@
 @endsection
 
 @push('scripts')
+    <script>
+        function deleteReview(message) {
+            if (! confirm(message)) {
+                return;
+            }
+
+            $('#deleteReviewForm').submit();
+        }
+    </script>
+
     <script type="text/x-template" id="load-more-template">
         <div class="col-12 row justify-content-center">
             <button type="button" class="theme-btn light" @click="loadNextPage">Load More</button>

From 8b021bc66f9dec916b1520c485c88b63c8695968 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Tue, 6 Jul 2021 14:07:19 +0530
Subject: [PATCH 05/11] Translation Added

---
 packages/Webkul/Shop/src/Resources/lang/ar/app.php    | 6 +++++-
 packages/Webkul/Shop/src/Resources/lang/de/app.php    | 6 +++++-
 packages/Webkul/Shop/src/Resources/lang/en/app.php    | 9 +++++++--
 packages/Webkul/Shop/src/Resources/lang/es/app.php    | 6 +++++-
 packages/Webkul/Shop/src/Resources/lang/fa/app.php    | 6 +++++-
 packages/Webkul/Shop/src/Resources/lang/fr/app.php    | 4 ++++
 packages/Webkul/Shop/src/Resources/lang/it/app.php    | 6 +++++-
 packages/Webkul/Shop/src/Resources/lang/ja/app.php    | 6 +++++-
 packages/Webkul/Shop/src/Resources/lang/nl/app.php    | 6 +++++-
 packages/Webkul/Shop/src/Resources/lang/pl/app.php    | 6 +++++-
 packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php | 6 +++++-
 packages/Webkul/Shop/src/Resources/lang/tr/app.php    | 6 +++++-
 12 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/packages/Webkul/Shop/src/Resources/lang/ar/app.php b/packages/Webkul/Shop/src/Resources/lang/ar/app.php
index 710362596..9cb13b744 100644
--- a/packages/Webkul/Shop/src/Resources/lang/ar/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/ar/app.php
@@ -391,7 +391,11 @@ return [
 
                 'view' => [
                     'page-tile' => '#:id مراجعة',
-                ]
+                ],
+
+                'delete' => [
+                    'confirmation-message' => 'هل أنت متأكد أنك تريد حذف هذه المراجعة؟',
+                ],
             ]
         ]
     ],
diff --git a/packages/Webkul/Shop/src/Resources/lang/de/app.php b/packages/Webkul/Shop/src/Resources/lang/de/app.php
index d4876679f..ad7301cdf 100755
--- a/packages/Webkul/Shop/src/Resources/lang/de/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/de/app.php
@@ -388,7 +388,11 @@ return [
 
                 'view' => [
                     'page-tile' => 'Bewertung #:id',
-                ]
+                ],
+
+                'delete' => [
+                    'confirmation-message' => 'Möchten Sie diese Bewertung wirklich löschen?',
+                ],
             ]
         ]
     ],
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index 8c8efc73b..e0dabaab3 100755
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -387,12 +387,17 @@ return [
             'review' => [
                 'index' => [
                     'title' => 'Reviews',
-                    'page-title' => 'Reviews'
+                    'page-title' => 'Reviews',
+
                 ],
 
                 'view' => [
                     'page-tile' => 'Review #:id',
-                ]
+                ],
+
+                'delete' => [
+                    'confirmation-message' => 'Are you sure you want to delete this review?',
+                ],
             ]
         ]
     ],
diff --git a/packages/Webkul/Shop/src/Resources/lang/es/app.php b/packages/Webkul/Shop/src/Resources/lang/es/app.php
index 2c985c307..4ea177dfc 100644
--- a/packages/Webkul/Shop/src/Resources/lang/es/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/es/app.php
@@ -391,7 +391,11 @@ return [
 
                 'view' => [
                     'page-tile' => 'Opinión #:id',
-                ]
+                ],
+
+                'delete' => [
+                    'confirmation-message' => '¿Seguro que quieres eliminar esta crítica?',
+                ],
             ]
         ]
     ],
diff --git a/packages/Webkul/Shop/src/Resources/lang/fa/app.php b/packages/Webkul/Shop/src/Resources/lang/fa/app.php
index 745d6d48a..207fdc6f5 100644
--- a/packages/Webkul/Shop/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/fa/app.php
@@ -387,7 +387,11 @@ return [
 
                 'view' => [
                     'page-tile' => '#:id بررسی',
-                ]
+                ],
+
+                'delete' => [
+                    'confirmation-message' => 'آیا شما مطمئن هستید که می خواهید این نظر را حذف کنید؟',
+                ],
             ]
         ]
     ],
diff --git a/packages/Webkul/Shop/src/Resources/lang/fr/app.php b/packages/Webkul/Shop/src/Resources/lang/fr/app.php
index e07caa7f0..9ca442d63 100755
--- a/packages/Webkul/Shop/src/Resources/lang/fr/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/fr/app.php
@@ -390,6 +390,10 @@ return [
                 'view' => [
                     'page-tile' => 'Avis n° :id',
                 ],
+
+                'delete' => [
+                    'confirmation-message' => 'Êtes-vous sûr de vouloir supprimer cet avis ?',
+                ],
             ],
         ],
     ],
diff --git a/packages/Webkul/Shop/src/Resources/lang/it/app.php b/packages/Webkul/Shop/src/Resources/lang/it/app.php
index 5931ff60a..9ef790107 100644
--- a/packages/Webkul/Shop/src/Resources/lang/it/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/it/app.php
@@ -389,7 +389,11 @@ return [
 
                 'view' => [
                     'page-tile' => 'Recensione #:id',
-                ]
+                ],
+
+                'delete' => [
+                    'confirmation-message' => 'Sei sicuro di voler eliminare questa recensione?',
+                ],
             ]
         ]
     ],
diff --git a/packages/Webkul/Shop/src/Resources/lang/ja/app.php b/packages/Webkul/Shop/src/Resources/lang/ja/app.php
index 5f3cf1864..50b5b2608 100644
--- a/packages/Webkul/Shop/src/Resources/lang/ja/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/ja/app.php
@@ -369,7 +369,11 @@ return [
 
                 'view' => [
                     'page-tile' => 'レビュー #:id',
-                ]
+                ],
+
+                'delete' => [
+                    'confirmation-message' => 'このレビューを削除してもよろしいですか？',
+                ],
             ]
         ]
     ],
diff --git a/packages/Webkul/Shop/src/Resources/lang/nl/app.php b/packages/Webkul/Shop/src/Resources/lang/nl/app.php
index 931c31e26..8371b5db3 100644
--- a/packages/Webkul/Shop/src/Resources/lang/nl/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/nl/app.php
@@ -395,7 +395,11 @@ return [
 
                 'view' => [
                     'page-tile' => 'Recensies #:id',
-                ]
+                ],
+
+                'delete' => [
+                    'confirmation-message' => 'Weet je zeker dat je deze recensie wilt verwijderen?',
+                ],
             ]
         ]
     ],
diff --git a/packages/Webkul/Shop/src/Resources/lang/pl/app.php b/packages/Webkul/Shop/src/Resources/lang/pl/app.php
index ef31896a7..6ffc8dff7 100644
--- a/packages/Webkul/Shop/src/Resources/lang/pl/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/pl/app.php
@@ -389,7 +389,11 @@ return [
 
                 'view' => [
                     'page-tile' => 'Recenzja #:id',
-                ]
+                ],
+
+                'delete' => [
+                    'confirmation-message' => 'Czy na pewno chcesz usunąć tę recenzję?',
+                ],
             ]
         ]
     ],
diff --git a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
index 71d101d23..659bfe1b6 100755
--- a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
@@ -383,7 +383,11 @@ return [
 
                 'view' => [
                     'page-tile' => 'Avaliação #:id',
-                ]
+                ],
+
+                'delete' => [
+                    'confirmation-message' => 'Tem certeza de que deseja excluir este comentário?',
+                ],
             ]
         ]
     ],
diff --git a/packages/Webkul/Shop/src/Resources/lang/tr/app.php b/packages/Webkul/Shop/src/Resources/lang/tr/app.php
index 21609c65f..f2ccf7001 100644
--- a/packages/Webkul/Shop/src/Resources/lang/tr/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/tr/app.php
@@ -388,7 +388,11 @@ return [
 
                 'view' => [
                     'page-tile' => 'İnceleme #:id',
-                ]
+                ],
+
+                'delete' => [
+                    'confirmation-message' => 'Bu incelemeyi silmek istediğinizden emin misiniz?',
+                ],
             ]
         ]
     ],

From dabab1643e656dc59cf301214e5b8d020aaa759a Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Tue, 6 Jul 2021 14:13:46 +0530
Subject: [PATCH 06/11] Prevent Default Removed As Already Not Clickable

---
 .../Resources/views/customers/account/address/index.blade.php    | 1 -
 .../src/Resources/views/customers/account/orders/view.blade.php  | 1 -
 .../Resources/views/shop/customers/account/orders/view.blade.php | 1 -
 3 files changed, 3 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 89e0d2278..cfd0b5863 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
@@ -110,7 +110,6 @@
     <script>
         function deleteAddress(message) {
             if (! confirm(message)) {
-                event.preventDefault();
                 return;
             }
 
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 b171265d4..115b5e20b 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
@@ -569,7 +569,6 @@
     <script>
         function cancelOrder(message) {
             if (! confirm(message)) {
-                event.preventDefault();
                 return;
             }
 
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php
index 7ef89531b..6a661723e 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php
@@ -589,7 +589,6 @@
     <script>
         function cancelOrder(message) {
             if (! confirm(message)) {
-                event.preventDefault();
                 return;
             }
 

From b35dff5366cfe0913e36076d5d094d7151cfda79 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Tue, 6 Jul 2021 14:15:36 +0530
Subject: [PATCH 07/11] One More Removed

---
 .../views/shop/customers/account/address/index.blade.php         | 1 -
 1 file changed, 1 deletion(-)

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 224b3447f..e65353960 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
@@ -79,7 +79,6 @@
     <script>
         function deleteAddress(message) {
             if (! confirm(message)) {
-                event.preventDefault();
                 return;
             }
 

From 2b829570520f840a6fe968a08ca3cbe834aa8772 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Wed, 7 Jul 2021 10:50:04 +0530
Subject: [PATCH 08/11] Removed Installer Folder When GUI Installation
 Completed

---
 packages/Webkul/Core/src/Console/Commands/Install.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/Webkul/Core/src/Console/Commands/Install.php b/packages/Webkul/Core/src/Console/Commands/Install.php
index fb6f86bc0..e6deebadb 100644
--- a/packages/Webkul/Core/src/Console/Commands/Install.php
+++ b/packages/Webkul/Core/src/Console/Commands/Install.php
@@ -73,6 +73,11 @@ class Install extends Command
         $result = shell_exec('composer dump-autoload');
         $this->info($result);
 
+        // removing the installer directory
+        if (is_dir('public/installer')) {
+            shell_exec('rm -rf public/installer');
+        }
+
         // final information
         $this->info('-----------------------------');
         $this->info('Congratulations!');

From 33d0eb4373f4176695b006ebc08fb16c410e08bb Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Wed, 7 Jul 2021 13:33:06 +0530
Subject: [PATCH 09/11] Added Token To Delete All Review

---
 packages/Webkul/Shop/src/Http/routes.php      |  2 +-
 .../customers/account/reviews/index.blade.php | 26 +++++++++----------
 .../customers/account/reviews/index.blade.php | 19 +++++---------
 3 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php
index d4b68577b..7d91bd2ba 100755
--- a/packages/Webkul/Shop/src/Http/routes.php
+++ b/packages/Webkul/Shop/src/Http/routes.php
@@ -295,7 +295,7 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function
                 ])->name('customer.review.delete');
 
                 //Customer all review delete
-                Route::get('reviews/all-delete', 'Webkul\Shop\Http\Controllers\ReviewController@deleteAll')->defaults('_config', [
+                Route::delete('reviews/all-delete', 'Webkul\Shop\Http\Controllers\ReviewController@deleteAll')->defaults('_config', [
                     'redirect' => 'customer.reviews.index'
                 ])->name('customer.review.deleteall');
             });
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 45126df2c..693a8fb7f 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
@@ -17,7 +17,14 @@
 
                 @if (count($reviews) > 1)
                     <div class="account-action">
-                        <a href="{{ route('customer.review.deleteall') }}">{{ __('shop::app.customer.account.wishlist.deleteall') }}</a>
+                        <form id="deleteAllReviewForm" action="{{ route('customer.review.deleteall') }}" method="post">
+                            @method('delete')
+                            @csrf
+                        </form>
+
+                        <a href="javascript:void(0);" onclick="confirm('{{ __('shop::app.customer.account.review.delete.confirmation-message') }}') ? document.getElementById('deleteAllReviewForm').submit() : null;">
+                            {{ __('shop::app.customer.account.wishlist.deleteall') }}
+                        </a>
                     </div>
                 @endif
 
@@ -62,9 +69,12 @@
                                     @csrf
                                 </form>
 
-                                <a class="mb-50" href="javascript:void(0);" onclick="deleteReview('{{ __('shop::app.customer.account.review.delete.confirmation-message') }}')"><span class="icon trash-icon"></span></a>
+                                <a class="mb-50" href="javascript:void(0);" onclick="confirm('{{ __('shop::app.customer.account.review.delete.confirmation-message') }}') ? document.getElementById('deleteReviewForm').submit() : null;">
+                                    <span class="icon trash-icon"></span>
+                                </a>
                             </div>
                         </div>
+
                         <div class="horizontal-rule mb-10 mt-10"></div>
                     @endforeach
 
@@ -83,15 +93,3 @@
         </div>
     </div>
 @endsection
-
-@push('scripts')
-    <script>
-        function deleteReview(message) {
-            if (! confirm(message)) {
-                return;
-            }
-
-            $('#deleteReviewForm').submit();
-        }
-    </script>
-@endpush
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/reviews/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/reviews/index.blade.php
index 99ba7f53f..fa7f91892 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/reviews/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/reviews/index.blade.php
@@ -16,7 +16,12 @@
 
         @if (count($reviews) > 1)
             <div class="account-action float-right">
-                <a href="{{ route('customer.review.deleteall') }}" class="theme-btn light unset">
+                <form id="deleteAllReviewForm" action="{{ route('customer.review.deleteall') }}" method="post">
+                    @method('delete')
+                    @csrf
+                </form>
+
+                <a href="javascript:void(0);" class="theme-btn light unset" onclick="confirm('{{ __('shop::app.customer.account.review.delete.confirmation-message') }}') ? document.getElementById('deleteAllReviewForm').submit() : null;">
                     {{ __('shop::app.customer.account.wishlist.deleteall') }}
                 </a>
             </div>
@@ -64,7 +69,7 @@
                                 @csrf
                             </form>
 
-                            <a class="unset" href="javacript:void(0);" onclick="deleteReview('{{ __('shop::app.customer.account.review.delete.confirmation-message') }}')">
+                            <a class="unset" href="javascript:void(0);" onclick="confirm('{{ __('shop::app.customer.account.review.delete.confirmation-message') }}') ? document.getElementById('deleteReviewForm').submit() : null;">
                                 <span class="rango-delete fs24"></span>
                                 <span class="align-vertical-top">{{ __('shop::app.checkout.cart.remove') }}</span>
                             </a>
@@ -89,16 +94,6 @@
 @endsection
 
 @push('scripts')
-    <script>
-        function deleteReview(message) {
-            if (! confirm(message)) {
-                return;
-            }
-
-            $('#deleteReviewForm').submit();
-        }
-    </script>
-
     <script type="text/x-template" id="load-more-template">
         <div class="col-12 row justify-content-center">
             <button type="button" class="theme-btn light" @click="loadNextPage">Load More</button>

From 23537d2b6da122f691c9ece19fe6110d583a1de6 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Wed, 7 Jul 2021 13:49:48 +0530
Subject: [PATCH 10/11] Translation Added

---
 packages/Webkul/Shop/src/Resources/lang/ar/app.php    | 5 +++++
 packages/Webkul/Shop/src/Resources/lang/de/app.php    | 5 +++++
 packages/Webkul/Shop/src/Resources/lang/en/app.php    | 5 +++++
 packages/Webkul/Shop/src/Resources/lang/es/app.php    | 5 +++++
 packages/Webkul/Shop/src/Resources/lang/fa/app.php    | 5 +++++
 packages/Webkul/Shop/src/Resources/lang/fr/app.php    | 5 +++++
 packages/Webkul/Shop/src/Resources/lang/it/app.php    | 5 +++++
 packages/Webkul/Shop/src/Resources/lang/ja/app.php    | 5 +++++
 packages/Webkul/Shop/src/Resources/lang/nl/app.php    | 5 +++++
 packages/Webkul/Shop/src/Resources/lang/pl/app.php    | 5 +++++
 packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php | 5 +++++
 packages/Webkul/Shop/src/Resources/lang/tr/app.php    | 5 +++++
 12 files changed, 60 insertions(+)

diff --git a/packages/Webkul/Shop/src/Resources/lang/ar/app.php b/packages/Webkul/Shop/src/Resources/lang/ar/app.php
index 9cb13b744..4880b0072 100644
--- a/packages/Webkul/Shop/src/Resources/lang/ar/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/ar/app.php
@@ -396,6 +396,11 @@ return [
                 'delete' => [
                     'confirmation-message' => 'هل أنت متأكد أنك تريد حذف هذه المراجعة؟',
                 ],
+
+                'delete-all' => [
+                    'title' => 'حذف الكل',
+                    'confirmation-message' => 'هل أنت متأكد أنك تريد حذف جميع المراجعات؟',
+                ],
             ]
         ]
     ],
diff --git a/packages/Webkul/Shop/src/Resources/lang/de/app.php b/packages/Webkul/Shop/src/Resources/lang/de/app.php
index ad7301cdf..d93c77660 100755
--- a/packages/Webkul/Shop/src/Resources/lang/de/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/de/app.php
@@ -393,6 +393,11 @@ return [
                 'delete' => [
                     'confirmation-message' => 'Möchten Sie diese Bewertung wirklich löschen?',
                 ],
+
+                'delete-all' => [
+                    'title' => 'Alles löschen',
+                    'confirmation-message' => 'Möchten Sie wirklich alle Bewertungen löschen?',
+                ],
             ]
         ]
     ],
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index e0dabaab3..1063e15d8 100755
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -398,6 +398,11 @@ return [
                 'delete' => [
                     'confirmation-message' => 'Are you sure you want to delete this review?',
                 ],
+
+                'delete-all' => [
+                    'title' => 'Delete All',
+                    'confirmation-message' => 'Are you sure you want to delete all the reviews?',
+                ],
             ]
         ]
     ],
diff --git a/packages/Webkul/Shop/src/Resources/lang/es/app.php b/packages/Webkul/Shop/src/Resources/lang/es/app.php
index 4ea177dfc..bc9a2ea9e 100644
--- a/packages/Webkul/Shop/src/Resources/lang/es/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/es/app.php
@@ -396,6 +396,11 @@ return [
                 'delete' => [
                     'confirmation-message' => '¿Seguro que quieres eliminar esta crítica?',
                 ],
+
+                'delete-all' => [
+                    'title' => 'Eliminar todos',
+                    'confirmation-message' => '¿Estás segura de que quieres eliminar todas las críticas?',
+                ],
             ]
         ]
     ],
diff --git a/packages/Webkul/Shop/src/Resources/lang/fa/app.php b/packages/Webkul/Shop/src/Resources/lang/fa/app.php
index 207fdc6f5..a7268b700 100644
--- a/packages/Webkul/Shop/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/fa/app.php
@@ -392,6 +392,11 @@ return [
                 'delete' => [
                     'confirmation-message' => 'آیا شما مطمئن هستید که می خواهید این نظر را حذف کنید؟',
                 ],
+
+                'delete-all' => [
+                    'title' => 'حذف همه',
+                    'confirmation-message' => 'آیا مطمئن هستید که می خواهید همه بررسی ها را حذف کنید؟',
+                ],
             ]
         ]
     ],
diff --git a/packages/Webkul/Shop/src/Resources/lang/fr/app.php b/packages/Webkul/Shop/src/Resources/lang/fr/app.php
index 9ca442d63..748cd750a 100755
--- a/packages/Webkul/Shop/src/Resources/lang/fr/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/fr/app.php
@@ -394,6 +394,11 @@ return [
                 'delete' => [
                     'confirmation-message' => 'Êtes-vous sûr de vouloir supprimer cet avis ?',
                 ],
+
+                'delete-all' => [
+                    'title' => 'Tout supprimer',
+                    'confirmation-message' => 'Êtes-vous sûr de vouloir supprimer tous les avis ?',
+                ],
             ],
         ],
     ],
diff --git a/packages/Webkul/Shop/src/Resources/lang/it/app.php b/packages/Webkul/Shop/src/Resources/lang/it/app.php
index 9ef790107..7f3f40da0 100644
--- a/packages/Webkul/Shop/src/Resources/lang/it/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/it/app.php
@@ -394,6 +394,11 @@ return [
                 'delete' => [
                     'confirmation-message' => 'Sei sicuro di voler eliminare questa recensione?',
                 ],
+
+                'delete-all' => [
+                    'title' => 'Cancella tutto',
+                    'confirmation-message' => 'Sei sicuro di voler eliminare tutte le recensioni?',
+                ],
             ]
         ]
     ],
diff --git a/packages/Webkul/Shop/src/Resources/lang/ja/app.php b/packages/Webkul/Shop/src/Resources/lang/ja/app.php
index 50b5b2608..0ec1bf812 100644
--- a/packages/Webkul/Shop/src/Resources/lang/ja/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/ja/app.php
@@ -374,6 +374,11 @@ return [
                 'delete' => [
                     'confirmation-message' => 'このレビューを削除してもよろしいですか？',
                 ],
+
+                'delete-all' => [
+                    'title' => 'すべて削除',
+                    'confirmation-message' => 'すべてのレビューを削除してもよろしいですか？',
+                ],
             ]
         ]
     ],
diff --git a/packages/Webkul/Shop/src/Resources/lang/nl/app.php b/packages/Webkul/Shop/src/Resources/lang/nl/app.php
index 8371b5db3..955e4e8ea 100644
--- a/packages/Webkul/Shop/src/Resources/lang/nl/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/nl/app.php
@@ -400,6 +400,11 @@ return [
                 'delete' => [
                     'confirmation-message' => 'Weet je zeker dat je deze recensie wilt verwijderen?',
                 ],
+
+                'delete-all' => [
+                    'title' => 'Verwijder alles',
+                    'confirmation-message' => 'Weet u zeker dat u alle beoordelingen wilt verwijderen?',
+                ],
             ]
         ]
     ],
diff --git a/packages/Webkul/Shop/src/Resources/lang/pl/app.php b/packages/Webkul/Shop/src/Resources/lang/pl/app.php
index 6ffc8dff7..f73745ef9 100644
--- a/packages/Webkul/Shop/src/Resources/lang/pl/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/pl/app.php
@@ -394,6 +394,11 @@ return [
                 'delete' => [
                     'confirmation-message' => 'Czy na pewno chcesz usunąć tę recenzję?',
                 ],
+
+                'delete-all' => [
+                    'title' => 'Usuń wszystko',
+                    'confirmation-message' => 'Czy na pewno chcesz usunąć wszystkie opinie?',
+                ],
             ]
         ]
     ],
diff --git a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
index 659bfe1b6..af10adfa8 100755
--- a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
@@ -388,6 +388,11 @@ return [
                 'delete' => [
                     'confirmation-message' => 'Tem certeza de que deseja excluir este comentário?',
                 ],
+
+                'delete-all' => [
+                    'title' => 'Apagar tudo',
+                    'confirmation-message' => 'Tem certeza de que deseja excluir todos os comentários?',
+                ],
             ]
         ]
     ],
diff --git a/packages/Webkul/Shop/src/Resources/lang/tr/app.php b/packages/Webkul/Shop/src/Resources/lang/tr/app.php
index f2ccf7001..cafc02df3 100644
--- a/packages/Webkul/Shop/src/Resources/lang/tr/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/tr/app.php
@@ -393,6 +393,11 @@ return [
                 'delete' => [
                     'confirmation-message' => 'Bu incelemeyi silmek istediğinizden emin misiniz?',
                 ],
+
+                'delete-all' => [
+                    'title' => 'Hepsini sil',
+                    'confirmation-message' => 'Tüm yorumları silmek istediğinizden emin misiniz?',
+                ],
             ]
         ]
     ],

From 4b49c9bc186f42ef73a7ef65ae73b22ce2ddd937 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Wed, 7 Jul 2021 13:50:04 +0530
Subject: [PATCH 11/11] Translation Key Updated

---
 .../Resources/views/customers/account/reviews/index.blade.php | 4 ++--
 .../views/shop/customers/account/reviews/index.blade.php      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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 693a8fb7f..4f04c8f2f 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
@@ -22,8 +22,8 @@
                             @csrf
                         </form>
 
-                        <a href="javascript:void(0);" onclick="confirm('{{ __('shop::app.customer.account.review.delete.confirmation-message') }}') ? document.getElementById('deleteAllReviewForm').submit() : null;">
-                            {{ __('shop::app.customer.account.wishlist.deleteall') }}
+                        <a href="javascript:void(0);" onclick="confirm('{{ __('shop::app.customer.account.review.delete-all.confirmation-message') }}') ? document.getElementById('deleteAllReviewForm').submit() : null;">
+                            {{ __('shop::app.customer.account.review.delete-all.title') }}
                         </a>
                     </div>
                 @endif
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/reviews/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/reviews/index.blade.php
index fa7f91892..8aecbb987 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/reviews/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/reviews/index.blade.php
@@ -21,8 +21,8 @@
                     @csrf
                 </form>
 
-                <a href="javascript:void(0);" class="theme-btn light unset" onclick="confirm('{{ __('shop::app.customer.account.review.delete.confirmation-message') }}') ? document.getElementById('deleteAllReviewForm').submit() : null;">
-                    {{ __('shop::app.customer.account.wishlist.deleteall') }}
+                <a href="javascript:void(0);" class="theme-btn light unset" onclick="confirm('{{ __('shop::app.customer.account.review.delete-all.confirmation-message') }}') ? document.getElementById('deleteAllReviewForm').submit() : null;">
+                    {{ __('shop::app.customer.account.review.delete-all.title') }}
                 </a>
             </div>
         @endif