From 3bd237e65674ad5b0437fe221e95501c0bda100d Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Tue, 6 Jul 2021 13:11:59 +0530 Subject: [PATCH 1/6] 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 @@ @@ -105,8 +109,12 @@ @push('scripts') @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') }} - - + {{ __('shop::app.customer.account.address.index.delete') }} + +
+ @method('delete') + @csrf +
@@ -77,8 +78,12 @@ @push('scripts') @endpush From b8ccf82246bcedc6ec7d6863d19d1841da66afd3 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Tue, 6 Jul 2021 13:29:41 +0530 Subject: [PATCH 2/6] 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()) - +
+ @csrf +
+ +
{{ __('shop::app.customer.account.order.view.cancel-btn-title') }} @endif @@ -560,3 +564,16 @@ @endsection + +@push('scripts') + +@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()) @@ -579,4 +583,17 @@ {!! 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 From 51b0f5d7e09ecf93198187522920a4bebedb6f55 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Tue, 6 Jul 2021 14:00:06 +0530 Subject: [PATCH 3/6] 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 @@
- +
+ @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/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') + +