mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-11-08 20:22:42 +01:00
Fixes for the mobile app
This commit is contained in:
parent
b3ed9e5dad
commit
4c319a2dad
@ -69,7 +69,7 @@ class ClientPortalController extends BaseController
|
||||
|
||||
if (request()->silent) {
|
||||
session(['silent:' . $client->id => true]);
|
||||
return redirect(request()->url());
|
||||
return redirect(request()->url() . '?borderless=' . request()->borderless);
|
||||
}
|
||||
|
||||
if (! $account->checkSubdomain(Request::server('HTTP_HOST'))) {
|
||||
|
@ -521,13 +521,13 @@ class Utils
|
||||
$country->name = trans('texts.country_'.$country->name);
|
||||
})->sortBy(function ($country) {
|
||||
return $country->name;
|
||||
});
|
||||
})->values();
|
||||
|
||||
$data['paymentTypes'] = Cache::get('paymentTypes')->each(function ($pType) {
|
||||
$pType->name = trans('texts.payment_type_'.$pType->name);
|
||||
})->sortBy(function ($pType) {
|
||||
return $pType->name;
|
||||
});
|
||||
})->values();
|
||||
|
||||
$data['languages'] = Cache::get('languages')->each(function ($lang) {
|
||||
$lang->name = trans('texts.lang_'.$lang->name);
|
||||
@ -536,10 +536,10 @@ class Utils
|
||||
});
|
||||
|
||||
$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) {
|
||||
return $currency->name;
|
||||
});
|
||||
})->values();
|
||||
}
|
||||
|
||||
return $data;
|
||||
|
@ -159,6 +159,7 @@ class UserAccountTransformer extends EntityTransformer
|
||||
'custom_invoice_taxes1' => (bool) $account->custom_invoice_taxes1,
|
||||
'custom_invoice_taxes2' => (bool) $account->custom_invoice_taxes1,
|
||||
'custom_fields' => $account->custom_fields ?: '',
|
||||
'invoice_fields' => $account->invoice_fields ?: '',
|
||||
];
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user