Skip to content

Commit 3250559

Browse files
mahesh-singh-rajawatmahesh-singh-rajawat
committed
Merge branch '2.4-develop' into AC-2719
2 parents 99a9509 + 41631d5 commit 3250559

File tree

92 files changed

+2266
-720
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+2266
-720
lines changed

‎app/code/Magento/AwsS3/composer.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
"require": {
88
"php": "~7.4.0||~8.1.0",
99
"magento/framework": "*",
10-
"magento/module-remote-storage": "*",
11-
"league/flysystem": "^2.0",
12-
"league/flysystem-aws-s3-v3": "^2.0"
10+
"magento/module-remote-storage": "*"
1311
},
1412
"type": "magento2-module",
1513
"license": [

‎app/code/Magento/BundleGraphQl/Model/Resolver/PriceRange.php

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<?php
2+
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
declare(strict_types=1);
8+
9+
namespace Magento\BundleGraphQl\Model\Resolver;
10+
11+
use Magento\CatalogGraphQl\Model\PriceRangeDataProvider;
12+
use Magento\CatalogGraphQl\Model\Resolver\Product\Price\Discount;
13+
use Magento\CatalogGraphQl\Model\Resolver\Product\Price\ProviderPool as PriceProviderPool;
14+
use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Deferred\Product as ProductDataProvider;
15+
use Magento\Framework\App\ObjectManager;
16+
use Magento\Framework\GraphQl\Config\Element\Field;
17+
use Magento\Framework\GraphQl\Query\ResolverInterface;
18+
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
19+
20+
/**
21+
* Format product's pricing information for price_range field
22+
*/
23+
class PriceRange implements ResolverInterface
24+
{
25+
/**
26+
* @var Discount
27+
*/
28+
private Discount $discount;
29+
30+
/**
31+
* @var PriceProviderPool
32+
*/
33+
private PriceProviderPool $priceProviderPool;
34+
35+
/**
36+
* @var ProductDataProvider
37+
*/
38+
private ProductDataProvider $productDataProvider;
39+
40+
/**
41+
* @var PriceRangeDataProvider
42+
*/
43+
private PriceRangeDataProvider $priceRangeDataProvider;
44+
45+
/**
46+
* @param PriceProviderPool $priceProviderPool
47+
* @param Discount $discount
48+
* @param ProductDataProvider|null $productDataProvider
49+
* @param PriceRangeDataProvider|null $priceRangeDataProvider
50+
*/
51+
public function __construct(
52+
PriceProviderPool $priceProviderPool,
53+
Discount $discount,
54+
ProductDataProvider $productDataProvider = null,
55+
PriceRangeDataProvider $priceRangeDataProvider = null
56+
) {
57+
$this->priceProviderPool = $priceProviderPool;
58+
$this->discount = $discount;
59+
$this->productDataProvider = $productDataProvider
60+
?? ObjectManager::getInstance()->get(ProductDataProvider::class);
61+
$this->priceRangeDataProvider = $priceRangeDataProvider
62+
?? ObjectManager::getInstance()->get(PriceRangeDataProvider::class);
63+
}
64+
65+
/**
66+
* @inheritDoc
67+
*/
68+
public function resolve(
69+
Field $field,
70+
$context,
71+
ResolveInfo $info,
72+
array $value = null,
73+
array $args = null
74+
) {
75+
$this->productDataProvider->addProductSku($value['sku']);
76+
$productData = $this->productDataProvider->getProductBySku($value['sku']);
77+
$value['model'] = $productData['model'];
78+
79+
return $this->priceRangeDataProvider->prepare($context, $info, $value);
80+
}
81+
}

‎app/code/Magento/BundleGraphQl/etc/schema.graphqls

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ type BundleItem @doc(description: "Defines an individual item within a bundle pr
5555
type: String @doc(description: "The input type that the customer uses to select the item. Examples include radio button and checkbox.")
5656
position: Int @doc(description: "A number indicating the sequence order of this item compared to the other bundle items.")
5757
sku: String @doc(description: "The SKU of the bundle product.")
58+
price_range: PriceRange! @doc(description: "The range of prices for the product") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\PriceRange")
5859
options: [BundleItemOption] @doc(description: "An array of additional options for this bundle item.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\BundleItemLinks")
5960
}
6061

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@
5959
<click stepKey="openFirstProduct" selector="{{AdminProductGridSection.productRowBySku($$createConfigProduct.sku$$)}}"/>
6060
<waitForPageLoad stepKey="waitForProductToLoad"/>
6161

62-
<fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="100" stepKey="fillProductQty"/>
62+
<actionGroup ref="AdminFillProductQtyOnProductFormActionGroup" stepKey="fillProductQty">
63+
<argument name="productQty" value="100"/>
64+
</actionGroup>
6365
<selectOption selector="{{AdminProductFormSection.productStockStatus}}" userInput="In Stock" stepKey="selectStockStatus"/>
6466

6567
<!-- Create New Product Attribute -->

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@
5555
<click stepKey="openFirstProduct" selector="{{AdminProductGridSection.productRowBySku($$createSimpleProduct.sku$$)}}"/>
5656
<waitForPageLoad stepKey="waitForProductToLoad"/>
5757

58-
<fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="100" stepKey="fillProductQty"/>
58+
<actionGroup ref="AdminFillProductQtyOnProductFormActionGroup" stepKey="fillProductQty">
59+
<argument name="productQty" value="100"/>
60+
</actionGroup>
5961
<actionGroup ref="AdminSetStockStatusActionGroup" stepKey="selectStockStatus">
6062
<argument name="stockStatus" value="In Stock"/>
6163
</actionGroup>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeRequiredTextFieldTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@
5252
<click stepKey="openFirstProduct" selector="{{AdminProductGridSection.productRowBySku($$createSimpleProduct.sku$$)}}"/>
5353
<waitForPageLoad stepKey="waitForProductToLoad"/>
5454

55-
<fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="100" stepKey="fillProductQty"/>
55+
<actionGroup ref="AdminFillProductQtyOnProductFormActionGroup" stepKey="fillProductQty">
56+
<argument name="productQty" value="100"/>
57+
</actionGroup>
5658
<actionGroup ref="AdminSetStockStatusActionGroup" stepKey="selectStockStatus">
5759
<argument name="stockStatus" value="In Stock"/>
5860
</actionGroup>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@
4444
<selectOption selector="{{AdminProductFormSection.countryOfManufacture}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.country_of_manufacture_label}}" stepKey="selectCountryOfManufacture"/>
4545
<fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.price}}" stepKey="fillSimpleProductPrice"/>
4646
<fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.weight}}" stepKey="fillSimpleProductWeight"/>
47-
<fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.quantity}}" stepKey="fillSimpleProductQuantity"/>
47+
<actionGroup ref="AdminFillProductQtyOnProductFormActionGroup" stepKey="fillSimpleProductQuantity">
48+
<argument name="productQty" value="{{nameAndAttributeSkuMaskSimpleProduct.quantity}}"/>
49+
</actionGroup>
4850
<actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
4951
<!-- Verify customer see success message -->
5052
<see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@
5454
<fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('1')}}" userInput="{{tierPriceOnDefault.qty_1}}" stepKey="fillProductTierPriceQuantityInput1"/>
5555
<fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('1')}}" userInput="{{tierPriceOnDefault.price_1}}" stepKey="selectProductTierPriceFixedPrice1"/>
5656
<click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
57-
<fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{virtualProductOutOfStock.quantity}}" stepKey="fillVirtualProductQuantity"/>
57+
<actionGroup ref="AdminFillProductQtyOnProductFormActionGroup" stepKey="fillVirtualProductQuantity">
58+
<argument name="productQty" value="{{virtualProductOutOfStock.quantity}}"/>
59+
</actionGroup>
5860
<selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{virtualProductOutOfStock.status}}" stepKey="selectStockStatusOutOfStock"/>
5961
<click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
6062
<fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@
4242
<fillField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductCustomImportOptions.name}}" stepKey="fillProductName"/>
4343
<fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductCustomImportOptions.sku}}" stepKey="fillProductSku"/>
4444
<fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{virtualProductCustomImportOptions.price}}" stepKey="fillProductPrice"/>
45-
<fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{virtualProductCustomImportOptions.quantity}}" stepKey="fillProductQuantity"/>
45+
<actionGroup ref="AdminFillProductQtyOnProductFormActionGroup" stepKey="fillProductQuantity">
46+
<argument name="productQty" value="{{virtualProductCustomImportOptions.quantity}}"/>
47+
</actionGroup>
4648
<click selector="{{AdminProductFormSection.productStockStatus}}" stepKey="clickProductStockStatus"/>
4749
<click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
4850
<fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@
4545
<fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnVirtualProduct.price}}" stepKey="selectProductTierPriceFixedPrice"/>
4646
<click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
4747
<selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{virtualProductBigQty.productTaxClass}}" stepKey="selectProductTaxClass"/>
48-
<fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{virtualProductBigQty.quantity}}" stepKey="fillProductQuantity"/>
48+
<actionGroup ref="AdminFillProductQtyOnProductFormActionGroup" stepKey="fillProductQuantity">
49+
<argument name="productQty" value="{{virtualProductBigQty.quantity}}"/>
50+
</actionGroup>
4951
<selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{virtualProductBigQty.status}}" stepKey="selectStockStatusInStock"/>
5052
<click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
5153
<fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />

0 commit comments

Comments
 (0)