Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00
Code Issues Releases Activity

Fixes for user locale

Browse Source
This commit is contained in:
David Bomba 2023-10-03 19:31:17 +11:00
parent 814ac115e8
commit 08f13cba2a
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Export/CSV/BaseExport.php
View File

@ -132,6 +132,7 @@ class BaseExport
];
protected array $invoice_report_keys = [
'name' => 'client.name',
"invoice_number" => "invoice.number",
"amount" => "invoice.amount",
"balance" => "invoice.balance",

2
app/Models/User.php
View File

@ -660,7 +660,7 @@ class User extends Authenticatable implements MustVerifyEmail
public function getLocale()
{
$locale = $this->language->locale ?? false;
$locale = $this->language->locale ?? null;
if($locale)
App::setLocale($locale);

1
app/Transformers/RecurringExpenseTransformer.php
View File

@ -90,7 +90,6 @@ class RecurringExpenseTransformer extends EntityTransformer
'currency_id' => (string) $recurring_expense->currency_id ?: '',
'category_id' => $this->encodePrimaryKey($recurring_expense->category_id),
'payment_type_id' => (string) $recurring_expense->payment_type_id ?: '',
'recurring_recurring_expense_id' => (string) $recurring_expense->recurring_recurring_expense_id ?: '',
'is_deleted' => (bool) $recurring_expense->is_deleted,
'should_be_invoiced' => (bool) $recurring_expense->should_be_invoiced,
'invoice_documents' => (bool) $recurring_expense->invoice_documents,