shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1417 from mehmetcoban/master

Browse Source 
Fix: wizard currency
This commit is contained in:
Mehmet Çoban 2020-04-19 16:33:49 +03:00 committed by GitHub
commit 716d5a8037
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Settings/Currencies.php
View File

@ -233,10 +233,12 @@ class Currencies extends Controller
$code = request('code'); $code = request('code');
$currencies = Currency::all()->pluck('rate', 'code');
if ($code) { if ($code) {
$currency = config('money.' . $code); $currency = config('money.' . $code);
$currency['rate'] = isset($currency['rate']) ? $currency['rate'] : null; $currency['rate'] = isset($currencies[$code]) ? $currencies[$code] : null;
$currency['symbol_first'] = $currency['symbol_first'] ? 1 : 0; $currency['symbol_first'] = $currency['symbol_first'] ? 1 : 0;
$json = (object) $currency; $json = (object) $currency;

2
resources/views/partials/wizard/content.blade.php
View File

@ -13,6 +13,6 @@
@yield('content') @yield('content')
@stack('content_content_end') @stack('content_content_end')
<notifications></notifications> <notifications></notifications>
<component v-bind:is="component"></component>
@stack('content_end') @stack('content_end')

2
resources/views/wizard/currencies/index.blade.php
View File

@ -84,7 +84,7 @@
{{ Form::textGroup('name', trans('general.name'), 'font', [], null, '') }} {{ Form::textGroup('name', trans('general.name'), 'font', [], null, '') }}
</td> </td>
<td class="col-md-3 d-none d-md-block"> <td class="col-md-3 d-none d-md-block">
{{ Form::selectGroup('code', trans('currencies.code'), 'code', $codes, null, ['required' => 'required', 'change' => 'onChangeCode'], '') }} {{ Form::selectGroup('code', trans('currencies.code'), 'code', $codes, null, ['required' => 'required', 'change' => 'onChangeCode', 'model' => 'form.code'], '') }}
</td> </td>
<td class="col-md-2 d-none d-md-block"> <td class="col-md-2 d-none d-md-block">
{{ Form::textGroup('rate', trans('currencies.rate'), 'percentage', ['required' => 'required'], null, '') }} {{ Form::textGroup('rate', trans('currencies.rate'), 'percentage', ['required' => 'required'], null, '') }}