diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php index c9e3fe892..d4b68577b 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) @@ -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 @@ -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/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?', + ], ] ] ], 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..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 @@ -77,18 +77,22 @@ @@ -105,8 +109,11 @@ @push('scripts') @endpush 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..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 @@ -21,7 +21,11 @@ @if ($order->canCancel()) - +
+ @csrf +
+ +
{{ __('shop::app.customer.account.order.view.cancel-btn-title') }} @endif @@ -560,3 +564,15 @@ @endsection + +@push('scripts') + +@endpush \ No newline at end of file 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 @@
- +
+ @method('delete') + @csrf +
+ +
@@ -77,4 +82,16 @@ {!! view_render_event('bagisto.shop.customers.account.reviews.list.after', ['reviews' => $reviews]) !!} -@endsection \ No newline at end of file +@endsection + +@push('scripts') + +@endpush \ No newline at end of file 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..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 @@ -56,13 +56,14 @@ {{ __('shop::app.customer.account.address.index.edit') }} - - + {{ __('shop::app.customer.account.address.index.delete') }} + +
+ @method('delete') + @csrf +
@@ -77,8 +78,11 @@ @push('scripts') @endpush 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..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 @@ -28,7 +28,11 @@ @if ($order->canCancel()) - +
+ @csrf +
+ +
{{ __('shop::app.customer.account.order.view.cancel-btn-title') }}
@@ -579,4 +583,16 @@ {!! view_render_event('bagisto.shop.customers.account.orders.view.after', ['order' => $order]) !!} -@endsection \ No newline at end of file +@endsection + +@push('scripts') + +@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 @@
- +
+ @method('delete') + @csrf +
+ +
{{ __('shop::app.checkout.cart.remove') }} @@ -84,6 +89,16 @@ @endsection @push('scripts') + +