Merge pull request firegento#59 from latenzio/list_product_plugin_fix

fix missing return when block was found and `catalog/frontend/display…
Detzler · Nov 2, 2017 · d2cc023 · d2cc023
2 parents a89faae + 1ad21ae
commit d2cc023
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/Plugin/Catalog/ListProductPlugin.php b/Plugin/Catalog/ListProductPlugin.php
@@ -33,22 +33,20 @@ public function aroundGetProductDetailsHtml(
         \Closure $proceed,
         \Magento\Catalog\Model\Product $product)
     {
+        $result = $proceed($product);
+
         $deliveryBlock = $subject->getLayout()->getBlock('product.info.delivery');
 
-        // Carry on with the default processing chain if the block does not exist.
-        if (!$deliveryBlock) {
-            return $proceed($product);
-        }
+        if ($deliveryBlock) {
+            $deliveryBlock->setProduct($product);
 
-        $deliveryBlock->setProduct($product);
-        $result = $proceed($product);
-        if ((bool)$this->_scopeConfig->getValue(
+            if ((bool) $this->_scopeConfig->getValue(
                 'catalog/frontend/display_delivery_time',
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )) {
-            return $deliveryBlock->toHtml() . $result;
-        } else {
-            return $result;
+                $result = $deliveryBlock->toHtml() . $result;
+            }
         }
+        return $result;
     }
 }