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

Invoice and Bill create, edit page item table cells style fixes.

Browse Source
This commit is contained in:
Cüneyt Şentürk
2020-03-11 16:37:42 +03:00
parent 2f49904b18
commit ac29fe4bf1
6 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/views/purchases/bills.js vendored
View File

@ -50,10 +50,12 @@ const app = new Vue({
items: '', items: '',
discount: false, discount: false,
taxes: null, taxes: null,
colspan: 5,
} }
}, },
mounted() { mounted() {
this.colspan = document.getElementById("items").rows[0].cells.length - 1;
this.form.items = []; this.form.items = [];
if (this.form.method) { if (this.form.method) {

2
resources/assets/js/views/sales/invoices.js vendored
View File

@ -50,10 +50,12 @@ const app = new Vue({
items: '', items: '',
discount: false, discount: false,
taxes: null, taxes: null,
colspan: 5,
} }
}, },
mounted() { mounted() {
this.colspan = document.getElementById("items").rows[0].cells.length - 1;
this.form.items = []; this.form.items = [];
if (this.form.method) { if (this.form.method) {

10
resources/views/purchases/bills/create.blade.php
View File

@ -69,13 +69,13 @@
<button type="button" @click="onAddItem" id="button-add-item" data-toggle="tooltip" title="{{ trans('general.add') }}" class="btn btn-icon btn-outline-success btn-lg" data-original-title="{{ trans('general.add') }}"><i class="fa fa-plus"></i> <button type="button" @click="onAddItem" id="button-add-item" data-toggle="tooltip" title="{{ trans('general.add') }}" class="btn btn-icon btn-outline-success btn-lg" data-original-title="{{ trans('general.add') }}"><i class="fa fa-plus"></i>
</button> </button>
</td> </td>
<td class="text-right border-bottom-0" colspan="5"></td> <td class="text-right border-bottom-0" colspan="5" :colspan="colspan"></td>
</tr> </tr>
@stack('add_item_td_end') @stack('add_item_td_end')
@stack('sub_total_td_start') @stack('sub_total_td_start')
<tr id="tr-subtotal"> <tr id="tr-subtotal">
<td class="text-right border-right-0 border-bottom-0" colspan="5"> <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
<strong>{{ trans('bills.sub_total') }}</strong> <strong>{{ trans('bills.sub_total') }}</strong>
</td> </td>
<td class="text-right border-bottom-0 long-texts"> <td class="text-right border-bottom-0 long-texts">
@ -88,7 +88,7 @@
@stack('add_discount_td_start') @stack('add_discount_td_start')
<tr id="tr-discount"> <tr id="tr-discount">
<td class="text-right border-right-0 border-bottom-0" colspan="5"> <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
<el-popover <el-popover
popper-class="p-0 h-0" popper-class="p-0 h-0"
placement="bottom" placement="bottom"
@ -140,7 +140,7 @@
@stack('tax_total_td_start') @stack('tax_total_td_start')
<tr id="tr-tax"> <tr id="tr-tax">
<td class="text-right border-right-0 border-bottom-0" colspan="5"> <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
<strong>{{ trans_choice('general.taxes', 1) }}</strong> <strong>{{ trans_choice('general.taxes', 1) }}</strong>
</td> </td>
<td class="text-right border-bottom-0 long-texts"> <td class="text-right border-bottom-0 long-texts">
@ -153,7 +153,7 @@
@stack('grand_total_td_start') @stack('grand_total_td_start')
<tr id="tr-total"> <tr id="tr-total">
<td class="text-right border-right-0" colspan="5"> <td class="text-right border-right-0" colspan="5" :colspan="colspan">
<strong>{{ trans('bills.total') }}</strong> <strong>{{ trans('bills.total') }}</strong>
</td> </td>
<td class="text-right long-texts"> <td class="text-right long-texts">

10
resources/views/purchases/bills/edit.blade.php
View File

@ -70,13 +70,13 @@
<button type="button" @click="onAddItem" id="button-add-item" data-toggle="tooltip" title="{{ trans('general.add') }}" class="btn btn-icon btn-outline-success btn-lg" data-original-title="{{ trans('general.add') }}"><i class="fa fa-plus"></i> <button type="button" @click="onAddItem" id="button-add-item" data-toggle="tooltip" title="{{ trans('general.add') }}" class="btn btn-icon btn-outline-success btn-lg" data-original-title="{{ trans('general.add') }}"><i class="fa fa-plus"></i>
</button> </button>
</td> </td>
<td class="text-right border-bottom-0" colspan="5"></td> <td class="text-right border-bottom-0" colspan="5" :colspan="colspan"></td>
</tr> </tr>
@stack('add_item_td_end') @stack('add_item_td_end')
@stack('sub_total_td_start') @stack('sub_total_td_start')
<tr id="tr-subtotal"> <tr id="tr-subtotal">
<td class="text-right border-right-0 border-bottom-0" colspan="5"> <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
<strong>{{ trans('bills.sub_total') }}</strong> <strong>{{ trans('bills.sub_total') }}</strong>
</td> </td>
<td class="text-right border-bottom-0 long-texts"> <td class="text-right border-bottom-0 long-texts">
@ -89,7 +89,7 @@
@stack('add_discount_td_start') @stack('add_discount_td_start')
<tr id="tr-discount"> <tr id="tr-discount">
<td class="text-right border-right-0 border-bottom-0" colspan="5"> <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
<el-popover <el-popover
popper-class="p-0 h-0" popper-class="p-0 h-0"
placement="bottom" placement="bottom"
@ -141,7 +141,7 @@
@stack('tax_total_td_start') @stack('tax_total_td_start')
<tr id="tr-tax"> <tr id="tr-tax">
<td class="text-right border-right-0 border-bottom-0" colspan="5"> <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
<strong>{{ trans_choice('general.taxes', 1) }}</strong> <strong>{{ trans_choice('general.taxes', 1) }}</strong>
</td> </td>
<td class="text-right border-bottom-0 long-texts"> <td class="text-right border-bottom-0 long-texts">
@ -154,7 +154,7 @@
@stack('grand_total_td_start') @stack('grand_total_td_start')
<tr id="tr-total"> <tr id="tr-total">
<td class="text-right border-right-0" colspan="5"> <td class="text-right border-right-0" colspan="5" :colspan="colspan">
<strong>{{ trans('bills.total') }}</strong> <strong>{{ trans('bills.total') }}</strong>
</td> </td>
<td class="text-right long-texts"> <td class="text-right long-texts">

10
resources/views/sales/invoices/create.blade.php
View File

@ -69,13 +69,13 @@
<button type="button" @click="onAddItem" id="button-add-item" data-toggle="tooltip" title="{{ trans('general.add') }}" class="btn btn-icon btn-outline-success btn-lg" data-original-title="{{ trans('general.add') }}"><i class="fa fa-plus"></i> <button type="button" @click="onAddItem" id="button-add-item" data-toggle="tooltip" title="{{ trans('general.add') }}" class="btn btn-icon btn-outline-success btn-lg" data-original-title="{{ trans('general.add') }}"><i class="fa fa-plus"></i>
</button> </button>
</td> </td>
<td class="text-right border-bottom-0" colspan="5"></td> <td class="text-right border-bottom-0" colspan="5" :colspan="colspan"></td>
</tr> </tr>
@stack('add_item_td_end') @stack('add_item_td_end')
@stack('sub_total_td_start') @stack('sub_total_td_start')
<tr id="tr-subtotal"> <tr id="tr-subtotal">
<td class="text-right border-right-0 border-bottom-0" colspan="5"> <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
<strong>{{ trans('invoices.sub_total') }}</strong> <strong>{{ trans('invoices.sub_total') }}</strong>
</td> </td>
<td class="text-right border-bottom-0 long-texts"> <td class="text-right border-bottom-0 long-texts">
@ -88,7 +88,7 @@
@stack('add_discount_td_start') @stack('add_discount_td_start')
<tr id="tr-discount"> <tr id="tr-discount">
<td class="text-right border-right-0 border-bottom-0" colspan="5"> <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
<el-popover <el-popover
popper-class="p-0 h-0" popper-class="p-0 h-0"
placement="bottom" placement="bottom"
@ -140,7 +140,7 @@
@stack('tax_total_td_start') @stack('tax_total_td_start')
<tr id="tr-tax"> <tr id="tr-tax">
<td class="text-right border-right-0 border-bottom-0" colspan="5"> <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
<strong>{{ trans_choice('general.taxes', 1) }}</strong> <strong>{{ trans_choice('general.taxes', 1) }}</strong>
</td> </td>
<td class="text-right border-bottom-0 long-texts"> <td class="text-right border-bottom-0 long-texts">
@ -153,7 +153,7 @@
@stack('grand_total_td_start') @stack('grand_total_td_start')
<tr id="tr-total"> <tr id="tr-total">
<td class="text-right border-right-0" colspan="5"> <td class="text-right border-right-0" colspan="5" :colspan="colspan">
<strong>{{ trans('invoices.total') }}</strong> <strong>{{ trans('invoices.total') }}</strong>
</td> </td>
<td class="text-right long-texts"> <td class="text-right long-texts">

10
resources/views/sales/invoices/edit.blade.php
View File

@ -70,13 +70,13 @@
<button type="button" @click="onAddItem" id="button-add-item" data-toggle="tooltip" title="{{ trans('general.add') }}" class="btn btn-icon btn-outline-success btn-lg" data-original-title="{{ trans('general.add') }}"><i class="fa fa-plus"></i> <button type="button" @click="onAddItem" id="button-add-item" data-toggle="tooltip" title="{{ trans('general.add') }}" class="btn btn-icon btn-outline-success btn-lg" data-original-title="{{ trans('general.add') }}"><i class="fa fa-plus"></i>
</button> </button>
</td> </td>
<td class="text-right border-bottom-0" colspan="5"></td> <td class="text-right border-bottom-0" colspan="5" :colspan="colspan"></td>
</tr> </tr>
@stack('add_item_td_end') @stack('add_item_td_end')
@stack('sub_total_td_start') @stack('sub_total_td_start')
<tr id="tr-subtotal"> <tr id="tr-subtotal">
<td class="text-right border-right-0 border-bottom-0" colspan="5"> <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
<strong>{{ trans('invoices.sub_total') }}</strong> <strong>{{ trans('invoices.sub_total') }}</strong>
</td> </td>
<td class="text-right border-bottom-0 long-texts"> <td class="text-right border-bottom-0 long-texts">
@ -89,7 +89,7 @@
@stack('add_discount_td_start') @stack('add_discount_td_start')
<tr id="tr-discount"> <tr id="tr-discount">
<td class="text-right border-right-0 border-bottom-0" colspan="5"> <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
<el-popover <el-popover
popper-class="p-0 h-0" popper-class="p-0 h-0"
placement="bottom" placement="bottom"
@ -141,7 +141,7 @@
@stack('tax_total_td_start') @stack('tax_total_td_start')
<tr id="tr-tax"> <tr id="tr-tax">
<td class="text-right border-right-0 border-bottom-0" colspan="5"> <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
<strong>{{ trans_choice('general.taxes', 1) }}</strong> <strong>{{ trans_choice('general.taxes', 1) }}</strong>
</td> </td>
<td class="text-right border-bottom-0 long-texts"> <td class="text-right border-bottom-0 long-texts">
@ -154,7 +154,7 @@
@stack('grand_total_td_start') @stack('grand_total_td_start')
<tr id="tr-total"> <tr id="tr-total">
<td class="text-right border-right-0" colspan="5"> <td class="text-right border-right-0" colspan="5" :colspan="colspan">
<strong>{{ trans('invoices.total') }}</strong> <strong>{{ trans('invoices.total') }}</strong>
</td> </td>
<td class="text-right long-texts"> <td class="text-right long-texts">