From ec16828f3cdb3f9d512f33740e324125364cd39c Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Fri, 4 Jun 2021 15:09:54 +0300 Subject: [PATCH 1/5] Line item content styling edited --- public/css/custom.css | 49 ++- .../documents/form/line-item.blade.php | 306 ++++++++---------- 2 files changed, 189 insertions(+), 166 deletions(-) diff --git a/public/css/custom.css b/public/css/custom.css index bf90d118f..97b04b683 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -1631,4 +1631,51 @@ table .align-items-center td span.badge { .form-group .el-select .el-select__tags > span { display: contents !important; } -/* Select Tag Fixed Content Finish */ \ No newline at end of file +/* Select Tag Fixed Content Finish */ + +/* Line item */ +.line-item-link { + display: flex; + padding-bottom:10px; +} + +.line-item-area { + display: flex; + justify-content: space-between; + align-items:center; +} + +.line-item-content { + position: relative; + width: 100%; + max-width:242px; +} + +.line-item-content-right { + display: flex; + align-items: center; +} + +.line-item-content-right-price { + padding-right: 1.5rem; +} + +.line-item-content-right-delete { + width:40px; + padding-right: 1.5rem; +} + +.line-item-text { + width: 54px; +} + +@media (max-width: 1500px) { + @media not all and (min-resolution:.001dpcm) { @media { + + .line-item-content { + max-width:223px; + } +}} +} + +/* Line item */ \ 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 7b9c7ecde..4cb3b161f 100644 --- a/resources/views/components/documents/form/line-item.blade.php +++ b/resources/views/components/documents/form/line-item.blade.php @@ -128,201 +128,177 @@ @stack('delete_td_end') - @stack('item_custom_fields') - - @if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both'])) - - - - - - - - - - - - - - - - - - @endif - - - + + @endif + +
+
+
+ {{ trans_choice('general.taxes', 1) }}
- -
- - - - - - - - - - - + @endif + + +
-
- -
- 		+
+
+
+ +
+
+
-
- -
-
-
- {{ trans('invoices.discount') }} +
+
+
+
+
+ {{ trans('invoices.discount') }} +
+ @stack('discount_input_start') +
+
+
+ + +
+ - @stack('discount_input_start') -
-
-
- - - -
- - -
-
-
+
- @stack('discount_input_end')
-
-
+
+ @stack('discount_input_end') + +
+
{{ 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') }}
-
- -
-
-
- {{ trans_choice('general.taxes', 1) }} -
- - @stack('taxes_input_start') - - @stack('taxes_input_end') +
+ +
+
+
-
+ @stack('taxes_input_start') + + @stack('taxes_input_end') +
+ +
+
{{ 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') }}
-
- -
-
-
- {{ trans_choice('general.taxes', 1) }} -
- - @stack('taxes_input_start') - - @stack('taxes_input_end') +
+ +
+
+ +
+
+
+ {{ trans_choice('general.taxes', 1) }}
-
-
+ @stack('taxes_input_start') + + @stack('taxes_input_end') +
+
+
__
-
- @if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both'])) +
+ @if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both'])) - @endif -
From 16754115cb803de5733e0312b60220a7c379f2da Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Mon, 7 Jun 2021 09:49:28 +0300 Subject: [PATCH 2/5] Code refactoring --- .../documents/form/line-item.blade.php | 316 +++++++++--------- 1 file changed, 155 insertions(+), 161 deletions(-) diff --git a/resources/views/components/documents/form/line-item.blade.php b/resources/views/components/documents/form/line-item.blade.php index 4cb3b161f..2a88de784 100644 --- a/resources/views/components/documents/form/line-item.blade.php +++ b/resources/views/components/documents/form/line-item.blade.php @@ -133,176 +133,170 @@ @stack('item_custom_fields') - - - @if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both'])) -
-
-
- -
+ @if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both'])) +
+
+
+
-
-
- -
-
+
+
+
+
-
-
-
- {{ trans('invoices.discount') }} -
- @stack('discount_input_start') -
-
-
- - - -
- - -
-
-
-
- @stack('discount_input_end') -
-
-
- {{ 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') }} -
-
- -
-
- +
+
+
+
+
+ {{ trans('invoices.discount') }}
- @endif - -
-
-
- {{ trans_choice('general.taxes', 1) }} + @stack('discount_input_start') +
+
+
+ + +
+ - @stack('taxes_input_start') - - @stack('taxes_input_end') +
+
+
- + @stack('discount_input_end') +
-
- {{ 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') }} -
-
- -
-
-
-
-
-
- {{ trans_choice('general.taxes', 1) }} -
+
+ {{ 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') }} +
+
+ +
+
+
+ @endif +
+
+
+ {{ trans_choice('general.taxes', 1) }} +
- @stack('taxes_input_start') - - @stack('taxes_input_end') -
-
-
- __ -
-
- @if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both'])) - - @endif -
-
-
-
-
+ @stack('taxes_input_start') + + @stack('taxes_input_end') + + +
+
+ {{ 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') }} +
+
+ +
+
+ +
+
+
+ {{ trans_choice('general.taxes', 1) }} +
+ + @stack('taxes_input_start') + + @stack('taxes_input_end') +
+
+
+ __ +
+
+ @if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both'])) + + @endif +
+
+
- + From 6e9edbb0fbef7b7757535d899f0b26da50e586d7 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Mon, 7 Jun 2021 12:17:59 +0300 Subject: [PATCH 3/5] Label text styling edited --- public/css/custom.css | 1 + 1 file changed, 1 insertion(+) diff --git a/public/css/custom.css b/public/css/custom.css index 97b04b683..623f468ab 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -1667,6 +1667,7 @@ table .align-items-center td span.badge { .line-item-text { width: 54px; + text-align: right; } @media (max-width: 1500px) { From 3d0752eefaf5d5c8ae8d97590759c9e694a19b3f Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Mon, 7 Jun 2021 17:32:15 +0300 Subject: [PATCH 4/5] Pixel perfect development edited --- public/css/custom.css | 21 ++++++++++++++++--- .../documents/form/line-item.blade.php | 4 +++- .../documents/form/totals.blade.php | 14 ++++++------- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/public/css/custom.css b/public/css/custom.css index 623f468ab..e5d37c717 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -1634,9 +1634,14 @@ table .align-items-center td span.badge { /* Select Tag Fixed Content Finish */ /* Line item */ +.line-item-link-container { + height: 25px; +} + .line-item-link { display: flex; - padding-bottom:10px; + padding-bottom: 10px; + top: -12px; } .line-item-area { @@ -1648,7 +1653,17 @@ table .align-items-center td span.badge { .line-item-content { position: relative; width: 100%; - max-width:242px; + max-width: 242px; +} + +.line-item-content .form-group { + position: relative; +} + +.line-item-content .badge { + position: absolute !important; + bottom: 12px; + right: 0; } .line-item-content-right { @@ -1679,4 +1694,4 @@ table .align-items-center td span.badge { }} } -/* Line item */ \ No newline at end of file +/* Line item */ diff --git a/resources/views/components/documents/form/line-item.blade.php b/resources/views/components/documents/form/line-item.blade.php index 2a88de784..fb92771ba 100644 --- a/resources/views/components/documents/form/line-item.blade.php +++ b/resources/views/components/documents/form/line-item.blade.php @@ -134,7 +134,8 @@ @if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both'])) -
+
+
+
diff --git a/resources/views/components/documents/form/totals.blade.php b/resources/views/components/documents/form/totals.blade.php index ebeaf2849..90abf3fc4 100644 --- a/resources/views/components/documents/form/totals.blade.php +++ b/resources/views/components/documents/form/totals.blade.php @@ -6,7 +6,7 @@ - + @stack('sub_total_td_start') @@ -20,7 +20,7 @@ {{ Form::moneyGroup('sub_total', '', '', ['disabled' => 'true' , 'row-input' => 'true', 'v-model' => 'totals.sub', 'currency' => $currency, 'dynamic-currency' => 'currency', 'money-class' => 'text-right disabled-money'], 0.00, 'text-right disabled-money') }}
- + @stack('sub_total_td_end') @@ -36,7 +36,7 @@ {{ Form::moneyGroup('item_discount', '', '', ['disabled' => 'true' , 'row-input' => 'true', 'v-model' => 'totals.item_discount', 'currency' => $currency, 'dynamic-currency' => 'currency', 'money-class' => 'text-right disabled-money'], 0.00, 'text-right disabled-money') }}
- + @stack('item_discount_td_end') @endif @@ -92,7 +92,7 @@
{!! Form::hidden('discount', null, ['id' => 'discount', 'class' => 'form-control text-right', 'v-model' => 'form.discount']) !!} - + @stack('add_discount_td_end') @endif @@ -109,7 +109,7 @@ {{ Form::moneyGroup('tax_total', '', '', ['disabled' => 'true' , 'row-input' => 'true', 'v-model' => 'tax.total', 'currency' => $currency, 'dynamic-currency' => 'currency', 'money-class' => 'text-right disabled-money'], 0.00, 'text-right disabled-money') }}
- + @stack('tax_total_td_end') @@ -126,7 +126,7 @@ {{ Form::moneyGroup('grand_total', '', '', ['disabled' => 'true' , 'row-input' => 'true', 'v-model' => 'totals.total', 'currency' => $currency, 'dynamic-currency' => 'currency', 'money-class' => 'text-right disabled-money'], 0.00, 'text-right disabled-money') }} - + @stack('grand_total_td_end') @@ -141,7 +141,7 @@ :currency-rate="form.currency_rate" > - + @stack('currency_conversion_td_end') From bbd9b3a2d88ac787e7890d07bad89fc2116f88e4 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Mon, 7 Jun 2021 20:14:14 +0300 Subject: [PATCH 5/5] Responsive mobile controlled --- public/css/custom.css | 7 +++++++ .../views/components/documents/form/line-item.blade.php | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/public/css/custom.css b/public/css/custom.css index e5d37c717..0d23a4b30 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -1678,6 +1678,7 @@ table .align-items-center td span.badge { .line-item-content-right-delete { width:40px; padding-right: 1.5rem; + /* padding-left: 5px !important; */ } .line-item-text { @@ -1694,4 +1695,10 @@ table .align-items-center td span.badge { }} } +@media only screen and (max-width: 600px) { + .line-item-content { + max-width: 133px; + } +} + /* Line item */ diff --git a/resources/views/components/documents/form/line-item.blade.php b/resources/views/components/documents/form/line-item.blade.php index fb92771ba..0b2e3fc85 100644 --- a/resources/views/components/documents/form/line-item.blade.php +++ b/resources/views/components/documents/form/line-item.blade.php @@ -286,7 +286,11 @@
- __ +
+
+ +
+
@if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both']))