escapeHtmlAttr($position) : '' ?>>
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/gallery.js b/app/code/Magento/Catalog/view/frontend/web/js/gallery.js
index f6be6fd58ca25..2b3349c25c917 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/gallery.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/gallery.js
@@ -3,18 +3,10 @@
* See COPYING.txt for license details.
*/
-(function (factory) {
- 'use strict';
-
- if (typeof define === 'function' && define.amd) {
- define([
- 'jquery',
- 'jquery-ui-modules/widget'
- ], factory);
- } else {
- factory(jQuery);
- }
-}(function ($) {
+define([
+ 'jquery',
+ 'jquery-ui-modules/widget'
+], function ($) {
'use strict';
$.widget('mage.gallery', {
@@ -49,4 +41,4 @@
});
return $.mage.gallery;
-}));
+});
diff --git a/app/code/Magento/Catalog/view/frontend/web/product/view/validation.js b/app/code/Magento/Catalog/view/frontend/web/product/view/validation.js
index ab1753e7b9ed3..3205e58297b6c 100644
--- a/app/code/Magento/Catalog/view/frontend/web/product/view/validation.js
+++ b/app/code/Magento/Catalog/view/frontend/web/product/view/validation.js
@@ -3,19 +3,11 @@
* See COPYING.txt for license details.
*/
-(function (factory) {
- 'use strict';
-
- if (typeof define === 'function' && define.amd) {
- define([
- 'jquery',
- 'jquery-ui-modules/widget',
- 'mage/validation/validation'
- ], factory);
- } else {
- factory(jQuery);
- }
-}(function ($) {
+define([
+ 'jquery',
+ 'jquery-ui-modules/widget',
+ 'mage/validation/validation'
+], function ($) {
'use strict';
$.widget('mage.validation', $.mage.validation, {
@@ -97,4 +89,4 @@
});
return $.mage.validation;
-}));
+});
diff --git a/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Customer/GetCustomerGroup.php b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Customer/GetCustomerGroup.php
new file mode 100644
index 0000000000000..65ab2940a7a51
--- /dev/null
+++ b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Customer/GetCustomerGroup.php
@@ -0,0 +1,67 @@
+groupManagement = $groupManagement;
+ $this->customerRepository = $customerRepository;
+ }
+
+ /**
+ * Get customer group by id
+ *
+ * @param int|null $customerId
+ * @return int
+ * @throws GraphQlNoSuchEntityException
+ */
+ public function execute(?int $customerId): int
+ {
+ if (!$customerId) {
+ $customerGroupId = GroupManagement::NOT_LOGGED_IN_ID;
+ } else {
+ try {
+ $customer = $this->customerRepository->getById($customerId);
+ } catch (NoSuchEntityException $e) {
+ throw new GraphQlNoSuchEntityException(
+ __('Customer with id "%customer_id" does not exist.', ['customer_id' => $customerId]),
+ $e
+ );
+ }
+ $customerGroupId = $customer->getGroupId();
+ }
+ return (int)$customerGroupId;
+ }
+}
diff --git a/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/PriceTiers.php b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/PriceTiers.php
new file mode 100644
index 0000000000000..4e75139c1a882
--- /dev/null
+++ b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/PriceTiers.php
@@ -0,0 +1,151 @@
+valueFactory = $valueFactory;
+ $this->tiersFactory = $tiersFactory;
+ $this->getCustomerGroup = $getCustomerGroup;
+ $this->discount = $discount;
+ $this->priceProviderPool = $priceProviderPool;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function resolve(
+ Field $field,
+ $context,
+ ResolveInfo $info,
+ array $value = null,
+ array $args = null
+ ) {
+ if (!isset($value['model'])) {
+ throw new LocalizedException(__('"model" value should be specified'));
+ }
+
+ if (empty($this->tiers)) {
+ $this->customerGroupId = $this->getCustomerGroup->execute($context->getUserId());
+ $this->tiers = $this->tiersFactory->create(['customerGroupId' => $this->customerGroupId]);
+ }
+
+ $product = $value['model'];
+ $productId = $product->getId();
+ $this->tiers->addProductFilter($productId);
+
+ return $this->valueFactory->create(
+ function () use ($productId, $context) {
+ /** @var StoreInterface $store */
+ $store = $context->getExtensionAttributes()->getStore();
+
+ $productPrice = $this->tiers->getProductRegularPrice($productId) ?? 0.0;
+ $tierPrices = $this->tiers->getProductTierPrices($productId) ?? [];
+
+ return $this->formatProductTierPrices($tierPrices, $productPrice, $store);
+ }
+ );
+ }
+
+ /**
+ * Format tier prices for output
+ *
+ * @param ProductTierPriceInterface[] $tierPrices
+ * @param float $productPrice
+ * @param StoreInterface $store
+ * @return array
+ */
+ private function formatProductTierPrices(array $tierPrices, float $productPrice, StoreInterface $store): array
+ {
+ $tiers = [];
+
+ foreach ($tierPrices as $tierPrice) {
+ $percentValue = $tierPrice->getExtensionAttributes()->getPercentageValue();
+ if ($percentValue && is_numeric($percentValue)) {
+ $discount = $this->discount->getDiscountByPercent($productPrice, (float)$percentValue);
+ } else {
+ $discount = $this->discount->getDiscountByDifference($productPrice, (float)$tierPrice->getValue());
+ }
+
+ $tiers[] = [
+ "discount" => $discount,
+ "quantity" => $tierPrice->getQty(),
+ "final_price" => [
+ "value" => $tierPrice->getValue(),
+ "currency" => $store->getCurrentCurrencyCode()
+ ]
+ ];
+ }
+ return $tiers;
+ }
+}
diff --git a/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Product/Price/Tiers.php b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Product/Price/Tiers.php
new file mode 100644
index 0000000000000..73a2ba83d5096
--- /dev/null
+++ b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Product/Price/Tiers.php
@@ -0,0 +1,176 @@
+collectionFactory = $collectionFactory;
+ $this->productResource = $productResource;
+ $this->priceProviderPool = $priceProviderPool;
+ $this->customerGroupId = $customerGroupId;
+ }
+
+ /**
+ * Add product ID to collection filter
+ *
+ * @param int $productId
+ */
+ public function addProductFilter($productId): void
+ {
+ $this->filterProductIds[] = $productId;
+ }
+
+ /**
+ * Get tier prices for product by ID
+ *
+ * @param int $productId
+ * @return ProductTierPriceInterface[]|null
+ */
+ public function getProductTierPrices($productId): ?array
+ {
+ if (!$this->isLoaded()) {
+ $this->load();
+ }
+
+ if (empty($this->products[$productId])) {
+ return null;
+ }
+ return $this->products[$productId]->getTierPrices();
+ }
+
+ /**
+ * Get product regular price by ID
+ *
+ * @param int $productId
+ * @return float|null
+ */
+ public function getProductRegularPrice($productId): ?float
+ {
+ if (!$this->isLoaded()) {
+ $this->load();
+ }
+
+ if (empty($this->products[$productId])) {
+ return null;
+ }
+ $product = $this->products[$productId];
+ $priceProvider = $this->priceProviderPool->getProviderByProductType($product->getTypeId());
+ return $priceProvider->getRegularPrice($product)->getValue();
+ }
+
+ /**
+ * Check if collection has been loaded
+ *
+ * @return bool
+ */
+ public function isLoaded(): bool
+ {
+ $numFilterProductIds = count(array_unique($this->filterProductIds));
+ if ($numFilterProductIds > count($this->products)) {
+ //New products were added to the filter after load, so we should reload
+ return false;
+ }
+ return $this->loaded;
+ }
+
+ /**
+ * Load product collection
+ */
+ private function load(): void
+ {
+ $this->loaded = false;
+
+ $productIdField = $this->productResource->getEntityIdField();
+ /** @var Collection $productCollection */
+ $productCollection = $this->collectionFactory->create();
+ $productCollection->addFieldToFilter($productIdField, ['in' => $this->filterProductIds]);
+ $productCollection->addAttributeToSelect('price');
+ $productCollection->addAttributeToSelect('price_type');
+ $productCollection->load();
+ $productCollection->addTierPriceDataByGroupId($this->customerGroupId);
+
+ $this->setProducts($productCollection);
+ $this->loaded = true;
+ }
+
+ /**
+ * Set products from collection
+ *
+ * @param Collection $productCollection
+ */
+ private function setProducts(Collection $productCollection): void
+ {
+ $this->products = [];
+
+ foreach ($productCollection as $product) {
+ $this->products[$product->getId()] = $product;
+ }
+
+ $missingProducts = array_diff($this->filterProductIds, array_keys($this->products));
+ foreach (array_unique($missingProducts) as $missingProductId) {
+ $this->products[$missingProductId] = null;
+ }
+ }
+}
diff --git a/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/TierPrices.php b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/TierPrices.php
new file mode 100644
index 0000000000000..c449d0a2ba30b
--- /dev/null
+++ b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/TierPrices.php
@@ -0,0 +1,97 @@
+valueFactory = $valueFactory;
+ $this->tiersFactory = $tiersFactory;
+ $this->getCustomerGroup = $getCustomerGroup;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function resolve(
+ Field $field,
+ $context,
+ ResolveInfo $info,
+ array $value = null,
+ array $args = null
+ ) {
+ if (!isset($value['model'])) {
+ throw new LocalizedException(__('"model" value should be specified'));
+ }
+
+ if (null === $this->customerGroupId) {
+ $this->customerGroupId = $this->getCustomerGroup->execute($context->getUserId());
+ $this->tiers = $this->tiersFactory->create(['customerGroupId' => $this->customerGroupId]);
+ }
+
+ /** @var Product $product */
+ $product = $value['model'];
+ $productId = $product->getId();
+ $this->tiers->addProductFilter($productId);
+
+ return $this->valueFactory->create(
+ function () use ($productId, $context) {
+ $tierPrices = $this->tiers->getProductTierPrices($productId);
+
+ return $tierPrices ?? [];
+ }
+ );
+ }
+}
diff --git a/app/code/Magento/CatalogCustomerGraphQl/README.md b/app/code/Magento/CatalogCustomerGraphQl/README.md
new file mode 100644
index 0000000000000..525a1a4f76433
--- /dev/null
+++ b/app/code/Magento/CatalogCustomerGraphQl/README.md
@@ -0,0 +1,3 @@
+# CatalogCustomerGraphQl
+
+**CatalogCustomerGraphQl** provides type and resolver information for GraphQL attributes that have dependences on the Catalog and Customer modules.
\ No newline at end of file
diff --git a/app/code/Magento/CatalogCustomerGraphQl/composer.json b/app/code/Magento/CatalogCustomerGraphQl/composer.json
new file mode 100644
index 0000000000000..859a5c6235697
--- /dev/null
+++ b/app/code/Magento/CatalogCustomerGraphQl/composer.json
@@ -0,0 +1,25 @@
+{
+ "name": "magento/module-catalog-customer-graph-ql",
+ "description": "N/A",
+ "type": "magento2-module",
+ "require": {
+ "php": "~7.1.3||~7.2.0||~7.3.0",
+ "magento/framework": "*",
+ "magento/module-catalog": "*",
+ "magento/module-customer": "*",
+ "magento/module-catalog-graph-ql": "*",
+ "magento/module-store": "*"
+ },
+ "license": [
+ "OSL-3.0",
+ "AFL-3.0"
+ ],
+ "autoload": {
+ "files": [
+ "registration.php"
+ ],
+ "psr-4": {
+ "Magento\\CatalogCustomerGraphQl\\": ""
+ }
+ }
+}
diff --git a/app/code/Magento/CatalogCustomerGraphQl/etc/module.xml b/app/code/Magento/CatalogCustomerGraphQl/etc/module.xml
new file mode 100644
index 0000000000000..6131435258b58
--- /dev/null
+++ b/app/code/Magento/CatalogCustomerGraphQl/etc/module.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/CatalogCustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogCustomerGraphQl/etc/schema.graphqls
new file mode 100644
index 0000000000000..17880584bf160
--- /dev/null
+++ b/app/code/Magento/CatalogCustomerGraphQl/etc/schema.graphqls
@@ -0,0 +1,22 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+interface ProductInterface {
+ tier_prices: [ProductTierPrices] @deprecated(reason: "Use price_tiers for product tier price information.") @doc(description: "An array of ProductTierPrices objects.") @resolver(class: "Magento\\CatalogCustomerGraphQl\\Model\\Resolver\\TierPrices")
+ price_tiers: [TierPrice] @doc(description: "An array of TierPrice objects.") @resolver(class: "Magento\\CatalogCustomerGraphQl\\Model\\Resolver\\PriceTiers")
+}
+
+type ProductTierPrices @doc(description: "ProductTierPrices is deprecated and has been replaced by TierPrice. The ProductTierPrices object defines a tier price, which is a quantity discount offered to a specific customer group.") {
+ customer_group_id: String @deprecated(reason: "customer_group_id is not relevant for storefront.") @doc(description: "The ID of the customer group.")
+ qty: Float @deprecated(reason: "ProductTierPrices is deprecated, use TierPrice.quantity.") @doc(description: "The number of items that must be purchased to qualify for tier pricing.")
+ value: Float @deprecated(reason: "ProductTierPrices is deprecated. Use TierPrice.final_price") @doc(description: "The price of the fixed price item.")
+ percentage_value: Float @deprecated(reason: "ProductTierPrices is deprecated. Use TierPrice.discount.") @doc(description: "The percentage discount of the item.")
+ website_id: Float @deprecated(reason: "website_id is not relevant for storefront.") @doc(description: "The ID assigned to the website.")
+}
+
+
+type TierPrice @doc(description: "A price based on the quantity purchased.") {
+ final_price: Money @doc(desription: "The price of the product at this tier.")
+ quantity: Float @doc(description: "The minimum number of items that must be purchased to qualify for this price tier.")
+ discount: ProductDiscount @doc(description: "The price discount that this tier represents.")
+}
diff --git a/app/code/Magento/CatalogCustomerGraphQl/registration.php b/app/code/Magento/CatalogCustomerGraphQl/registration.php
new file mode 100644
index 0000000000000..8176716d42ea0
--- /dev/null
+++ b/app/code/Magento/CatalogCustomerGraphQl/registration.php
@@ -0,0 +1,9 @@
+scopeConfig = $scopeConfig;
+ }
+
+ /**
+ * Filter for filtering the requested categories id's based on url_key, ids, name in the result.
+ *
+ * @param array $args
+ * @param Collection $categoryCollection
+ * @param StoreInterface $store
+ * @throws InputException
+ */
+ public function applyFilters(array $args, Collection $categoryCollection, StoreInterface $store)
+ {
+ $categoryCollection->addAttributeToFilter(CategoryInterface::KEY_IS_ACTIVE, ['eq' => 1]);
+ foreach ($args['filters'] as $field => $cond) {
+ foreach ($cond as $condType => $value) {
+ if ($field === 'ids') {
+ $categoryCollection->addIdFilter($value);
+ } else {
+ $this->addAttributeFilter($categoryCollection, $field, $condType, $value, $store);
+ }
+ }
+ }
+ }
+
+ /**
+ * Add filter to category collection
+ *
+ * @param Collection $categoryCollection
+ * @param string $field
+ * @param string $condType
+ * @param string|array $value
+ * @param StoreInterface $store
+ * @throws InputException
+ */
+ private function addAttributeFilter($categoryCollection, $field, $condType, $value, $store)
+ {
+ if ($condType === 'match') {
+ $this->addMatchFilter($categoryCollection, $field, $value, $store);
+ return;
+ }
+ $categoryCollection->addAttributeToFilter($field, [$condType => $value]);
+ }
+
+ /**
+ * Add match filter to collection
+ *
+ * @param Collection $categoryCollection
+ * @param string $field
+ * @param string $value
+ * @param StoreInterface $store
+ * @throws InputException
+ */
+ private function addMatchFilter($categoryCollection, $field, $value, $store)
+ {
+ $minQueryLength = $this->scopeConfig->getValue(
+ Query::XML_PATH_MIN_QUERY_LENGTH,
+ ScopeInterface::SCOPE_STORE,
+ $store
+ );
+ $searchValue = str_replace('%', '', $value);
+ $matchLength = strlen($searchValue);
+ if ($matchLength < $minQueryLength) {
+ throw new InputException(__('Invalid match filter'));
+ }
+
+ $categoryCollection->addAttributeToFilter($field, ['like' => "%{$searchValue}%"]);
+ }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/DataProvider/Breadcrumbs.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/DataProvider/Breadcrumbs.php
index 9e23c4f1e9736..863e621bd8df3 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/DataProvider/Breadcrumbs.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/DataProvider/Breadcrumbs.php
@@ -29,8 +29,11 @@ public function __construct(
}
/**
+ * Get breadcrumbs data
+ *
* @param string $categoryPath
* @return array
+ * @throws \Magento\Framework\Exception\LocalizedException
*/
public function getData(string $categoryPath): array
{
@@ -41,7 +44,7 @@ public function getData(string $categoryPath): array
if (count($parentCategoryIds)) {
$collection = $this->collectionFactory->create();
- $collection->addAttributeToSelect(['name', 'url_key']);
+ $collection->addAttributeToSelect(['name', 'url_key', 'url_path']);
$collection->addAttributeToFilter('entity_id', $parentCategoryIds);
foreach ($collection as $category) {
@@ -50,6 +53,7 @@ public function getData(string $categoryPath): array
'category_name' => $category->getName(),
'category_level' => $category->getLevel(),
'category_url_key' => $category->getUrlKey(),
+ 'category_url_path' => $category->getUrlPath(),
];
}
}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryList.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryList.php
new file mode 100644
index 0000000000000..6b8949d612829
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryList.php
@@ -0,0 +1,114 @@
+categoryTree = $categoryTree;
+ $this->extractDataFromCategoryTree = $extractDataFromCategoryTree;
+ $this->categoryFilter = $categoryFilter;
+ $this->collectionFactory = $collectionFactory;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+ {
+ if (isset($value[$field->getName()])) {
+ return $value[$field->getName()];
+ }
+ $store = $context->getExtensionAttributes()->getStore();
+
+ $rootCategoryIds = [];
+ if (!isset($args['filters'])) {
+ $rootCategoryIds[] = (int)$store->getRootCategoryId();
+ } else {
+ $categoryCollection = $this->collectionFactory->create();
+ try {
+ $this->categoryFilter->applyFilters($args, $categoryCollection, $store);
+ } catch (InputException $e) {
+ return [];
+ }
+
+ foreach ($categoryCollection as $category) {
+ $rootCategoryIds[] = (int)$category->getId();
+ }
+ }
+
+ $result = $this->fetchCategories($rootCategoryIds, $info);
+ return $result;
+ }
+
+ /**
+ * Fetch category tree data
+ *
+ * @param array $categoryIds
+ * @param ResolveInfo $info
+ * @return array
+ * @throws GraphQlNoSuchEntityException
+ */
+ private function fetchCategories(array $categoryIds, ResolveInfo $info)
+ {
+ $fetchedCategories = [];
+ foreach ($categoryIds as $categoryId) {
+ $categoryTree = $this->categoryTree->getTree($info, $categoryId);
+ if (empty($categoryTree)) {
+ continue;
+ }
+ $fetchedCategories[] = current($this->extractDataFromCategoryTree->execute($categoryTree));
+ }
+
+ return $fetchedCategories;
+ }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Price/Discount.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Price/Discount.php
new file mode 100644
index 0000000000000..c56e05bf267a4
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Price/Discount.php
@@ -0,0 +1,98 @@
+ $this->getPriceDifferenceAsValue($regularPrice, $finalPrice),
+ 'percent_off' => $this->getPriceDifferenceAsPercent($regularPrice, $finalPrice)
+ ];
+ }
+
+ /**
+ * Get formatted discount based on percent off
+ *
+ * @param float $regularPrice
+ * @param float $percentOff
+ * @return array
+ */
+ public function getDiscountByPercent(float $regularPrice, float $percentOff): array
+ {
+ return [
+ 'amount_off' => $this->getPercentDiscountAsValue($regularPrice, $percentOff),
+ 'percent_off' => $percentOff
+ ];
+ }
+
+ /**
+ * Get value difference between two prices
+ *
+ * @param float $regularPrice
+ * @param float $finalPrice
+ * @return float
+ */
+ private function getPriceDifferenceAsValue(float $regularPrice, float $finalPrice): float
+ {
+ $difference = $regularPrice - $finalPrice;
+ if ($difference <= $this->zeroThreshold) {
+ return 0;
+ }
+ return round($difference, 2);
+ }
+
+ /**
+ * Get percent difference between two prices
+ *
+ * @param float $regularPrice
+ * @param float $finalPrice
+ * @return float
+ */
+ private function getPriceDifferenceAsPercent(float $regularPrice, float $finalPrice): float
+ {
+ $difference = $this->getPriceDifferenceAsValue($regularPrice, $finalPrice);
+
+ if ($difference <= $this->zeroThreshold || $regularPrice <= $this->zeroThreshold) {
+ return 0;
+ }
+
+ return round(($difference / $regularPrice) * 100, 2);
+ }
+
+ /**
+ * Get amount difference that percentOff represents
+ *
+ * @param float $regularPrice
+ * @param float $percentOff
+ * @return float
+ */
+ private function getPercentDiscountAsValue(float $regularPrice, float $percentOff): float
+ {
+ $percentDecimal = $percentOff / 100;
+ $valueDiscount = $regularPrice * $percentDecimal;
+
+ return round($valueDiscount, 2);
+ }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Price/Provider.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Price/Provider.php
new file mode 100644
index 0000000000000..67dbcf861170f
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Price/Provider.php
@@ -0,0 +1,63 @@
+getPriceInfo()->getPrice(FinalPrice::PRICE_CODE);
+ return $finalPrice->getMinimalPrice();
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getMinimalRegularPrice(SaleableInterface $product): AmountInterface
+ {
+ return $this->getRegularPrice($product);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getMaximalFinalPrice(SaleableInterface $product): AmountInterface
+ {
+ /** @var FinalPrice $finalPrice */
+ $finalPrice = $product->getPriceInfo()->getPrice(FinalPrice::PRICE_CODE);
+ return $finalPrice->getMaximalPrice();
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getMaximalRegularPrice(SaleableInterface $product): AmountInterface
+ {
+ return $this->getRegularPrice($product);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getRegularPrice(SaleableInterface $product): AmountInterface
+ {
+ return $product->getPriceInfo()->getPrice(RegularPrice::PRICE_CODE)->getAmount();
+ }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Price/ProviderInterface.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Price/ProviderInterface.php
new file mode 100644
index 0000000000000..99459daf045a5
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Price/ProviderInterface.php
@@ -0,0 +1,57 @@
+providers = $providers;
+ }
+
+ /**
+ * Get price provider by product type
+ *
+ * @param string $productType
+ * @return ProviderInterface
+ */
+ public function getProviderByProductType(string $productType): ProviderInterface
+ {
+ if (isset($this->providers[$productType])) {
+ return $this->providers[$productType];
+ }
+ return $this->providers[self::DEFAULT];
+ }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/PriceRange.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/PriceRange.php
new file mode 100644
index 0000000000000..9396b1f02b975
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/PriceRange.php
@@ -0,0 +1,133 @@
+priceProviderPool = $priceProviderPool;
+ $this->discount = $discount;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function resolve(
+ Field $field,
+ $context,
+ ResolveInfo $info,
+ array $value = null,
+ array $args = null
+ ) {
+ if (!isset($value['model'])) {
+ throw new LocalizedException(__('"model" value should be specified'));
+ }
+ /** @var StoreInterface $store */
+ $store = $context->getExtensionAttributes()->getStore();
+
+ /** @var Product $product */
+ $product = $value['model'];
+ $product->unsetData('minimal_price');
+
+ $requestedFields = $info->getFieldSelection(10);
+ $returnArray = [];
+
+ if (isset($requestedFields['minimum_price'])) {
+ $returnArray['minimum_price'] = $this->getMinimumProductPrice($product, $store);
+ }
+ if (isset($requestedFields['maximum_price'])) {
+ $returnArray['maximum_price'] = $this->getMaximumProductPrice($product, $store);
+ }
+ return $returnArray;
+ }
+
+ /**
+ * Get formatted minimum product price
+ *
+ * @param SaleableInterface $product
+ * @param StoreInterface $store
+ * @return array
+ */
+ private function getMinimumProductPrice(SaleableInterface $product, StoreInterface $store): array
+ {
+ $priceProvider = $this->priceProviderPool->getProviderByProductType($product->getTypeId());
+ $regularPrice = $priceProvider->getMinimalRegularPrice($product)->getValue();
+ $finalPrice = $priceProvider->getMinimalFinalPrice($product)->getValue();
+ $minPriceArray = $this->formatPrice($regularPrice, $finalPrice, $store);
+ $minPriceArray['model'] = $product;
+ return $minPriceArray;
+ }
+
+ /**
+ * Get formatted maximum product price
+ *
+ * @param SaleableInterface $product
+ * @param StoreInterface $store
+ * @return array
+ */
+ private function getMaximumProductPrice(SaleableInterface $product, StoreInterface $store): array
+ {
+ $priceProvider = $this->priceProviderPool->getProviderByProductType($product->getTypeId());
+ $regularPrice = $priceProvider->getMaximalRegularPrice($product)->getValue();
+ $finalPrice = $priceProvider->getMaximalFinalPrice($product)->getValue();
+ $maxPriceArray = $this->formatPrice($regularPrice, $finalPrice, $store);
+ $maxPriceArray['model'] = $product;
+ return $maxPriceArray;
+ }
+
+ /**
+ * Format price for GraphQl output
+ *
+ * @param float $regularPrice
+ * @param float $finalPrice
+ * @param StoreInterface $store
+ * @return array
+ */
+ private function formatPrice(float $regularPrice, float $finalPrice, StoreInterface $store): array
+ {
+ return [
+ 'regular_price' => [
+ 'value' => $regularPrice,
+ 'currency' => $store->getCurrentCurrencyCode()
+ ],
+ 'final_price' => [
+ 'value' => $finalPrice,
+ 'currency' => $store->getCurrentCurrencyCode()
+ ],
+ 'discount' => $this->discount->getDiscountByDifference($regularPrice, $finalPrice),
+ ];
+ }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/TierPrices.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/TierPrices.php
deleted file mode 100644
index 726ef91c56880..0000000000000
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/TierPrices.php
+++ /dev/null
@@ -1,63 +0,0 @@
-getTierPrices()) {
- $tierPrices = [];
- /** @var TierPrice $tierPrice */
- foreach ($product->getTierPrices() as $tierPrice) {
- $tierPrices[] = $tierPrice->getData();
- }
- }
-
- return $tierPrices;
- }
-}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/AttributeProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/AttributeProcessor.php
index f4cefeb3f3638..2ad05fbfa1e08 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/AttributeProcessor.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/AttributeProcessor.php
@@ -19,7 +19,22 @@
class AttributeProcessor implements CollectionProcessorInterface
{
/**
- * {@inheritdoc}
+ * Map GraphQl input fields to product attributes
+ *
+ * @var array
+ */
+ private $fieldToAttributeMap = [];
+
+ /**
+ * @param array $fieldToAttributeMap
+ */
+ public function __construct($fieldToAttributeMap = [])
+ {
+ $this->fieldToAttributeMap = array_merge($this->fieldToAttributeMap, $fieldToAttributeMap);
+ }
+
+ /**
+ * @inheritdoc
*/
public function process(
Collection $collection,
@@ -27,9 +42,32 @@ public function process(
array $attributeNames
): Collection {
foreach ($attributeNames as $name) {
- $collection->addAttributeToSelect($name);
+ $this->addAttribute($collection, $name);
}
return $collection;
}
+
+ /**
+ * Add attribute to collection select
+ *
+ * @param Collection $collection
+ * @param string $attribute
+ */
+ private function addAttribute(Collection $collection, string $attribute): void
+ {
+ if (isset($this->fieldToAttributeMap[$attribute])) {
+ $attributeMap = $this->fieldToAttributeMap[$attribute];
+ if (is_array($attributeMap)) {
+ foreach ($attributeMap as $attributeName) {
+ $collection->addAttributeToSelect($attributeName);
+ }
+ } else {
+ $collection->addAttributeToSelect($attributeMap);
+ }
+
+ } else {
+ $collection->addAttributeToSelect($attribute);
+ }
+ }
}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/FieldSelection.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/FieldSelection.php
index 3912bab05ebbe..ae4f2e911a5b0 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/FieldSelection.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/FieldSelection.php
@@ -60,9 +60,9 @@ private function getProductFields(ResolveInfo $info): array
$fieldNames[] = $this->collectProductFieldNames($selection, $fieldNames);
}
}
-
- $fieldNames = array_merge(...$fieldNames);
-
+ if (!empty($fieldNames)) {
+ $fieldNames = array_merge(...$fieldNames);
+ }
return $fieldNames;
}
diff --git a/app/code/Magento/CatalogGraphQl/Plugin/DesignLoader.php b/app/code/Magento/CatalogGraphQl/Plugin/DesignLoader.php
new file mode 100644
index 0000000000000..cfb99ce270c21
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Plugin/DesignLoader.php
@@ -0,0 +1,71 @@
+designLoader = $designLoader;
+ $this->messageManager = $messageManager;
+ }
+
+ /**
+ * Before create load the design files
+ *
+ * @param ImageFactory $subject
+ * @param Product $product
+ * @param string $imageId
+ * @param array|null $attributes
+ *
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function beforeCreate(
+ ImageFactory $subject,
+ Product $product,
+ string $imageId,
+ array $attributes = null
+ ) {
+ try {
+ $this->designLoader->load();
+ } catch (\Magento\Framework\Exception\LocalizedException $e) {
+ if ($e->getPrevious() instanceof \Magento\Framework\Config\Dom\ValidationException) {
+ /** @var MessageInterface $message */
+ $message = $this->messageManager
+ ->createMessage(MessageInterface::TYPE_ERROR)
+ ->setText($e->getMessage());
+ $this->messageManager->addUniqueMessages([$message]);
+ }
+ }
+ }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Test/Unit/Model/Resolver/Product/Price/DiscountTest.php b/app/code/Magento/CatalogGraphQl/Test/Unit/Model/Resolver/Product/Price/DiscountTest.php
new file mode 100644
index 0000000000000..5ebb48f761c06
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Test/Unit/Model/Resolver/Product/Price/DiscountTest.php
@@ -0,0 +1,61 @@
+discount = new Discount();
+ }
+
+ /**
+ * @dataProvider priceDataProvider
+ * @param $regularPrice
+ * @param $finalPrice
+ * @param $expectedAmountOff
+ * @param $expectedPercentOff
+ */
+ public function testGetPriceDiscount($regularPrice, $finalPrice, $expectedAmountOff, $expectedPercentOff)
+ {
+ $discountResult = $this->discount->getDiscountByDifference($regularPrice, $finalPrice);
+
+ $this->assertEquals($expectedAmountOff, $discountResult['amount_off']);
+ $this->assertEquals($expectedPercentOff, $discountResult['percent_off']);
+ }
+
+ /**
+ * Price data provider
+ *
+ * [regularPrice, finalPrice, expectedAmountOff, expectedPercentOff]
+ *
+ * @return array
+ */
+ public function priceDataProvider()
+ {
+ return [
+ [100, 50, 50, 50],
+ [.1, .05, .05, 50],
+ [12.50, 10, 2.5, 20],
+ [99.99, 84.99, 15.0, 15],
+ [9999999999.01, 8999999999.11, 999999999.9, 10],
+ [0, 0, 0, 0],
+ [0, 10, 0, 0],
+ [9.95, 9.95, 0, 0],
+ [21.05, 0, 21.05, 100]
+ ];
+ }
+}
diff --git a/app/code/Magento/CatalogGraphQl/etc/di.xml b/app/code/Magento/CatalogGraphQl/etc/di.xml
index 485ae792193e3..1fe62fc442ecf 100644
--- a/app/code/Magento/CatalogGraphQl/etc/di.xml
+++ b/app/code/Magento/CatalogGraphQl/etc/di.xml
@@ -69,4 +69,6 @@
+
+
diff --git a/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml b/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml
index fe3413dc3b218..f8a3e4ac5c895 100644
--- a/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml
@@ -118,4 +118,27 @@
+
+
+
+
+
+ - Magento\CatalogGraphQl\Model\Resolver\Product\Price\Provider
+
+
+
+
+
+
+
+ -
+
- price
+
+
+
+
+
+
+
diff --git a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
index 76a58857cebc2..536992d3fca82 100644
--- a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
@@ -11,26 +11,29 @@ type Query {
): Products
@resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Products") @doc(description: "The products query searches for products that match the criteria specified in the search and filter attributes.") @cache(cacheIdentity: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Identity")
category (
- id: Int @doc(description: "Id of the category.")
+ id: Int @doc(description: "Id of the category.")
): CategoryTree
- @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\CategoryTree") @doc(description: "The category query searches for categories that match the criteria specified in the search and filter attributes.") @cache(cacheIdentity: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\CategoryTreeIdentity")
+ @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\CategoryTree") @doc(description: "The category query searches for categories that match the criteria specified in the search and filter attributes.") @deprecated(reason: "Use 'categoryList' query instead of 'category' query") @cache(cacheIdentity: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\CategoryTreeIdentity")
+ categoryList(
+ filters: CategoryFilterInput @doc(description: "Identifies which Category filter inputs to search for and return.")
+ ): [CategoryTree] @doc(description: "Returns an array of categories based on the specified filters.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\CategoryList") @cache(cacheIdentity: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\CategoriesIdentity")
}
-type Price @doc(description: "The Price object defines the price of a product as well as any tax-related adjustments.") {
- amount: Money @doc(description: "The price of a product plus a three-letter currency code.")
- adjustments: [PriceAdjustment] @doc(description: "An array that provides information about tax, weee, or weee_tax adjustments.")
+type Price @doc(description: "Price is deprecated, replaced by ProductPrice. The Price object defines the price of a product as well as any tax-related adjustments.") {
+ amount: Money @deprecated(reason: "Price is deprecated, use ProductPrice.") @doc(description: "The price of a product plus a three-letter currency code.")
+ adjustments: [PriceAdjustment] @deprecated(reason: "Price is deprecated, use ProductPrice.") @doc(description: "An array that provides information about tax, weee, or weee_tax adjustments.")
}
-type PriceAdjustment @doc(description: "The PricedAdjustment object defines the amount of money to apply as an adjustment, the type of adjustment to apply, and whether the item is included or excluded from the adjustment.") {
+type PriceAdjustment @doc(description: "PriceAdjustment is deprecated. Taxes will be included or excluded in the price. The PricedAdjustment object defines the amount of money to apply as an adjustment, the type of adjustment to apply, and whether the item is included or excluded from the adjustment.") {
amount: Money @doc(description: "The amount of the price adjustment and its currency code.")
- code: PriceAdjustmentCodesEnum @doc(description: "Indicates whether the adjustment involves tax, weee, or weee_tax.")
- description: PriceAdjustmentDescriptionEnum @doc(description: "Indicates whether the entity described by the code attribute is included or excluded from the adjustment.")
+ code: PriceAdjustmentCodesEnum @deprecated(reason: "PriceAdjustment is deprecated.") @doc(description: "Indicates whether the adjustment involves tax, weee, or weee_tax.")
+ description: PriceAdjustmentDescriptionEnum @deprecated(reason: "PriceAdjustment is deprecated.") @doc(description: "Indicates whether the entity described by the code attribute is included or excluded from the adjustment.")
}
-enum PriceAdjustmentCodesEnum @doc(description: "Note: This enumeration contains values defined in modules other than the Catalog module.") {
+enum PriceAdjustmentCodesEnum @doc(description: "PriceAdjustment.code is deprecated. This enumeration contains values defined in modules other than the Catalog module.") {
}
-enum PriceAdjustmentDescriptionEnum @doc(description: "This enumeration states whether a price adjustment is included or excluded.") {
+enum PriceAdjustmentDescriptionEnum @doc(description: "PriceAdjustmentDescriptionEnum is deprecated. This enumeration states whether a price adjustment is included or excluded.") {
INCLUDED
EXCLUDED
}
@@ -41,10 +44,26 @@ enum PriceTypeEnum @doc(description: "This enumeration the price type.") {
DYNAMIC
}
-type ProductPrices @doc(description: "The ProductPrices object contains the regular price of an item, as well as its minimum and maximum prices. Only composite products, which include bundle, configurable, and grouped products, can contain a minimum and maximum price.") {
- minimalPrice: Price @doc(description: "The lowest possible final price for all the options defined within a composite product. If you are specifying a price range, this would be the from value.")
- maximalPrice: Price @doc(description: "The highest possible final price for all the options defined within a composite product. If you are specifying a price range, this would be the to value.")
- regularPrice: Price @doc(description: "The base price of a product.")
+type ProductPrices @doc(description: "ProductPrices is deprecated, replaced by PriceRange. The ProductPrices object contains the regular price of an item, as well as its minimum and maximum prices. Only composite products, which include bundle, configurable, and grouped products, can contain a minimum and maximum price.") {
+ minimalPrice: Price @deprecated(reason: "Use PriceRange.minimum_price.") @doc(description: "The lowest possible final price for all the options defined within a composite product. If you are specifying a price range, this would be the from value.")
+ maximalPrice: Price @deprecated(reason: "Use PriceRange.maximum_price.") @doc(description: "The highest possible final price for all the options defined within a composite product. If you are specifying a price range, this would be the to value.")
+ regularPrice: Price @deprecated(reason: "Use regular_price from PriceRange.minimum_price or PriceRange.maximum_price.") @doc(description: "The base price of a product.")
+}
+
+type PriceRange @doc(description: "Price range for a product. If the product has a single price, the minimum and maximum price will be the same."){
+ minimum_price: ProductPrice! @doc(description: "The lowest possible price for the product.")
+ maximum_price: ProductPrice @doc(description: "The highest possible price for the product.")
+}
+
+type ProductPrice @doc(description: "Represents a product price.") {
+ regular_price: Money! @doc(description: "The regular price of the product.")
+ final_price: Money! @doc(description: "The final price of the product after discounts applied.")
+ discount: ProductDiscount @doc(description: "The price discount. Represents the difference between the regular and final price.")
+}
+
+type ProductDiscount @doc(description: "A discount applied to a product price.") {
+ percent_off: Float @doc(description: "The discount expressed a percentage.")
+ amount_off: Float @doc(description: "The actual value of the discount.")
}
type ProductLinks implements ProductLinksInterface @doc(description: "ProductLinks is an implementation of ProductLinksInterface.") {
@@ -58,14 +77,6 @@ interface ProductLinksInterface @typeResolver(class: "Magento\\CatalogGraphQl\\M
position: Int @doc(description: "The position within the list of product links.")
}
-type ProductTierPrices @doc(description: "The ProductTierPrices object defines a tier price, which is a quantity discount offered to a specific customer group.") {
- customer_group_id: String @doc(description: "The ID of the customer group.")
- qty: Float @doc(description: "The number of items that must be purchased to qualify for tier pricing.")
- value: Float @doc(description: "The price of the fixed price item.")
- percentage_value: Float @doc(description: "The percentage discount of the item.")
- website_id: Float @doc(description: "The ID assigned to the website.")
-}
-
interface ProductInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\ProductInterfaceTypeResolverComposite") @doc(description: "The ProductInterface contains attributes that are common to all types of products. Note that descriptions may not be available for custom and EAV attributes.") {
id: Int @doc(description: "The ID number assigned to the product.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\EntityIdToId")
name: String @doc(description: "The product name. Customers use this name to identify the product.")
@@ -84,7 +95,7 @@ interface ProductInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\
thumbnail: ProductImage @doc(description: "The relative path to the product's thumbnail image.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductImage")
new_from_date: String @doc(description: "The beginning date for new product listings, and determines if the product is featured as a new product.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\NewFromTo")
new_to_date: String @doc(description: "The end date for new product listings.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\NewFromTo")
- tier_price: Float @doc(description: "The price when tier pricing is in effect and the items purchased threshold has been reached.")
+ tier_price: Float @deprecated(reason: "Use price_tiers for product tier price information.") @doc(description: "The price when tier pricing is in effect and the items purchased threshold has been reached.")
options_container: String @doc(description: "If the product has multiple options, determines where they appear on the product page.")
created_at: String @doc(description: "Timestamp indicating when the product was created.")
updated_at: String @doc(description: "Timestamp indicating when the product was updated.")
@@ -93,8 +104,8 @@ interface ProductInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\
websites: [Website] @doc(description: "An array of websites in which the product is available.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Websites")
product_links: [ProductLinksInterface] @doc(description: "An array of ProductLinks objects.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductLinks")
media_gallery_entries: [MediaGalleryEntry] @deprecated(reason: "Use product's `media_gallery` instead") @doc(description: "An array of MediaGalleryEntry objects.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\MediaGalleryEntries")
- tier_prices: [ProductTierPrices] @doc(description: "An array of ProductTierPrices objects.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\TierPrices")
- price: ProductPrices @doc(description: "A ProductPrices object, indicating the price of an item.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Price")
+ price: ProductPrices @deprecated(reason: "Use price_range for product price information.") @doc(description: "A ProductPrices object, indicating the price of an item.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Price")
+ price_range: PriceRange! @doc(description: "A PriceRange object, indicating the range of prices for the product") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\PriceRange")
gift_message_available: String @doc(description: "Indicates whether a gift message is available.")
manufacturer: Int @doc(description: "A number representing the product's manufacturer.")
categories: [CategoryInterface] @doc(description: "The categories assigned to a product.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Categories") @cache(cacheIdentity: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\CategoriesIdentity")
@@ -231,6 +242,7 @@ type Breadcrumb @doc(description: "Breadcrumb item."){
category_name: String @doc(description: "Category name.")
category_level: Int @doc(description: "Category level.")
category_url_key: String @doc(description: "Category URL key.")
+ category_url_path: String @doc(description: "Category URL path.")
}
type CustomizableRadioOption implements CustomizableOptionInterface @doc(description: "CustomizableRadioOption contains information about a set of radio buttons that are defined as part of a customizable option.") {
@@ -285,6 +297,13 @@ input ProductAttributeFilterInput @doc(description: "ProductAttributeFilterInput
category_id: FilterEqualTypeInput @doc(description: "Filter product by category id")
}
+input CategoryFilterInput @doc(description: "CategoryFilterInput defines the filters to be used in the search. A filter contains at least one attribute, a comparison operator, and the value that is being searched for.")
+{
+ ids: FilterEqualTypeInput @doc(description: "Filter by category ID that uniquely identifies the category.")
+ url_key: FilterEqualTypeInput @doc(description: "Filter by the part of the URL that identifies the category")
+ name: FilterMatchTypeInput @doc(description: "Filter by the display name of the category.")
+}
+
input ProductFilterInput @doc(description: "ProductFilterInput is deprecated, use @ProductAttributeFilterInput instead. ProductFilterInput defines the filters to be used in the search. A filter contains at least one attribute, a comparison operator, and the value that is being searched for.") {
name: FilterTypeInput @doc(description: "The product name. Customers use this name to identify the product.")
sku: FilterTypeInput @doc(description: "A number or code assigned to a product to identify the product, options, price, and manufacturer.")
diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
index 428c61c7fec0f..5baa4b4274be5 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
@@ -484,7 +484,9 @@ protected function initTypeModels()
}
if ($model->isSuitable()) {
$this->_productTypeModels[$productTypeName] = $model;
+ // phpcs:ignore Magento2.Performance.ForeachArrayMerge
$this->_disabledAttrs = array_merge($this->_disabledAttrs, $model->getDisabledAttrs());
+ // phpcs:ignore Magento2.Performance.ForeachArrayMerge
$this->_indexValueAttributes = array_merge(
$this->_indexValueAttributes,
$model->getIndexValueAttributes()
@@ -526,7 +528,7 @@ protected function getMediaGallery(array $productIds)
if (empty($productIds)) {
return [];
}
-
+
$productEntityJoinField = $this->getProductEntityLinkField();
$select = $this->_connection->select()->from(
@@ -710,6 +712,21 @@ public function _getHeaderColumns()
return $this->_customHeadersMapping($this->rowCustomizer->addHeaderColumns($this->_headerColumns));
}
+ /**
+ * Return non-system attributes
+
+ * @return array
+ */
+ private function getNonSystemAttributes(): array
+ {
+ $attrKeys = [];
+ foreach ($this->filterAttributeCollection($this->getAttributeCollection()) as $attribute) {
+ $attrKeys[] = $attribute->getAttributeCode();
+ }
+
+ return array_diff($this->_getExportMainAttrCodes(), $this->_customHeadersMapping($attrKeys));
+ }
+
/**
* Set headers columns
*
@@ -722,6 +739,18 @@ public function _getHeaderColumns()
*/
protected function setHeaderColumns($customOptionsData, $stockItemRows)
{
+ $exportAttributes = (
+ array_key_exists("skip_attr", $this->_parameters) && count($this->_parameters["skip_attr"])
+ ) ?
+ array_intersect(
+ $this->_getExportMainAttrCodes(),
+ array_merge(
+ $this->_customHeadersMapping($this->_getExportAttrCodes()),
+ $this->getNonSystemAttributes()
+ )
+ ) :
+ $this->_getExportMainAttrCodes();
+
if (!$this->_headerColumns) {
$this->_headerColumns = array_merge(
[
@@ -732,7 +761,7 @@ protected function setHeaderColumns($customOptionsData, $stockItemRows)
self::COL_CATEGORY,
self::COL_PRODUCT_WEBSITES,
],
- $this->_getExportMainAttrCodes(),
+ $exportAttributes,
[self::COL_ADDITIONAL_ATTRIBUTES],
reset($stockItemRows) ? array_keys(end($stockItemRows)) : [],
[
@@ -923,6 +952,7 @@ protected function getExportData()
foreach ($rawData as $productId => $productData) {
foreach ($productData as $storeId => $dataRow) {
if ($storeId == Store::DEFAULT_STORE_ID && isset($stockItemRows[$productId])) {
+ // phpcs:ignore Magento2.Performance.ForeachArrayMerge
$dataRow = array_merge($dataRow, $stockItemRows[$productId]);
}
$this->appendMultirowData($dataRow, $multirawData);
@@ -1330,7 +1360,7 @@ private function appendMultirowData(&$dataRow, $multiRawData)
$dataRow[self::COL_SKU] = $sku;
$dataRow[self::COL_ATTR_SET] = $attributeSet;
$dataRow[self::COL_TYPE] = $type;
-
+
return $dataRow;
}
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 4ff995c2a872c..1ae993ed99060 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -141,7 +141,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
const COL_PRODUCT_WEBSITES = '_product_websites';
/**
- * Media gallery attribute code.
+ * Attribute code for media gallery.
*/
const MEDIA_GALLERY_ATTRIBUTE_CODE = 'media_gallery';
@@ -151,12 +151,12 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
const COL_MEDIA_IMAGE = '_media_image';
/**
- * Inventory use config.
+ * Inventory use config label.
*/
const INVENTORY_USE_CONFIG = 'Use Config';
/**
- * Inventory use config prefix.
+ * Prefix for inventory use config.
*/
const INVENTORY_USE_CONFIG_PREFIX = 'use_config_';
@@ -1886,6 +1886,7 @@ protected function _saveProducts()
return $this;
}
+ //phpcs:enable Generic.Metrics.NestingLevel
/**
* Prepare array with image states (visible or hidden from product page)
@@ -2736,8 +2737,6 @@ protected function _saveValidatedBunches()
try {
$rowData = $source->current();
} catch (\InvalidArgumentException $e) {
- $this->addRowError($e->getMessage(), $this->_processedRowsCount);
- $this->_processedRowsCount++;
$source->next();
continue;
}
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
index 3b6caef66ce6c..d87c3d8477556 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
@@ -13,6 +13,7 @@
/**
* Import entity abstract product type model
*
+ * phpcs:disable Magento2.Classes.AbstractApi
* @api
*
* @SuppressWarnings(PHPMD.TooManyFields)
@@ -543,7 +544,7 @@ public function prepareAttributesWithDefaultValueForSave(array $rowData, $withDe
} else {
$resultAttrs[$attrCode] = $rowData[$attrCode];
}
- } elseif (array_key_exists($attrCode, $rowData) && empty($rowData['_store'])) {
+ } elseif (array_key_exists($attrCode, $rowData)) {
$resultAttrs[$attrCode] = $rowData[$attrCode];
} elseif ($withDefaultValue && null !== $attrParams['default_value'] && empty($rowData['_store'])) {
$resultAttrs[$attrCode] = $attrParams['default_value'];
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/AbstractTypeTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/AbstractTypeTest.php
index bd2fe896b8c0a..371d75bc922f3 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/AbstractTypeTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/AbstractTypeTest.php
@@ -72,7 +72,9 @@ protected function setUp()
'setAttributeSetFilter'
]
);
- $attribute = $this->createPartialMock(\Magento\Eav\Model\Entity\Attribute::class, [
+ $attribute = $this->createPartialMock(
+ \Magento\Eav\Model\Entity\Attribute::class,
+ [
'getAttributeCode',
'getId',
'getIsVisible',
@@ -85,7 +87,8 @@ protected function setUp()
'getDefaultValue',
'usesSource',
'getFrontendInput',
- ]);
+ ]
+ );
$attribute->expects($this->any())->method('getIsVisible')->willReturn(true);
$attribute->expects($this->any())->method('getIsGlobal')->willReturn(true);
$attribute->expects($this->any())->method('getIsRequired')->willReturn(true);
@@ -107,6 +110,7 @@ protected function setUp()
];
$attribute1 = clone $attribute;
$attribute2 = clone $attribute;
+ $attribute3 = clone $attribute;
$attribute1->expects($this->any())->method('getId')->willReturn('1');
$attribute1->expects($this->any())->method('getAttributeCode')->willReturn('attr_code');
@@ -118,6 +122,11 @@ protected function setUp()
$attribute2->expects($this->any())->method('getFrontendInput')->willReturn('boolean');
$attribute2->expects($this->any())->method('isStatic')->willReturn(false);
+ $attribute3->expects($this->any())->method('getId')->willReturn('3');
+ $attribute3->expects($this->any())->method('getAttributeCode')->willReturn('text_attribute');
+ $attribute3->expects($this->any())->method('getFrontendInput')->willReturn('text');
+ $attribute3->expects($this->any())->method('isStatic')->willReturn(false);
+
$this->entityModel->expects($this->any())->method('getEntityTypeId')->willReturn(3);
$this->entityModel->expects($this->any())->method('getAttributeOptions')->willReturnOnConsecutiveCalls(
['option1', 'option2'],
@@ -126,7 +135,9 @@ protected function setUp()
$attrSetColFactory->expects($this->any())->method('create')->willReturn($attrSetCollection);
$attrSetCollection->expects($this->any())->method('setEntityTypeFilter')->willReturn([$attributeSet]);
$attrColFactory->expects($this->any())->method('create')->willReturn($attrCollection);
- $attrCollection->expects($this->any())->method('setAttributeSetFilter')->willReturn([$attribute1, $attribute2]);
+ $attrCollection->expects($this->any())
+ ->method('setAttributeSetFilter')
+ ->willReturn([$attribute1, $attribute2, $attribute3]);
$attributeSet->expects($this->any())->method('getId')->willReturn(1);
$attributeSet->expects($this->any())->method('getAttributeSetName')->willReturn('attribute_set_name');
@@ -157,9 +168,11 @@ protected function setUp()
],
]
)
- ->willReturn([$attribute1, $attribute2]);
+ ->willReturn([$attribute1, $attribute2, $attribute3]);
- $this->connection = $this->createPartialMock(\Magento\Framework\DB\Adapter\Pdo\Mysql::class, [
+ $this->connection = $this->createPartialMock(
+ \Magento\Framework\DB\Adapter\Pdo\Mysql::class,
+ [
'select',
'fetchAll',
'fetchPairs',
@@ -167,13 +180,17 @@ protected function setUp()
'insertOnDuplicate',
'delete',
'quoteInto'
- ]);
- $this->select = $this->createPartialMock(\Magento\Framework\DB\Select::class, [
+ ]
+ );
+ $this->select = $this->createPartialMock(
+ \Magento\Framework\DB\Select::class,
+ [
'from',
'where',
'joinLeft',
'getConnection',
- ]);
+ ]
+ );
$this->select->expects($this->any())->method('from')->will($this->returnSelf());
$this->select->expects($this->any())->method('where')->will($this->returnSelf());
$this->select->expects($this->any())->method('joinLeft')->will($this->returnSelf());
@@ -189,10 +206,13 @@ protected function setUp()
->method('fetchAll')
->will($this->returnValue($entityAttributes));
- $this->resource = $this->createPartialMock(\Magento\Framework\App\ResourceConnection::class, [
+ $this->resource = $this->createPartialMock(
+ \Magento\Framework\App\ResourceConnection::class,
+ [
'getConnection',
'getTableName',
- ]);
+ ]
+ );
$this->resource->expects($this->any())->method('getConnection')->will(
$this->returnValue($this->connection)
);
@@ -257,9 +277,13 @@ public function testIsRowValidSuccess()
$rowNum = 1;
$this->entityModel->expects($this->any())->method('getRowScope')->willReturn(null);
$this->entityModel->expects($this->never())->method('addRowError');
- $this->setPropertyValue($this->simpleType, '_attributes', [
- $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET] => [],
- ]);
+ $this->setPropertyValue(
+ $this->simpleType,
+ '_attributes',
+ [
+ $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET] => [],
+ ]
+ );
$this->assertTrue($this->simpleType->isRowValid($rowData, $rowNum));
}
@@ -278,13 +302,17 @@ public function testIsRowValidError()
'attr_code'
)
->willReturnSelf();
- $this->setPropertyValue($this->simpleType, '_attributes', [
- $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET] => [
- 'attr_code' => [
- 'is_required' => true,
+ $this->setPropertyValue(
+ $this->simpleType,
+ '_attributes',
+ [
+ $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET] => [
+ 'attr_code' => [
+ 'is_required' => true,
+ ],
],
- ],
- ]);
+ ]
+ );
$this->assertFalse($this->simpleType->isRowValid($rowData, $rowNum));
}
@@ -364,9 +392,14 @@ public function testPrepareAttributesWithDefaultValueForSave()
{
$rowData = [
'_attribute_set' => 'attributeSetName',
- 'boolean_attribute' => 'Yes'
+ 'boolean_attribute' => 'Yes',
+ ];
+
+ $expected = [
+ 'boolean_attribute' => 1,
+ 'text_attribute' => 'default_value'
];
$result = $this->simpleType->prepareAttributesWithDefaultValueForSave($rowData);
- $this->assertEquals(['boolean_attribute' => 1], $result);
+ $this->assertEquals($expected, $result);
}
}
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/ProductPriceIndexFilter.php b/app/code/Magento/CatalogInventory/Model/Indexer/ProductPriceIndexFilter.php
index f9a49d4f8d121..35231b8460b19 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/ProductPriceIndexFilter.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/ProductPriceIndexFilter.php
@@ -104,6 +104,10 @@ public function modifyPrice(IndexTableStructure $priceTable, array $entityIds =
$select->where('stock_item.use_config_manage_stock = 0 AND stock_item.manage_stock = 1');
}
+ if (!empty($entityIds)) {
+ $select->where('stock_item.product_id in (?)', $entityIds);
+ }
+
$select->group('stock_item.product_id');
$select->having('max_is_in_stock = 0');
diff --git a/app/code/Magento/CatalogInventory/Setup/Patch/Schema/ChangeTmpTablesEngine.php b/app/code/Magento/CatalogInventory/Setup/Patch/Schema/ChangeTmpTablesEngine.php
deleted file mode 100644
index 7f43cd279d4e3..0000000000000
--- a/app/code/Magento/CatalogInventory/Setup/Patch/Schema/ChangeTmpTablesEngine.php
+++ /dev/null
@@ -1,61 +0,0 @@
-schemaSetup = $schemaSetup;
- }
-
- /**
- * @inheritdoc
- */
- public function apply()
- {
- $this->schemaSetup->startSetup();
-
- $tableName = $this->schemaSetup->getTable('cataloginventory_stock_status_tmp');
- if ($this->schemaSetup->getConnection()->isTableExists($tableName)) {
- $this->schemaSetup->getConnection()->changeTableEngine($tableName, 'InnoDB');
- }
-
- $this->schemaSetup->endSetup();
- }
-
- /**
- * @inheritdoc
- */
- public static function getDependencies()
- {
- return [];
- }
-
- /**
- * @inheritdoc
- */
- public function getAliases()
- {
- return [];
- }
-}
diff --git a/app/code/Magento/CatalogInventory/Test/Mftf/ActionGroup/AdminAssertDisabledQtyActionGroup.xml b/app/code/Magento/CatalogInventory/Test/Mftf/ActionGroup/AdminAssertDisabledQtyActionGroup.xml
new file mode 100644
index 0000000000000..27c4a93577a07
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Test/Mftf/ActionGroup/AdminAssertDisabledQtyActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ Goes to the 'Quantity' field and assert disabled attribute.
+
+
+
+
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/ProductPriceIndexFilterTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/ProductPriceIndexFilterTest.php
new file mode 100644
index 0000000000000..46f4e0f26f378
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/ProductPriceIndexFilterTest.php
@@ -0,0 +1,121 @@
+stockConfiguration = $this->createMock(StockConfigurationInterface::class);
+ $this->item = $this->createMock(Item::class);
+ $this->resourceCnnection = $this->createMock(ResourceConnection::class);
+ $this->generator = $this->createMock(Generator::class);
+
+ $this->productPriceIndexFilter = new ProductPriceIndexFilter(
+ $this->stockConfiguration,
+ $this->item,
+ $this->resourceCnnection,
+ 'indexer',
+ $this->generator,
+ 100
+ );
+ }
+
+ /**
+ * Test to ensure that Modify Price method uses entityIds,
+ */
+ public function testModifyPrice()
+ {
+ $entityIds = [1, 2, 3];
+ $indexTableStructure = $this->createMock(IndexTableStructure::class);
+ $connectionMock = $this->createMock(\Magento\Framework\DB\Adapter\AdapterInterface::class);
+ $this->resourceCnnection->expects($this->once())->method('getConnection')->willReturn($connectionMock);
+ $selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
+ $connectionMock->expects($this->once())->method('select')->willReturn($selectMock);
+ $selectMock->expects($this->at(2))
+ ->method('where')
+ ->with('stock_item.product_id in (?)', $entityIds)
+ ->willReturn($selectMock);
+ $this->generator->expects($this->once())
+ ->method('generate')
+ ->will(
+ $this->returnCallback(
+ $this->getBatchIteratorCallback($selectMock, 5)
+ )
+ );
+
+ $fetchStmtMock = $this->createPartialMock(\Zend_Db_Statement_Pdo::class, ['fetchAll']);
+ $fetchStmtMock->expects($this->any())
+ ->method('fetchAll')
+ ->will($this->returnValue([['product_id' => 1]]));
+ $connectionMock->expects($this->any())->method('query')->will($this->returnValue($fetchStmtMock));
+ $this->productPriceIndexFilter->modifyPrice($indexTableStructure, $entityIds);
+ }
+
+ /**
+ * Returns batches.
+ *
+ * @param MockObject $selectMock
+ * @param int $batchCount
+ * @return \Closure
+ */
+ private function getBatchIteratorCallback(MockObject $selectMock, int $batchCount): \Closure
+ {
+ $iteratorCallback = function () use ($batchCount, $selectMock): array {
+ $result = [];
+ $count = $batchCount;
+ while ($count) {
+ $count--;
+ $result[$count] = $selectMock;
+ }
+
+ return $result;
+ };
+
+ return $iteratorCallback;
+ }
+}
diff --git a/app/code/Magento/CatalogInventory/Ui/DataProvider/Product/Form/Modifier/AdvancedInventory.php b/app/code/Magento/CatalogInventory/Ui/DataProvider/Product/Form/Modifier/AdvancedInventory.php
index da465f5bdd3dc..789befcfec8b7 100644
--- a/app/code/Magento/CatalogInventory/Ui/DataProvider/Product/Form/Modifier/AdvancedInventory.php
+++ b/app/code/Magento/CatalogInventory/Ui/DataProvider/Product/Form/Modifier/AdvancedInventory.php
@@ -1,11 +1,10 @@
meta = $this->arrayManager->merge(
$fieldsetPath . '/children',
$this->meta,
- ['container_quantity_and_stock_status_qty' => $container]
+ ['quantity_and_stock_status_qty' => $container]
);
}
}
diff --git a/app/code/Magento/CatalogInventory/etc/db_schema.xml b/app/code/Magento/CatalogInventory/etc/db_schema.xml
index 5ac7fedc5aa18..b5c4a96f24a94 100644
--- a/app/code/Magento/CatalogInventory/etc/db_schema.xml
+++ b/app/code/Magento/CatalogInventory/etc/db_schema.xml
@@ -9,9 +9,9 @@
xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-
+
-
+
Validates that the provided Catalog Rule, Status, Websites and Customer Group details are present and correct on a Admin Catalog Price Rule creation/edit page.
-
-
+
+
+
+
+
+
@@ -172,6 +177,10 @@
+
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest.xml
index 06392764290ac..ea5c2c33a0a39 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest.xml
@@ -154,6 +154,10 @@
-
-
-
+
-
-
-
-
-
+
-
+
-
-
-
-
-
+
+
-
+
-
+
@@ -91,11 +91,11 @@
@@ -121,9 +121,9 @@
@@ -232,11 +232,11 @@
@@ -263,9 +263,9 @@
description
-
+
-
- catalog_rule
+ - 0
- number
- Status
- true
- is_active
+
+ true
+
+ boolean
+ Active
-
+
-
-
- - 1
- - Active
-
-
- - 0
- - Inactive
-
-
+
+ 0
+ 1
+
+ toggle
-
+
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
index e9fb1070fedd5..3b0c4dfb6df2f 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
@@ -3,6 +3,8 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\CatalogSearch\Model\Layer\Filter;
use Magento\Catalog\Model\Layer\Filter\AbstractFilter;
@@ -12,6 +14,9 @@
*/
class Decimal extends AbstractFilter
{
+ /** Decimal delta for filter */
+ private const DECIMAL_DELTA = 0.001;
+
/**
* @var \Magento\Framework\Pricing\PriceCurrencyInterface
*/
@@ -70,11 +75,17 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
list($from, $to) = explode('-', $filter);
+ // When the range is 10-20 we only need to get products that are in the 10-19.99 range.
+ $toValue = $to;
+ if (!empty($toValue) && $from !== $toValue) {
+ $toValue -= self::DECIMAL_DELTA;
+ }
+
$this->getLayer()
->getProductCollection()
->addFieldToFilter(
$this->getAttributeModel()->getAttributeCode(),
- ['from' => $from, 'to' => $to]
+ ['from' => $from, 'to' => $toValue]
);
$this->getLayer()->getState()->addFilter(
@@ -111,7 +122,7 @@ protected function _getItemsData()
$from = '';
}
if ($to == '*') {
- $to = null;
+ $to = '';
}
$label = $this->renderRangeLabel(empty($from) ? 0 : $from, $to);
$value = $from . '-' . $to;
@@ -138,7 +149,7 @@ protected function _getItemsData()
protected function renderRangeLabel($fromPrice, $toPrice)
{
$formattedFromPrice = $this->priceCurrency->format($fromPrice);
- if ($toPrice === null) {
+ if ($toPrice === '') {
return __('%1 and above', $formattedFromPrice);
} else {
if ($fromPrice != $toPrice) {
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
index a19f53469ae01..66d9281ed38e2 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
@@ -3,6 +3,8 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\CatalogSearch\Model\Layer\Filter;
use Magento\Catalog\Model\Layer\Filter\AbstractFilter;
@@ -11,6 +13,7 @@
* Layer price filter based on Search API
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
*/
class Price extends AbstractFilter
{
@@ -138,7 +141,7 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
list($from, $to) = $filter;
$this->getLayer()->getProductCollection()->addFieldToFilter(
- 'price',
+ $this->getAttributeModel()->getAttributeCode(),
['from' => $from, 'to' => empty($to) || $from == $to ? $to : $to - self::PRICE_DELTA]
);
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
index 595bc12ca956a..edc65490a3c67 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
@@ -393,6 +393,7 @@ private function getSearchResultApplier(SearchResultInterface $searchResult): Se
/** This variable sets by serOrder method, but doesn't have a getter method. */
'orders' => $this->_orders,
'size' => $this->getPageSize(),
+ 'currentPage' => (int)$this->_curPage,
]
);
}
diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php
index 8f8ba39ebd329..5ac252677ff79 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php
@@ -3,6 +3,8 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\CatalogSearch\Model\Search;
use Magento\Catalog\Api\Data\EavAttributeInterface;
@@ -78,6 +80,7 @@ private function generateRequest($attributeType, $container, $useFulltext)
{
$request = [];
foreach ($this->getSearchableAttributes() as $attribute) {
+ /** @var $attribute Attribute */
if ($attribute->getData($attributeType)) {
if (!in_array($attribute->getAttributeCode(), ['price', 'category_ids'], true)) {
$queryName = $attribute->getAttributeCode() . '_query';
@@ -97,12 +100,14 @@ private function generateRequest($attributeType, $container, $useFulltext)
],
];
$bucketName = $attribute->getAttributeCode() . self::BUCKET_SUFFIX;
- $generator = $this->generatorResolver->getGeneratorForType($attribute->getBackendType());
+ $generatorType = $attribute->getFrontendInput() === 'price'
+ ? $attribute->getFrontendInput()
+ : $attribute->getBackendType();
+ $generator = $this->generatorResolver->getGeneratorForType($generatorType);
$request['filters'][$filterName] = $generator->getFilterData($attribute, $filterName);
$request['aggregations'][$bucketName] = $generator->getAggregationData($attribute, $bucketName);
}
}
- /** @var $attribute Attribute */
if (!$attribute->getIsSearchable() || in_array($attribute->getAttributeCode(), ['price'], true)) {
// Some fields have their own specific handlers
continue;
diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/Decimal.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/Decimal.php
index b3d39a48fe9fc..73d011cc532db 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/Decimal.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/Decimal.php
@@ -3,6 +3,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
namespace Magento\CatalogSearch\Model\Search\RequestGenerator;
diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/Price.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/Price.php
new file mode 100644
index 0000000000000..949806d14f45a
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/Price.php
@@ -0,0 +1,46 @@
+ FilterInterface::TYPE_RANGE,
+ 'name' => $filterName,
+ 'field' => $attribute->getAttributeCode(),
+ 'from' => '$' . $attribute->getAttributeCode() . '.from$',
+ 'to' => '$' . $attribute->getAttributeCode() . '.to$',
+ ];
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getAggregationData(Attribute $attribute, $bucketName): array
+ {
+ return [
+ 'type' => BucketInterface::TYPE_DYNAMIC,
+ 'name' => $bucketName,
+ 'field' => $attribute->getAttributeCode(),
+ 'method' => '$price_dynamic_algorithm$',
+ 'metric' => [['type' => 'count']],
+ ];
+ }
+}
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontFillFormAdvancedSearchActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontFillFormAdvancedSearchActionGroup.xml
new file mode 100644
index 0000000000000..1afdb6e5e46fa
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontFillFormAdvancedSearchActionGroup.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml
index 6b28b4f36c6a7..eb3bc8e79d7b5 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml
@@ -17,5 +17,6 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml
index b6417e12a6db7..89269a1ad0d9e 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml
@@ -18,6 +18,7 @@
+
+
+
+
+
+
@@ -242,6 +252,7 @@
@@ -306,6 +317,10 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByAllParametersTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByAllParametersTest.xml
new file mode 100644
index 0000000000000..9ad868ff6db7e
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByAllParametersTest.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByDescriptionTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByDescriptionTest.xml
new file mode 100644
index 0000000000000..5693721e6ed65
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByDescriptionTest.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByNameSkuDescriptionPriceTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByNameSkuDescriptionPriceTest.xml
new file mode 100644
index 0000000000000..4d3ba22f79356
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByNameSkuDescriptionPriceTest.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByNameTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByNameTest.xml
new file mode 100644
index 0000000000000..f0b81e08252fc
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByNameTest.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialNameTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialNameTest.xml
new file mode 100644
index 0000000000000..f875021bd9669
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialNameTest.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialShortDescriptionTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialShortDescriptionTest.xml
new file mode 100644
index 0000000000000..0edc3f31216bb
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialShortDescriptionTest.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialSkuAndDescriptionTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialSkuAndDescriptionTest.xml
new file mode 100644
index 0000000000000..b2b4ef9cc4782
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialSkuAndDescriptionTest.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialSkuTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialSkuTest.xml
new file mode 100644
index 0000000000000..45cec0a899361
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialSkuTest.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPriceFromAndPriceToTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPriceFromAndPriceToTest.xml
new file mode 100644
index 0000000000000..6b85cdf61c84c
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPriceFromAndPriceToTest.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPriceToTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPriceToTest.xml
new file mode 100644
index 0000000000000..755bb92c897ea
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPriceToTest.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByShortDescriptionTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByShortDescriptionTest.xml
new file mode 100644
index 0000000000000..c4622d02a5152
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByShortDescriptionTest.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchBySkuTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchBySkuTest.xml
new file mode 100644
index 0000000000000..ca5e237099681
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchBySkuTest.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchEntitySimpleProductTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchEntitySimpleProductTest.xml
new file mode 100644
index 0000000000000..78110b531be33
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchEntitySimpleProductTest.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchNegativeProductSearchTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchNegativeProductSearchTest.xml
new file mode 100644
index 0000000000000..b4f2314295a00
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchNegativeProductSearchTest.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchWithoutEnteringDataTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchWithoutEnteringDataTest.xml
new file mode 100644
index 0000000000000..8a29ab718bd25
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchWithoutEnteringDataTest.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/PriceTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/PriceTest.php
index abad58a6876d3..f783f75a170e3 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/PriceTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/PriceTest.php
@@ -3,6 +3,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
namespace Magento\CatalogSearch\Test\Unit\Model\Layer\Filter;
@@ -208,6 +209,12 @@ public function testApply()
$priceId = '15-50';
$requestVar = 'test_request_var';
+ $this->target->setAttributeModel($this->attribute);
+ $attributeCode = 'price';
+ $this->attribute->expects($this->any())
+ ->method('getAttributeCode')
+ ->will($this->returnValue($attributeCode));
+
$this->target->setRequestVar($requestVar);
$this->request->expects($this->exactly(1))
->method('getParam')
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Advanced/CollectionTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Advanced/CollectionTest.php
index f5e5a34047aff..10010188c26c9 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Advanced/CollectionTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Advanced/CollectionTest.php
@@ -183,6 +183,7 @@ public function testLike()
'searchResult' => $searchResult,
'orders' => [],
'size' => $pageSize,
+ 'currentPage' => 0,
]
)
->willReturn($searchResultApplier);
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGenerator/DecimalTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGenerator/DecimalTest.php
index 8157c1fa8fa82..350344372612a 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGenerator/DecimalTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGenerator/DecimalTest.php
@@ -3,6 +3,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
namespace Magento\CatalogSearch\Test\Unit\Model\Search\RequestGenerator;
@@ -11,6 +12,9 @@
use Magento\Framework\Search\Request\BucketInterface;
use Magento\Framework\Search\Request\FilterInterface;
+/**
+ * Test catalog search range request generator.
+ */
class DecimalTest extends \PHPUnit\Framework\TestCase
{
/** @var Decimal */
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGenerator/PriceTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGenerator/PriceTest.php
new file mode 100644
index 0000000000000..3635430197591
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGenerator/PriceTest.php
@@ -0,0 +1,82 @@
+attribute = $this->getMockBuilder(Attribute::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getAttributeCode'])
+ ->getMockForAbstractClass();
+ $this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class)
+ ->setMethods(['getValue'])
+ ->getMockForAbstractClass();
+ $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $this->price = $objectManager->getObject(
+ Price::class,
+ ['scopeConfig' => $this->scopeConfigMock]
+ );
+ }
+
+ public function testGetFilterData()
+ {
+ $filterName = 'test_filter_name';
+ $attributeCode = 'test_attribute_code';
+ $expected = [
+ 'type' => FilterInterface::TYPE_RANGE,
+ 'name' => $filterName,
+ 'field' => $attributeCode,
+ 'from' => '$' . $attributeCode . '.from$',
+ 'to' => '$' . $attributeCode . '.to$',
+ ];
+ $this->attribute->expects($this->atLeastOnce())
+ ->method('getAttributeCode')
+ ->willReturn($attributeCode);
+ $actual = $this->price->getFilterData($this->attribute, $filterName);
+ $this->assertEquals($expected, $actual);
+ }
+
+ public function testGetAggregationData()
+ {
+ $bucketName = 'test_bucket_name';
+ $attributeCode = 'test_attribute_code';
+ $method = 'price_dynamic_algorithm';
+ $expected = [
+ 'type' => BucketInterface::TYPE_DYNAMIC,
+ 'name' => $bucketName,
+ 'field' => $attributeCode,
+ 'method' => '$'. $method . '$',
+ 'metric' => [['type' => 'count']],
+ ];
+ $this->attribute->expects($this->atLeastOnce())
+ ->method('getAttributeCode')
+ ->willReturn($attributeCode);
+ $actual = $this->price->getAggregationData($this->attribute, $bucketName);
+ $this->assertEquals($expected, $actual);
+ }
+}
diff --git a/app/code/Magento/CatalogSearch/etc/di.xml b/app/code/Magento/CatalogSearch/etc/di.xml
index 28d5035308dee..da0a60dad1f77 100644
--- a/app/code/Magento/CatalogSearch/etc/di.xml
+++ b/app/code/Magento/CatalogSearch/etc/di.xml
@@ -281,6 +281,7 @@
\Magento\CatalogSearch\Model\Search\RequestGenerator\General
- Magento\CatalogSearch\Model\Search\RequestGenerator\Decimal
+ - Magento\CatalogSearch\Model\Search\RequestGenerator\Price
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php b/app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php
index edca633fb14cc..d9e9705ac039d 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php
@@ -148,7 +148,7 @@ private function getCategoryUrlSuffix($storeId = null): string
CategoryUrlPathGenerator::XML_PATH_CATEGORY_URL_SUFFIX,
ScopeInterface::SCOPE_STORE,
$storeId
- );
+ ) ?? '';
}
/**
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
index 704b60a8aaf2a..b1dfa79373a05 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
@@ -23,7 +23,6 @@
use Magento\Framework\Event\Observer;
use Magento\Framework\Event\ObserverInterface;
use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Exception\NoSuchEntityException;
use Magento\ImportExport\Model\Import as ImportExport;
use Magento\Store\Model\Store;
use Magento\Store\Model\StoreManagerInterface;
@@ -252,7 +251,7 @@ public function execute(Observer $observer)
* @throws LocalizedException
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
- protected function _populateForUrlGeneration($rowData)
+ private function _populateForUrlGeneration($rowData)
{
$newSku = $this->import->getNewSku($rowData[ImportProduct::COL_SKU]);
$oldSku = $this->import->getOldSku();
@@ -321,7 +320,7 @@ private function isNeedToPopulateForUrlGeneration($rowData, $newSku, $oldSku): b
* @param array $rowData
* @return void
*/
- protected function setStoreToProduct(Product $product, array $rowData)
+ private function setStoreToProduct(Product $product, array $rowData)
{
if (!empty($rowData[ImportProduct::COL_STORE])
&& ($storeId = $this->import->getStoreIdByCode($rowData[ImportProduct::COL_STORE]))
@@ -339,7 +338,7 @@ protected function setStoreToProduct(Product $product, array $rowData)
* @param string $storeId
* @return $this
*/
- protected function addProductToImport($product, $storeId)
+ private function addProductToImport($product, $storeId)
{
if ($product->getVisibility() == (string)Visibility::getOptionArray()[Visibility::VISIBILITY_NOT_VISIBLE]) {
return $this;
@@ -357,7 +356,7 @@ protected function addProductToImport($product, $storeId)
* @param Product $product
* @return $this
*/
- protected function populateGlobalProduct($product)
+ private function populateGlobalProduct($product)
{
foreach ($this->import->getProductWebsites($product->getSku()) as $websiteId) {
foreach ($this->websitesToStoreIds[$websiteId] as $storeId) {
@@ -376,7 +375,7 @@ protected function populateGlobalProduct($product)
* @return UrlRewrite[]
* @throws LocalizedException
*/
- protected function generateUrls()
+ private function generateUrls()
{
$mergeDataProvider = clone $this->mergeDataProviderPrototype;
$mergeDataProvider->merge($this->canonicalUrlRewriteGenerate());
@@ -398,7 +397,7 @@ protected function generateUrls()
* @param int|null $storeId
* @return bool
*/
- protected function isGlobalScope($storeId)
+ private function isGlobalScope($storeId)
{
return null === $storeId || $storeId == Store::DEFAULT_STORE_ID;
}
@@ -408,7 +407,7 @@ protected function isGlobalScope($storeId)
*
* @return UrlRewrite[]
*/
- protected function canonicalUrlRewriteGenerate()
+ private function canonicalUrlRewriteGenerate()
{
$urls = [];
foreach ($this->products as $productId => $productsByStores) {
@@ -433,7 +432,7 @@ protected function canonicalUrlRewriteGenerate()
* @return UrlRewrite[]
* @throws LocalizedException
*/
- protected function categoriesUrlRewriteGenerate()
+ private function categoriesUrlRewriteGenerate(): array
{
$urls = [];
foreach ($this->products as $productId => $productsByStores) {
@@ -444,17 +443,24 @@ protected function categoriesUrlRewriteGenerate()
continue;
}
$requestPath = $this->productUrlPathGenerator->getUrlPathWithSuffix($product, $storeId, $category);
- $urls[] = $this->urlRewriteFactory->create()
- ->setEntityType(ProductUrlRewriteGenerator::ENTITY_TYPE)
- ->setEntityId($productId)
- ->setRequestPath($requestPath)
- ->setTargetPath($this->productUrlPathGenerator->getCanonicalUrlPath($product, $category))
- ->setStoreId($storeId)
- ->setMetadata(['category_id' => $category->getId()]);
+ $urls[] = [
+ $this->urlRewriteFactory->create()
+ ->setEntityType(ProductUrlRewriteGenerator::ENTITY_TYPE)
+ ->setEntityId($productId)
+ ->setRequestPath($requestPath)
+ ->setTargetPath($this->productUrlPathGenerator->getCanonicalUrlPath($product, $category))
+ ->setStoreId($storeId)
+ ->setMetadata(['category_id' => $category->getId()])
+ ];
+ $parentCategoryIds = $category->getAnchorsAbove();
+ if ($parentCategoryIds) {
+ $urls[] = $this->getParentCategoriesUrlRewrites($parentCategoryIds, $storeId, $product);
+ }
}
}
}
- return $urls;
+ $result = !empty($urls) ? array_merge(...$urls) : [];
+ return $result;
}
/**
@@ -462,7 +468,7 @@ protected function categoriesUrlRewriteGenerate()
*
* @return UrlRewrite[]
*/
- protected function currentUrlRewritesRegenerate()
+ private function currentUrlRewritesRegenerate()
{
$currentUrlRewrites = $this->urlFinder->findAllByData(
[
@@ -496,7 +502,7 @@ protected function currentUrlRewritesRegenerate()
* @param Category $category
* @return array
*/
- protected function generateForAutogenerated($url, $category)
+ private function generateForAutogenerated($url, $category)
{
$storeId = $url->getStoreId();
$productId = $url->getEntityId();
@@ -532,7 +538,7 @@ protected function generateForAutogenerated($url, $category)
* @param Category $category
* @return array
*/
- protected function generateForCustom($url, $category)
+ private function generateForCustom($url, $category)
{
$storeId = $url->getStoreId();
$productId = $url->getEntityId();
@@ -566,7 +572,7 @@ protected function generateForCustom($url, $category)
* @param UrlRewrite $url
* @return Category|null|bool
*/
- protected function retrieveCategoryFromMetadata($url)
+ private function retrieveCategoryFromMetadata($url)
{
$metadata = $url->getMetadata();
if (isset($metadata['category_id'])) {
@@ -576,32 +582,6 @@ protected function retrieveCategoryFromMetadata($url)
return null;
}
- /**
- * Check, category suited for url-rewrite generation.
- *
- * @param Category $category
- * @param int $storeId
- * @return bool
- * @throws NoSuchEntityException
- */
- protected function isCategoryProperForGenerating($category, $storeId)
- {
- if (isset($this->acceptableCategories[$storeId]) &&
- isset($this->acceptableCategories[$storeId][$category->getId()])) {
- return $this->acceptableCategories[$storeId][$category->getId()];
- }
- $acceptable = false;
- if ($category->getParentId() != Category::TREE_ROOT_ID) {
- list(, $rootCategoryId) = $category->getParentIds();
- $acceptable = ($rootCategoryId == $this->storeManager->getStore($storeId)->getRootCategoryId());
- }
- if (!isset($this->acceptableCategories[$storeId])) {
- $this->acceptableCategories[$storeId] = [];
- }
- $this->acceptableCategories[$storeId][$category->getId()] = $acceptable;
- return $acceptable;
- }
-
/**
* Get category by id considering store scope.
*
@@ -635,4 +615,36 @@ private function isCategoryRewritesEnabled()
{
return (bool)$this->scopeConfig->getValue('catalog/seo/generate_category_product_rewrites');
}
+
+ /**
+ * Generate url-rewrite for anchor parent-categories.
+ *
+ * @param array $categoryIds
+ * @param int $storeId
+ * @param Product $product
+ * @return array
+ * @throws LocalizedException
+ */
+ private function getParentCategoriesUrlRewrites(array $categoryIds, int $storeId, Product $product): array
+ {
+ $urls = [];
+ foreach ($categoryIds as $categoryId) {
+ $category = $this->getCategoryById($categoryId, $storeId);
+ if ($category->getParentId() == Category::TREE_ROOT_ID) {
+ continue;
+ }
+ $requestPath = $this->productUrlPathGenerator
+ ->getUrlPathWithSuffix($product, $storeId, $category);
+ $targetPath = $this->productUrlPathGenerator
+ ->getCanonicalUrlPath($product, $category);
+ $urls[] = $this->urlRewriteFactory->create()
+ ->setEntityType(ProductUrlRewriteGenerator::ENTITY_TYPE)
+ ->setEntityId($product->getId())
+ ->setRequestPath($requestPath)
+ ->setTargetPath($targetPath)
+ ->setStoreId($storeId)
+ ->setMetadata(['category_id' => $category->getId()]);
+ }
+ return $urls;
+ }
}
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php
index 7f987124040fd..54ef7102fcc47 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php
@@ -3,6 +3,8 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\CatalogUrlRewrite\Observer;
use Magento\Catalog\Model\Category;
@@ -18,6 +20,14 @@
*/
class CategoryUrlPathAutogeneratorObserver implements ObserverInterface
{
+
+ /**
+ * Reserved endpoint names.
+ *
+ * @var string[]
+ */
+ private $invalidValues = [];
+
/**
* @var \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator
*/
@@ -38,22 +48,34 @@ class CategoryUrlPathAutogeneratorObserver implements ObserverInterface
*/
private $categoryRepository;
+ /**
+ * @var \Magento\Backend\App\Area\FrontNameResolver
+ */
+ private $frontNameResolver;
+
/**
* @param CategoryUrlPathGenerator $categoryUrlPathGenerator
* @param ChildrenCategoriesProvider $childrenCategoriesProvider
* @param \Magento\CatalogUrlRewrite\Service\V1\StoreViewService $storeViewService
* @param CategoryRepositoryInterface $categoryRepository
+ * @param \Magento\Backend\App\Area\FrontNameResolver $frontNameResolver
+ * @param string[] $invalidValues
*/
public function __construct(
CategoryUrlPathGenerator $categoryUrlPathGenerator,
ChildrenCategoriesProvider $childrenCategoriesProvider,
StoreViewService $storeViewService,
- CategoryRepositoryInterface $categoryRepository
+ CategoryRepositoryInterface $categoryRepository,
+ \Magento\Backend\App\Area\FrontNameResolver $frontNameResolver = null,
+ array $invalidValues = []
) {
$this->categoryUrlPathGenerator = $categoryUrlPathGenerator;
$this->childrenCategoriesProvider = $childrenCategoriesProvider;
$this->storeViewService = $storeViewService;
$this->categoryRepository = $categoryRepository;
+ $this->frontNameResolver = $frontNameResolver ?: \Magento\Framework\App\ObjectManager::getInstance()
+ ->get(\Magento\Backend\App\Area\FrontNameResolver::class);
+ $this->invalidValues = $invalidValues;
}
/**
@@ -93,6 +115,17 @@ private function updateUrlKey($category, $urlKey)
if (empty($urlKey)) {
throw new \Magento\Framework\Exception\LocalizedException(__('Invalid URL key'));
}
+
+ if (in_array($urlKey, $this->getInvalidValues())) {
+ throw new \Magento\Framework\Exception\LocalizedException(
+ __(
+ 'URL key "%1" matches a reserved endpoint name (%2). Use another URL key.',
+ $urlKey,
+ implode(', ', $this->getInvalidValues())
+ )
+ );
+ }
+
$category->setUrlKey($urlKey)
->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
if (!$category->isObjectNew()) {
@@ -103,6 +136,16 @@ private function updateUrlKey($category, $urlKey)
}
}
+ /**
+ * Get reserved endpoint names.
+ *
+ * @return array
+ */
+ private function getInvalidValues()
+ {
+ return array_unique(array_merge($this->invalidValues, [$this->frontNameResolver->getFrontName()]));
+ }
+
/**
* Update url path for children category.
*
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Data/AdminCategoryRestrictedUrlMessageData.xml b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Data/AdminCategoryRestrictedUrlMessageData.xml
new file mode 100644
index 0000000000000..b463b0524d5ff
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Data/AdminCategoryRestrictedUrlMessageData.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+ URL key "admin" matches a reserved endpoint name (admin, soap, rest, graphql, standard). Use another URL key.
+ URL key "soap" matches a reserved endpoint name (admin, soap, rest, graphql, standard). Use another URL key.
+ URL key "rest" matches a reserved endpoint name (admin, soap, rest, graphql, standard). Use another URL key.
+ URL key "graphql" matches a reserved endpoint name (admin, soap, rest, graphql, standard). Use another URL key.
+
+
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminCategoryWithRestrictedUrlKeyNotCreatedTest.xml b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminCategoryWithRestrictedUrlKeyNotCreatedTest.xml
new file mode 100644
index 0000000000000..6538ec6e935df
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminCategoryWithRestrictedUrlKeyNotCreatedTest.xml
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/AfterImportDataObserverTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/AfterImportDataObserverTest.php
index 3984d949332d3..94fe6ae8c54dc 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/AfterImportDataObserverTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/AfterImportDataObserverTest.php
@@ -153,24 +153,32 @@ class AfterImportDataObserverTest extends \PHPUnit\Framework\TestCase
*/
protected function setUp()
{
- $this->importProduct = $this->createPartialMock(\Magento\CatalogImportExport\Model\Import\Product::class, [
+ $this->importProduct = $this->createPartialMock(
+ \Magento\CatalogImportExport\Model\Import\Product::class,
+ [
'getNewSku',
'getProductCategories',
'getProductWebsites',
'getStoreIdByCode',
'getCategoryProcessor',
- ]);
- $this->catalogProductFactory = $this->createPartialMock(\Magento\Catalog\Model\ProductFactory::class, [
+ ]
+ );
+ $this->catalogProductFactory = $this->createPartialMock(
+ \Magento\Catalog\Model\ProductFactory::class,
+ [
'create',
- ]);
+ ]
+ );
$this->storeManager = $this
->getMockBuilder(
\Magento\Store\Model\StoreManagerInterface::class
)
->disableOriginalConstructor()
- ->setMethods([
- 'getWebsite',
- ])
+ ->setMethods(
+ [
+ 'getWebsite',
+ ]
+ )
->getMockForAbstractClass();
$this->event = $this->createPartialMock(\Magento\Framework\Event::class, ['getAdapter', 'getBunch']);
$this->event->expects($this->any())->method('getAdapter')->willReturn($this->importProduct);
@@ -202,9 +210,11 @@ protected function setUp()
);
$this->urlFinder = $this
->getMockBuilder(\Magento\UrlRewrite\Model\UrlFinderInterface::class)
- ->setMethods([
- 'findAllByData',
- ])
+ ->setMethods(
+ [
+ 'findAllByData',
+ ]
+ )
->disableOriginalConstructor()
->getMockForAbstractClass();
@@ -269,9 +279,12 @@ public function testAfterImportData()
$newSku = [['entity_id' => 'value'], ['entity_id' => 'value3']];
$websiteId = 'websiteId value';
$productsCount = count($this->products);
- $websiteMock = $this->createPartialMock(\Magento\Store\Model\Website::class, [
+ $websiteMock = $this->createPartialMock(
+ \Magento\Store\Model\Website::class,
+ [
'getStoreIds',
- ]);
+ ]
+ );
$storeIds = [1, Store::DEFAULT_STORE_ID];
$websiteMock
->expects($this->once())
@@ -315,13 +328,16 @@ public function testAfterImportData()
->expects($this->exactly(1))
->method('getStoreIdByCode')
->will($this->returnValueMap($map));
- $product = $this->createPartialMock(\Magento\Catalog\Model\Product::class, [
+ $product = $this->createPartialMock(
+ \Magento\Catalog\Model\Product::class,
+ [
'getId',
'setId',
'getSku',
'setStoreId',
'getStoreId',
- ]);
+ ]
+ );
$product
->expects($this->exactly($productsCount))
->method('setId')
@@ -341,17 +357,21 @@ public function testAfterImportData()
$product
->expects($this->exactly($productsCount))
->method('getSku')
- ->will($this->onConsecutiveCalls(
- $this->products[0]['sku'],
- $this->products[1]['sku']
- ));
+ ->will(
+ $this->onConsecutiveCalls(
+ $this->products[0]['sku'],
+ $this->products[1]['sku']
+ )
+ );
$product
->expects($this->exactly($productsCount))
->method('getStoreId')
- ->will($this->onConsecutiveCalls(
- $this->products[0][ImportProduct::COL_STORE],
- $this->products[1][ImportProduct::COL_STORE]
- ));
+ ->will(
+ $this->onConsecutiveCalls(
+ $this->products[0][ImportProduct::COL_STORE],
+ $this->products[1][ImportProduct::COL_STORE]
+ )
+ );
$product
->expects($this->exactly($productsCount))
->method('setStoreId')
@@ -540,7 +560,10 @@ public function testCategoriesUrlRewriteGenerate()
->expects($this->any())
->method('getId')
->will($this->returnValue($this->categoryId));
-
+ $category
+ ->expects($this->any())
+ ->method('getAnchorsAbove')
+ ->willReturn([]);
$categoryCollection = $this->getMockBuilder(CategoryCollection::class)
->disableOriginalConstructor()
->getMock();
diff --git a/app/code/Magento/CatalogUrlRewrite/etc/di.xml b/app/code/Magento/CatalogUrlRewrite/etc/di.xml
index e6fbcaefd0768..2a74b5cd92b28 100644
--- a/app/code/Magento/CatalogUrlRewrite/etc/di.xml
+++ b/app/code/Magento/CatalogUrlRewrite/etc/di.xml
@@ -45,4 +45,15 @@
+
+
+
+ - admin
+ - soap
+ - rest
+ - graphql
+ - standard
+
+
+
diff --git a/app/code/Magento/CatalogUrlRewrite/i18n/en_US.csv b/app/code/Magento/CatalogUrlRewrite/i18n/en_US.csv
index b3335dc3523ca..0f21e8ddf9fc9 100644
--- a/app/code/Magento/CatalogUrlRewrite/i18n/en_US.csv
+++ b/app/code/Magento/CatalogUrlRewrite/i18n/en_US.csv
@@ -5,4 +5,5 @@
"Product URL Suffix","Product URL Suffix"
"Use Categories Path for Product URLs","Use Categories Path for Product URLs"
"Create Permanent Redirect for URLs if URL Key Changed","Create Permanent Redirect for URLs if URL Key Changed"
-"Generate "category/product" URL Rewrites","Generate "category/product" URL Rewrites"
\ No newline at end of file
+"Generate "category/product" URL Rewrites","Generate "category/product" URL Rewrites"
+"URL key ""%1"" matches a reserved endpoint name (%2). Use another URL key.","URL key ""%1"" matches a reserved endpoint name (%2). Use another URL key."
diff --git a/app/code/Magento/CatalogUrlRewriteGraphQl/Model/Resolver/CategoryUrlSuffix.php b/app/code/Magento/CatalogUrlRewriteGraphQl/Model/Resolver/CategoryUrlSuffix.php
new file mode 100644
index 0000000000000..59708d90c23b7
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewriteGraphQl/Model/Resolver/CategoryUrlSuffix.php
@@ -0,0 +1,82 @@
+scopeConfig = $scopeConfig;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function resolve(
+ Field $field,
+ $context,
+ ResolveInfo $info,
+ array $value = null,
+ array $args = null
+ ): string {
+ /** @var StoreInterface $store */
+ $store = $context->getExtensionAttributes()->getStore();
+ $storeId = (int)$store->getId();
+ return $this->getCategoryUrlSuffix($storeId);
+ }
+
+ /**
+ * Retrieve category url suffix by store
+ *
+ * @param int $storeId
+ * @return string
+ */
+ private function getCategoryUrlSuffix(int $storeId): string
+ {
+ if (!isset($this->categoryUrlSuffix[$storeId])) {
+ $this->categoryUrlSuffix[$storeId] = $this->scopeConfig->getValue(
+ self::$xml_path_category_url_suffix,
+ ScopeInterface::SCOPE_STORE,
+ $storeId
+ );
+ }
+ return $this->categoryUrlSuffix[$storeId];
+ }
+}
diff --git a/app/code/Magento/CatalogUrlRewriteGraphQl/Model/Resolver/ProductUrlSuffix.php b/app/code/Magento/CatalogUrlRewriteGraphQl/Model/Resolver/ProductUrlSuffix.php
new file mode 100644
index 0000000000000..9a0193ba36367
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewriteGraphQl/Model/Resolver/ProductUrlSuffix.php
@@ -0,0 +1,82 @@
+scopeConfig = $scopeConfig;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function resolve(
+ Field $field,
+ $context,
+ ResolveInfo $info,
+ array $value = null,
+ array $args = null
+ ): string {
+ /** @var StoreInterface $store */
+ $store = $context->getExtensionAttributes()->getStore();
+ $storeId = (int)$store->getId();
+ return $this->getProductUrlSuffix($storeId);
+ }
+
+ /**
+ * Retrieve product url suffix by store
+ *
+ * @param int $storeId
+ * @return string
+ */
+ private function getProductUrlSuffix(int $storeId): string
+ {
+ if (!isset($this->productUrlSuffix[$storeId])) {
+ $this->productUrlSuffix[$storeId] = $this->scopeConfig->getValue(
+ self::$xml_path_product_url_suffix,
+ ScopeInterface::SCOPE_STORE,
+ $storeId
+ );
+ }
+ return $this->productUrlSuffix[$storeId];
+ }
+}
diff --git a/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json b/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json
index e276da0cc6fd8..202c573c2ae04 100644
--- a/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json
+++ b/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json
@@ -4,6 +4,7 @@
"type": "magento2-module",
"require": {
"php": "~7.1.3||~7.2.0||~7.3.0",
+ "magento/module-store": "*",
"magento/module-catalog": "*",
"magento/framework": "*"
},
diff --git a/app/code/Magento/CatalogUrlRewriteGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogUrlRewriteGraphQl/etc/schema.graphqls
index 4453674de04dd..82facf6959f3c 100644
--- a/app/code/Magento/CatalogUrlRewriteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CatalogUrlRewriteGraphQl/etc/schema.graphqls
@@ -3,10 +3,15 @@
interface ProductInterface {
url_key: String @doc(description: "The part of the URL that identifies the product")
+ url_suffix: String @doc(description: "The part of the product URL that is appended after the url key") @resolver(class: "Magento\\CatalogUrlRewriteGraphQl\\Model\\Resolver\\ProductUrlSuffix")
url_path: String @deprecated(reason: "Use product's `canonical_url` or url rewrites instead")
url_rewrites: [UrlRewrite] @doc(description: "URL rewrites list") @resolver(class: "Magento\\UrlRewriteGraphQl\\Model\\Resolver\\UrlRewrite")
}
+interface CategoryInterface {
+ url_suffix: String @doc(description: "The part of the category URL that is appended after the url key") @resolver(class: "Magento\\CatalogUrlRewriteGraphQl\\Model\\Resolver\\CategoryUrlSuffix")
+}
+
input ProductFilterInput {
url_key: FilterTypeInput @doc(description: "The part of the URL that identifies the product")
url_path: FilterTypeInput @deprecated(reason: "Use product's `canonical_url` or url rewrites instead")
diff --git a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
index e5fb20a58aea1..a712ae91cbfa9 100644
--- a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
+++ b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
@@ -11,6 +11,7 @@
use Magento\Catalog\Api\Data\ProductInterface;
use Magento\Catalog\Model\ProductCategoryList;
+use Magento\Store\Model\Store;
/**
* Class Product
@@ -106,7 +107,7 @@ function ($attribute) {
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*
* @param array &$attributes
* @return void
@@ -164,6 +165,8 @@ public function addToCollection($collection)
}
/**
+ * Adds Attributes that belong to Global Scope
+ *
* @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
* @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
* @return $this
@@ -200,6 +203,8 @@ protected function addGlobalAttribute(
}
/**
+ * Adds Attributes that don't belong to Global Scope
+ *
* @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
* @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
* @return $this
@@ -208,7 +213,7 @@ protected function addNotGlobalAttribute(
\Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute,
\Magento\Catalog\Model\ResourceModel\Product\Collection $collection
) {
- $storeId = $this->storeManager->getStore()->getId();
+ $storeId = $this->storeManager->getStore()->getId();
$values = $collection->getAllAttributeValues($attribute);
$validEntities = [];
if ($values) {
@@ -218,7 +223,9 @@ protected function addNotGlobalAttribute(
$validEntities[] = $entityId;
}
} else {
- if ($this->validateAttribute($storeValues[\Magento\Store\Model\Store::DEFAULT_STORE_ID])) {
+ if (isset($storeValues[Store::DEFAULT_STORE_ID]) &&
+ $this->validateAttribute($storeValues[Store::DEFAULT_STORE_ID])
+ ) {
$validEntities[] = $entityId;
}
}
@@ -236,7 +243,7 @@ protected function addNotGlobalAttribute(
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*
* @return string
*/
@@ -257,7 +264,7 @@ public function getMappedSqlField()
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*
* @param \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection
* @return $this
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontCheckoutSuccessActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontCheckoutSuccessActionGroup.xml
new file mode 100644
index 0000000000000..9ff7e5a96fae7
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontCheckoutSuccessActionGroup.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+ Verifies if the order is placed successfully on the 'one page checkout' page.
+
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontMiniCartItemsActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontMiniCartItemsActionGroup.xml
index 176eebed142c8..8933ebbc1dd84 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontMiniCartItemsActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontMiniCartItemsActionGroup.xml
@@ -18,12 +18,24 @@
+
+
+
+ Validates that the provided Product details (Name, Price) are
+ not present in the Storefront Mini Shopping Cart.
+
+
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
index 7f6980d0c9744..e0519a126aa48 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
@@ -64,6 +64,7 @@
- Validates the the provided Product appears in the Storefront Checkout 'Order Summary' section.
+ Validates the provided Product appears in the Storefront Checkout 'Order Summary' section.
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckCartDiscountAndSummaryActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckCartDiscountAndSummaryActionGroup.xml
index 112abfbb5897a..9f766742b545f 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckCartDiscountAndSummaryActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckCartDiscountAndSummaryActionGroup.xml
@@ -17,13 +17,12 @@
diff --git a/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutPage.xml b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutPage.xml
index d3fa045e4654f..d6173dfa17916 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutPage.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutPage.xml
@@ -14,5 +14,6 @@
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
index 3ab3fa5857b78..1b85f3b045c5d 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
@@ -18,6 +18,7 @@
@@ -147,7 +147,7 @@
-
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/EditShippingAddressOnePageCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/EditShippingAddressOnePageCheckoutTest.xml
index 20015f76e08e3..c61545e51d535 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/EditShippingAddressOnePageCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/EditShippingAddressOnePageCheckoutTest.xml
@@ -25,6 +25,9 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml
index 3c98f9177f4a7..fd6656b1d1b28 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml
@@ -26,6 +26,8 @@
100.00
-
@@ -280,7 +277,9 @@
-
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
index 40b781df9b2ae..4e19de659be26 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
@@ -148,7 +148,7 @@
-
+
+
+
-
@@ -112,7 +116,7 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/Cart/RequestQuantityProcessorTest.php b/app/code/Magento/Checkout/Test/Unit/Model/Cart/RequestQuantityProcessorTest.php
index daabb080b1c9a..82384fa83ab94 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/Cart/RequestQuantityProcessorTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/Cart/RequestQuantityProcessorTest.php
@@ -48,6 +48,9 @@ public function testProcess($cartData, $expected)
$this->assertEquals($this->requestProcessor->process($cartData), $expected);
}
+ /**
+ * @return array
+ */
public function cartDataProvider()
{
return [
diff --git a/app/code/Magento/Checkout/etc/frontend/sections.xml b/app/code/Magento/Checkout/etc/frontend/sections.xml
index 46dd8d9106545..021cd930c74c0 100644
--- a/app/code/Magento/Checkout/etc/frontend/sections.xml
+++ b/app/code/Magento/Checkout/etc/frontend/sections.xml
@@ -9,6 +9,7 @@
xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Customer:etc/sections.xsd">
+
diff --git a/app/code/Magento/Checkout/view/frontend/templates/button.phtml b/app/code/Magento/Checkout/view/frontend/templates/button.phtml
index b0087794ea850..6d1f076e6b26d 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/button.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/button.phtml
@@ -7,7 +7,10 @@
getCanViewOrder() && $block->getCanPrintOrder()) :?>
-
+
escapeHtml(__('Print receipt')) ?>
getChildHtml() ?>
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js b/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js
index 9b20a782c38d9..6e1b031ab48ce 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js
@@ -9,8 +9,9 @@ define([
'jquery',
'Magento_Checkout/js/model/new-customer-address',
'Magento_Customer/js/customer-data',
- 'mage/utils/objects'
-], function ($, address, customerData, mageUtils) {
+ 'mage/utils/objects',
+ 'underscore'
+], function ($, address, customerData, mageUtils, _) {
'use strict';
var countryData = customerData.get('directory-data');
@@ -18,6 +19,7 @@ define([
return {
/**
* Convert address form data to Address object
+ *
* @param {Object} formData
* @returns {Object}
*/
@@ -59,13 +61,15 @@ define([
delete addressData['region_id'];
if (addressData['custom_attributes']) {
- addressData['custom_attributes'] = Object.entries(addressData['custom_attributes'])
- .map(function (customAttribute) {
+ addressData['custom_attributes'] = _.map(
+ addressData['custom_attributes'],
+ function (value, key) {
return {
- 'attribute_code': customAttribute[0],
- 'value': customAttribute[1]
+ 'attribute_code': key,
+ 'value': value
};
- });
+ }
+ );
}
return address(addressData);
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/cart/estimate-service.js b/app/code/Magento/Checkout/view/frontend/web/js/model/cart/estimate-service.js
index 54e496131972e..fd12eed76ed50 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/cart/estimate-service.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/cart/estimate-service.js
@@ -13,8 +13,8 @@ define([
], function (quote, defaultProcessor, totalsDefaultProvider, shippingService, cartCache, customerData) {
'use strict';
- var rateProcessors = [],
- totalsProcessors = [],
+ var rateProcessors = {},
+ totalsProcessors = {},
/**
* Estimate totals for shipping address and update shipping rates.
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rate-service.js b/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rate-service.js
index 7eddc0d1a58d4..be2199961e07a 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rate-service.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rate-service.js
@@ -10,7 +10,7 @@ define([
], function (quote, defaultProcessor, customerAddressProcessor) {
'use strict';
- var processors = [];
+ var processors = {};
processors.default = defaultProcessor;
processors['customer-address'] = customerAddressProcessor;
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-save-processor.js b/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-save-processor.js
index d506f0a4359c5..cf26f682ad3aa 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-save-processor.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-save-processor.js
@@ -11,7 +11,7 @@ define([
], function (defaultProcessor) {
'use strict';
- var processors = [];
+ var processors = {};
processors['default'] = defaultProcessor;
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
index a9cbb1194cfd3..6d54f607484b4 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
@@ -162,6 +162,9 @@ define([
this._clearError();
this._checkRegionRequired(country);
+ $(regionList).find('option:selected').removeAttr('selected');
+ regionInput.val('');
+
// Populate state/province dropdown list if available or use input box
if (this.options.regionJson[country]) {
this._removeSelectOptions(regionList);
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
index 59d1daa757138..e728a5c0fcdd5 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
@@ -159,7 +159,6 @@ function (
}
addressData['save_in_address_book'] = this.saveInAddressBook() ? 1 : 0;
newBillingAddress = createBillingAddress(addressData);
-
// New address must be selected as a billing address
selectBillingAddress(newBillingAddress);
checkoutData.setSelectedBillingAddress(newBillingAddress.getKey());
@@ -237,6 +236,30 @@ function (
*/
getCode: function (parent) {
return _.isFunction(parent.getCode) ? parent.getCode() : 'shared';
+ },
+
+ /**
+ * Get customer attribute label
+ *
+ * @param {*} attribute
+ * @returns {*}
+ */
+ getCustomAttributeLabel: function (attribute) {
+ var resultAttribute;
+
+ if (typeof attribute === 'string') {
+ return attribute;
+ }
+
+ if (attribute.label) {
+ return attribute.label;
+ }
+
+ resultAttribute = _.findWhere(this.source.get('customAttributes')[attribute['attribute_code']], {
+ value: attribute.value
+ });
+
+ return resultAttribute && resultAttribute.label || attribute.value;
}
});
});
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js b/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js
index d152f94397730..4adc1cd88c0ae 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js
@@ -103,8 +103,8 @@ define([
});
if (
- cartData().website_id !== window.checkout.websiteId &&
- cartData().website_id !== undefined
+ cartData().website_id !== window.checkout.websiteId && cartData().website_id !== undefined ||
+ cartData().storeId !== window.checkout.storeId && cartData().storeId !== undefined
) {
customerData.reload(['cart'], false);
}
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address/address-renderer/default.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address/address-renderer/default.js
index 54381ad96b0b9..939a2af1a25aa 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address/address-renderer/default.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address/address-renderer/default.js
@@ -7,12 +7,13 @@ define([
'jquery',
'ko',
'uiComponent',
+ 'underscore',
'Magento_Checkout/js/action/select-shipping-address',
'Magento_Checkout/js/model/quote',
'Magento_Checkout/js/model/shipping-address/form-popup-state',
'Magento_Checkout/js/checkout-data',
'Magento_Customer/js/customer-data'
-], function ($, ko, Component, selectShippingAddressAction, quote, formPopUpState, checkoutData, customerData) {
+], function ($, ko, Component, _, selectShippingAddressAction, quote, formPopUpState, checkoutData, customerData) {
'use strict';
var countryData = customerData.get('directory-data');
@@ -47,6 +48,30 @@ define([
return countryData()[countryId] != undefined ? countryData()[countryId].name : ''; //eslint-disable-line
},
+ /**
+ * Get customer attribute label
+ *
+ * @param {*} attribute
+ * @returns {*}
+ */
+ getCustomAttributeLabel: function (attribute) {
+ var resultAttribute;
+
+ if (typeof attribute === 'string') {
+ return attribute;
+ }
+
+ if (attribute.label) {
+ return attribute.label;
+ }
+
+ resultAttribute = _.findWhere(this.source.get('customAttributes')[attribute['attribute_code']], {
+ value: attribute.value
+ });
+
+ return resultAttribute && resultAttribute.label || attribute.value;
+ },
+
/** Set selected customer shipping address */
selectAddress: function () {
selectShippingAddressAction(this.address());
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address/list.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address/list.js
index 4f4fc3de3e1a5..2bdfd063cb6fb 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address/list.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address/list.js
@@ -16,7 +16,8 @@ define([
var defaultRendererTemplate = {
parent: '${ $.$data.parentName }',
name: '${ $.$data.name }',
- component: 'Magento_Checkout/js/view/shipping-address/address-renderer/default'
+ component: 'Magento_Checkout/js/view/shipping-address/address-renderer/default',
+ provider: 'checkoutProvider'
};
return Component.extend({
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information/address-renderer/default.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information/address-renderer/default.js
index acc9f1c2391d9..009178cbb19b9 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information/address-renderer/default.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information/address-renderer/default.js
@@ -5,8 +5,9 @@
define([
'uiComponent',
+ 'underscore',
'Magento_Customer/js/customer-data'
-], function (Component, customerData) {
+], function (Component, _, customerData) {
'use strict';
var countryData = customerData.get('directory-data');
@@ -22,6 +23,30 @@ define([
*/
getCountryName: function (countryId) {
return countryData()[countryId] != undefined ? countryData()[countryId].name : ''; //eslint-disable-line
+ },
+
+ /**
+ * Get customer attribute label
+ *
+ * @param {*} attribute
+ * @returns {*}
+ */
+ getCustomAttributeLabel: function (attribute) {
+ var resultAttribute;
+
+ if (typeof attribute === 'string') {
+ return attribute;
+ }
+
+ if (attribute.label) {
+ return attribute.label;
+ }
+
+ resultAttribute = _.findWhere(this.source.get('customAttributes')[attribute['attribute_code']], {
+ value: attribute.value
+ });
+
+ return resultAttribute && resultAttribute.label || attribute.value;
}
});
});
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information/list.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information/list.js
index 28eb83c8be3e3..3bb2715c78a7b 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information/list.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information/list.js
@@ -16,7 +16,8 @@ define([
var defaultRendererTemplate = {
parent: '${ $.$data.parentName }',
name: '${ $.$data.name }',
- component: 'Magento_Checkout/js/view/shipping-information/address-renderer/default'
+ component: 'Magento_Checkout/js/view/shipping-information/address-renderer/default',
+ provider: 'checkoutProvider'
};
return Component.extend({
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
index c811d3a1e8369..d5098dbc6f734 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
@@ -249,6 +249,16 @@ define([
if (this.validateShippingInformation()) {
quote.billingAddress(null);
checkoutDataResolver.resolveBillingAddress();
+ registry.async('checkoutProvider')(function (checkoutProvider) {
+ var shippingAddressData = checkoutData.getShippingAddressFromData();
+
+ if (shippingAddressData) {
+ checkoutProvider.set(
+ 'shippingAddress',
+ $.extend(true, {}, checkoutProvider.get('shippingAddress'), shippingAddressData)
+ );
+ }
+ });
setShippingInformationAction().done(
function () {
stepNavigator.next();
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
index a0827d17d6622..23bbce48fee2c 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
@@ -13,19 +13,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/CheckoutAgreements/etc/db_schema.xml b/app/code/Magento/CheckoutAgreements/etc/db_schema.xml
index 09cd1c5b63965..43da8d7d27dd9 100644
--- a/app/code/Magento/CheckoutAgreements/etc/db_schema.xml
+++ b/app/code/Magento/CheckoutAgreements/etc/db_schema.xml
@@ -9,7 +9,7 @@
xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+
+
+
+
+
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection.xml
index 2efa7f62fc4ec..445279a8b1403 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection.xml
@@ -24,6 +24,8 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Cms/etc/di.xml b/app/code/Magento/Cms/etc/di.xml
index e41f500915916..d82dc4ea86239 100644
--- a/app/code/Magento/Cms/etc/di.xml
+++ b/app/code/Magento/Cms/etc/di.xml
@@ -7,9 +7,9 @@
-->
- Goes to the 'Configuration' page for 'Customer Configuration'. Sets the 'Group For Valid VAT ID Intra Union' option. Clicks on the Save button. Validates the the Save message is present.
+ Goes to the 'Configuration' page for 'Customer Configuration'. Sets the 'Group For Valid VAT ID Intra Union' option. Clicks on the Save button. Validates the Save message is present.
+
+
+ Goes to the 'Configuration' page and expands main level configuration tab passed via argument as Tab Name.
+
+
+
+
+
+
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminOpenConfigNavItemActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminOpenConfigNavItemActionGroup.xml
new file mode 100644
index 0000000000000..eaca27f86f49a
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminOpenConfigNavItemActionGroup.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+ Clicks on config nav item selected by passed argument.
+
+
+
+
+
+
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminOpenStoreConfigDeveloperPageActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminOpenStoreConfigDeveloperPageActionGroup.xml
new file mode 100644
index 0000000000000..4c5d21a890973
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminOpenStoreConfigDeveloperPageActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ Go to admin store configuration developer page.
+
+
+
+
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminOpenStoreConfigPageActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminOpenStoreConfigPageActionGroup.xml
new file mode 100644
index 0000000000000..43343fd0851e4
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminOpenStoreConfigPageActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ Go to admin store configuration page.
+
+
+
+
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/GeneralConfigurationActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/GeneralConfigurationActionGroup.xml
index 45d84a338a30b..d65376828e2c4 100644
--- a/app/code/Magento/Config/Test/Mftf/ActionGroup/GeneralConfigurationActionGroup.xml
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/GeneralConfigurationActionGroup.xml
@@ -27,7 +27,6 @@
-
Selects the provided Countries under 'Top destinations' on the 'General' section of the 'Configuration' page. Clicks on the Save button.
diff --git a/app/code/Magento/Config/Test/Mftf/Page/AdminConfigPage.xml b/app/code/Magento/Config/Test/Mftf/Page/AdminConfigPage.xml
index 7a62dfff8323b..8fafdc202bf09 100644
--- a/app/code/Magento/Config/Test/Mftf/Page/AdminConfigPage.xml
+++ b/app/code/Magento/Config/Test/Mftf/Page/AdminConfigPage.xml
@@ -21,4 +21,7 @@
+
+
+
diff --git a/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml
index fd49c1482c133..ffe3f0076ca8d 100644
--- a/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml
+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml
@@ -7,6 +7,11 @@
-->
+
-
+
+
+
+
+
-
-
\ No newline at end of file
+
diff --git a/app/code/Magento/Config/etc/db_schema.xml b/app/code/Magento/Config/etc/db_schema.xml
index 8aeac802fbd91..46dd77959b9d4 100644
--- a/app/code/Magento/Config/etc/db_schema.xml
+++ b/app/code/Magento/Config/etc/db_schema.xml
@@ -9,10 +9,10 @@
xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
diff --git a/app/code/Magento/Config/i18n/en_US.csv b/app/code/Magento/Config/i18n/en_US.csv
index 9770bf4b94c27..ceb1efdc8b77d 100644
--- a/app/code/Magento/Config/i18n/en_US.csv
+++ b/app/code/Magento/Config/i18n/en_US.csv
@@ -118,3 +118,4 @@ Dashboard,Dashboard
"Web Section","Web Section"
"Store Email Addresses Section","Store Email Addresses Section"
"Email to a Friend","Email to a Friend"
+"Taiwan","Taiwan, Province of China"
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php
index 4874dc8ea03ae..11384263b59a2 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php
@@ -197,6 +197,7 @@ protected function getAttributes()
foreach ($attributes as $key => $attribute) {
if (isset($configurableData[$key])) {
$attributes[$key] = array_replace_recursive($attribute, $configurableData[$key]);
+ // phpcs:ignore Magento2.Performance.ForeachArrayMerge
$attributes[$key]['values'] = array_merge(
isset($attribute['values']) ? $attribute['values'] : [],
isset($configurableData[$key]['values'])
@@ -412,14 +413,15 @@ private function prepareAttributes(
'position' => $configurableAttributes[$attribute->getAttributeId()]['position'],
'chosen' => [],
];
- foreach ($attribute->getOptions() as $option) {
- if (!empty($option->getValue())) {
+ $options = $attribute->usesSource() ? $attribute->getSource()->getAllOptions() : [];
+ foreach ($options as $option) {
+ if (!empty($option['value'])) {
$attributes[$attribute->getAttributeId()]['options'][] = [
'attribute_code' => $attribute->getAttributeCode(),
'attribute_label' => $attribute->getStoreLabel(0),
- 'id' => $option->getValue(),
- 'label' => $option->getLabel(),
- 'value' => $option->getValue(),
+ 'id' => $option['value'],
+ 'label' => $option['label'],
+ 'value' => $option['value'],
'__disableTmpl' => true,
];
}
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Attribute.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Attribute.php
index b013916cc221a..01549ffcd2755 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Attribute.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Attribute.php
@@ -113,11 +113,12 @@ public function afterSave()
}
/**
- * Load configurable attribute by product and product's attribute
+ * Load configurable attribute by product and product's attribute.
*
* @param \Magento\Catalog\Model\Product $product
* @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
* @throws LocalizedException
+ * @return void
*/
public function loadByProductAndAttribute($product, $attribute)
{
@@ -263,6 +264,9 @@ public function setProductId($value)
/**
* @inheritdoc
+ *
+ * @SuppressWarnings(PHPMD.SerializationAware)
+ * @deprecated Do not use PHP serialization.
*/
public function __sleep()
{
@@ -274,6 +278,9 @@ public function __sleep()
/**
* @inheritdoc
+ *
+ * @SuppressWarnings(PHPMD.SerializationAware)
+ * @deprecated Do not use PHP serialization.
*/
public function __wakeup()
{
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/VariationMatrix.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/VariationMatrix.php
index 979587dc500a4..f837444aa45ca 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/VariationMatrix.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/VariationMatrix.php
@@ -3,9 +3,12 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
namespace Magento\ConfigurableProduct\Model\Product\Type;
/**
+ * Variation matrix.
+ *
* @api
* @since 100.0.2
*/
@@ -40,7 +43,9 @@ public function getVariations($usedProductAttributes)
for ($attributeIndex = $attributesCount; $attributeIndex--;) {
$currentAttribute = $variationalAttributes[$attributeIndex];
$currentVariationValue = $currentVariation[$attributeIndex];
- $filledVariation[$currentAttribute['id']] = $currentAttribute['values'][$currentVariationValue];
+ if (!empty($currentAttribute['id'])) {
+ $filledVariation[$currentAttribute['id']] = $currentAttribute['values'][$currentVariationValue];
+ }
}
$variations[] = $filledVariation;
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
index 8f2cc6ddb43ce..3aa90c7b3ce57 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
@@ -302,7 +302,9 @@ protected function _loadLabels()
}
/**
- * Load attribute options.
+ * Load related options' data.
+ *
+ * @return void
*/
protected function loadOptions()
{
@@ -355,6 +357,9 @@ protected function getIncludedOptions(array $usedProducts, AbstractAttribute $pr
/**
* @inheritdoc
* @since 100.0.6
+ *
+ * @SuppressWarnings(PHPMD.SerializationAware)
+ * @deprecated Do not use PHP serialization.
*/
public function __sleep()
{
@@ -374,6 +379,9 @@ public function __sleep()
/**
* @inheritdoc
* @since 100.0.6
+ *
+ * @SuppressWarnings(PHPMD.SerializationAware)
+ * @deprecated Do not use PHP serialization.
*/
public function __wakeup()
{
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml
index 3f21c98068d8a..6ae3c4f4e16cf 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml
@@ -60,6 +60,19 @@
ApiProductDescription
ApiProductShortDescription
+
+ api_configurable_product
+ configurable
+ 4
+ 4
+ API Configurable Product
+ api-configurable-product
+ 1
+ 100
+ EavStockItem
+ ApiProductDescription
+ ApiProductShortDescription
+
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductDeleteTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductDeleteTest.xml
index 1a694b8adf17e..33a6da9dabf34 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductDeleteTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductDeleteTest.xml
@@ -66,7 +66,7 @@
-
-
@@ -87,6 +87,9 @@
-
-
-
-
-
-
-
-
@@ -277,7 +277,7 @@
@@ -326,7 +326,7 @@
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithImagesTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithImagesTest.xml
index 925e7a890cead..9796c14f5519a 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithImagesTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithImagesTest.xml
@@ -129,6 +129,9 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdvanceCatalogSearchConfigurableTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdvanceCatalogSearchConfigurableTest.xml
index c303e4d19db81..0370280309272 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdvanceCatalogSearchConfigurableTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdvanceCatalogSearchConfigurableTest.xml
@@ -80,6 +80,8 @@
@@ -104,7 +106,7 @@
-
@@ -228,6 +232,8 @@
@@ -302,6 +308,8 @@
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml
index a71f51526c8ab..83d9bbe8c270a 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml
@@ -77,7 +77,7 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontAdvanceCatalogSearchConfigurableBySkuWithHyphenTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontAdvanceCatalogSearchConfigurableBySkuWithHyphenTest.xml
new file mode 100644
index 0000000000000..a8e982475253f
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontAdvanceCatalogSearchConfigurableBySkuWithHyphenTest.xml
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductCategoryViewChildOnlyTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductCategoryViewChildOnlyTest.xml
index ac468fc92e4db..805727e29a17a 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductCategoryViewChildOnlyTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductCategoryViewChildOnlyTest.xml
@@ -88,7 +88,7 @@
-
@@ -131,7 +132,7 @@
-
@@ -72,7 +72,7 @@
@@ -113,7 +113,7 @@
@@ -151,7 +151,7 @@
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest.xml
index cc8291a83eb40..0ade410714a25 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest.xml
@@ -32,7 +32,7 @@
@@ -68,7 +68,7 @@
@@ -106,7 +106,7 @@
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductWithFileCustomOptionTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductWithFileCustomOptionTest.xml
index d890d59858116..4c955f3385643 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductWithFileCustomOptionTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductWithFileCustomOptionTest.xml
@@ -25,7 +25,7 @@
+
+
+ - Magento\ConfigurableProductGraphQl\Model\Resolver\Product\Price\Provider
+
+
+
diff --git a/app/code/Magento/Cookie/Block/DataProviders/SessionConfig.php b/app/code/Magento/Cookie/Block/DataProviders/SessionConfig.php
new file mode 100644
index 0000000000000..9d8ae5b19be9c
--- /dev/null
+++ b/app/code/Magento/Cookie/Block/DataProviders/SessionConfig.php
@@ -0,0 +1,45 @@
+sessionConfig = $sessionConfig;
+ }
+ /**
+ * Get session.cookie_secure
+ *
+ * @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
+ */
+ public function getCookieSecure()
+ {
+ return $this->sessionConfig->getCookieSecure();
+ }
+}
diff --git a/app/code/Magento/Cookie/view/adminhtml/layout/default.xml b/app/code/Magento/Cookie/view/adminhtml/layout/default.xml
new file mode 100644
index 0000000000000..2862cf917856d
--- /dev/null
+++ b/app/code/Magento/Cookie/view/adminhtml/layout/default.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+ Magento\Cookie\Block\DataProviders\SessionConfig
+
+
+
+
+
diff --git a/app/code/Magento/Cookie/view/base/requirejs-config.js b/app/code/Magento/Cookie/view/base/requirejs-config.js
new file mode 100644
index 0000000000000..b4362ffd80cb6
--- /dev/null
+++ b/app/code/Magento/Cookie/view/base/requirejs-config.js
@@ -0,0 +1,10 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+var config = {
+ paths: {
+ 'jquery/jquery-storageapi': 'Magento_Cookie/js/jquery.storageapi.extended'
+ }
+};
diff --git a/app/code/Magento/Cookie/view/base/templates/html/cookie.phtml b/app/code/Magento/Cookie/view/base/templates/html/cookie.phtml
new file mode 100644
index 0000000000000..b05c53db02abf
--- /dev/null
+++ b/app/code/Magento/Cookie/view/base/templates/html/cookie.phtml
@@ -0,0 +1,17 @@
+
+
+
diff --git a/app/code/Magento/Cookie/view/base/web/js/jquery.storageapi.extended.js b/app/code/Magento/Cookie/view/base/web/js/jquery.storageapi.extended.js
new file mode 100644
index 0000000000000..c026b205f0374
--- /dev/null
+++ b/app/code/Magento/Cookie/view/base/web/js/jquery.storageapi.extended.js
@@ -0,0 +1,69 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'jquery',
+ 'jquery/jquery.cookie',
+ 'jquery/jquery.storageapi.min'
+], function ($) {
+ 'use strict';
+
+ /**
+ *
+ * @param {Object} storage
+ * @private
+ */
+ function _extend(storage) {
+ $.extend(storage, {
+ _secure: window.cookiesConfig ? window.cookiesConfig.secure : false,
+
+ /**
+ * Set value under name
+ * @param {String} name
+ * @param {String} value
+ * @param {Object} [options]
+ */
+ setItem: function (name, value, options) {
+ var _default = {
+ expires: this._expires,
+ path: this._path,
+ domain: this._domain,
+ secure: this._secure
+ };
+
+ $.cookie(this._prefix + name, value, $.extend(_default, options || {}));
+ },
+
+ /**
+ * Set default options
+ * @param {Object} c
+ * @returns {storage}
+ */
+ setConf: function (c) {
+ if (c.path) {
+ this._path = c.path;
+ }
+
+ if (c.domain) {
+ this._domain = c.domain;
+ }
+
+ if (c.expires) {
+ this._expires = c.expires;
+ }
+
+ if (typeof c.secure !== 'undefined') {
+ this._secure = c.secure;
+ }
+
+ return this;
+ }
+ });
+ }
+
+ if (window.cookieStorage) {
+ _extend(window.cookieStorage);
+ }
+});
diff --git a/app/code/Magento/Cookie/view/frontend/layout/default.xml b/app/code/Magento/Cookie/view/frontend/layout/default.xml
index 8b6b86e81c51a..5202c624fefe1 100644
--- a/app/code/Magento/Cookie/view/frontend/layout/default.xml
+++ b/app/code/Magento/Cookie/view/frontend/layout/default.xml
@@ -9,6 +9,11 @@
+
+ Magento\Cookie\Block\DataProviders\SessionConfig
+
+
diff --git a/app/code/Magento/Cron/etc/db_schema.xml b/app/code/Magento/Cron/etc/db_schema.xml
index b3061eefa6313..206b8f64f3ae7 100644
--- a/app/code/Magento/Cron/etc/db_schema.xml
+++ b/app/code/Magento/Cron/etc/db_schema.xml
@@ -9,7 +9,7 @@
xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+
+
+
+
+
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/StorefrontCurrencyRatesActionGroup.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/StorefrontCurrencyRatesActionGroup.xml
new file mode 100644
index 0000000000000..61a6123b1a7af
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/StorefrontCurrencyRatesActionGroup.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Data/AdminCurrencyRatesMessageData.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Data/AdminCurrencyRatesMessageData.xml
new file mode 100644
index 0000000000000..90d22b06fcb80
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Data/AdminCurrencyRatesMessageData.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+ All valid rates have been saved.
+
+
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Data/CurrencyRatesConfigData.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Data/CurrencyRatesConfigData.xml
new file mode 100644
index 0000000000000..6194287dd058b
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Data/CurrencyRatesConfigData.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+ currency/options/base
+ USD
+ websites
+ base
+
+
+ currency/options/base
+ EUR
+ websites
+ base
+
+
+ currency/options/allow
+ USD
+ websites
+ base
+
+
+ currency/options/allow
+ EUR
+ websites
+ base
+
+
+ currency/options/allow
+ RUB
+ websites
+ base
+
+
+ currency/options/default
+ EUR
+ websites
+ base
+
+
+ currency/options/default
+ USD
+ websites
+ base
+
+
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Page/AdminCurrencyRatesPage.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Page/AdminCurrencyRatesPage.xml
new file mode 100644
index 0000000000000..d31dd71d474bb
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Page/AdminCurrencyRatesPage.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Section/AdminCurrencyRatesSection.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Section/AdminCurrencyRatesSection.xml
new file mode 100644
index 0000000000000..a5799356eb459
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Section/AdminCurrencyRatesSection.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Section/StorefrontSwitchCurrencyRatesSection.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Section/StorefrontSwitchCurrencyRatesSection.xml
new file mode 100644
index 0000000000000..e69823ad68e0e
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Section/StorefrontSwitchCurrencyRatesSection.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminOrderRateDisplayWhenChooseThreeAllowedCurrenciesTest.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminOrderRateDisplayWhenChooseThreeAllowedCurrenciesTest.xml
new file mode 100644
index 0000000000000..26fbfd394be68
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminOrderRateDisplayWhenChooseThreeAllowedCurrenciesTest.xml
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ grabRates
+ ['EUR / USD rate:', 'RUB / USD rate:']
+
+
+
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminOrderRateDisplayedInOneLineTest.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminOrderRateDisplayedInOneLineTest.xml
new file mode 100644
index 0000000000000..dc6bdf3db542e
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminOrderRateDisplayedInOneLineTest.xml
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ grabRate
+ [EUR / USD rate:]
+
+
+
diff --git a/app/code/Magento/CurrencySymbol/Test/Unit/Controller/Adminhtml/System/Currency/SaveRatesTest.php b/app/code/Magento/CurrencySymbol/Test/Unit/Controller/Adminhtml/System/Currency/SaveRatesTest.php
new file mode 100644
index 0000000000000..b561c02c7b36e
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Unit/Controller/Adminhtml/System/Currency/SaveRatesTest.php
@@ -0,0 +1,67 @@
+requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
+
+ $this->responseMock = $this->createPartialMock(
+ \Magento\Framework\App\ResponseInterface::class,
+ ['setRedirect', 'sendResponse']
+ );
+
+ $this->action = $objectManager->getObject(
+ \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency\SaveRates::class,
+ [
+ 'request' => $this->requestMock,
+ 'response' => $this->responseMock,
+ ]
+ );
+ }
+
+ /**
+ *
+ */
+ public function testWithNullRateExecute()
+ {
+ $this->requestMock->expects($this->once())
+ ->method('getParam')
+ ->with('rate')
+ ->willReturn(null);
+
+ $this->responseMock->expects($this->once())->method('setRedirect');
+
+ $this->action->execute();
+ }
+}
diff --git a/app/code/Magento/CurrencySymbol/Test/Unit/Controller/Adminhtml/System/Currencysymbol/SaveTest.php b/app/code/Magento/CurrencySymbol/Test/Unit/Controller/Adminhtml/System/Currencysymbol/SaveTest.php
index 0863104a2bf8d..06f4294ce6397 100644
--- a/app/code/Magento/CurrencySymbol/Test/Unit/Controller/Adminhtml/System/Currencysymbol/SaveTest.php
+++ b/app/code/Magento/CurrencySymbol/Test/Unit/Controller/Adminhtml/System/Currencysymbol/SaveTest.php
@@ -128,7 +128,7 @@ public function testExecute()
->willReturn($this->filterManagerMock);
$this->messageManagerMock->expects($this->once())
- ->method('addSuccess')
+ ->method('addSuccessMessage')
->with(__('You applied the custom currency symbols.'));
$this->action->execute();
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php
index db560f7de3ecb..3709f4914c477 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php
@@ -75,7 +75,7 @@ public function __construct(
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
protected function _construct()
{
@@ -119,7 +119,7 @@ protected function _prepareCollection()
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
protected function _prepareColumns()
{
@@ -201,7 +201,7 @@ public function getCustomerId()
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function getGridUrl()
{
@@ -224,7 +224,13 @@ public function getGridParentHtml()
*/
public function getRowUrl($row)
{
- return $this->getUrl('catalog/product/edit', ['id' => $row->getProductId()]);
+ return $this->getUrl(
+ 'catalog/product/edit',
+ [
+ 'id' => $row->getProductId(),
+ 'customerId' => $this->getCustomerId()
+ ]
+ );
}
/**
diff --git a/app/code/Magento/Customer/Block/SectionNamesProvider.php b/app/code/Magento/Customer/Block/SectionNamesProvider.php
new file mode 100644
index 0000000000000..92029d1715d4b
--- /dev/null
+++ b/app/code/Magento/Customer/Block/SectionNamesProvider.php
@@ -0,0 +1,39 @@
+sectionPool = $sectionPool;
+ }
+
+ /**
+ * Return array of section names based on config.
+ *
+ * @return array
+ */
+ public function getSectionNames()
+ {
+ return $this->sectionPool->getSectionNames();
+ }
+}
diff --git a/app/code/Magento/Customer/Block/Widget/Dob.php b/app/code/Magento/Customer/Block/Widget/Dob.php
index d874729d9132e..e020de79a3a60 100644
--- a/app/code/Magento/Customer/Block/Widget/Dob.php
+++ b/app/code/Magento/Customer/Block/Widget/Dob.php
@@ -267,6 +267,8 @@ public function getHtmlExtraParams()
$validators['validate-date'] = [
'dateFormat' => $this->getDateFormat()
];
+ $validators['validate-dob'] = true;
+
return 'data-validate="' . $this->_escaper->escapeHtml(json_encode($validators)) . '"';
}
@@ -277,7 +279,11 @@ public function getHtmlExtraParams()
*/
public function getDateFormat()
{
- return $this->_localeDate->getDateFormatWithLongYear();
+ $dateFormat = $this->_localeDate->getDateFormatWithLongYear();
+ /** Escape RTL characters which are present in some locales and corrupt formatting */
+ $escapedDateFormat = preg_replace('/[^MmDdYy\/\.\-]/', '', $dateFormat);
+
+ return $escapedDateFormat;
}
/**
diff --git a/app/code/Magento/Customer/CustomerData/SectionPool.php b/app/code/Magento/Customer/CustomerData/SectionPool.php
index efea1762d9de6..eef2854cf363e 100644
--- a/app/code/Magento/Customer/CustomerData/SectionPool.php
+++ b/app/code/Magento/Customer/CustomerData/SectionPool.php
@@ -62,6 +62,16 @@ public function getSectionsData(array $sectionNames = null, $forceNewTimestamp =
return $sectionsData;
}
+ /**
+ * Return array of section names.
+ *
+ * @return array
+ */
+ public function getSectionNames()
+ {
+ return array_keys($this->sectionSourceMap);
+ }
+
/**
* Get section sources by section names
*
diff --git a/app/code/Magento/Customer/Model/AddressSearchResults.php b/app/code/Magento/Customer/Model/AddressSearchResults.php
new file mode 100644
index 0000000000000..7e83aa8f8d8df
--- /dev/null
+++ b/app/code/Magento/Customer/Model/AddressSearchResults.php
@@ -0,0 +1,18 @@
+storeManager->getStore()->getId();
+ $storeId = $customer->getStoreId();
if (!$storeId) {
$storeId = $this->getWebsiteStoreId($customer);
}
diff --git a/app/code/Magento/Customer/Model/GroupSearchResults.php b/app/code/Magento/Customer/Model/GroupSearchResults.php
new file mode 100644
index 0000000000000..1de4cd078db88
--- /dev/null
+++ b/app/code/Magento/Customer/Model/GroupSearchResults.php
@@ -0,0 +1,18 @@
+setAddresses([]);
$customerData = $this->extensibleDataObjectConverter->toNestedArray($customer, [], CustomerInterface::class);
$customer->setAddresses($origAddresses);
- /** @var Customer $customerModel */
+ /** @var CustomerModel $customerModel */
$customerModel = $this->customerFactory->create(['data' => $customerData]);
//Model's actual ID field maybe different than "id" so "id" field from $customerData may be ignored.
$customerModel->setId($customer->getId());
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StoreFrontClickEditDefaultShippingAddressActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StoreFrontClickEditDefaultShippingAddressActionGroup.xml
new file mode 100644
index 0000000000000..36c62a887c180
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StoreFrontClickEditDefaultShippingAddressActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ Click on the edit default shipping address link.
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenCustomerAccountCreatePageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenCustomerAccountCreatePageActionGroup.xml
index b013b1db1c8e7..31a988ac9da0d 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenCustomerAccountCreatePageActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenCustomerAccountCreatePageActionGroup.xml
@@ -16,4 +16,15 @@
+
+ Goes to the Storefront Customer Create page using Store code in URL option.
+
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
index 4d7a39b3246e1..74365ef02fe87 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
@@ -51,6 +51,21 @@
Yes
RegionTX
+
+ John
+ Doe
+ Magento
+
+ - 7700 West Parmer Lane
+
+ Austin
+ Texas
+ US
+ United States
+ 78729
+ 512-345-6789
+ RegionTX
+
John
Doe
@@ -239,6 +254,21 @@
Côtes-d'Armor
12345
+
+ Xian
+ Shai
+ Hunan Fenmian
+ +86 851 8410 4337
+
+ - Nanyuan Rd, Wudang
+ - Hunan Fenmian
+
+ CN
+ China
+ Guiyang
+ Guizhou Sheng
+ 550002
+
Jany
Doe
@@ -312,4 +342,37 @@
90230
555-55-555-55
+
+ John
+ Doe
+ Magento
+
+ - 7700 West Parmer Lane
+ - 113
+
+ Los Angeles
+ Armed Forces Europe
+ US
+ United States
+ 90001
+ 512-345-6789
+ Yes
+ Yes
+ RegionAE
+
+
+ John
+ Doe
+ Magento
+
+ - Chaussee de Wavre
+ - 318
+
+ Bihain
+ Hainaut
+ BE
+ Belgium
+ 6690
+ 0477-58-77867
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/AdminGeneralStoreInfomationConfigData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AdminGeneralStoreInfomationConfigData.xml
new file mode 100644
index 0000000000000..e4c020cc449fb
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Data/AdminGeneralStoreInfomationConfigData.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+ general/store_information/merchant_vat_number
+ 111607872
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
index c7a73b61dc48a..093d6a05e8c5c 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
@@ -47,6 +47,20 @@
General
US_Address_TX
+
+ 1
+ true
+ true
+ John.Doe@example.com
+ John
+ Doe
+ John Doe
+ pwdTest123!
+ 0
+ 0
+ General
+ US_Address_TX_Without_Default
+
true
true
@@ -309,4 +323,17 @@
0
0
+
+ 0
+ true
+ true
+ John.Doe@example.com
+ John
+ Doe
+ John Doe
+ pwdTest123!
+ 0
+ 0
+ US_Address_AE
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/RegionData.xml b/app/code/Magento/Customer/Test/Mftf/Data/RegionData.xml
index 280bae7de411a..0a956f16767be 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/RegionData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/RegionData.xml
@@ -32,4 +32,9 @@
UT
58
+
+ Armed Forces Europe
+ AFE
+ 9
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/AdminEditCustomerPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/AdminEditCustomerPage.xml
index 9bd382da8eb92..79fb18afaad53 100644
--- a/app/code/Magento/Customer/Test/Mftf/Page/AdminEditCustomerPage.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Page/AdminEditCustomerPage.xml
@@ -12,6 +12,8 @@
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerCartSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerCartSection.xml
new file mode 100644
index 0000000000000..5c8b8907db43a
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerCartSection.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerInformationSection.xml
new file mode 100644
index 0000000000000..d680015230b9d
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerInformationSection.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml
index 78bae7ad60dd8..a11fb9d0eaa8f 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml
@@ -23,7 +23,7 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminProductBackRedirectNavigateFromCustomerViewCartProduct.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminProductBackRedirectNavigateFromCustomerViewCartProduct.xml
new file mode 100644
index 0000000000000..9de2339f2e217
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminProductBackRedirectNavigateFromCustomerViewCartProduct.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
index 2b24233e8b072..bf8844b2cc7ab 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
@@ -25,7 +25,7 @@
-
@@ -101,7 +101,7 @@
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerTest.xml
index 97c932f0cb28a..7d51f97f2463a 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerTest.xml
@@ -20,7 +20,7 @@
-
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressBelgiumTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressBelgiumTest.xml
new file mode 100644
index 0000000000000..6c0615f701df6
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressBelgiumTest.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressChinaTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressChinaTest.xml
new file mode 100644
index 0000000000000..285de8d777b48
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressChinaTest.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php b/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php
index 8bfddac3cef8f..b1d7c455324b3 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php
@@ -9,13 +9,13 @@
use Magento\Customer\Api\CustomerMetadataInterface;
use Magento\Customer\Api\Data\AttributeMetadataInterface;
use Magento\Customer\Api\Data\ValidationRuleInterface;
+use Magento\Customer\Block\Widget\Dob;
use Magento\Customer\Helper\Address;
use Magento\Framework\App\CacheInterface;
use Magento\Framework\Cache\FrontendInterface;
use Magento\Framework\Data\Form\FilterFactory;
use Magento\Framework\Escaper;
use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Customer\Block\Widget\Dob;
use Magento\Framework\Locale\Resolver;
use Magento\Framework\Locale\ResolverInterface;
use Magento\Framework\Stdlib\DateTime\Timezone;
@@ -23,7 +23,7 @@
use Magento\Framework\View\Element\Html\Date;
use Magento\Framework\View\Element\Template\Context;
use PHPUnit\Framework\TestCase;
-use PHPUnit_Framework_MockObject_MockObject;
+use PHPUnit\Framework\MockObject\MockObject;
use Zend_Cache_Backend_BlackHole;
use Zend_Cache_Core;
@@ -60,17 +60,17 @@ class DobTest extends TestCase
const YEAR_HTML =
'yy
';
- /** @var PHPUnit_Framework_MockObject_MockObject|AttributeMetadataInterface */
+ /** @var MockObject|AttributeMetadataInterface */
protected $attribute;
/** @var Dob */
protected $_block;
- /** @var PHPUnit_Framework_MockObject_MockObject|CustomerMetadataInterface */
+ /** @var MockObject|CustomerMetadataInterface */
protected $customerMetadata;
/**
- * @var FilterFactory|PHPUnit_Framework_MockObject_MockObject
+ * @var FilterFactory|MockObject
*/
protected $filterFactory;
@@ -336,12 +336,27 @@ public function getYearDataProvider()
}
/**
- * is used to derive the Locale that is used to determine the
- * value of Dob::getDateFormat() for that Locale.
+ * Is used to derive the Locale that is used to determine the value of Dob::getDateFormat() for that Locale
+ *
+ * @param string $locale
+ * @param string $expectedFormat
+ * @dataProvider getDateFormatDataProvider
+ */
+ public function testGetDateFormat(string $locale, string $expectedFormat)
+ {
+ $this->_locale = $locale;
+ $this->assertEquals($expectedFormat, $this->_block->getDateFormat());
+ }
+
+ /**
+ * @return array
*/
- public function testGetDateFormat()
+ public function getDateFormatDataProvider(): array
{
- $this->assertEquals(self::DATE_FORMAT, $this->_block->getDateFormat());
+ return [
+ ['ar_SA', 'd/M/y'],
+ [Resolver::DEFAULT_LOCALE, self::DATE_FORMAT],
+ ];
}
/**
@@ -521,8 +536,8 @@ public function testGetHtmlExtraParamsWithoutRequiredOption()
{
$this->escaper->expects($this->any())
->method('escapeHtml')
- ->with('{"validate-date":{"dateFormat":"M\/d\/Y"}}')
- ->will($this->returnValue('{"validate-date":{"dateFormat":"M\/d\/Y"}}'));
+ ->with('{"validate-date":{"dateFormat":"M\/d\/Y"},"validate-dob":true}')
+ ->will($this->returnValue('{"validate-date":{"dateFormat":"M\/d\/Y"},"validate-dob":true}'));
$this->attribute->expects($this->once())
->method("isRequired")
@@ -530,7 +545,7 @@ public function testGetHtmlExtraParamsWithoutRequiredOption()
$this->assertEquals(
$this->_block->getHtmlExtraParams(),
- 'data-validate="{"validate-date":{"dateFormat":"M\/d\/Y"}}"'
+ 'data-validate="{"validate-date":{"dateFormat":"M\/d\/Y"},"validate-dob":true}"'
);
}
@@ -544,13 +559,17 @@ public function testGetHtmlExtraParamsWithRequiredOption()
->willReturn(true);
$this->escaper->expects($this->any())
->method('escapeHtml')
- ->with('{"required":true,"validate-date":{"dateFormat":"M\/d\/Y"}}')
- ->will($this->returnValue('{"required":true,"validate-date":{"dateFormat":"M\/d\/Y"}}'));
+ ->with('{"required":true,"validate-date":{"dateFormat":"M\/d\/Y"},"validate-dob":true}')
+ ->will(
+ $this->returnValue(
+ '{"required":true,"validate-date":{"dateFormat":"M\/d\/Y"},"validate-dob":true}'
+ )
+ );
$this->context->expects($this->any())->method('getEscaper')->will($this->returnValue($this->escaper));
$this->assertEquals(
- 'data-validate="{"required":true,"validate-date":{"dateFormat":"M\/d\/Y"}}"',
+ 'data-validate="{"required":true,"validate-date":{"dateFormat":"M\/d\/Y"},"validate-dob":true}"',
$this->_block->getHtmlExtraParams()
);
}
diff --git a/app/code/Magento/Customer/Test/Unit/Model/EmailNotificationTest.php b/app/code/Magento/Customer/Test/Unit/Model/EmailNotificationTest.php
index 318023d8068c5..ff83ef62c6aa7 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/EmailNotificationTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/EmailNotificationTest.php
@@ -521,7 +521,7 @@ public function testPasswordResetConfirmation()
/** @var CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $customer */
$customer = $this->createMock(CustomerInterface::class);
- $customer->expects($this->any())
+ $customer->expects($this->once())
->method('getStoreId')
->willReturn($customerStoreId);
$customer->expects($this->any())
@@ -539,11 +539,6 @@ public function testPasswordResetConfirmation()
->method('getStore')
->willReturn($this->storeMock);
- $this->storeManagerMock->expects($this->at(1))
- ->method('getStore')
- ->with($customerStoreId)
- ->willReturn($this->storeMock);
-
$this->customerRegistryMock->expects($this->once())
->method('retrieveSecureData')
->with($customerId)
diff --git a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/GroupTest.php b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/GroupTest.php
index b245702ce07f9..069ddc63d74d7 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/GroupTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/GroupTest.php
@@ -127,7 +127,7 @@ public function testSaveWithReservedId()
]
)
->getMockForAbstractClass();
- $dbAdapter->expects($this->any())->method('describeTable')->willReturn([]);
+ $dbAdapter->expects($this->any())->method('describeTable')->willReturn(['customer_group_id' => []]);
$dbAdapter->expects($this->any())->method('update')->willReturnSelf();
$dbAdapter->expects($this->once())->method('lastInsertId')->willReturn($expectedId);
$selectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
diff --git a/app/code/Magento/Customer/etc/db_schema.xml b/app/code/Magento/Customer/etc/db_schema.xml
index c699db06d30dc..e07d7d8708a43 100644
--- a/app/code/Magento/Customer/etc/db_schema.xml
+++ b/app/code/Magento/Customer/etc/db_schema.xml
@@ -15,7 +15,7 @@
SectionInvalidationConfigData
+
+
+ SectionInvalidationConfigData
+
+
diff --git a/app/code/Magento/Customer/i18n/en_US.csv b/app/code/Magento/Customer/i18n/en_US.csv
index 3495feb925cb3..a70aa08dba735 100644
--- a/app/code/Magento/Customer/i18n/en_US.csv
+++ b/app/code/Magento/Customer/i18n/en_US.csv
@@ -539,3 +539,4 @@ Addresses,Addresses
"Prefix","Prefix"
"Middle Name/Initial","Middle Name/Initial"
"Suffix","Suffix"
+"The Date of Birth should not be greater than today.","The Date of Birth should not be greater than today."
diff --git a/app/code/Magento/Customer/view/base/ui_component/customer_form.xml b/app/code/Magento/Customer/view/base/ui_component/customer_form.xml
index 5fb8b17dbb8c5..954b44ec19bbb 100644
--- a/app/code/Magento/Customer/view/base/ui_component/customer_form.xml
+++ b/app/code/Magento/Customer/view/base/ui_component/customer_form.xml
@@ -265,10 +265,20 @@
true
+ true
text
true
+
+
+
+
+ -1d
+
+
+
+
diff --git a/app/code/Magento/Customer/view/frontend/layout/default.xml b/app/code/Magento/Customer/view/frontend/layout/default.xml
index 94e46fda194b0..3976fc6bd9090 100644
--- a/app/code/Magento/Customer/view/frontend/layout/default.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/default.xml
@@ -41,9 +41,12 @@
+
+ Magento\Customer\Block\SectionNamesProvider
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Deploy/Test/Mftf/Suite/MagentoProductionModeOnlyTestSuite.xml b/app/code/Magento/Deploy/Test/Mftf/Suite/MagentoProductionModeOnlyTestSuite.xml
new file mode 100644
index 0000000000000..bf7014cdbb49d
--- /dev/null
+++ b/app/code/Magento/Deploy/Test/Mftf/Suite/MagentoProductionModeOnlyTestSuite.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php b/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
index 396381960e544..fcc02476bb858 100644
--- a/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
@@ -103,7 +103,7 @@ public function testDeploy($options, $expectedContentVersion)
$package->expects($this->never())->method('getTheme');
$package->expects($this->never())->method('getLocale');
} else {
- $package->expects($this->exactly(1))->method('isVirtual')->willReturn(false);
+ $package->expects($this->exactly(2))->method('isVirtual')->willReturn(false);
$package->expects($this->exactly(3))->method('getArea')->willReturn('area');
$package->expects($this->exactly(3))->method('getTheme')->willReturn('theme');
$package->expects($this->exactly(3))->method('getLocale')->willReturn('locale');
@@ -198,6 +198,7 @@ public function deployDataProvider()
[
'strategy' => 'compact',
'no-javascript' => false,
+ 'no-js-bundle' => false,
'no-html-minify' => false,
'refresh-content-version-only' => false,
],
@@ -207,6 +208,7 @@ public function deployDataProvider()
[
'strategy' => 'compact',
'no-javascript' => false,
+ 'no-js-bundle' => false,
'no-html-minify' => false,
'refresh-content-version-only' => false,
'content-version' => '123456',
@@ -226,25 +228,28 @@ public function deployDataProvider()
public function testMaxExecutionTimeOptionPassed()
{
$options = [
- DeployStaticOptions::MAX_EXECUTION_TIME => 100,
+ DeployStaticOptions::MAX_EXECUTION_TIME => 100,
DeployStaticOptions::REFRESH_CONTENT_VERSION_ONLY => false,
- DeployStaticOptions::JOBS_AMOUNT => 3,
- DeployStaticOptions::STRATEGY => 'compact',
- DeployStaticOptions::NO_JAVASCRIPT => true,
- DeployStaticOptions::NO_HTML_MINIFY => true,
+ DeployStaticOptions::JOBS_AMOUNT => 3,
+ DeployStaticOptions::STRATEGY => 'compact',
+ DeployStaticOptions::NO_JAVASCRIPT => true,
+ DeployStaticOptions::NO_JS_BUNDLE => true,
+ DeployStaticOptions::NO_HTML_MINIFY => true,
];
$queueMock = $this->createMock(Queue::class);
$strategyMock = $this->createMock(CompactDeploy::class);
$this->queueFactory->expects($this->once())
->method('create')
- ->with([
- 'logger' => $this->logger,
- 'maxExecTime' => 100,
- 'maxProcesses' => 3,
- 'options' => $options,
- 'deployPackageService' => null
- ])
+ ->with(
+ [
+ 'logger' => $this->logger,
+ 'maxExecTime' => 100,
+ 'maxProcesses' => 3,
+ 'options' => $options,
+ 'deployPackageService' => null
+ ]
+ )
->willReturn($queueMock);
$this->deployStrategyFactory->expects($this->once())
->method('create')
diff --git a/app/code/Magento/Dhl/Test/Mftf/Section/AdminShippingMethodDHLSection.xml b/app/code/Magento/Dhl/Test/Mftf/Section/AdminShippingMethodDHLSection.xml
new file mode 100644
index 0000000000000..1256bb5443e04
--- /dev/null
+++ b/app/code/Magento/Dhl/Test/Mftf/Section/AdminShippingMethodDHLSection.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Dhl/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml b/app/code/Magento/Dhl/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml
new file mode 100644
index 0000000000000..f5e1e8ef0c8ec
--- /dev/null
+++ b/app/code/Magento/Dhl/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Directory/Model/Observer.php b/app/code/Magento/Directory/Model/Observer.php
index e35c2de5cee5b..6d227e7148261 100644
--- a/app/code/Magento/Directory/Model/Observer.php
+++ b/app/code/Magento/Directory/Model/Observer.php
@@ -12,6 +12,11 @@
namespace Magento\Directory\Model;
+/**
+ * Class Observer
+ *
+ * @package Magento\Directory\Model
+ */
class Observer
{
const CRON_STRING_PATH = 'crontab/default/jobs/currency_rates_update/schedule/cron_expr';
@@ -83,6 +88,8 @@ public function __construct(
}
/**
+ * Schedule update currency rates
+ *
* @param mixed $schedule
* @return void
* @throws \Exception
@@ -122,7 +129,7 @@ public function scheduledUpdateCurrencyRates($schedule)
$importWarnings[] = __('FATAL ERROR:') . ' ' . __('Please specify the correct Import Service.');
}
- if (sizeof($errors) > 0) {
+ if (count($errors) > 0) {
foreach ($errors as $error) {
$importWarnings[] = __('WARNING:') . ' ' . $error;
}
@@ -132,7 +139,7 @@ public function scheduledUpdateCurrencyRates($schedule)
self::XML_PATH_ERROR_RECIPIENT,
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
- if (sizeof($importWarnings) == 0) {
+ if (count($importWarnings) == 0) {
$this->_currencyFactory->create()->saveRates($rates);
} elseif ($errorRecipient) {
//if $errorRecipient is not set, there is no sense send email to nobody
diff --git a/app/code/Magento/Directory/Setup/Patch/Data/AddCountriesCaribbeanCuracaoKosovoSintMaarten.php b/app/code/Magento/Directory/Setup/Patch/Data/AddCountriesCaribbeanCuracaoKosovoSintMaarten.php
new file mode 100644
index 0000000000000..d7bec84e5440c
--- /dev/null
+++ b/app/code/Magento/Directory/Setup/Patch/Data/AddCountriesCaribbeanCuracaoKosovoSintMaarten.php
@@ -0,0 +1,90 @@
+moduleDataSetup = $moduleDataSetup;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function apply()
+ {
+ /**
+ * Fill table directory/country
+ */
+ $data = [
+ [
+ 'country_id' => 'BQ',
+ 'iso2_code' => 'BQ',
+ 'iso3_code' => 'BES',
+ ],
+ [
+ 'country_id' => 'CW',
+ 'iso2_code' => 'CW',
+ 'iso3_code' => 'CUW',
+ ],
+ [
+ 'country_id' => 'SX',
+ 'iso2_code' => 'SX',
+ 'iso3_code' => 'SXM',
+ ],
+ [
+ 'country_id' => 'XK',
+ 'iso2_code' => 'XK',
+ 'iso3_code' => 'XKX',
+ ],
+ ];
+
+ $this->moduleDataSetup->getConnection()->insertOnDuplicate(
+ $this->moduleDataSetup->getTable('directory_country'),
+ $data
+ );
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public static function getDependencies()
+ {
+ return [
+ InitializeDirectoryData::class
+ ];
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getAliases()
+ {
+ return [];
+ }
+}
diff --git a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForBelgium.php b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForBelgium.php
new file mode 100644
index 0000000000000..7e53198cb9a4e
--- /dev/null
+++ b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForBelgium.php
@@ -0,0 +1,94 @@
+moduleDataSetup = $moduleDataSetup;
+ $this->dataInstallerFactory = $dataInstallerFactory;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function apply()
+ {
+ /** @var DataInstaller $dataInstaller */
+ $dataInstaller = $this->dataInstallerFactory->create();
+ $dataInstaller->addCountryRegions(
+ $this->moduleDataSetup->getConnection(),
+ $this->getDataForBelgium()
+ );
+ }
+
+ /**
+ * Belgium states data.
+ *
+ * @return array
+ */
+ private function getDataForBelgium()
+ {
+ return [
+ ['BE', 'VAN', 'Antwerpen'],
+ ['BE', 'WBR', 'Brabant wallon'],
+ ['BE', 'BRU', 'Brussels Hoofdstedelijk Gewest'],
+ ['BE', 'WHT', 'Hainaut'],
+ ['BE', 'VLI', 'Limburg'],
+ ['BE', 'WLG', 'Liege'],
+ ['BE', 'WLX', 'Luxembourg'],
+ ['BE', 'WNA', 'Namur'],
+ ['BE', 'VOV', 'Oost-Vlaanderen'],
+ ['BE', 'VLG', 'Vlaams Gewest'],
+ ['BE', 'VBR', 'Vlaams-Brabant'],
+ ['BE', 'VWV', 'West-Vlaanderen'],
+ ['BE', 'WAL', 'Wallonne, Region']
+ ];
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public static function getDependencies()
+ {
+ return [
+ InitializeDirectoryData::class,
+ ];
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getAliases()
+ {
+ return [];
+ }
+}
diff --git a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForChina.php b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForChina.php
new file mode 100644
index 0000000000000..0750f8056c4d7
--- /dev/null
+++ b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForChina.php
@@ -0,0 +1,117 @@
+moduleDataSetup = $moduleDataSetup;
+ $this->dataInstallerFactory = $dataInstallerFactory;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function apply()
+ {
+ /** @var DataInstaller $dataInstaller */
+ $dataInstaller = $this->dataInstallerFactory->create();
+ $dataInstaller->addCountryRegions(
+ $this->moduleDataSetup->getConnection(),
+ $this->getDataForChina()
+ );
+ }
+
+ /**
+ * China states data.
+ *
+ * @return array
+ */
+ private function getDataForChina()
+ {
+ return [
+ ['CN', 'CN-AH', 'Anhui Sheng'],
+ ['CN', 'CN-BJ', 'Beijing Shi'],
+ ['CN', 'CN-CQ', 'Chongqing Shi'],
+ ['CN', 'CN-FJ', 'Fujian Sheng'],
+ ['CN', 'CN-GS', 'Gansu Sheng'],
+ ['CN', 'CN-GD', 'Guangdong Sheng'],
+ ['CN', 'CN-GX', 'Guangxi Zhuangzu Zizhiqu'],
+ ['CN', 'CN-GZ', 'Guizhou Sheng'],
+ ['CN', 'CN-HI', 'Hainan Sheng'],
+ ['CN', 'CN-HE', 'Hebei Sheng'],
+ ['CN', 'CN-HL', 'Heilongjiang Sheng'],
+ ['CN', 'CN-HA', 'Henan Sheng'],
+ ['CN', 'CN-HK', 'Hong Kong SAR'],
+ ['CN', 'CN-HB', 'Hubei Sheng'],
+ ['CN', 'CN-HN', 'Hunan Sheng'],
+ ['CN', 'CN-JS', 'Jiangsu Sheng'],
+ ['CN', 'CN-JX', 'Jiangxi Sheng'],
+ ['CN', 'CN-JL', 'Jilin Sheng'],
+ ['CN', 'CN-LN', 'Liaoning Sheng'],
+ ['CN', 'CN-MO', 'Macao SAR'],
+ ['CN', 'CN-NM', 'Nei Mongol Zizhiqu'],
+ ['CN', 'CN-NX', 'Ningxia Huizi Zizhiqu'],
+ ['CN', 'CN-QH', 'Qinghai Sheng'],
+ ['CN', 'CN-SN', 'Shaanxi Sheng'],
+ ['CN', 'CN-SD', 'Shandong Sheng'],
+ ['CN', 'CN-SH', 'Shanghai Shi'],
+ ['CN', 'CN-SX', 'Shanxi Sheng'],
+ ['CN', 'CN-SC', 'Sichuan Sheng'],
+ ['CN', 'CN-TW', 'Taiwan Sheng'],
+ ['CN', 'CN-TJ', 'Tianjin Shi'],
+ ['CN', 'CN-XJ', 'Xinjiang Uygur Zizhiqu'],
+ ['CN', 'CN-XZ', 'Xizang Zizhiqu'],
+ ['CN', 'CN-YN', 'Yunnan Sheng'],
+ ['CN', 'CN-ZJ', 'Zhejiang Sheng'],
+ ];
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public static function getDependencies()
+ {
+ return [
+ InitializeDirectoryData::class,
+ ];
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getAliases()
+ {
+ return [];
+ }
+}
diff --git a/app/code/Magento/Directory/etc/adminhtml/system.xml b/app/code/Magento/Directory/etc/adminhtml/system.xml
index 7d650b14b3d97..474b8357dfe1f 100644
--- a/app/code/Magento/Directory/etc/adminhtml/system.xml
+++ b/app/code/Magento/Directory/etc/adminhtml/system.xml
@@ -67,27 +67,45 @@
Error Email Recipient
validate-email
+
+ 1
+
Error Email Sender
Magento\Config\Model\Config\Source\Email\Identity
+
+ 1
+
Error Email Template
Email template chosen based on theme fallback when "Default" option is selected.
Magento\Config\Model\Config\Source\Email\Template
+
+ 1
+
Frequency
Magento\Cron\Model\Config\Source\Frequency
+
+ 1
+
Service
Magento\Directory\Model\Currency\Import\Source\Service
Magento\Config\Model\Config\Backend\Currency\Cron
+
+ 1
+
Start Time
+
+ 1
+
diff --git a/app/code/Magento/Directory/etc/config.xml b/app/code/Magento/Directory/etc/config.xml
index c18c4f29d5822..2ff0b484fe979 100644
--- a/app/code/Magento/Directory/etc/config.xml
+++ b/app/code/Magento/Directory/etc/config.xml
@@ -36,7 +36,7 @@
HK,IE,MO,PA,GB
- AF,AL,DZ,AS,AD,AO,AI,AQ,AG,AR,AM,AW,AU,AT,AX,AZ,BS,BH,BD,BB,BY,BE,BZ,BJ,BM,BL,BT,BO,BA,BW,BV,BR,IO,VG,BN,BG,BF,BI,KH,CM,CA,CD,CV,KY,CF,TD,CL,CN,CX,CC,CO,KM,CG,CK,CR,HR,CU,CY,CZ,DK,DJ,DM,DO,EC,EG,SV,GQ,ER,EE,ET,FK,FO,FJ,FI,FR,GF,PF,TF,GA,GM,GE,DE,GG,GH,GI,GR,GL,GD,GP,GU,GT,GN,GW,GY,HT,HM,HN,HK,HU,IS,IM,IN,ID,IR,IQ,IE,IL,IT,CI,JE,JM,JP,JO,KZ,KE,KI,KW,KG,LA,LV,LB,LS,LR,LY,LI,LT,LU,ME,MF,MO,MK,MG,MW,MY,MV,ML,MT,MH,MQ,MR,MU,YT,FX,MX,FM,MD,MC,MN,MS,MA,MZ,MM,NA,NR,NP,NL,AN,NC,NZ,NI,NE,NG,NU,NF,KP,MP,NO,OM,PK,PW,PA,PG,PY,PE,PH,PN,PL,PS,PT,PR,QA,RE,RO,RS,RU,RW,SH,KN,LC,PM,VC,WS,SM,ST,SA,SN,SC,SL,SG,SK,SI,SB,SO,ZA,GS,KR,ES,LK,SD,SR,SJ,SZ,SE,CH,SY,TL,TW,TJ,TZ,TH,TG,TK,TO,TT,TN,TR,TM,TC,TV,VI,UG,UA,AE,GB,US,UM,UY,UZ,VU,VA,VE,VN,WF,EH,YE,ZM,ZW
+ AF,AL,DZ,AS,AD,AO,AI,AQ,AG,AR,AM,AW,AU,AT,AX,AZ,BS,BH,BD,BB,BY,BE,BZ,BJ,BM,BL,BT,BO,BQ,BA,BW,BV,BR,IO,VG,BN,BG,BF,BI,KH,CM,CA,CD,CV,KY,CF,TD,CL,CN,CX,CW,CC,CO,KM,CG,CK,CR,HR,CU,CY,CZ,DK,DJ,DM,DO,EC,EG,SV,GQ,ER,EE,ET,FK,FO,FJ,FI,FR,GF,PF,TF,GA,GM,GE,DE,GG,GH,GI,GR,GL,GD,GP,GU,GT,GN,GW,GY,HT,HM,HN,HK,HU,IS,IM,IN,ID,IR,IQ,IE,IL,IT,CI,JE,JM,JP,JO,KZ,KE,KI,KW,KG,LA,LV,LB,LS,LR,LY,LI,LT,LU,ME,MF,MO,MK,MG,MW,MY,MV,ML,MT,MH,MQ,MR,MU,YT,FX,MX,FM,MD,MC,MN,MS,MA,MZ,MM,NA,NR,NP,NL,AN,NC,NZ,NI,NE,NG,NU,NF,KP,MP,NO,OM,PK,PW,PA,PG,PY,PE,PH,PN,PL,PS,PT,PR,QA,RE,RO,RS,RU,RW,SH,KN,LC,PM,VC,WS,SM,ST,SA,SN,SC,SL,SG,SK,SI,SB,SO,ZA,GS,KR,ES,LK,SD,SR,SJ,SZ,SE,CH,SX,SY,TL,TW,TJ,TZ,TH,TG,TK,TO,TT,TN,TR,TM,TC,TV,VI,UG,UA,AE,GB,US,UM,UY,UZ,VU,VA,VE,VN,WF,EH,XK,YE,ZM,ZW
US
diff --git a/app/code/Magento/Directory/etc/crontab.xml b/app/code/Magento/Directory/etc/crontab.xml
index d6868ff6aa0d6..589cd394d7cf1 100644
--- a/app/code/Magento/Directory/etc/crontab.xml
+++ b/app/code/Magento/Directory/etc/crontab.xml
@@ -7,6 +7,8 @@
-->
-
+ crontab/default/jobs/currency_rates_update/schedule/cron_expr
+
diff --git a/app/code/Magento/Directory/etc/db_schema.xml b/app/code/Magento/Directory/etc/db_schema.xml
index c11e0ee525e37..163e972423b98 100644
--- a/app/code/Magento/Directory/etc/db_schema.xml
+++ b/app/code/Magento/Directory/etc/db_schema.xml
@@ -8,7 +8,7 @@
@@ -31,9 +31,9 @@
@@ -47,7 +47,7 @@
comment="Directory Country Region Name">
ApiProductShortDescription
apiDownloadableLink
+
+ api_downloadable_product
+ downloadable
+ 4
+ 4
+ Api Downloadable Product
+ 123.00
+ api-downloadable-product
+ 1
+ 100
+ EavStockItem
+ ApiProductDescription
+ ApiProductShortDescription
+ apiDownloadableLink
+
downloadableproduct
downloadable
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Section/StorefrontDownloadableProductSection.xml b/app/code/Magento/Downloadable/Test/Mftf/Section/StorefrontDownloadableProductSection.xml
index 543aea7d8297f..dc2a58be138e7 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Section/StorefrontDownloadableProductSection.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Section/StorefrontDownloadableProductSection.xml
@@ -14,5 +14,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdvanceCatalogSearchDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdvanceCatalogSearchDownloadableProductTest.xml
index 66177b6875dd9..39260b897ee19 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdvanceCatalogSearchDownloadableProductTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdvanceCatalogSearchDownloadableProductTest.xml
@@ -39,7 +39,7 @@
-
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/EditDownloadableProductWithSeparateLinksFromCartTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/EditDownloadableProductWithSeparateLinksFromCartTest.xml
new file mode 100644
index 0000000000000..0b905964fd2d9
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/EditDownloadableProductWithSeparateLinksFromCartTest.xml
@@ -0,0 +1,104 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/ManualSelectAllDownloadableLinksDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/ManualSelectAllDownloadableLinksDownloadableProductTest.xml
new file mode 100644
index 0000000000000..b0424b1976c1c
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/ManualSelectAllDownloadableLinksDownloadableProductTest.xml
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Unselect all
+ {$grabUnselectAllButtonText}
+
+
+
+
+ Select all
+ {$grabSelectAllButtonText}
+
+
+
+
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/SelectAllDownloadableLinksDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/SelectAllDownloadableLinksDownloadableProductTest.xml
new file mode 100644
index 0000000000000..94940f0e08195
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/SelectAllDownloadableLinksDownloadableProductTest.xml
@@ -0,0 +1,101 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontAdvanceCatalogSearchDownloadableBySkuWithHyphenTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontAdvanceCatalogSearchDownloadableBySkuWithHyphenTest.xml
new file mode 100644
index 0000000000000..7174122760576
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontAdvanceCatalogSearchDownloadableBySkuWithHyphenTest.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Downloadable/etc/db_schema.xml b/app/code/Magento/Downloadable/etc/db_schema.xml
index ccbefa4fb3992..ee7b3c5683ea1 100644
--- a/app/code/Magento/Downloadable/etc/db_schema.xml
+++ b/app/code/Magento/Downloadable/etc/db_schema.xml
@@ -233,7 +233,7 @@
-
@@ -332,9 +332,9 @@
@@ -426,9 +426,9 @@
@@ -443,11 +443,11 @@
+
@@ -467,11 +471,11 @@
+
@@ -491,14 +499,14 @@
@@ -515,9 +523,9 @@
diff --git a/app/code/Magento/Eav/etc/db_schema_whitelist.json b/app/code/Magento/Eav/etc/db_schema_whitelist.json
index b3f1aca50df01..1814c7ba2dbc3 100644
--- a/app/code/Magento/Eav/etc/db_schema_whitelist.json
+++ b/app/code/Magento/Eav/etc/db_schema_whitelist.json
@@ -287,7 +287,8 @@
"constraint": {
"PRIMARY": true,
"EAV_ATTR_OPT_VAL_OPT_ID_EAV_ATTR_OPT_OPT_ID": true,
- "EAV_ATTRIBUTE_OPTION_VALUE_STORE_ID_STORE_STORE_ID": true
+ "EAV_ATTRIBUTE_OPTION_VALUE_STORE_ID_STORE_STORE_ID": true,
+ "EAV_ATTRIBUTE_OPTION_VALUE_STORE_ID_OPTION_ID": true
}
},
"eav_attribute_label": {
@@ -304,7 +305,8 @@
"constraint": {
"PRIMARY": true,
"EAV_ATTRIBUTE_LABEL_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID": true,
- "EAV_ATTRIBUTE_LABEL_STORE_ID_STORE_STORE_ID": true
+ "EAV_ATTRIBUTE_LABEL_STORE_ID_STORE_STORE_ID": true,
+ "EAV_ATTRIBUTE_LABEL_STORE_ID_ATTRIBUTE_ID": true
}
},
"eav_form_type": {
diff --git a/app/code/Magento/Eav/etc/di.xml b/app/code/Magento/Eav/etc/di.xml
index db6f9b0a64f9f..a09dc28399858 100644
--- a/app/code/Magento/Eav/etc/di.xml
+++ b/app/code/Magento/Eav/etc/di.xml
@@ -22,9 +22,9 @@
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
index 97a76de4b995a..f6d0a6318a5f2 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
@@ -195,15 +195,11 @@ public function cleanIndex($storeId, $mappedIndexerId)
{
$this->checkIndex($storeId, $mappedIndexerId, true);
$indexName = $this->indexNameResolver->getIndexName($storeId, $mappedIndexerId, $this->preparedIndex);
- if ($this->client->isEmptyIndex($indexName)) {
- // use existing index if empty
- return $this;
- }
// prepare new index name and increase version
$indexPattern = $this->indexNameResolver->getIndexPattern($storeId, $mappedIndexerId);
$version = (int)(str_replace($indexPattern, '', $indexName));
- $newIndexName = $indexPattern . ++$version;
+ $newIndexName = $indexPattern . (++$version);
// remove index if already exists
if ($this->client->indexExists($newIndexName)) {
@@ -354,12 +350,14 @@ protected function prepareIndex($storeId, $indexName, $mappedIndexerId)
{
$this->indexBuilder->setStoreId($storeId);
$settings = $this->indexBuilder->build();
- $allAttributeTypes = $this->fieldMapper->getAllAttributesTypes([
- 'entityType' => $mappedIndexerId,
- // Use store id instead of website id from context for save existing fields mapping.
- // In future websiteId will be eliminated due to index stored per store
- 'websiteId' => $storeId
- ]);
+ $allAttributeTypes = $this->fieldMapper->getAllAttributesTypes(
+ [
+ 'entityType' => $mappedIndexerId,
+ // Use store id instead of website id from context for save existing fields mapping.
+ // In future websiteId will be eliminated due to index stored per store
+ 'websiteId' => $storeId
+ ]
+ );
$settings['index']['mapping']['total_fields']['limit'] = $this->getMappingTotalFieldsLimit($allAttributeTypes);
$this->client->createIndex($indexName, ['settings' => $settings]);
$this->client->addFieldsMapping(
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php
index afd383c13421f..ddf75c0a78e25 100644
--- a/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php
@@ -138,7 +138,12 @@ protected function buildQueries(array $matches, array $queryValue)
$transformedTypes = [];
foreach ($matches as $match) {
- $attributeAdapter = $this->attributeProvider->getByAttributeCode($match['field']);
+ $resolvedField = $this->fieldMapper->getFieldName(
+ $match['field'],
+ ['type' => FieldMapperInterface::TYPE_QUERY]
+ );
+
+ $attributeAdapter = $this->attributeProvider->getByAttributeCode($resolvedField);
$fieldType = $this->fieldTypeResolver->getFieldType($attributeAdapter);
$valueTransformer = $this->valueTransformerPool->get($fieldType ?? 'text');
$valueTransformerHash = \spl_object_hash($valueTransformer);
@@ -151,10 +156,6 @@ protected function buildQueries(array $matches, array $queryValue)
continue;
}
- $resolvedField = $this->fieldMapper->getFieldName(
- $match['field'],
- ['type' => FieldMapperInterface::TYPE_QUERY]
- );
$conditions[] = [
'condition' => $queryValue['condition'],
'body' => [
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php
index ec50ba7b3d5df..326c04aad6165 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php
@@ -77,6 +77,7 @@ class ElasticsearchTest extends \PHPUnit\Framework\TestCase
* Setup
*
* @return void
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function setUp()
{
@@ -93,10 +94,12 @@ protected function setUp()
->getMock();
$this->clientConfig = $this->getMockBuilder(\Magento\Elasticsearch\Model\Config::class)
->disableOriginalConstructor()
- ->setMethods([
- 'getIndexPrefix',
- 'getEntityType',
- ])->getMock();
+ ->setMethods(
+ [
+ 'getIndexPrefix',
+ 'getEntityType',
+ ]
+ )->getMock();
$this->indexBuilder = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface::class)
->disableOriginalConstructor()
->getMock();
@@ -104,44 +107,52 @@ protected function setUp()
->disableOriginalConstructor()
->getMock();
$elasticsearchClientMock = $this->getMockBuilder(\Elasticsearch\Client::class)
- ->setMethods([
- 'indices',
- 'ping',
- 'bulk',
- 'search',
- ])
+ ->setMethods(
+ [
+ 'indices',
+ 'ping',
+ 'bulk',
+ 'search',
+ ]
+ )
->disableOriginalConstructor()
->getMock();
$indicesMock = $this->getMockBuilder(\Elasticsearch\Namespaces\IndicesNamespace::class)
- ->setMethods([
- 'exists',
- 'getSettings',
- 'create',
- 'putMapping',
- 'deleteMapping',
- 'existsAlias',
- 'updateAliases',
- 'stats'
- ])
+ ->setMethods(
+ [
+ 'exists',
+ 'getSettings',
+ 'create',
+ 'putMapping',
+ 'deleteMapping',
+ 'existsAlias',
+ 'updateAliases',
+ 'stats'
+ ]
+ )
->disableOriginalConstructor()
->getMock();
$elasticsearchClientMock->expects($this->any())
->method('indices')
->willReturn($indicesMock);
$this->client = $this->getMockBuilder(\Magento\Elasticsearch\Model\Client\Elasticsearch::class)
- ->setConstructorArgs([
- 'options' => $this->getClientOptions(),
- 'elasticsearchClient' => $elasticsearchClientMock
- ])
+ ->setConstructorArgs(
+ [
+ 'options' => $this->getClientOptions(),
+ 'elasticsearchClient' => $elasticsearchClientMock
+ ]
+ )
->getMock();
$this->connectionManager->expects($this->any())
->method('getConnection')
->willReturn($this->client);
$this->fieldMapper->expects($this->any())
->method('getAllAttributesTypes')
- ->willReturn([
- 'name' => 'string',
- ]);
+ ->willReturn(
+ [
+ 'name' => 'string',
+ ]
+ );
$this->clientConfig->expects($this->any())
->method('getIndexPrefix')
->willReturn('indexName');
@@ -151,12 +162,14 @@ protected function setUp()
$this->indexNameResolver = $this->getMockBuilder(
\Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver::class
)
- ->setMethods([
- 'getIndexName',
- 'getIndexNamespace',
- 'getIndexFromAlias',
- 'getIndexNameForAlias',
- ])
+ ->setMethods(
+ [
+ 'getIndexName',
+ 'getIndexNamespace',
+ 'getIndexFromAlias',
+ 'getIndexNameForAlias',
+ ]
+ )
->disableOriginalConstructor()
->getMock();
$this->batchDocumentDataMapper = $this->getMockBuilder(
@@ -216,9 +229,11 @@ public function testPrepareDocsPerStore()
{
$this->batchDocumentDataMapper->expects($this->once())
->method('map')
- ->willReturn([
- 'name' => 'Product Name',
- ]);
+ ->willReturn(
+ [
+ 'name' => 'Product Name',
+ ]
+ );
$this->assertInternalType(
'array',
$this->model->prepareDocsPerStore(
@@ -283,10 +298,6 @@ public function testCleanIndex()
->with(1, 'product', [])
->willReturn('indexName_product_1_v');
- $this->client->expects($this->once())
- ->method('isEmptyIndex')
- ->with('indexName_product_1_v')
- ->willReturn(false);
$this->client->expects($this->atLeastOnce())
->method('indexExists')
->willReturn(true);
@@ -299,26 +310,6 @@ public function testCleanIndex()
);
}
- /**
- * Test cleanIndex() method isEmptyIndex is true
- */
- public function testCleanIndexTrue()
- {
- $this->indexNameResolver->expects($this->any())
- ->method('getIndexName')
- ->willReturn('indexName_product_1_v');
-
- $this->client->expects($this->once())
- ->method('isEmptyIndex')
- ->with('indexName_product_1_v')
- ->willReturn(true);
-
- $this->assertSame(
- $this->model,
- $this->model->cleanIndex(1, 'product')
- );
- }
-
/**
* Test deleteDocs() method
*/
@@ -376,9 +367,11 @@ public function testConnectException()
{
$connectionManager = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ConnectionManager::class)
->disableOriginalConstructor()
- ->setMethods([
- 'getConnection',
- ])
+ ->setMethods(
+ [
+ 'getConnection',
+ ]
+ )
->getMock();
$connectionManager->expects($this->any())
diff --git a/app/code/Magento/Elasticsearch/etc/di.xml b/app/code/Magento/Elasticsearch/etc/di.xml
index 55df6a5a37f46..f42d957276d76 100644
--- a/app/code/Magento/Elasticsearch/etc/di.xml
+++ b/app/code/Magento/Elasticsearch/etc/di.xml
@@ -267,7 +267,7 @@
- Magento\Elasticsearch\Elasticsearch5\Model\Client\ElasticsearchFactory
+ Magento\Elasticsearch\Elasticsearch5\Model\Client\ClientFactoryProxy
Magento\Elasticsearch\Model\Config
diff --git a/app/code/Magento/Elasticsearch6/Test/Mftf/Data/ConfigData.xml b/app/code/Magento/Elasticsearch6/Test/Mftf/Data/ConfigData.xml
new file mode 100644
index 0000000000000..f1f2f39f4457b
--- /dev/null
+++ b/app/code/Magento/Elasticsearch6/Test/Mftf/Data/ConfigData.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ catalog/search/engine
+ 1
+ Elasticsearch 6.0+
+ elasticsearch6
+
+
diff --git a/app/code/Magento/Elasticsearch6/Test/Mftf/Suite/SearchEngineElasticsearchSuite.xml b/app/code/Magento/Elasticsearch6/Test/Mftf/Suite/SearchEngineElasticsearchSuite.xml
new file mode 100644
index 0000000000000..d612f5bd17a2f
--- /dev/null
+++ b/app/code/Magento/Elasticsearch6/Test/Mftf/Suite/SearchEngineElasticsearchSuite.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Email/Test/Mftf/ActionGroup/EmailTemplateActionGroup.xml b/app/code/Magento/Email/Test/Mftf/ActionGroup/EmailTemplateActionGroup.xml
index 1155930dd75ef..3b99ade32e6ce 100644
--- a/app/code/Magento/Email/Test/Mftf/ActionGroup/EmailTemplateActionGroup.xml
+++ b/app/code/Magento/Email/Test/Mftf/ActionGroup/EmailTemplateActionGroup.xml
@@ -21,7 +21,7 @@
