Issue #1680 fixed
This commit is contained in:
parent
937fda187f
commit
22fe76c83c
|
|
@ -163,7 +163,7 @@ class InvoiceRepository extends Repository
|
||||||
'additional' => $childOrderItem->additional
|
'additional' => $childOrderItem->additional
|
||||||
]);
|
]);
|
||||||
|
|
||||||
if (! $childOrderItem->product->getTypeInstance()->isStockable() && $childOrderItem->product->getTypeInstance()->showQuantityBox()) {
|
if ($childOrderItem->product && ! $childOrderItem->getTypeInstance()->isStockable() && $childOrderItem->getTypeInstance()->showQuantityBox()) {
|
||||||
$this->invoiceItemRepository->updateProductInventory([
|
$this->invoiceItemRepository->updateProductInventory([
|
||||||
'invoice' => $invoice,
|
'invoice' => $invoice,
|
||||||
'product' => $childOrderItem->product,
|
'product' => $childOrderItem->product,
|
||||||
|
|
@ -174,7 +174,7 @@ class InvoiceRepository extends Repository
|
||||||
|
|
||||||
$this->orderItemRepository->collectTotals($childOrderItem);
|
$this->orderItemRepository->collectTotals($childOrderItem);
|
||||||
}
|
}
|
||||||
} elseif (! $orderItem->product->getTypeInstance()->isStockable() && $orderItem->product->getTypeInstance()->showQuantityBox()) {
|
} elseif ($orderItem->product && ! $orderItem->getTypeInstance()->isStockable() && $orderItem->getTypeInstance()->showQuantityBox()) {
|
||||||
$this->invoiceItemRepository->updateProductInventory([
|
$this->invoiceItemRepository->updateProductInventory([
|
||||||
'invoice' => $invoice,
|
'invoice' => $invoice,
|
||||||
'product' => $orderItem->product,
|
'product' => $orderItem->product,
|
||||||
|
|
|
||||||
|
|
@ -108,7 +108,7 @@ class OrderItemRepository extends Repository
|
||||||
{
|
{
|
||||||
$orderItems = [];
|
$orderItems = [];
|
||||||
|
|
||||||
if ($orderItem->product->getTypeInstance()->isComposite()) {
|
if ($orderItem->getTypeInstance()->isComposite()) {
|
||||||
foreach ($orderItem->children as $child) {
|
foreach ($orderItem->children as $child) {
|
||||||
$orderItems[] = $child;
|
$orderItems[] = $child;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -145,7 +145,7 @@ class OrderRepository extends Repository
|
||||||
|
|
||||||
$orderItems = [];
|
$orderItems = [];
|
||||||
|
|
||||||
if ($item->product->getTypeInstance()->isComposite()) {
|
if ($item->getTypeInstance()->isComposite()) {
|
||||||
foreach ($item->children as $child) {
|
foreach ($item->children as $child) {
|
||||||
$orderItems[] = $child;
|
$orderItems[] = $child;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue