From f9de526cfd5d1b7a3bd7fb4de41c94c322031f30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Sat, 29 Feb 2020 12:27:13 +0300
Subject: [PATCH] Invoice and Bill item page fixes.

---
 .../views/purchases/bills/item.blade.php      | 73 +++++++++++--------
 resources/views/sales/invoices/item.blade.php | 73 +++++++++++--------
 2 files changed, 88 insertions(+), 58 deletions(-)

diff --git a/resources/views/purchases/bills/item.blade.php b/resources/views/purchases/bills/item.blade.php
index 3c224b275..aab4fec40 100644
--- a/resources/views/purchases/bills/item.blade.php
+++ b/resources/views/purchases/bills/item.blade.php
@@ -4,20 +4,22 @@
         <td class="text-center border-right-0 border-bottom-0">
             @stack('actions_button_start')
                 <button type="button"
-                        @click="onDeleteItem(index)"
-                        data-toggle="tooltip"
-                        title="{{ trans('general.delete') }}"
-                        class="btn btn-icon btn-outline-danger btn-lg"><i class="fa fa-trash"></i>
+                    @click="onDeleteItem(index)"
+                    data-toggle="tooltip"
+                    title="{{ trans('general.delete') }}"
+                    class="btn btn-icon btn-outline-danger btn-lg">
+                    <i class="fa fa-trash"></i>
                 </button>
             @stack('actions_button_end')
         </td>
     @stack('actions_td_end')
 
     @stack('name_td_start')
-        <td class="border-right-0 border-bottom-0">
+        <td class="border-right-0 border-bottom-0"
+            :class="[{'has-error': form.errors.has('items.' + index + '.name') }]">
             @stack('name_input_start')
             <akaunting-select-remote
-                :form-classes="[{'has-error': form.errors.get('name') }]"
+                :form-classes="[{'has-error': form.errors.has('items.' + index + '.name')}]"
                 :placeholder="'{{ trans('general.type_item_name') }}'"
                 :name="'item_id'"
                 :options="{{ json_encode($items) }}"
@@ -32,10 +34,11 @@
                 @interface="row.item_id = $event"
                 @label="row.name = $event"
                 @option="onSelectItem($event, index)"
+                @change="form.errors.clear('items.' + index + '.name')"
                 :remote-action="'{{ route('items.autocomplete') }}'"
-                :remote-type="'bill'"
+                remote-type="bill"
                 :currency-code="form.currency_code"
-                :form-error="form.errors.get('name')"
+                :form-error="form.errors.get('items.' + index + '.name')"
                 :loading-text="'{{ trans('general.loading') }}'"
                 :no-data-text="'{{ trans('general.no_data') }}'"
                 :no-matching-data-text="'{{ trans('general.no_matching_data') }}'"
@@ -45,47 +48,59 @@
                 v-model="row.name"
                 @input="onCalculateTotal"
                 name="item[][name]">
-            {!! $errors->first('item.name', '<p class="help-block">:message</p>') !!}
+
+            <div class="invalid-feedback d-block"
+                v-if="form.errors.has('items.' + index + '.name')"
+                v-html="form.errors.get('items.' + index + '.name')">
+            </div>
             @stack('name_input_end')
         </td>
     @stack('name_td_end')
 
     @stack('quantity_td_start')
-        <td class="border-right-0 border-bottom-0">
+        <td class="border-right-0 border-bottom-0"
+            :class="[{'has-error': form.errors.has('items.' + index + '.quantity') }]">
             @stack('quantity_input_start')
-                <input class="form-control text-center"
-                       autocomplete="off"
-                       required="required"
-                       data-item="quantity"
-                       v-model="row.quantity"
-                       @input="onCalculateTotal"
-                       name="item[][quantity]"
-                       type="text">
-                {!! $errors->first('item.quantity', '<p class="help-block">:message</p>') !!}
+                <input type="text"
+                    class="form-control text-center"
+                    :name="'items.' + index + '.quantity'"
+                    autocomplete="off"
+                    required="required"
+                    data-item="quantity"
+                    v-model="row.quantity"
+                    @input="onCalculateTotal"
+                    @change="form.errors.clear('items.' + index + '.quantity')">
+
+                <div class="invalid-feedback d-block"
+                    v-if="form.errors.has('items.' + index + '.quantity')"
+                    v-html="form.errors.get('items.' + index + '.quantity')">
+                </div>
             @stack('quantity_input_end')
         </td>
     @stack('quantity_td_end')
 
     @stack('price_td_start')
-        <td class="border-right-0 border-bottom-0 pb-0">
+        <td class="border-right-0 border-bottom-0 pb-0"
+            :class="[{'has-error': form.errors.has('items.' + index + '.price') }]">
             @stack('price_input_start')
-                {{ Form::moneyGroup('name', '', '', ['required' => 'required', 'v-model' => 'row.price', 'data-item' => 'price', 'currency' => $currency, 'change' => 'row.price = $event; onCalculateTotal'], 0.00, 'text-right input-price') }}
-                <input name="items[][currency]"
-                       data-item="currency"
-                       v-model="row.currency"
-                       @input="onCalculateTotal"
-                       type="hidden">
-                {!! $errors->first('item.price', '<p class="help-block">:message</p>') !!}
+                {{ Form::moneyGroup('name', '', '', ['required' => 'required', 'v-model' => 'row.price', 'v-error' => 'form.errors.get(\'items.\' + index + \'.price\')', 'v-error-message' => 'form.errors.get(\'items.\' + index + \'.price\')' , 'data-item' => 'price', 'currency' => $currency, 'dynamic-currency' => 'currency', 'change' => 'row.price = $event; form.errors.clear(\'items.\' + index + \'.price\'); onCalculateTotal'], 0.00, 'text-right input-price') }}
+
+                <input :name="'items.' + index + '.currency'"
+                    data-item="currency"
+                    v-model="row.currency"
+                    @input="onCalculateTotal"
+                    type="hidden">
             @stack('price_input_end')
         </td>
     @stack('price_td_end')
 
     @stack('taxes_td_start')
-        <td class="border-right-0 border-bottom-0">
+        <td class="border-right-0 border-bottom-0"
+            :class="[{'has-error': form.errors.has('items.' + index + '.tax_id') }]">
             @stack('tax_id_input_start')
             <akaunting-select
                 class="mb-0 select-tax"
-                :form-classes="[{'has-error': form.errors.get('tax_id') }]"
+                :form-classes="[{'has-error': form.errors.has('tax_id') }]"
                 :icon="''"
                 :title="''"
                 :placeholder="'{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}'"
diff --git a/resources/views/sales/invoices/item.blade.php b/resources/views/sales/invoices/item.blade.php
index 4c117e48f..c9eddbc40 100644
--- a/resources/views/sales/invoices/item.blade.php
+++ b/resources/views/sales/invoices/item.blade.php
@@ -4,20 +4,22 @@
         <td class="text-center border-right-0 border-bottom-0">
             @stack('actions_button_start')
                 <button type="button"
-                        @click="onDeleteItem(index)"
-                        data-toggle="tooltip"
-                        title="{{ trans('general.delete') }}"
-                        class="btn btn-icon btn-outline-danger btn-lg"><i class="fa fa-trash"></i>
+                    @click="onDeleteItem(index)"
+                    data-toggle="tooltip"
+                    title="{{ trans('general.delete') }}"
+                    class="btn btn-icon btn-outline-danger btn-lg">
+                    <i class="fa fa-trash"></i>
                 </button>
             @stack('actions_button_end')
         </td>
     @stack('actions_td_end')
 
     @stack('name_td_start')
-        <td class="border-right-0 border-bottom-0">
+        <td class="border-right-0 border-bottom-0"
+            :class="[{'has-error': form.errors.has('items.' + index + '.name') }]">
             @stack('name_input_start')
             <akaunting-select-remote
-                :form-classes="[{'has-error': form.errors.get('name') }]"
+                :form-classes="[{'has-error': form.errors.has('items.' + index + '.name')}]"
                 :placeholder="'{{ trans('general.type_item_name') }}'"
                 :name="'item_id'"
                 :options="{{ json_encode($items) }}"
@@ -32,10 +34,11 @@
                 @interface="row.item_id = $event"
                 @label="row.name = $event"
                 @option="onSelectItem($event, index)"
+                @change="form.errors.clear('items.' + index + '.name')"
                 :remote-action="'{{ route('items.autocomplete') }}'"
-                :remote-type="'invoice'"
+                remote-type="invoice"
                 :currency-code="form.currency_code"
-                :form-error="form.errors.get('name')"
+                :form-error="form.errors.get('items.' + index + '.name')"
                 :loading-text="'{{ trans('general.loading') }}'"
                 :no-data-text="'{{ trans('general.no_data') }}'"
                 :no-matching-data-text="'{{ trans('general.no_matching_data') }}'"
@@ -45,47 +48,59 @@
                 v-model="row.name"
                 @input="onCalculateTotal"
                 name="item[][name]">
-            {!! $errors->first('item.name', '<p class="help-block">:message</p>') !!}
+
+            <div class="invalid-feedback d-block"
+                v-if="form.errors.has('items.' + index + '.name')"
+                v-html="form.errors.get('items.' + index + '.name')">
+            </div>
             @stack('name_input_end')
         </td>
     @stack('name_td_end')
 
     @stack('quantity_td_start')
-        <td class="border-right-0 border-bottom-0">
+        <td class="border-right-0 border-bottom-0"
+            :class="[{'has-error': form.errors.has('items.' + index + '.quantity') }]">
             @stack('quantity_input_start')
-                <input class="form-control text-center"
-                       autocomplete="off"
-                       required="required"
-                       data-item="quantity"
-                       v-model="row.quantity"
-                       @input="onCalculateTotal"
-                       name="item[][quantity]"
-                       type="text">
-                {!! $errors->first('item.quantity', '<p class="help-block">:message</p>') !!}
+                <input type="text"
+                    class="form-control text-center"
+                    :name="'items.' + index + '.quantity'"
+                    autocomplete="off"
+                    required="required"
+                    data-item="quantity"
+                    v-model="row.quantity"
+                    @input="onCalculateTotal"
+                    @change="form.errors.clear('items.' + index + '.quantity')">
+
+                <div class="invalid-feedback d-block"
+                    v-if="form.errors.has('items.' + index + '.quantity')"
+                    v-html="form.errors.get('items.' + index + '.quantity')">
+                </div>
             @stack('quantity_input_end')
         </td>
     @stack('quantity_td_end')
 
     @stack('price_td_start')
-        <td class="border-right-0 border-bottom-0 pb-0">
+        <td class="border-right-0 border-bottom-0 pb-0"
+            :class="[{'has-error': form.errors.has('items.' + index + '.price') }]">
             @stack('price_input_start')
-                {{ Form::moneyGroup('name', '', '', ['required' => 'required', 'v-model' => 'row.price', 'data-item' => 'price', 'currency' => $currency, 'change' => 'row.price = $event; onCalculateTotal'], 0.00, 'text-right input-price') }}
-                <input name="items[][currency]"
-                       data-item="currency"
-                       v-model="row.currency"
-                       @input="onCalculateTotal"
-                       type="hidden">
-                {!! $errors->first('item.price', '<p class="help-block">:message</p>') !!}
+                {{ Form::moneyGroup('name', '', '', ['required' => 'required', 'v-model' => 'row.price', 'v-error' => 'form.errors.get(\'items.\' + index + \'.price\')', 'v-error-message' => 'form.errors.get(\'items.\' + index + \'.price\')' , 'data-item' => 'price', 'currency' => $currency, 'dynamic-currency' => 'currency', 'change' => 'row.price = $event; form.errors.clear(\'items.\' + index + \'.price\'); onCalculateTotal'], 0.00, 'text-right input-price') }}
+
+                <input :name="'items.' + index + '.currency'"
+                    data-item="currency"
+                    v-model="row.currency"
+                    @input="onCalculateTotal"
+                    type="hidden">
             @stack('price_input_end')
         </td>
     @stack('price_td_end')
 
     @stack('taxes_td_start')
-        <td class="border-right-0 border-bottom-0">
+        <td class="border-right-0 border-bottom-0"
+            :class="[{'has-error': form.errors.has('items.' + index + '.tax_id') }]">
             @stack('tax_id_input_start')
             <akaunting-select
                 class="mb-0 select-tax"
-                :form-classes="[{'has-error': form.errors.get('tax_id') }]"
+                :form-classes="[{'has-error': form.errors.has('tax_id') }]"
                 :icon="''"
                 :title="''"
                 :placeholder="'{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}'"