MAGETWO-35054: Tier price message not shown in product page for some customer groups

 - updated per code review

Author: Mike Weis

app/code/Magento/Catalog/Pricing/Price/TierPrice.php

@@ -162,17 +162,11 @@ protected function filterTierPrices(array $priceList)
         $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']];

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') ?>&nbsp;<strong class="benefit"><?php echo __('save ')?>
-                        <span class="percent tier-<?php echo $index ?>"><?php echo $tierPriceModel->getSavePercent($price['price']) ?></span>%
+                    &nbsp;<?php echo __('and') ?>&nbsp;<strong class="benefit"><?php echo __('save')?>
+                        <span class="percent tier-<?php echo $index ?>">&nbsp;<?php echo $tierPriceModel->getSavePercent($price['price']) ?></span>%
                     </strong>
                 <?php endif ?>
             <?php endif; ?>