Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 08:21:34 +02:00
Code Issues Releases Activity

translation of time intervals in clients portal do not apply #1812

Browse Source
This commit is contained in:
Hillel Coren 2018-02-14 20:29:30 +02:00
parent 52de9f028f
commit 5346cca9ac
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/ClientPortalController.php
View File

@ -77,8 +77,6 @@ class ClientPortalController extends BaseController
]); ]);
} }
$account->loadLocalizationSettings($client);
if (! Input::has('phantomjs') && ! session('silent:' . $client->id) && ! Session::has($invitation->invitation_key) if (! Input::has('phantomjs') && ! session('silent:' . $client->id) && ! Session::has($invitation->invitation_key)
&& (! Auth::check() || Auth::user()->account_id != $invoice->account_id)) { && (! Auth::check() || Auth::user()->account_id != $invoice->account_id)) {
if ($invoice->isType(INVOICE_TYPE_QUOTE)) { if ($invoice->isType(INVOICE_TYPE_QUOTE)) {
@ -263,7 +261,6 @@ class ClientPortalController extends BaseController
return redirect(request()->url()); return redirect(request()->url());
} }
$account->loadLocalizationSettings($client);
$color = $account->primary_color ? $account->primary_color : '#0b4d78'; $color = $account->primary_color ? $account->primary_color : '#0b4d78';
$customer = false; $customer = false;
@ -336,7 +333,6 @@ class ClientPortalController extends BaseController
} }
$account = $contact->account; $account = $contact->account;
$account->loadLocalizationSettings($contact->client);
if (! $account->enable_client_portal) { if (! $account->enable_client_portal) {
return $this->returnError(); return $this->returnError();
@ -370,7 +366,6 @@ class ClientPortalController extends BaseController
} }
$account = $contact->account; $account = $contact->account;
$account->loadLocalizationSettings($contact->client);
if (! $account->enable_client_portal) { if (! $account->enable_client_portal) {
return $this->returnError(); return $this->returnError();
@ -416,7 +411,6 @@ class ClientPortalController extends BaseController
} }
$account = $contact->account; $account = $contact->account;
$account->loadLocalizationSettings($contact->client);
if (! $account->enable_client_portal) { if (! $account->enable_client_portal) {
return $this->returnError(); return $this->returnError();
@ -501,7 +495,6 @@ class ClientPortalController extends BaseController
} }
$account = $contact->account; $account = $contact->account;
$account->loadLocalizationSettings($contact->client);
if (! $account->enable_client_portal) { if (! $account->enable_client_portal) {
return $this->returnError(); return $this->returnError();
@ -537,7 +530,6 @@ class ClientPortalController extends BaseController
} }
$account = $contact->account; $account = $contact->account;
$account->loadLocalizationSettings($contact->client);
if (! $account->enable_client_portal) { if (! $account->enable_client_portal) {
return $this->returnError(); return $this->returnError();
@ -573,7 +565,6 @@ class ClientPortalController extends BaseController
} }
$account = $contact->account; $account = $contact->account;
$account->loadLocalizationSettings($contact->client);
if (! $contact->client->show_tasks_in_portal) { if (! $contact->client->show_tasks_in_portal) {
return redirect()->to($account->enable_client_portal_dashboard ? '/client/dashboard' : '/client/payment_methods/'); return redirect()->to($account->enable_client_portal_dashboard ? '/client/dashboard' : '/client/payment_methods/');
@ -613,7 +604,6 @@ class ClientPortalController extends BaseController
} }
$account = $contact->account; $account = $contact->account;
$account->loadLocalizationSettings($contact->client);
if (! $account->enable_client_portal) { if (! $account->enable_client_portal) {
return $this->returnError(); return $this->returnError();

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

@ -91,6 +91,7 @@ class Authenticate
if ($authenticated) { if ($authenticated) {
$request->merge(['contact' => $contact]); $request->merge(['contact' => $contact]);
$account->loadLocalizationSettings($contact->client);
} }
} }

2
app/Ninja/Repositories/InvoiceRepository.php
View File

@ -240,7 +240,7 @@ class InvoiceRepository extends BaseRepository
$table = \Datatable::query($query) $table = \Datatable::query($query)
->addColumn('frequency', function ($model) { ->addColumn('frequency', function ($model) {
return $model->frequency; return trans('texts.freq_' . \Str::snake($model->frequency));
}) })
->addColumn('start_date', function ($model) { ->addColumn('start_date', function ($model) {
return Utils::fromSqlDate($model->start_date); return Utils::fromSqlDate($model->start_date);