Merge pull request #23 from heidelpay/develop

Bugfix for isAvailable()
heidelpay · May 9, 2017 · eb865ee · eb865ee
2 parents a74f105 + b7bb1f8
commit eb865ee
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Release Notes - heidelpay Payment Gateway for Magento 2
 
+## v17.5.9
+
+### Fixed
+- Bugfix for isAvailable() method on both B2C payment methods where an exception was thrown (tested on 2.1.1) when loading the checkout and the quote was null for some reason
+
+## v17.5.3
+
+### Changed/Fixed
+- Removed the usage of the unsed Class 'ShipmentValidatorInterface', which wasn't present in <=2.0.8 and <=2.1.1
+
 ## v17.4.16
 
 ### Added

diff --git a/PaymentMethods/HeidelpayDirectDebitSecuredPaymentMethod.php b/PaymentMethods/HeidelpayDirectDebitSecuredPaymentMethod.php
@@ -173,7 +173,7 @@ public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
     {
         // in B2C payment methods, we don't want companies to be involved.
         // so, if the address contains a company, return false.
-        if ($quote->getBillingAddress()->getCompany() !== null) {
+        if ($quote !== null && $quote->getBillingAddress()->getCompany() !== null) {
             return false;
         }
 

diff --git a/PaymentMethods/HeidelpayInvoiceSecuredPaymentMethod.php b/PaymentMethods/HeidelpayInvoiceSecuredPaymentMethod.php
@@ -187,7 +187,7 @@ public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
     {
         // in B2C payment methods, we don't want companies to be involved.
         // so, if the address contains a company, return false.
-        if ($quote->getBillingAddress()->getCompany() !== null) {
+        if ($quote !== null && $quote->getBillingAddress()->getCompany() !== null) {
             return false;
         }
 

diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ All versions greater than 16.10.17 are based on the heidelpay php-api. (https://
 
 ### Install the heidelpay Magento 2 composer package
 
-```composer require "heidelpay/magento2:17.5.3"```
+```composer require "heidelpay/magento2:17.5.9"```
 
 ### Enable the extension in Magento 2
 

diff --git a/etc/module.xml b/etc/module.xml
@@ -1,5 +1,5 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="Heidelpay_Gateway" schema_version="17.4.16" setup_version="17.4.16">
+    <module name="Heidelpay_Gateway" schema_version="17.5.9" setup_version="17.5.9">
         <sequence>
             <module name="Magento_Sales" />
             <module name="Magento_Payment" />