Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Code Issues Releases Activity

Fix fix currency/language placeholders

Browse Source
This commit is contained in:
Hillel Coren 2017-12-01 09:28:01 +02:00
parent ec81aca807
commit e301ebfe0a
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Ninja/Repositories/AccountRepository.php
View File

@ -60,6 +60,7 @@ class AccountRepository
$account->ip = Request::getClientIp(); $account->ip = Request::getClientIp();
$account->account_key = strtolower(str_random(RANDOM_KEY_LENGTH)); $account->account_key = strtolower(str_random(RANDOM_KEY_LENGTH));
$account->company_id = $company->id; $account->company_id = $company->id;
$account->currency_id = DEFAULT_CURRENCY;
// Set default language/currency based on IP // Set default language/currency based on IP
if (\Cache::get('currencies')) { if (\Cache::get('currencies')) {

1
database/seeds/UserTableSeeder.php
View File

@ -31,6 +31,7 @@ class UserTableSeeder extends Seeder
'city' => $faker->city, 'city' => $faker->city,
'state' => $faker->state, 'state' => $faker->state,
'postal_code' => $faker->postcode, 'postal_code' => $faker->postcode,
'currency_id' => DEFAULT_CURRENCY,
'country_id' => Country::all()->random()->id, 'country_id' => Country::all()->random()->id,
'account_key' => strtolower(str_random(RANDOM_KEY_LENGTH)), 'account_key' => strtolower(str_random(RANDOM_KEY_LENGTH)),
'invoice_terms' => $faker->text($faker->numberBetween(50, 300)), 'invoice_terms' => $faker->text($faker->numberBetween(50, 300)),

1
resources/views/accounts/localization.blade.php
View File

@ -27,7 +27,6 @@
<div class="panel-body form-padding-right"> <div class="panel-body form-padding-right">
{!! Former::select('currency_id') {!! Former::select('currency_id')
->addOption('','')
->fromQuery($currencies, 'name', 'id') ->fromQuery($currencies, 'name', 'id')
->onchange('updateCurrencyCodeRadio()') !!} ->onchange('updateCurrencyCodeRadio()') !!}
{!! Former::radios('show_currency_code')->radios([ {!! Former::radios('show_currency_code')->radios([

2
resources/views/clients/edit.blade.php
View File

@ -187,7 +187,7 @@
<div class="tab-content" style="padding-top:24px;"> <div class="tab-content" style="padding-top:24px;">
<div role="tabpanel" class="tab-pane active" id="settings"> <div role="tabpanel" class="tab-pane active" id="settings">
{!! Former::select('currency_id')->addOption('','') {!! 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') !!} ->fromQuery($currencies, 'name', 'id') !!}
{!! Former::select('language_id')->addOption('','') {!! Former::select('language_id')->addOption('','')
->placeholder($account->language ? trans('texts.lang_'.$account->language->name) : '') ->placeholder($account->language ? trans('texts.lang_'.$account->language->name) : '')

4
resources/views/invoices/edit.blade.php
View File

@ -714,14 +714,14 @@
</span> </span>
{!! Former::select('client[currency_id]')->addOption('','') {!! 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')) ->label(trans('texts.currency_id'))
->data_bind('value: currency_id') ->data_bind('value: currency_id')
->fromQuery($currencies, 'name', 'id') !!} ->fromQuery($currencies, 'name', 'id') !!}
<span data-bind="visible: $root.showMore"> <span data-bind="visible: $root.showMore">
{!! Former::select('client[language_id]')->addOption('','') {!! 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')) ->label(trans('texts.language_id'))
->data_bind('value: language_id') ->data_bind('value: language_id')
->fromQuery($languages, 'name', 'id') !!} ->fromQuery($languages, 'name', 'id') !!}