Merge pull request #79 from heidelpay/bugfix/MAGE2-92/change_company_…

…not_set_check bugfix/MAGE2-92/change_company_not_set_check
heidelpay · Sep 20, 2018 · cf71900 · cf71900
2 parents 7130992 + 7cc41cc
commit cf71900
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@
 
 This project does not follow a versioning standard. Versions are crafted after the dates; for example, the version 17.7.25 was released on July, 25th in 2017
 
+## 18.9.20
+
+### Fixed
+- An issue which resulted in an error on checkout with secured payment methods with magento security patch SUPEE-10888 (Magento Version 2.2.6).
+- An issue concerning the versions of the dependencies.
+
 ## 18.8.9
 
 ### Fixed

diff --git a/PaymentMethods/HeidelpayDirectDebitSecuredPaymentMethod.php b/PaymentMethods/HeidelpayDirectDebitSecuredPaymentMethod.php
@@ -211,7 +211,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 !== null && $quote->getBillingAddress()->getCompany() !== null) {
+        if ($quote !== null && !empty($quote->getBillingAddress()->getCompany())) {
             return false;
         }
 

diff --git a/PaymentMethods/HeidelpayInvoiceSecuredPaymentMethod.php b/PaymentMethods/HeidelpayInvoiceSecuredPaymentMethod.php
@@ -216,7 +216,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 !== null && $quote->getBillingAddress()->getCompany() !== null) {
+        if ($quote !== null && !empty($quote->getBillingAddress()->getCompany())) {
             return false;
         }
 

diff --git a/composer.json b/composer.json
@@ -12,9 +12,9 @@
     "magento/module-payment": "^100.0.0 | ^101.0.0",
     "magento/module-backend": "^100.0.0 | ^101.0.0",
     "magento/framework": "^100.0.0 | ^101.0.0",
-    "heidelpay/php-message-code-mapper": "~1.0.0",
-    "heidelpay/php-basket-api": "~1.0.1",
-    "heidelpay/php-payment-api": "~1.4.0"
+    "heidelpay/php-message-code-mapper": "~1.0",
+    "heidelpay/php-basket-api": "~1.0",
+    "heidelpay/php-payment-api": "~1.4"
   },
   "require-dev": {
     "magento/marketplace-eqp": "~1.0.5",

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="18.8.9" setup_version="18.8.9">
+    <module name="Heidelpay_Gateway" schema_version="18.9.20" setup_version="18.9.20">
         <sequence>
             <module name="Magento_Sales" />
             <module name="Magento_Payment" />