Merge pull request #160 from magento-fearless-kiwis/develop

[FearlessKiwis] Sprint 43-A: Bug fixes

Author: Tang, Yu(ytang1)

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

@@ -162,7 +162,8 @@ protected function filterTierPrices(array $priceList)
         $qtyCache = [];
         foreach ($priceList as $priceKey => $price) {
             /* filter price by customer group */
-            if ($price['cust_group'] !== $this->customerGroup && $price['cust_group'] !== $this->groupManagement->getAllCustomersGroup()->getId()) {
+            if ($price['cust_group'] != $this->customerGroup &&
+                $price['cust_group'] != $this->groupManagement->getAllCustomersGroup()->getId()) {
                 unset($priceList[$priceKey]);
                 continue;
             }

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; ?>