merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Folders

This commit is contained in:
merdan 2023-03-24 13:05:48 +05:00
parent ae8032735d
commit b3f3baaf65
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/Sarga/API/Http/Resources/Customer/OrderItemResource.php
View File

@ -36,23 +36,23 @@ class OrderItemResource extends JsonResource
'formatted_total' => core()->formatBasePrice($this->total), 'formatted_total' => core()->formatBasePrice($this->total),
'total_invoiced' => (double) $this->total_invoiced, '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, '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_percent' => (double) $this->discount_percent,
'discount_amount' => (double) $this->discount_amount, '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, '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, '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, '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, // 'downloadable_links' => $this->downloadable_link_purchased,
// 'additional' => is_array($this->resource->additional) // 'additional' => is_array($this->resource->additional)
// ? $this->resource->additional // ? $this->resource->additional

22
packages/Sarga/API/Http/Resources/Customer/OrderResource.php
View File

@ -41,40 +41,40 @@ class OrderResource extends JsonResource
'channel_currency_code' => $this->channel_currency_code, 'channel_currency_code' => $this->channel_currency_code,
'order_currency_code' => $this->order_currency_code, 'order_currency_code' => $this->order_currency_code,
'grand_total' => (double) $this->grand_total, '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'), 'total_weight' => $this->items->sum('total_weight'),
'grand_total_invoiced' => (double) $this->grand_total_invoiced, '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, '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, '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, '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, 'sub_total_refunded' => (double) $this->sub_total_refunded,
// 'formatted_sub_total_refunded' => core()->formatPrice($this->sub_total_refunded, $this->order_currency_code), // 'formatted_sub_total_refunded' => core()->formatPrice($this->sub_total_refunded, $this->order_currency_code),
'discount_percent' => (double) $this->discount_percent, 'discount_percent' => (double) $this->discount_percent,
'discount_amount' => (double) $this->discount_amount, '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, '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, '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, '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, '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, '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), 'shipping_address' => new OrderAddressResource($this->shipping_address),
'billing_address' => new OrderAddressResource($this->billing_address), 'billing_address' => new OrderAddressResource($this->billing_address),

2
packages/Webkul/Core/src/Core.php
View File

@ -614,7 +614,7 @@ class Core
{ {
$code = $currency instanceof \Webkul\Core\Contracts\Currency ? $currency->code : $currency; $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); return $formatter->getSymbol(\NumberFormatter::CURRENCY_SYMBOL);
} }