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

close #664 Fixed: Not listing invoice/bill add payment if empty account's currency

Browse Source
This commit is contained in:
cuneytsenturk 2018-12-04 11:29:42 +03:00
parent 5511ab9a48
commit bc8a1305a5
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Modals/BillPayments.php
View File

@ -39,9 +39,7 @@ class BillPayments extends Controller
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray(); $currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
$account_currency_code = Account::where('id', setting('general.default_account'))->pluck('currency_code')->first(); $currency = Currency::where('code', $bill->currency_code)->first();
$currency = Currency::where('code', $account_currency_code)->first();
$payment_methods = Modules::getPaymentMethods(); $payment_methods = Modules::getPaymentMethods();
@ -60,7 +58,7 @@ class BillPayments extends Controller
$bill->grand_total = $bill->total - $paid; $bill->grand_total = $bill->total - $paid;
} }
$html = view('modals.bills.payment', compact('bill', 'accounts', 'account_currency_code', 'currencies', 'currency', 'payment_methods'))->render(); $html = view('modals.bills.payment', compact('bill', 'accounts', 'currencies', 'currency', 'payment_methods'))->render();
return response()->json([ return response()->json([
'success' => true, 'success' => true,

6
app/Http/Controllers/Modals/InvoicePayments.php
View File

@ -39,9 +39,7 @@ class InvoicePayments extends Controller
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray(); $currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
$account_currency_code = Account::where('id', setting('general.default_account'))->pluck('currency_code')->first(); $currency = Currency::where('code', $invoice->currency_code)->first();
$currency = Currency::where('code', $account_currency_code)->first();
$payment_methods = Modules::getPaymentMethods(); $payment_methods = Modules::getPaymentMethods();
@ -60,7 +58,7 @@ class InvoicePayments extends Controller
$invoice->grand_total = $invoice->total - $paid; $invoice->grand_total = $invoice->total - $paid;
} }
$html = view('modals.invoices.payment', compact('invoice', 'accounts', 'account_currency_code', 'currencies', 'currency', 'payment_methods'))->render(); $html = view('modals.invoices.payment', compact('invoice', 'accounts', 'currencies', 'currency', 'payment_methods'))->render();
return response()->json([ return response()->json([
'success' => true, 'success' => true,

4
resources/views/modals/bills/payment.blade.php
View File

@ -20,8 +20,8 @@
{!! Form::label('currency_code', trans_choice('general.currencies', 1), ['class' => 'control-label']) !!} {!! Form::label('currency_code', trans_choice('general.currencies', 1), ['class' => 'control-label']) !!}
<div class="input-group"> <div class="input-group">
<div class="input-group-addon"><i class="fa fa-exchange"></i></div> <div class="input-group-addon"><i class="fa fa-exchange"></i></div>
{!! Form::text('currency', $currencies[$account_currency_code], ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!} {!! Form::text('currency', $currencies[$bill->currency_code], ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!}
{!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} {!! Form::hidden('currency_code', $bill->currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
</div> </div>
</div> </div>
@stack('currency_code_input_end') @stack('currency_code_input_end')

4
resources/views/modals/invoices/payment.blade.php
View File

@ -20,8 +20,8 @@
{!! Form::label('currency_code', trans_choice('general.currencies', 1), ['class' => 'control-label']) !!} {!! Form::label('currency_code', trans_choice('general.currencies', 1), ['class' => 'control-label']) !!}
<div class="input-group"> <div class="input-group">
<div class="input-group-addon"><i class="fa fa-exchange"></i></div> <div class="input-group-addon"><i class="fa fa-exchange"></i></div>
{!! Form::text('currency', $currencies[$account_currency_code], ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!} {!! Form::text('currency', $currencies[$invoice->currency_code], ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!}
{!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} {!! Form::hidden('currency_code', $invoice->currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
</div> </div>
</div> </div>
@stack('currency_code_input_end') @stack('currency_code_input_end')