wip

Author: duncanmcclean

routes/actions.php

@@ -6,22 +6,19 @@
 use DuncanMcClean\SimpleCommerce\Http\Controllers\DigitalProducts\DownloadController;
 use DuncanMcClean\SimpleCommerce\Http\Controllers\Payments\CallbackController;
 use DuncanMcClean\SimpleCommerce\Http\Controllers\Payments\WebhookController;
-use DuncanMcClean\SimpleCommerce\Http\Middleware\EnsureFormParametersArriveIntact;
 use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken;
 use Illuminate\Support\Facades\Route;
 
 Route::name('simple-commerce.')->group(function () {
-    Route::middleware(EnsureFormParametersArriveIntact::class)->group(function () {
-        Route::get('cart', [CartController::class, 'index'])->name('cart.index');
-        Route::patch('cart', [CartController::class, 'update'])->name('cart.update');
-        Route::delete('cart', [CartController::class, 'destroy'])->name('cart.update');
+    Route::get('cart', [CartController::class, 'index'])->name('cart.index');
+    Route::patch('cart', [CartController::class, 'update'])->name('cart.update');
+    Route::delete('cart', [CartController::class, 'destroy'])->name('cart.destroy');
 
-        Route::post('cart/line-items', [CartLineItemsController::class, 'store'])->name('cart.line-items.store');
-        Route::patch('cart/line-items/{lineItem}', [CartLineItemsController::class, 'update'])->name('cart.line-items.update');
-        Route::delete('cart/line-items/{lineItem}', [CartLineItemsController::class, 'destroy'])->name('cart.line-items.destroy');
+    Route::post('cart/line-items', [CartLineItemsController::class, 'store'])->name('cart.line-items.store');
+    Route::patch('cart/line-items/{lineItem}', [CartLineItemsController::class, 'update'])->name('cart.line-items.update');
+    Route::delete('cart/line-items/{lineItem}', [CartLineItemsController::class, 'destroy'])->name('cart.line-items.destroy');
 
-        Route::post('checkout', CheckoutController::class)->name('checkout');
-    });
+    Route::post('checkout', CheckoutController::class)->name('checkout');
 
     Route::name('payments.')
         ->prefix('payments')

src/Http/Controllers/BaseActionController.php

@@ -9,7 +9,7 @@
 use Illuminate\Support\Arr;
 use Statamic\Exceptions\NotFoundHttpException;
 
-class CartController extends BaseActionController
+class CartController
 {
     use Concerns\HandlesCustomerInformation;
 
@@ -36,7 +36,11 @@ public function update(UpdateCartRequest $request)
 
         $cart->save();
 
-        return new CartResource($cart->fresh());
+        if ($request->ajax() || $request->wantsJson()) {
+            return new CartResource($cart->fresh());
+        }
+
+        return $request->_redirect ? redirect($request->_redirect) : back();
     }
 
     public function destroy(Request $request)
@@ -45,6 +49,10 @@ public function destroy(Request $request)
 
         Cart::forgetCurrentCart();
 
-        return [];
+        if ($request->ajax() || $request->wantsJson()) {
+            return [];
+        }
+
+        return $request->_redirect ? redirect($request->_redirect) : back();
     }
 }

src/Http/Controllers/CartController.php

@@ -11,7 +11,7 @@
 use Illuminate\Http\Request;
 use Statamic\Exceptions\NotFoundHttpException;
 
-class CartLineItemsController extends BaseActionController
+class CartLineItemsController
 {
     use Concerns\HandlesCustomerInformation, Concerns\ValidatesStock, Concerns\HandlePrerequisiteProducts;
 
@@ -21,7 +21,7 @@ public function store(AddLineItemRequest $request)
         $product = Product::find($request->product);
 
         $data = $request->collect()->except([
-            '_redirect', '_error_redirect', '_request', 'product', 'variant', 'quantity', 'first_name', 'last_name'. 'email', 'customer',
+            '_redirect', '_error_redirect', 'product', 'variant', 'quantity', 'first_name', 'last_name'. 'email', 'customer',
         ]);
 
         $this->validateStock($request, $cart);
@@ -63,7 +63,11 @@ public function store(AddLineItemRequest $request)
 
         $cart->save();
 
-        return new CartResource($cart->fresh());
+        if ($request->ajax() || $request->wantsJson()) {
+            return new CartResource($cart->fresh());
+        }
+
+        return $request->_redirect ? redirect($request->_redirect) : back();
     }
 
     public function update(UpdateLineItemRequest $request, string $lineItem)
@@ -74,7 +78,7 @@ public function update(UpdateLineItemRequest $request, string $lineItem)
         throw_if(! $lineItem, NotFoundHttpException::class);
 
         $data = $request->collect()->except([
-            '_redirect', '_error_redirect', '_request', 'product', 'variant', 'quantity', 'first_name', 'last_name'. 'email', 'customer',
+            '_redirect', '_error_redirect', 'product', 'variant', 'quantity', 'first_name', 'last_name'. 'email', 'customer',
         ]);
 
         $this->validateStock($request, $cart, $lineItem);
@@ -89,7 +93,11 @@ public function update(UpdateLineItemRequest $request, string $lineItem)
 
         $cart->save();
 
-        return new CartResource($cart->fresh());
+        if ($request->ajax() || $request->wantsJson()) {
+            return new CartResource($cart->fresh());
+        }
+
+        return $request->_redirect ? redirect($request->_redirect) : back();
     }
 
     public function destroy(Request $request, string $lineItem)
@@ -104,6 +112,10 @@ public function destroy(Request $request, string $lineItem)
         $cart->lineItems()->remove($lineItem->id());
         $cart->save();
 
-        return new CartResource($cart->fresh());
+        if ($request->ajax() || $request->wantsJson()) {
+            return new CartResource($cart->fresh());
+        }
+
+        return $request->_redirect ? redirect($request->_redirect) : back();
     }
 }

src/Http/Controllers/CartLineItemsController.php

@@ -11,7 +11,7 @@
 use DuncanMcClean\SimpleCommerce\Orders\Blueprint;
 use Illuminate\Http\Request;
 
-class CheckoutController extends BaseActionController
+class CheckoutController
 {
     use Concerns\HandlesCustomerInformation, Concerns\ValidatesStock;
 
@@ -42,6 +42,10 @@ public function __invoke(Request $request)
 
         Cart::forgetCurrentCart();
 
-        return $this->formSuccess($request, new CartResource(Cart::current()));
+        if ($request->ajax() || $request->wantsJson()) {
+            return new CartResource($cart);
+        }
+
+        return $request->_redirect ? redirect($request->_redirect) : back();
     }
 }

src/Http/Controllers/CheckoutController.php

@@ -6,14 +6,13 @@
 use DuncanMcClean\SimpleCommerce\Exceptions\GatewayDoesNotExist;
 use DuncanMcClean\SimpleCommerce\Facades\Gateway;
 use DuncanMcClean\SimpleCommerce\Facades\Order;
-use DuncanMcClean\SimpleCommerce\Http\Controllers\BaseActionController;
 use DuncanMcClean\SimpleCommerce\Orders\Cart\Drivers\CartDriver;
 use DuncanMcClean\SimpleCommerce\Orders\OrderStatus;
 use DuncanMcClean\SimpleCommerce\Orders\PaymentStatus;
 use DuncanMcClean\SimpleCommerce\SimpleCommerce;
 use Illuminate\Http\Request;
 
-class CallbackController extends BaseActionController
+class CallbackController
 {
     public function __invoke(Request $request, $gateway)
     {

src/Http/Controllers/Payments/CallbackController.php

@@ -5,11 +5,10 @@
 use DuncanMcClean\SimpleCommerce\Events\GatewayWebhookReceived;
 use DuncanMcClean\SimpleCommerce\Exceptions\GatewayDoesNotExist;
 use DuncanMcClean\SimpleCommerce\Facades\Gateway;
-use DuncanMcClean\SimpleCommerce\Http\Controllers\BaseActionController;
 use DuncanMcClean\SimpleCommerce\SimpleCommerce;
 use Illuminate\Http\Request;
 
-class WebhookController extends BaseActionController
+class WebhookController
 {
     public function __invoke(Request $request, $gateway)
     {

src/Http/Controllers/Payments/WebhookController.php

@@ -2,19 +2,15 @@
 
 namespace DuncanMcClean\SimpleCommerce\Http\Requests\Cart;
 
-use DuncanMcClean\SimpleCommerce\Facades\Cart;
 use DuncanMcClean\SimpleCommerce\Facades\Product;
 use DuncanMcClean\SimpleCommerce\Products\ProductType;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
-use Statamic\Exceptions\NotFoundHttpException;
 
 class AddLineItemRequest extends FormRequest
 {
     public function authorize()
     {
-        throw_if(! Cart::hasCurrentCart(), NotFoundHttpException::class);
-
         return true;
     }