From cfda5585a4872d12c15a5acf3120b9118e7bd126 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Tue, 17 Apr 2018 00:34:02 +0300 Subject: [PATCH] fixed #280 --- app/Providers/FormServiceProvider.php | 4 ++++ resources/views/banking/accounts/create.blade.php | 2 +- resources/views/banking/accounts/edit.blade.php | 2 +- resources/views/banking/transfers/create.blade.php | 2 +- resources/views/banking/transfers/edit.blade.php | 2 +- resources/views/expenses/bills/create.blade.php | 10 +++++----- resources/views/expenses/bills/edit.blade.php | 14 +++++++------- resources/views/expenses/payments/create.blade.php | 2 +- resources/views/expenses/payments/edit.blade.php | 2 +- resources/views/incomes/invoices/create.blade.php | 10 +++++----- resources/views/incomes/invoices/edit.blade.php | 14 +++++++------- resources/views/incomes/revenues/create.blade.php | 2 +- resources/views/incomes/revenues/edit.blade.php | 2 +- resources/views/items/items/create.blade.php | 4 ++-- resources/views/items/items/edit.blade.php | 4 ++-- .../views/settings/currencies/create.blade.php | 4 ++-- resources/views/settings/currencies/edit.blade.php | 4 ++-- resources/views/settings/taxes/create.blade.php | 2 +- resources/views/settings/taxes/edit.blade.php | 2 +- 19 files changed, 46 insertions(+), 42 deletions(-) diff --git a/app/Providers/FormServiceProvider.php b/app/Providers/FormServiceProvider.php index 680e9c7e6..b4d9daf88 100644 --- a/app/Providers/FormServiceProvider.php +++ b/app/Providers/FormServiceProvider.php @@ -27,6 +27,10 @@ class FormServiceProvider extends ServiceProvider 'name', 'text', 'icon', 'attributes' => ['required' => 'required'], 'value' => null, 'col' => 'col-md-6', ]); + Form::component('numberGroup', 'partials.form.number_group', [ + 'name', 'text', 'icon', 'attributes' => ['required' => 'required'], 'value' => null, 'col' => 'col-md-6', + ]); + Form::component('selectGroup', 'partials.form.select_group', [ 'name', 'text', 'icon', 'values', 'selected' => null, 'attributes' => ['required' => 'required'], 'col' => 'col-md-6', ]); diff --git a/resources/views/banking/accounts/create.blade.php b/resources/views/banking/accounts/create.blade.php index b39a015f2..ff9a3b264 100644 --- a/resources/views/banking/accounts/create.blade.php +++ b/resources/views/banking/accounts/create.blade.php @@ -14,7 +14,7 @@ {{ Form::selectGroup('currency_code', trans_choice('general.currencies', 1), 'exchange', $currencies, setting('general.default_currency')) }} - {{ Form::textGroup('opening_balance', trans('accounts.opening_balance'), 'money', ['required' => 'required'], 0) }} + {{ Form::numberGroup('opening_balance', trans('accounts.opening_balance'), 'money', ['required' => 'required'], 0) }} {{ Form::textGroup('bank_name', trans('accounts.bank_name'), 'university', []) }} diff --git a/resources/views/banking/accounts/edit.blade.php b/resources/views/banking/accounts/edit.blade.php index 5033d6a3f..83b2ede15 100644 --- a/resources/views/banking/accounts/edit.blade.php +++ b/resources/views/banking/accounts/edit.blade.php @@ -18,7 +18,7 @@ {{ Form::selectGroup('currency_code', trans_choice('general.currencies', 1), 'exchange', $currencies) }} - {{ Form::textGroup('opening_balance', trans('accounts.opening_balance'), 'money') }} + {{ Form::numberGroup('opening_balance', trans('accounts.opening_balance'), 'money') }} {{ Form::textGroup('bank_name', trans('accounts.bank_name'), 'university', []) }} diff --git a/resources/views/banking/transfers/create.blade.php b/resources/views/banking/transfers/create.blade.php index 4fe79d8f8..86eb4b963 100644 --- a/resources/views/banking/transfers/create.blade.php +++ b/resources/views/banking/transfers/create.blade.php @@ -12,7 +12,7 @@ {{ Form::selectGroup('to_account_id', trans('transfers.to_account'), 'university', $accounts) }} - {{ Form::textGroup('amount', trans('general.amount'), 'money') }} + {{ Form::numberGroup('amount', trans('general.amount'), 'money') }} {{ Form::textGroup('transferred_at', trans('general.date'), 'calendar',['id' => 'transferred_at', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => ''], Date::now()->toDateString()) }} diff --git a/resources/views/banking/transfers/edit.blade.php b/resources/views/banking/transfers/edit.blade.php index f4dbdd93a..c5a3974b8 100644 --- a/resources/views/banking/transfers/edit.blade.php +++ b/resources/views/banking/transfers/edit.blade.php @@ -16,7 +16,7 @@ {{ Form::selectGroup('to_account_id', trans('transfers.to_account'), 'university', $accounts) }} - {{ Form::textGroup('amount', trans('general.amount'), 'money') }} + {{ Form::numberGroup('amount', trans('general.amount'), 'money') }} {{ Form::textGroup('transferred_at', trans('general.date'), 'calendar',['id' => 'transferred_at', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => ''], Date::now()->toDateString()) }} diff --git a/resources/views/expenses/bills/create.blade.php b/resources/views/expenses/bills/create.blade.php index d40a13fd7..d2e51de41 100644 --- a/resources/views/expenses/bills/create.blade.php +++ b/resources/views/expenses/bills/create.blade.php @@ -55,10 +55,10 @@ - + - + {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, setting('general.default_tax'), ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!} @@ -127,10 +127,10 @@ html += ' '; html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; html += ' '; html += ' - + - + {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, $item->tax_id, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.enter', ['field' => trans_choice('general.taxes', 1)])]) !!} @@ -70,10 +70,10 @@ - + - + {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, null, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!} @@ -145,10 +145,10 @@ html += ' '; html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; html += ' '; html += ' - + - + {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, setting('general.default_tax'), ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!} @@ -128,10 +128,10 @@ html += ' '; html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; html += ' '; html += ' - + - + {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, $item->tax_id, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.enter', ['field' => trans_choice('general.taxes', 1)])]) !!} @@ -69,10 +69,10 @@ - + - + {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, null, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!} @@ -144,10 +144,10 @@ html += ' '; html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; html += ' '; html += '