Merge pull request #1417 from algolia/update/MAGE-760

MAGE-760 Fixed Tier price issue

Author: mohitalgolia

Helper/Entity/Product/PriceManager/ProductWithoutChildren.php

@@ -14,6 +14,7 @@
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Tax\Helper\Data as TaxHelper;
 use Magento\Tax\Model\Config as TaxConfig;
+use Magento\Catalog\Api\ScopedProductTierPriceManagementInterface;
 
 abstract class ProductWithoutChildren
 {
@@ -46,6 +47,11 @@ abstract class ProductWithoutChildren
      */
     protected $productloader;
 
+    /**
+     * @var ScopedProductTierPriceManagementInterface
+     */
+    private $productTierPrice;
+
     protected $store;
     protected $baseCurrencyCode;
     protected $groups;
@@ -60,6 +66,7 @@ abstract class ProductWithoutChildren
      * @param TaxHelper $taxHelper
      * @param Rule $rule
      * @param ProductFactory $productloader
+     * @param ScopedProductTierPriceManagementInterface $productTierPrice
      */
     public function __construct(
         ConfigHelper $configHelper,
@@ -68,7 +75,8 @@ public function __construct(
         CatalogHelper $catalogHelper,
         TaxHelper $taxHelper,
         Rule $rule,
-        ProductFactory $productloader
+        ProductFactory $productloader,
+        ScopedProductTierPriceManagementInterface $productTierPrice
     ) {
         $this->configHelper = $configHelper;
         $this->customerGroupCollectionFactory = $customerGroupCollectionFactory;
@@ -77,6 +85,7 @@ public function __construct(
         $this->taxHelper = $taxHelper;
         $this->rule = $rule;
         $this->productloader = $productloader;
+        $this->productTierPrice = $productTierPrice;
     }
 
     /**
@@ -244,7 +253,7 @@ protected function getTierPrice(Product $product, $currencyCode, $withTax)
         $tierPrice = [];
         $tierPrices = [];
 
-        if (!is_null($product->getTierPrices())) {
+        if (!empty($product->getTierPrices())) {
             $product->setData('website_id', $product->getStore()->getWebsiteId());
             $productTierPrices = $product->getTierPrices();
             foreach ($productTierPrices as $productTierPrice) {
@@ -259,6 +268,24 @@ protected function getTierPrice(Product $product, $currencyCode, $withTax)
                     $productTierPrice->getValue()
                 );
             }
+        } else {
+            /** @var Group $group */
+            foreach ($this->groups as $group) {
+                $customerGroupId = (int) $group->getData('customer_group_id');
+                $productTierPrices = $this->productTierPrice->getList($product->getSku(), $customerGroupId);
+                if(!empty($productTierPrices)) {
+                    foreach ($productTierPrices as $productTierPrice) {
+                        if (!isset($tierPrices[$productTierPrice->getCustomerGroupId()])) {
+                            $tierPrices[$productTierPrice->getCustomerGroupId()] = $productTierPrice->getValue();
+                            continue;
+                        }
+                        $tierPrices[$productTierPrice->getCustomerGroupId()] = min(
+                            $tierPrices[$productTierPrice->getCustomerGroupId()],
+                            $productTierPrice->getValue()
+                        );
+                    }
+                }
+            }
         }
 
         /** @var Group $group */