FIX issue #31 - error while selecting shipping address

magespecialist · Aug 24, 2017 · fb1c55e · fb1c55e
1 parent 154353a
commit fb1c55e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/Model/ResourceModel/CashondeliveryTable.php b/Model/ResourceModel/CashondeliveryTable.php
@@ -51,6 +51,14 @@ protected function _construct()
      */
     public function getFee($amount, $country, $region)
     {
+        if (!$country) {
+            $country = '';
+        }
+
+        if (!$region) {
+            $region = '';
+        }
+
         $table = $this->getMainTable();
 
         $currentWebsite = $this->storeManager->getWebsite()->getCode();

diff --git a/Model/Total/Quote/Cashondelivery.php b/Model/Total/Quote/Cashondelivery.php
@@ -57,7 +57,11 @@ public function collect(
         }
 
         $country = $quote->getShippingAddress()->getCountryModel()->getData('iso2_code');
-        $region = $quote->getShippingAddress()->getRegion();
+        $region = $quote->getShippingAddress()->getRegionModel()->getData('code');
+
+        if (!$region && is_string($quote->getShippingAddress()->getRegion())) {
+            $region = $quote->getShippingAddress()->getRegion();
+        }
 
         $baseAmount = $this->cashOnDeliveryInterface->getBaseAmount($total->getAllBaseTotalAmounts(), $country, $region);
         $amount = $this->priceCurrencyInterface->convert($baseAmount);

diff --git a/Model/Total/Quote/CashondeliveryTax.php b/Model/Total/Quote/CashondeliveryTax.php
@@ -55,7 +55,11 @@ public function collect(
         }
 
         $country = $quote->getShippingAddress()->getCountryModel()->getData('iso2_code');
-        $region = $quote->getShippingAddress()->getRegion();
+        $region = $quote->getShippingAddress()->getRegionModel()->getData('code');
+
+        if (!$region && is_string($quote->getShippingAddress()->getRegion())) {
+            $region = $quote->getShippingAddress()->getRegion();
+        }
 
         $baseAmount = $this->cashOnDeliveryInterface->getBaseAmount($total->getAllBaseTotalAmounts(), $country, $region);
 

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.2.0">
+    <module name="MSP_CashOnDelivery" setup_version="1.2.1">
         <sequence>
             <module name="Magento_Sales" />
             <module name="Magento_Payment" />