diff --git a/packages/Sarga/API/Http/Resources/Customer/OrderItemResource.php b/packages/Sarga/API/Http/Resources/Customer/OrderItemResource.php index 468093fd3..54fbccff7 100644 --- a/packages/Sarga/API/Http/Resources/Customer/OrderItemResource.php +++ b/packages/Sarga/API/Http/Resources/Customer/OrderItemResource.php @@ -36,23 +36,23 @@ class OrderItemResource extends JsonResource 'formatted_total' => core()->formatBasePrice($this->total), 'total_invoiced' => (double) $this->total_invoiced, - 'formatted_total_invoiced' => core()->formatBasePrice($this->total_invoiced), + 'formatted_total_invoiced' => core()->formatBasePrice($this->total_invoiced, $this->order->order_currency_code), 'amount_refunded' => (double) $this->amount_refunded, - 'formatted_amount_refunded' => core()->formatBasePrice($this->amount_refunded), + 'formatted_amount_refunded' => core()->formatBasePrice($this->amount_refunded, $this->order->order_currency_code), 'discount_percent' => (double) $this->discount_percent, 'discount_amount' => (double) $this->discount_amount, - 'formatted_discount_amount' => core()->formatBasePrice($this->base_discount_amount), + 'formatted_discount_amount' => core()->formatBasePrice($this->base_discount_amount, $this->order->order_currency_code), 'discount_invoiced' => (double) $this->discount_invoiced, - 'formatted_discount_invoiced' => core()->formatBasePrice($this->discount_invoiced), + 'formatted_discount_invoiced' => core()->formatBasePrice($this->discount_invoiced, $this->order->order_currency_code), 'discount_refunded' => (double) $this->discount_refunded, - 'formatted_discount_refunded' => core()->formatBasePrice($this->discount_refunded), + 'formatted_discount_refunded' => core()->formatBasePrice($this->discount_refunded, $this->order->order_currency_code), 'grant_total' => $this->total + $this->tax_amount, - 'formatted_grant_total' => core()->formatBasePrice($this->total + $this->tax_amount), + 'formatted_grant_total' => core()->formatBasePrice($this->total + $this->tax_amount, $this->order->order_currency_code), // 'downloadable_links' => $this->downloadable_link_purchased, // 'additional' => is_array($this->resource->additional) // ? $this->resource->additional diff --git a/packages/Sarga/API/Http/Resources/Customer/OrderResource.php b/packages/Sarga/API/Http/Resources/Customer/OrderResource.php index 13b4ed707..aec0406ac 100644 --- a/packages/Sarga/API/Http/Resources/Customer/OrderResource.php +++ b/packages/Sarga/API/Http/Resources/Customer/OrderResource.php @@ -41,40 +41,40 @@ class OrderResource extends JsonResource 'channel_currency_code' => $this->channel_currency_code, 'order_currency_code' => $this->order_currency_code, 'grand_total' => (double) $this->grand_total, - 'formatted_grand_total' => core()->formatBasePrice($this->grand_total), + 'formatted_grand_total' => core()->formatPrice($this->base_grand_total, $this->order_currency_code), 'total_weight' => $this->items->sum('total_weight'), 'grand_total_invoiced' => (double) $this->grand_total_invoiced, - 'formatted_grand_total_invoiced' => core()->formatBasePrice($this->grand_total_invoiced), + 'formatted_grand_total_invoiced' => core()->formatPrice($this->base_grand_total_invoiced, $this->order_currency_code), 'grand_total_refunded' => (double) $this->grand_total_refunded, - 'formatted_grand_total_refunded' => core()->formatBasePrice($this->grand_total_refunded), + 'formatted_grand_total_refunded' => core()->formatPrice($this->base_grand_total_refunded, $this->order_currency_code), 'sub_total' => (double) $this->sub_total, - 'formatted_sub_total' => core()->formatBasePrice($this->sub_total), + 'formatted_sub_total' => core()->formatPrice($this->base_sub_total, $this->order_currency_code), 'sub_total_invoiced' => (double) $this->sub_total_invoiced, - 'formatted_sub_total_invoiced' => core()->formatBasePrice($this->sub_total_invoiced), + 'formatted_sub_total_invoiced' => core()->formatPrice($this->base_sub_total_invoiced, $this->order_currency_code), '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()->formatBasePrice(abs((double)$this->discount_amount)), + 'formatted_discount_amount' => core()->formatPrice(abs((double)$this->base_discount_amount), $this->order_currency_code), 'discount_invoiced' => (double)$this->discount_invoiced, - 'formatted_discount_invoiced' => core()->formatBasePrice($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()->formatBasePrice($this->discount_refunded), + 'formatted_discount_refunded' => core()->formatPrice($this->discount_refunded, $this->order_currency_code), 'shipping_amount' => (double) $this->shipping_amount, - 'formatted_shipping_amount' => core()->formatBasePrice($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()->formatBasePrice($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()->formatBasePrice($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), diff --git a/packages/Webkul/Core/src/Core.php b/packages/Webkul/Core/src/Core.php index 114f26445..998dafd3b 100755 --- a/packages/Webkul/Core/src/Core.php +++ b/packages/Webkul/Core/src/Core.php @@ -614,7 +614,7 @@ class Core { $code = $currency instanceof \Webkul\Core\Contracts\Currency ? $currency->code : $currency; - $formatter = new \NumberFormatter(app()->getLocale() . '@currency=' . $code, \NumberFormatter::CURRENCY); + $formatter = new \NumberFormatter('ru_RU' . '@currency=' . $code, \NumberFormatter::CURRENCY); return $formatter->getSymbol(\NumberFormatter::CURRENCY_SYMBOL); }