From ac29fe4bf1332938182059311e9dff65eccc3fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Wed, 11 Mar 2020 16:37:42 +0300
Subject: [PATCH] Invoice and Bill create, edit page item table cells style
 fixes.

---
 resources/assets/js/views/purchases/bills.js     |  2 ++
 resources/assets/js/views/sales/invoices.js      |  2 ++
 resources/views/purchases/bills/create.blade.php | 10 +++++-----
 resources/views/purchases/bills/edit.blade.php   | 10 +++++-----
 resources/views/sales/invoices/create.blade.php  | 10 +++++-----
 resources/views/sales/invoices/edit.blade.php    | 10 +++++-----
 6 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/resources/assets/js/views/purchases/bills.js b/resources/assets/js/views/purchases/bills.js
index 1fdb8dace..9397710ab 100644
--- a/resources/assets/js/views/purchases/bills.js
+++ b/resources/assets/js/views/purchases/bills.js
@@ -50,10 +50,12 @@ const app = new Vue({
             items: '',
             discount: false,
             taxes: null,
+            colspan: 5,
         }
     },
 
     mounted() {
+        this.colspan = document.getElementById("items").rows[0].cells.length - 1;
         this.form.items = [];
 
         if (this.form.method) {
diff --git a/resources/assets/js/views/sales/invoices.js b/resources/assets/js/views/sales/invoices.js
index 25668bf86..c5e485fbb 100644
--- a/resources/assets/js/views/sales/invoices.js
+++ b/resources/assets/js/views/sales/invoices.js
@@ -50,10 +50,12 @@ const app = new Vue({
             items: '',
             discount: false,
             taxes: null,
+            colspan: 5,
         }
     },
 
     mounted() {
+        this.colspan = document.getElementById("items").rows[0].cells.length - 1;
         this.form.items = [];
 
         if (this.form.method) {
diff --git a/resources/views/purchases/bills/create.blade.php b/resources/views/purchases/bills/create.blade.php
index 6b5b0ced6..6c69677d1 100644
--- a/resources/views/purchases/bills/create.blade.php
+++ b/resources/views/purchases/bills/create.blade.php
@@ -69,13 +69,13 @@
                                                 <button type="button" @click="onAddItem" id="button-add-item" data-toggle="tooltip" title="{{ trans('general.add') }}" class="btn btn-icon btn-outline-success btn-lg" data-original-title="{{ trans('general.add') }}"><i class="fa fa-plus"></i>
                                                 </button>
                                             </td>
-                                            <td class="text-right border-bottom-0" colspan="5"></td>
+                                            <td class="text-right border-bottom-0" colspan="5" :colspan="colspan"></td>
                                         </tr>
                                     @stack('add_item_td_end')
 
                                     @stack('sub_total_td_start')
                                         <tr id="tr-subtotal">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="5">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
                                                 <strong>{{ trans('bills.sub_total') }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
@@ -88,7 +88,7 @@
 
                                     @stack('add_discount_td_start')
                                         <tr id="tr-discount">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="5">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
                                                 <el-popover
                                                     popper-class="p-0 h-0"
                                                     placement="bottom"
@@ -140,7 +140,7 @@
 
                                     @stack('tax_total_td_start')
                                         <tr id="tr-tax">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="5">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
                                                 <strong>{{ trans_choice('general.taxes', 1) }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
@@ -153,7 +153,7 @@
 
                                     @stack('grand_total_td_start')
                                         <tr id="tr-total">
-                                            <td class="text-right border-right-0" colspan="5">
+                                            <td class="text-right border-right-0" colspan="5" :colspan="colspan">
                                                 <strong>{{ trans('bills.total') }}</strong>
                                             </td>
                                             <td class="text-right long-texts">
diff --git a/resources/views/purchases/bills/edit.blade.php b/resources/views/purchases/bills/edit.blade.php
index 4bd955b1b..53eb712a7 100644
--- a/resources/views/purchases/bills/edit.blade.php
+++ b/resources/views/purchases/bills/edit.blade.php
@@ -70,13 +70,13 @@
                                                 <button type="button" @click="onAddItem" id="button-add-item" data-toggle="tooltip" title="{{ trans('general.add') }}" class="btn btn-icon btn-outline-success btn-lg" data-original-title="{{ trans('general.add') }}"><i class="fa fa-plus"></i>
                                                 </button>
                                             </td>
-                                            <td class="text-right border-bottom-0" colspan="5"></td>
+                                            <td class="text-right border-bottom-0" colspan="5" :colspan="colspan"></td>
                                         </tr>
                                     @stack('add_item_td_end')
 
                                     @stack('sub_total_td_start')
                                         <tr id="tr-subtotal">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="5">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
                                                 <strong>{{ trans('bills.sub_total') }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
@@ -89,7 +89,7 @@
 
                                     @stack('add_discount_td_start')
                                         <tr id="tr-discount">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="5">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
                                                 <el-popover
                                                     popper-class="p-0 h-0"
                                                     placement="bottom"
@@ -141,7 +141,7 @@
 
                                     @stack('tax_total_td_start')
                                         <tr id="tr-tax">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="5">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
                                                 <strong>{{ trans_choice('general.taxes', 1) }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
@@ -154,7 +154,7 @@
 
                                     @stack('grand_total_td_start')
                                         <tr id="tr-total">
-                                            <td class="text-right border-right-0" colspan="5">
+                                            <td class="text-right border-right-0" colspan="5" :colspan="colspan">
                                                 <strong>{{ trans('bills.total') }}</strong>
                                             </td>
                                             <td class="text-right long-texts">
diff --git a/resources/views/sales/invoices/create.blade.php b/resources/views/sales/invoices/create.blade.php
index d32cdf149..a6fc4001e 100644
--- a/resources/views/sales/invoices/create.blade.php
+++ b/resources/views/sales/invoices/create.blade.php
@@ -69,13 +69,13 @@
                                                 <button type="button" @click="onAddItem" id="button-add-item" data-toggle="tooltip" title="{{ trans('general.add') }}" class="btn btn-icon btn-outline-success btn-lg" data-original-title="{{ trans('general.add') }}"><i class="fa fa-plus"></i>
                                                 </button>
                                             </td>
-                                            <td class="text-right border-bottom-0" colspan="5"></td>
+                                            <td class="text-right border-bottom-0" colspan="5" :colspan="colspan"></td>
                                         </tr>
                                     @stack('add_item_td_end')
 
                                     @stack('sub_total_td_start')
                                         <tr id="tr-subtotal">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="5">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
                                                 <strong>{{ trans('invoices.sub_total') }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
@@ -88,7 +88,7 @@
 
                                     @stack('add_discount_td_start')
                                         <tr id="tr-discount">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="5">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
                                                 <el-popover
                                                     popper-class="p-0 h-0"
                                                     placement="bottom"
@@ -140,7 +140,7 @@
 
                                     @stack('tax_total_td_start')
                                         <tr id="tr-tax">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="5">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
                                                 <strong>{{ trans_choice('general.taxes', 1) }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
@@ -153,7 +153,7 @@
 
                                     @stack('grand_total_td_start')
                                         <tr id="tr-total">
-                                            <td class="text-right border-right-0" colspan="5">
+                                            <td class="text-right border-right-0" colspan="5" :colspan="colspan">
                                                 <strong>{{ trans('invoices.total') }}</strong>
                                             </td>
                                             <td class="text-right long-texts">
diff --git a/resources/views/sales/invoices/edit.blade.php b/resources/views/sales/invoices/edit.blade.php
index 72aec97ee..41e933e17 100644
--- a/resources/views/sales/invoices/edit.blade.php
+++ b/resources/views/sales/invoices/edit.blade.php
@@ -70,13 +70,13 @@
                                                 <button type="button" @click="onAddItem" id="button-add-item" data-toggle="tooltip" title="{{ trans('general.add') }}" class="btn btn-icon btn-outline-success btn-lg" data-original-title="{{ trans('general.add') }}"><i class="fa fa-plus"></i>
                                                 </button>
                                             </td>
-                                            <td class="text-right border-bottom-0" colspan="5"></td>
+                                            <td class="text-right border-bottom-0" colspan="5" :colspan="colspan"></td>
                                         </tr>
                                     @stack('add_item_td_end')
 
                                     @stack('sub_total_td_start')
                                         <tr id="tr-subtotal">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="5">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
                                                 <strong>{{ trans('invoices.sub_total') }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
@@ -89,7 +89,7 @@
 
                                     @stack('add_discount_td_start')
                                         <tr id="tr-discount">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="5">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
                                                 <el-popover
                                                     popper-class="p-0 h-0"
                                                     placement="bottom"
@@ -141,7 +141,7 @@
 
                                     @stack('tax_total_td_start')
                                         <tr id="tr-tax">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="5">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
                                                 <strong>{{ trans_choice('general.taxes', 1) }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
@@ -154,7 +154,7 @@
 
                                     @stack('grand_total_td_start')
                                         <tr id="tr-total">
-                                            <td class="text-right border-right-0" colspan="5">
+                                            <td class="text-right border-right-0" colspan="5" :colspan="colspan">
                                                 <strong>{{ trans('invoices.total') }}</strong>
                                             </td>
                                             <td class="text-right long-texts">