Fix invoice issue

magespecialist · Aug 4, 2017 · fe2d0b9 · fe2d0b9
1 parent 3f02a82
commit fe2d0b9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/Block/Sales/Cashondelivery.php b/Block/Sales/Cashondelivery.php
@@ -22,6 +22,8 @@
 
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\DataObject;
+use Magento\Sales\Api\Data\InvoiceInterface;
+use Magento\Sales\Api\Data\OrderInterface;
 use MSP\CashOnDelivery\Model\Payment;
 
 class Cashondelivery extends Template
@@ -46,7 +48,8 @@ public function initTotals()
         $this->_source = $parent->getSource();
         $source = $this->getSource();
 
-        if ($source->getPayment()->getMethod() == Payment::CODE) {
+
+        if ($this->getPayment($source)->getMethod() == Payment::CODE) {
             $fee = new DataObject(
                 [
                     'code' => 'msp_cashondelivery',
@@ -61,4 +64,17 @@ public function initTotals()
 
         return $this;
     }
+
+    protected function getPayment($source)
+    {
+        if($source instanceof InvoiceInterface) {
+            return $source->getOrder()->getPayment();
+        }
+
+        if($source instanceof OrderInterface) {
+            return $source;
+        }
+
+
+    }
 }
diff --git a/etc/module.xml b/etc/module.xml
@@ -21,7 +21,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="MSP_CashOnDelivery" setup_version="1.1.6">
+    <module name="MSP_CashOnDelivery" setup_version="1.1.7">
         <sequence>
             <module name="Magento_Sales" />
             <module name="Magento_Payment" />