Merge remote-tracking branch 'origin/master'

AltaPay · Jul 6, 2017 · 459daab · 459daab
2 parents 967dc38 + ddb8f56
commit 459daab
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/Observer/CaptureObserver.php b/Observer/CaptureObserver.php
@@ -61,12 +61,14 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                 }
             }
 
-            $orderlines[] = (new OrderLine(
-                'Shipping',
-                'shipping',
-                1,
-                $invoice->getShippingInclTax()
-            ))->setGoodsType('shipment');
+            if ($invoice->getShippingInclTax()) {
+                $orderlines[] = (new OrderLine(
+                    'Shipping',
+                    'shipping',
+                    1,
+                    $invoice->getShippingInclTax()
+                ))->setGoodsType('shipment');
+            }
 
             $api = new CaptureReservation($this->systemConfig->getAuth());
             if ($invoice->getTransactionId()) {