shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pixel perfect development edited

Browse Source
This commit is contained in:
Burak Civan 2021-06-07 17:32:15 +03:00
parent 6e9edbb0fb
commit 3d0752eefa
3 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
public/css/custom.css vendored
View File

@ -1634,9 +1634,14 @@ table .align-items-center td span.badge {
/* Select Tag Fixed Content Finish */ /* Select Tag Fixed Content Finish */
/* Line item */ /* Line item */
.line-item-link-container {
height: 25px;
}
.line-item-link { .line-item-link {
display: flex; display: flex;
padding-bottom:10px; padding-bottom: 10px;
top: -12px;
} }
.line-item-area { .line-item-area {
@ -1648,7 +1653,17 @@ table .align-items-center td span.badge {
.line-item-content { .line-item-content {
position: relative; position: relative;
width: 100%; 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 { .line-item-content-right {

4
resources/views/components/documents/form/line-item.blade.php
View File

@ -134,7 +134,8 @@
</td> </td>
<td class="border-top-0 p-0" colspan="4"> <td class="border-top-0 p-0" colspan="4">
@if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both'])) @if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both']))
<div v-if="!row.add_tax || !row.add_discount" class="line-item-link"> <div v-if="!row.add_tax || !row.add_discount" class="line-item-link-container position-relative">
<div v-if="!row.add_tax || !row.add_discount" class="line-item-link position-absolute">
<div class="text-left border-0 p-0 mr-5"> <div class="text-left border-0 p-0 mr-5">
<div> <div>
<button type="button" class="btn btn-link btn-sm p-0" @click="onAddLineDiscount(index)" v-if="!row.add_discount"> <button type="button" class="btn btn-link btn-sm p-0" @click="onAddLineDiscount(index)" v-if="!row.add_discount">
@ -150,6 +151,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div v-if="row.add_discount" class="line-item-area pb-3"> <div v-if="row.add_discount" class="line-item-area pb-3">
<div class="line-item-content"> <div class="line-item-content">
<div class="long-texts line-item-text" style="float: left; margin-top: 15px; position: absolute; left: -65px;"> <div class="long-texts line-item-text" style="float: left; margin-top: 15px; position: absolute; left: -65px;">

14
resources/views/components/documents/form/totals.blade.php
View File

@ -6,7 +6,7 @@
<col class="document-total-50"> <col class="document-total-50">
<col class="document-total-30"> <col class="document-total-30">
<col class="document-total-25"> <col class="document-total-25">
<col class="document-total-40-px"> <col class="document-total-50-px">
</colgroup> </colgroup>
<tbody id="invoice-total-rows" class="table-padding-05"> <tbody id="invoice-total-rows" class="table-padding-05">
@stack('sub_total_td_start') @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') }} {{ 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') }}
</div> </div>
</td> </td>
<td class="border-bottom-0 pb-0" style="max-width: 40px"></td> <td class="border-bottom-0 pb-0" style="max-width: 50px"></td>
</tr> </tr>
@stack('sub_total_td_end') @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') }} {{ 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') }}
</div> </div>
</td> </td>
<td class="border-top-0 pt-0 pb-0" style="max-width: 40px"></td> <td class="border-top-0 pt-0 pb-0" style="max-width: 50px"></td>
</tr> </tr>
@stack('item_discount_td_end') @stack('item_discount_td_end')
@endif @endif
@ -92,7 +92,7 @@
</div> </div>
{!! Form::hidden('discount', null, ['id' => 'discount', 'class' => 'form-control text-right', 'v-model' => 'form.discount']) !!} {!! Form::hidden('discount', null, ['id' => 'discount', 'class' => 'form-control text-right', 'v-model' => 'form.discount']) !!}
</td> </td>
<td class="border-top-0 pt-0 pb-0" style="max-width: 40px"></td> <td class="border-top-0 pt-0 pb-0" style="max-width: 50px"></td>
</tr> </tr>
@stack('add_discount_td_end') @stack('add_discount_td_end')
@endif @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') }} {{ 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') }}
</div> </div>
</td> </td>
<td class="border-top-0 pt-0 pb-0" style="max-width: 40px"></td> <td class="border-top-0 pt-0 pb-0" style="max-width: 50px"></td>
</tr> </tr>
@stack('tax_total_td_end') @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') }} {{ 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') }}
</div> </div>
</td> </td>
<td class="border-top-0 pt-0 pb-0" style="max-width: 40px"></td> <td class="border-top-0 pt-0 pb-0" style="max-width: 50px"></td>
</tr> </tr>
@stack('grand_total_td_end') @stack('grand_total_td_end')
@ -141,7 +141,7 @@
:currency-rate="form.currency_rate" :currency-rate="form.currency_rate"
></akaunting-currency-conversion> ></akaunting-currency-conversion>
</td> </td>
<td class="border-top-0 pt-0 pb-0" style="max-width: 40px"></td> <td class="border-top-0 pt-0 pb-0" style="max-width: 50px"></td>
</tr> </tr>
@stack('currency_conversion_td_end') @stack('currency_conversion_td_end')
</tbody> </tbody>