diff --git a/packages/Sarga/API/Http/Resources/Catalog/ProductDetail.php b/packages/Sarga/API/Http/Resources/Catalog/ProductDetail.php index 357a5b90e..b5546536d 100644 --- a/packages/Sarga/API/Http/Resources/Catalog/ProductDetail.php +++ b/packages/Sarga/API/Http/Resources/Catalog/ProductDetail.php @@ -23,6 +23,7 @@ class ProductDetail extends Product 'name' => $product->name, 'description' => $product->description, 'brand' => $product->brand->name ?? '', + 'color' => $product->color, 'images' => ProductImage::collection($product->images), 'color_variants' => ColorVariant::collection($product->related_products->where('status',1)), 'size_variants' => SizeVariant::collection($product->variants->where('status',1)), diff --git a/packages/Sarga/API/Http/Resources/Customer/OrderResource.php b/packages/Sarga/API/Http/Resources/Customer/OrderResource.php index 278929074..c06a649f7 100644 --- a/packages/Sarga/API/Http/Resources/Customer/OrderResource.php +++ b/packages/Sarga/API/Http/Resources/Customer/OrderResource.php @@ -26,7 +26,7 @@ class OrderResource extends JsonResource public function toArray($request){ return [ 'id' => $this->id, - 'status' => $this->status, + 'status' => $this->status_label, 'status_label' => trans('sarga-api::app.orders.order-status-'.$this->status), 'shipping_method' => $this->shipping_method, 'shipping_title' => $this->shipping_title, diff --git a/packages/Sarga/Shop/src/Models/Order.php b/packages/Sarga/Shop/src/Models/Order.php index 1b5b57fd7..f1306dc99 100644 --- a/packages/Sarga/Shop/src/Models/Order.php +++ b/packages/Sarga/Shop/src/Models/Order.php @@ -9,15 +9,15 @@ class Order extends \Webkul\Sales\Models\Order implements \Sarga\Shop\Contracts\ public const STATUS_SHIPPING = 'shipping'; protected $statusLabel = [ - self::STATUS_PENDING => 'Pending', - self::STATUS_PENDING_PAYMENT => 'Pending Payment', - self::STATUS_PURCHASE => 'Accepted', - self::STATUS_SHIPPING => 'Shipping', - self::STATUS_PROCESSING => 'Arrived', - self::STATUS_COMPLETED => 'Completed', - self::STATUS_CANCELED => 'Canceled', - self::STATUS_CLOSED => 'Closed', - self::STATUS_FRAUD => 'Fraud', + self::STATUS_PENDING => 'pending', + self::STATUS_PENDING_PAYMENT => 'pending_payment', + self::STATUS_PURCHASE => 'accepted', + self::STATUS_SHIPPING => 'shipping', + self::STATUS_PROCESSING => 'arrived', + self::STATUS_COMPLETED => 'completed', + self::STATUS_CANCELED => 'canceled', + self::STATUS_CLOSED => 'closed', + self::STATUS_FRAUD => 'fraud', ];