Skip to content

Commit 68159d0

Browse files
committed
Revert "Merge remote-tracking branch 'origin/AC-7099-v1' into spartans_pr_13062023"
This reverts commit 1c65707, reversing changes made to cb7cd87.
1 parent f886410 commit 68159d0

File tree

4 files changed

+5
-218
lines changed

4 files changed

+5
-218
lines changed

app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPrice.php

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -87,27 +87,6 @@ public function getValue()
8787
return $this->values[$this->product->getId()];
8888
}
8989

90-
/**
91-
* Checks if all children simple products have the same price.
92-
*
93-
* @return bool
94-
*/
95-
public function isChildProductsOfEqualPrices():bool
96-
{
97-
$minPrice = $this->getMinRegularAmount()->getValue();
98-
$maxPrice = $this->getMaxRegularAmount()->getValue();
99-
foreach ($this->getUsedProducts() as $subProduct) {
100-
if ($subProduct->isAvailable() && !$subProduct->isDisabled()) {
101-
if ($specialPrice = $subProduct->getSpecialPrice()) {
102-
return !($specialPrice != $minPrice);
103-
} elseif ($subProduct->getFinalPrice() < $minPrice) {
104-
return false;
105-
}
106-
}
107-
}
108-
return !(count($this->getUsedProducts()) === 1) && $minPrice === $maxPrice;
109-
}
110-
11190
/**
11291
* @inheritdoc
11392
*/

app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/CreateConfigurableProductWithSamePriceActionGroup.xml

Lines changed: 0 additions & 101 deletions
This file was deleted.

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceLabelVisibilityWithoutAsLowAsTest.xml

Lines changed: 0 additions & 89 deletions
This file was deleted.

app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,12 @@
99
$priceModel = $block->getPriceType('regular_price');
1010
/** @var \Magento\Framework\Pricing\Price\PriceInterface $finalPriceModel */
1111
$finalPriceModel = $block->getPriceType('final_price');
12-
/** @var Magento\ConfigurableProduct\Pricing\Price\ConfigurableRegularPriceInterface $regularPriceModel */
13-
$regularPriceModel = $block->getPriceType('regular_price');
1412
$idSuffix = $block->getIdSuffix() ? $block->getIdSuffix() : '';
1513
$schema = ($block->getZone() == 'item_view') ? true : false;
1614
?>
1715
<span class="normal-price">
1816
<?= /* @noEscape */ $block->renderAmount($finalPriceModel->getAmount(), [
19-
'display_label' => $regularPriceModel->isChildProductsOfEqualPrices() ? '' : __('As low as'),
17+
'display_label' => __('As low as'),
2018
'price_id' => $block->getPriceId('product-price-' . $idSuffix),
2119
'price_type' => 'finalPrice',
2220
'include_container' => true,
@@ -25,7 +23,7 @@ $schema = ($block->getZone() == 'item_view') ? true : false;
2523
?>
2624
</span>
2725

28-
<?php if (!$block->isProductList() && $block->hasSpecialPrice()): ?>
26+
<?php if (!$block->isProductList() && $block->hasSpecialPrice()) : ?>
2927
<span class="old-price sly-old-price no-display">
3028
<?= /* @noEscape */ $block->renderAmount($priceModel->getAmount(), [
3129
'display_label' => __('Regular Price'),
@@ -37,12 +35,12 @@ $schema = ($block->getZone() == 'item_view') ? true : false;
3735
</span>
3836
<?php endif; ?>
3937

40-
<?php if ($block->showMinimalPrice()): ?>
41-
<?php if ($block->getUseLinkForAsLowAs()):?>
38+
<?php if ($block->showMinimalPrice()) : ?>
39+
<?php if ($block->getUseLinkForAsLowAs()) :?>
4240
<a href="<?= $block->escapeUrl($block->getSaleableItem()->getProductUrl()) ?>" class="minimal-price-link">
4341
<?= /* @noEscape */ $block->renderAmountMinimal() ?>
4442
</a>
45-
<?php else:?>
43+
<?php else :?>
4644
<span class="minimal-price-link">
4745
<?= /* @noEscape */ $block->renderAmountMinimal() ?>
4846
</span>

0 commit comments

Comments
 (0)