Invoice and bill create/update empty tax issue solved.
This commit is contained in:
parent
404c5ca41c
commit
f372e3636e
@ -59,14 +59,16 @@ class CreateBill
|
||||
$sub_total += $bill_item->total;
|
||||
|
||||
// Set taxes
|
||||
foreach ($bill_item->item_taxes as $item_tax) {
|
||||
if (isset($taxes) && array_key_exists($item_tax['tax_id'], $taxes)) {
|
||||
$taxes[$item_tax['tax_id']]['amount'] += $item_tax['amount'];
|
||||
} else {
|
||||
$taxes[$item_tax['tax_id']] = [
|
||||
'name' => $item_tax['name'],
|
||||
'amount' => $item_tax['amount']
|
||||
];
|
||||
if ($bill_item->item_taxes) {
|
||||
foreach ($bill_item->item_taxes as $item_tax) {
|
||||
if (isset($taxes) && array_key_exists($item_tax['tax_id'], $taxes)) {
|
||||
$taxes[$item_tax['tax_id']]['amount'] += $item_tax['amount'];
|
||||
} else {
|
||||
$taxes[$item_tax['tax_id']] = [
|
||||
'name' => $item_tax['name'],
|
||||
'amount' => $item_tax['amount']
|
||||
];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -180,8 +180,12 @@ class CreateBillItem
|
||||
'total' => $item_amount,
|
||||
]);
|
||||
|
||||
$bill_item->item_taxes = false;
|
||||
$bill_item->inclusives = false;
|
||||
$bill_item->compounds = false;
|
||||
|
||||
// set item_taxes for
|
||||
if (!empty($this->data['tax_id'])) {
|
||||
// set item_taxes for
|
||||
$bill_item->item_taxes = $item_taxes;
|
||||
$bill_item->inclusives = $inclusives;
|
||||
$bill_item->compounds = $compounds;
|
||||
|
@ -62,14 +62,16 @@ class UpdateBill
|
||||
$sub_total += $bill_item->total;
|
||||
|
||||
// Set taxes
|
||||
foreach ($bill_item->item_taxes as $item_tax) {
|
||||
if (isset($taxes) && array_key_exists($item_tax['tax_id'], $taxes)) {
|
||||
$taxes[$item_tax['tax_id']]['amount'] += $item_tax['amount'];
|
||||
} else {
|
||||
$taxes[$item_tax['tax_id']] = [
|
||||
'name' => $item_tax['name'],
|
||||
'amount' => $item_tax['amount']
|
||||
];
|
||||
if ($bill_item->item_taxes) {
|
||||
foreach ($bill_item->item_taxes as $item_tax) {
|
||||
if (isset($taxes) && array_key_exists($item_tax['tax_id'], $taxes)) {
|
||||
$taxes[$item_tax['tax_id']]['amount'] += $item_tax['amount'];
|
||||
} else {
|
||||
$taxes[$item_tax['tax_id']] = [
|
||||
'name' => $item_tax['name'],
|
||||
'amount' => $item_tax['amount']
|
||||
];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -60,14 +60,16 @@ class CreateInvoice
|
||||
$sub_total += $invoice_item->total;
|
||||
|
||||
// Set taxes
|
||||
foreach ($invoice_item->item_taxes as $item_tax) {
|
||||
if (isset($taxes) && array_key_exists($item_tax['tax_id'], $taxes)) {
|
||||
$taxes[$item_tax['tax_id']]['amount'] += $item_tax['amount'];
|
||||
} else {
|
||||
$taxes[$item_tax['tax_id']] = [
|
||||
'name' => $item_tax['name'],
|
||||
'amount' => $item_tax['amount']
|
||||
];
|
||||
if ($invoice_item->item_taxes) {
|
||||
foreach ($invoice_item->item_taxes as $item_tax) {
|
||||
if (isset($taxes) && array_key_exists($item_tax['tax_id'], $taxes)) {
|
||||
$taxes[$item_tax['tax_id']]['amount'] += $item_tax['amount'];
|
||||
} else {
|
||||
$taxes[$item_tax['tax_id']] = [
|
||||
'name' => $item_tax['name'],
|
||||
'amount' => $item_tax['amount']
|
||||
];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -207,8 +207,12 @@ class CreateInvoiceItem
|
||||
'total' => $item_amount,
|
||||
]);
|
||||
|
||||
$invoice_item->item_taxes = false;
|
||||
$invoice_item->inclusives = false;
|
||||
$invoice_item->compounds = false;
|
||||
|
||||
// set item_taxes for
|
||||
if (!empty($this->data['tax_id'])) {
|
||||
// set item_taxes for
|
||||
$invoice_item->item_taxes = $item_taxes;
|
||||
$invoice_item->inclusives = $inclusives;
|
||||
$invoice_item->compounds = $compounds;
|
||||
|
@ -63,14 +63,16 @@ class UpdateInvoice
|
||||
$sub_total += $invoice_item->total;
|
||||
|
||||
// Set taxes
|
||||
foreach ($invoice_item->item_taxes as $item_tax) {
|
||||
if (isset($taxes) && array_key_exists($item_tax['tax_id'], $taxes)) {
|
||||
$taxes[$item_tax['tax_id']]['amount'] += $item_tax['amount'];
|
||||
} else {
|
||||
$taxes[$item_tax['tax_id']] = [
|
||||
'name' => $item_tax['name'],
|
||||
'amount' => $item_tax['amount']
|
||||
];
|
||||
if ($invoice_item->item_taxes) {
|
||||
foreach ($invoice_item->item_taxes as $item_tax) {
|
||||
if (isset($taxes) && array_key_exists($item_tax['tax_id'], $taxes)) {
|
||||
$taxes[$item_tax['tax_id']]['amount'] += $item_tax['amount'];
|
||||
} else {
|
||||
$taxes[$item_tax['tax_id']] = [
|
||||
'name' => $item_tax['name'],
|
||||
'amount' => $item_tax['amount']
|
||||
];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -35,7 +35,7 @@
|
||||
@stack('taxes_td_start')
|
||||
<td {{ $errors->has('item.' . $item_row . '.tax_id') ? 'class="has-error"' : '' }}>
|
||||
@stack('tax_id_input_start')
|
||||
{!! Form::select('item[' . $item_row . '][tax_id][]', $taxes, empty($item) ? setting('general.default_tax') : $item->tax_id, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control tax-select2', 'multiple' => 'true']) !!}
|
||||
{!! Form::select('item[' . $item_row . '][tax_id][]', $taxes, (empty($item) || empty($item->tax_id)) ? setting('general.default_tax') : $item->tax_id, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control tax-select2', 'multiple' => 'true']) !!}
|
||||
{!! $errors->first('item.' . $item_row . '.tax_id', '<p class="help-block">:message</p>') !!}
|
||||
@stack('tax_id_input_end')
|
||||
</td>
|
||||
|
@ -35,7 +35,7 @@
|
||||
@stack('taxes_td_start')
|
||||
<td {{ $errors->has('item.' . $item_row . '.tax_id') ? 'class="has-error"' : '' }}>
|
||||
@stack('tax_id_input_start')
|
||||
{!! Form::select('item[' . $item_row . '][tax_id][]', $taxes, empty($item) ? setting('general.default_tax') : $item->tax_id, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control tax-select2', 'multiple' => 'true']) !!}
|
||||
{!! Form::select('item[' . $item_row . '][tax_id][]', $taxes, (empty($item) || empty($item->tax_id)) ? setting('general.default_tax') : $item->tax_id, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control tax-select2', 'multiple' => 'true']) !!}
|
||||
{!! $errors->first('item.' . $item_row . '.tax_id', '<p class="help-block">:message</p>') !!}
|
||||
@stack('tax_id_input_end')
|
||||
</td>
|
||||
|
Loading…
x
Reference in New Issue
Block a user