Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 10:04:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
David Bomba 2021-02-25 21:41:18 +11:00
parent c9231c85aa
commit 29b4e6d1b7
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/DataMapper/CompanySettings.php
View File

@ -652,13 +652,12 @@ class CompanySettings extends BaseSettings
'total_columns' => [ 'total_columns' => [
'$subtotal', '$subtotal',
'$discount', '$discount',
'$total_taxes',
'$line_taxes',
'$custom_surcharge1', '$custom_surcharge1',
'$custom_surcharge2', '$custom_surcharge2',
'$custom_surcharge3', '$custom_surcharge3',
'$custom_surcharge4', '$custom_surcharge4',
'$total', '$total_taxes',
'$line_taxes',
'$paid_to_date', '$paid_to_date',
'$outstanding', '$outstanding',
], ],

1
app/Http/Middleware/PasswordProtection.php
View File

@ -53,6 +53,7 @@ class PasswordProtection
/* Cannot allow duplicates! */ /* Cannot allow duplicates! */
if ($existing_user = MultiDB::hasUser($query)) { if ($existing_user = MultiDB::hasUser($query)) {
Cache::add(auth()->user()->email.'_logged_in', Str::random(64), now()->addMinutes(30));
return $next($request); return $next($request);
} }
} }

1
app/Models/User.php
View File

@ -80,6 +80,7 @@ class User extends Authenticatable implements MustVerifyEmail
'custom_value3', 'custom_value3',
'custom_value4', 'custom_value4',
'is_deleted', 'is_deleted',
'google_2fa_secret',
]; ];
/** /**

1
app/Utils/HtmlEngine.php
View File

@ -248,7 +248,6 @@ class HtmlEngine
$data['$client.currency'] = ['value' => $this->client->currency()->code, 'label' => '']; $data['$client.currency'] = ['value' => $this->client->currency()->code, 'label' => ''];
$data['$client.balance'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')]; $data['$client.balance'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')];
$data['$outstanding'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')];
$data['$client_balance'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')]; $data['$client_balance'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')];
$data['$paid_to_date'] = ['value' => Number::formatMoney($this->client->paid_to_date, $this->client), 'label' => ctrans('texts.paid_to_date')]; $data['$paid_to_date'] = ['value' => Number::formatMoney($this->client->paid_to_date, $this->client), 'label' => ctrans('texts.paid_to_date')];