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

Merge pull request #311 from cuneytsenturk/1.2-dev

Browse Source 
Payment, Revenue account and currency input combination
This commit is contained in:
Cüneyt Şentürk 2018-04-26 15:33:04 +03:00 committed by GitHub
commit 6da89251ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 42 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
public/css/app.css vendored
View File

@ -575,4 +575,13 @@ input[type="number"] {
.btn-icon {
height: 34px;
}
}
.form-small #account_id, .form-small .select2.select2-container {
width: 70% !important;
float: left;
}
.form-small #currency {
width: 30%;
}

16
resources/views/expenses/payments/create.blade.php
View File

@ -12,16 +12,16 @@
{{ Form::numberGroup('amount', trans('general.amount'), 'money', ['required' => 'required', 'autofocus' => 'autofocus']) }}
{{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('general.default_account')) }}
<div class="form-group col-md-6 {{ $errors->has('currency_code') ? 'has-error' : ''}}">
{!! Form::label('currency_code', trans_choice('general.currencies', 1), ['class' => 'control-label']) !!}
<div class="form-group col-md-6 form-small">
{!! Form::label('account_id', trans_choice('general.accounts', 1), ['class' => 'control-label']) !!}
<div class="input-group">
<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::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
<div class="input-group-addon"><i class="fa fa-university"></i></div>
{!! Form::select('account_id', $accounts, setting('general.default_account'), array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.accounts', 1)])])) !!}
<div class="input-group-append">
{!! Form::text('currency', $currencies[$account_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']) !!}
</div>
</div>
{!! $errors->first('currency_code', '<p class="help-block">:message</p>') !!}
</div>
{{ Form::textareaGroup('description', trans('general.description')) }}

16
resources/views/expenses/payments/edit.blade.php
View File

@ -17,16 +17,16 @@
{{ Form::numberGroup('amount', trans('general.amount'), 'money', ['required' => 'required', 'autofocus' => 'autofocus']) }}
{{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts) }}
<div class="form-group col-md-6 {{ $errors->has('currency_code') ? 'has-error' : ''}}">
{!! Form::label('currency_code', trans_choice('general.currencies', 1), ['class' => 'control-label']) !!}
<div class="form-group col-md-6 form-small">
{!! Form::label('account_id', trans_choice('general.accounts', 1), ['class' => 'control-label']) !!}
<div class="input-group">
<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::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
<div class="input-group-addon"><i class="fa fa-university"></i></div>
{!! Form::select('account_id', $accounts, null, array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.accounts', 1)])])) !!}
<div class="input-group-append">
{!! Form::text('currency', $currencies[$account_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']) !!}
</div>
</div>
{!! $errors->first('currency_code', '<p class="help-block">:message</p>') !!}
</div>
{{ Form::textareaGroup('description', trans('general.description')) }}

16
resources/views/incomes/revenues/create.blade.php
View File

@ -12,16 +12,16 @@
{{ Form::numberGroup('amount', trans('general.amount'), 'money', ['required' => 'required', 'autofocus' => 'autofocus']) }}
{{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('general.accounts', 1)) }}
<div class="form-group col-md-6 {{ $errors->has('currency_code') ? 'has-error' : ''}}">
{!! Form::label('currency_code', trans_choice('general.currencies', 1), ['class' => 'control-label']) !!}
<div class="form-group col-md-6 form-small">
{!! Form::label('account_id', trans_choice('general.accounts', 1), ['class' => 'control-label']) !!}
<div class="input-group">
<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::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
<div class="input-group-addon"><i class="fa fa-university"></i></div>
{!! Form::select('account_id', $accounts, setting('general.accounts', 1), array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.accounts', 1)])])) !!}
<div class="input-group-append">
{!! Form::text('currency', $currencies[$account_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']) !!}
</div>
</div>
{!! $errors->first('currency_code', '<p class="help-block">:message</p>') !!}
</div>
{{ Form::textareaGroup('description', trans('general.description')) }}

16
resources/views/incomes/revenues/edit.blade.php
View File

@ -17,16 +17,16 @@
{{ Form::numberGroup('amount', trans('general.amount'), 'money', ['required' => 'required', 'autofocus' => 'autofocus']) }}
{{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts) }}
<div class="form-group col-md-6 {{ $errors->has('currency_code') ? 'has-error' : ''}}">
{!! Form::label('currency_code', trans_choice('general.currencies', 1), ['class' => 'control-label']) !!}
<div class="form-group col-md-6 form-small">
{!! Form::label('account_id', trans_choice('general.accounts', 1), ['class' => 'control-label']) !!}
<div class="input-group">
<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::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
<div class="input-group-addon"><i class="fa fa-university"></i></div>
{!! Form::select('account_id', $accounts, null, array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.accounts', 1)])])) !!}
<div class="input-group-append">
{!! Form::text('currency', $currencies[$account_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']) !!}
</div>
</div>
{!! $errors->first('currency_code', '<p class="help-block">:message</p>') !!}
</div>
{{ Form::textareaGroup('description', trans('general.description')) }}