From 48987ea2ada7e102c3653861c0d7dcc3c1c02d3f Mon Sep 17 00:00:00 2001
From: merdan <merdan.m@gmail.com>
Date: Sat, 23 Apr 2022 15:13:49 +0500
Subject: [PATCH] discounted configurables

---
 .../Http/Resources/Customer/OrderResource.php | 52 +++++++++----------
 packages/Sarga/API/Http/routes.php            |  2 +-
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/packages/Sarga/API/Http/Resources/Customer/OrderResource.php b/packages/Sarga/API/Http/Resources/Customer/OrderResource.php
index 1e0a99a20..ea2a6095c 100644
--- a/packages/Sarga/API/Http/Resources/Customer/OrderResource.php
+++ b/packages/Sarga/API/Http/Resources/Customer/OrderResource.php
@@ -57,32 +57,32 @@ class OrderResource extends JsonResource
 
             'sub_total_refunded'                 => (double) $this->sub_total_refunded,
 //            'formatted_sub_total_refunded'        => core()->formatPrice($this->sub_total_refunded, $this->order_currency_code),
-//            'discount_percent'                   => (double) $this->discount_percent,
-//            'discount_amount'                    => (double) $this->discount_amount,
-//            'formatted_discount_amount'           => core()->formatPrice($this->base_discount_amount, $this->order_currency_code),
-//
-//            'discount_invoiced'                  => (double)$this->discount_invoiced,
-//            'formatted_discount_invoiced'         => core()->formatPrice($this->base_discount_invoiced, $this->order_currency_code),
-//
-//            'discount_refunded'                  => (double) $this->discount_refunded,
-//            'formatted_discount_refunded'         => core()->formatPrice($this->base_discount_refunded, $this->order_currency_code),
-//
-//            'shipping_amount'                    => (double) $this->shipping_amount,
-//            'formatted_shipping_amount'           => core()->formatPrice($this->base_shipping_amount, $this->order_currency_code),
-//
-//            'shipping_invoiced'                  => $this->shipping_invoiced,
-//            'formatted_shipping_invoiced'         => core()->formatPrice($this->base_shipping_invoiced, $this->order_currency_code),
-//
-//            'shipping_refunded'                  => $this->shipping_refunded,
-//            'formatted_shipping_refunded'         => core()->formatPrice($this->base_shipping_refunded, $this->order_currency_code),
-//
-//            'shipping_address'                   => new OrderAddressResource($this->shipping_address),
-//            'billing_address'                    => new OrderAddressResource($this->billing_address),
-//            'vendors'                            => $this->groupByVendors($this->items),
-//            'invoices'                           => InvoiceResource::collection($this->invoices),
-//            'shipments'                          => ShipmentResource::collection($this->shipments),
-//            'updated_at'                         => $this->updated_at,
-//            'created_at'                         => $this->created_at,
+            'discount_percent'                   => (double) $this->discount_percent,
+            'discount_amount'                    => (double) $this->discount_amount,
+            'formatted_discount_amount'           => core()->formatPrice($this->base_discount_amount, $this->order_currency_code),
+
+            'discount_invoiced'                  => (double)$this->discount_invoiced,
+            'formatted_discount_invoiced'         => core()->formatPrice($this->base_discount_invoiced, $this->order_currency_code),
+
+            'discount_refunded'                  => (double) $this->discount_refunded,
+            'formatted_discount_refunded'         => core()->formatPrice($this->base_discount_refunded, $this->order_currency_code),
+
+            'shipping_amount'                    => (double) $this->shipping_amount,
+            'formatted_shipping_amount'           => core()->formatPrice($this->base_shipping_amount, $this->order_currency_code),
+
+            'shipping_invoiced'                  => $this->shipping_invoiced,
+            'formatted_shipping_invoiced'         => core()->formatPrice($this->base_shipping_invoiced, $this->order_currency_code),
+
+            'shipping_refunded'                  => $this->shipping_refunded,
+            'formatted_shipping_refunded'         => core()->formatPrice($this->base_shipping_refunded, $this->order_currency_code),
+
+            'shipping_address'                   => new OrderAddressResource($this->shipping_address),
+            'billing_address'                    => new OrderAddressResource($this->billing_address),
+            'vendors'                            => $this->groupByVendors($this->items),
+            'invoices'                           => InvoiceResource::collection($this->invoices),
+            'shipments'                          => ShipmentResource::collection($this->shipments),
+            'updated_at'                         => $this->updated_at,
+            'created_at'                         => $this->created_at,
         ];
     }
 
diff --git a/packages/Sarga/API/Http/routes.php b/packages/Sarga/API/Http/routes.php
index 8d3a03fc6..cb74d8780 100644
--- a/packages/Sarga/API/Http/routes.php
+++ b/packages/Sarga/API/Http/routes.php
@@ -115,7 +115,7 @@ Route::group(['prefix' => 'api'], function () {
                 /**
                  * Customer sale routes.
                  */
-                Route::get('orders', [Orders::class, 'allResources']);
+                Route::get('my-orders', [Orders::class, 'allResources']);
                 Route::get('orders/{id}', [Orders::class, 'getResource']);
                 Route::post('orders/{id}/cancel', [Orders::class, 'cancel']);
                 Route::post('orders/{id}/cancel/{item_id}', [Orders::class, 'cancelItem']);