Fix "Recursion detected" error with cart endpoints

Author: duncanmcclean

src/Http/Controllers/BaseActionController.php

@@ -10,6 +10,16 @@ class BaseActionController extends Controller
 {
     protected function withSuccess(Request $request, array $data = [])
     {
+        // The cart is only useful in a JSON response, so we'll remove it from
+        // the $data array before we pass it to the view.
+        if (Arr::has($data, 'cart')) {
+            // dd($data['cart']);
+            // unset($data['cart']['customer']);
+            // unset($data['cart']['customer_id']);
+
+            // dd($data['cart']['customer']);
+        }
+
         if ($request->wantsJson()) {
             $data = array_merge($data, [
                 'status' => 'success',

src/Http/Controllers/CartController.php

@@ -22,8 +22,9 @@ public function index(IndexRequest $request)
         }
 
         return [
-            'data' => $this->getCart()
+            'cart' => $this->getCart()
                 ->toAugmentedCollection()
+                ->withRelations(['customer', 'customer_id'])
                 ->withShallowNesting()
                 ->toArray(),
         ];
@@ -58,7 +59,11 @@ public function update(UpdateRequest $request)
 
         return $this->withSuccess($request, [
             'message' => __('Cart Updated'),
-            'cart' => $cart->toAugmentedArray(),
+            'cart' => $this->getCart()
+                ->toAugmentedCollection()
+                ->withRelations(['customer', 'customer_id'])
+                ->withShallowNesting()
+                ->toArray(),
         ]);
     }
 
@@ -72,7 +77,6 @@ public function destroy(DestroyRequest $request)
 
         return $this->withSuccess($request, [
             'message' => __('Cart Deleted'),
-            'cart' => null,
         ]);
     }
 

src/Http/Controllers/CartItemController.php

@@ -119,7 +119,11 @@ public function store(StoreRequest $request)
 
         return $this->withSuccess($request, [
             'message' => __('Added to Cart'),
-            'cart' => $cart->fresh()->toAugmentedArray(),
+            'cart' => $this->getCart()
+                ->toAugmentedCollection()
+                ->withRelations(['customer', 'customer_id'])
+                ->withShallowNesting()
+                ->toArray(),
         ]);
     }
 
@@ -163,7 +167,11 @@ public function update(UpdateRequest $request, string $requestItem)
 
         return $this->withSuccess($request, [
             'message' => __('Line Item Updated'),
-            'cart' => $cart->toAugmentedArray(),
+            'cart' => $this->getCart()
+                ->toAugmentedCollection()
+                ->withRelations(['customer', 'customer_id'])
+                ->withShallowNesting()
+                ->toArray(),
         ]);
     }
 
@@ -175,7 +183,11 @@ public function destroy(DestroyRequest $request, string $item)
 
         return $this->withSuccess($request, [
             'message' => __('Item Removed from Cart'),
-            'cart' => $cart->toAugmentedArray(),
+            'cart' => $this->getCart()
+                ->toAugmentedCollection()
+                ->withRelations(['customer', 'customer_id'])
+                ->withShallowNesting()
+                ->toArray(),
         ]);
     }
 

src/Http/Controllers/CheckoutController.php

@@ -52,7 +52,11 @@ public function __invoke(CheckoutRequest $request)
 
         return $this->withSuccess($request, [
             'message' => __('Checkout Complete!'),
-            'cart' => $this->order->toAugmentedArray(),
+            'cart' => $this->getCart()
+                ->toAugmentedCollection()
+                ->withRelations(['customer', 'customer_id'])
+                ->withShallowNesting()
+                ->toArray(),
             'is_checkout_request' => true,
         ]);
     }

src/Http/Controllers/CouponController.php

@@ -25,7 +25,11 @@ public function store(StoreRequest $request)
 
         return $this->withSuccess($request, [
             'message' => __('Coupon added to cart'),
-            'cart' => $this->getCart()->toAugmentedArray(),
+            'cart' => $this->getCart()
+                ->toAugmentedCollection()
+                ->withRelations(['customer', 'customer_id'])
+                ->withShallowNesting()
+                ->toArray(),
         ]);
     }
 
@@ -41,7 +45,11 @@ public function destroy(DestroyRequest $request)
 
         return $this->withSuccess($request, [
             'message' => __('Coupon removed from cart'),
-            'cart' => $this->getCart()->toAugmentedArray(),
+            'cart' => $this->getCart()
+                ->toAugmentedCollection()
+                ->withRelations(['customer', 'customer_id'])
+                ->withShallowNesting()
+                ->toArray(),
         ]);
     }
 }