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 @@ {{ __('admin::app.sales.orders.SKU') }} {{ __('admin::app.sales.orders.product-name') }} + {{ __('admin::app.sales.orders.price') }} {{ __('admin::app.sales.orders.item-status') }} {{ __('admin::app.sales.orders.subtotal') }} {{ __('admin::app.sales.orders.tax-amount') }} @@ -261,6 +262,8 @@ @endif + {{ core()->formatBasePrice($item->base_price) }} + {{ $item->qty_ordered ? __('admin::app.sales.orders.item-ordered', ['qty_ordered' => $item->qty_ordered]) : '' }} @@ -283,7 +286,7 @@ - {{ core()->formatBasePrice($item->base_price) }} + {{ core()->formatBasePrice($item->base_total) }} {{ core()->formatBasePrice($item->base_tax_amount) }} 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!'); diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php index c9e3fe892..7d91bd2ba 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,12 +290,12 @@ 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'); //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/lang/ar/app.php b/packages/Webkul/Shop/src/Resources/lang/ar/app.php index 710362596..4880b0072 100644 --- a/packages/Webkul/Shop/src/Resources/lang/ar/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/ar/app.php @@ -391,7 +391,16 @@ return [ 'view' => [ 'page-tile' => '#:id مراجعة', - ] + ], + + '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 d4876679f..d93c77660 100755 --- a/packages/Webkul/Shop/src/Resources/lang/de/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/de/app.php @@ -388,7 +388,16 @@ return [ 'view' => [ 'page-tile' => 'Bewertung #:id', - ] + ], + + '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 8c8efc73b..1063e15d8 100755 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -387,12 +387,22 @@ 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?', + ], + + '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 2c985c307..bc9a2ea9e 100644 --- a/packages/Webkul/Shop/src/Resources/lang/es/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/es/app.php @@ -391,7 +391,16 @@ return [ 'view' => [ 'page-tile' => 'Opinión #:id', - ] + ], + + '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 745d6d48a..a7268b700 100644 --- a/packages/Webkul/Shop/src/Resources/lang/fa/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/fa/app.php @@ -387,7 +387,16 @@ return [ 'view' => [ 'page-tile' => '#:id بررسی', - ] + ], + + '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 e07caa7f0..748cd750a 100755 --- a/packages/Webkul/Shop/src/Resources/lang/fr/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/fr/app.php @@ -390,6 +390,15 @@ return [ 'view' => [ 'page-tile' => 'Avis n° :id', ], + + '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 5931ff60a..7f3f40da0 100644 --- a/packages/Webkul/Shop/src/Resources/lang/it/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/it/app.php @@ -389,7 +389,16 @@ return [ 'view' => [ 'page-tile' => 'Recensione #:id', - ] + ], + + '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 5f3cf1864..0ec1bf812 100644 --- a/packages/Webkul/Shop/src/Resources/lang/ja/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/ja/app.php @@ -369,7 +369,16 @@ return [ 'view' => [ 'page-tile' => 'レビュー #:id', - ] + ], + + '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 931c31e26..955e4e8ea 100644 --- a/packages/Webkul/Shop/src/Resources/lang/nl/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/nl/app.php @@ -395,7 +395,16 @@ return [ 'view' => [ 'page-tile' => 'Recensies #:id', - ] + ], + + '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 ef31896a7..f73745ef9 100644 --- a/packages/Webkul/Shop/src/Resources/lang/pl/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/pl/app.php @@ -389,7 +389,16 @@ return [ 'view' => [ 'page-tile' => 'Recenzja #:id', - ] + ], + + '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 71d101d23..af10adfa8 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,16 @@ return [ 'view' => [ 'page-tile' => 'Avaliação #:id', - ] + ], + + '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 21609c65f..cafc02df3 100644 --- a/packages/Webkul/Shop/src/Resources/lang/tr/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/tr/app.php @@ -388,7 +388,16 @@ return [ 'view' => [ 'page-tile' => 'İnceleme #:id', - ] + ], + + '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?', + ], ] ] ], 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..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 @@ -17,7 +17,14 @@ @if (count($reviews) > 1)
- {{ __('shop::app.customer.account.wishlist.deleteall') }} +
+ @method('delete') + @csrf +
+ + + {{ __('shop::app.customer.account.review.delete-all.title') }} +
@endif @@ -57,9 +64,17 @@
- +
+ @method('delete') + @csrf +
+ + + +
+
@endforeach @@ -77,4 +92,4 @@ {!! view_render_event('bagisto.shop.customers.account.reviews.list.after', ['reviews' => $reviews]) !!} -@endsection \ No newline at end of file +@endsection 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..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 @@ -16,8 +16,13 @@ @if (count($reviews) > 1)
- - {{ __('shop::app.customer.account.wishlist.deleteall') }} +
+ @method('delete') + @csrf +
+ +
+ {{ __('shop::app.customer.account.review.delete-all.title') }}
@endif @@ -59,7 +64,12 @@
- +
+ @method('delete') + @csrf +
+ +
{{ __('shop::app.checkout.cart.remove') }}