Skip to content

Commit 601dec4

Browse files
internal-magento-queue-manager[bot]internal-magento-queue-manager[bot]
authored
Merge pull request #8623 from magento-gl/spartans_pr_07112023
[Spartans] Bugfix Delivery
2 parents 2807445 + d0aee58 commit 601dec4

File tree

16 files changed

+469
-28
lines changed

16 files changed

+469
-28
lines changed

‎app/code/Magento/ConfigurableProduct/Model/ConfigurableMaxPriceCalculator.php

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\ConfigurableProduct\Model;
9+
10+
use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
11+
use Magento\Framework\Pricing\PriceCurrencyInterface;
12+
use Magento\Framework\App\ResourceConnection;
13+
14+
class ConfigurableMaxPriceCalculator
15+
{
16+
/**
17+
* @var CalculatorInterface
18+
*/
19+
private $calculator;
20+
21+
/**
22+
* @var PriceCurrencyInterface
23+
*/
24+
private $priceCurrency;
25+
26+
/**
27+
* @var ResourceConnection
28+
*/
29+
private $resourceConnection;
30+
31+
/**
32+
* @param CalculatorInterface $calculator
33+
* @param PriceCurrencyInterface $priceCurrency
34+
* @param ResourceConnection $resourceConnection
35+
*/
36+
public function __construct(
37+
CalculatorInterface $calculator,
38+
PriceCurrencyInterface $priceCurrency,
39+
ResourceConnection $resourceConnection
40+
) {
41+
$this->calculator = $calculator;
42+
$this->priceCurrency = $priceCurrency;
43+
$this->resourceConnection = $resourceConnection;
44+
}
45+
46+
/**
47+
* Get the maximum price of a configurable product.
48+
*
49+
* @param int $productId
50+
* @return float
51+
*/
52+
public function getMaxPriceForConfigurableProduct($productId)
53+
{
54+
$connection = $this->resourceConnection->getConnection();
55+
$superLinkTable = $this->resourceConnection->getTableName('catalog_product_super_link');
56+
$catalogProductTable = $this->resourceConnection->getTableName('catalog_product_entity');
57+
$priceIndexTable = $this->resourceConnection->getTableName('catalog_product_index_price');
58+
$select = $connection->select()
59+
->from(['sl' => $superLinkTable], [])
60+
->join(['pe' => $catalogProductTable], 'sl.product_id = pe.entity_id', [])
61+
->join(['ip' => $priceIndexTable], 'pe.entity_id = ip.entity_id', ['max_price' => 'MAX(ip.final_price)'])
62+
->where('sl.parent_id = ?', $productId);
63+
$result = $connection->fetchRow($select);
64+
65+
if ($result && isset($result['max_price'])) {
66+
return $result['max_price'];
67+
}
68+
69+
// Return a default value or handle the case where there's no max price
70+
return 0.00;
71+
}
72+
}

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@
77
namespace Magento\ConfigurableProduct\Pricing\Price;
88

99
use Magento\Catalog\Model\Product;
10+
use Magento\ConfigurableProduct\Model\ConfigurableMaxPriceCalculator;
1011
use Magento\Framework\App\ObjectManager;
1112
use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
1213
use Magento\Framework\Pricing\Price\AbstractPrice;
14+
use Magento\Framework\Pricing\SaleableInterface;
1315

1416
/**
1517
* Class RegularPrice
@@ -53,12 +55,18 @@ class ConfigurableRegularPrice extends AbstractPrice implements
5355
*/
5456
private $lowestPriceOptionsProvider;
5557

58+
/**
59+
* @var ConfigurableMaxPriceCalculator
60+
*/
61+
private $configurableMaxPriceCalculator;
62+
5663
/**
5764
* @param \Magento\Framework\Pricing\SaleableInterface $saleableItem
5865
* @param float $quantity
5966
* @param \Magento\Framework\Pricing\Adjustment\CalculatorInterface $calculator
6067
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
6168
* @param PriceResolverInterface $priceResolver
69+
* @param ConfigurableMaxPriceCalculator $configurableMaxPriceCalculator
6270
* @param LowestPriceOptionsProviderInterface $lowestPriceOptionsProvider
6371
*/
6472
public function __construct(
@@ -67,12 +75,14 @@ public function __construct(
6775
\Magento\Framework\Pricing\Adjustment\CalculatorInterface $calculator,
6876
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
6977
PriceResolverInterface $priceResolver,
78+
ConfigurableMaxPriceCalculator $configurableMaxPriceCalculator,
7079
LowestPriceOptionsProviderInterface $lowestPriceOptionsProvider = null
7180
) {
7281
parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
7382
$this->priceResolver = $priceResolver;
7483
$this->lowestPriceOptionsProvider = $lowestPriceOptionsProvider ?:
7584
ObjectManager::getInstance()->get(LowestPriceOptionsProviderInterface::class);
85+
$this->configurableMaxPriceCalculator = $configurableMaxPriceCalculator;
7686
}
7787

7888
/**
@@ -184,4 +194,28 @@ public function _resetState(): void
184194
{
185195
$this->values = [];
186196
}
197+
198+
/**
199+
* Check whether Configurable Product have more than one children products
200+
*
201+
* @param SaleableInterface $product
202+
* @return bool
203+
*/
204+
public function isChildProductsOfEqualPrices(SaleableInterface $product): bool
205+
{
206+
$minPrice = $this->getMinRegularAmount()->getValue();
207+
$final_price = $product->getFinalPrice();
208+
$productId = $product->getId();
209+
if ($final_price < $minPrice) {
210+
return false;
211+
}
212+
$attributes = $product->getTypeInstance()->getConfigurableAttributes($product);
213+
$items = $attributes->getItems();
214+
$options = reset($items);
215+
$maxPrice = $this->configurableMaxPriceCalculator->getMaxPriceForConfigurableProduct($productId);
216+
if ($maxPrice == 0) {
217+
$maxPrice = $this->getMaxRegularAmount()->getValue();
218+
}
219+
return (count($options->getOptions()) > 1) && $minPrice == $maxPrice;
220+
}
187221
}

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

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="CreateConfigurableProductWithSamePriceActionGroup">
12+
<annotations>
13+
<description>Goes to the Admin Product grid page.
14+
Create a Configurable Product using the default Product Options with identical pricing.</description>
15+
</annotations>
16+
<arguments>
17+
<argument name="product" defaultValue="_defaultProduct"/>
18+
<argument name="category" defaultValue="_defaultCategory"/>
19+
</arguments>
20+
21+
<!-- fill in basic configurable product values -->
22+
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
23+
<waitForPageLoad time="30" stepKey="wait1"/>
24+
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickOnAddProductToggle"/>
25+
<click selector="{{AdminProductGridActionSection.addConfigurableProduct}}"
26+
stepKey="clickOnAddConfigurableProduct"/>
27+
<fillField userInput="{{product.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
28+
<fillField userInput="{{product.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
29+
<fillField userInput="{{product.price}}" selector="{{AdminProductFormSection.productPrice}}"
30+
stepKey="fillPrice"/>
31+
<fillField userInput="{{product.quantity}}" selector="{{AdminProductFormSection.productQuantity}}"
32+
stepKey="fillQuantity"/>
33+
<searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}"
34+
parameterArray="[{{category.name}}]" stepKey="fillCategory"/>
35+
<selectOption userInput="{{product.visibility}}" selector="{{AdminProductFormSection.visibility}}"
36+
stepKey="fillVisibility"/>
37+
<click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
38+
<fillField userInput="{{product.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}"
39+
stepKey="fillUrlKey"/>
40+
41+
<!-- create configurations for colors the product is available in -->
42+
<click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}"
43+
stepKey="clickOnCreateConfigurations"/>
44+
<click selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="clickOnNewAttribute"/>
45+
<waitForPageLoad stepKey="waitForIFrame"/>
46+
<switchToIFrame selector="{{AdminNewAttributePanel.newAttributeIFrame}}" stepKey="switchToNewAttributeIFrame"/>
47+
<fillField selector="{{AdminNewAttributePanel.defaultLabel}}"
48+
userInput="{{colorProductAttribute.default_label}}"
49+
stepKey="fillDefaultLabel"/>
50+
<click selector="{{AdminNewAttributePanel.saveAttribute}}" stepKey="clickOnNewAttributePanel"/>
51+
<waitForPageLoad stepKey="waitForSaveAttribute"/>
52+
<switchToIFrame stepKey="switchOutOfIFrame"/>
53+
<waitForPageLoad stepKey="waitForFilters"/>
54+
<click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickOnFilters"/>
55+
<fillField userInput="{{colorProductAttribute.default_label}}"
56+
selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}"
57+
stepKey="fillFilterAttributeCodeField"/>
58+
<click selector="{{AdminCreateProductConfigurationsPanel.applyFilters}}" stepKey="clickApplyFiltersButton"/>
59+
<click selector="{{AdminCreateProductConfigurationsPanel.firstCheckbox}}" stepKey="clickOnFirstCheckbox"/>
60+
<click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton1"/>
61+
<waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}"
62+
stepKey="waitCreateNewValueAppears"/>
63+
<click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateNewValue1"/>
64+
<fillField userInput="{{colorProductAttribute1.name}}"
65+
selector="{{AdminCreateProductConfigurationsPanel.attributeName}}"
66+
stepKey="fillFieldForNewAttribute1"/>
67+
<click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute1"/>
68+
<click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateNewValue2"/>
69+
<fillField userInput="{{colorProductAttribute2.name}}"
70+
selector="{{AdminCreateProductConfigurationsPanel.attributeName}}"
71+
stepKey="fillFieldForNewAttribute2"/>
72+
<click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute2"/>
73+
<click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateNewValue3"/>
74+
<fillField userInput="{{colorProductAttribute3.name}}"
75+
selector="{{AdminCreateProductConfigurationsPanel.attributeName}}"
76+
stepKey="fillFieldForNewAttribute3"/>
77+
<click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute3"/>
78+
<click selector="{{AdminCreateProductConfigurationsPanel.selectAll}}" stepKey="clickOnSelectAll"/>
79+
<click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton2"/>
80+
<click selector="{{AdminCreateProductConfigurationsPanel.applyUniquePricesByAttributeToEachSku}}"
81+
stepKey="clickOnApplyUniquePricesByAttributeToEachSku"/>
82+
<selectOption selector="{{AdminCreateProductConfigurationsPanel.selectAttribute}}"
83+
userInput="{{colorProductAttribute.default_label}}" stepKey="selectAttributes"/>
84+
<fillField selector="{{AdminCreateProductConfigurationsPanel.attribute1}}"
85+
userInput="{{colorProductAttribute1.price}}" stepKey="fillAttributePrice1"/>
86+
<fillField selector="{{AdminCreateProductConfigurationsPanel.attribute2}}"
87+
userInput="{{colorProductAttribute1.price}}" stepKey="fillAttributePrice2"/>
88+
<fillField selector="{{AdminCreateProductConfigurationsPanel.attribute3}}"
89+
userInput="{{colorProductAttribute1.price}}" stepKey="fillAttributePrice3"/>
90+
<click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}"
91+
stepKey="clickOnApplySingleQuantityToEachSku"/>
92+
<fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}"
93+
userInput="1" stepKey="enterAttributeQuantity"/>
94+
<click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton3"/>
95+
<click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton4"/>
96+
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"/>
97+
<click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
98+
<seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
99+
<seeInTitle userInput="{{product.name}}" stepKey="seeProductNameInTitle"/>
100+
</actionGroup>
101+
</actionGroups>

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

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="ConfigurableProductPriceLabelVisibilityWithoutAsLowAsTest">
11+
<annotations>
12+
<features value="ConfigurableProduct"/>
13+
<stories value="View configurable product details in storefront"/>
14+
<title value="Customer should not see As low as label for Configurable Product with identical pricing"/>
15+
<description value="Customer should not see As low as label for Configurable Product with same pricing"/>
16+
<severity value="AVERAGE"/>
17+
<testCaseId value="AC-7099"/>
18+
<group value="ConfigurableProduct"/>
19+
</annotations>
20+
21+
<before>
22+
<createData entity="ApiCategory" stepKey="createCategory"/>
23+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
24+
<!-- Create a configurable product via the UI -->
25+
<actionGroup ref="CreateConfigurableProductWithSamePriceActionGroup" stepKey="createProduct">
26+
<argument name="product" value="_defaultProduct"/>
27+
<argument name="category" value="$$createCategory$$"/>
28+
</actionGroup>
29+
</before>
30+
<after>
31+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
32+
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteProduct">
33+
<argument name="sku" value="{{_defaultProduct.sku}}"/>
34+
</actionGroup>
35+
<actionGroup ref="AdminGridFilterResetActionGroup" stepKey="clearGridFiltersVirtual"/>
36+
<actionGroup ref="AdminGridFilterFillInputFieldActionGroup" stepKey="addSkuFilterVirtual">
37+
<argument name="filterInputName" value="sku"/>
38+
<argument name="filterValue" value="{{_defaultProduct.sku}}"/>
39+
</actionGroup>
40+
<actionGroup ref="AdminClickSearchInGridActionGroup" stepKey="applyGridFilterVirtual"/>
41+
<actionGroup ref="DeleteProductsIfTheyExistActionGroup" stepKey="deleteVirtualProducts">
42+
<argument name="sku" value="{{_defaultProduct.sku}}"/>
43+
</actionGroup>
44+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearProductsGridFilters"/>
45+
<actionGroup ref="AdminDeleteProductAttributeByLabelActionGroup" stepKey="deleteProductAttribute">
46+
<argument name="productAttributeLabel" value="{{colorProductAttribute.default_label}}"/>
47+
</actionGroup>
48+
<!-- Reindex after deleting product attribute -->
49+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
50+
<argument name="indices" value=""/>
51+
</actionGroup>
52+
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
53+
</after>
54+
55+
<!-- Verify configurable product details in storefront product view -->
56+
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="amOnConfigurableProductPage">
57+
<argument name="productUrl" value="{{_defaultProduct.urlKey}}"/>
58+
</actionGroup>
59+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="wait"/>
60+
<actionGroup ref="StorefrontAssertProductNameOnProductPageActionGroup" stepKey="seeProductName">
61+
<argument name="productName" value="{{_defaultProduct.name}}"/>
62+
</actionGroup>
63+
<actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeProductSku">
64+
<argument name="productSku" value="{{_defaultProduct.sku}}"/>
65+
</actionGroup>
66+
<dontSee userInput="As low as" selector="{{StorefrontProductInfoMainSection.productPriceLabel}}"
67+
stepKey="seeProductPriceLabel"/>
68+
<actionGroup ref="AssertStorefrontProductStockStatusOnProductPageActionGroup" stepKey="seeProductStockStatus">
69+
<argument name="productStockStatus" value="In Stock"/>
70+
</actionGroup>
71+
<actionGroup ref="StorefrontAssertProductPriceOnProductPageActionGroup" stepKey="seeProductPrice">
72+
<argument name="productPrice" value="1.00"/>
73+
</actionGroup>
74+
<actionGroup ref="AssertStorefrontProductAttributeLabelVisibleActionGroup" stepKey="seeProductAttributeTitle">
75+
<argument name="productAttributeLabel" value="{{colorProductAttribute.default_label}}"/>
76+
</actionGroup>
77+
<comment userInput="Comment is added to preserve the step key for backward compatibility"
78+
stepKey="seeColorAttributeName1"/>
79+
<actionGroup ref="AssertStorefrontProductAttributeOptionVisibleActionGroup" stepKey="seeInDropDown1">
80+
<argument name="productAttributeOption" value="{{colorProductAttribute1.name}}"/>
81+
</actionGroup>
82+
<actionGroup ref="AssertStorefrontProductAttributeOptionVisibleActionGroup" stepKey="seeInDropDown2">
83+
<argument name="productAttributeOption" value="{{colorProductAttribute2.name}}"/>
84+
</actionGroup>
85+
<actionGroup ref="AssertStorefrontProductAttributeOptionVisibleActionGroup" stepKey="seeInDropDown3">
86+
<argument name="productAttributeOption" value="{{colorProductAttribute3.name}}"/>
87+
</actionGroup>
88+
</test>
89+
</tests>

‎app/code/Magento/ConfigurableProduct/etc/di.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@
164164
<type name="Magento\ConfigurableProduct\Pricing\Price\ConfigurableRegularPrice">
165165
<arguments>
166166
<argument name="priceResolver" xsi:type="object">ConfigurableRegularPriceResolver</argument>
167+
<argument name="configurableMaxPriceCalculator" xsi:type="object">Magento\ConfigurableProduct\Model\ConfigurableMaxPriceCalculator</argument>
167168
</arguments>
168169
</type>
169170
<type name="Magento\Catalog\Model\Product\Attribute\Backend\Price">

0 commit comments

Comments
 (0)