mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-09-20 00:11:35 +02:00
Fix fix currency/language placeholders
This commit is contained in:
parent
ec81aca807
commit
e301ebfe0a
@ -60,6 +60,7 @@ class AccountRepository
|
||||
$account->ip = Request::getClientIp();
|
||||
$account->account_key = strtolower(str_random(RANDOM_KEY_LENGTH));
|
||||
$account->company_id = $company->id;
|
||||
$account->currency_id = DEFAULT_CURRENCY;
|
||||
|
||||
// Set default language/currency based on IP
|
||||
if (\Cache::get('currencies')) {
|
||||
|
@ -31,6 +31,7 @@ class UserTableSeeder extends Seeder
|
||||
'city' => $faker->city,
|
||||
'state' => $faker->state,
|
||||
'postal_code' => $faker->postcode,
|
||||
'currency_id' => DEFAULT_CURRENCY,
|
||||
'country_id' => Country::all()->random()->id,
|
||||
'account_key' => strtolower(str_random(RANDOM_KEY_LENGTH)),
|
||||
'invoice_terms' => $faker->text($faker->numberBetween(50, 300)),
|
||||
|
@ -27,7 +27,6 @@
|
||||
<div class="panel-body form-padding-right">
|
||||
|
||||
{!! Former::select('currency_id')
|
||||
->addOption('','')
|
||||
->fromQuery($currencies, 'name', 'id')
|
||||
->onchange('updateCurrencyCodeRadio()') !!}
|
||||
{!! Former::radios('show_currency_code')->radios([
|
||||
|
@ -187,7 +187,7 @@
|
||||
<div class="tab-content" style="padding-top:24px;">
|
||||
<div role="tabpanel" class="tab-pane active" id="settings">
|
||||
{!! Former::select('currency_id')->addOption('','')
|
||||
->placeholder($account->currency ? $account->currency->name : '')
|
||||
->placeholder($account->currency ? trans('texts.currency_'.Str::slug($account->currency->name, '_')) : '')
|
||||
->fromQuery($currencies, 'name', 'id') !!}
|
||||
{!! Former::select('language_id')->addOption('','')
|
||||
->placeholder($account->language ? trans('texts.lang_'.$account->language->name) : '')
|
||||
|
@ -714,14 +714,14 @@
|
||||
</span>
|
||||
|
||||
{!! Former::select('client[currency_id]')->addOption('','')
|
||||
->placeholder($account->currency ? $account->currency->name : '')
|
||||
->placeholder($account->currency ? trans('texts.currency_'.Str::slug($account->currency->name, '_')) : '')
|
||||
->label(trans('texts.currency_id'))
|
||||
->data_bind('value: currency_id')
|
||||
->fromQuery($currencies, 'name', 'id') !!}
|
||||
|
||||
<span data-bind="visible: $root.showMore">
|
||||
{!! Former::select('client[language_id]')->addOption('','')
|
||||
->placeholder($account->language ? $account->language->name : '')
|
||||
->placeholder($account->language ? trans('texts.lang_'.$account->language->name) : '')
|
||||
->label(trans('texts.language_id'))
|
||||
->data_bind('value: language_id')
|
||||
->fromQuery($languages, 'name', 'id') !!}
|
||||
|
Loading…
Reference in New Issue
Block a user