diff --git a/resources/views/banking/reconciliations/create.blade.php b/resources/views/banking/reconciliations/create.blade.php index ad5089a55..4bed571c3 100644 --- a/resources/views/banking/reconciliations/create.blade.php +++ b/resources/views/banking/reconciliations/create.blade.php @@ -20,7 +20,7 @@ {{ Form::dateGroup('ended_at', trans('reconciliations.end_date'), 'calendar', ['id' => 'ended_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], request('ended_at', Date::now()->endOfMonth()->toDateString()), 'col-xl-3') }} - {{ Form::moneyGroup('closing_balance', trans('reconciliations.closing_balance'), 'balance-scale', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency, 'dynamic-currency' => 'currency'], request('closing_balance', 0.00), 'col-xl-2') }} + {{ Form::moneyGroup('closing_balance', trans('reconciliations.closing_balance'), 'balance-scale', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency, 'dynamic-currency' => 'currency', 'input' => 'onCalculate'], request('closing_balance', 0.00), 'col-xl-2') }} {{ Form::selectAddNewGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, request('account_id', setting('default.account')), ['required' => 'required', 'path' => route('modals.accounts.create'), 'change' => 'onChangeAccount'], 'col-xl-2') }} @@ -83,7 +83,7 @@ @endif
- {{ Form::checkbox($item->type . '_' . $item->id, $item->amount, $item->reconciled, [ + {{ Form::checkbox($item->type . '_' . $item->id, $item->price, $item->reconciled, [ 'data-field' => 'transactions', 'v-model' => 'form.transactions.' . $item->type . '_' . $item->id, 'id' => 'transaction-' . $item->id . '-'. $item->type, @@ -100,6 +100,12 @@ @if ($transactions->count()) + + + +
{{ trans('reconciliations.opening_balance') }}: + @money($opening_balance, $account->currency_code, true) +
{{ trans('reconciliations.closing_balance') }}: diff --git a/resources/views/banking/reconciliations/edit.blade.php b/resources/views/banking/reconciliations/edit.blade.php index 3a2df5943..dba9f1155 100644 --- a/resources/views/banking/reconciliations/edit.blade.php +++ b/resources/views/banking/reconciliations/edit.blade.php @@ -55,7 +55,7 @@ @endif
- {{ Form::checkbox($item->type . '_' . $item->id, $item->amount, $item->reconciled, [ + {{ Form::checkbox($item->type . '_' . $item->id, $item->price, $item->reconciled, [ 'data-field' => 'transactions', 'v-model' => 'form.transactions.' . $item->type . '_' . $item->id, 'id' => 'transaction-' . $item->id . '-'. $item->type,