Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for the mobile app

Browse Source
This commit is contained in:
Hillel Coren 2018-07-08 13:04:58 +03:00
parent b3ed9e5dad
commit 4c319a2dad
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,7 @@ class ClientPortalController extends BaseController
if (request()->silent) { if (request()->silent) {
session(['silent:' . $client->id => true]); session(['silent:' . $client->id => true]);
return redirect(request()->url()); return redirect(request()->url() . '?borderless=' . request()->borderless);
} }
if (! $account->checkSubdomain(Request::server('HTTP_HOST'))) { if (! $account->checkSubdomain(Request::server('HTTP_HOST'))) {

8
app/Libraries/Utils.php
View File

@ -521,13 +521,13 @@ class Utils
$country->name = trans('texts.country_'.$country->name); $country->name = trans('texts.country_'.$country->name);
})->sortBy(function ($country) { })->sortBy(function ($country) {
return $country->name; return $country->name;
}); })->values();
$data['paymentTypes'] = Cache::get('paymentTypes')->each(function ($pType) { $data['paymentTypes'] = Cache::get('paymentTypes')->each(function ($pType) {
$pType->name = trans('texts.payment_type_'.$pType->name); $pType->name = trans('texts.payment_type_'.$pType->name);
})->sortBy(function ($pType) { })->sortBy(function ($pType) {
return $pType->name; return $pType->name;
}); })->values();
$data['languages'] = Cache::get('languages')->each(function ($lang) { $data['languages'] = Cache::get('languages')->each(function ($lang) {
$lang->name = trans('texts.lang_'.$lang->name); $lang->name = trans('texts.lang_'.$lang->name);
@ -536,10 +536,10 @@ class Utils
}); });
$data['currencies'] = Cache::get('currencies')->each(function ($currency) { $data['currencies'] = Cache::get('currencies')->each(function ($currency) {
$currency->name = trans('texts.currency_' . Str::slug($currency->name, '_')); $currency->name = trans('texts.currency_' . \Str::slug($currency->name, '_'));
})->sortBy(function ($currency) { })->sortBy(function ($currency) {
return $currency->name; return $currency->name;
}); })->values();
} }
return $data; return $data;

1
app/Ninja/Transformers/UserAccountTransformer.php
View File

@ -159,6 +159,7 @@ class UserAccountTransformer extends EntityTransformer
'custom_invoice_taxes1' => (bool) $account->custom_invoice_taxes1, 'custom_invoice_taxes1' => (bool) $account->custom_invoice_taxes1,
'custom_invoice_taxes2' => (bool) $account->custom_invoice_taxes1, 'custom_invoice_taxes2' => (bool) $account->custom_invoice_taxes1,
'custom_fields' => $account->custom_fields ?: '', 'custom_fields' => $account->custom_fields ?: '',
'invoice_fields' => $account->invoice_fields ?: '',
]; ];
} }
} }