mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-09-20 16:31:33 +02:00
Minor fixes
This commit is contained in:
parent
20a74f199c
commit
d26e5f05c3
@ -288,7 +288,7 @@ class CompanyExport implements ShouldQueue
|
|||||||
$this->export_data['recurring_expenses'] = $this->company->recurring_expenses()->orderBy('number', 'DESC')->cursor()->map(function ($expense) {
|
$this->export_data['recurring_expenses'] = $this->company->recurring_expenses()->orderBy('number', 'DESC')->cursor()->map(function ($expense) {
|
||||||
$expense = $this->transformBasicEntities($expense);
|
$expense = $this->transformBasicEntities($expense);
|
||||||
$expense = $this->transformArrayOfKeys($expense, ['vendor_id', 'invoice_id', 'client_id', 'category_id', 'project_id']);
|
$expense = $this->transformArrayOfKeys($expense, ['vendor_id', 'invoice_id', 'client_id', 'category_id', 'project_id']);
|
||||||
|
|
||||||
return $expense->makeVisible(['id']);
|
return $expense->makeVisible(['id']);
|
||||||
})->all();
|
})->all();
|
||||||
|
|
||||||
|
@ -522,7 +522,7 @@ class TemplateService
|
|||||||
'balance_raw' => ($payment->amount - $payment->refunded - $payment->applied),
|
'balance_raw' => ($payment->amount - $payment->refunded - $payment->applied),
|
||||||
'date' => $this->translateDate($payment->date, $payment->client->date_format(), $payment->client->locale()),
|
'date' => $this->translateDate($payment->date, $payment->client->date_format(), $payment->client->locale()),
|
||||||
'method' => $payment->translatedType(),
|
'method' => $payment->translatedType(),
|
||||||
'currency' => $payment->currency->code,
|
'currency' => $payment->currency->code ?? $this->company->currency()->code,
|
||||||
'exchange_rate' => $payment->exchange_rate,
|
'exchange_rate' => $payment->exchange_rate,
|
||||||
'transaction_reference' => $payment->transaction_reference,
|
'transaction_reference' => $payment->transaction_reference,
|
||||||
'is_manual' => $payment->is_manual,
|
'is_manual' => $payment->is_manual,
|
||||||
|
Loading…
Reference in New Issue
Block a user