Fix magento#2132 - Enabled Store Pickup Shipping Method

* Added config options * Changed error in the model * Auto-Formated system.xml (too long lines)
amenk · Oct 18, 2015 · 80a2fa4 · 80a2fa4 · UglyWillDuckling · Sep 6, 2016
1 parent 24abff1
commit 80a2fa4
Show file tree

Hide file tree

Showing 3 changed files with 141 additions and 53 deletions.
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Pickup.php b/app/code/Magento/OfflineShipping/Model/Carrier/Pickup.php
@@ -62,24 +62,22 @@ public function collectRates(RateRequest $request)
             return false;
         }
 
-        /** @var \Magento\Shipping\Model\Rate\Result $result */
-        $result = $this->_rateResultFactory->create();
+    /** @var \Magento\Shipping\Model\Rate\Result $result */
+    $result = $this->_rateResultFactory->create();
 
-        if (!empty($rate)) {
-            /** @var \Magento\Quote\Model\Quote\Address\RateResult\Method $method */
-            $method = $this->_rateMethodFactory->create();
+        /** @var \Magento\Quote\Model\Quote\Address\RateResult\Method $method */
+        $method = $this->_rateMethodFactory->create();
 
-            $method->setCarrier('pickup');
-            $method->setCarrierTitle($this->getConfigData('title'));
+        $method->setCarrier('pickup');
+        $method->setCarrierTitle($this->getConfigData('title'));
 
-            $method->setMethod('store');
-            $method->setMethodTitle(__('Store Pickup'));
+        $method->setMethod('store');
+        $method->setMethodTitle(__('Store Pickup'));
 
-            $method->setPrice(0);
-            $method->setCost(0);
+        $method->setPrice(0);
+        $method->setCost(0);
 
-            $result->append($method);
-        }
+        $result->append($method);
 
         return $result;
     }