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

Merge branch 'master' of github.com:akaunting/akaunting

Browse Source 
# Conflicts:
#	resources/views/banking/reconciliations/create.blade.php
This commit is contained in:
Cüneyt Şentürk
2020-06-08 23:13:38 +03:00
parent d4923b4414 5e51b494d2
commit 41e7aee498
391 changed files with 6324 additions and 2309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/views/partials/form/date_group.blade.php
View File

@ -9,6 +9,8 @@
:form-classes="[{'has-error': form.errors.get('{{ $name }}') }]"
@endif
:group_class="'{{ $group_class }}'"
icon="fa fa-{{ $icon }}"
title="{{ $text }}"
placeholder="{{ trans('general.form.select.field', ['field' => $text]) }}"
@ -47,6 +49,10 @@
@interface="form.{{ $name }} = $event"
@endif
@if (isset($attributes['required']))
:required="{{ ($attributes['required']) ? 'true' : 'false' }}"
@endif
@if (isset($attributes['readonly']))
:readonly="{{ $attributes['readonly'] }}"
@endif

6
resources/views/partials/form/money_group.blade.php
View File

@ -54,11 +54,11 @@
@endif
@if (!empty($attributes['v-model']))
@interface="{{ $attributes['v-model'] . ' = $event' }}"
@interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}"
@elseif (!empty($attributes['data-field']))
@interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
@interface="form.errors.clear("{{ 'form.' . $attributes['data-field'] }}"); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
@else
@interface="form.{{ $name }} = $event"
@interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event"
@endif
@if (isset($attributes['v-error-message']))

4
resources/views/partials/form/select_group.blade.php
View File

@ -24,9 +24,9 @@
@endif
@if (!empty($attributes['v-model']))
@interface="{{ $attributes['v-model'] . ' = $event' }}"
@interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}"
@elseif (!empty($attributes['data-field']))
@interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
@interface="form.errors.clear("{{ 'form.' . $attributes['data-field'] }}"); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
@else
@interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event;"
@endif