From 9b7d4ac8c03eade9c6e94262b2f868cdf3f36aca Mon Sep 17 00:00:00 2001
From: vaibhav <vaibhav.ahalpara@krishtechnolabs.com>
Date: Sat, 8 Sep 2018 15:59:57 +0530
Subject: [PATCH 1/3] add error message in else condition

---
 .../OfflineShipping/Model/Carrier/Freeshipping.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php b/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
index b546237b82565..e85548b422201 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
@@ -98,6 +98,20 @@ public function collectRates(RateRequest $request)
 
             $result->append($method);
         }
+        elseif ($this->getConfigData('showmethod'))
+        {
+            $error = $this->_rateErrorFactory->create();
+            $error->setCarrier($this->_code);
+            $error->setCarrierTitle($this->getConfigData('title'));
+            $errorMsg = $this->getConfigData('specificerrmsg');
+            $error->setErrorMessage(
+                $errorMsg ? $errorMsg : __(
+                    'Sorry, but we can\'t deliver to the destination country with this shipping module.'
+                )
+            );
+
+            return $error;
+        }
 
         return $result;
     }

From 67e1b01f6d8c90df57a70a3e9d56220234af27c2 Mon Sep 17 00:00:00 2001
From: vaibhav <vaibhav.ahalpara@krishtechnolabs.com>
Date: Sun, 9 Sep 2018 18:27:00 +0530
Subject: [PATCH 2/3] Fix testCodeStyle issue

---
 .../Magento/OfflineShipping/Model/Carrier/Freeshipping.php    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php b/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
index e85548b422201..353f3c8e1f016 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
@@ -109,10 +109,8 @@ public function collectRates(RateRequest $request)
                     'Sorry, but we can\'t deliver to the destination country with this shipping module.'
                 )
             );
-
             return $error;
-        }
-
+        } 
         return $result;
     }
 

From 4938bbc5e51fc67cff8098719e7301d0cb4255d5 Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <mankivsk@adobe.com>
Date: Tue, 2 Oct 2018 15:33:55 -0500
Subject: [PATCH 3/3] Fixed codestyle

---
 .../Magento/OfflineShipping/Model/Carrier/Freeshipping.php  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php b/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
index 353f3c8e1f016..2373b5285ed00 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
@@ -97,9 +97,7 @@ public function collectRates(RateRequest $request)
             $method->setCost('0.00');
 
             $result->append($method);
-        }
-        elseif ($this->getConfigData('showmethod'))
-        {
+        } elseif ($this->getConfigData('showmethod')) {
             $error = $this->_rateErrorFactory->create();
             $error->setCarrier($this->_code);
             $error->setCarrierTitle($this->getConfigData('title'));
@@ -110,7 +108,7 @@ public function collectRates(RateRequest $request)
                 )
             );
             return $error;
-        } 
+        }
         return $result;
     }