mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-11-13 22:54:25 +01:00
Fixes for stripe currency conversions
This commit is contained in:
parent
3d14f24f49
commit
055e0ecb8c
@ -45,7 +45,7 @@ class InvoiceTransformer extends BaseTransformer {
|
|||||||
'client_id' => $this->getClient( $this->getString( $invoice_data, 'client.name' ), $this->getString( $invoice_data, 'client.email' ) ),
|
'client_id' => $this->getClient( $this->getString( $invoice_data, 'client.name' ), $this->getString( $invoice_data, 'client.email' ) ),
|
||||||
'discount' => $this->getFloat( $invoice_data, 'invoice.discount' ),
|
'discount' => $this->getFloat( $invoice_data, 'invoice.discount' ),
|
||||||
'po_number' => $this->getString( $invoice_data, 'invoice.po_number' ),
|
'po_number' => $this->getString( $invoice_data, 'invoice.po_number' ),
|
||||||
'date' => isset( $invoice_data['invoice.date'] ) ? date( 'Y-m-d', strtotime( $invoice_data['invoice.date'] ) ) : null,
|
'date' => isset( $invoice_data['invoice.date'] ) ? date( 'Y-m-d', strtotime( $invoice_data['invoice.date'] ) ) : now()->format('Y-m-d'),
|
||||||
'due_date' => isset( $invoice_data['invoice.due_date'] ) ? date( 'Y-m-d', strtotime( $invoice_data['invoice.due_date'] ) ) : null,
|
'due_date' => isset( $invoice_data['invoice.due_date'] ) ? date( 'Y-m-d', strtotime( $invoice_data['invoice.due_date'] ) ) : null,
|
||||||
'terms' => $this->getString( $invoice_data, 'invoice.terms' ),
|
'terms' => $this->getString( $invoice_data, 'invoice.terms' ),
|
||||||
'public_notes' => $this->getString( $invoice_data, 'invoice.public_notes' ),
|
'public_notes' => $this->getString( $invoice_data, 'invoice.public_notes' ),
|
||||||
|
@ -18,7 +18,7 @@ trait Utilities
|
|||||||
public function convertFromStripeAmount($amount, $precision, $currency)
|
public function convertFromStripeAmount($amount, $precision, $currency)
|
||||||
{
|
{
|
||||||
|
|
||||||
if(in_array($amount, ["BIF","CLP","DJF","GNF","JPY","KMF","KRW","MGA","PYG","RWF","UGX","VND","VUV","XAF","XOF","XPF"]))
|
if(in_array($currency->code, ["BIF","CLP","DJF","GNF","JPY","KMF","KRW","MGA","PYG","RWF","UGX","VND","VUV","XAF","XOF","XPF"]))
|
||||||
return $amount;
|
return $amount;
|
||||||
|
|
||||||
return $amount / pow(10, $precision);
|
return $amount / pow(10, $precision);
|
||||||
@ -28,7 +28,7 @@ trait Utilities
|
|||||||
public function convertToStripeAmount($amount, $precision, $currency)
|
public function convertToStripeAmount($amount, $precision, $currency)
|
||||||
{
|
{
|
||||||
|
|
||||||
if(in_array($amount, ["BIF","CLP","DJF","GNF","JPY","KMF","KRW","MGA","PYG","RWF","UGX","VND","VUV","XAF","XOF","XPF"]))
|
if(in_array($currency->code, ["BIF","CLP","DJF","GNF","JPY","KMF","KRW","MGA","PYG","RWF","UGX","VND","VUV","XAF","XOF","XPF"]))
|
||||||
return $amount;
|
return $amount;
|
||||||
|
|
||||||
return round(($amount * pow(10, $precision)),0);
|
return round(($amount * pow(10, $precision)),0);
|
||||||
|
Loading…
Reference in New Issue
Block a user