From c0dc66ff1eea0e83c057bd2c4add4b816493d944 Mon Sep 17 00:00:00 2001
From: Riccardo Tempesta <info@riccardotempesta.com>
Date: Tue, 12 Sep 2017 15:14:21 +0200
Subject: [PATCH] FIX error on payment

---
 Block/Info/CashOnDelivery.php | 6 ++++--
 etc/module.xml                | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Block/Info/CashOnDelivery.php b/Block/Info/CashOnDelivery.php
index d3fcf45..3bc5c20 100644
--- a/Block/Info/CashOnDelivery.php
+++ b/Block/Info/CashOnDelivery.php
@@ -25,6 +25,8 @@ class CashOnDelivery extends Info
 {
     protected function _prepareSpecificInformation($transport = null)
     {
+        return parent::_prepareSpecificInformation($transport);
+
 //        if (is_null($this->_paymentSpecificInformation)) {
 //            $transport = parent::_prepareSpecificInformation($transport);
 //            $data = [];
@@ -40,7 +42,7 @@ protected function _prepareSpecificInformation($transport = null)
 //
 //            $this->_paymentSpecificInformation = $transport->setData(array_merge($data, $transport->getData()));
 //        }
-
-        return $this->_paymentSpecificInformation;
+//
+//        return $this->_paymentSpecificInformation;
     }
 }
diff --git a/etc/module.xml b/etc/module.xml
index 07d5823..2d69ed6 100644
--- 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.2.4">
+    <module name="MSP_CashOnDelivery" setup_version="1.2.5">
         <sequence>
             <module name="Magento_Sales" />
             <module name="Magento_Payment" />