diff --git a/packages/Sarga/API/Http/Resources/Checkout/CartItemResource.php b/packages/Sarga/API/Http/Resources/Checkout/CartItemResource.php index fd89463fb..b4a8dd37c 100644 --- a/packages/Sarga/API/Http/Resources/Checkout/CartItemResource.php +++ b/packages/Sarga/API/Http/Resources/Checkout/CartItemResource.php @@ -4,7 +4,7 @@ namespace Sarga\API\Http\Resources\Checkout; use Illuminate\Http\Resources\Json\JsonResource; use Sarga\API\Http\Resources\Catalog\Product as ProductResource; -use Sarga\API\Http\Resources\Catalog\ProductVariant; +use Webkul\Marketplace\Repositories\ProductRepository; class CartItemResource extends JsonResource { @@ -33,7 +33,7 @@ class CartItemResource extends JsonResource ? $this->resource->additional : json_decode($this->resource->additional, true), 'child' => new self($this->child), - 'product' => $this->when($this->product_id, new ProductVariant($this->product->parent->super_attributes??null)) + 'product' => $this->when($this->product_id, new CartItemProduct($this->product)), ]; } } diff --git a/packages/Sarga/API/Http/Resources/Checkout/CartResource.php b/packages/Sarga/API/Http/Resources/Checkout/CartResource.php index 035e050ca..2b67e9d77 100644 --- a/packages/Sarga/API/Http/Resources/Checkout/CartResource.php +++ b/packages/Sarga/API/Http/Resources/Checkout/CartResource.php @@ -22,11 +22,6 @@ class CartResource extends JsonResource */ public function toArray($request): array { - $taxes = Tax::getTaxRatesWithAmount($this, false); - $baseTaxes = Tax::getTaxRatesWithAmount($this, true); - - $formatedTaxes = $this->formatTaxAmounts($taxes, false); - $formatedBaseTaxes = $this->formatTaxAmounts($baseTaxes, true); return [ 'id' => $this->id, diff --git a/packages/Sarga/API/Http/Resources/Customer/OrderResource.php b/packages/Sarga/API/Http/Resources/Customer/OrderResource.php index 73b21d3aa..37ab34cee 100644 --- a/packages/Sarga/API/Http/Resources/Customer/OrderResource.php +++ b/packages/Sarga/API/Http/Resources/Customer/OrderResource.php @@ -4,12 +4,18 @@ namespace Sarga\API\Http\Resources\Customer; use Illuminate\Http\Resources\Json\JsonResource; +use Webkul\Marketplace\Repositories\ProductRepository; use Webkul\RestApi\Http\Resources\V1\Admin\Sale\InvoiceResource; use Webkul\RestApi\Http\Resources\V1\Admin\Sale\OrderAddressResource; use Webkul\RestApi\Http\Resources\V1\Admin\Sale\ShipmentResource; class OrderResource extends JsonResource { + public function __construct($resource) + { + $this->sellerProductRepository = app(ProductRepository::class); + parent::__construct($resource); + } /** * Transform the resource into an array. *