Merge branch 'master' of github.com:akaunting/akaunting into 2.1-dev

# Conflicts:
#	app/Http/Controllers/Common/Items.php
#	resources/views/modules/item/documentation.blade.php
#	resources/views/modules/item/show.blade.php
#	resources/views/partials/admin/header.blade.php
#	resources/views/purchases/bills/show.blade.php
#	resources/views/purchases/vendors/show.blade.php
#	resources/views/sales/customers/show.blade.php
#	resources/views/sales/invoices/show.blade.php
#	resources/views/wizard/companies/edit.blade.php
#	resources/views/wizard/currencies/index.blade.php
#	resources/views/wizard/finish/index.blade.php
#	resources/views/wizard/taxes/index.blade.php

resources/views/partials/form/checkbox_group.blade.php

@@ -11,7 +11,7 @@
             @foreach($items as $item)
                 <div class="col-md-3">
                     <div class="custom-control custom-checkbox">
-                        {{ Form::checkbox($name, $item->$id, null, [
+                        {{ Form::checkbox($name, $item->$id, (is_array($selected) && count($selected) ? (in_array($item->$id, $selected) ? true : false) : null), [
                             'id' => 'checkbox-' . $name . '-' . $item->$id,
                             'class' => 'custom-control-input',
                             'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name),

resources/views/partials/form/date_group.blade.php

@@ -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]) }}"
@@ -40,11 +42,15 @@
         }"
 
         @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'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
         @else
-        @interface="form.{{ $name }} = $event"
+        @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event"
+        @endif
+
+        @if (isset($attributes['required']))
+        :required="{{ ($attributes['required']) ? 'true' : 'false' }}"
         @endif
 
         @if (isset($attributes['readonly']))

resources/views/partials/form/date_time_group.blade.php

@@ -45,11 +45,11 @@
         }"
 
         @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'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
         @else
-        @interface="form.{{ $name }} = $event"
+        @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event"
         @endif
 
         @if (isset($attributes['readonly']))

resources/views/partials/form/invoice_text.blade.php

@@ -1,31 +1,87 @@
 @stack($name . '_input_start')
+    <div class="{{ $col }} input-group-invoice-text">
+        <akaunting-select
+            class="float-left{{ isset($attributes['required']) ? ' required' : '' }}{{ isset($attributes['disabled']) ? ' disabled' : '' }}"
 
-    <div
-        class="form-group {{ $col }}{{ isset($attributes['required']) ? ' required' : '' }}{{ isset($attributes['readonly']) ? ' readonly' : '' }}{{ isset($attributes['disabled']) ? ' disabled' : '' }}"
-        :class="[{'has-error': form.errors.get('{{ $name }}')}]">
-        @if (!empty($text))
-            {!! Form::label($name, $text, ['class' => 'form-control-label'])!!}
-        @endif
+            @if (!empty($attributes['v-error']))
+            :form-classes="[{'has-error': {{ $attributes['v-error'] }} }, form.{{ $name }} == 'custom' ? 'col-md-6' : 'col-md-12']"
+            @else
+            :form-classes="[{'has-error': form.errors.has('{{ $name }}') }, form.{{ $name }} == 'custom' ? 'col-md-6' : 'col-md-12']"
+            @endif
 
-        <div class="input-group input-group-merge {{ $group_class }}">
-            <div class="input-group-prepend">
-                <span class="input-group-text">
-                    <i class="fa fa-{{ $icon }}"></i>
-                </span>
+            icon="{{ $icon }}"
+            title="{{ $text }}"
+            placeholder="{{ trans('general.form.select.field', ['field' => $text]) }}"
+            name="{{ $name }}"
+            :options="{{ json_encode($values) }}"
+
+            @if (isset($selected) || old($name))
+            value="{{ old($name, $selected) }}"
+            @endif
+
+            @if (!empty($attributes['model']))
+            :model="{{ $attributes['model'] }}"
+            @endif
+
+            @if (!empty($attributes['v-model']))
+            @interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}"
+            @elseif (!empty($attributes['data-field']))
+            @interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
+            @else
+            @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event;"
+            @endif
+
+            @if (!empty($attributes['change']))
+            @change="{{ $attributes['change'] }}($event)"
+            @endif
+
+            @if (isset($attributes['readonly']))
+            :readonly="{{ $attributes['readonly'] }}"
+            @endif
+
+            @if (isset($attributes['disabled']))
+            :disabled="{{ $attributes['disabled'] }}"
+            @endif
+
+            @if (isset($attributes['show']))
+            v-if="{{ $attributes['show'] }}"
+            @endif
+
+            @if (isset($attributes['v-error-message']))
+            :form-error="{{ $attributes['v-error-message'] }}"
+            @else
+            :form-error="form.errors.get('{{ $name }}')"
+            @endif
+
+            no-data-text="{{ trans('general.no_data') }}"
+            no-matching-data-text="{{ trans('general.no_matching_data') }}"
+        ></akaunting-select>
+
+        <div
+            class="form-group float-left{{ isset($attributes['required']) ? ' required' : '' }}{{ isset($attributes['readonly']) ? ' readonly' : '' }}{{ isset($attributes['disabled']) ? ' disabled' : '' }}"
+            :class="[{'has-error': form.errors.get('{{ $input_name }}')}, form.{{ $name }} == 'custom' ? 'col-md-6' : 'd-none']">
+            {!! Form::label($input_name, trans('settings.invoice.custom'), ['class' => 'form-control-label'])!!}
+
+            <div class="input-group input-group-merge {{ $group_class }}">
+                <div class="input-group-prepend">
+                    <span class="input-group-text">
+                        <i class="fa fa-{{ $icon }}"></i>
+                    </span>
+                </div>
+
+                {!! Form::text($input_name, $input_value, [
+                    'class' => 'form-control',
+                    'data-name' => $input_name,
+                    'data-value' => $input_value,
+                    'placeholder' => trans('general.form.enter', ['field' => $text]),
+                    'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $input_name : 'form.' . $input_name),
+                ]) !!}
             </div>
 
-            {!! Form::text($input_name, $input_value, [
-                'class' => 'form-control',
-                'data-name' => $input_name,
-                'data-value' => $input_value,
-                'placeholder' => trans('general.form.enter', ['field' => $text]),
-                'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name),
-            ]) !!}
-        </div>
-
-        <div class="invalid-feedback d-block"
-            v-if="form.errors.has('{{ $input_name }}')"
-            v-html="form.errors.get('{{ $input_name }}')">
+            <div class="invalid-feedback d-block"
+                v-if="form.errors.has('{{ $input_name }}')"
+                v-html="form.errors.get('{{ $input_name }}')">
+            </div>
         </div>
     </div>
 

resources/views/partials/form/money_group.blade.php

@@ -49,12 +49,16 @@
         @change="{{ $attributes['change'] }}($event)"
         @endif
 
+        @if (!empty($attributes['input']))
+        @input="{{ $attributes['input'] }}"
+        @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'] . '.' . $name }}'); {{ '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']))

resources/views/partials/form/multi_select_add_new_group.blade.php

@@ -52,11 +52,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'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
         @else
-        @interface="form.{{ $name }} = $event"
+        @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event"
         @endif
 
         @if (!empty($attributes['change']))

resources/views/partials/form/multi_select_group.blade.php

@@ -30,11 +30,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'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
         @else
-        @interface="form.{{ $name }} = $event"
+        @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event"
         @endif
 
         @if (!empty($attributes['change']))

resources/views/partials/form/multi_select_remote_group.blade.php

@@ -0,0 +1,76 @@
+@stack($name . '_input_start')
+
+    <akaunting-select-remote
+        class="{{ $col }}{{ isset($attributes['required']) ? ' required' : '' }}{{ isset($attributes['disabled']) ? ' disabled' : '' }}"
+
+        id="form-select-{{ $name }}"
+
+        @if (!empty($attributes['v-error']))
+        :form-classes="[{'has-error': {{ $attributes['v-error'] }} }]"
+        @else
+        :form-classes="[{'has-error': form.errors.get('{{ $name }}') }]"
+        @endif
+
+        icon="{{ $icon }}"
+        title="{{ $text }}"
+        placeholder="{{ trans('general.form.select.field', ['field' => $text]) }}"
+        name="{{ $name }}"
+        :options="{{ json_encode($values) }}"
+
+        @if (!empty($selected) || old($name))
+        :value="{{ json_encode(old($name, $selected)) }}"
+        @endif
+
+        @if (!empty($attributes['model']))
+        :model="{{ $attributes['model'] }}"
+        @endif
+
+        :multiple="true"
+
+        @if (!empty($attributes['collapse']))
+        :collapse="true"
+        @endif
+
+        @if (!empty($attributes['v-model']))
+        @interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}"
+        @elseif (!empty($attributes['data-field']))
+        @interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
+        @else
+        @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event"
+        @endif
+
+        @if (!empty($attributes['change']))
+        @change="{{ $attributes['change'] }}($event)"
+        @endif
+
+        @if (isset($attributes['readonly']))
+        :readonly="{{ $attributes['readonly'] }}"
+        @endif
+
+        @if (isset($attributes['disabled']))
+        :disabled="{{ $attributes['disabled'] }}"
+        @endif
+
+        @if (isset($attributes['show']))
+        v-if="{{ $attributes['show'] }}"
+        @endif
+
+        @if (isset($attributes['v-error-message']))
+        :form-error="{{ $attributes['v-error-message'] }}"
+        @else
+        :form-error="form.errors.get('{{ $name }}')"
+        @endif
+
+        remote-action="{{ $attributes['remote_action'] }}"
+        remote-type="{{ $attributes['remote_type'] }}"
+
+        @if (!empty($attributes['currecny_code'])) 
+        currency-code="{{ $attributes['currecny_code'] }}"
+        @endif
+
+        loading-text="{{ trans('general.loading') }}"
+        no-data-text="{{ trans('general.no_data') }}"
+        no-matching-data-text="{{ trans('general.no_matching_data') }}"
+    ></akaunting-select-remote>
+
+@stack($name . '_input_end')

resources/views/partials/form/select_add_new_group.blade.php

@@ -46,9 +46,9 @@
         ])}}"
 
         @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'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
         @else
         @interface="form.{{ $name }} = $event; form.errors.clear('{{ $name }}');"
         @endif

resources/views/partials/form/select_group.blade.php

@@ -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'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
         @else
         @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event;"
         @endif

resources/views/partials/form/select_group_add_new_group.blade.php

@@ -48,11 +48,11 @@
         :group="true"
 
         @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'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
         @else
-        @interface="form.{{ $name }} = $event; form.errors.clear('{{ $name }}');"
+        @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event; form.errors.clear('{{ $name }}');"
         @endif
 
         @if (!empty($attributes['change']))

resources/views/partials/form/select_group_group.blade.php

@@ -26,11 +26,11 @@
         :group="true"
 
         @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'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
         @else
-        @interface="form.{{ $name }} = $event"
+        @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event"
         @endif
 
         @if (!empty($attributes['change']))

resources/views/partials/form/select_remote_group.blade.php

@@ -24,11 +24,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'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
         @else
-        @interface="form.{{ $name }} = $event"
+        @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event"
         @endif
 
         @if (!empty($attributes['change']))

resources/views/partials/form/text_editor_group.blade.php

@@ -10,12 +10,10 @@
         <akaunting-html-editor
             name="{{ $name }}"
 
-            @if (!empty($attributes['v-model']))
-            :value="{{ $attributes['v-model'] . ' = ' . `$value` }}"
-            @elseif (!empty($attributes['data-field']))
-            :value="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = '. `$value` }}"
+            @if (!empty($value))
+            :value="`{{ $value }}`"
             @else
-            :value="form.{{ $name }} = `{{ $value }}`"
+            :value="''"
             @endif
 
             @if (!empty($attributes['v-model']))

resources/views/partials/form/time_group.blade.php

@@ -33,11 +33,11 @@
         }"
 
         @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'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
         @else
-        @interface="form.{{ $name }} = $event"
+        @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event"
         @endif
 
         @if (isset($attributes['readonly']))