From f9ad078c08038f619e3e865b7f55894f918011df Mon Sep 17 00:00:00 2001
From: Burak Civan <burakcivan22@gmail.com>
Date: Tue, 1 Jun 2021 15:02:51 +0300
Subject: [PATCH 1/5] Invoice styling edited again

---
 public/css/custom.css                         | 40 +++++++++++++++++++
 .../documents/form/line-item.blade.php        | 30 ++++----------
 2 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/public/css/custom.css b/public/css/custom.css
index 8e9cd06c8..8d79abef3 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -1628,3 +1628,43 @@ table .align-items-center td span.badge {
     display: contents !important;
 }
 /* Select Tag Fixed Content Finish */
+
+@-moz-document url-prefix() {
+    .row-tax-clear {
+        max-width: 40px !important;
+    }
+    
+    .row-tax-value {
+        width: 167px !important;
+    }
+    
+    .row-tax-input {
+        width: 224px !important;
+    }
+  }
+
+.row-tax-clear {
+    max-width: 40px !important;
+}
+
+.row-tax-value {
+    width: 243px !important;
+}
+
+.row-tax-input {
+    width: 244px !important;
+}
+
+@media (max-width: 1300px) {
+    .row-tax-clear {
+        max-width: 40px !important;
+    }
+    
+    .row-tax-value {
+        width: 233px !important;
+    }
+    
+    .row-tax-input {
+        width: 234px !important;
+    }
+}
\ No newline at end of file
diff --git a/resources/views/components/documents/form/line-item.blade.php b/resources/views/components/documents/form/line-item.blade.php
index 97a04b43d..7102085ab 100644
--- a/resources/views/components/documents/form/line-item.blade.php
+++ b/resources/views/components/documents/form/line-item.blade.php
@@ -136,20 +136,6 @@
 
                         <td class="border-top-0 p-0" colspan="4">
                             <table class="w-100">
-                                <colgroup>
-                                    @if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both']))
-                                    <col style="width: 25%;">
-                                    <col style="width: 30%;">
-                                    <col style="width: 55%;">
-                                    <col style="width: 40px;">
-                                    @else
-                                    <col style="width: 10%;">
-                                    <col style="width: 10%;">
-                                    <col style="width: 42%;">
-                                    <col style="width: 40px;">
-                                    @endif
-                                </colgroup>
-
                                 <tbody>
 
                                     @if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both']))
@@ -230,7 +216,7 @@
 
                                     <tr v-for="(row_tax, row_tax_index) in row.tax_ids"
                                     :index="row_tax_index">
-                                        <td class="pl-0 pb-0 border-0" :class="{'pb-2' : !row.add_tax}" style="width: 42%;">
+                                        <td class="pl-0 pb-0 border-0 row-tax-input" :class="{'pb-2' : !row.add_tax}" style="width: 244px;">
                                             <div>
                                                 <div style="float: left; margin-top: 15px; margin-right:2px">
                                                     {{ trans_choice('general.taxes', 1) }}
@@ -258,13 +244,13 @@
                                             </div>
                                         </td>
 
-                                        <td :class="{'pb-2' : !row.add_tax}" class="border-0 pb-0 text-right long-texts" style="width: 39%;">
+                                        <td :class="{'pb-2' : !row.add_tax}" class="border-0 pb-0 text-right long-texts row-tax-value" style="width: 243px;">
                                             <div>
                                                 {{ Form::moneyGroup('tax', '', '', ['required' => 'required', 'disabled' => 'true' , 'row-input' => 'true', 'v-model' => 'row_tax.price', 'data-item' => 'total', 'currency' => $currency, 'dynamic-currency' => 'currency'], 0.00, 'text-right input-price disabled-money') }}
                                             </div>
                                         </td>
 
-                                        <td class="pb-3 pl-2 align-bottom border-0" :class="{'pb-2' : !row.add_tax}" style="width:19%;" >
+                                        <td class="pb-3 pl-2 align-bottom border-0 row-tax-clear" :class="{'pb-2' : !row.add_tax}" style="max-width: 40px;">
                                             <button type="button" @click="onDeleteTax(index, row_tax_index)" class="btn btn-link btn-delete p-0">
                                                 <i class="far fa-trash-alt"></i>
                                             </button>
@@ -272,7 +258,7 @@
                                     </tr>
 
                                     <tr v-if="row.add_tax">
-                                        <td class="pl-0 border-0" style="width:42%;">
+                                        <td class="pl-0 border-0 row-tax-input" style="width: 244px;">
                                             <div>
                                                 <div style="float: left; margin-top: 15px; margin-right:2px;">
                                                     {{ trans_choice('general.taxes', 1) }}
@@ -322,18 +308,18 @@
                                             </div>
                                         </td>
 
-                                        <td class="border-0 text-right long-texts align-middle;" style="width:39%;">
+                                        <td class="border-0 text-right long-texts align-middle row-tax-value" style="width: 243px;">
                                             <div>
                                                 __
                                             </div>
                                         </td>
 
-                                        <td class="pb-3 pl-2 align-bottom border-0" style="width:19%;" >
-                                            @if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both']))
+                                        <td class="pb-3 pl-2 align-bottom border-0 row-tax-clear" style="max-width: 40px;">
+                                        @if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both']))
                                                 <button type="button" @click="onDeleteTax(index, 999)" class="btn btn-link btn-delete p-0">
                                                     <i class="far fa-trash-alt"></i>
                                                 </button>
-                                            @endif
+                                        @endif
                                         </td>
                                     </tr>
 

From 3dfb9c23e8a22a977bbfdf6b4ef8c4ed665a1fb3 Mon Sep 17 00:00:00 2001
From: Burak Civan <burakcivan22@gmail.com>
Date: Tue, 1 Jun 2021 15:20:17 +0300
Subject: [PATCH 2/5] Unusage code ejected

---
 public/css/custom.css                              | 14 --------------
 .../components/documents/form/line-item.blade.php  |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/public/css/custom.css b/public/css/custom.css
index 8d79abef3..ea9a68e94 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -1629,20 +1629,6 @@ table .align-items-center td span.badge {
 }
 /* Select Tag Fixed Content Finish */
 
-@-moz-document url-prefix() {
-    .row-tax-clear {
-        max-width: 40px !important;
-    }
-    
-    .row-tax-value {
-        width: 167px !important;
-    }
-    
-    .row-tax-input {
-        width: 224px !important;
-    }
-  }
-
 .row-tax-clear {
     max-width: 40px !important;
 }
diff --git a/resources/views/components/documents/form/line-item.blade.php b/resources/views/components/documents/form/line-item.blade.php
index 7102085ab..fee17a96b 100644
--- a/resources/views/components/documents/form/line-item.blade.php
+++ b/resources/views/components/documents/form/line-item.blade.php
@@ -258,7 +258,7 @@
                                     </tr>
 
                                     <tr v-if="row.add_tax">
-                                        <td class="pl-0 border-0 row-tax-input" style="width: 244px;">
+                                        <td class="pl-0 border-0 row-tax-input" style="width: 234px;">
                                             <div>
                                                 <div style="float: left; margin-top: 15px; margin-right:2px;">
                                                     {{ trans_choice('general.taxes', 1) }}
@@ -308,7 +308,7 @@
                                             </div>
                                         </td>
 
-                                        <td class="border-0 text-right long-texts align-middle row-tax-value" style="width: 243px;">
+                                        <td class="border-0 text-right long-texts align-middle row-tax-value" style="width: 233px;">
                                             <div>
                                                 __
                                             </div>

From bdbca0f17506fcb7e54f7cfcd4533723971c7809 Mon Sep 17 00:00:00 2001
From: Burak Civan <burakcivan22@gmail.com>
Date: Wed, 2 Jun 2021 17:42:45 +0300
Subject: [PATCH 3/5] Code refactoring

---
 public/css/custom.css                         | 28 +----------------
 .../documents/form/line-item.blade.php        | 31 +++++++++++++------
 2 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/public/css/custom.css b/public/css/custom.css
index ea9a68e94..f4217bd52 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -1627,30 +1627,4 @@ table .align-items-center td span.badge {
 .form-group .el-select .el-select__tags > span {
     display: contents !important;
 }
-/* Select Tag Fixed Content Finish */
-
-.row-tax-clear {
-    max-width: 40px !important;
-}
-
-.row-tax-value {
-    width: 243px !important;
-}
-
-.row-tax-input {
-    width: 244px !important;
-}
-
-@media (max-width: 1300px) {
-    .row-tax-clear {
-        max-width: 40px !important;
-    }
-    
-    .row-tax-value {
-        width: 233px !important;
-    }
-    
-    .row-tax-input {
-        width: 234px !important;
-    }
-}
\ No newline at end of file
+/* Select Tag Fixed Content Finish */
\ No newline at end of file
diff --git a/resources/views/components/documents/form/line-item.blade.php b/resources/views/components/documents/form/line-item.blade.php
index fee17a96b..6e067d1c4 100644
--- a/resources/views/components/documents/form/line-item.blade.php
+++ b/resources/views/components/documents/form/line-item.blade.php
@@ -136,6 +136,19 @@
 
                         <td class="border-top-0 p-0" colspan="4">
                             <table class="w-100">
+                            <colgroup>
+                                    @if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both']))
+                                    <col style="width: 25%;">
+                                    <col style="width: 30%;">
+                                    <col style="width: 55%;">
+                                    <col style="width: 40px;">
+                                    @else
+                                    <col style="width: 10%;">
+                                    <col style="width: 10%;">
+                                    <col style="width: 42%;">
+                                    <col style="width: 40px;">
+                                    @endif
+                                </colgroup>
                                 <tbody>
 
                                     @if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both']))
@@ -166,7 +179,7 @@
                                     <tr v-if="row.add_discount">
                                         <td colspan="2" class="pl-0 pb-0 border-0" :class="{'pb-2' : !row.add_tax}">
                                             <div>
-                                                <div style="float: left; margin-top: 15px; margin-left: -65px;">
+                                                <div style="float: left; margin-top: 15px; margin-left: -65px">
                                                     {{ trans('invoices.discount') }}
                                                 </div>
 
@@ -216,9 +229,9 @@
 
                                     <tr v-for="(row_tax, row_tax_index) in row.tax_ids"
                                     :index="row_tax_index">
-                                        <td class="pl-0 pb-0 border-0 row-tax-input" :class="{'pb-2' : !row.add_tax}" style="width: 244px;">
+                                        <td colspan="2" class="pl-0 pb-0 border-0 row-tax-input" :class="{'pb-2' : !row.add_tax}">
                                             <div>
-                                                <div style="float: left; margin-top: 15px; margin-right:2px">
+                                                <div style="float: left; margin-top: 15px; margin-right:2px; position:absolute; margin-left:-35px;">
                                                     {{ trans_choice('general.taxes', 1) }}
                                                 </div>
 
@@ -244,13 +257,13 @@
                                             </div>
                                         </td>
 
-                                        <td :class="{'pb-2' : !row.add_tax}" class="border-0 pb-0 text-right long-texts row-tax-value" style="width: 243px;">
+                                        <td :class="{'pb-2' : !row.add_tax}" class="border-0 pb-0 text-right long-texts">
                                             <div>
                                                 {{ Form::moneyGroup('tax', '', '', ['required' => 'required', 'disabled' => 'true' , 'row-input' => 'true', 'v-model' => 'row_tax.price', 'data-item' => 'total', 'currency' => $currency, 'dynamic-currency' => 'currency'], 0.00, 'text-right input-price disabled-money') }}
                                             </div>
                                         </td>
 
-                                        <td class="pb-3 pl-2 align-bottom border-0 row-tax-clear" :class="{'pb-2' : !row.add_tax}" style="max-width: 40px;">
+                                        <td class="pb-3 pl-2 align-bottom border-0" :class="{'pb-2' : !row.add_tax}" style="max-width: 40px;">
                                             <button type="button" @click="onDeleteTax(index, row_tax_index)" class="btn btn-link btn-delete p-0">
                                                 <i class="far fa-trash-alt"></i>
                                             </button>
@@ -258,9 +271,9 @@
                                     </tr>
 
                                     <tr v-if="row.add_tax">
-                                        <td class="pl-0 border-0 row-tax-input" style="width: 234px;">
-                                            <div>
-                                                <div style="float: left; margin-top: 15px; margin-right:2px;">
+                                        <td colspan="2" class="pl-0 border-0 row-tax-input">
+                                            <div style="position: relative;">
+                                                <div style="float: left; margin-top: 15px; margin-right:2px; position: absolute; margin-left: -35px;">
                                                     {{ trans_choice('general.taxes', 1) }}
                                                 </div>
 
@@ -308,7 +321,7 @@
                                             </div>
                                         </td>
 
-                                        <td class="border-0 text-right long-texts align-middle row-tax-value" style="width: 233px;">
+                                        <td class="border-0 text-right long-texts align-middle row-tax-value">
                                             <div>
                                                 __
                                             </div>

From 38ee37818a87cfd332024e0a8e235a463cca59cc Mon Sep 17 00:00:00 2001
From: Burak Civan <burakcivan22@gmail.com>
Date: Thu, 3 Jun 2021 18:40:26 +0300
Subject: [PATCH 4/5] Code refactoring

---
 .../documents/form/line-item.blade.php        | 39 ++++++++++---------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/resources/views/components/documents/form/line-item.blade.php b/resources/views/components/documents/form/line-item.blade.php
index 6e067d1c4..e666cff51 100644
--- a/resources/views/components/documents/form/line-item.blade.php
+++ b/resources/views/components/documents/form/line-item.blade.php
@@ -136,7 +136,7 @@
 
                         <td class="border-top-0 p-0" colspan="4">
                             <table class="w-100">
-                            <colgroup>
+                                <!-- <colgroup>
                                     @if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both']))
                                     <col style="width: 25%;">
                                     <col style="width: 30%;">
@@ -148,12 +148,13 @@
                                     <col style="width: 42%;">
                                     <col style="width: 40px;">
                                     @endif
-                                </colgroup>
+                                </colgroup> -->
+
                                 <tbody>
 
                                     @if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both']))
                                     <tr v-if="!row.add_tax || !row.add_discount">
-                                        <td class="text-left border-0 p-0">
+                                        <td class="text-left border-0 p-0" style="display: block;">
                                             <div>
                                                 <button type="button" class="btn btn-link btn-sm p-0" @click="onAddLineDiscount(index)" v-if="!row.add_discount">
                                                     {{ trans('general.title.add', ['type' => trans('invoices.discount')]) }}
@@ -161,8 +162,8 @@
                                             </div>
                                         </td>
 
-                                        <td class="text-right border-0 p-0 pr-4">
-                                            <div>
+                                        <td class="text-right border-0 p-0 pr-4" style="display: block;">
+                                            <div style="float:left;">
                                                 <button type="button" class="btn btn-link btn-sm p-0" @click="onAddTax(index)" v-if="!row.add_tax">
                                                     {{ trans('general.title.add', ['type' => trans_choice('general.taxes', 1)]) }}
                                                 </button>
@@ -177,9 +178,9 @@
                                     </tr>
 
                                     <tr v-if="row.add_discount">
-                                        <td colspan="2" class="pl-0 pb-0 border-0" :class="{'pb-2' : !row.add_tax}">
+                                        <td colspan="2" class="pl-0 pb-0 border-0" :class="{'pb-2' : !row.add_tax}" style="width:42%;">
                                             <div>
-                                                <div style="float: left; margin-top: 15px; margin-left: -65px">
+                                                <div style="float: left; margin-top: 15px; margin-left: -65px;">
                                                     {{ trans('invoices.discount') }}
                                                 </div>
 
@@ -213,7 +214,7 @@
                                             </div>
                                         </td>
 
-                                        <td class="border-0 pb-0 text-right long-texts" :class="{'pb-2' : !row.add_tax}">
+                                        <td class="border-0 pb-0 text-right long-texts" :class="{'pb-2' : !row.add_tax}" style="width:231px;">
                                             <div>
                                                 {{ Form::moneyGroup('discount_amount', '', '', ['required' => 'required', 'disabled' => 'true' , 'row-input' => 'true', 'v-model' => 'row.discount_amount', 'data-item' => 'discount_amount', 'currency' => $currency, 'dynamic-currency' => 'currency'], 0.00, 'text-right input-price disabled-money') }}
                                             </div>
@@ -229,9 +230,9 @@
 
                                     <tr v-for="(row_tax, row_tax_index) in row.tax_ids"
                                     :index="row_tax_index">
-                                        <td colspan="2" class="pl-0 pb-0 border-0 row-tax-input" :class="{'pb-2' : !row.add_tax}">
-                                            <div>
-                                                <div style="float: left; margin-top: 15px; margin-right:2px; position:absolute; margin-left:-35px;">
+                                        <td colspan="2" class="pl-0 pb-0 border-0" :class="{'pb-2' : !row.add_tax}" style="width:42%;">
+                                            <div style="position: relative;">
+                                                <div style="float: left; margin-top: 15px; margin-right:2px; position: absolute; left: -33px;">
                                                     {{ trans_choice('general.taxes', 1) }}
                                                 </div>
 
@@ -257,13 +258,13 @@
                                             </div>
                                         </td>
 
-                                        <td :class="{'pb-2' : !row.add_tax}" class="border-0 pb-0 text-right long-texts">
+                                        <td :class="{'pb-2' : !row.add_tax}" class="border-0 pb-0 text-right long-texts" style="width:231px;">
                                             <div>
                                                 {{ Form::moneyGroup('tax', '', '', ['required' => 'required', 'disabled' => 'true' , 'row-input' => 'true', 'v-model' => 'row_tax.price', 'data-item' => 'total', 'currency' => $currency, 'dynamic-currency' => 'currency'], 0.00, 'text-right input-price disabled-money') }}
                                             </div>
                                         </td>
 
-                                        <td class="pb-3 pl-2 align-bottom border-0" :class="{'pb-2' : !row.add_tax}" style="max-width: 40px;">
+                                        <td class="pb-3 pl-2 align-bottom border-0" :class="{'pb-2' : !row.add_tax}" style="max-width: 40px;" >
                                             <button type="button" @click="onDeleteTax(index, row_tax_index)" class="btn btn-link btn-delete p-0">
                                                 <i class="far fa-trash-alt"></i>
                                             </button>
@@ -271,9 +272,9 @@
                                     </tr>
 
                                     <tr v-if="row.add_tax">
-                                        <td colspan="2" class="pl-0 border-0 row-tax-input">
+                                        <td colspan="2" class="pl-0 border-0" style="width: 42%;">
                                             <div style="position: relative;">
-                                                <div style="float: left; margin-top: 15px; margin-right:2px; position: absolute; margin-left: -35px;">
+                                                <div style="float: left; margin-top: 15px; margin-right:2px; position: absolute; left: -33px;" style="width:231px;">
                                                     {{ trans_choice('general.taxes', 1) }}
                                                 </div>
 
@@ -321,18 +322,18 @@
                                             </div>
                                         </td>
 
-                                        <td class="border-0 text-right long-texts align-middle row-tax-value">
+                                        <td class="border-0 text-right long-texts align-middle;" style="width:231px;">
                                             <div>
                                                 __
                                             </div>
                                         </td>
 
-                                        <td class="pb-3 pl-2 align-bottom border-0 row-tax-clear" style="max-width: 40px;">
-                                        @if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both']))
+                                        <td class="pb-3 pl-2 align-bottom border-0" style="max-width:40px;" >
+                                            @if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both']))
                                                 <button type="button" @click="onDeleteTax(index, 999)" class="btn btn-link btn-delete p-0">
                                                     <i class="far fa-trash-alt"></i>
                                                 </button>
-                                        @endif
+                                            @endif
                                         </td>
                                     </tr>
 

From 2aee641b4bd2b2cbc2ad85794135539879da9beb Mon Sep 17 00:00:00 2001
From: Burak Civan <burakcivan22@gmail.com>
Date: Fri, 4 Jun 2021 09:25:29 +0300
Subject: [PATCH 5/5] Unusage code ejected

---
 .../components/documents/form/line-item.blade.php  | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/resources/views/components/documents/form/line-item.blade.php b/resources/views/components/documents/form/line-item.blade.php
index e666cff51..7b9c7ecde 100644
--- a/resources/views/components/documents/form/line-item.blade.php
+++ b/resources/views/components/documents/form/line-item.blade.php
@@ -136,20 +136,6 @@
 
                         <td class="border-top-0 p-0" colspan="4">
                             <table class="w-100">
-                                <!-- <colgroup>
-                                    @if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both']))
-                                    <col style="width: 25%;">
-                                    <col style="width: 30%;">
-                                    <col style="width: 55%;">
-                                    <col style="width: 40px;">
-                                    @else
-                                    <col style="width: 10%;">
-                                    <col style="width: 10%;">
-                                    <col style="width: 42%;">
-                                    <col style="width: 40px;">
-                                    @endif
-                                </colgroup> -->
-
                                 <tbody>
 
                                     @if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both']))