diff --git a/packages/Sarga/API/Http/Resources/Checkout/CartItemResource.php b/packages/Sarga/API/Http/Resources/Checkout/CartItemResource.php index b4a8dd37c..f77c53140 100644 --- a/packages/Sarga/API/Http/Resources/Checkout/CartItemResource.php +++ b/packages/Sarga/API/Http/Resources/Checkout/CartItemResource.php @@ -3,8 +3,7 @@ namespace Sarga\API\Http\Resources\Checkout; use Illuminate\Http\Resources\Json\JsonResource; -use Sarga\API\Http\Resources\Catalog\Product as ProductResource; -use Webkul\Marketplace\Repositories\ProductRepository; +use Sarga\API\Http\Resources\Catalog\Product; class CartItemResource extends JsonResource { @@ -32,8 +31,8 @@ class CartItemResource extends JsonResource 'additional' => is_array($this->resource->additional) ? $this->resource->additional : json_decode($this->resource->additional, true), - 'child' => new self($this->child), - 'product' => $this->when($this->product_id, new CartItemProduct($this->product)), + 'main_product' => $this->when($this->child, new Product($this->product)), + 'product' => $this->when($this->product_id, new CartItemProduct($this->child->product ?? $this->product)), ]; } } diff --git a/packages/Sarga/API/Http/Resources/Customer/OrderItemResource.php b/packages/Sarga/API/Http/Resources/Customer/OrderItemResource.php index 9b504842b..2ceb742e4 100644 --- a/packages/Sarga/API/Http/Resources/Customer/OrderItemResource.php +++ b/packages/Sarga/API/Http/Resources/Customer/OrderItemResource.php @@ -3,6 +3,7 @@ namespace Sarga\API\Http\Resources\Customer; use Illuminate\Http\Resources\Json\JsonResource; +use Sarga\API\Http\Resources\Catalog\Product; use Sarga\API\Http\Resources\Checkout\CartItemProduct; class OrderItemResource extends JsonResource @@ -56,7 +57,7 @@ class OrderItemResource extends JsonResource // 'additional' => is_array($this->resource->additional) // ? $this->resource->additional // : json_decode($this->resource->additional, true), - 'child' => new self($this->child), + 'main_product' => new Product($this->product), // 'children' => Self::collection($this->children), ]; }