diff --git a/public/css/custom.css b/public/css/custom.css index 4d9c3dba2..bf90d118f 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -1631,4 +1631,4 @@ table .align-items-center td span.badge { .form-group .el-select .el-select__tags > span { display: contents !important; } -/* Select Tag Fixed Content Finish */ +/* 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 97a04b43d..7b9c7ecde 100644 --- a/resources/views/components/documents/form/line-item.blade.php +++ b/resources/views/components/documents/form/line-item.blade.php @@ -136,25 +136,11 @@ - - @if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both'])) - - - - - @else - - - - - @endif - - @if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both'])) - - - - - - - - - -
+
-
+
+
@@ -178,7 +164,7 @@
+
{{ trans('invoices.discount') }} @@ -214,7 +200,7 @@
+
{{ 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') }}
@@ -230,9 +216,9 @@
-
-
+
+
+
{{ trans_choice('general.taxes', 1) }}
@@ -258,13 +244,13 @@
+
{{ 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') }}
+ @@ -272,9 +258,9 @@
-
-
+
+
+
{{ trans_choice('general.taxes', 1) }}
@@ -322,13 +308,13 @@
+
__
+ @if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both']))