From 434138c5de03942c626597d0b0f72649361ccb53 Mon Sep 17 00:00:00 2001 From: Mike Weis <miweis@ebay.com> Date: Mon, 16 Mar 2015 16:20:49 -0500 Subject: [PATCH] MAGETWO-35054: Tier price message not shown in product page for some customer groups - updated per code review --- app/code/Magento/Catalog/Pricing/Price/TierPrice.php | 10 ++-------- .../base/templates/product/price/tier_prices.phtml | 4 ++-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php index 34b8239a513..1a7e1dcc8c2 100644 --- a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php +++ b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php @@ -162,17 +162,11 @@ class TierPrice extends AbstractPrice implements TierPriceInterface, BasePricePr $qtyCache = []; foreach ($priceList as $priceKey => $price) { /* filter price by customer group */ - $eligible = false; - if ($price['cust_group'] == $this->customerGroup) { - $eligible = true; - } elseif ($price['cust_group'] == $this->groupManagement->getAllCustomersGroup()->getId()) { - $eligible = true; - } - if (!$eligible) { + if ($price['cust_group'] != $this->customerGroup && + $price['cust_group'] != $this->groupManagement->getAllCustomersGroup()->getId()) { unset($priceList[$priceKey]); continue; } - /* select a lower price for each quantity */ if (isset($qtyCache[$price['price_qty']])) { $priceQty = $qtyCache[$price['price_qty']]; diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml index 87703eac6f3..466a9519bc6 100644 --- a/app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml +++ b/app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml @@ -73,8 +73,8 @@ $product = $block->getSaleableItem(); ); ?><?php echo __('each') ?> <?php if ($block->getShowDetailedPrice() !== false): ?> - <?php echo __(' and') ?> <strong class="benefit"><?php echo __('save ')?> - <span class="percent tier-<?php echo $index ?>"><?php echo $tierPriceModel->getSavePercent($price['price']) ?></span>% + <?php echo __('and') ?> <strong class="benefit"><?php echo __('save')?> + <span class="percent tier-<?php echo $index ?>"> <?php echo $tierPriceModel->getSavePercent($price['price']) ?></span>% </strong> <?php endif ?> <?php endif; ?> -- GitLab