Code refactoring
This commit is contained in:
Burak Civan
parent
ec16828f3c
commit
16754115cb
@ -133,176 +133,170 @@
|
|||||||
@stack('item_custom_fields')
|
@stack('item_custom_fields')
|
||||||
</td>
|
</td>
|
||||||
<td class="border-top-0 p-0" colspan="4">
|
<td class="border-top-0 p-0" colspan="4">
|
||||||
<table class="w-100">
|
@if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both']))
|
||||||
<tbody>
|
<div v-if="!row.add_tax || !row.add_discount" class="line-item-link">
|
||||||
@if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both']))
|
<div class="text-left border-0 p-0 mr-5">
|
||||||
<div v-if="!row.add_tax || !row.add_discount" class="line-item-link">
|
<div>
|
||||||
<div class="text-left border-0 p-0 mr-5">
|
<button type="button" class="btn btn-link btn-sm p-0" @click="onAddLineDiscount(index)" v-if="!row.add_discount">
|
||||||
<div>
|
{{ trans('general.title.add', ['type' => trans('invoices.discount')]) }}
|
||||||
<button type="button" class="btn btn-link btn-sm p-0" @click="onAddLineDiscount(index)" v-if="!row.add_discount">
|
</button>
|
||||||
{{ trans('general.title.add', ['type' => trans('invoices.discount')]) }}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="text-right border-0 p-0 pr-4">
|
</div>
|
||||||
<div style="float:left;">
|
<div class="text-right border-0 p-0 pr-4">
|
||||||
<button type="button" class="btn btn-link btn-sm p-0" @click="onAddTax(index)" v-if="!row.add_tax">
|
<div style="float:left;">
|
||||||
{{ trans('general.title.add', ['type' => trans_choice('general.taxes', 1)]) }}
|
<button type="button" class="btn btn-link btn-sm p-0" @click="onAddTax(index)" v-if="!row.add_tax">
|
||||||
</button>
|
{{ trans('general.title.add', ['type' => trans_choice('general.taxes', 1)]) }}
|
||||||
</div>
|
</button>
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div v-if="row.add_discount" class="line-item-area pb-3">
|
</div>
|
||||||
<div class="line-item-content">
|
</div>
|
||||||
<div class="long-texts line-item-text" style="float: left; margin-top: 15px; position: absolute; left: -65px;">
|
<div v-if="row.add_discount" class="line-item-area pb-3">
|
||||||
{{ trans('invoices.discount') }}
|
<div class="line-item-content">
|
||||||
</div>
|
<div class="long-texts line-item-text" style="float: left; margin-top: 15px; position: absolute; left: -65px;">
|
||||||
@stack('discount_input_start')
|
{{ trans('invoices.discount') }}
|
||||||
<div class="form-group mb-0 w-100" style="display: inline-block; position: relative;">
|
|
||||||
<div class="input-group input-group-merge mb-0 select-tax">
|
|
||||||
<div class="input-group-prepend">
|
|
||||||
<span class="input-group-text" id="input-discount">
|
|
||||||
<i class="fa fa-percent"></i>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<input type="number"
|
|
||||||
max="100"
|
|
||||||
min="0"
|
|
||||||
class="form-control text-center"
|
|
||||||
:name="'items.' + index + '.discount'"
|
|
||||||
autocomplete="off"
|
|
||||||
required="required"
|
|
||||||
data-item="discount"
|
|
||||||
v-model="row.discount"
|
|
||||||
@input="onCalculateTotal"
|
|
||||||
@change="form.errors.clear('items.' + index + '.discount')">
|
|
||||||
|
|
||||||
<div class="invalid-feedback d-block"
|
|
||||||
v-if="form.errors.has('items.' + index + '.discount')"
|
|
||||||
v-html="form.errors.get('items.' + index + '.discount')">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
@stack('discount_input_end')
|
|
||||||
</div>
|
|
||||||
<div class="line-item-content-right">
|
|
||||||
<div class="line-item-content-right-price long-texts text-right">
|
|
||||||
{{ 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>
|
|
||||||
<div class="line-item-content-right-delete pl-2">
|
|
||||||
<button type="button" @click="onDeleteDiscount(index)" class="btn btn-link btn-delete p-0">
|
|
||||||
<i class="far fa-trash-alt"></i>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</tr>
|
|
||||||
</div>
|
</div>
|
||||||
@endif
|
@stack('discount_input_start')
|
||||||
|
<div class="form-group mb-0 w-100" style="display: inline-block; position: relative;">
|
||||||
<div class="line-item-area pb-3" v-for="(row_tax, row_tax_index) in row.tax_ids"
|
<div class="input-group input-group-merge mb-0 select-tax">
|
||||||
:index="row_tax_index">
|
<div class="input-group-prepend">
|
||||||
<div class="line-item-content">
|
<span class="input-group-text" id="input-discount">
|
||||||
<div class="long-texts line-item-text" style="float: left; margin-top: 15px; margin-right:2px; position: absolute; left: -63px;">
|
<i class="fa fa-percent"></i>
|
||||||
{{ trans_choice('general.taxes', 1) }}
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
<input type="number"
|
||||||
|
max="100"
|
||||||
|
min="0"
|
||||||
|
class="form-control text-center"
|
||||||
|
:name="'items.' + index + '.discount'"
|
||||||
|
autocomplete="off"
|
||||||
|
required="required"
|
||||||
|
data-item="discount"
|
||||||
|
v-model="row.discount"
|
||||||
|
@input="onCalculateTotal"
|
||||||
|
@change="form.errors.clear('items.' + index + '.discount')">
|
||||||
|
|
||||||
@stack('taxes_input_start')
|
<div class="invalid-feedback d-block"
|
||||||
<akaunting-select
|
v-if="form.errors.has('items.' + index + '.discount')"
|
||||||
class="mb-0 select-tax"
|
v-html="form.errors.get('items.' + index + '.discount')">
|
||||||
:form-classes="[{'has-error': form.errors.has('items.' + index + '.taxes') }]"
|
</div>
|
||||||
:icon="''"
|
</div>
|
||||||
:title="''"
|
|
||||||
:placeholder="'{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}'"
|
|
||||||
:name="'items.' + index + '.taxes.' + row_tax_index"
|
|
||||||
:options="{{ json_encode($taxes->pluck('title', 'id')) }}"
|
|
||||||
:disabled-options="form.items[index].tax_ids"
|
|
||||||
:value="row_tax.id"
|
|
||||||
@interface="row_tax.id = $event"
|
|
||||||
@change="onCalculateTotal()"
|
|
||||||
@new="taxes.push($event)"
|
|
||||||
:form-error="form.errors.get('items.' + index + '.taxes')"
|
|
||||||
:no-data-text="'{{ trans('general.no_data') }}'"
|
|
||||||
:no-matching-data-text="'{{ trans('general.no_matching_data') }}'"
|
|
||||||
></akaunting-select>
|
|
||||||
@stack('taxes_input_end')
|
|
||||||
</div>
|
</div>
|
||||||
|
@stack('discount_input_end')
|
||||||
|
</div>
|
||||||
<div class="line-item-content-right">
|
<div class="line-item-content-right">
|
||||||
<div class="line-item-content-right-price long-texts text-right">
|
<div class="line-item-content-right-price long-texts text-right">
|
||||||
{{ 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') }}
|
{{ 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>
|
</div>
|
||||||
<div class="line-item-content-right-delete pl-2">
|
<div class="line-item-content-right-delete pl-2">
|
||||||
<button type="button" @click="onDeleteTax(index, row_tax_index)" class="btn btn-link btn-delete p-0">
|
<button type="button" @click="onDeleteDiscount(index)" class="btn btn-link btn-delete p-0">
|
||||||
<i class="far fa-trash-alt"></i>
|
<i class="far fa-trash-alt"></i>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="row.add_tax" class="line-item-area pb-3" :class="{'pt-2' : row.add_discount}">
|
@endif
|
||||||
<div class="line-item-content">
|
<div class="line-item-area pb-3" v-for="(row_tax, row_tax_index) in row.tax_ids"
|
||||||
<div class="long-texts line-item-text" style="float: left; margin-top: 15px; margin-right:2px; position: absolute; left: -63px;">
|
:index="row_tax_index">
|
||||||
{{ trans_choice('general.taxes', 1) }}
|
<div class="line-item-content">
|
||||||
</div>
|
<div class="long-texts line-item-text" style="float: left; margin-top: 15px; margin-right:2px; position: absolute; left: -63px;">
|
||||||
|
{{ trans_choice('general.taxes', 1) }}
|
||||||
|
</div>
|
||||||
|
|
||||||
@stack('taxes_input_start')
|
@stack('taxes_input_start')
|
||||||
<akaunting-select
|
<akaunting-select
|
||||||
class="mb-0 select-tax"
|
class="mb-0 select-tax"
|
||||||
style="margin-left: 1px; margin-right: -2px;"
|
:form-classes="[{'has-error': form.errors.has('items.' + index + '.taxes') }]"
|
||||||
:form-classes="[{'has-error': form.errors.has('items.' + index + '.taxes') }]"
|
:icon="''"
|
||||||
:icon="''"
|
:title="''"
|
||||||
:title="''"
|
:placeholder="'{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}'"
|
||||||
:placeholder="'{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}'"
|
:name="'items.' + index + '.taxes.' + row_tax_index"
|
||||||
:name="'items.' + index + '.taxes.999'"
|
:options="{{ json_encode($taxes->pluck('title', 'id')) }}"
|
||||||
:options="{{ json_encode($taxes->pluck('title', 'id')) }}"
|
:disabled-options="form.items[index].tax_ids"
|
||||||
:disabled-options="form.items[index].tax_ids"
|
:value="row_tax.id"
|
||||||
:value="tax_id"
|
@interface="row_tax.id = $event"
|
||||||
:add-new="{{ json_encode([
|
@change="onCalculateTotal()"
|
||||||
'status' => true,
|
@new="taxes.push($event)"
|
||||||
'text' => trans('general.add_new'),
|
:form-error="form.errors.get('items.' + index + '.taxes')"
|
||||||
'path' => route('modals.taxes.create'),
|
:no-data-text="'{{ trans('general.no_data') }}'"
|
||||||
'type' => 'modal',
|
:no-matching-data-text="'{{ trans('general.no_matching_data') }}'"
|
||||||
'field' => [
|
></akaunting-select>
|
||||||
'key' => 'id',
|
@stack('taxes_input_end')
|
||||||
'value' => 'title'
|
</div>
|
||||||
],
|
|
||||||
'new_text' => trans('modules.new'),
|
<div class="line-item-content-right">
|
||||||
'buttons' => [
|
<div class="line-item-content-right-price long-texts text-right">
|
||||||
'cancel' => [
|
{{ 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') }}
|
||||||
'text' => trans('general.cancel'),
|
</div>
|
||||||
'class' => 'btn-outline-secondary'
|
<div class="line-item-content-right-delete pl-2">
|
||||||
],
|
<button type="button" @click="onDeleteTax(index, row_tax_index)" class="btn btn-link btn-delete p-0">
|
||||||
'confirm' => [
|
<i class="far fa-trash-alt"></i>
|
||||||
'text' => trans('general.save'),
|
</button>
|
||||||
'class' => 'btn-success'
|
</div>
|
||||||
]
|
</div>
|
||||||
]
|
</div>
|
||||||
])}}"
|
<div v-if="row.add_tax" class="line-item-area pb-3" :class="{'pt-2' : row.add_discount}">
|
||||||
@interface="tax_id = $event"
|
<div class="line-item-content">
|
||||||
@visible-change="onSelectedTax(index)"
|
<div class="long-texts line-item-text" style="float: left; margin-top: 15px; margin-right:2px; position: absolute; left: -63px;">
|
||||||
@new="taxes.push($event)"
|
{{ trans_choice('general.taxes', 1) }}
|
||||||
:form-error="form.errors.get('items.' + index + '.taxes')"
|
</div>
|
||||||
:no-data-text="'{{ trans('general.no_data') }}'"
|
|
||||||
:no-matching-data-text="'{{ trans('general.no_matching_data') }}'"
|
@stack('taxes_input_start')
|
||||||
></akaunting-select>
|
<akaunting-select
|
||||||
@stack('taxes_input_end')
|
class="mb-0 select-tax"
|
||||||
</div>
|
style="margin-left: 1px; margin-right: -2px;"
|
||||||
<div class="line-item-content-right">
|
:form-classes="[{'has-error': form.errors.has('items.' + index + '.taxes') }]"
|
||||||
<div class="line-item-content-right-price long-texts text-right">
|
:icon="''"
|
||||||
__
|
:title="''"
|
||||||
</div>
|
:placeholder="'{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}'"
|
||||||
<div class="line-item-content-right-delete pl-2">
|
:name="'items.' + index + '.taxes.999'"
|
||||||
@if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both']))
|
:options="{{ json_encode($taxes->pluck('title', 'id')) }}"
|
||||||
<button type="button" @click="onDeleteTax(index, 999)" class="btn btn-link btn-delete p-0">
|
:disabled-options="form.items[index].tax_ids"
|
||||||
<i class="far fa-trash-alt"></i>
|
:value="tax_id"
|
||||||
</button>
|
:add-new="{{ json_encode([
|
||||||
@endif
|
'status' => true,
|
||||||
</div>
|
'text' => trans('general.add_new'),
|
||||||
</div>
|
'path' => route('modals.taxes.create'),
|
||||||
</div>
|
'type' => 'modal',
|
||||||
</tbody>
|
'field' => [
|
||||||
</table>
|
'key' => 'id',
|
||||||
|
'value' => 'title'
|
||||||
|
],
|
||||||
|
'new_text' => trans('modules.new'),
|
||||||
|
'buttons' => [
|
||||||
|
'cancel' => [
|
||||||
|
'text' => trans('general.cancel'),
|
||||||
|
'class' => 'btn-outline-secondary'
|
||||||
|
],
|
||||||
|
'confirm' => [
|
||||||
|
'text' => trans('general.save'),
|
||||||
|
'class' => 'btn-success'
|
||||||
|
]
|
||||||
|
]
|
||||||
|
])}}"
|
||||||
|
@interface="tax_id = $event"
|
||||||
|
@visible-change="onSelectedTax(index)"
|
||||||
|
@new="taxes.push($event)"
|
||||||
|
:form-error="form.errors.get('items.' + index + '.taxes')"
|
||||||
|
:no-data-text="'{{ trans('general.no_data') }}'"
|
||||||
|
:no-matching-data-text="'{{ trans('general.no_matching_data') }}'"
|
||||||
|
></akaunting-select>
|
||||||
|
@stack('taxes_input_end')
|
||||||
|
</div>
|
||||||
|
<div class="line-item-content-right">
|
||||||
|
<div class="line-item-content-right-price long-texts text-right">
|
||||||
|
__
|
||||||
|
</div>
|
||||||
|
<div class="line-item-content-right-delete pl-2">
|
||||||
|
@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
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</td>
|
</td>
|
||||||
<tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user