Skip to content

Commit

Permalink
Code refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
@brkcvn
brkcvn committed Jun 3, 2021
1 parent bdbca0f commit 38ee378
Showing 1 changed file with 20 additions and 19 deletions.
39 changes: 20 additions & 19 deletions resources/views/components/documents/form/line-item.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ class="form-control text-center p-0"

<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%;">
Expand All @@ -148,21 +148,22 @@ class="form-control text-center p-0"
<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')]) }}
</button>
</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>
Expand All @@ -177,9 +178,9 @@ class="form-control text-center p-0"
</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>

Expand Down Expand Up @@ -213,7 +214,7 @@ class="form-control text-center"
</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>
Expand All @@ -229,9 +230,9 @@ class="form-control text-center"

<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>

Expand All @@ -257,23 +258,23 @@ class="mb-0 select-tax"
</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>
</td>
</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>

Expand Down Expand Up @@ -321,18 +322,18 @@ class="mb-0 select-tax"
</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>

Expand Down

0 comments on commit 38ee378

Please sign in to comment.