diff --git a/public/js/app.js b/public/js/app.js index 5b153e223..71ef370cd 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -330,3 +330,13 @@ function convertDateFormat(date, split_character) { return result.join(split_character); } + +function itemTableResize() { + colspan = $('#items.table.table-bordered thead tr th').length - 1; + + $('#items.table.table-bordered tbody #addItem .text-right').attr('colspan', colspan); + $('#items.table.table-bordered tbody #tr-subtotal .text-right:first').attr('colspan', colspan); + $('#items.table.table-bordered tbody #tr-discount .text-right:first').attr('colspan', colspan); + $('#items.table.table-bordered tbody #tr-tax .text-right:first').attr('colspan', colspan); + $('#items.table.table-bordered tbody #tr-total .text-right:first').attr('colspan', colspan); +} \ No newline at end of file diff --git a/resources/views/expenses/bills/create.blade.php b/resources/views/expenses/bills/create.blade.php index 07044e837..3b492cab9 100644 --- a/resources/views/expenses/bills/create.blade.php +++ b/resources/views/expenses/bills/create.blade.php @@ -222,6 +222,8 @@ }); $(document).ready(function(){ + itemTableResize(); + @if (old('item')) $('#vendor_id').trigger('change'); @endif diff --git a/resources/views/expenses/bills/edit.blade.php b/resources/views/expenses/bills/edit.blade.php index f9abcee6f..dfd361337 100644 --- a/resources/views/expenses/bills/edit.blade.php +++ b/resources/views/expenses/bills/edit.blade.php @@ -221,6 +221,8 @@ }); $(document).ready(function(){ + itemTableResize(); + @if (old('item')) $('#vendor_id').trigger('change'); @endif diff --git a/resources/views/incomes/invoices/create.blade.php b/resources/views/incomes/invoices/create.blade.php index d006a52e8..17cddd2d0 100644 --- a/resources/views/incomes/invoices/create.blade.php +++ b/resources/views/incomes/invoices/create.blade.php @@ -222,6 +222,8 @@ }); $(document).ready(function(){ + itemTableResize(); + @if (old('item')) $('#customer_id').trigger('change'); @endif diff --git a/resources/views/incomes/invoices/edit.blade.php b/resources/views/incomes/invoices/edit.blade.php index dced10244..daf6aee26 100644 --- a/resources/views/incomes/invoices/edit.blade.php +++ b/resources/views/incomes/invoices/edit.blade.php @@ -221,6 +221,8 @@ }); $(document).ready(function(){ + itemTableResize(); + @if (old('item')) $('#customer_id').trigger('change'); @endif