-### Labels applied by the Magento team
+### Labels Applied by the Magento Team
We apply labels to public Pull Requests and Issues to help other participants retrieve additional information about current progress, component assignments, Magento release lines, and much more.
Please review the [Code Contributions guide](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#labels) for detailed information on labels used in Magento 2 repositories.
-## Reporting security issues
+## Reporting Security Issues
-To report security vulnerabilities in Magento software or web sites, please create a Bugcrowd researcher account [there](https://bugcrowd.com/magento) to submit and follow-up your issue. Learn more about reporting security issues [here](https://magento.com/security/reporting-magento-security-issue).
+To report security vulnerabilities or learn more about reporting security issues in Magento software or web sites visit the [Magento Bug Bounty Program](https://hackerone.com/magento) on hackerone. Please create a hackerone account [there](https://hackerone.com/magento) to submit and follow-up your issue.
Stay up-to-date on the latest security news and patches for Magento by signing up for [Security Alert Notifications](https://magento.com/security/sign-up).
diff --git a/app/bootstrap.php b/app/bootstrap.php
index 0b13d12cece58..4974acdf0fc80 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -8,6 +8,9 @@
* Environment initialization
*/
error_reporting(E_ALL);
+if (in_array('phar', \stream_get_wrappers())) {
+ stream_wrapper_unregister('phar');
+}
#ini_set('display_errors', 1);
/* PHP version validation */
diff --git a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
index 6f0e42bdcbef1..82f70d92e4930 100644
--- a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
+++ b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
@@ -8,6 +8,11 @@
namespace Magento\AdminNotification\Block\Grid\Renderer;
+/**
+ * Renderer class for action in the admin notifications grid
+ *
+ * @package Magento\AdminNotification\Block\Grid\Renderer
+ */
class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
{
/**
@@ -37,7 +42,9 @@ public function __construct(
*/
public function render(\Magento\Framework\DataObject $row)
{
- $readDetailsHtml = $row->getUrl() ? 'getUiId('content-header') ?>>
+ cc_type,cc_number,avsPostalCodeResponseCode,avsStreetAddressResponseCode,cvvResponseCode,processorAuthorizationCode,processorResponseCode,processorResponseText,liabilityShifted,liabilityShiftPossible,riskDataId,riskDataDecision
Magento\Braintree\Model\AvsEmsCodeMapper
Magento\Braintree\Model\CvvEmsCodeMapper
- braintree
+ braintree_group
BraintreePayPalFacade
@@ -68,7 +68,7 @@
processorResponseCode,processorResponseText,paymentId
processorResponseCode,processorResponseText,paymentId,payerEmail
en_US,en_GB,en_AU,da_DK,fr_FR,fr_CA,de_DE,zh_HK,it_IT,nl_NL,no_NO,pl_PL,es_ES,sv_SE,tr_TR,pt_BR,ja_JP,id_ID,ko_KR,pt_PT,ru_RU,th_TH,zh_CN,zh_TW
- braintree
+ braintree_group
BraintreeCreditCardVaultFacade
@@ -78,7 +78,7 @@
Magento\Braintree\Model\InstantPurchase\CreditCard\TokenFormatter
Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider
- braintree
+ braintree_group
BraintreePayPalVaultFacade
@@ -88,7 +88,7 @@
Magento\Braintree\Model\InstantPurchase\PayPal\TokenFormatter
Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider
- braintree
+ braintree_group
diff --git a/app/code/Magento/Braintree/etc/frontend/di.xml b/app/code/Magento/Braintree/etc/frontend/di.xml
index ea417c407dffd..d8d3a93b71dc3 100644
--- a/app/code/Magento/Braintree/etc/frontend/di.xml
+++ b/app/code/Magento/Braintree/etc/frontend/di.xml
@@ -61,4 +61,12 @@
Magento\Braintree\Model\LocaleResolver
+
+
+
+ - Magento\Braintree\Model\Multishipping\PlaceOrder
+ - Magento\Braintree\Model\Multishipping\PlaceOrder
+
+
+
diff --git a/app/code/Magento/Braintree/etc/payment.xml b/app/code/Magento/Braintree/etc/payment.xml
index dbabd91151022..4cae049aaf5a9 100644
--- a/app/code/Magento/Braintree/etc/payment.xml
+++ b/app/code/Magento/Braintree/etc/payment.xml
@@ -8,8 +8,16 @@
-
+
+
+
+ 1
+
+
+ 1
+
+
diff --git a/app/code/Magento/Braintree/view/frontend/layout/multishipping_checkout_billing.xml b/app/code/Magento/Braintree/view/frontend/layout/multishipping_checkout_billing.xml
new file mode 100644
index 0000000000000..06390d403e63d
--- /dev/null
+++ b/app/code/Magento/Braintree/view/frontend/layout/multishipping_checkout_billing.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+ - Magento_Braintree::multishipping/form.phtml
+ - Magento_Braintree::multishipping/form_paypal.phtml
+
+
+
+
+
diff --git a/app/code/Magento/Braintree/view/frontend/templates/multishipping/form.phtml b/app/code/Magento/Braintree/view/frontend/templates/multishipping/form.phtml
new file mode 100644
index 0000000000000..bf8aa8dd09c2c
--- /dev/null
+++ b/app/code/Magento/Braintree/view/frontend/templates/multishipping/form.phtml
@@ -0,0 +1,29 @@
+
+
+
diff --git a/app/code/Magento/Braintree/view/frontend/templates/multishipping/form_paypal.phtml b/app/code/Magento/Braintree/view/frontend/templates/multishipping/form_paypal.phtml
new file mode 100644
index 0000000000000..ea3eb2214c2d8
--- /dev/null
+++ b/app/code/Magento/Braintree/view/frontend/templates/multishipping/form_paypal.phtml
@@ -0,0 +1,29 @@
+
+
+
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/hosted-fields.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/hosted-fields.js
new file mode 100644
index 0000000000000..1ceebc8e66282
--- /dev/null
+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/hosted-fields.js
@@ -0,0 +1,102 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/*browser:true*/
+/*global define*/
+
+define([
+ 'jquery',
+ 'Magento_Braintree/js/view/payment/method-renderer/hosted-fields',
+ 'Magento_Braintree/js/validator',
+ 'Magento_Ui/js/model/messageList',
+ 'mage/translate',
+ 'Magento_Checkout/js/model/full-screen-loader',
+ 'Magento_Checkout/js/action/set-payment-information',
+ 'Magento_Checkout/js/model/payment/additional-validators'
+], function (
+ $,
+ Component,
+ validator,
+ messageList,
+ $t,
+ fullScreenLoader,
+ setPaymentInformationAction,
+ additionalValidators
+) {
+ 'use strict';
+
+ return Component.extend({
+ defaults: {
+ template: 'Magento_Braintree/payment/multishipping/form'
+ },
+
+ /**
+ * Get list of available CC types
+ *
+ * @returns {Object}
+ */
+ getCcAvailableTypes: function () {
+ var availableTypes = validator.getAvailableCardTypes(),
+ billingCountryId;
+
+ billingCountryId = $('#multishipping_billing_country_id').val();
+
+ if (billingCountryId && validator.getCountrySpecificCardTypes(billingCountryId)) {
+ return validator.collectTypes(
+ availableTypes, validator.getCountrySpecificCardTypes(billingCountryId)
+ );
+ }
+
+ return availableTypes;
+ },
+
+ /**
+ * @override
+ */
+ placeOrder: function () {
+ var self = this;
+
+ this.validatorManager.validate(self, function () {
+ return self.setPaymentInformation();
+ });
+ },
+
+ /**
+ * @override
+ */
+ setPaymentInformation: function () {
+ if (additionalValidators.validate()) {
+
+ fullScreenLoader.startLoader();
+
+ $.when(
+ setPaymentInformationAction(
+ this.messageContainer,
+ this.getData()
+ )
+ ).done(this.done.bind(this))
+ .fail(this.fail.bind(this));
+ }
+ },
+
+ /**
+ * {Function}
+ */
+ fail: function () {
+ fullScreenLoader.stopLoader();
+
+ return this;
+ },
+
+ /**
+ * {Function}
+ */
+ done: function () {
+ fullScreenLoader.stopLoader();
+ $('#multishipping-billing-form').submit();
+
+ return this;
+ }
+ });
+});
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/paypal.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/paypal.js
new file mode 100644
index 0000000000000..6702e58d1214b
--- /dev/null
+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/paypal.js
@@ -0,0 +1,143 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/*browser:true*/
+/*global define*/
+define([
+ 'jquery',
+ 'underscore',
+ 'Magento_Braintree/js/view/payment/method-renderer/paypal',
+ 'Magento_Checkout/js/action/set-payment-information',
+ 'Magento_Checkout/js/model/payment/additional-validators',
+ 'Magento_Checkout/js/model/full-screen-loader',
+ 'mage/translate'
+], function (
+ $,
+ _,
+ Component,
+ setPaymentInformationAction,
+ additionalValidators,
+ fullScreenLoader,
+ $t
+) {
+ 'use strict';
+
+ return Component.extend({
+ defaults: {
+ template: 'Magento_Braintree/payment/multishipping/paypal',
+ submitButtonSelector: '#payment-continue span'
+ },
+
+ /**
+ * @override
+ */
+ onActiveChange: function (isActive) {
+ this.updateSubmitButtonTitle(isActive);
+
+ this._super(isActive);
+ },
+
+ /**
+ * @override
+ */
+ beforePlaceOrder: function (data) {
+ this._super(data);
+
+ this.updateSubmitButtonTitle(true);
+ },
+
+ /**
+ * @override
+ */
+ getShippingAddress: function () {
+ return {};
+ },
+
+ /**
+ * @override
+ */
+ getData: function () {
+ var data = this._super();
+
+ data['additional_data']['is_active_payment_token_enabler'] = true;
+
+ return data;
+ },
+
+ /**
+ * @override
+ */
+ isActiveVault: function () {
+ return true;
+ },
+
+ /**
+ * Skipping order review step on checkout with multiple addresses is not allowed.
+ *
+ * @returns {Boolean}
+ */
+ isSkipOrderReview: function () {
+ return false;
+ },
+
+ /**
+ * Checks if payment method nonce is already received.
+ *
+ * @returns {Boolean}
+ */
+ isPaymentMethodNonceReceived: function () {
+ return this.paymentMethodNonce !== null;
+ },
+
+ /**
+ * Updates submit button title on multi-addresses checkout billing form.
+ *
+ * @param {Boolean} isActive
+ */
+ updateSubmitButtonTitle: function (isActive) {
+ var title = this.isPaymentMethodNonceReceived() || !isActive ?
+ $t('Go to Review Your Order') : $t('Continue to PayPal');
+
+ $(this.submitButtonSelector).html(title);
+ },
+
+ /**
+ * @override
+ */
+ placeOrder: function () {
+ if (!this.isPaymentMethodNonceReceived()) {
+ this.payWithPayPal();
+ } else {
+ fullScreenLoader.startLoader();
+
+ $.when(
+ setPaymentInformationAction(
+ this.messageContainer,
+ this.getData()
+ )
+ ).done(this.done.bind(this))
+ .fail(this.fail.bind(this));
+ }
+ },
+
+ /**
+ * {Function}
+ */
+ fail: function () {
+ fullScreenLoader.stopLoader();
+
+ return this;
+ },
+
+ /**
+ * {Function}
+ */
+ done: function () {
+ fullScreenLoader.stopLoader();
+ $('#multishipping-billing-form').submit();
+
+ return this;
+ }
+ });
+});
diff --git a/app/code/Magento/Braintree/view/frontend/web/template/payment/multishipping/form.html b/app/code/Magento/Braintree/view/frontend/web/template/payment/multishipping/form.html
new file mode 100644
index 0000000000000..964e15df166d3
--- /dev/null
+++ b/app/code/Magento/Braintree/view/frontend/web/template/payment/multishipping/form.html
@@ -0,0 +1,106 @@
+
+
+
+ * @author Magento Core Team
*/
-namespace Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes;
-
class Extend extends \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element
{
/**
@@ -75,7 +75,7 @@ public function getElementHtml()
}
/**
- * Execute method getElementHtml from parrent class
+ * Execute method getElementHtml from parent class
*
* @return string
*/
@@ -85,6 +85,8 @@ public function getParentElementHtml()
}
/**
+ * Get options.
+ *
* @return array
*/
public function getOptions()
@@ -106,6 +108,8 @@ public function getOptions()
}
/**
+ * Is disabled field.
+ *
* @return bool
*/
public function isDisabledField()
@@ -118,6 +122,8 @@ public function isDisabledField()
}
/**
+ * Get product.
+ *
* @return mixed
*/
public function getProduct()
@@ -129,6 +135,8 @@ public function getProduct()
}
/**
+ * Get extended element.
+ *
* @param string $switchAttributeCode
* @return \Magento\Framework\Data\Form\Element\Select
* @throws \Magento\Framework\Exception\LocalizedException
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
index 7c63af0bd0e2e..7c5a64ca0232f 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
@@ -6,6 +6,8 @@
namespace Magento\Bundle\Block\Catalog\Product\View\Type\Bundle;
+use Magento\Catalog\Model\Product;
+
/**
* Bundle option renderer
* @api
@@ -169,7 +171,7 @@ protected function assignSelection(\Magento\Bundle\Model\Option $option, $select
{
if (is_array($selectionId)) {
$this->_selectedOptions = $selectionId;
- } else if ($selectionId && $option->getSelectionById($selectionId)) {
+ } elseif ($selectionId && $option->getSelectionById($selectionId)) {
$this->_selectedOptions = $selectionId;
} elseif (!$option->getRequired()) {
$this->_selectedOptions = 'None';
@@ -179,7 +181,7 @@ protected function assignSelection(\Magento\Bundle\Model\Option $option, $select
/**
* Define if selection is selected
*
- * @param \Magento\Catalog\Model\Product $selection
+ * @param Product $selection
* @return bool
*/
public function isSelected($selection)
@@ -219,7 +221,7 @@ protected function _getSelectedQty()
/**
* Get product model
*
- * @return \Magento\Catalog\Model\Product
+ * @return Product
*/
public function getProduct()
{
@@ -232,7 +234,7 @@ public function getProduct()
/**
* Get bundle option price title.
*
- * @param \Magento\Catalog\Model\Product $selection
+ * @param Product $selection
* @param bool $includeContainer
* @return string
*/
@@ -254,7 +256,7 @@ public function getSelectionQtyTitlePrice($selection, $includeContainer = true)
/**
* Get price for selection product
*
- * @param \Magento\Catalog\Model\Product $selection
+ * @param Product $selection
* @return int|float
*/
public function getSelectionPrice($selection)
@@ -277,7 +279,7 @@ public function getSelectionPrice($selection)
/**
* Get title price for selection product
*
- * @param \Magento\Catalog\Model\Product $selection
+ * @param Product $selection
* @param bool $includeContainer
* @return string
*/
@@ -299,7 +301,7 @@ public function getSelectionTitlePrice($selection, $includeContainer = true)
*/
public function setValidationContainer($elementId, $containerId)
{
- return;
+ return '';
}
/**
@@ -318,7 +320,7 @@ public function setOption(\Magento\Bundle\Model\Option $option)
/**
* Format price string
*
- * @param \Magento\Catalog\Model\Product $selection
+ * @param Product $selection
* @param bool $includeContainer
* @return string
*/
diff --git a/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php b/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php
index c75ebc700603b..863f273225693 100644
--- a/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php
+++ b/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php
@@ -69,6 +69,7 @@ public function __construct(
/**
* Overloaded method for getting list of bundle options
+ *
* Caches result in quote item, because it can be used in cart 'recent view' and on same page in cart checkout
*
* @return array
@@ -88,7 +89,7 @@ public function getMessages()
$messages = [];
$quoteItem = $this->getItem();
- // Add basic messages occuring during this page load
+ // Add basic messages occurring during this page load
$baseMessages = $quoteItem->getMessage(false);
if ($baseMessages) {
foreach ($baseMessages as $message) {
diff --git a/app/code/Magento/Bundle/Block/DataProviders/OptionPriceRenderer.php b/app/code/Magento/Bundle/Block/DataProviders/OptionPriceRenderer.php
new file mode 100644
index 0000000000000..058b3a981b52f
--- /dev/null
+++ b/app/code/Magento/Bundle/Block/DataProviders/OptionPriceRenderer.php
@@ -0,0 +1,63 @@
+layout = $layout;
+ }
+
+ /**
+ * Format tier price string
+ *
+ * @param Product $selection
+ * @param array $arguments
+ * @return string
+ */
+ public function renderTierPrice(Product $selection, array $arguments = []): string
+ {
+ if (!array_key_exists('zone', $arguments)) {
+ $arguments['zone'] = Render::ZONE_ITEM_OPTION;
+ }
+
+ $priceHtml = '';
+
+ /** @var Render $priceRender */
+ $priceRender = $this->layout->getBlock('product.price.render.default');
+ if ($priceRender !== false) {
+ $priceHtml = $priceRender->render(
+ TierPrice::PRICE_CODE,
+ $selection,
+ $arguments
+ );
+ }
+
+ return $priceHtml;
+ }
+}
diff --git a/app/code/Magento/Bundle/Model/Product/Price.php b/app/code/Magento/Bundle/Model/Product/Price.php
index 00b6b2d7a3f5a..0e75ad2dc828c 100644
--- a/app/code/Magento/Bundle/Model/Product/Price.php
+++ b/app/code/Magento/Bundle/Model/Product/Price.php
@@ -11,8 +11,11 @@
use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
/**
+ * Bundle product type price model
+ *
* @api
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
* @since 100.0.2
*/
class Price extends \Magento\Catalog\Model\Product\Type\Price
@@ -180,9 +183,9 @@ protected function getBundleSelectionIds(\Magento\Catalog\Model\Product $product
/**
* Get product final price
*
- * @param float $qty
- * @param \Magento\Catalog\Model\Product $product
- * @return float
+ * @param float $qty
+ * @param \Magento\Catalog\Model\Product $product
+ * @return float
*/
public function getFinalPrice($qty, $product)
{
@@ -207,9 +210,9 @@ public function getFinalPrice($qty, $product)
* Returns final price of a child product
*
* @param \Magento\Catalog\Model\Product $product
- * @param float $productQty
+ * @param float $productQty
* @param \Magento\Catalog\Model\Product $childProduct
- * @param float $childProductQty
+ * @param float $childProductQty
* @return float
*/
public function getChildFinalPrice($product, $productQty, $childProduct, $childProductQty)
@@ -220,10 +223,10 @@ public function getChildFinalPrice($product, $productQty, $childProduct, $childP
/**
* Retrieve Price considering tier price
*
- * @param \Magento\Catalog\Model\Product $product
- * @param string|null $which
- * @param bool|null $includeTax
- * @param bool $takeTierPrice
+ * @param \Magento\Catalog\Model\Product $product
+ * @param string|null $which
+ * @param bool|null $includeTax
+ * @param bool $takeTierPrice
* @return float|array
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
@@ -255,67 +258,68 @@ public function getTotalPrices($product, $which = null, $includeTax = null, $tak
foreach ($options as $option) {
/* @var $option \Magento\Bundle\Model\Option */
$selections = $option->getSelections();
- if ($selections) {
- $selectionMinimalPrices = [];
- $selectionMaximalPrices = [];
-
- foreach ($option->getSelections() as $selection) {
- /* @var $selection \Magento\Bundle\Model\Selection */
- if (!$selection->isSalable()) {
- /**
- * @todo CatalogInventory Show out of stock Products
- */
- continue;
- }
-
- $qty = $selection->getSelectionQty();
-
- $item = $product->getPriceType() == self::PRICE_TYPE_FIXED ? $product : $selection;
-
- $selectionMinimalPrices[] = $this->_catalogData->getTaxPrice(
- $item,
- $this->getSelectionFinalTotalPrice(
- $product,
- $selection,
- 1,
- $qty,
- true,
- $takeTierPrice
- ),
- $includeTax
- );
- $selectionMaximalPrices[] = $this->_catalogData->getTaxPrice(
- $item,
- $this->getSelectionFinalTotalPrice(
- $product,
- $selection,
- 1,
- null,
- true,
- $takeTierPrice
- ),
- $includeTax
+ if (empty($selections)) {
+ continue;
+ }
+ $selectionMinimalPrices = [];
+ $selectionMaximalPrices = [];
+
+ foreach ($option->getSelections() as $selection) {
+ /* @var $selection \Magento\Bundle\Model\Selection */
+ if (!$selection->isSalable()) {
+ /**
+ * @todo CatalogInventory Show out of stock Products
+ */
+ continue;
+ }
+
+ $qty = $selection->getSelectionQty();
+
+ $item = $product->getPriceType() == self::PRICE_TYPE_FIXED ? $product : $selection;
+
+ $selectionMinimalPrices[] = $this->_catalogData->getTaxPrice(
+ $item,
+ $this->getSelectionFinalTotalPrice(
+ $product,
+ $selection,
+ 1,
+ $qty,
+ true,
+ $takeTierPrice
+ ),
+ $includeTax
+ );
+ $selectionMaximalPrices[] = $this->_catalogData->getTaxPrice(
+ $item,
+ $this->getSelectionFinalTotalPrice(
+ $product,
+ $selection,
+ 1,
+ null,
+ true,
+ $takeTierPrice
+ ),
+ $includeTax
+ );
+ }
+
+ if (count($selectionMinimalPrices)) {
+ $selMinPrice = min($selectionMinimalPrices);
+ if ($option->getRequired()) {
+ $minimalPrice += $selMinPrice;
+ $minPriceFounded = true;
+ } elseif (true !== $minPriceFounded) {
+ $selMinPrice += $minimalPrice;
+ $minPriceFounded = false === $minPriceFounded ? $selMinPrice : min(
+ $minPriceFounded,
+ $selMinPrice
);
}
- if (count($selectionMinimalPrices)) {
- $selMinPrice = min($selectionMinimalPrices);
- if ($option->getRequired()) {
- $minimalPrice += $selMinPrice;
- $minPriceFounded = true;
- } elseif (true !== $minPriceFounded) {
- $selMinPrice += $minimalPrice;
- $minPriceFounded = false === $minPriceFounded ? $selMinPrice : min(
- $minPriceFounded,
- $selMinPrice
- );
- }
-
- if ($option->isMultiSelection()) {
- $maximalPrice += array_sum($selectionMaximalPrices);
- } else {
- $maximalPrice += max($selectionMaximalPrices);
- }
+ if ($option->isMultiSelection()) {
+ $maximalPrice += array_sum($selectionMaximalPrices);
+ } else {
+ $maximalPrice += max($selectionMaximalPrices);
}
}
}
@@ -338,23 +342,25 @@ public function getTotalPrices($product, $which = null, $includeTax = null, $tak
$prices[] = $valuePrice;
}
- if (count($prices)) {
- if ($customOption->getIsRequire()) {
- $minimalPrice += $this->_catalogData->getTaxPrice($product, min($prices), $includeTax);
- }
-
- $multiTypes = [
- \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_CHECKBOX,
- \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_MULTIPLE,
- ];
-
- if (in_array($customOption->getType(), $multiTypes)) {
- $maximalValue = array_sum($prices);
- } else {
- $maximalValue = max($prices);
- }
- $maximalPrice += $this->_catalogData->getTaxPrice($product, $maximalValue, $includeTax);
+ if (empty($prices)) {
+ continue;
+ }
+
+ if ($customOption->getIsRequire()) {
+ $minimalPrice += $this->_catalogData->getTaxPrice($product, min($prices), $includeTax);
+ }
+
+ $multiTypes = [
+ \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_CHECKBOX,
+ \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_MULTIPLE,
+ ];
+
+ if (in_array($customOption->getType(), $multiTypes)) {
+ $maximalValue = array_sum($prices);
+ } else {
+ $maximalValue = max($prices);
}
+ $maximalPrice += $this->_catalogData->getTaxPrice($product, $maximalValue, $includeTax);
} else {
$valuePrice = $customOption->getPrice(true);
@@ -402,8 +408,8 @@ public function getOptions($product)
*
* @param \Magento\Catalog\Model\Product $bundleProduct
* @param \Magento\Catalog\Model\Product $selectionProduct
- * @param float|null $selectionQty
- * @param null|bool $multiplyQty Whether to multiply selection's price by its quantity
+ * @param float|null $selectionQty
+ * @param null|bool $multiplyQty Whether to multiply selection's price by its quantity
* @return float
*
* @see \Magento\Bundle\Model\Product\Price::getSelectionFinalTotalPrice()
@@ -418,7 +424,7 @@ public function getSelectionPrice($bundleProduct, $selectionProduct, $selectionQ
*
* @param \Magento\Catalog\Model\Product $bundleProduct
* @param \Magento\Catalog\Model\Product $selectionProduct
- * @param float $qty
+ * @param float $qty
* @return float
*/
public function getSelectionPreFinalPrice($bundleProduct, $selectionProduct, $qty = null)
@@ -427,15 +433,14 @@ public function getSelectionPreFinalPrice($bundleProduct, $selectionProduct, $qt
}
/**
- * Calculate final price of selection
- * with take into account tier price
+ * Calculate final price of selection with take into account tier price
*
- * @param \Magento\Catalog\Model\Product $bundleProduct
- * @param \Magento\Catalog\Model\Product $selectionProduct
- * @param float $bundleQty
- * @param float $selectionQty
- * @param bool $multiplyQty
- * @param bool $takeTierPrice
+ * @param \Magento\Catalog\Model\Product $bundleProduct
+ * @param \Magento\Catalog\Model\Product $selectionProduct
+ * @param float $bundleQty
+ * @param float $selectionQty
+ * @param bool $multiplyQty
+ * @param bool $takeTierPrice
* @return float
*/
public function getSelectionFinalTotalPrice(
@@ -454,7 +459,11 @@ public function getSelectionFinalTotalPrice(
}
if ($bundleProduct->getPriceType() == self::PRICE_TYPE_DYNAMIC) {
- $price = $selectionProduct->getFinalPrice($takeTierPrice ? $selectionQty : 1);
+ $totalQty = $bundleQty * $selectionQty;
+ if (!$takeTierPrice || $totalQty === 0) {
+ $totalQty = 1;
+ }
+ $price = $selectionProduct->getFinalPrice($totalQty);
} else {
if ($selectionProduct->getSelectionPriceType()) {
// percent
@@ -485,10 +494,10 @@ public function getSelectionFinalTotalPrice(
/**
* Apply tier price for bundle
*
- * @param \Magento\Catalog\Model\Product $product
- * @param float $qty
- * @param float $finalPrice
- * @return float
+ * @param \Magento\Catalog\Model\Product $product
+ * @param float $qty
+ * @param float $finalPrice
+ * @return float
*/
protected function _applyTierPrice($product, $qty, $finalPrice)
{
@@ -509,9 +518,9 @@ protected function _applyTierPrice($product, $qty, $finalPrice)
/**
* Get product tier price by qty
*
- * @param float $qty
- * @param \Magento\Catalog\Model\Product $product
- * @return float|array
+ * @param float $qty
+ * @param \Magento\Catalog\Model\Product $product
+ * @return float|array
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
@@ -605,11 +614,11 @@ public function getTierPrice($qty, $product)
/**
* Calculate and apply special price
*
- * @param float $finalPrice
- * @param float $specialPrice
+ * @param float $finalPrice
+ * @param float $specialPrice
* @param string $specialPriceFrom
* @param string $specialPriceTo
- * @param mixed $store
+ * @param mixed $store
* @return float
*/
public function calculateSpecialPrice(
@@ -634,7 +643,7 @@ public function calculateSpecialPrice(
*
* @param /Magento/Catalog/Model/Product $bundleProduct
* @param float|string $price
- * @param int $bundleQty
+ * @param int $bundleQty
* @return float
*/
public function getLowestPrice($bundleProduct, $price, $bundleQty = 1)
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiBundleProductActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiBundleProductActionGroup.xml
index ad9a8253e910c..4cd16320d3d78 100644
--- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiBundleProductActionGroup.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiBundleProductActionGroup.xml
@@ -106,4 +106,62 @@
+
+
+
+
+ 10
+
+
+ 20
+
+
+
+ {{productName}}
+
+
+ Drop-down Option
+
+
+ Radio Buttons Option
+
+
+ Checkbox Option
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
index e36730a87b41a..1767db0a00974 100644
--- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
@@ -38,4 +38,24 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
index dbe48c46c820b..30a7e8b777f3b 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
@@ -26,11 +26,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Buy 5 for $5.00 each and save 50%
+ DropDownTierPriceTextProduct1
+
+
+
+ Buy 7 for $15.00 each and save 25%
+ dropDownTierPriceTextProduct2
+
+
+
+
+
+ Buy 5 for $5.00 each and save 50%
+ radioButtonsOptionTierPriceTextProduct1
+
+
+
+ Buy 7 for $15.00 each and save 25%
+ radioButtonsOptionTierPriceTextProduct2
+
+
+
+
+
+ Buy 5 for $5.00 each and save 50%
+ checkBoxOptionTierPriceTextProduct1
+
+
+
+ Buy 7 for $15.00 each and save 25%
+ checkBoxOptionTierPriceTextProduct2
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Unit/Block/DataProviders/OptionPriceRendererTest.php b/app/code/Magento/Bundle/Test/Unit/Block/DataProviders/OptionPriceRendererTest.php
new file mode 100644
index 0000000000000..1af73bafc6256
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Unit/Block/DataProviders/OptionPriceRendererTest.php
@@ -0,0 +1,99 @@
+layoutMock = $this->createMock(
+ LayoutInterface::class
+ );
+
+ $this->renderer = $objectManager->getObject(
+ OptionPriceRenderer::class,
+ ['layout' => $this->layoutMock]
+ );
+ }
+
+ /**
+ * Test to render Tier price html
+ *
+ * @return void
+ */
+ public function testRenderTierPrice(): void
+ {
+ $expectedHtml = 'tier price html';
+ $expectedArguments = ['zone' => Render::ZONE_ITEM_OPTION];
+
+ $productMock = $this->createMock(Product::class);
+
+ $priceRenderer = $this->createPartialMock(BlockInterface::class, ['toHtml', 'render']);
+ $priceRenderer->expects($this->once())
+ ->method('render')
+ ->with('tier_price', $productMock, $expectedArguments)
+ ->willReturn($expectedHtml);
+
+ $this->layoutMock->method('getBlock')
+ ->with('product.price.render.default')
+ ->willReturn($priceRenderer);
+
+ $this->assertEquals(
+ $expectedHtml,
+ $this->renderer->renderTierPrice($productMock),
+ 'Render Tier price is wrong'
+ );
+ }
+
+ /**
+ * Test to render Tier price html when render block is not exists
+ *
+ * @return void
+ */
+ public function testRenderTierPriceNotExist(): void
+ {
+ $productMock = $this->createMock(Product::class);
+
+ $this->layoutMock->method('getBlock')
+ ->with('product.price.render.default')
+ ->willReturn(false);
+
+ $this->assertEquals(
+ '',
+ $this->renderer->renderTierPrice($productMock),
+ 'Render Tier price is wrong'
+ );
+ }
+}
diff --git a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
index e56cc6f32d804..49ee253ad1e88 100644
--- a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
+++ b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
@@ -27,7 +27,8 @@ define([
'<% } %>',
controlContainer: 'dd', // should be eliminated
priceFormat: {},
- isFixedPrice: false
+ isFixedPrice: false,
+ optionTierPricesBlocksSelector: '#option-tier-prices-{1} [data-role="selection-tier-prices"]'
};
$.widget('mage.priceBundle', {
@@ -91,6 +92,8 @@ define([
if (changes) {
priceBox.trigger('updatePrice', changes);
}
+
+ this._displayTierPriceBlock(bundleOption);
this.updateProductSummary();
},
@@ -207,6 +210,35 @@ define([
return this;
},
+ /**
+ * Show or hide option tier prices block
+ *
+ * @param {Object} optionElement
+ * @private
+ */
+ _displayTierPriceBlock: function (optionElement) {
+ var optionType = optionElement.prop('type'),
+ optionId,
+ optionValue,
+ optionTierPricesElements;
+
+ if (optionType === 'select-one') {
+ optionId = utils.findOptionId(optionElement[0]);
+ optionValue = optionElement.val() || null;
+ optionTierPricesElements = $(this.options.optionTierPricesBlocksSelector.replace('{1}', optionId));
+
+ _.each(optionTierPricesElements, function (tierPriceElement) {
+ var selectionId = $(tierPriceElement).data('selection-id') + '';
+
+ if (selectionId === optionValue) {
+ $(tierPriceElement).show();
+ } else {
+ $(tierPriceElement).hide();
+ }
+ });
+ }
+ },
+
/**
* Handler to update productSummary box
*/
@@ -374,8 +406,17 @@ define([
function applyTierPrice(oneItemPrice, qty, optionConfig) {
var tiers = optionConfig.tierPrice,
magicKey = _.keys(oneItemPrice)[0],
+ tiersFirstKey = _.keys(optionConfig)[0],
lowest = false;
+ if (!tiers) {//tiers is undefined when options has only one option
+ tiers = optionConfig[tiersFirstKey].tierPrice;
+ }
+
+ tiers.sort(function (a, b) {//sorting based on "price_qty"
+ return a['price_qty'] - b['price_qty'];
+ });
+
_.each(tiers, function (tier, index) {
if (tier['price_qty'] > qty) {
return;
diff --git a/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml b/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml
index 5b8c050e5af54..d12f2e8f6a952 100644
--- a/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml
+++ b/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml
@@ -29,10 +29,22 @@
-
+
+ \Magento\Bundle\Block\DataProviders\OptionPriceRenderer
+
+
+
+ \Magento\Bundle\Block\DataProviders\OptionPriceRenderer
+
+
+
+
+ \Magento\Bundle\Block\DataProviders\OptionPriceRenderer
+
+
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
index bda649eb603e6..830d03c826f32 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
@@ -19,6 +19,7 @@
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
index 7ea89e8609818..1f33d97227ea3 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
@@ -21,6 +21,7 @@
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
index 977daa2b2a446..4ea00f62b2043 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
@@ -20,6 +20,7 @@
getUiId('content-header') ?>>
getChildHtml() ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html b/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html
index fe30ca7e83f19..0033f4c071e42 100644
--- a/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html
+++ b/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html
@@ -69,7 +69,7 @@
+
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/view/frontend/web/template/payment/multishipping/paypal.html b/app/code/Magento/Braintree/view/frontend/web/template/payment/multishipping/paypal.html
new file mode 100644
index 0000000000000..722989e41f98f
--- /dev/null
+++ b/app/code/Magento/Braintree/view/frontend/web/template/payment/multishipping/paypal.html
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
index 0e21e566d5e75..a768e2450bfe8 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
@@ -4,13 +4,13 @@
* See COPYING.txt for license details.
*/
+namespace Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes;
+
/**
- * Bundle Extended Attribures Block
+ * Bundle Extended Attribures Block.
*
- * @author Magento Core Team
+
+
+
+
+
+
showSingle()): ?>
getSelectionTitlePrice($_selections[0]) ?>
+ getTierPriceRenderer()->renderTierPrice($_selections[0]) ?>
+
+
+
+ getTierPriceRenderer()->renderTierPrice($_selection) ?>
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AdminLoginWithCaptchaActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AdminLoginWithCaptchaActionGroup.xml
new file mode 100644
index 0000000000000..07329e2659876
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AdminLoginWithCaptchaActionGroup.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaNotVisibleOnCustomerLoginFormActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaNotVisibleOnCustomerLoginFormActionGroup.xml
new file mode 100644
index 0000000000000..a371f177e3552
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaNotVisibleOnCustomerLoginFormActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnAdminLoginFormActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnAdminLoginFormActionGroup.xml
new file mode 100644
index 0000000000000..aa02588000d2b
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnAdminLoginFormActionGroup.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnContactUsFormActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnContactUsFormActionGroup.xml
new file mode 100644
index 0000000000000..d800c65cabb60
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnContactUsFormActionGroup.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerAccountCreatePageActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerAccountCreatePageActionGroup.xml
new file mode 100644
index 0000000000000..6c09d1d49381f
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerAccountCreatePageActionGroup.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerAccountInfoActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerAccountInfoActionGroup.xml
new file mode 100644
index 0000000000000..c68ffbfb5be4b
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerAccountInfoActionGroup.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerLoginFormActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerLoginFormActionGroup.xml
new file mode 100644
index 0000000000000..5616b099c026d
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerLoginFormActionGroup.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/CaptchaFormsDisplayingActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/CaptchaFormsDisplayingActionGroup.xml
index beb2c2bffa135..f3b6eb1d9af84 100644
--- a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/CaptchaFormsDisplayingActionGroup.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/CaptchaFormsDisplayingActionGroup.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillContactUsFormWithCaptchaActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillContactUsFormWithCaptchaActionGroup.xml
new file mode 100644
index 0000000000000..3546fa2e57a33
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillContactUsFormWithCaptchaActionGroup.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCustomerAccountCreationFormWithCaptchaActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCustomerAccountCreationFormWithCaptchaActionGroup.xml
new file mode 100644
index 0000000000000..d67ebc1a00768
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCustomerAccountCreationFormWithCaptchaActionGroup.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCustomerLoginFormWithCaptchaActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCustomerLoginFormWithCaptchaActionGroup.xml
new file mode 100644
index 0000000000000..5ad727a8fe99d
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCustomerLoginFormWithCaptchaActionGroup.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml
new file mode 100644
index 0000000000000..90f48c320f2ac
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+ customer/captcha/enable
+ 0
+ Yes
+ 1
+
+
+ customer/captcha/enable
+ 0
+ No
+ 0
+
+
+ customer/captcha/forms
+ 0
+ Create user
+ user_create
+
+
+ customer/captcha/forms
+ 0
+ Contact Us
+ contact_us
+
+
+
+ customer/captcha/forms
+ 0
+ Login
+ user_login
+
+
+ customer/captcha/forms
+ 0
+ Change password
+ user_edit
+
+
+
+ customer/captcha/forms
+ 0
+ Forgot password
+ user_forgotpassword
+
+
+ customer/captcha/mode
+ 0
+ Always
+ always
+
+
+
+ customer/captcha/mode
+ 0
+ After number of attempts to login
+ after_fail
+
+
+ customer/captcha/length
+ admin
+ 1
+ 3
+ 3
+
+
+ customer/captcha/symbols
+ admin
+ 1
+ 1
+ 1
+
+
+
+ customer/captcha/length
+ admin
+ 1
+ 4-5
+ 4-5
+
+
+
+ customer/captcha/symbols
+ admin
+ 1
+ ABCDEFGHJKMnpqrstuvwxyz23456789
+ ABCDEFGHJKMnpqrstuvwxyz23456789
+
+
+
+ admin/captcha/enable
+ 0
+ Yes
+ 1
+
+
+ admin/captcha/enable
+ 0
+ No
+ 0
+
+
+ admin/captcha/length
+ admin
+ 1
+ 3
+ 3
+
+
+ admin/captcha/symbols
+ admin
+ 1
+ 1
+ 1
+
+
+
+ admin/captcha/length
+ admin
+ 1
+ 4-5
+ 4-5
+
+
+
+ admin/captcha/symbols
+ admin
+ 1
+ ABCDEFGHJKMnpqrstuvwxyz23456789
+ ABCDEFGHJKMnpqrstuvwxyz23456789
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaData.xml b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaData.xml
new file mode 100644
index 0000000000000..d8fb206b8111c
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaData.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+ WrongCAPTCHA
+
+
+
+
+ 111
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaFormsDisplayingData.xml b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaFormsDisplayingData.xml
index 9db8110c0f64b..57a09219fe4db 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaFormsDisplayingData.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaFormsDisplayingData.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
Create user
Login
diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/AdminLoginFormSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/AdminLoginFormSection.xml
new file mode 100644
index 0000000000000..2bcc6fc542d82
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Section/AdminLoginFormSection.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsCaptchaSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsCaptchaSection.xml
new file mode 100644
index 0000000000000..f587812576ff1
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsCaptchaSection.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsFormSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsFormSection.xml
new file mode 100644
index 0000000000000..60cf961ba7e8c
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsFormSection.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml
new file mode 100644
index 0000000000000..a273c8d4abd28
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
new file mode 100644
index 0000000000000..f48e6124cb214
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
index 7a0557c4a2744..54aa36d1ca267 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
@@ -8,7 +8,7 @@
-
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/AdminLoginWithCaptchaTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/AdminLoginWithCaptchaTest.xml
new file mode 100644
index 0000000000000..e5ee55910df65
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/AdminLoginWithCaptchaTest.xml
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaEditCustomerEmailTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaEditCustomerEmailTest.xml
new file mode 100644
index 0000000000000..54237087227d8
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaEditCustomerEmailTest.xml
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnContactUsTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnContactUsTest.xml
new file mode 100644
index 0000000000000..0c6a3f31c1df2
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnContactUsTest.xml
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnCustomerLoginTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnCustomerLoginTest.xml
new file mode 100644
index 0000000000000..5a1be68d3f251
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnCustomerLoginTest.xml
@@ -0,0 +1,79 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaRegisterNewCustomerTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaRegisterNewCustomerTest.xml
new file mode 100644
index 0000000000000..2c331f958e467
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaRegisterNewCustomerTest.xml
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml
new file mode 100644
index 0000000000000..36d7989b9acc1
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Api/ProductRenderListInterface.php b/app/code/Magento/Catalog/Api/ProductRenderListInterface.php
index f79efa4c814d7..954acd35a07db 100644
--- a/app/code/Magento/Catalog/Api/ProductRenderListInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductRenderListInterface.php
@@ -4,18 +4,22 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
namespace Magento\Catalog\Api;
/**
- * Interface which provides product renders information for products
+ * Interface which provides product renders information for products.
+ *
* @api
* @since 101.1.0
*/
interface ProductRenderListInterface
{
/**
- * Collect and retrieve the list of product render info
- * This info contains raw prices and formated prices, product name, stock status, store_id, etc
+ * Collect and retrieve the list of product render info.
+ *
+ * This info contains raw prices and formatted prices, product name, stock status, store_id, etc.
+ *
* @see \Magento\Catalog\Api\Data\ProductRenderInfoDtoInterface
*
* @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
index a67f55235b6df..83ec501592489 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
@@ -71,7 +71,7 @@ public function __construct(
}
/**
- * @return void
+ * @inheritdoc
*/
protected function _construct()
{
@@ -80,7 +80,7 @@ protected function _construct()
}
/**
- * @return $this
+ * @inheritdoc
*/
protected function _prepareLayout()
{
@@ -182,6 +182,8 @@ public function getSuggestedCategoriesJson($namePart)
}
/**
+ * Get add root button html
+ *
* @return string
*/
public function getAddRootButtonHtml()
@@ -190,6 +192,8 @@ public function getAddRootButtonHtml()
}
/**
+ * Get add sub button html
+ *
* @return string
*/
public function getAddSubButtonHtml()
@@ -198,6 +202,8 @@ public function getAddSubButtonHtml()
}
/**
+ * Get expand button html
+ *
* @return string
*/
public function getExpandButtonHtml()
@@ -206,6 +212,8 @@ public function getExpandButtonHtml()
}
/**
+ * Get collapse button html
+ *
* @return string
*/
public function getCollapseButtonHtml()
@@ -214,6 +222,8 @@ public function getCollapseButtonHtml()
}
/**
+ * Get store switcher
+ *
* @return string
*/
public function getStoreSwitcherHtml()
@@ -222,6 +232,8 @@ public function getStoreSwitcherHtml()
}
/**
+ * Get loader tree url
+ *
* @param bool|null $expanded
* @return string
*/
@@ -235,6 +247,8 @@ public function getLoadTreeUrl($expanded = null)
}
/**
+ * Get nodes url
+ *
* @return string
*/
public function getNodesUrl()
@@ -243,6 +257,8 @@ public function getNodesUrl()
}
/**
+ * Get switcher tree url
+ *
* @return string
*/
public function getSwitchTreeUrl()
@@ -254,6 +270,8 @@ public function getSwitchTreeUrl()
}
/**
+ * Get is was expanded
+ *
* @return bool
* @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
@@ -263,6 +281,8 @@ public function getIsWasExpanded()
}
/**
+ * Get move url
+ *
* @return string
*/
public function getMoveUrl()
@@ -271,6 +291,8 @@ public function getMoveUrl()
}
/**
+ * Get tree
+ *
* @param mixed|null $parenNodeCategory
* @return array
*/
@@ -282,6 +304,8 @@ public function getTree($parenNodeCategory = null)
}
/**
+ * Get tree json
+ *
* @param mixed|null $parenNodeCategory
* @return string
*/
@@ -367,7 +391,7 @@ protected function _getNodeJson($node, $level = 0)
}
}
- if ($isParent || $node->getLevel() < 2) {
+ if ($isParent || $node->getLevel() < 1) {
$item['expanded'] = true;
}
@@ -390,6 +414,8 @@ public function buildNodeName($node)
}
/**
+ * Is category movable
+ *
* @param Node|array $node
* @return bool
*/
@@ -403,6 +429,8 @@ protected function _isCategoryMoveable($node)
}
/**
+ * Is parent selected category
+ *
* @param Node|array $node
* @return bool
*/
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
index dd09e40ac5b35..1b6756968662f 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
@@ -4,11 +4,6 @@
* See COPYING.txt for license details.
*/
-/**
- * Product attribute add/edit form main tab
- *
- * @author Magento Core Team
- */
namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab;
use Magento\Backend\Block\Widget\Form\Generic;
@@ -18,6 +13,8 @@
use Magento\Framework\App\ObjectManager;
/**
+ * Product attribute add/edit form main tab
+ *
* @api
* @since 100.0.2
*/
@@ -73,6 +70,7 @@ public function __construct(
* Adding product form elements for editing attribute
*
* @return $this
+ * @throws \Magento\Framework\Exception\LocalizedException
* @SuppressWarnings(PHPMD)
*/
protected function _prepareForm()
@@ -255,7 +253,7 @@ protected function _prepareForm()
}
/**
- * Initialize form fileds values
+ * Initialize form fields values
*
* @return $this
*/
diff --git a/app/code/Magento/Catalog/Block/Product/View/Gallery.php b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
index 706d9b83b9711..8b98fbdc8f7ef 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
@@ -207,8 +207,8 @@ public function isMainImage($image)
*/
public function getImageAttribute($imageId, $attributeName, $default = null)
{
- $attributes =
- $this->getConfigView()->getMediaAttributes('Magento_Catalog', Image::MEDIA_TYPE_CONFIG_NODE, $imageId);
+ $attributes = $this->getConfigView()
+ ->getMediaAttributes('Magento_Catalog', Image::MEDIA_TYPE_CONFIG_NODE, $imageId);
return $attributes[$attributeName] ?? $default;
}
diff --git a/app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php b/app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php
new file mode 100644
index 0000000000000..0384c9cd9acce
--- /dev/null
+++ b/app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php
@@ -0,0 +1,156 @@
+gallery = $gallery;
+ $this->jsonSerializer = $jsonSerializer;
+ parent::__construct($context, $arrayUtils, $data);
+ }
+
+ /**
+ * Retrieve gallery options in JSON format
+ *
+ * @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ElseExpression)
+ */
+ public function getOptionsJson()
+ {
+ $optionItems = null;
+
+ //Special case for gallery/nav which can be the string "thumbs/false/dots"
+ if (is_bool($this->getVar("gallery/nav"))) {
+ $optionItems['nav'] = $this->getVar("gallery/nav") ? 'true' : 'false';
+ } else {
+ $optionItems['nav'] = $this->escapeHtml($this->getVar("gallery/nav"));
+ }
+
+ $optionItems['loop'] = $this->getVar("gallery/loop");
+ $optionItems['keyboard'] = $this->getVar("gallery/keyboard");
+ $optionItems['arrows'] = $this->getVar("gallery/arrows");
+ $optionItems['allowfullscreen'] = $this->getVar("gallery/allowfullscreen");
+ $optionItems['showCaption'] = $this->getVar("gallery/caption");
+ $optionItems['width'] = (int)$this->escapeHtml(
+ $this->gallery->getImageAttribute('product_page_image_medium', 'width')
+ );
+ $optionItems['thumbwidth'] = (int)$this->escapeHtml(
+ $this->gallery->getImageAttribute('product_page_image_small', 'width')
+ );
+
+ if ($this->gallery->getImageAttribute('product_page_image_small', 'height') ||
+ $this->gallery->getImageAttribute('product_page_image_small', 'width')) {
+ $optionItems['thumbheight'] = (int)$this->escapeHtml(
+ $this->gallery->getImageAttribute('product_page_image_small', 'height') ?:
+ $this->gallery->getImageAttribute('product_page_image_small', 'width')
+ );
+ }
+
+ if ($this->gallery->getImageAttribute('product_page_image_medium', 'height') ||
+ $this->gallery->getImageAttribute('product_page_image_medium', 'width')) {
+ $optionItems['height'] = (int)$this->escapeHtml(
+ $this->gallery->getImageAttribute('product_page_image_medium', 'height') ?:
+ $this->gallery->getImageAttribute('product_page_image_medium', 'width')
+ );
+ }
+
+ if ($this->getVar("gallery/transition/duration")) {
+ $optionItems['transitionduration'] =
+ (int)$this->escapeHtml($this->getVar("gallery/transition/duration"));
+ }
+
+ $optionItems['transition'] = $this->escapeHtml($this->getVar("gallery/transition/effect"));
+ $optionItems['navarrows'] = $this->getVar("gallery/navarrows");
+ $optionItems['navtype'] = $this->escapeHtml($this->getVar("gallery/navtype"));
+ $optionItems['navdir'] = $this->escapeHtml($this->getVar("gallery/navdir"));
+
+ if ($this->getVar("gallery/thumbmargin")) {
+ $optionItems['thumbmargin'] = (int)$this->escapeHtml($this->getVar("gallery/thumbmargin"));
+ }
+
+ return $this->jsonSerializer->serialize($optionItems);
+ }
+
+ /**
+ * Retrieve gallery fullscreen options in JSON format
+ *
+ * @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ElseExpression)
+ */
+ public function getFSOptionsJson()
+ {
+ $fsOptionItems = null;
+
+ //Special case for gallery/nav which can be the string "thumbs/false/dots"
+ if (is_bool($this->getVar("gallery/fullscreen/nav"))) {
+ $fsOptionItems['nav'] = $this->getVar("gallery/fullscreen/nav") ? 'true' : 'false';
+ } else {
+ $fsOptionItems['nav'] = $this->escapeHtml($this->getVar("gallery/fullscreen/nav"));
+ }
+
+ $fsOptionItems['loop'] = $this->getVar("gallery/fullscreen/loop");
+ $fsOptionItems['navdir'] = $this->escapeHtml($this->getVar("gallery/fullscreen/navdir"));
+ $fsOptionItems['navarrows'] = $this->getVar("gallery/fullscreen/navarrows");
+ $fsOptionItems['navtype'] = $this->escapeHtml($this->getVar("gallery/fullscreen/navtype"));
+ $fsOptionItems['arrows'] = $this->getVar("gallery/fullscreen/arrows");
+ $fsOptionItems['showCaption'] = $this->getVar("gallery/fullscreen/caption");
+
+ if ($this->getVar("gallery/fullscreen/transition/duration")) {
+ $fsOptionItems['transitionduration'] = (int)$this->escapeHtml(
+ $this->getVar("gallery/fullscreen/transition/duration")
+ );
+ }
+
+ $fsOptionItems['transition'] = $this->escapeHtml($this->getVar("gallery/fullscreen/transition/effect"));
+
+ if ($this->getVar("gallery/fullscreen/keyboard")) {
+ $fsOptionItems['keyboard'] = $this->getVar("gallery/fullscreen/keyboard");
+ }
+
+ if ($this->getVar("gallery/fullscreen/thumbmargin")) {
+ $fsOptionItems['thumbmargin'] =
+ (int)$this->escapeHtml($this->getVar("gallery/fullscreen/thumbmargin"));
+ }
+
+ return $this->jsonSerializer->serialize($fsOptionItems);
+ }
+}
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
index 181211a0fc4a2..059580b9b5eae 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
@@ -9,11 +9,14 @@
*
* @author Magento Core Team
*/
+
namespace Magento\Catalog\Block\Product\View\Options;
use Magento\Catalog\Pricing\Price\CustomOptionPriceInterface;
/**
+ * Product aoptions section abstract block.
+ *
* @api
* @since 100.0.2
*/
@@ -46,7 +49,7 @@ abstract class AbstractOptions extends \Magento\Framework\View\Element\Template
/**
* @param \Magento\Framework\View\Element\Template\Context $context
* @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
- * @param \Magento\Catalog\Helper\Data $catalogData,
+ * @param \Magento\Catalog\Helper\Data $catalogData
* @param array $data
*/
public function __construct(
@@ -123,6 +126,8 @@ public function getFormattedPrice()
}
/**
+ * Retrieve formatted price.
+ *
* @return string
*
* @deprecated
@@ -134,7 +139,7 @@ public function getFormatedPrice()
}
/**
- * Return formated price
+ * Return formatted price
*
* @param array $value
* @param bool $flag
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
index 7df9b972e1501..d9d663b32f4de 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
@@ -3,8 +3,17 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
namespace Magento\Catalog\Block\Product\View\Options\Type;
+use Magento\Catalog\Model\Product\Option;
+use Magento\Catalog\Block\Product\View\Options\Type\Select\CheckableFactory;
+use Magento\Catalog\Block\Product\View\Options\Type\Select\MultipleFactory;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Framework\Pricing\Helper\Data;
+use Magento\Catalog\Helper\Data as CatalogHelper;
+
/**
* Product options text type block
*
@@ -13,169 +22,60 @@
*/
class Select extends \Magento\Catalog\Block\Product\View\Options\AbstractOptions
{
+ /**
+ * @var CheckableFactory
+ */
+ private $checkableFactory;
+ /**
+ * @var MultipleFactory
+ */
+ private $multipleFactory;
+
+ /**
+ * Select constructor.
+ * @param Context $context
+ * @param Data $pricingHelper
+ * @param CatalogHelper $catalogData
+ * @param array $data
+ * @param CheckableFactory|null $checkableFactory
+ * @param MultipleFactory|null $multipleFactory
+ */
+ public function __construct(
+ Context $context,
+ Data $pricingHelper,
+ CatalogHelper $catalogData,
+ array $data = [],
+ CheckableFactory $checkableFactory = null,
+ MultipleFactory $multipleFactory = null
+ ) {
+ parent::__construct($context, $pricingHelper, $catalogData, $data);
+ $this->checkableFactory = $checkableFactory ?: ObjectManager::getInstance()->get(CheckableFactory::class);
+ $this->multipleFactory = $multipleFactory ?: ObjectManager::getInstance()->get(MultipleFactory::class);
+ }
+
/**
* Return html for control element
*
* @return string
- * @SuppressWarnings(PHPMD.CyclomaticComplexity)
- * @SuppressWarnings(PHPMD.NPathComplexity)
- * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function getValuesHtml()
{
- $_option = $this->getOption();
- $configValue = $this->getProduct()->getPreconfiguredValues()->getData('options/' . $_option->getId());
- $store = $this->getProduct()->getStore();
-
- $this->setSkipJsReloadPrice(1);
- // Remove inline prototype onclick and onchange events
-
- if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DROP_DOWN ||
- $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_MULTIPLE
+ $option = $this->getOption();
+ $optionType = $option->getType();
+ if ($optionType === Option::OPTION_TYPE_DROP_DOWN ||
+ $optionType === Option::OPTION_TYPE_MULTIPLE
) {
- $require = $_option->getIsRequire() ? ' required' : '';
- $extraParams = '';
- $select = $this->getLayout()->createBlock(
- \Magento\Framework\View\Element\Html\Select::class
- )->setData(
- [
- 'id' => 'select_' . $_option->getId(),
- 'class' => $require . ' product-custom-option admin__control-select'
- ]
- );
- if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DROP_DOWN) {
- $select->setName('options[' . $_option->getId() . ']')->addOption('', __('-- Please Select --'));
- } else {
- $select->setName('options[' . $_option->getId() . '][]');
- $select->setClass('multiselect admin__control-multiselect' . $require . ' product-custom-option');
- }
- foreach ($_option->getValues() as $_value) {
- $priceStr = $this->_formatPrice(
- [
- 'is_percent' => $_value->getPriceType() == 'percent',
- 'pricing_value' => $_value->getPrice($_value->getPriceType() == 'percent'),
- ],
- false
- );
- $select->addOption(
- $_value->getOptionTypeId(),
- $_value->getTitle() . ' ' . strip_tags($priceStr) . '',
- ['price' => $this->pricingHelper->currencyByStore($_value->getPrice(true), $store, false)]
- );
- }
- if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_MULTIPLE) {
- $extraParams = ' multiple="multiple"';
- }
- if (!$this->getSkipJsReloadPrice()) {
- $extraParams .= ' onchange="opConfig.reloadPrice()"';
- }
- $extraParams .= ' data-selector="' . $select->getName() . '"';
- $select->setExtraParams($extraParams);
-
- if ($configValue) {
- $select->setValue($configValue);
- }
-
- return $select->getHtml();
+ $optionBlock = $this->multipleFactory->create();
}
-
- if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_RADIO ||
- $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_CHECKBOX
+ if ($optionType === Option::OPTION_TYPE_RADIO ||
+ $optionType === Option::OPTION_TYPE_CHECKBOX
) {
- $selectHtml = '';
-
- return $selectHtml;
+ $optionBlock = $this->checkableFactory->create();
}
+ return $optionBlock
+ ->setOption($option)
+ ->setProduct($this->getProduct())
+ ->setSkipJsReloadPrice(1)
+ ->_toHtml();
}
}
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Checkable.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Checkable.php
new file mode 100644
index 0000000000000..3d856f85dbd94
--- /dev/null
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Checkable.php
@@ -0,0 +1,68 @@
+ $value->getPriceType() === 'percent',
+ 'pricing_value' => $value->getPrice($value->getPriceType() === 'percent')
+ ]
+ );
+ }
+
+ /**
+ * Returns current currency for store
+ *
+ * @param ProductCustomOptionValuesInterface $value
+ * @return float|string
+ */
+ public function getCurrencyByStore(ProductCustomOptionValuesInterface $value)
+ {
+ /** @noinspection PhpMethodParametersCountMismatchInspection */
+ return $this->pricingHelper->currencyByStore(
+ $value->getPrice(true),
+ $this->getProduct()->getStore(),
+ false
+ );
+ }
+
+ /**
+ * Returns preconfigured value for given option
+ *
+ * @param Option $option
+ * @return string|array|null
+ */
+ public function getPreconfiguredValue(Option $option)
+ {
+ return $this->getProduct()->getPreconfiguredValues()->getData('options/' . $option->getId());
+ }
+}
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Multiple.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Multiple.php
new file mode 100644
index 0000000000000..09a931dfa0693
--- /dev/null
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Multiple.php
@@ -0,0 +1,112 @@
+getOption();
+ $optionType = $option->getType();
+ $configValue = $this->getProduct()->getPreconfiguredValues()->getData('options/' . $option->getId());
+ $require = $option->getIsRequire() ? ' required' : '';
+ $extraParams = '';
+ /** @var Select $select */
+ $select = $this->getLayout()->createBlock(
+ Select::class
+ )->setData(
+ [
+ 'id' => 'select_' . $option->getId(),
+ 'class' => $require . ' product-custom-option admin__control-select'
+ ]
+ );
+ $select = $this->insertSelectOption($select, $option);
+ $select = $this->processSelectOption($select, $option);
+ if ($optionType === Option::OPTION_TYPE_MULTIPLE) {
+ $extraParams = ' multiple="multiple"';
+ }
+ if (!$this->getSkipJsReloadPrice()) {
+ $extraParams .= ' onchange="opConfig.reloadPrice()"';
+ }
+ $extraParams .= ' data-selector="' . $select->getName() . '"';
+ $select->setExtraParams($extraParams);
+ if ($configValue) {
+ $select->setValue($configValue);
+ }
+ return $select->getHtml();
+ }
+
+ /**
+ * Returns select with inserted option give as a parameter
+ *
+ * @param Select $select
+ * @param Option $option
+ * @return Select
+ */
+ private function insertSelectOption(Select $select, Option $option): Select
+ {
+ $require = $option->getIsRequire() ? ' required' : '';
+ if ($option->getType() === Option::OPTION_TYPE_DROP_DOWN) {
+ $select->setName('options[' . $option->getId() . ']')->addOption('', __('-- Please Select --'));
+ } else {
+ $select->setName('options[' . $option->getId() . '][]');
+ $select->setClass('multiselect admin__control-multiselect' . $require . ' product-custom-option');
+ }
+
+ return $select;
+ }
+
+ /**
+ * Returns select with formated option prices
+ *
+ * @param Select $select
+ * @param Option $option
+ * @return Select
+ */
+ private function processSelectOption(Select $select, Option $option): Select
+ {
+ $store = $this->getProduct()->getStore();
+ foreach ($option->getValues() as $_value) {
+ $isPercentPriceType = $_value->getPriceType() === 'percent';
+ $priceStr = $this->_formatPrice(
+ [
+ 'is_percent' => $isPercentPriceType,
+ 'pricing_value' => $_value->getPrice($isPercentPriceType)
+ ],
+ false
+ );
+ $select->addOption(
+ $_value->getOptionTypeId(),
+ $_value->getTitle() . ' ' . strip_tags($priceStr) . '',
+ [
+ 'price' => $this->pricingHelper->currencyByStore(
+ $_value->getPrice(true),
+ $store,
+ false
+ )
+ ]
+ );
+ }
+
+ return $select;
+ }
+}
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
index 0730e7a7c5dc1..342bbc388f872 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
@@ -6,8 +6,10 @@
*/
namespace Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute;
-use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
use Magento\Backend\App\Action;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
/**
* Class Save
@@ -16,75 +18,68 @@
class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute implements HttpPostActionInterface
{
/**
- * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
+ * @var \Magento\Framework\Bulk\BulkManagementInterface
*/
- protected $_productFlatIndexerProcessor;
+ private $bulkManagement;
/**
- * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
+ * @var \Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory
*/
- protected $_productPriceIndexerProcessor;
+ private $operationFactory;
/**
- * Catalog product
- *
- * @var \Magento\Catalog\Helper\Product
+ * @var \Magento\Framework\DataObject\IdentityGeneratorInterface
*/
- protected $_catalogProduct;
+ private $identityService;
/**
- * @var \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory
+ * @var \Magento\Framework\Serialize\SerializerInterface
*/
- protected $stockItemFactory;
+ private $serializer;
/**
- * Stock Indexer
- *
- * @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor
+ * @var \Magento\Authorization\Model\UserContextInterface
*/
- protected $_stockIndexerProcessor;
+ private $userContext;
/**
- * @var \Magento\Framework\Api\DataObjectHelper
+ * @var int
*/
- protected $dataObjectHelper;
+ private $bulkSize;
/**
* @param Action\Context $context
* @param \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper
- * @param \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor
- * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor
- * @param \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor
- * @param \Magento\Catalog\Helper\Product $catalogProduct
- * @param \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory $stockItemFactory
- * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
+ * @param \Magento\Framework\Bulk\BulkManagementInterface $bulkManagement
+ * @param \Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory $operartionFactory
+ * @param \Magento\Framework\DataObject\IdentityGeneratorInterface $identityService
+ * @param \Magento\Framework\Serialize\SerializerInterface $serializer
+ * @param \Magento\Authorization\Model\UserContextInterface $userContext
+ * @param int $bulkSize
*/
public function __construct(
Action\Context $context,
\Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper,
- \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor,
- \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor,
- \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor,
- \Magento\Catalog\Helper\Product $catalogProduct,
- \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory $stockItemFactory,
- \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
+ \Magento\Framework\Bulk\BulkManagementInterface $bulkManagement,
+ \Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory $operartionFactory,
+ \Magento\Framework\DataObject\IdentityGeneratorInterface $identityService,
+ \Magento\Framework\Serialize\SerializerInterface $serializer,
+ \Magento\Authorization\Model\UserContextInterface $userContext,
+ int $bulkSize = 100
) {
- $this->_productFlatIndexerProcessor = $productFlatIndexerProcessor;
- $this->_productPriceIndexerProcessor = $productPriceIndexerProcessor;
- $this->_stockIndexerProcessor = $stockIndexerProcessor;
- $this->_catalogProduct = $catalogProduct;
- $this->stockItemFactory = $stockItemFactory;
parent::__construct($context, $attributeHelper);
- $this->dataObjectHelper = $dataObjectHelper;
+ $this->bulkManagement = $bulkManagement;
+ $this->operationFactory = $operartionFactory;
+ $this->identityService = $identityService;
+ $this->serializer = $serializer;
+ $this->userContext = $userContext;
+ $this->bulkSize = $bulkSize;
}
/**
* Update product attributes
*
- * @return \Magento\Backend\Model\View\Result\Redirect
- * @SuppressWarnings(PHPMD.CyclomaticComplexity)
- * @SuppressWarnings(PHPMD.NPathComplexity)
- * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ * @return \Magento\Framework\Controller\Result\Redirect
*/
public function execute()
{
@@ -93,128 +88,184 @@ public function execute()
}
/* Collect Data */
- $inventoryData = $this->getRequest()->getParam('inventory', []);
$attributesData = $this->getRequest()->getParam('attributes', []);
$websiteRemoveData = $this->getRequest()->getParam('remove_website_ids', []);
$websiteAddData = $this->getRequest()->getParam('add_website_ids', []);
- /* Prepare inventory data item options (use config settings) */
- $options = $this->_objectManager->get(\Magento\CatalogInventory\Api\StockConfigurationInterface::class)
- ->getConfigItemOptions();
- foreach ($options as $option) {
- if (isset($inventoryData[$option]) && !isset($inventoryData['use_config_' . $option])) {
- $inventoryData['use_config_' . $option] = 0;
- }
- }
+ $storeId = $this->attributeHelper->getSelectedStoreId();
+ $websiteId = $this->attributeHelper->getStoreWebsiteId($storeId);
+ $productIds = $this->attributeHelper->getProductIds();
+
+ $attributesData = $this->sanitizeProductAttributes($attributesData);
try {
- $storeId = $this->attributeHelper->getSelectedStoreId();
- if ($attributesData) {
- $dateFormat = $this->_objectManager->get(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class)
- ->getDateFormat(\IntlDateFormatter::SHORT);
-
- foreach ($attributesData as $attributeCode => $value) {
- $attribute = $this->_objectManager->get(\Magento\Eav\Model\Config::class)
- ->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode);
- if (!$attribute->getAttributeId()) {
- unset($attributesData[$attributeCode]);
- continue;
- }
- if ($attribute->getBackendType() == 'datetime') {
- if (!empty($value)) {
- $filterInput = new \Zend_Filter_LocalizedToNormalized(['date_format' => $dateFormat]);
- $filterInternal = new \Zend_Filter_NormalizedToLocalized(
- ['date_format' => \Magento\Framework\Stdlib\DateTime::DATE_INTERNAL_FORMAT]
- );
- $value = $filterInternal->filter($filterInput->filter($value));
- } else {
- $value = null;
- }
- $attributesData[$attributeCode] = $value;
- } elseif ($attribute->getFrontendInput() == 'multiselect') {
- // Check if 'Change' checkbox has been checked by admin for this attribute
- $isChanged = (bool)$this->getRequest()->getPost('toggle_' . $attributeCode);
- if (!$isChanged) {
- unset($attributesData[$attributeCode]);
- continue;
- }
- if (is_array($value)) {
- $value = implode(',', $value);
- }
- $attributesData[$attributeCode] = $value;
- }
- }
+ $this->publish($attributesData, $websiteRemoveData, $websiteAddData, $storeId, $websiteId, $productIds);
+ $this->messageManager->addSuccessMessage(__('Message is added to queue'));
+ } catch (\Magento\Framework\Exception\LocalizedException $e) {
+ $this->messageManager->addErrorMessage($e->getMessage());
+ } catch (\Exception $e) {
+ $this->messageManager->addExceptionMessage(
+ $e,
+ __('Something went wrong while updating the product(s) attributes.')
+ );
+ }
- $this->_objectManager->get(\Magento\Catalog\Model\Product\Action::class)
- ->updateAttributes($this->attributeHelper->getProductIds(), $attributesData, $storeId);
- }
+ return $this->resultRedirectFactory->create()->setPath('catalog/product/', ['store' => $storeId]);
+ }
- if ($inventoryData) {
- // TODO why use ObjectManager?
- /** @var \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry */
- $stockRegistry = $this->_objectManager
- ->create(\Magento\CatalogInventory\Api\StockRegistryInterface::class);
- /** @var \Magento\CatalogInventory\Api\StockItemRepositoryInterface $stockItemRepository */
- $stockItemRepository = $this->_objectManager
- ->create(\Magento\CatalogInventory\Api\StockItemRepositoryInterface::class);
- foreach ($this->attributeHelper->getProductIds() as $productId) {
- $stockItemDo = $stockRegistry->getStockItem(
- $productId,
- $this->attributeHelper->getStoreWebsiteId($storeId)
- );
- if (!$stockItemDo->getProductId()) {
- $inventoryData['product_id'] = $productId;
- }
-
- $stockItemId = $stockItemDo->getId();
- $this->dataObjectHelper->populateWithArray(
- $stockItemDo,
- $inventoryData,
- \Magento\CatalogInventory\Api\Data\StockItemInterface::class
+ /**
+ * Sanitize product attributes
+ *
+ * @param array $attributesData
+ *
+ * @return array
+ */
+ private function sanitizeProductAttributes($attributesData)
+ {
+ $dateFormat = $this->_objectManager->get(TimezoneInterface::class)->getDateFormat(\IntlDateFormatter::SHORT);
+ $config = $this->_objectManager->get(\Magento\Eav\Model\Config::class);
+
+ foreach ($attributesData as $attributeCode => $value) {
+ $attribute = $config->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode);
+ if (!$attribute->getAttributeId()) {
+ unset($attributesData[$attributeCode]);
+ continue;
+ }
+ if ($attribute->getBackendType() === 'datetime') {
+ if (!empty($value)) {
+ $filterInput = new \Zend_Filter_LocalizedToNormalized(['date_format' => $dateFormat]);
+ $filterInternal = new \Zend_Filter_NormalizedToLocalized(
+ ['date_format' => \Magento\Framework\Stdlib\DateTime::DATE_INTERNAL_FORMAT]
);
- $stockItemDo->setItemId($stockItemId);
- $stockItemRepository->save($stockItemDo);
+ $value = $filterInternal->filter($filterInput->filter($value));
+ } else {
+ $value = null;
}
- $this->_stockIndexerProcessor->reindexList($this->attributeHelper->getProductIds());
- }
-
- if ($websiteAddData || $websiteRemoveData) {
- /* @var $actionModel \Magento\Catalog\Model\Product\Action */
- $actionModel = $this->_objectManager->get(\Magento\Catalog\Model\Product\Action::class);
- $productIds = $this->attributeHelper->getProductIds();
-
- if ($websiteRemoveData) {
- $actionModel->updateWebsites($productIds, $websiteRemoveData, 'remove');
+ $attributesData[$attributeCode] = $value;
+ } elseif ($attribute->getFrontendInput() === 'multiselect') {
+ // Check if 'Change' checkbox has been checked by admin for this attribute
+ $isChanged = (bool)$this->getRequest()->getPost('toggle_' . $attributeCode);
+ if (!$isChanged) {
+ unset($attributesData[$attributeCode]);
+ continue;
}
- if ($websiteAddData) {
- $actionModel->updateWebsites($productIds, $websiteAddData, 'add');
+ if (is_array($value)) {
+ $value = implode(',', $value);
}
-
- $this->_eventManager->dispatch('catalog_product_to_website_change', ['products' => $productIds]);
+ $attributesData[$attributeCode] = $value;
}
+ }
+ return $attributesData;
+ }
- $this->messageManager->addSuccessMessage(
- __('A total of %1 record(s) were updated.', count($this->attributeHelper->getProductIds()))
- );
-
- $this->_productFlatIndexerProcessor->reindexList($this->attributeHelper->getProductIds());
+ /**
+ * Schedule new bulk
+ *
+ * @param array $attributesData
+ * @param array $websiteRemoveData
+ * @param array $websiteAddData
+ * @param int $storeId
+ * @param int $websiteId
+ * @param array $productIds
+ * @throws \Magento\Framework\Exception\LocalizedException
+ *
+ * @return void
+ */
+ private function publish(
+ $attributesData,
+ $websiteRemoveData,
+ $websiteAddData,
+ $storeId,
+ $websiteId,
+ $productIds
+ ):void {
+ $productIdsChunks = array_chunk($productIds, $this->bulkSize);
+ $bulkUuid = $this->identityService->generateId();
+ $bulkDescription = __('Update attributes for ' . count($productIds) . ' selected products');
+ $operations = [];
+ foreach ($productIdsChunks as $productIdsChunk) {
+ if ($websiteRemoveData || $websiteAddData) {
+ $dataToUpdate = [
+ 'website_assign' => $websiteAddData,
+ 'website_detach' => $websiteRemoveData
+ ];
+ $operations[] = $this->makeOperation(
+ 'Update website assign',
+ 'product_action_attribute.website.update',
+ $dataToUpdate,
+ $storeId,
+ $websiteId,
+ $productIdsChunk,
+ $bulkUuid
+ );
+ }
- if ($this->_catalogProduct->isDataForPriceIndexerWasChanged($attributesData)
- || !empty($websiteRemoveData)
- || !empty($websiteAddData)
- ) {
- $this->_productPriceIndexerProcessor->reindexList($this->attributeHelper->getProductIds());
+ if ($attributesData) {
+ $operations[] = $this->makeOperation(
+ 'Update product attributes',
+ 'product_action_attribute.update',
+ $attributesData,
+ $storeId,
+ $websiteId,
+ $productIdsChunk,
+ $bulkUuid
+ );
}
- } catch (\Magento\Framework\Exception\LocalizedException $e) {
- $this->messageManager->addErrorMessage($e->getMessage());
- } catch (\Exception $e) {
- $this->messageManager->addExceptionMessage(
- $e,
- __('Something went wrong while updating the product(s) attributes.')
+ }
+
+ if (!empty($operations)) {
+ $result = $this->bulkManagement->scheduleBulk(
+ $bulkUuid,
+ $operations,
+ $bulkDescription,
+ $this->userContext->getUserId()
);
+ if (!$result) {
+ throw new \Magento\Framework\Exception\LocalizedException(
+ __('Something went wrong while processing the request.')
+ );
+ }
}
+ }
+
+ /**
+ * Make asynchronous operation
+ *
+ * @param string $meta
+ * @param string $queue
+ * @param array $dataToUpdate
+ * @param int $storeId
+ * @param int $websiteId
+ * @param array $productIds
+ * @param int $bulkUuid
+ *
+ * @return OperationInterface
+ */
+ private function makeOperation(
+ $meta,
+ $queue,
+ $dataToUpdate,
+ $storeId,
+ $websiteId,
+ $productIds,
+ $bulkUuid
+ ): OperationInterface {
+ $dataToEncode = [
+ 'meta_information' => $meta,
+ 'product_ids' => $productIds,
+ 'store_id' => $storeId,
+ 'website_id' => $websiteId,
+ 'attributes' => $dataToUpdate
+ ];
+ $data = [
+ 'data' => [
+ 'bulk_uuid' => $bulkUuid,
+ 'topic_name' => $queue,
+ 'serialized_data' => $this->serializer->serialize($dataToEncode),
+ 'status' => \Magento\Framework\Bulk\OperationInterface::STATUS_TYPE_OPEN,
+ ]
+ ];
- return $this->resultRedirectFactory->create()
- ->setPath('catalog/product/', ['store' => $this->attributeHelper->getSelectedStoreId()]);
+ return $this->operationFactory->create($data);
}
}
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
index 39ed11b1806cd..853cc65270306 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
@@ -195,25 +195,6 @@ public function execute()
? $model->getAttributeCode()
: $this->getRequest()->getParam('attribute_code');
$attributeCode = $attributeCode ?: $this->generateCode($this->getRequest()->getParam('frontend_label')[0]);
- if (strlen($attributeCode) > 0) {
- $validatorAttrCode = new \Zend_Validate_Regex(
- ['pattern' => '/^[a-zA-Z\x{600}-\x{6FF}][a-zA-Z\x{600}-\x{6FF}_0-9]{0,30}$/u']
- );
- if (!$validatorAttrCode->isValid($attributeCode)) {
- $this->messageManager->addErrorMessage(
- __(
- 'Attribute code "%1" is invalid. Please use only letters (a-z or A-Z), ' .
- 'numbers (0-9) or underscore(_) in this field, first character should be a letter.',
- $attributeCode
- )
- );
- return $this->returnResult(
- 'catalog/*/edit',
- ['attribute_id' => $attributeId, '_current' => true],
- ['error' => true]
- );
- }
- }
$data['attribute_code'] = $attributeCode;
//validate frontend_input
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
index 124ee1abb078e..c74a382724a00 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
@@ -7,12 +7,13 @@
namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute;
-use Magento\Framework\Serialize\Serializer\FormData;
+use Magento\Catalog\Controller\Adminhtml\Product\Attribute as AttributeAction;
+use Magento\Eav\Model\Validator\Attribute\Code as AttributeCodeValidator;
use Magento\Framework\App\Action\HttpGetActionInterface;
use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
use Magento\Framework\App\ObjectManager;
use Magento\Framework\DataObject;
-use Magento\Catalog\Controller\Adminhtml\Product\Attribute as AttributeAction;
+use Magento\Framework\Serialize\Serializer\FormData;
/**
* Product attribute validate controller.
@@ -43,6 +44,11 @@ class Validate extends AttributeAction implements HttpGetActionInterface, HttpPo
*/
private $formDataSerializer;
+ /**
+ * @var AttributeCodeValidator
+ */
+ private $attributeCodeValidator;
+
/**
* Constructor
*
@@ -54,6 +60,7 @@ class Validate extends AttributeAction implements HttpGetActionInterface, HttpPo
* @param \Magento\Framework\View\LayoutFactory $layoutFactory
* @param array $multipleAttributeList
* @param FormData|null $formDataSerializer
+ * @param AttributeCodeValidator|null $attributeCodeValidator
*/
public function __construct(
\Magento\Backend\App\Action\Context $context,
@@ -63,7 +70,8 @@ public function __construct(
\Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
\Magento\Framework\View\LayoutFactory $layoutFactory,
array $multipleAttributeList = [],
- FormData $formDataSerializer = null
+ FormData $formDataSerializer = null,
+ AttributeCodeValidator $attributeCodeValidator = null
) {
parent::__construct($context, $attributeLabelCache, $coreRegistry, $resultPageFactory);
$this->resultJsonFactory = $resultJsonFactory;
@@ -71,6 +79,9 @@ public function __construct(
$this->multipleAttributeList = $multipleAttributeList;
$this->formDataSerializer = $formDataSerializer ?: ObjectManager::getInstance()
->get(FormData::class);
+ $this->attributeCodeValidator = $attributeCodeValidator ?: ObjectManager::getInstance()->get(
+ AttributeCodeValidator::class
+ );
}
/**
@@ -115,6 +126,12 @@ public function execute()
$response->setError(true);
$response->setProductAttribute($attribute->toArray());
}
+
+ if (!$this->attributeCodeValidator->isValid($attributeCode)) {
+ $this->setMessageToResponse($response, $this->attributeCodeValidator->getMessages());
+ $response->setError(true);
+ }
+
if ($this->getRequest()->has('new_attribute_set_name')) {
$setName = $this->getRequest()->getParam('new_attribute_set_name');
/** @var $attributeSet \Magento\Eav\Model\Entity\Attribute\Set */
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
index e84d9ff12906e..825d0ee032d6c 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
@@ -159,6 +159,7 @@ public function execute()
if ($redirectBack === 'duplicate') {
$product->unsetData('quantity_and_stock_status');
$newProduct = $this->productCopier->copy($product);
+ $this->checkUniqueAttributes($product);
$this->messageManager->addSuccessMessage(__('You duplicated the product.'));
}
} catch (\Magento\Framework\Exception\LocalizedException $e) {
@@ -343,4 +344,25 @@ private function persistMediaData(ProductInterface $product, array $data)
return $data;
}
+
+ /**
+ * Check unique attributes and add error to message manager
+ *
+ * @param \Magento\Catalog\Model\Product $product
+ */
+ private function checkUniqueAttributes(\Magento\Catalog\Model\Product $product)
+ {
+ $uniqueLabels = [];
+ foreach ($product->getAttributes() as $attribute) {
+ if ($attribute->getIsUnique() && $attribute->getIsUserDefined()
+ && $product->getData($attribute->getAttributeCode()) !== null
+ ) {
+ $uniqueLabels[] = $attribute->getDefaultFrontendLabel();
+ }
+ }
+ if ($uniqueLabels) {
+ $uniqueLabels = implode('", "', $uniqueLabels);
+ $this->messageManager->addErrorMessage(__('The value of attribute(s) "%1" must be unique', $uniqueLabels));
+ }
+ }
}
diff --git a/app/code/Magento/Catalog/Helper/Image.php b/app/code/Magento/Catalog/Helper/Image.php
index 170f1209ad9e6..9b8d0ad75a8c9 100644
--- a/app/code/Magento/Catalog/Helper/Image.php
+++ b/app/code/Magento/Catalog/Helper/Image.php
@@ -6,6 +6,7 @@
namespace Magento\Catalog\Helper;
use Magento\Framework\App\Helper\AbstractHelper;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
/**
* Catalog image helper
@@ -14,7 +15,7 @@
* @SuppressWarnings(PHPMD.TooManyFields)
* @since 100.0.2
*/
-class Image extends AbstractHelper
+class Image extends AbstractHelper implements ArgumentInterface
{
/**
* Media config node
@@ -764,7 +765,7 @@ protected function getImageFile()
protected function parseSize($string)
{
$size = explode('x', strtolower($string));
- if (sizeof($size) == 2) {
+ if (count($size) == 2) {
return ['width' => $size[0] > 0 ? $size[0] : null, 'height' => $size[1] > 0 ? $size[1] : null];
}
return false;
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
new file mode 100644
index 0000000000000..dc24a3090481e
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
@@ -0,0 +1,163 @@
+catalogProduct = $catalogProduct;
+ $this->productFlatIndexerProcessor = $productFlatIndexerProcessor;
+ $this->productPriceIndexerProcessor = $productPriceIndexerProcessor;
+ $this->productAction = $action;
+ $this->logger = $logger;
+ $this->serializer = $serializer;
+ $this->operationManagement = $operationManagement;
+ $this->entityManager = $entityManager;
+ }
+
+ /**
+ * Process
+ *
+ * @param \Magento\AsynchronousOperations\Api\Data\OperationInterface $operation
+ * @throws \Exception
+ *
+ * @return void
+ */
+ public function process(\Magento\AsynchronousOperations\Api\Data\OperationInterface $operation)
+ {
+ try {
+ $serializedData = $operation->getSerializedData();
+ $data = $this->serializer->unserialize($serializedData);
+ $this->execute($data);
+ } catch (\Zend_Db_Adapter_Exception $e) {
+ $this->logger->critical($e->getMessage());
+ if ($e instanceof \Magento\Framework\DB\Adapter\LockWaitException
+ || $e instanceof \Magento\Framework\DB\Adapter\DeadlockException
+ || $e instanceof \Magento\Framework\DB\Adapter\ConnectionException
+ ) {
+ $status = OperationInterface::STATUS_TYPE_RETRIABLY_FAILED;
+ $errorCode = $e->getCode();
+ $message = $e->getMessage();
+ } else {
+ $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+ $errorCode = $e->getCode();
+ $message = __(
+ 'Sorry, something went wrong during product attributes update. Please see log for details.'
+ );
+ }
+ } catch (NoSuchEntityException $e) {
+ $this->logger->critical($e->getMessage());
+ $status = ($e instanceof TemporaryStateExceptionInterface)
+ ? OperationInterface::STATUS_TYPE_RETRIABLY_FAILED
+ : OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+ $errorCode = $e->getCode();
+ $message = $e->getMessage();
+ } catch (LocalizedException $e) {
+ $this->logger->critical($e->getMessage());
+ $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+ $errorCode = $e->getCode();
+ $message = $e->getMessage();
+ } catch (\Exception $e) {
+ $this->logger->critical($e->getMessage());
+ $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+ $errorCode = $e->getCode();
+ $message = __('Sorry, something went wrong during product attributes update. Please see log for details.');
+ }
+
+ $operation->setStatus($status ?? OperationInterface::STATUS_TYPE_COMPLETE)
+ ->setErrorCode($errorCode ?? null)
+ ->setResultMessage($message ?? null);
+
+ $this->entityManager->save($operation);
+ }
+
+ /**
+ * Execute
+ *
+ * @param array $data
+ *
+ * @return void
+ */
+ private function execute($data): void
+ {
+ $this->productAction->updateAttributes($data['product_ids'], $data['attributes'], $data['store_id']);
+ if ($this->catalogProduct->isDataForPriceIndexerWasChanged($data['attributes'])) {
+ $this->productPriceIndexerProcessor->reindexList($data['product_ids']);
+ }
+
+ $this->productFlatIndexerProcessor->reindexList($data['product_ids']);
+ }
+}
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php b/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
new file mode 100644
index 0000000000000..32ba39d9afd98
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
@@ -0,0 +1,168 @@
+productFlatIndexerProcessor = $productFlatIndexerProcessor;
+ $this->productAction = $action;
+ $this->logger = $logger;
+ $this->serializer = $serializer;
+ $this->productPriceIndexerProcessor = $productPriceIndexerProcessor;
+ $this->entityManager = $entityManager;
+ }
+
+ /**
+ * Process
+ *
+ * @param \Magento\AsynchronousOperations\Api\Data\OperationInterface $operation
+ * @throws \Exception
+ *
+ * @return void
+ */
+ public function process(\Magento\AsynchronousOperations\Api\Data\OperationInterface $operation)
+ {
+ try {
+ $serializedData = $operation->getSerializedData();
+ $data = $this->serializer->unserialize($serializedData);
+ $this->execute($data);
+ } catch (\Zend_Db_Adapter_Exception $e) {
+ $this->logger->critical($e->getMessage());
+ if ($e instanceof \Magento\Framework\DB\Adapter\LockWaitException
+ || $e instanceof \Magento\Framework\DB\Adapter\DeadlockException
+ || $e instanceof \Magento\Framework\DB\Adapter\ConnectionException
+ ) {
+ $status = OperationInterface::STATUS_TYPE_RETRIABLY_FAILED;
+ $errorCode = $e->getCode();
+ $message = __($e->getMessage());
+ } else {
+ $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+ $errorCode = $e->getCode();
+ $message = __(
+ 'Sorry, something went wrong during product attributes update. Please see log for details.'
+ );
+ }
+ } catch (NoSuchEntityException $e) {
+ $this->logger->critical($e->getMessage());
+ $status = ($e instanceof TemporaryStateExceptionInterface)
+ ? OperationInterface::STATUS_TYPE_RETRIABLY_FAILED
+ : OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+ $errorCode = $e->getCode();
+ $message = $e->getMessage();
+ } catch (LocalizedException $e) {
+ $this->logger->critical($e->getMessage());
+ $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+ $errorCode = $e->getCode();
+ $message = $e->getMessage();
+ } catch (\Exception $e) {
+ $this->logger->critical($e->getMessage());
+ $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+ $errorCode = $e->getCode();
+ $message = __('Sorry, something went wrong during product attributes update. Please see log for details.');
+ }
+
+ $operation->setStatus($status ?? OperationInterface::STATUS_TYPE_COMPLETE)
+ ->setErrorCode($errorCode ?? null)
+ ->setResultMessage($message ?? null);
+
+ $this->entityManager->save($operation);
+ }
+
+ /**
+ * Update website in products
+ *
+ * @param array $productIds
+ * @param array $websiteRemoveData
+ * @param array $websiteAddData
+ *
+ * @return void
+ */
+ private function updateWebsiteInProducts($productIds, $websiteRemoveData, $websiteAddData): void
+ {
+ if ($websiteRemoveData) {
+ $this->productAction->updateWebsites($productIds, $websiteRemoveData, 'remove');
+ }
+ if ($websiteAddData) {
+ $this->productAction->updateWebsites($productIds, $websiteAddData, 'add');
+ }
+ }
+
+ /**
+ * Execute
+ *
+ * @param array $data
+ *
+ * @return void
+ */
+ private function execute($data): void
+ {
+ $this->updateWebsiteInProducts(
+ $data['product_ids'],
+ $data['attributes']['website_detach'],
+ $data['attributes']['website_assign']
+ );
+ $this->productPriceIndexerProcessor->reindexList($data['product_ids']);
+ $this->productFlatIndexerProcessor->reindexList($data['product_ids']);
+ }
+}
diff --git a/app/code/Magento/Catalog/Model/CategoryList.php b/app/code/Magento/Catalog/Model/CategoryList.php
index e3318db505489..cab8e013d9ba1 100644
--- a/app/code/Magento/Catalog/Model/CategoryList.php
+++ b/app/code/Magento/Catalog/Model/CategoryList.php
@@ -76,11 +76,10 @@ public function getList(SearchCriteriaInterface $searchCriteria)
$this->extensionAttributesJoinProcessor->process($collection);
$this->collectionProcessor->process($searchCriteria, $collection);
- $collection->load();
$items = [];
- foreach ($collection->getItems() as $category) {
- $items[] = $this->categoryRepository->get($category->getId());
+ foreach ($collection->getAllIds() as $id) {
+ $items[] = $this->categoryRepository->get($id);
}
/** @var CategorySearchResultsInterface $searchResult */
diff --git a/app/code/Magento/Catalog/Model/Config/CatalogClone/Media/Image.php b/app/code/Magento/Catalog/Model/Config/CatalogClone/Media/Image.php
index e2b0a91574021..10675a7b7c7e2 100644
--- a/app/code/Magento/Catalog/Model/Config/CatalogClone/Media/Image.php
+++ b/app/code/Magento/Catalog/Model/Config/CatalogClone/Media/Image.php
@@ -5,6 +5,9 @@
*/
namespace Magento\Catalog\Model\Config\CatalogClone\Media;
+use Magento\Framework\Escaper;
+use Magento\Framework\App\ObjectManager;
+
/**
* Clone model for media images related config fields
*
@@ -26,6 +29,11 @@ class Image extends \Magento\Framework\App\Config\Value
*/
protected $_attributeCollectionFactory;
+ /**
+ * @var Escaper
+ */
+ private $escaper;
+
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
@@ -36,6 +44,9 @@ class Image extends \Magento\Framework\App\Config\Value
* @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
* @param array $data
+ * @param Escaper|null $escaper
+ *
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -46,8 +57,10 @@ public function __construct(
\Magento\Eav\Model\Config $eavConfig,
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
- array $data = []
+ array $data = [],
+ Escaper $escaper = null
) {
+ $this->escaper = $escaper ?? ObjectManager::getInstance()->get(Escaper::class);
$this->_attributeCollectionFactory = $attributeCollectionFactory;
$this->_eavConfig = $eavConfig;
parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
@@ -71,10 +84,9 @@ public function getPrefixes()
$prefixes = [];
foreach ($collection as $attribute) {
- /* @var $attribute \Magento\Eav\Model\Entity\Attribute */
$prefixes[] = [
'field' => $attribute->getAttributeCode() . '_',
- 'label' => $attribute->getFrontend()->getLabel(),
+ 'label' => $this->escaper->escapeHtml($attribute->getFrontend()->getLabel()),
];
}
diff --git a/app/code/Magento/Catalog/Model/Product/Action.php b/app/code/Magento/Catalog/Model/Product/Action.php
index f78048424b42c..3863cf2457247 100644
--- a/app/code/Magento/Catalog/Model/Product/Action.php
+++ b/app/code/Magento/Catalog/Model/Product/Action.php
@@ -168,5 +168,7 @@ public function updateWebsites($productIds, $websiteIds, $type)
if (!$categoryIndexer->isScheduled()) {
$categoryIndexer->reindexList(array_unique($productIds));
}
+
+ $this->_eventManager->dispatch('catalog_product_to_website_change', ['products' => $productIds]);
}
}
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
index e346c912dccaa..db967052cb7a5 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
@@ -165,19 +165,6 @@ protected function modifyPriceData($object, $data)
/** @var \Magento\Catalog\Model\Product $object */
$data = parent::modifyPriceData($object, $data);
$price = $object->getPrice();
-
- $specialPrice = $object->getSpecialPrice();
- $specialPriceFromDate = $object->getSpecialFromDate();
- $specialPriceToDate = $object->getSpecialToDate();
- $today = time();
-
- if ($specialPrice && ($object->getPrice() > $object->getFinalPrice())) {
- if ($today >= strtotime($specialPriceFromDate) && $today <= strtotime($specialPriceToDate) ||
- $today >= strtotime($specialPriceFromDate) && $specialPriceToDate === null) {
- $price = $specialPrice;
- }
- }
-
foreach ($data as $key => $tierPrice) {
$percentageValue = $this->getPercentage($tierPrice);
if ($percentageValue) {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php b/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
index 0941aa2478935..9cb6cda4d0a09 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
@@ -3,6 +3,8 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\Catalog\Model\Product\Option;
use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface as OptionRepository;
@@ -58,11 +60,26 @@ public function execute($entity, $arguments = [])
}
}
if ($options) {
- foreach ($options as $option) {
- $this->optionRepository->save($option);
- }
+ $this->processOptionsSaving($options, (bool)$entity->dataHasChangedFor('sku'), (string)$entity->getSku());
}
return $entity;
}
+
+ /**
+ * Save custom options
+ *
+ * @param array $options
+ * @param bool $hasChangedSku
+ * @param string $newSku
+ */
+ private function processOptionsSaving(array $options, bool $hasChangedSku, string $newSku)
+ {
+ foreach ($options as $option) {
+ if ($hasChangedSku && $option->hasData('product_sku')) {
+ $option->setProductSku($newSku);
+ }
+ $this->optionRepository->save($option);
+ }
+ }
}
diff --git a/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php b/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
index 3ec8e968aa245..24775a791e59f 100644
--- a/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
+++ b/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
@@ -16,6 +16,8 @@
use Magento\Framework\EntityManager\EntityManager;
/**
+ * A Product Widget Synchronizer.
+ *
* Service which allows to sync product widget information, such as product id with db. In order to reuse this info
* on different devices
*/
@@ -85,9 +87,10 @@ public function __construct(
}
/**
- * Find lifetime in configuration. Configuration is hold in Stores Configuration
- * Also this configuration is generated by:
- * @see \Magento\Catalog\Model\Widget\RecentlyViewedStorageConfiguration
+ * Finds lifetime in configuration.
+ *
+ * Configuration is hold in Stores Configuration. Also this configuration is generated by
+ * {@see Magento\Catalog\Model\Widget\RecentlyViewedStorageConfiguration}
*
* @param string $namespace
* @return int
@@ -108,6 +111,8 @@ private function getLifeTimeByNamespace($namespace)
}
/**
+ * Filters actions.
+ *
* In order to avoid suspicious actions, we need to filter them in DESC order, and slice only items that
* can be persisted in database.
*
@@ -138,7 +143,9 @@ private function getProductIdsByActions(array $actions)
$productIds = [];
foreach ($actions as $action) {
- $productIds[] = $action['product_id'];
+ if (isset($action['product_id'])) {
+ $productIds[] = $action['product_id'];
+ }
}
return $productIds;
@@ -159,33 +166,37 @@ public function syncActions(array $productsData, $typeId)
$customerId = $this->session->getCustomerId();
$visitorId = $this->visitor->getId();
$collection = $this->getActionsByType($typeId);
- $collection->addFieldToFilter('product_id', $this->getProductIdsByActions($productsData));
-
- /**
- * Note that collection is also filtered by visitor id and customer id
- * This collection shouldn't be flushed when visitor has products and then login
- * It can remove only products for visitor, or only products for customer
- *
- * ['product_id' => 'added_at']
- * @var ProductFrontendActionInterface $item
- */
- foreach ($collection as $item) {
- $this->entityManager->delete($item);
- }
-
- foreach ($productsData as $productId => $productData) {
- /** @var ProductFrontendActionInterface $action */
- $action = $this->productFrontendActionFactory->create([
- 'data' => [
- 'visitor_id' => $customerId ? null : $visitorId,
- 'customer_id' => $this->session->getCustomerId(),
- 'added_at' => $productData['added_at'],
- 'product_id' => $productId,
- 'type_id' => $typeId
- ]
- ]);
-
- $this->entityManager->save($action);
+ $productIds = $this->getProductIdsByActions($productsData);
+
+ if ($productIds) {
+ $collection->addFieldToFilter('product_id', $productIds);
+
+ /**
+ * Note that collection is also filtered by visitor id and customer id
+ * This collection shouldn't be flushed when visitor has products and then login
+ * It can remove only products for visitor, or only products for customer
+ *
+ * ['product_id' => 'added_at']
+ * @var ProductFrontendActionInterface $item
+ */
+ foreach ($collection as $item) {
+ $this->entityManager->delete($item);
+ }
+
+ foreach ($productsData as $productId => $productData) {
+ /** @var ProductFrontendActionInterface $action */
+ $action = $this->productFrontendActionFactory->create([
+ 'data' => [
+ 'visitor_id' => $customerId ? null : $visitorId,
+ 'customer_id' => $this->session->getCustomerId(),
+ 'added_at' => $productData['added_at'],
+ 'product_id' => $productId,
+ 'type_id' => $typeId
+ ]
+ ]);
+
+ $this->entityManager->save($action);
+ }
}
}
diff --git a/app/code/Magento/Catalog/Model/Product/Type/FrontSpecialPrice.php b/app/code/Magento/Catalog/Model/Product/Type/FrontSpecialPrice.php
index f6893a41113e6..dabfdb74f0118 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/FrontSpecialPrice.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/FrontSpecialPrice.php
@@ -17,6 +17,9 @@
*
* @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ *
+ * @deprecated
+ * @see \Magento\Catalog\Model\Product\Type\Price
*/
class FrontSpecialPrice extends Price
{
@@ -66,6 +69,8 @@ public function __construct(
/**
* @inheritdoc
+ *
+ * @deprecated
*/
protected function _applySpecialPrice($product, $finalPrice)
{
diff --git a/app/code/Magento/Catalog/Observer/SetSpecialPriceStartDate.php b/app/code/Magento/Catalog/Observer/SetSpecialPriceStartDate.php
index a597b8fddda9f..ed9f89efc6891 100644
--- a/app/code/Magento/Catalog/Observer/SetSpecialPriceStartDate.php
+++ b/app/code/Magento/Catalog/Observer/SetSpecialPriceStartDate.php
@@ -3,9 +3,12 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\Catalog\Observer;
use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
/**
* Set value for Special Price start date
@@ -13,21 +16,20 @@
class SetSpecialPriceStartDate implements ObserverInterface
{
/**
- * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
+ * @var TimezoneInterface
*/
private $localeDate;
/**
- * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
- * @codeCoverageIgnore
+ * @param TimezoneInterface $localeDate
*/
- public function __construct(\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate)
+ public function __construct(TimezoneInterface $localeDate)
{
$this->localeDate = $localeDate;
}
/**
- * Set the current date to Special Price From attribute if it empty
+ * Set the current date to Special Price From attribute if it's empty.
*
* @param \Magento\Framework\Event\Observer $observer
* @return $this
@@ -36,8 +38,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
{
/** @var $product \Magento\Catalog\Model\Product */
$product = $observer->getEvent()->getProduct();
- if ($product->getSpecialPrice() && !$product->getSpecialFromDate()) {
- $product->setData('special_from_date', $this->localeDate->date());
+ if ($product->getSpecialPrice() && ! $product->getSpecialFromDate()) {
+ $product->setData('special_from_date', $this->localeDate->date()->setTime(0, 0));
}
return $this;
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
index 692487c1d60cd..a544be434f9c5 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
@@ -11,9 +11,13 @@
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
index d786795bc3090..90d732c9654e1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
@@ -302,4 +302,18 @@
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index 3afdc41888c79..3c44a8f1898ad 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -15,12 +15,20 @@
+
+
+
-
+
+
+
+
+
+
+
@@ -77,6 +104,14 @@
+
+
+
+
+
+
@@ -180,12 +215,14 @@
-
@@ -387,6 +424,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -288,4 +289,13 @@
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInfoOnEditPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInfoOnEditPageActionGroup.xml
new file mode 100644
index 0000000000000..7917fe68aaebc
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInfoOnEditPageActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductOnAdminGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductOnAdminGridActionGroup.xml
new file mode 100644
index 0000000000000..963c9d9f1c911
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductOnAdminGridActionGroup.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
index 2d966dde64c4a..b914d5e20712d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
@@ -52,4 +52,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductImagesOnProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductImagesOnProductPageActionGroup.xml
new file mode 100644
index 0000000000000..1bb7c179dfca8
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductImagesOnProductPageActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductNameOnProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductNameOnProductPageActionGroup.xml
new file mode 100644
index 0000000000000..6cb156723b286
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductNameOnProductPageActionGroup.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductPriceOnProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductPriceOnProductPageActionGroup.xml
new file mode 100644
index 0000000000000..3c62ef89e584b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductPriceOnProductPageActionGroup.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSkuOnProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSkuOnProductPageActionGroup.xml
new file mode 100644
index 0000000000000..85d3927a6d6d0
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSkuOnProductPageActionGroup.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontOpenProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontOpenProductPageActionGroup.xml
new file mode 100644
index 0000000000000..f5fabae5fc4ce
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontOpenProductPageActionGroup.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..24e1fe9cf5ecd
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/AdminMenuData.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+ Catalog
+ Catalog
+ magento-catalog-catalog
+
+
+ Default Category (ID: 2)
+ Categories
+ magento-catalog-catalog-categories
+
+
+ Products
+ Products
+ magento-catalog-catalog-products
+
+
+ Attribute Sets
+ Attribute Set
+ magento-catalog-catalog-attributes-sets
+
+
+ Product Attributes
+ Product
+ magento-catalog-catalog-attributes-attributes
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CatalogSpecialPriceData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogSpecialPriceData.xml
index 4c6b0749a0f9e..31783526932b6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/CatalogSpecialPriceData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogSpecialPriceData.xml
@@ -12,4 +12,9 @@
0
+
+ 55.55
+ 0
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml
index 8a26b6babdbbc..d09880f14afbf 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml
@@ -13,4 +13,8 @@
1
2
+
+ "Pursuit Lumaflex™ Tone Band"
+ "x™"
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
index 134abcaa50354..817dd637f81dd 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
@@ -73,6 +73,20 @@
false
ProductAttributeFrontendLabel
+
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+
attribute
select
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml
index 713c453bb7ad4..6d4314a6d865f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml
@@ -20,4 +20,10 @@
7
1
+
+
+ 0
+ 0
+ 0
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index 0b3a31194ea36..3492dffd7cc7d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -35,6 +35,10 @@
EavStockItem
CustomAttributeCategoryIds
+
+ Pursuit Lumaflex™ Tone Band
+ x™
+
100
@@ -60,6 +64,48 @@
EavStockItem
CustomAttributeCategoryIds
+
+ SimpleProductForTest1
+ simple
+ 4
+ SimpleProductAfterImport1
+ 250.00
+ 4
+ 1
+ 100
+ simple-product-for-test-1
+ 1
+ EavStockItem
+ CustomAttributeCategoryIds
+
+
+ SimpleProductForTest2
+ simple
+ 4
+ SimpleProductAfterImport2
+ 300.00
+ 4
+ 1
+ 100
+ simple-product-for-test-2
+ 1
+ EavStockItem
+ CustomAttributeCategoryIds
+
+
+ SimpleProductForTest3
+ simple
+ 4
+ SimpleProductAfterImport3
+ 350.00
+ 4
+ 1
+ 100
+ simple-product-for-test-3
+ 1
+ EavStockItem
+ CustomAttributeCategoryIds
+
SimpleProduct
simple
@@ -386,6 +432,11 @@
ProductOptionDropDownWithLongValuesTitle
+
+
+ ProductOptionField
+ ProductOptionArea
+
api-virtual-product
virtual
@@ -889,6 +940,19 @@
13
0
+
+ AAA Product
+
+
+ BBB Product
+
+
+ Product "!@#$%^&*()+:;\|}{][?=~`
+ |}{][?=~`
+
+
+ ProductWith128Chars 1234567891123456789112345678911234567891123456789112345678911234567891123456789112345678 endnums
+
sku_simple_product_
simple
@@ -906,4 +970,20 @@
EavStockItem
CustomAttributeCategoryIds
+
+ sku_simple_product_
+ simple
+ 4
+ 4
+ SimpleProduct
+ 560
+ simple-product-
+ 1
+ 25
+ 1
+ 1
+ 1
+ 2
+ EavStockItem
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductGridData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductGridData.xml
index ea0bcafe56c48..71c8af318e9b4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductGridData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductGridData.xml
@@ -12,4 +12,7 @@
10
100
+
+ 1
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMessagesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMessagesSection.xml
index fee86ca1caa29..ea4f4bf53eb71 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMessagesSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMessagesSection.xml
@@ -10,5 +10,6 @@
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
index 14e714cb2b6b7..fba28b3feaff1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
@@ -16,5 +16,6 @@
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection.xml
index e159a4ce5c0b6..a2a349ed67611 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection.xml
@@ -17,8 +17,23 @@
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
index 656a844d49700..f515171e835db 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
@@ -13,17 +13,23 @@
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
index 02bdbac313076..07dd26381fe08 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
@@ -17,6 +17,7 @@
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml
index c6bad0efb3ca7..292b2d7008bc1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml
@@ -12,5 +12,6 @@
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogCategoriesNavigateMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogCategoriesNavigateMenuTest.xml
new file mode 100644
index 0000000000000..a51df86d0327a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogCategoriesNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogProductsNavigateMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogProductsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..1d9400bf81e4d
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogProductsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeSet.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeSet.xml
index 3027416ee520b..bcfab6ccfdf1f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeSet.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeSet.xml
@@ -34,7 +34,7 @@
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml
new file mode 100644
index 0000000000000..37ec4e0d32528
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml
new file mode 100644
index 0000000000000..575bb56912b25
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
index 70edb0ce3ea7d..17769c79677f7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
@@ -139,7 +139,7 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml
new file mode 100644
index 0000000000000..b24ed7f9c9a81
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml
new file mode 100644
index 0000000000000..79ff7bcade77b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
index d7607b4b269e8..4d581bae700d7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
@@ -54,7 +54,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresAttributeSetNavigateMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresAttributeSetNavigateMenuTest.xml
new file mode 100644
index 0000000000000..ed29c281b804c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresAttributeSetNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresProductNavigateMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresProductNavigateMenuTest.xml
new file mode 100644
index 0000000000000..28a33c4f20c01
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresProductNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.xml
index 3086f4398e08d..51af9d78dfd46 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.xml
@@ -11,8 +11,8 @@
productPriceAmount
-
@@ -333,8 +333,8 @@
@@ -417,9 +417,9 @@
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
index 951afa2ddb68b..a3bce2d4fe2f2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
@@ -20,30 +20,36 @@
+ 17
+
+
-
+
-
- 17
-
-
+
-
-
@@ -92,21 +98,21 @@
+
+ '<media-image-attributelabel',
+ ],
+ ];
}
}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php
index fce4a02622d9e..38bed83cb9504 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php
@@ -80,6 +80,7 @@ protected function setUp()
public function testFilterProductActions()
{
+ $typeId = 'recently_compared_product';
$productsData = [
1 => [
'added_at' => 12,
@@ -87,7 +88,7 @@ public function testFilterProductActions()
],
2 => [
'added_at' => 13,
- 'product_id' => 2,
+ 'product_id' => '2',
],
3 => [
'added_at' => 14,
@@ -126,10 +127,12 @@ public function testFilterProductActions()
$collection->expects($this->once())
->method('addFilterByUserIdentities')
->with(1, 34);
- $collection->expects($this->any())
+ $collection->expects($this->at(1))
->method('addFieldToFilter')
- ->withConsecutive(['type_id'], ['product_id']);
-
+ ->with('type_id', $typeId);
+ $collection->expects($this->at(2))
+ ->method('addFieldToFilter')
+ ->with('product_id', [1, 2]);
$iterator = new \IteratorIterator(new \ArrayIterator([$frontendAction]));
$collection->expects($this->once())
->method('getIterator')
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
index 5af0d71dc246c..494b77724e5b7 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
@@ -3,13 +3,19 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
+declare(strict_types=1);
+
namespace Magento\Catalog\Ui\Component\Listing\Columns;
-use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Framework\DB\Helper;
use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
use Magento\Store\Model\StoreManagerInterface;
/**
+ * Websites listing column component.
+ *
* @api
* @since 100.0.2
*/
@@ -20,6 +26,11 @@ class Websites extends \Magento\Ui\Component\Listing\Columns\Column
*/
const NAME = 'websites';
+ /**
+ * Data for concatenated website names value.
+ */
+ private $websiteNames = 'website_names';
+
/**
* Store manager
*
@@ -27,26 +38,36 @@ class Websites extends \Magento\Ui\Component\Listing\Columns\Column
*/
protected $storeManager;
+ /**
+ * @var \Magento\Framework\DB\Helper
+ */
+ private $resourceHelper;
+
/**
* @param ContextInterface $context
* @param UiComponentFactory $uiComponentFactory
* @param StoreManagerInterface $storeManager
* @param array $components
* @param array $data
+ * @param Helper $resourceHelper
*/
public function __construct(
ContextInterface $context,
UiComponentFactory $uiComponentFactory,
StoreManagerInterface $storeManager,
array $components = [],
- array $data = []
+ array $data = [],
+ Helper $resourceHelper = null
) {
parent::__construct($context, $uiComponentFactory, $components, $data);
+ $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$this->storeManager = $storeManager;
+ $this->resourceHelper = $resourceHelper ?: $objectManager->get(Helper::class);
}
/**
- * {@inheritdoc}
+ * @inheritdoc
+ *
* @deprecated 101.0.0
*/
public function prepareDataSource(array $dataSource)
@@ -71,9 +92,10 @@ public function prepareDataSource(array $dataSource)
return $dataSource;
}
-
+
/**
- * Prepare component configuration
+ * Prepare component configuration.
+ *
* @return void
*/
public function prepare()
@@ -83,4 +105,46 @@ public function prepare()
$this->_data['config']['componentDisabled'] = true;
}
}
+
+ /**
+ * Apply sorting.
+ *
+ * @return void
+ */
+ protected function applySorting()
+ {
+ $sorting = $this->getContext()->getRequestParam('sorting');
+ $isSortable = $this->getData('config/sortable');
+ if ($isSortable !== false
+ && !empty($sorting['field'])
+ && !empty($sorting['direction'])
+ && $sorting['field'] === $this->getName()
+ ) {
+ $collection = $this->getContext()->getDataProvider()->getCollection();
+ $collection
+ ->joinField(
+ 'websites_ids',
+ 'catalog_product_website',
+ 'website_id',
+ 'product_id=entity_id',
+ null,
+ 'left'
+ )
+ ->joinTable(
+ 'store_website',
+ 'website_id = websites_ids',
+ ['name'],
+ null,
+ 'left'
+ )
+ ->groupByAttribute('entity_id');
+ $this->resourceHelper->addGroupConcatColumn(
+ $collection->getSelect(),
+ $this->websiteNames,
+ 'name'
+ );
+
+ $collection->getSelect()->order($this->websiteNames . ' ' . $sorting['direction']);
+ }
+ }
}
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
index f8f82511cc12f..af43c84501f65 100755
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
@@ -871,6 +871,7 @@ protected function getPositionFieldConfig($sortOrder)
'formElement' => Hidden::NAME,
'dataScope' => static::FIELD_SORT_ORDER_NAME,
'dataType' => Number::NAME,
+ 'visible' => false,
'sortOrder' => $sortOrder,
],
],
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
old mode 100755
new mode 100644
index 99f7122efa0a8..8326c3b531892
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
@@ -676,7 +676,7 @@ public function setupAttributeMeta(ProductAttributeInterface $attribute, $groupC
// TODO: Refactor to $attribute->getOptions() when MAGETWO-48289 is done
$attributeModel = $this->getAttributeModel($attribute);
if ($attributeModel->usesSource()) {
- $options = $attributeModel->getSource()->getAllOptions();
+ $options = $attributeModel->getSource()->getAllOptions(true, true);
$meta = $this->arrayManager->merge($configPath, $meta, [
'options' => $this->convertOptionsValueToString($options),
]);
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php
index f4334bc25efd8..e5451c8e49847 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php
@@ -5,10 +5,16 @@
*/
namespace Magento\Catalog\Ui\DataProvider\Product;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Eav\Model\Entity\Attribute\AttributeInterface;
+
/**
* Collection which is used for rendering product list in the backend.
*
* Used for product grid and customizes behavior of the default Product collection for grid needs.
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
*/
class ProductCollection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
{
@@ -25,4 +31,63 @@ protected function _productLimitationJoinPrice()
$this->_productLimitationFilters->setUsePriceIndex(false);
return $this->_productLimitationPrice(true);
}
+
+ /**
+ * Add attribute filter to collection
+ *
+ * @param AttributeInterface|integer|string|array $attribute
+ * @param null|string|array $condition
+ * @param string $joinType
+ * @return $this
+ * @throws LocalizedException
+ */
+ public function addAttributeToFilter($attribute, $condition = null, $joinType = 'inner')
+ {
+ $storeId = (int)$this->getStoreId();
+ if ($attribute === 'is_saleable'
+ || is_array($attribute)
+ || $storeId !== $this->getDefaultStoreId()
+ ) {
+ return parent::addAttributeToFilter($attribute, $condition, $joinType);
+ }
+
+ if ($attribute instanceof AttributeInterface) {
+ $attributeModel = $attribute;
+ } else {
+ $attributeModel = $this->getEntity()->getAttribute($attribute);
+ if ($attributeModel === false) {
+ throw new LocalizedException(
+ __('Invalid attribute identifier for filter (%1)', get_class($attribute))
+ );
+ }
+ }
+
+ if ($attributeModel->isScopeGlobal() || $attributeModel->getBackend()->isStatic()) {
+ return parent::addAttributeToFilter($attribute, $condition, $joinType);
+ }
+
+ $this->addAttributeToFilterAllStores($attributeModel, $condition);
+
+ return $this;
+ }
+
+ /**
+ * Add attribute to filter by all stores
+ *
+ * @param Attribute $attributeModel
+ * @param array $condition
+ * @return void
+ */
+ private function addAttributeToFilterAllStores(Attribute $attributeModel, array $condition): void
+ {
+ $tableName = $this->getTable($attributeModel->getBackendTable());
+ $entity = $this->getEntity();
+ $fKey = 'e.' . $this->getEntityPkName($entity);
+ $pKey = $tableName . '.' . $this->getEntityPkName($entity);
+ $condition = "({$pKey} = {$fKey}) AND ("
+ . $this->_getConditionSql("{$tableName}.value", $condition)
+ . ')';
+ $selectExistsInAllStores = $this->getConnection()->select()->from($tableName);
+ $this->getSelect()->exists($selectExistsInAllStores, $condition);
+ }
}
diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
index 44d051933909b..5c3ee3da8ca81 100644
--- a/app/code/Magento/Catalog/composer.json
+++ b/app/code/Magento/Catalog/composer.json
@@ -7,6 +7,8 @@
"require": {
"php": "~7.1.3||~7.2.0",
"magento/framework": "*",
+ "magento/module-authorization": "*",
+ "magento/module-asynchronous-operations": "*",
"magento/module-backend": "*",
"magento/module-catalog-inventory": "*",
"magento/module-catalog-rule": "*",
diff --git a/app/code/Magento/Catalog/etc/adminhtml/system.xml b/app/code/Magento/Catalog/etc/adminhtml/system.xml
index 7a05601fcd666..1d563244f1432 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/system.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/system.xml
@@ -59,7 +59,7 @@
Comma-separated.
- validate-per-page-value-list
+ validate-per-page-value-list required-entry
@@ -69,7 +69,7 @@
Comma-separated.
- validate-per-page-value-list
+ validate-per-page-value-list required-entry
diff --git a/app/code/Magento/Catalog/etc/communication.xml b/app/code/Magento/Catalog/etc/communication.xml
new file mode 100644
index 0000000000000..1a957f6ac9fe5
--- /dev/null
+++ b/app/code/Magento/Catalog/etc/communication.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml
index 7d2c3699ee2c2..49447447622f9 100644
--- a/app/code/Magento/Catalog/etc/di.xml
+++ b/app/code/Magento/Catalog/etc/di.xml
@@ -72,6 +72,7 @@
diff --git a/app/code/Magento/Catalog/etc/frontend/di.xml b/app/code/Magento/Catalog/etc/frontend/di.xml
index 793a2291f599c..ee9c5b29da894 100644
--- a/app/code/Magento/Catalog/etc/frontend/di.xml
+++ b/app/code/Magento/Catalog/etc/frontend/di.xml
@@ -120,5 +120,4 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/etc/queue_consumer.xml b/app/code/Magento/Catalog/etc/queue_consumer.xml
new file mode 100644
index 0000000000000..d9e66ae69c10c
--- /dev/null
+++ b/app/code/Magento/Catalog/etc/queue_consumer.xml
@@ -0,0 +1,11 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/etc/queue_publisher.xml b/app/code/Magento/Catalog/etc/queue_publisher.xml
new file mode 100644
index 0000000000000..1606ea42ec0b3
--- /dev/null
+++ b/app/code/Magento/Catalog/etc/queue_publisher.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/etc/queue_topology.xml b/app/code/Magento/Catalog/etc/queue_topology.xml
new file mode 100644
index 0000000000000..bdac891afbdb8
--- /dev/null
+++ b/app/code/Magento/Catalog/etc/queue_topology.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
index 578281f44c4cf..d689daef4bcab 100644
--- a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
@@ -132,6 +132,7 @@
true
text
+ ui/grid/cells/html
@@ -154,6 +155,7 @@
text
+ ui/grid/cells/html
diff --git a/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml b/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
new file mode 100644
index 0000000000000..0f3b4f481a288
--- /dev/null
+++ b/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
@@ -0,0 +1,100 @@
+getOption();
+if ($option) : ?>
+ getPreconfiguredValue($option);
+ $optionType = $option->getType();
+ $arraySign = $optionType === Option::OPTION_TYPE_CHECKBOX ? '[]' : '';
+ $count = 1;
+ ?>
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
index 8d3248896b434..41a2a6142d506 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
@@ -121,7 +121,12 @@
-
+
+ Magento\Catalog\Block\Product\View\GalleryOptions
+ Magento\Catalog\Helper\Image
+
+
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml
index c930d2195a01b..1c4a37fedebe3 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml
@@ -23,8 +23,8 @@
- escapeHtml(__($_data['label'])) ?>
- productAttribute($_product, $_data['value'], $_data['code']) ?>
+ escapeHtml($_data['label']) ?>
+ productAttribute($_product, $_data['value'], $_data['code']) ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
index 1bfa30478df8a..1f06b90758d0b 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
@@ -12,32 +12,32 @@
* @var $block \Magento\Catalog\Block\Product\View\Gallery
*/
?>
-
diff --git a/app/code/Magento/PageCache/Test/Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml b/app/code/Magento/PageCache/Test/Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml
new file mode 100644
index 0000000000000..bd6f7ba362bf4
--- /dev/null
+++ b/app/code/Magento/PageCache/Test/Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml b/app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml
index c5871ddc3a373..a3c9e7b39217d 100644
--- a/app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml
+++ b/app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml
@@ -9,7 +9,7 @@
-
-
-
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OtherPayPalConfigurationActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OtherPayPalConfigurationActionGroup.xml
new file mode 100644
index 0000000000000..08ca6c7834384
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OtherPayPalConfigurationActionGroup.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PayPalExpressCheckoutConfigurationActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PayPalExpressCheckoutConfigurationActionGroup.xml
index 7bf26aceb316a..bae517ffe2f3e 100644
--- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PayPalExpressCheckoutConfigurationActionGroup.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PayPalExpressCheckoutConfigurationActionGroup.xml
@@ -8,18 +8,22 @@
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Paypal/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..207bf62abf3ce
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Data/AdminMenuData.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+ PayPal Settlement Reports
+ PayPal Settlement
+ magento-paypal-report-salesroot-paypal-settlement-reports
+
+
+ Sales
+ Sales
+ magento-sales-sales
+
+
+ Billing Agreements
+ Billing Agreements
+ magento-paypal-paypal-billing-agreement
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml b/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml
index d97e60043cc5d..ae34476e9ac0b 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml
@@ -38,6 +38,9 @@
0
+
+ someMerchantId
+
@@ -89,4 +92,11 @@
silver
black
+
+ myBusinessAccount@magento.com
+ myApiUsername.magento.com
+ somePassword
+ someApiSignature
+ someMerchantId
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/OtherPayPalPaymentsConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/OtherPayPalPaymentsConfigSection.xml
new file mode 100644
index 0000000000000..ca8438d5ee06a
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Section/OtherPayPalPaymentsConfigSection.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection.xml
index 3ac0bb2707556..85f94cd8691a5 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection.xml
@@ -9,20 +9,24 @@
-
+
+
-
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPal.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPal.xml
new file mode 100644
index 0000000000000..b485fcb2a8f9a
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPal.xml
@@ -0,0 +1,276 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminReportsPayPalSettlementNavigateMenuTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminReportsPayPalSettlementNavigateMenuTest.xml
new file mode 100644
index 0000000000000..03f0167230e9f
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminReportsPayPalSettlementNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminSalesBillingAgreementsNavigateMenuTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminSalesBillingAgreementsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..8c3735fcbd253
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminSalesBillingAgreementsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php
index b33d2f5723961..b9ea53c154014 100644
--- a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php
@@ -5,6 +5,8 @@
*/
namespace Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Field\Enable;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
/**
* Class AbstractEnableTest
*
@@ -43,8 +45,18 @@ protected function setUp()
)->disableOriginalConstructor()
->getMockForAbstractClass();
+ $objectManager = new ObjectManager($this);
+ $escaper = $objectManager->getObject(\Magento\Framework\Escaper::class);
+ $reflection = new \ReflectionClass($this->elementMock);
+ $reflection_property = $reflection->getProperty('_escaper');
+ $reflection_property->setAccessible(true);
+ $reflection_property->setValue($this->elementMock, $escaper);
+
$this->abstractEnable = $objectManager->getObject(
- \Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Field\Enable\AbstractEnable\Stub::class
+ \Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Field\Enable\AbstractEnable\Stub::class,
+ [
+ '_escaper' => $objectManager->getObject(\Magento\Framework\Escaper::class)
+ ]
);
}
diff --git a/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php b/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php
index 60451a9827097..6752eab6a7783 100644
--- a/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php
@@ -3,16 +3,18 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\Paypal\Test\Unit\Controller\Transparent;
use Magento\Framework\App\Action\Context;
use Magento\Framework\Controller\Result\JsonFactory;
use Magento\Framework\Session\Generic;
use Magento\Framework\Session\SessionManager;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
use Magento\Paypal\Controller\Transparent\RequestSecureToken;
use Magento\Paypal\Model\Payflow\Service\Request\SecureToken;
use Magento\Paypal\Model\Payflow\Transparent;
+use PHPUnit\Framework\MockObject\MockObject;
/**
* Class RequestSecureTokenTest
@@ -22,39 +24,39 @@
class RequestSecureTokenTest extends \PHPUnit\Framework\TestCase
{
/**
- * @var Transparent|\PHPUnit_Framework_MockObject_MockObject
+ * @var Transparent|MockObject
*/
- protected $transparentMock;
+ private $transparent;
/**
- * @var RequestSecureToken|\PHPUnit_Framework_MockObject_MockObject
+ * @var RequestSecureToken|MockObject
*/
- protected $controller;
+ private $controller;
/**
- * @var Context|\PHPUnit_Framework_MockObject_MockObject
+ * @var Context|MockObject
*/
- protected $contextMock;
+ private $context;
/**
- * @var JsonFactory|\PHPUnit_Framework_MockObject_MockObject
+ * @var JsonFactory|MockObject
*/
- protected $resultJsonFactoryMock;
+ private $resultJsonFactory;
/**
- * @var Generic|\PHPUnit_Framework_MockObject_MockObject
+ * @var Generic|MockObject
*/
- protected $sessionTransparentMock;
+ private $sessionTransparent;
/**
- * @var SecureToken|\PHPUnit_Framework_MockObject_MockObject
+ * @var SecureToken|MockObject
*/
- protected $secureTokenServiceMock;
+ private $secureTokenService;
/**
- * @var SessionManager|\PHPUnit_Framework_MockObject_MockObject
+ * @var SessionManager|MockObject
*/
- protected $sessionManagerMock;
+ private $sessionManager;
/**
* Set up
@@ -64,45 +66,46 @@ class RequestSecureTokenTest extends \PHPUnit\Framework\TestCase
protected function setUp()
{
- $this->contextMock = $this->getMockBuilder(\Magento\Framework\App\Action\Context::class)
+ $this->context = $this->getMockBuilder(\Magento\Framework\App\Action\Context::class)
->disableOriginalConstructor()
->getMock();
- $this->resultJsonFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\JsonFactory::class)
+ $this->resultJsonFactory = $this->getMockBuilder(\Magento\Framework\Controller\Result\JsonFactory::class)
->setMethods(['create'])
->disableOriginalConstructor()
->getMock();
- $this->sessionTransparentMock = $this->getMockBuilder(\Magento\Framework\Session\Generic::class)
+ $this->sessionTransparent = $this->getMockBuilder(\Magento\Framework\Session\Generic::class)
->setMethods(['setQuoteId'])
->disableOriginalConstructor()
->getMock();
- $this->secureTokenServiceMock = $this->getMockBuilder(
+ $this->secureTokenService = $this->getMockBuilder(
\Magento\Paypal\Model\Payflow\Service\Request\SecureToken::class
)
->setMethods(['requestToken'])
->disableOriginalConstructor()
->getMock();
- $this->sessionManagerMock = $this->getMockBuilder(\Magento\Framework\Session\SessionManager::class)
+ $this->sessionManager = $this->getMockBuilder(\Magento\Framework\Session\SessionManager::class)
->setMethods(['getQuote'])
->disableOriginalConstructor()
->getMock();
- $this->transparentMock = $this->getMockBuilder(\Magento\Paypal\Model\Payflow\Transparent::class)
- ->setMethods(['getCode'])
+ $this->transparent = $this->getMockBuilder(\Magento\Paypal\Model\Payflow\Transparent::class)
+ ->setMethods(['getCode', 'isActive'])
->disableOriginalConstructor()
->getMock();
$this->controller = new \Magento\Paypal\Controller\Transparent\RequestSecureToken(
- $this->contextMock,
- $this->resultJsonFactoryMock,
- $this->sessionTransparentMock,
- $this->secureTokenServiceMock,
- $this->sessionManagerMock,
- $this->transparentMock
+ $this->context,
+ $this->resultJsonFactory,
+ $this->sessionTransparent,
+ $this->secureTokenService,
+ $this->sessionManager,
+ $this->transparent
);
}
public function testExecuteSuccess()
{
$quoteId = 99;
+ $storeId = 2;
$tokenFields = ['fields-1', 'fields-2', 'fields-3'];
$secureToken = 'token_hash';
$resultExpectation = [
@@ -116,6 +119,8 @@ public function testExecuteSuccess()
$quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
->disableOriginalConstructor()
->getMock();
+ $quoteMock->method('getStoreId')
+ ->willReturn($storeId);
$tokenMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
->disableOriginalConstructor()
->getMock();
@@ -123,21 +128,23 @@ public function testExecuteSuccess()
->disableOriginalConstructor()
->getMock();
- $this->sessionManagerMock->expects($this->atLeastOnce())
+ $this->sessionManager->expects($this->atLeastOnce())
->method('getQuote')
->willReturn($quoteMock);
+ $this->transparent->method('isActive')
+ ->with($storeId)
+ ->willReturn(true);
$quoteMock->expects($this->once())
->method('getId')
->willReturn($quoteId);
- $this->sessionTransparentMock->expects($this->once())
+ $this->sessionTransparent->expects($this->once())
->method('setQuoteId')
->with($quoteId);
- $this->secureTokenServiceMock->expects($this->once())
+ $this->secureTokenService->expects($this->once())
->method('requestToken')
->with($quoteMock)
->willReturn($tokenMock);
- $this->transparentMock->expects($this->once())
- ->method('getCode')
+ $this->transparent->method('getCode')
->willReturn('transparent');
$tokenMock->expects($this->atLeastOnce())
->method('getData')
@@ -147,7 +154,7 @@ public function testExecuteSuccess()
['securetoken', null, $secureToken]
]
);
- $this->resultJsonFactoryMock->expects($this->once())
+ $this->resultJsonFactory->expects($this->once())
->method('create')
->willReturn($jsonMock);
$jsonMock->expects($this->once())
@@ -161,6 +168,7 @@ public function testExecuteSuccess()
public function testExecuteTokenRequestException()
{
$quoteId = 99;
+ $storeId = 2;
$resultExpectation = [
'success' => false,
'error' => true,
@@ -170,24 +178,29 @@ public function testExecuteTokenRequestException()
$quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
->disableOriginalConstructor()
->getMock();
+ $quoteMock->method('getStoreId')
+ ->willReturn($storeId);
$jsonMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Json::class)
->disableOriginalConstructor()
->getMock();
- $this->sessionManagerMock->expects($this->atLeastOnce())
+ $this->sessionManager->expects($this->atLeastOnce())
->method('getQuote')
->willReturn($quoteMock);
$quoteMock->expects($this->once())
->method('getId')
->willReturn($quoteId);
- $this->sessionTransparentMock->expects($this->once())
+ $this->transparent->method('isActive')
+ ->with($storeId)
+ ->willReturn(true);
+ $this->sessionTransparent->expects($this->once())
->method('setQuoteId')
->with($quoteId);
- $this->secureTokenServiceMock->expects($this->once())
+ $this->secureTokenService->expects($this->once())
->method('requestToken')
->with($quoteMock)
->willThrowException(new \Exception());
- $this->resultJsonFactoryMock->expects($this->once())
+ $this->resultJsonFactory->expects($this->once())
->method('create')
->willReturn($jsonMock);
$jsonMock->expects($this->once())
@@ -211,10 +224,10 @@ public function testExecuteEmptyQuoteError()
->disableOriginalConstructor()
->getMock();
- $this->sessionManagerMock->expects($this->atLeastOnce())
+ $this->sessionManager->expects($this->atLeastOnce())
->method('getQuote')
->willReturn($quoteMock);
- $this->resultJsonFactoryMock->expects($this->once())
+ $this->resultJsonFactory->expects($this->once())
->method('create')
->willReturn($jsonMock);
$jsonMock->expects($this->once())
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml
index 565962518881b..d8b765b9b4d22 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml
@@ -15,7 +15,7 @@
+ >
wps_express
@@ -39,16 +39,16 @@
+ >
payments_pro_hosted_solution_with_express_checkout
- express_checkout_us
+ express_checkout_gb
-
+
@@ -56,19 +56,19 @@
payments_pro_hosted_solution_with_express_checkout
- express_checkout_us
+ express_checkout_gb
-
+
+ >
wps_express
@@ -98,4 +98,4 @@
-
+
\ No newline at end of file
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml
index 425e4cffb666c..694e517816b22 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml
@@ -6,7 +6,7 @@
*/
-->
-
+
0
@@ -30,7 +30,7 @@
+
See Details.
"
+"PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit® - at no additional cost to you.
+ You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit®.
+ Learn More","PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit® - at no additional cost to you.
+ You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit®.
+ Learn More"
"Customize Smart Buttons","Customize Smart Buttons"
"Checkout Page","Checkout Page"
"Label","Label"
@@ -731,4 +736,4 @@ User,User
"PayPal will automatically display each enabled funding option to eligible buyers. For example, PayPal Credit is only shown to buyers in countries where PayPal Credit is offered and the currency offered by the merchant is USD.","PayPal will automatically display each enabled funding option to eligible buyers. For example, PayPal Credit is only shown to buyers in countries where PayPal Credit is offered and the currency offered by the merchant is USD."
"PayPal Credit","PayPal Credit"
"PayPal Guest Checkout Credit Card Icons","PayPal Guest Checkout Credit Card Icons"
-"Elektronisches Lastschriftverfahren - German ELV","Elektronisches Lastschriftverfahren - German ELV"
\ No newline at end of file
+"Elektronisches Lastschriftverfahren - German ELV","Elektronisches Lastschriftverfahren - German ELV"
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html
index f1b14831bab31..d6fb2f3e6fc75 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html
@@ -58,6 +58,7 @@
+
-
-
-
+ $helper = $block->getData('imageHelper');
+ $mainImageData = $mainImage ?
+ $mainImage->getData('medium_image_url') :
+ $helper->getDefaultPlaceholderUrl('image');
+
+?>
+
+
-
-
-  ?>)
-
-
-
+ 
+
+
diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
index 8d75cc32914b4..a1fb2e449d7bf 100644
--- a/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
+++ b/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
@@ -33,7 +33,10 @@ protected function setUp()
$testHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
$this->_object = $testHelper->getObject(
\Magento\OfflineShipping\Block\Adminhtml\Form\Field\Import::class,
- ['data' => $testData]
+ [
+ 'data' => $testData,
+ '_escaper' => $testHelper->getObject(\Magento\Framework\Escaper::class)
+ ]
);
$this->_object->setForm($this->_formMock);
}
diff --git a/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml b/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml
index 34a77095d524d..ee0c32633569a 100644
--- a/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml
+++ b/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml
@@ -30,5 +30,6 @@
diff --git a/app/code/Magento/PaypalCaptcha/LICENSE.txt b/app/code/Magento/PaypalCaptcha/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/LICENSE.txt
@@ -0,0 +1,48 @@
+
+Open Software License ("OSL") v. 3.0
+
+This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Open Software License version 3.0
+
+ 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+ 1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+ 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+ 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
+
+ 4. to perform the Original Work publicly; and
+
+ 5. to display the Original Work publicly.
+
+ 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+ 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+ 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+ 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+ 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+ 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+ 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+ 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+ 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+ 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+ 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+ 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+ 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+ 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+ 16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
\ No newline at end of file
diff --git a/app/code/Magento/PaypalCaptcha/LICENSE_AFL.txt b/app/code/Magento/PaypalCaptcha/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/LICENSE_AFL.txt
@@ -0,0 +1,48 @@
+
+Academic Free License ("AFL") v. 3.0
+
+This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Academic Free License version 3.0
+
+ 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+ 1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+ 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+ 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License;
+
+ 4. to perform the Original Work publicly; and
+
+ 5. to display the Original Work publicly.
+
+ 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+ 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+ 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+ 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+ 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+ 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+ 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+ 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+ 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+ 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+ 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+ 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+ 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+ 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+ 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
diff --git a/app/code/Magento/PaypalCaptcha/Model/Checkout/ConfigProviderPayPal.php b/app/code/Magento/PaypalCaptcha/Model/Checkout/ConfigProviderPayPal.php
new file mode 100644
index 0000000000000..289a1631ed1f6
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/Model/Checkout/ConfigProviderPayPal.php
@@ -0,0 +1,135 @@
+storeManager = $storeManager;
+ $this->captchaData = $captchaData;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getConfig(): array
+ {
+ $config['captchaPayments'][self::$formId] = [
+ 'isCaseSensitive' => $this->isCaseSensitive(self::$formId),
+ 'imageHeight' => $this->getImageHeight(self::$formId),
+ 'imageSrc' => $this->getImageSrc(self::$formId),
+ 'refreshUrl' => $this->getRefreshUrl(),
+ 'isRequired' => $this->isRequired(self::$formId),
+ 'timestamp' => time()
+ ];
+
+ return $config;
+ }
+
+ /**
+ * Returns is captcha case sensitive
+ *
+ * @param string $formId
+ * @return bool
+ */
+ private function isCaseSensitive(string $formId): bool
+ {
+ return (bool)$this->getCaptchaModel($formId)->isCaseSensitive();
+ }
+
+ /**
+ * Returns captcha image height
+ *
+ * @param string $formId
+ * @return int
+ */
+ private function getImageHeight(string $formId): int
+ {
+ return (int)$this->getCaptchaModel($formId)->getHeight();
+ }
+
+ /**
+ * Returns captcha image source path
+ *
+ * @param string $formId
+ * @return string
+ */
+ private function getImageSrc(string $formId): string
+ {
+ if ($this->isRequired($formId)) {
+ $captcha = $this->getCaptchaModel($formId);
+ $captcha->generate();
+ return $captcha->getImgSrc();
+ }
+
+ return '';
+ }
+
+ /**
+ * Returns URL to controller action which returns new captcha image
+ *
+ * @return string
+ */
+ private function getRefreshUrl(): string
+ {
+ $store = $this->storeManager->getStore();
+ return $store->getUrl('captcha/refresh', ['_secure' => $store->isCurrentlySecure()]);
+ }
+
+ /**
+ * Whether captcha is required to be inserted to this form
+ *
+ * @param string $formId
+ * @return bool
+ */
+ private function isRequired(string $formId): bool
+ {
+ return (bool)$this->getCaptchaModel($formId)->isRequired();
+ }
+
+ /**
+ * Return captcha model for specified form
+ *
+ * @param string $formId
+ * @return CaptchaInterface
+ */
+ private function getCaptchaModel(string $formId): CaptchaInterface
+ {
+ return $this->captchaData->getCaptcha($formId);
+ }
+}
diff --git a/app/code/Magento/PaypalCaptcha/Observer/CaptchaRequestToken.php b/app/code/Magento/PaypalCaptcha/Observer/CaptchaRequestToken.php
new file mode 100644
index 0000000000000..e7cb282b1799b
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/Observer/CaptchaRequestToken.php
@@ -0,0 +1,76 @@
+helper = $helper;
+ $this->jsonSerializer = $jsonSerializer;
+ $this->actionFlag = $actionFlag;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function execute(Observer $observer)
+ {
+ $formId = 'co-payment-form';
+ $captcha = $this->helper->getCaptcha($formId);
+
+ if (!$captcha->isRequired()) {
+ return;
+ }
+
+ /** @var Action $controller */
+ $controller = $observer->getControllerAction();
+ $word = $controller->getRequest()->getPost('captcha_string');
+ if ($captcha->isCorrect($word)) {
+ return;
+ }
+
+ $data = $this->jsonSerializer->serialize([
+ 'success' => false,
+ 'error' => true,
+ 'error_messages' => __('Incorrect CAPTCHA.')
+ ]);
+ $this->actionFlag->set('', Action::FLAG_NO_DISPATCH, true);
+ $controller->getResponse()->representJson($data);
+ }
+}
diff --git a/app/code/Magento/PaypalCaptcha/README.md b/app/code/Magento/PaypalCaptcha/README.md
new file mode 100644
index 0000000000000..71588599a5ecd
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/README.md
@@ -0,0 +1 @@
+The PayPal Captcha module provides a possibility to enable Captcha validation on Payflow Pro payment form.
\ No newline at end of file
diff --git a/app/code/Magento/PaypalCaptcha/composer.json b/app/code/Magento/PaypalCaptcha/composer.json
new file mode 100644
index 0000000000000..e71ef8c0ec7de
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/composer.json
@@ -0,0 +1,30 @@
+{
+ "name": "magento/module-paypal-captcha",
+ "description": "Provides CAPTCHA validation for PayPal Payflow Pro",
+ "config": {
+ "sort-packages": true
+ },
+ "require": {
+ "php": "~7.1.3||~7.2.0",
+ "magento/framework": "*",
+ "magento/module-captcha": "*",
+ "magento/module-checkout": "*",
+ "magento/module-store": "*"
+ },
+ "suggest": {
+ "magento/module-paypal": "*"
+ },
+ "type": "magento2-module",
+ "license": [
+ "OSL-3.0",
+ "AFL-3.0"
+ ],
+ "autoload": {
+ "files": [
+ "registration.php"
+ ],
+ "psr-4": {
+ "Magento\\PaypalCaptcha\\": ""
+ }
+ }
+}
diff --git a/app/code/Magento/PaypalCaptcha/etc/adminhtml/system.xml b/app/code/Magento/PaypalCaptcha/etc/adminhtml/system.xml
new file mode 100644
index 0000000000000..12afd8ceda60e
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/etc/adminhtml/system.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+ CAPTCHA for "Create user", "Forgot password", "Payflow Pro" forms is always enabled if chosen.
+
+
+
+
+
diff --git a/app/code/Magento/PaypalCaptcha/etc/config.xml b/app/code/Magento/PaypalCaptcha/etc/config.xml
new file mode 100644
index 0000000000000..133a78a42f7b4
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/etc/config.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+ 1
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/PaypalCaptcha/etc/frontend/di.xml b/app/code/Magento/PaypalCaptcha/etc/frontend/di.xml
new file mode 100644
index 0000000000000..c236d5ea04ca0
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/etc/frontend/di.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+ - Magento\PaypalCaptcha\Model\Checkout\ConfigProviderPayPal
+
+
+
+
diff --git a/app/code/Magento/PaypalCaptcha/etc/frontend/events.xml b/app/code/Magento/PaypalCaptcha/etc/frontend/events.xml
new file mode 100644
index 0000000000000..ae706c4485d61
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/etc/frontend/events.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/PaypalCaptcha/etc/module.xml b/app/code/Magento/PaypalCaptcha/etc/module.xml
new file mode 100644
index 0000000000000..425c829a5d391
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/etc/module.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/PaypalCaptcha/registration.php b/app/code/Magento/PaypalCaptcha/registration.php
new file mode 100644
index 0000000000000..4dac0582a6d1b
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/registration.php
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+ -
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- uiComponent
+ - paypal-captcha
+ - paypal-captcha
+ - checkoutProvider
+ -
+
- Magento_Checkout/payment/before-place-order
+
+ -
+
-
+
- Magento_PaypalCaptcha/js/view/checkout/paymentCaptcha
+ - paypal-captcha
+ - co-payment-form
+ - checkoutConfig
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/PaypalCaptcha/view/frontend/requirejs-config.js b/app/code/Magento/PaypalCaptcha/view/frontend/requirejs-config.js
new file mode 100644
index 0000000000000..78e7add4ec690
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/view/frontend/requirejs-config.js
@@ -0,0 +1,14 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+var config = {
+ config: {
+ mixins: {
+ 'Magento_Checkout/js/view/payment/list': {
+ 'Magento_PaypalCaptcha/js/view/payment/list-mixin': true
+ }
+ }
+ }
+};
diff --git a/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/checkout/paymentCaptcha.js b/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/checkout/paymentCaptcha.js
new file mode 100644
index 0000000000000..f8f119e3b3396
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/checkout/paymentCaptcha.js
@@ -0,0 +1,44 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'jquery',
+ 'Magento_Captcha/js/view/checkout/defaultCaptcha',
+ 'Magento_Captcha/js/model/captchaList',
+ 'Magento_Captcha/js/model/captcha'
+],
+function ($, defaultCaptcha, captchaList, Captcha) {
+ 'use strict';
+
+ return defaultCaptcha.extend({
+
+ /** @inheritdoc */
+ initialize: function () {
+ var captchaConfigPayment,
+ currentCaptcha;
+
+ this._super();
+
+ if (window[this.configSource] && window[this.configSource].captchaPayments) {
+ captchaConfigPayment = window[this.configSource].captchaPayments;
+
+ $.each(captchaConfigPayment, function (formId, captchaData) {
+ var captcha;
+
+ captchaData.formId = formId;
+ captcha = Captcha(captchaData);
+ captchaList.add(captcha);
+ });
+ }
+
+ currentCaptcha = captchaList.getCaptchaByFormId(this.formId);
+
+ if (currentCaptcha != null) {
+ currentCaptcha.setIsVisible(true);
+ this.setCurrentCaptcha(currentCaptcha);
+ }
+ }
+ });
+});
diff --git a/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/payment/list-mixin.js b/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/payment/list-mixin.js
new file mode 100644
index 0000000000000..60172f696e9ed
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/payment/list-mixin.js
@@ -0,0 +1,54 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'jquery',
+ 'Magento_Captcha/js/model/captchaList'
+], function ($, captchaList) {
+ 'use strict';
+
+ var mixin = {
+
+ formId: 'co-payment-form',
+
+ /**
+ * Sets custom template for Payflow Pro
+ *
+ * @param {Object} payment
+ * @returns {Object}
+ */
+ createComponent: function (payment) {
+
+ var component = this._super(payment);
+
+ if (component.component === 'Magento_Paypal/js/view/payment/method-renderer/payflowpro-method') {
+ component.template = 'Magento_PaypalCaptcha/payment/payflowpro-form';
+ $(window).off('clearTimeout')
+ .on('clearTimeout', this.clearTimeout.bind(this));
+ }
+
+ return component;
+ },
+
+ /**
+ * Overrides default window.clearTimeout() to catch errors from iframe and reload Captcha.
+ */
+ clearTimeout: function () {
+ var captcha = captchaList.getCaptchaByFormId(this.formId);
+
+ if (captcha !== null) {
+ captcha.refresh();
+ }
+ clearTimeout();
+ }
+ };
+
+ /**
+ * Overrides `Magento_Checkout/js/view/payment/list::createComponent`
+ */
+ return function (target) {
+ return target.extend(mixin);
+ };
+});
diff --git a/app/code/Magento/PaypalCaptcha/view/frontend/web/template/payment/payflowpro-form.html b/app/code/Magento/PaypalCaptcha/view/frontend/web/template/payment/payflowpro-form.html
new file mode 100644
index 0000000000000..fec5cf96b0324
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/view/frontend/web/template/payment/payflowpro-form.html
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+ 150
+
+
+
+ John1
+ Doe1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{US_Address_CA.postcode}}
+ grabTextPostCode
+
+
+
diff --git a/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php
index 46dda1be365d4..b096dd2317a33 100644
--- a/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php
@@ -1,12 +1,16 @@
checkoutSessionMock,
$this->requestMock
);
+ $this->quoteMock = $this->getMockBuilder(Quote::class)
+ ->setMethods(['getCustomerIsGuest', 'getIsPersistent'])
+ ->disableOriginalConstructor()
+ ->getMock();
}
public function testExecuteWhenCanNotApplyPersistentData()
@@ -133,6 +146,11 @@ public function testExecuteWhenPersistentIsEnabled(
->willReturn(true);
$this->persistentHelperMock->expects($this->once())->method('isEnabled')->willReturn(true);
$this->sessionMock->expects($this->once())->method('isPersistent')->willReturn(false);
+ $this->checkoutSessionMock
+ ->method('getQuote')
+ ->willReturn($this->quoteMock);
+ $this->quoteMock->method('getCustomerIsGuest')->willReturn(true);
+ $this->quoteMock->method('getIsPersistent')->willReturn(true);
$this->customerSessionMock
->expects($this->atLeastOnce())
->method('isLoggedIn')
diff --git a/app/code/Magento/Persistent/Test/Unit/Observer/SetQuotePersistentDataObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Observer/SetQuotePersistentDataObserverTest.php
index 6724743789cea..ffa829e8456cc 100644
--- a/app/code/Magento/Persistent/Test/Unit/Observer/SetQuotePersistentDataObserverTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Observer/SetQuotePersistentDataObserverTest.php
@@ -7,6 +7,9 @@
namespace Magento\Persistent\Test\Unit\Observer;
+/**
+ * Observer test for setting "is_persistent" value to quote
+ */
class SetQuotePersistentDataObserverTest extends \PHPUnit\Framework\TestCase
{
/**
@@ -83,7 +86,6 @@ public function testExecuteWhenQuoteNotExist()
->method('getEvent')
->will($this->returnValue($this->eventManagerMock));
$this->eventManagerMock->expects($this->once())->method('getQuote');
- $this->customerSessionMock->expects($this->never())->method('isLoggedIn');
$this->model->execute($this->observerMock);
}
@@ -98,8 +100,7 @@ public function testExecuteWhenSessionIsPersistent()
->expects($this->once())
->method('getQuote')
->will($this->returnValue($this->quoteMock));
- $this->customerSessionMock->expects($this->once())->method('isLoggedIn')->will($this->returnValue(false));
- $this->helperMock->expects($this->once())->method('isShoppingCartPersist')->will($this->returnValue(false));
+ $this->helperMock->expects($this->once())->method('isShoppingCartPersist')->will($this->returnValue(true));
$this->quoteManagerMock->expects($this->once())->method('isPersistent')->will($this->returnValue(true));
$this->quoteMock->expects($this->once())->method('setIsPersistent')->with(true);
$this->model->execute($this->observerMock);
diff --git a/app/code/Magento/ProductVideo/i18n/de_DE.csv b/app/code/Magento/ProductVideo/i18n/de_DE.csv
deleted file mode 100644
index ca24668bb8d16..0000000000000
--- a/app/code/Magento/ProductVideo/i18n/de_DE.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-"Add video","Add video"
-"New Video","New Video"
-"Product Video","Product Video"
-"YouTube API key","YouTube API key"
-"You have not entered youtube API key. No information about youtube video will be retrieved.","You have not entered youtube API key. No information about youtube video will be retrieved."
-"Url","Url"
-"Preview Image","Preview Image"
-"Get Video Information","Get Video Information"
-"Youtube or Vimeo supported","Youtube or Vimeo supported"
-"Delete image in all store views","Delete image in all store views"
diff --git a/app/code/Magento/ProductVideo/i18n/es_ES.csv b/app/code/Magento/ProductVideo/i18n/es_ES.csv
deleted file mode 100644
index ca24668bb8d16..0000000000000
--- a/app/code/Magento/ProductVideo/i18n/es_ES.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-"Add video","Add video"
-"New Video","New Video"
-"Product Video","Product Video"
-"YouTube API key","YouTube API key"
-"You have not entered youtube API key. No information about youtube video will be retrieved.","You have not entered youtube API key. No information about youtube video will be retrieved."
-"Url","Url"
-"Preview Image","Preview Image"
-"Get Video Information","Get Video Information"
-"Youtube or Vimeo supported","Youtube or Vimeo supported"
-"Delete image in all store views","Delete image in all store views"
diff --git a/app/code/Magento/ProductVideo/i18n/fr_FR.csv b/app/code/Magento/ProductVideo/i18n/fr_FR.csv
deleted file mode 100644
index ca24668bb8d16..0000000000000
--- a/app/code/Magento/ProductVideo/i18n/fr_FR.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-"Add video","Add video"
-"New Video","New Video"
-"Product Video","Product Video"
-"YouTube API key","YouTube API key"
-"You have not entered youtube API key. No information about youtube video will be retrieved.","You have not entered youtube API key. No information about youtube video will be retrieved."
-"Url","Url"
-"Preview Image","Preview Image"
-"Get Video Information","Get Video Information"
-"Youtube or Vimeo supported","Youtube or Vimeo supported"
-"Delete image in all store views","Delete image in all store views"
diff --git a/app/code/Magento/ProductVideo/i18n/nl_NL.csv b/app/code/Magento/ProductVideo/i18n/nl_NL.csv
deleted file mode 100644
index 5ad8386573040..0000000000000
--- a/app/code/Magento/ProductVideo/i18n/nl_NL.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-"Add video","Add video"
-"New Video","New Video"
-"Product Video","Product Video"
-"YouTube API key","YouTube API key"
-"You have not entered youtube API key. No information about youtube video will be retrieved.","You have not entered youtube API key. No information about youtube video will be retrieved."
-"Url","Url"
-"Preview Image","Preview Image"
-"Get Video Information","Get Video Information"
-"Youtube or Vimeo supported","Youtube or Vimeo supported"
-"Delete image in all store views","Delete image in all store views"
\ No newline at end of file
diff --git a/app/code/Magento/ProductVideo/i18n/pt_BR.csv b/app/code/Magento/ProductVideo/i18n/pt_BR.csv
deleted file mode 100644
index 5ad8386573040..0000000000000
--- a/app/code/Magento/ProductVideo/i18n/pt_BR.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-"Add video","Add video"
-"New Video","New Video"
-"Product Video","Product Video"
-"YouTube API key","YouTube API key"
-"You have not entered youtube API key. No information about youtube video will be retrieved.","You have not entered youtube API key. No information about youtube video will be retrieved."
-"Url","Url"
-"Preview Image","Preview Image"
-"Get Video Information","Get Video Information"
-"Youtube or Vimeo supported","Youtube or Vimeo supported"
-"Delete image in all store views","Delete image in all store views"
\ No newline at end of file
diff --git a/app/code/Magento/ProductVideo/i18n/zh_Hans_CN.csv b/app/code/Magento/ProductVideo/i18n/zh_Hans_CN.csv
deleted file mode 100644
index 5ad8386573040..0000000000000
--- a/app/code/Magento/ProductVideo/i18n/zh_Hans_CN.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-"Add video","Add video"
-"New Video","New Video"
-"Product Video","Product Video"
-"YouTube API key","YouTube API key"
-"You have not entered youtube API key. No information about youtube video will be retrieved.","You have not entered youtube API key. No information about youtube video will be retrieved."
-"Url","Url"
-"Preview Image","Preview Image"
-"Get Video Information","Get Video Information"
-"Youtube or Vimeo supported","Youtube or Vimeo supported"
-"Delete image in all store views","Delete image in all store views"
\ No newline at end of file
diff --git a/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php b/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php
index c5b8dc1c4b124..6fdb70350ed72 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php
@@ -12,6 +12,9 @@
use Magento\Quote\Model\QuoteAddressValidator;
use Magento\Customer\Api\AddressRepositoryInterface;
+/**
+ * Saves billing address for quotes.
+ */
class BillingAddressPersister
{
/**
@@ -37,6 +40,8 @@ public function __construct(
}
/**
+ * Save address for billing.
+ *
* @param CartInterface $quote
* @param AddressInterface $address
* @param bool $useForShipping
@@ -47,7 +52,7 @@ public function __construct(
public function save(CartInterface $quote, AddressInterface $address, $useForShipping = false)
{
/** @var \Magento\Quote\Model\Quote $quote */
- $this->addressValidator->validate($address);
+ $this->addressValidator->validateForCart($quote, $address);
$customerAddressId = $address->getCustomerAddressId();
$shippingAddress = null;
$addressData = [];
diff --git a/app/code/Magento/Quote/Model/Quote/Item/Compare.php b/app/code/Magento/Quote/Model/Quote/Item/Compare.php
index ddaa636ef32b3..76ba324518dc1 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/Compare.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/Compare.php
@@ -50,7 +50,7 @@ protected function getOptionValues($value)
if (is_string($value) && $this->jsonValidator->isValid($value)) {
$value = $this->serializer->unserialize($value);
if (is_array($value)) {
- unset($value['qty'], $value['uenc']);
+ unset($value['qty'], $value['uenc'], $value['related_product'], $value['item']);
$value = array_filter($value, function ($optionValue) {
return !empty($optionValue);
});
diff --git a/app/code/Magento/Quote/Model/QuoteAddressValidator.php b/app/code/Magento/Quote/Model/QuoteAddressValidator.php
index 9a86829bfc4ce..e7750f5879de5 100644
--- a/app/code/Magento/Quote/Model/QuoteAddressValidator.php
+++ b/app/code/Magento/Quote/Model/QuoteAddressValidator.php
@@ -6,10 +6,13 @@
namespace Magento\Quote\Model;
use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Api\Data\AddressInterface;
+use Magento\Quote\Api\Data\CartInterface;
/**
* Quote shipping/billing address validator service.
*
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
*/
class QuoteAddressValidator
{
@@ -28,7 +31,7 @@ class QuoteAddressValidator
protected $customerRepository;
/**
- * @var \Magento\Customer\Model\Session
+ * @deprecated This class is not a part of HTML presentation layer and should not use sessions.
*/
protected $customerSession;
@@ -50,44 +53,80 @@ public function __construct(
}
/**
- * Validates the fields in a specified address data object.
+ * Validate address.
*
- * @param \Magento\Quote\Api\Data\AddressInterface $addressData The address data object.
- * @return bool
+ * @param AddressInterface $address
+ * @param int|null $customerId Cart belongs to
+ * @return void
* @throws \Magento\Framework\Exception\InputException The specified address belongs to another customer.
* @throws \Magento\Framework\Exception\NoSuchEntityException The specified customer ID or address ID is not valid.
*/
- public function validate(\Magento\Quote\Api\Data\AddressInterface $addressData)
+ private function doValidate(AddressInterface $address, ?int $customerId): void
{
//validate customer id
- if ($addressData->getCustomerId()) {
- $customer = $this->customerRepository->getById($addressData->getCustomerId());
+ if ($customerId) {
+ $customer = $this->customerRepository->getById($customerId);
if (!$customer->getId()) {
throw new \Magento\Framework\Exception\NoSuchEntityException(
- __('Invalid customer id %1', $addressData->getCustomerId())
+ __('Invalid customer id %1', $customerId)
);
}
}
- if ($addressData->getCustomerAddressId()) {
+ if ($address->getCustomerAddressId()) {
+ //Existing address cannot belong to a guest
+ if (!$customerId) {
+ throw new \Magento\Framework\Exception\NoSuchEntityException(
+ __('Invalid customer address id %1', $address->getCustomerAddressId())
+ );
+ }
+ //Validating address ID
try {
- $this->addressRepository->getById($addressData->getCustomerAddressId());
+ $this->addressRepository->getById($address->getCustomerAddressId());
} catch (NoSuchEntityException $e) {
throw new \Magento\Framework\Exception\NoSuchEntityException(
- __('Invalid address id %1', $addressData->getId())
+ __('Invalid address id %1', $address->getId())
);
}
-
+ //Finding available customer's addresses
$applicableAddressIds = array_map(function ($address) {
/** @var \Magento\Customer\Api\Data\AddressInterface $address */
return $address->getId();
- }, $this->customerRepository->getById($addressData->getCustomerId())->getAddresses());
- if (!in_array($addressData->getCustomerAddressId(), $applicableAddressIds)) {
+ }, $this->customerRepository->getById($customerId)->getAddresses());
+ if (!in_array($address->getCustomerAddressId(), $applicableAddressIds)) {
throw new \Magento\Framework\Exception\NoSuchEntityException(
- __('Invalid customer address id %1', $addressData->getCustomerAddressId())
+ __('Invalid customer address id %1', $address->getCustomerAddressId())
);
}
}
+ }
+
+ /**
+ * Validates the fields in a specified address data object.
+ *
+ * @param \Magento\Quote\Api\Data\AddressInterface $addressData The address data object.
+ * @return bool
+ * @throws \Magento\Framework\Exception\InputException The specified address belongs to another customer.
+ * @throws \Magento\Framework\Exception\NoSuchEntityException The specified customer ID or address ID is not valid.
+ */
+ public function validate(AddressInterface $addressData)
+ {
+ $this->doValidate($addressData, $addressData->getCustomerId());
+
return true;
}
+
+ /**
+ * Validate address to be used for cart.
+ *
+ * @param CartInterface $cart
+ * @param AddressInterface $address
+ * @return void
+ * @throws \Magento\Framework\Exception\InputException The specified address belongs to another customer.
+ * @throws \Magento\Framework\Exception\NoSuchEntityException The specified customer ID or address ID is not valid.
+ */
+ public function validateForCart(CartInterface $cart, AddressInterface $address): void
+ {
+ $this->doValidate($address, $cart->getCustomerIsGuest() ? null : $cart->getCustomer()->getId());
+ }
}
diff --git a/app/code/Magento/Quote/Model/QuoteManagement.php b/app/code/Magento/Quote/Model/QuoteManagement.php
index 8f216b64aa9b0..2fcfd2dfadabb 100644
--- a/app/code/Magento/Quote/Model/QuoteManagement.php
+++ b/app/code/Magento/Quote/Model/QuoteManagement.php
@@ -532,19 +532,7 @@ protected function submitQuote(QuoteEntity $quote, $orderData = [])
);
$this->quoteRepository->save($quote);
} catch (\Exception $e) {
- if (!empty($this->addressesToSync)) {
- foreach ($this->addressesToSync as $addressId) {
- $this->addressRepository->deleteById($addressId);
- }
- }
- $this->eventManager->dispatch(
- 'sales_model_service_quote_submit_failure',
- [
- 'order' => $order,
- 'quote' => $quote,
- 'exception' => $e
- ]
- );
+ $this->rollbackAddresses($quote, $order, $e);
throw $e;
}
return $order;
@@ -611,4 +599,41 @@ protected function _prepareCustomerQuote($quote)
$shipping->setIsDefaultBilling(true);
}
}
+
+ /**
+ * Remove related to order and quote addresses and submit exception to further processing.
+ *
+ * @param Quote $quote
+ * @param \Magento\Sales\Api\Data\OrderInterface $order
+ * @param \Exception $e
+ * @throws \Exception
+ */
+ private function rollbackAddresses(
+ QuoteEntity $quote,
+ \Magento\Sales\Api\Data\OrderInterface $order,
+ \Exception $e
+ ): void {
+ try {
+ if (!empty($this->addressesToSync)) {
+ foreach ($this->addressesToSync as $addressId) {
+ $this->addressRepository->deleteById($addressId);
+ }
+ }
+ $this->eventManager->dispatch(
+ 'sales_model_service_quote_submit_failure',
+ [
+ 'order' => $order,
+ 'quote' => $quote,
+ 'exception' => $e,
+ ]
+ );
+ } catch (\Exception $consecutiveException) {
+ $message = sprintf(
+ "An exception occurred on 'sales_model_service_quote_submit_failure' event: %s",
+ $consecutiveException->getMessage()
+ );
+
+ throw new \Exception($message, 0, $e);
+ }
+ }
}
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
index abecec395865d..392a815ed963c 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
@@ -256,9 +256,8 @@ protected function _assignProducts(): self
foreach ($this as $item) {
/** @var ProductInterface $product */
$product = $productCollection->getItemById($item->getProductId());
- $isValidProduct = $this->isValidProduct($product);
$qtyOptions = [];
- if ($isValidProduct) {
+ if ($product && $this->isValidProduct($product)) {
$product->setCustomOptions([]);
$optionProductIds = $this->getOptionProductIds($item, $product, $productCollection);
foreach ($optionProductIds as $optionProductId) {
diff --git a/app/code/Magento/Quote/Model/ShippingAddressManagement.php b/app/code/Magento/Quote/Model/ShippingAddressManagement.php
index d8e70c68ba33f..b9edcc13d0077 100644
--- a/app/code/Magento/Quote/Model/ShippingAddressManagement.php
+++ b/app/code/Magento/Quote/Model/ShippingAddressManagement.php
@@ -79,7 +79,7 @@ public function __construct(
}
/**
- * {@inheritDoc}
+ * @inheritDoc
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $address)
@@ -95,7 +95,7 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
$saveInAddressBook = $address->getSaveInAddressBook() ? 1 : 0;
$sameAsBilling = $address->getSameAsBilling() ? 1 : 0;
$customerAddressId = $address->getCustomerAddressId();
- $this->addressValidator->validate($address);
+ $this->addressValidator->validateForCart($quote, $address);
$quote->setShippingAddress($address);
$address = $quote->getShippingAddress();
@@ -123,7 +123,7 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
}
/**
- * {@inheritDoc}
+ * @inheritDoc
*/
public function get($cartId)
{
diff --git a/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php b/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
index 76c9a49b290c5..77dfec9603a5c 100644
--- a/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
+++ b/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
@@ -7,6 +7,11 @@
use Magento\Framework\Event\ObserverInterface;
+/**
+ * Handle customer VAT number on collect_totals_before event of quote address.
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
class CollectTotalsObserver implements ObserverInterface
{
/**
@@ -124,7 +129,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
);
}
- if ($groupId) {
+ if ($groupId !== null) {
$address->setPrevQuoteCustomerGroupId($quote->getCustomerGroupId());
$quote->setCustomerGroupId($groupId);
$this->customerSession->setCustomerGroupId($groupId);
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteAddressValidatorTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteAddressValidatorTest.php
deleted file mode 100644
index 08f5f6a808561..0000000000000
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteAddressValidatorTest.php
+++ /dev/null
@@ -1,128 +0,0 @@
-objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-
- $this->addressRepositoryMock = $this->createMock(\Magento\Customer\Api\AddressRepositoryInterface::class);
- $this->quoteAddressMock = $this->createPartialMock(
- \Magento\Quote\Model\Quote\Address::class,
- ['getCustomerId', 'load', 'getId', '__wakeup']
- );
- $this->customerRepositoryMock = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class);
- $this->customerSessionMock = $this->createMock(\Magento\Customer\Model\Session::class);
- $this->model = $this->objectManager->getObject(
- \Magento\Quote\Model\QuoteAddressValidator::class,
- [
- 'addressRepository' => $this->addressRepositoryMock,
- 'customerRepository' => $this->customerRepositoryMock,
- 'customerSession' => $this->customerSessionMock
- ]
- );
- }
-
- /**
- * @expectedException \Magento\Framework\Exception\NoSuchEntityException
- * @expectedExceptionMessage Invalid customer id 100
- */
- public function testValidateInvalidCustomer()
- {
- $customerId = 100;
- $address = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
- $customerMock = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
-
- $address->expects($this->atLeastOnce())->method('getCustomerId')->willReturn($customerId);
- $this->customerRepositoryMock->expects($this->once())->method('getById')->with($customerId)
- ->willReturn($customerMock);
- $this->model->validate($address);
- }
-
- /**
- * @expectedException \Magento\Framework\Exception\NoSuchEntityException
- * @expectedExceptionMessage Invalid address id 101
- */
- public function testValidateInvalidAddress()
- {
- $address = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
- $this->customerRepositoryMock->expects($this->never())->method('getById');
- $address->expects($this->atLeastOnce())->method('getCustomerAddressId')->willReturn(101);
- $address->expects($this->once())->method('getId')->willReturn(101);
-
- $this->addressRepositoryMock->expects($this->once())->method('getById')
- ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException());
-
- $this->model->validate($address);
- }
-
- /**
- * Neither customer id used nor address id exists
- */
- public function testValidateNewAddress()
- {
- $this->customerRepositoryMock->expects($this->never())->method('getById');
- $this->addressRepositoryMock->expects($this->never())->method('getById');
- $address = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
- $this->assertTrue($this->model->validate($address));
- }
-
- public function testValidateWithValidAddress()
- {
- $addressCustomer = 100;
- $customerAddressId = 42;
-
- $address = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
- $address->expects($this->atLeastOnce())->method('getCustomerId')->willReturn($addressCustomer);
- $address->expects($this->atLeastOnce())->method('getCustomerAddressId')->willReturn($customerAddressId);
- $customerMock = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
- $customerAddress = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
-
- $this->customerRepositoryMock->expects($this->exactly(2))->method('getById')->willReturn($customerMock);
- $customerMock->expects($this->once())->method('getId')->willReturn($addressCustomer);
-
- $this->addressRepositoryMock->expects($this->once())->method('getById')->willReturn($this->quoteAddressMock);
- $this->quoteAddressMock->expects($this->any())->method('getCustomerId')->willReturn($addressCustomer);
-
- $customerMock->expects($this->once())->method('getAddresses')->willReturn([$customerAddress]);
- $customerAddress->expects($this->once())->method('getId')->willReturn(42);
-
- $this->assertTrue($this->model->validate($address));
- }
-}
diff --git a/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php
deleted file mode 100644
index 89fea2bec73a8..0000000000000
--- a/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php
+++ /dev/null
@@ -1,282 +0,0 @@
-objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
- $this->quoteRepositoryMock = $this->createMock(\Magento\Quote\Api\CartRepositoryInterface::class);
- $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
-
- $this->quoteAddressMock = $this->createPartialMock(\Magento\Quote\Model\Quote\Address::class, [
- 'setSameAsBilling',
- 'setCollectShippingRates',
- '__wakeup',
- 'collectTotals',
- 'save',
- 'getId',
- 'getCustomerAddressId',
- 'getSaveInAddressBook',
- 'getSameAsBilling',
- 'importCustomerAddressData',
- 'setSaveInAddressBook',
- ]);
- $this->validatorMock = $this->createMock(\Magento\Quote\Model\QuoteAddressValidator::class);
- $this->totalsCollectorMock = $this->createMock(\Magento\Quote\Model\Quote\TotalsCollector::class);
- $this->addressRepository = $this->createMock(\Magento\Customer\Api\AddressRepositoryInterface::class);
-
- $this->amountErrorMessageMock = $this->createPartialMock(
- \Magento\Quote\Model\Quote\Validator\MinimumOrderAmount\ValidationMessage::class,
- ['getMessage']
- );
-
- $this->service = $this->objectManager->getObject(
- \Magento\Quote\Model\ShippingAddressManagement::class,
- [
- 'quoteRepository' => $this->quoteRepositoryMock,
- 'addressValidator' => $this->validatorMock,
- 'logger' => $this->createMock(\Psr\Log\LoggerInterface::class),
- 'scopeConfig' => $this->scopeConfigMock,
- 'totalsCollector' => $this->totalsCollectorMock,
- 'addressRepository' => $this->addressRepository
- ]
- );
- }
-
- /**
- * @expectedException \Magento\Framework\Exception\NoSuchEntityException
- * @expectedExceptionMessage error345
- */
- public function testSetAddressValidationFailed()
- {
- $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
- $this->quoteRepositoryMock->expects($this->once())
- ->method('getActive')
- ->with('cart654')
- ->will($this->returnValue($quoteMock));
-
- $this->validatorMock->expects($this->once())->method('validate')
- ->will($this->throwException(new \Magento\Framework\Exception\NoSuchEntityException(__('error345'))));
-
- $this->service->assign('cart654', $this->quoteAddressMock);
- }
-
- public function testSetAddress()
- {
- $addressId = 1;
- $customerAddressId = 150;
-
- $quoteMock = $this->createPartialMock(
- \Magento\Quote\Model\Quote::class,
- ['getIsMultiShipping', 'isVirtual', 'validateMinimumAmount', 'setShippingAddress', 'getShippingAddress']
- );
- $this->quoteRepositoryMock->expects($this->once())
- ->method('getActive')
- ->with('cart867')
- ->willReturn($quoteMock);
- $quoteMock->expects($this->once())->method('isVirtual')->will($this->returnValue(false));
- $quoteMock->expects($this->once())
- ->method('setShippingAddress')
- ->with($this->quoteAddressMock)
- ->willReturnSelf();
-
- $this->quoteAddressMock->expects($this->once())->method('getSaveInAddressBook')->willReturn(1);
- $this->quoteAddressMock->expects($this->once())->method('getSameAsBilling')->willReturn(1);
- $this->quoteAddressMock->expects($this->once())->method('getCustomerAddressId')->willReturn($customerAddressId);
-
- $customerAddressMock = $this->createMock(\Magento\Customer\Api\Data\AddressInterface::class);
-
- $this->addressRepository->expects($this->once())
- ->method('getById')
- ->with($customerAddressId)
- ->willReturn($customerAddressMock);
-
- $this->validatorMock->expects($this->once())->method('validate')
- ->with($this->quoteAddressMock)
- ->willReturn(true);
-
- $quoteMock->expects($this->exactly(3))->method('getShippingAddress')->willReturn($this->quoteAddressMock);
- $this->quoteAddressMock->expects($this->once())
- ->method('importCustomerAddressData')
- ->with($customerAddressMock)
- ->willReturnSelf();
-
- $this->quoteAddressMock->expects($this->once())->method('setSameAsBilling')->with(1)->willReturnSelf();
- $this->quoteAddressMock->expects($this->once())->method('setSaveInAddressBook')->with(1)->willReturnSelf();
- $this->quoteAddressMock->expects($this->once())
- ->method('setCollectShippingRates')
- ->with(true)
- ->willReturnSelf();
-
- $this->quoteAddressMock->expects($this->once())->method('save')->willReturnSelf();
- $this->quoteAddressMock->expects($this->once())->method('getId')->will($this->returnValue($addressId));
-
- $this->assertEquals($addressId, $this->service->assign('cart867', $this->quoteAddressMock));
- }
-
- /**
- * @expectedException \Magento\Framework\Exception\NoSuchEntityException
- * @expectedExceptionMessage The Cart includes virtual product(s) only, so a shipping address is not used.
- */
- public function testSetAddressForVirtualProduct()
- {
- $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
- $this->quoteRepositoryMock->expects($this->once())
- ->method('getActive')
- ->with('cart867')
- ->will($this->returnValue($quoteMock));
- $quoteMock->expects($this->once())->method('isVirtual')->will($this->returnValue(true));
- $quoteMock->expects($this->never())->method('setShippingAddress');
-
- $this->quoteAddressMock->expects($this->never())->method('getCustomerAddressId');
- $this->quoteAddressMock->expects($this->never())->method('setSaveInAddressBook');
-
- $quoteMock->expects($this->never())->method('save');
-
- $this->service->assign('cart867', $this->quoteAddressMock);
- }
-
- /**
- * @expectedException \Magento\Framework\Exception\InputException
- * @expectedExceptionMessage The address failed to save. Verify the address and try again.
- */
- public function testSetAddressWithInabilityToSaveQuote()
- {
- $this->quoteAddressMock->expects($this->once())->method('save')->willThrowException(
- new \Exception('The address failed to save. Verify the address and try again.')
- );
-
- $customerAddressId = 150;
-
- $quoteMock = $this->createPartialMock(
- \Magento\Quote\Model\Quote::class,
- ['getIsMultiShipping', 'isVirtual', 'validateMinimumAmount', 'setShippingAddress', 'getShippingAddress']
- );
- $this->quoteRepositoryMock->expects($this->once())
- ->method('getActive')
- ->with('cart867')
- ->willReturn($quoteMock);
- $quoteMock->expects($this->once())->method('isVirtual')->will($this->returnValue(false));
- $quoteMock->expects($this->once())
- ->method('setShippingAddress')
- ->with($this->quoteAddressMock)
- ->willReturnSelf();
-
- $customerAddressMock = $this->createMock(\Magento\Customer\Api\Data\AddressInterface::class);
-
- $this->addressRepository->expects($this->once())
- ->method('getById')
- ->with($customerAddressId)
- ->willReturn($customerAddressMock);
-
- $this->validatorMock->expects($this->once())->method('validate')
- ->with($this->quoteAddressMock)
- ->willReturn(true);
-
- $this->quoteAddressMock->expects($this->once())->method('getSaveInAddressBook')->willReturn(1);
- $this->quoteAddressMock->expects($this->once())->method('getSameAsBilling')->willReturn(1);
- $this->quoteAddressMock->expects($this->once())->method('getCustomerAddressId')->willReturn($customerAddressId);
-
- $quoteMock->expects($this->exactly(2))->method('getShippingAddress')->willReturn($this->quoteAddressMock);
- $this->quoteAddressMock->expects($this->once())
- ->method('importCustomerAddressData')
- ->with($customerAddressMock)
- ->willReturnSelf();
-
- $this->quoteAddressMock->expects($this->once())->method('setSameAsBilling')->with(1)->willReturnSelf();
- $this->quoteAddressMock->expects($this->once())->method('setSaveInAddressBook')->with(1)->willReturnSelf();
- $this->quoteAddressMock->expects($this->once())
- ->method('setCollectShippingRates')
- ->with(true)
- ->willReturnSelf();
-
- $this->service->assign('cart867', $this->quoteAddressMock);
- }
-
- public function testGetAddress()
- {
- $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
- $this->quoteRepositoryMock->expects($this->once())->method('getActive')->with('cartId')->will(
- $this->returnValue($quoteMock)
- );
-
- $addressMock = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
- $quoteMock->expects($this->any())->method('getShippingAddress')->will($this->returnValue($addressMock));
- $quoteMock->expects($this->any())->method('isVirtual')->will($this->returnValue(false));
- $this->assertEquals($addressMock, $this->service->get('cartId'));
- }
-
- /**
- * @expectedException \Exception
- * @expectedExceptionMessage The Cart includes virtual product(s) only, so a shipping address is not used.
- */
- public function testGetAddressOfQuoteWithVirtualProducts()
- {
- $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
- $this->quoteRepositoryMock->expects($this->once())->method('getActive')->with('cartId')->will(
- $this->returnValue($quoteMock)
- );
-
- $quoteMock->expects($this->any())->method('isVirtual')->will($this->returnValue(true));
- $quoteMock->expects($this->never())->method('getShippingAddress');
-
- $this->service->get('cartId');
- }
-}
diff --git a/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php b/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
index f3357f8aacd31..4ea067c9be8f6 100644
--- a/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
@@ -199,7 +199,7 @@ public function testDispatchWithCustomerCountryNotInEUAndNotLoggedCustomerInGrou
->method('getNotLoggedInGroup')
->will($this->returnValue($this->groupInterfaceMock));
$this->groupInterfaceMock->expects($this->once())
- ->method('getId')->will($this->returnValue(0));
+ ->method('getId')->will($this->returnValue(null));
$this->vatValidatorMock->expects($this->once())
->method('isEnabled')
->with($this->quoteAddressMock, $this->storeId)
@@ -220,9 +220,6 @@ public function testDispatchWithCustomerCountryNotInEUAndNotLoggedCustomerInGrou
$this->returnValue(false)
);
- $groupMock = $this->getMockBuilder(\Magento\Customer\Api\Data\GroupInterface::class)
- ->disableOriginalConstructor()
- ->getMock();
$this->customerMock->expects($this->once())->method('getId')->will($this->returnValue(null));
/** Assertions */
diff --git a/app/code/Magento/Quote/etc/db_schema.xml b/app/code/Magento/Quote/etc/db_schema.xml
index 6f9f81ba6b3fa..48954f1af90fc 100644
--- a/app/code/Magento/Quote/etc/db_schema.xml
+++ b/app/code/Magento/Quote/etc/db_schema.xml
@@ -202,6 +202,8 @@
diff --git a/app/code/Magento/Quote/i18n/en_US.csv b/app/code/Magento/Quote/i18n/en_US.csv
index ae7453aa0d0cc..b24179297493a 100644
--- a/app/code/Magento/Quote/i18n/en_US.csv
+++ b/app/code/Magento/Quote/i18n/en_US.csv
@@ -65,3 +65,5 @@ error345,error345
Carts,Carts
"Manage carts","Manage carts"
"Invalid state change requested","Invalid state change requested"
+"Validated Country Code","Validated Country Code"
+"Validated Vat Number","Validated Vat Number"
diff --git a/app/code/Magento/QuoteAnalytics/composer.json b/app/code/Magento/QuoteAnalytics/composer.json
index 90dae1ec2adca..706bed674b4a9 100644
--- a/app/code/Magento/QuoteAnalytics/composer.json
+++ b/app/code/Magento/QuoteAnalytics/composer.json
@@ -4,7 +4,8 @@
"require": {
"php": "~7.1.3||~7.2.0",
"magento/framework": "*",
- "magento/module-quote": "*"
+ "magento/module-quote": "*",
+ "magento/module-analytics": "*"
},
"type": "magento2-module",
"license": [
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
index 1b32866ed883c..6868ce3f7f1ff 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
@@ -67,6 +67,11 @@ public function execute(Quote $cart, array $cartItemData): void
{
$sku = $this->extractSku($cartItemData);
$qty = $this->extractQty($cartItemData);
+ if ($qty <= 0) {
+ throw new GraphQlInputException(
+ __('Please enter a number greater than 0 in this field.')
+ );
+ }
$customizableOptions = $this->extractCustomizableOptions($cartItemData);
try {
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractDataFromAddress.php b/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php
similarity index 96%
rename from app/code/Magento/QuoteGraphQl/Model/Cart/ExtractDataFromAddress.php
rename to app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php
index 20212d3412595..840dedb4f274e 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractDataFromAddress.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php
@@ -13,9 +13,9 @@
use Magento\Quote\Model\Quote\Address as QuoteAddress;
/**
- * Extract the necessary address fields from an Address model
+ * Extract address fields from an Quote Address model
*/
-class ExtractDataFromAddress
+class ExtractQuoteAddressData
{
/**
* @var ExtensibleDataObjectConverter
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
index 21df2271cc7f3..3506ffc8c8792 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
@@ -13,6 +13,7 @@
use Magento\Quote\Api\CartRepositoryInterface;
use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
use Magento\Quote\Model\Quote;
+use Magento\Store\Model\StoreManagerInterface;
/**
* Get cart
@@ -29,16 +30,24 @@ class GetCartForUser
*/
private $cartRepository;
+ /**
+ * @var StoreManagerInterface
+ */
+ private $storeManager;
+
/**
* @param MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId
* @param CartRepositoryInterface $cartRepository
+ * @param StoreManagerInterface $storeManager
*/
public function __construct(
MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId,
- CartRepositoryInterface $cartRepository
+ CartRepositoryInterface $cartRepository,
+ StoreManagerInterface $storeManager
) {
$this->maskedQuoteIdToQuoteId = $maskedQuoteIdToQuoteId;
$this->cartRepository = $cartRepository;
+ $this->storeManager = $storeManager;
}
/**
@@ -69,6 +78,21 @@ public function execute(string $cartHash, ?int $customerId): Quote
);
}
+ if (false === (bool)$cart->getIsActive()) {
+ throw new GraphQlNoSuchEntityException(
+ __('Current user does not have an active cart.')
+ );
+ }
+
+ if ((int)$cart->getStoreId() !== (int)$this->storeManager->getStore()->getId()) {
+ throw new GraphQlNoSuchEntityException(
+ __(
+ 'Wrong store code specified for cart "%masked_cart_id"',
+ ['masked_cart_id' => $cartHash]
+ )
+ );
+ }
+
$cartCustomerId = (int)$cart->getCustomerId();
/* Guest cart, allow operations */
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/GetQuoteAddress.php b/app/code/Magento/QuoteGraphQl/Model/Cart/GetQuoteAddress.php
index 1fb737d964139..89124c594dd87 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/GetQuoteAddress.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/GetQuoteAddress.php
@@ -8,10 +8,10 @@
namespace Magento\QuoteGraphQl\Model\Cart;
use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
use Magento\Quote\Api\Data\AddressInterface;
use Magento\Quote\Api\Data\AddressInterfaceFactory;
+use Magento\Quote\Api\Data\CartInterface;
use Magento\Quote\Model\ResourceModel\Quote\Address as AddressResource;
/**
@@ -44,14 +44,14 @@ public function __construct(
/**
* Get quote address
*
+ * @param CartInterface $cart
* @param int $quoteAddressId
* @param int|null $customerId
* @return AddressInterface
- * @throws GraphQlInputException
- * @throws GraphQlNoSuchEntityException
* @throws GraphQlAuthorizationException
+ * @throws GraphQlNoSuchEntityException
*/
- public function execute(int $quoteAddressId, ?int $customerId): AddressInterface
+ public function execute(CartInterface $cart, int $quoteAddressId, ?int $customerId): AddressInterface
{
$quoteAddress = $this->quoteAddressFactory->create();
@@ -62,14 +62,15 @@ public function execute(int $quoteAddressId, ?int $customerId): AddressInterface
);
}
- $quoteAddressCustomerId = (int)$quoteAddress->getCustomerId();
-
- /* Guest cart, allow operations */
- if (!$quoteAddressCustomerId && null === $customerId) {
- return $quoteAddress;
+ // TODO: GetQuoteAddress::execute should depend only on AddressInterface contract
+ // https://github.com/magento/graphql-ce/issues/550
+ if ($quoteAddress->getQuoteId() !== $cart->getId()) {
+ throw new GraphQlNoSuchEntityException(
+ __('Cart does not contain address with ID "%cart_address_id"', ['cart_address_id' => $quoteAddressId])
+ );
}
- if ($quoteAddressCustomerId !== $customerId) {
+ if ((int)$quoteAddress->getCustomerId() !== (int)$customerId) {
throw new GraphQlAuthorizationException(
__(
'The current user cannot use cart address with ID "%cart_address_id"',
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
index 76bdc74611131..13d6a1d3dce70 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
@@ -7,9 +7,12 @@
namespace Magento\QuoteGraphQl\Model\Cart;
-use Magento\Customer\Api\Data\AddressInterface as CustomerAddress;
+use Magento\Customer\Helper\Address as AddressHelper;
+use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
use Magento\Quote\Model\Quote\Address as QuoteAddress;
use Magento\Quote\Model\Quote\AddressFactory as BaseQuoteAddressFactory;
@@ -23,13 +26,29 @@ class QuoteAddressFactory
*/
private $quoteAddressFactory;
+ /**
+ * @var GetCustomerAddress
+ */
+ private $getCustomerAddress;
+
+ /**
+ * @var AddressHelper
+ */
+ private $addressHelper;
+
/**
* @param BaseQuoteAddressFactory $quoteAddressFactory
+ * @param GetCustomerAddress $getCustomerAddress
+ * @param AddressHelper $addressHelper
*/
public function __construct(
- BaseQuoteAddressFactory $quoteAddressFactory
+ BaseQuoteAddressFactory $quoteAddressFactory,
+ GetCustomerAddress $getCustomerAddress,
+ AddressHelper $addressHelper
) {
$this->quoteAddressFactory = $quoteAddressFactory;
+ $this->getCustomerAddress = $getCustomerAddress;
+ $this->addressHelper = $addressHelper;
}
/**
@@ -37,25 +56,38 @@ public function __construct(
*
* @param array $addressInput
* @return QuoteAddress
+ * @throws GraphQlInputException
*/
public function createBasedOnInputData(array $addressInput): QuoteAddress
{
$addressInput['country_id'] = $addressInput['country_code'] ?? '';
+ $maxAllowedLineCount = $this->addressHelper->getStreetLines();
+ if (is_array($addressInput['street']) && count($addressInput['street']) > $maxAllowedLineCount) {
+ throw new GraphQlInputException(
+ __('"Street Address" cannot contain more than %1 lines.', $maxAllowedLineCount)
+ );
+ }
+
$quoteAddress = $this->quoteAddressFactory->create();
$quoteAddress->addData($addressInput);
return $quoteAddress;
}
/**
- * Create QuoteAddress based on CustomerAddress
+ * Create Quote Address based on Customer Address
*
- * @param CustomerAddress $customerAddress
+ * @param int $customerAddressId
+ * @param int $customerId
* @return QuoteAddress
* @throws GraphQlInputException
+ * @throws GraphQlAuthorizationException
+ * @throws GraphQlNoSuchEntityException
*/
- public function createBasedOnCustomerAddress(CustomerAddress $customerAddress): QuoteAddress
+ public function createBasedOnCustomerAddress(int $customerAddressId, int $customerId): QuoteAddress
{
+ $customerAddress = $this->getCustomerAddress->execute((int)$customerAddressId, $customerId);
+
$quoteAddress = $this->quoteAddressFactory->create();
try {
$quoteAddress->importCustomerAddressData($customerAddress);
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
index cf277c729cdfd..c2bac13c07067 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
@@ -7,7 +7,7 @@
namespace Magento\QuoteGraphQl\Model\Cart;
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
@@ -26,14 +26,9 @@ class SetBillingAddressOnCart
private $quoteAddressFactory;
/**
- * @var CheckCustomerAccount
+ * @var GetCustomer
*/
- private $checkCustomerAccount;
-
- /**
- * @var GetCustomerAddress
- */
- private $getCustomerAddress;
+ private $getCustomer;
/**
* @var AssignBillingAddressToCart
@@ -42,19 +37,16 @@ class SetBillingAddressOnCart
/**
* @param QuoteAddressFactory $quoteAddressFactory
- * @param CheckCustomerAccount $checkCustomerAccount
- * @param GetCustomerAddress $getCustomerAddress
+ * @param GetCustomer $getCustomer
* @param AssignBillingAddressToCart $assignBillingAddressToCart
*/
public function __construct(
QuoteAddressFactory $quoteAddressFactory,
- CheckCustomerAccount $checkCustomerAccount,
- GetCustomerAddress $getCustomerAddress,
+ GetCustomer $getCustomer,
AssignBillingAddressToCart $assignBillingAddressToCart
) {
$this->quoteAddressFactory = $quoteAddressFactory;
- $this->checkCustomerAccount = $checkCustomerAccount;
- $this->getCustomerAddress = $getCustomerAddress;
+ $this->getCustomer = $getCustomer;
$this->assignBillingAddressToCart = $assignBillingAddressToCart;
}
@@ -99,9 +91,11 @@ public function execute(ContextInterface $context, CartInterface $cart, array $b
if (null === $customerAddressId) {
$billingAddress = $this->quoteAddressFactory->createBasedOnInputData($addressInput);
} else {
- $this->checkCustomerAccount->execute($context->getUserId(), $context->getUserType());
- $customerAddress = $this->getCustomerAddress->execute((int)$customerAddressId, (int)$context->getUserId());
- $billingAddress = $this->quoteAddressFactory->createBasedOnCustomerAddress($customerAddress);
+ $customer = $this->getCustomer->execute($context);
+ $billingAddress = $this->quoteAddressFactory->createBasedOnCustomerAddress(
+ (int)$customerAddressId,
+ (int)$customer->getId()
+ );
}
$this->assignBillingAddressToCart->execute($cart, $billingAddress, $useForShipping);
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
index 8e54ab0d3feef..6b0e2a311bf44 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
@@ -7,7 +7,7 @@
namespace Magento\QuoteGraphQl\Model\Cart;
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
use Magento\Quote\Api\Data\CartInterface;
@@ -23,14 +23,9 @@ class SetShippingAddressesOnCart implements SetShippingAddressesOnCartInterface
private $quoteAddressFactory;
/**
- * @var CheckCustomerAccount
+ * @var GetCustomer
*/
- private $checkCustomerAccount;
-
- /**
- * @var GetCustomerAddress
- */
- private $getCustomerAddress;
+ private $getCustomer;
/**
* @var AssignShippingAddressToCart
@@ -39,19 +34,16 @@ class SetShippingAddressesOnCart implements SetShippingAddressesOnCartInterface
/**
* @param QuoteAddressFactory $quoteAddressFactory
- * @param CheckCustomerAccount $checkCustomerAccount
- * @param GetCustomerAddress $getCustomerAddress
+ * @param GetCustomer $getCustomer
* @param AssignShippingAddressToCart $assignShippingAddressToCart
*/
public function __construct(
QuoteAddressFactory $quoteAddressFactory,
- CheckCustomerAccount $checkCustomerAccount,
- GetCustomerAddress $getCustomerAddress,
+ GetCustomer $getCustomer,
AssignShippingAddressToCart $assignShippingAddressToCart
) {
$this->quoteAddressFactory = $quoteAddressFactory;
- $this->checkCustomerAccount = $checkCustomerAccount;
- $this->getCustomerAddress = $getCustomerAddress;
+ $this->getCustomer = $getCustomer;
$this->assignShippingAddressToCart = $assignShippingAddressToCart;
}
@@ -84,9 +76,11 @@ public function execute(ContextInterface $context, CartInterface $cart, array $s
if (null === $customerAddressId) {
$shippingAddress = $this->quoteAddressFactory->createBasedOnInputData($addressInput);
} else {
- $this->checkCustomerAccount->execute($context->getUserId(), $context->getUserType());
- $customerAddress = $this->getCustomerAddress->execute((int)$customerAddressId, (int)$context->getUserId());
- $shippingAddress = $this->quoteAddressFactory->createBasedOnCustomerAddress($customerAddress);
+ $customer = $this->getCustomer->execute($context);
+ $shippingAddress = $this->quoteAddressFactory->createBasedOnCustomerAddress(
+ (int)$customerAddressId,
+ (int)$customer->getId()
+ );
}
$this->assignShippingAddressToCart->execute($cart, $shippingAddress);
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php
index 37e0118423745..730cf1b0ffee3 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php
@@ -7,11 +7,7 @@
namespace Magento\QuoteGraphQl\Model\Cart;
-use Magento\Framework\Exception\InputException;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Exception\StateException;
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
use Magento\Quote\Api\Data\CartInterface;
@@ -69,8 +65,7 @@ public function execute(ContextInterface $context, CartInterface $cart, array $s
}
$methodCode = $shippingMethodInput['method_code'];
- $quoteAddress = $this->getQuoteAddress->execute($cartAddressId, $context->getUserId());
-
+ $quoteAddress = $this->getQuoteAddress->execute($cart, $cartAddressId, $context->getUserId());
$this->assignShippingMethodToCart->execute($cart, $quoteAddress, $carrierCode, $methodCode);
}
}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/AppliedCoupon.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/AppliedCoupon.php
index ca69b763929be..8251089abcd60 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/AppliedCoupon.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/AppliedCoupon.php
@@ -11,12 +11,27 @@
use Magento\Framework\GraphQl\Config\Element\Field;
use Magento\Framework\GraphQl\Query\ResolverInterface;
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Quote\Api\CouponManagementInterface;
/**
* @inheritdoc
*/
class AppliedCoupon implements ResolverInterface
{
+ /**
+ * @var CouponManagementInterface
+ */
+ private $couponManagement;
+
+ /**
+ * @param CouponManagementInterface $couponManagement
+ */
+ public function __construct(
+ CouponManagementInterface $couponManagement
+ ) {
+ $this->couponManagement = $couponManagement;
+ }
+
/**
* @inheritdoc
*/
@@ -26,9 +41,9 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
throw new LocalizedException(__('"model" value should be specified'));
}
$cart = $value['model'];
+ $cartId = $cart->getId();
- $appliedCoupon = $cart->getCouponCode();
-
+ $appliedCoupon = $this->couponManagement->get($cartId);
return $appliedCoupon ? ['code' => $appliedCoupon] : null;
}
}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php
index 5429d5333b25b..4de0464681186 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php
@@ -75,7 +75,11 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
try {
$this->couponManagement->set($cartId, $couponCode);
} catch (NoSuchEntityException $e) {
- throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+ $message = $e->getMessage();
+ if (preg_match('/The "\d+" Cart doesn\'t contain products/', $message)) {
+ $message = 'Cart does not contain products.';
+ }
+ throw new GraphQlNoSuchEntityException(__($message), $e);
} catch (CouldNotSaveException $e) {
throw new LocalizedException(__($e->getMessage()), $e);
}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php
index a03533ecefffa..a6bb0b0d04df1 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php
@@ -11,7 +11,8 @@
use Magento\Framework\GraphQl\Config\Element\Field;
use Magento\Framework\GraphQl\Query\ResolverInterface;
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\QuoteGraphQl\Model\Cart\ExtractDataFromAddress;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\QuoteGraphQl\Model\Cart\ExtractQuoteAddressData;
/**
* @inheritdoc
@@ -19,16 +20,16 @@
class BillingAddress implements ResolverInterface
{
/**
- * @var ExtractDataFromAddress
+ * @var ExtractQuoteAddressData
*/
- private $extractDataFromAddress;
+ private $extractQuoteAddressData;
/**
- * @param ExtractDataFromAddress $extractDataFromAddress
+ * @param ExtractQuoteAddressData $extractQuoteAddressData
*/
- public function __construct(ExtractDataFromAddress $extractDataFromAddress)
+ public function __construct(ExtractQuoteAddressData $extractQuoteAddressData)
{
- $this->extractDataFromAddress = $extractDataFromAddress;
+ $this->extractQuoteAddressData = $extractQuoteAddressData;
}
/**
@@ -39,6 +40,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
if (!isset($value['model'])) {
throw new LocalizedException(__('"model" value should be specified'));
}
+ /** @var CartInterface $cart */
$cart = $value['model'];
$billingAddress = $cart->getBillingAddress();
@@ -46,7 +48,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
return null;
}
- $addressData = $this->extractDataFromAddress->execute($billingAddress);
+ $addressData = $this->extractQuoteAddressData->execute($billingAddress);
return $addressData;
}
}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartEmail.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartEmail.php
new file mode 100644
index 0000000000000..8d0cb114d8315
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartEmail.php
@@ -0,0 +1,49 @@
+getCartForUser = $getCartForUser;
+ }
+
+ /**
+ * @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 Quote $cart */
+ $cart = $value['model'];
+
+ return $cart->getCustomerEmail();
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartPrices.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartPrices.php
new file mode 100644
index 0000000000000..7a9bdd926764c
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartPrices.php
@@ -0,0 +1,87 @@
+totalsCollector = $totalsCollector;
+ }
+
+ /**
+ * @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 Quote $quote */
+ $quote = $value['model'];
+ $cartTotals = $this->totalsCollector->collectQuoteTotals($quote);
+ $currency = $quote->getQuoteCurrencyCode();
+
+ return [
+ 'grand_total' => ['value' => $cartTotals->getGrandTotal(), 'currency' => $currency],
+ 'subtotal_including_tax' => ['value' => $cartTotals->getSubtotalInclTax(), 'currency' => $currency],
+ 'subtotal_excluding_tax' => ['value' => $cartTotals->getSubtotal(), 'currency' => $currency],
+ 'subtotal_with_discount_excluding_tax' => [
+ 'value' => $cartTotals->getSubtotalWithDiscount(), 'currency' => $currency
+ ],
+ 'applied_taxes' => $this->getAppliedTaxes($cartTotals, $currency),
+ 'model' => $quote
+ ];
+ }
+
+ /**
+ * Returns taxes applied to the current quote
+ *
+ * @param Total $total
+ * @param string $currency
+ * @return array
+ */
+ private function getAppliedTaxes(Total $total, string $currency): array
+ {
+ $appliedTaxesData = [];
+ $appliedTaxes = $total->getAppliedTaxes();
+
+ if (count($appliedTaxes) === 0) {
+ return $appliedTaxesData;
+ }
+
+ foreach ($appliedTaxes as $appliedTax) {
+ $appliedTaxesData[] = [
+ 'label' => $appliedTax['id'],
+ 'amount' => ['value' => $appliedTax['amount'], 'currency' => $currency]
+ ];
+ }
+ return $appliedTaxesData;
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php
new file mode 100644
index 0000000000000..1672474bb3ddd
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php
@@ -0,0 +1,90 @@
+getCartForUser = $getCartForUser;
+ $this->cartManagement = $cartManagement;
+ $this->orderRepository = $orderRepository;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+ {
+ if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
+ throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
+ }
+ $maskedCartId = $args['input']['cart_id'];
+
+ $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId());
+
+ if ($context->getUserId() === 0) {
+ if (!$cart->getCustomerEmail()) {
+ throw new GraphQlInputException(__("Guest email for cart is missing. Please enter"));
+ }
+ $cart->setCheckoutMethod(CartManagementInterface::METHOD_GUEST);
+ }
+
+ try {
+ $orderId = $this->cartManagement->placeOrder($cart->getId());
+ $order = $this->orderRepository->get($orderId);
+
+ return [
+ 'order' => [
+ 'order_id' => $order->getIncrementId(),
+ ],
+ ];
+ } catch (NoSuchEntityException $e) {
+ throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+ } catch (LocalizedException $e) {
+ throw new GraphQlInputException(__('Unable to place order: %message', ['message' => $e->getMessage()]), $e);
+ }
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php
index 5a708ceaedc28..f81ea3020d3d0 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php
@@ -62,7 +62,11 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
try {
$this->couponManagement->remove($cartId);
} catch (NoSuchEntityException $e) {
- throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+ $message = $e->getMessage();
+ if (preg_match('/The "\d+" Cart doesn\'t contain products/', $message)) {
+ $message = 'Cart does not contain products';
+ }
+ throw new GraphQlNoSuchEntityException(__($message), $e);
} catch (CouldNotDeleteException $e) {
throw new LocalizedException(__($e->getMessage()), $e);
}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetGuestEmailOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetGuestEmailOnCart.php
new file mode 100644
index 0000000000000..d621057348b54
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetGuestEmailOnCart.php
@@ -0,0 +1,95 @@
+getCartForUser = $getCartForUser;
+ $this->cartRepository = $cartRepository;
+ $this->emailValidator = $emailValidator;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+ {
+ if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
+ throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
+ }
+ $maskedCartId = $args['input']['cart_id'];
+
+ if (!isset($args['input']['email']) || empty($args['input']['email'])) {
+ throw new GraphQlInputException(__('Required parameter "email" is missing'));
+ }
+
+ if (false === $this->emailValidator->isValid($args['input']['email'])) {
+ throw new GraphQlInputException(__('Invalid email format'));
+ }
+ $email = $args['input']['email'];
+
+ $currentUserId = $context->getUserId();
+
+ if ($currentUserId !== 0) {
+ throw new GraphQlInputException(__('The request is not allowed for logged in customers'));
+ }
+
+ $cart = $this->getCartForUser->execute($maskedCartId, $currentUserId);
+ $cart->setCustomerEmail($email);
+
+ try {
+ $this->cartRepository->save($cart);
+ } catch (CouldNotSaveException $e) {
+ throw new LocalizedException(__($e->getMessage()), $e);
+ }
+
+ return [
+ 'cart' => [
+ 'model' => $cart,
+ ],
+ ];
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php
index a93c8032c996a..d1dcb4a48a76b 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php
@@ -60,12 +60,12 @@ public function __construct(
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
{
if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
- throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
+ throw new GraphQlInputException(__('Required parameter "cart_id" is missing.'));
}
$maskedCartId = $args['input']['cart_id'];
if (!isset($args['input']['payment_method']['code']) || empty($args['input']['payment_method']['code'])) {
- throw new GraphQlInputException(__('Required parameter "payment_method" is missing'));
+ throw new GraphQlInputException(__('Required parameter "code" for "payment_method" is missing.'));
}
$paymentMethodCode = $args['input']['payment_method']['code'];
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddresses.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddresses.php
index 3a55ef9ae25a8..eb3b0966740eb 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddresses.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddresses.php
@@ -11,7 +11,8 @@
use Magento\Framework\GraphQl\Config\Element\Field;
use Magento\Framework\GraphQl\Query\ResolverInterface;
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\QuoteGraphQl\Model\Cart\ExtractDataFromAddress;
+use Magento\Quote\Model\Quote;
+use Magento\QuoteGraphQl\Model\Cart\ExtractQuoteAddressData;
/**
* @inheritdoc
@@ -19,16 +20,16 @@
class ShippingAddresses implements ResolverInterface
{
/**
- * @var ExtractDataFromAddress
+ * @var ExtractQuoteAddressData
*/
- private $extractDataFromAddress;
+ private $extractQuoteAddressData;
/**
- * @param ExtractDataFromAddress $extractDataFromAddress
+ * @param ExtractQuoteAddressData $extractQuoteAddressData
*/
- public function __construct(ExtractDataFromAddress $extractDataFromAddress)
+ public function __construct(ExtractQuoteAddressData $extractQuoteAddressData)
{
- $this->extractDataFromAddress = $extractDataFromAddress;
+ $this->extractQuoteAddressData = $extractQuoteAddressData;
}
/**
@@ -39,6 +40,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
if (!isset($value['model'])) {
throw new LocalizedException(__('"model" value should be specified'));
}
+ /** @var Quote $cart */
$cart = $value['model'];
$addressesData = [];
@@ -46,7 +48,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
if (count($shippingAddresses)) {
foreach ($shippingAddresses as $shippingAddress) {
- $addressesData[] = $this->extractDataFromAddress->execute($shippingAddress);
+ $addressesData[] = $this->extractQuoteAddressData->execute($shippingAddress);
}
}
return $addressesData;
diff --git a/app/code/Magento/QuoteGraphQl/composer.json b/app/code/Magento/QuoteGraphQl/composer.json
index 1bf4d581a5fe3..22ca9cfdfae9a 100644
--- a/app/code/Magento/QuoteGraphQl/composer.json
+++ b/app/code/Magento/QuoteGraphQl/composer.json
@@ -10,7 +10,8 @@
"magento/module-catalog": "*",
"magento/module-store": "*",
"magento/module-customer": "*",
- "magento/module-customer-graph-ql": "*"
+ "magento/module-customer-graph-ql": "*",
+ "magento/module-sales": "*"
},
"suggest": {
"magento/module-graph-ql": "*"
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index 79cea3855f6f3..711e6cbc7f5f6 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -17,6 +17,8 @@ type Mutation {
setBillingAddressOnCart(input: SetBillingAddressOnCartInput): SetBillingAddressOnCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetBillingAddressOnCart")
setShippingMethodsOnCart(input: SetShippingMethodsOnCartInput): SetShippingMethodsOnCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetShippingMethodsOnCart")
setPaymentMethodOnCart(input: SetPaymentMethodOnCartInput): SetPaymentMethodOnCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\SetPaymentMethodOnCart")
+ setGuestEmailOnCart(input: SetGuestEmailOnCartInput): SetGuestEmailOnCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\SetGuestEmailOnCart")
+ placeOrder(input: PlaceOrderInput): PlaceOrderOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\PlaceOrder")
}
input AddSimpleProductsToCartInput {
@@ -114,6 +116,10 @@ input ShippingMethodInput {
method_code: String!
}
+input PlaceOrderInput {
+ cart_id: String!
+}
+
input SetPaymentMethodOnCartInput {
cart_id: String!
payment_method: PaymentMethodInput!
@@ -124,6 +130,24 @@ input PaymentMethodInput {
purchase_order_number: String @doc(description:"Purchase order number")
}
+input SetGuestEmailOnCartInput {
+ cart_id: String!
+ email: String!
+}
+
+type CartPrices {
+ grand_total: Money
+ subtotal_including_tax: Money
+ subtotal_excluding_tax: Money
+ subtotal_with_discount_excluding_tax: Money
+ applied_taxes: [CartTaxItem]
+}
+
+type CartTaxItem {
+ amount: Money!
+ label: String!
+}
+
type SetPaymentMethodOnCartOutput {
cart: Cart!
}
@@ -144,13 +168,19 @@ type ApplyCouponToCartOutput {
cart: Cart!
}
+type PlaceOrderOutput {
+ order: Order!
+}
+
type Cart {
items: [CartItemInterface] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartItems")
applied_coupon: AppliedCoupon @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\AppliedCoupon")
+ email: String @resolver (class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartEmail")
shipping_addresses: [CartAddress]! @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ShippingAddresses")
billing_address: CartAddress! @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\BillingAddress")
available_payment_methods: [AvailablePaymentMethod] @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AvailablePaymentMethods") @doc(description: "Available payment methods")
selected_payment_method: SelectedPaymentMethod @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SelectedPaymentMethod")
+ prices: CartPrices @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartPrices")
}
type CartAddress {
@@ -249,6 +279,10 @@ type RemoveItemFromCartOutput {
cart: Cart!
}
+type SetGuestEmailOnCartOutput {
+ cart: Cart!
+}
+
type SimpleCartItem implements CartItemInterface @doc(description: "Simple Cart Item") {
customizable_options: [SelectedCustomizableOption] @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\CustomizableOptions")
}
@@ -285,3 +319,7 @@ type CartItemSelectedOptionValuePrice {
units: String!
type: PriceTypeEnum!
}
+
+type Order {
+ order_id: String
+}
diff --git a/app/code/Magento/ReleaseNotification/etc/di.xml b/app/code/Magento/ReleaseNotification/etc/di.xml
index 1404a6adb0a10..a4c434ff7f623 100644
--- a/app/code/Magento/ReleaseNotification/etc/di.xml
+++ b/app/code/Magento/ReleaseNotification/etc/di.xml
@@ -6,7 +6,6 @@
*/
-->
-
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
index da7ab97a1b211..d89a118bff94b 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
@@ -769,11 +769,12 @@ public function addOrdersCount()
*/
public function addRevenueToSelect($convertCurrency = false)
{
- $expr = $this->getTotalsExpression(
+ $expr = $this->getTotalsExpressionWithDiscountRefunded(
!$convertCurrency,
$this->getConnection()->getIfNullSql('main_table.base_subtotal_refunded', 0),
$this->getConnection()->getIfNullSql('main_table.base_subtotal_canceled', 0),
- $this->getConnection()->getIfNullSql('main_table.base_discount_canceled', 0)
+ $this->getConnection()->getIfNullSql('ABS(main_table.base_discount_refunded)', 0),
+ $this->getConnection()->getIfNullSql('ABS(main_table.base_discount_canceled)', 0)
);
$this->getSelect()->columns(['revenue' => $expr]);
@@ -791,11 +792,12 @@ public function addSumAvgTotals($storeId = 0)
/**
* calculate average and total amount
*/
- $expr = $this->getTotalsExpression(
+ $expr = $this->getTotalsExpressionWithDiscountRefunded(
$storeId,
$this->getConnection()->getIfNullSql('main_table.base_subtotal_refunded', 0),
$this->getConnection()->getIfNullSql('main_table.base_subtotal_canceled', 0),
- $this->getConnection()->getIfNullSql('main_table.base_discount_canceled', 0)
+ $this->getConnection()->getIfNullSql('ABS(main_table.base_discount_refunded)', 0),
+ $this->getConnection()->getIfNullSql('ABS(main_table.base_discount_canceled)', 0)
);
$this->getSelect()->columns(
@@ -808,13 +810,15 @@ public function addSumAvgTotals($storeId = 0)
}
/**
- * Get SQL expression for totals
+ * Get SQL expression for totals.
*
* @param int $storeId
* @param string $baseSubtotalRefunded
* @param string $baseSubtotalCanceled
* @param string $baseDiscountCanceled
* @return string
+ * @deprecated
+ * @see getTotalsExpressionWithDiscountRefunded
*/
protected function getTotalsExpression(
$storeId,
@@ -825,10 +829,40 @@ protected function getTotalsExpression(
$template = ($storeId != 0)
? '(main_table.base_subtotal - %2$s - %1$s - ABS(main_table.base_discount_amount) - %3$s)'
: '((main_table.base_subtotal - %1$s - %2$s - ABS(main_table.base_discount_amount) + %3$s) '
- . ' * main_table.base_to_global_rate)';
+ . ' * main_table.base_to_global_rate)';
return sprintf($template, $baseSubtotalRefunded, $baseSubtotalCanceled, $baseDiscountCanceled);
}
+ /**
+ * Get SQL expression for totals with discount refunded.
+ *
+ * @param int $storeId
+ * @param string $baseSubtotalRefunded
+ * @param string $baseSubtotalCanceled
+ * @param string $baseDiscountRefunded
+ * @param string $baseDiscountCanceled
+ * @return string
+ */
+ private function getTotalsExpressionWithDiscountRefunded(
+ $storeId,
+ $baseSubtotalRefunded,
+ $baseSubtotalCanceled,
+ $baseDiscountRefunded,
+ $baseDiscountCanceled
+ ) {
+ $template = ($storeId != 0)
+ ? '(main_table.base_subtotal - %2$s - %1$s - (ABS(main_table.base_discount_amount) - %3$s - %4$s))'
+ : '((main_table.base_subtotal - %1$s - %2$s - (ABS(main_table.base_discount_amount) - %3$s - %4$s)) '
+ . ' * main_table.base_to_global_rate)';
+ return sprintf(
+ $template,
+ $baseSubtotalRefunded,
+ $baseSubtotalCanceled,
+ $baseDiscountRefunded,
+ $baseDiscountCanceled
+ );
+ }
+
/**
* Sort order by total amount
*
diff --git a/app/code/Magento/Reports/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Reports/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..e77e3ee8abd87
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Data/AdminMenuData.xml
@@ -0,0 +1,86 @@
+
+
+
+
+
+ Abandoned Carts
+ Abandoned Carts
+ magento-reports-report-shopcart-abandoned
+
+
+ Bestsellers Report
+ Bestsellers
+ magento-reports-report-products-bestsellers
+
+
+ Coupons Report
+ Coupons
+ magento-reports-report-salesroot-coupons
+
+
+ Downloads Report
+ Downloads
+ magento-downloadable-report-products-downloads
+
+
+ Invoice Report
+ Invoiced
+ magento-reports-report-salesroot-invoiced
+
+
+ Low Stock Report
+ Low Stock
+ magento-reports-report-products-lowstock
+
+
+ New Accounts Report
+ New
+ magento-reports-report-customers-accounts
+
+
+ Order Count Report
+ Order Count
+ magento-reports-report-customers-orders
+
+
+ Ordered Products Report
+ Ordered
+ magento-reports-report-products-sold
+
+
+ Orders Report
+ Orders
+ magento-reports-report-salesroot-sales
+
+
+ Order Total Report
+ Order Total
+ magento-reports-report-customers-totals
+
+
+ Products in Carts
+ Products in Cart
+ magento-reports-report-shopcart-product
+
+
+ Refresh Statistics
+ Refresh Statistics
+ magento-reports-report-statistics-refresh
+
+
+ Tax Report
+ Tax
+ magento-reports-report-salesroot-tax
+
+
+ Product Views Report
+ Views
+ magento-reports-report-products-viewed
+
+
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsAbandonedCartsNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsAbandonedCartsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..342955e0684b3
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsAbandonedCartsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsBestsellersNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsBestsellersNavigateMenuTest.xml
new file mode 100644
index 0000000000000..259f2cde2786a
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsBestsellersNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsCouponsNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsCouponsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..321f3078bc63f
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsCouponsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsDownloadsNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsDownloadsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..584c1af6683aa
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsDownloadsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsInvoicedNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsInvoicedNavigateMenuTest.xml
new file mode 100644
index 0000000000000..34aec0620cad9
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsInvoicedNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsLowStockNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsLowStockNavigateMenuTest.xml
new file mode 100644
index 0000000000000..5d91d65a3a457
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsLowStockNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsNewNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsNewNavigateMenuTest.xml
new file mode 100644
index 0000000000000..aeb35ba65a380
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsNewNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderCountNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderCountNavigateMenuTest.xml
new file mode 100644
index 0000000000000..1bfbc654746e6
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderCountNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderTotalNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderTotalNavigateMenuTest.xml
new file mode 100644
index 0000000000000..88c94b53f5233
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderTotalNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedNavigateMenuTest.xml
new file mode 100644
index 0000000000000..e81239539a5b5
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrdersNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrdersNavigateMenuTest.xml
new file mode 100644
index 0000000000000..13fc8e7353139
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrdersNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsProductsInCartNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsProductsInCartNavigateMenuTest.xml
new file mode 100644
index 0000000000000..03877f8e58ecc
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsProductsInCartNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsRefreshStatisticsNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsRefreshStatisticsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..d05fc091357df
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsRefreshStatisticsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsTaxNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsTaxNavigateMenuTest.xml
new file mode 100644
index 0000000000000..11a065c933a3b
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsTaxNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsViewsNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsViewsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..9154b96c71e38
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsViewsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Review/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Review/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..89882707f5ebd
--- /dev/null
+++ b/app/code/Magento/Review/Test/Mftf/Data/AdminMenuData.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+ Reviews
+ Reviews
+ magento-review-catalog-reviews-ratings-reviews-all
+
+
+ Customer Reviews Report
+ By Customers
+ magento-review-report-review-customer
+
+
+ Product Reviews Report
+ By Products
+ magento-review-report-review-product
+
+
+ Ratings
+ Rating
+ magento-review-catalog-reviews-ratings-ratings
+
+
diff --git a/app/code/Magento/Review/Test/Mftf/Test/AdminMarketingReviewsNavigateMenuTest.xml b/app/code/Magento/Review/Test/Mftf/Test/AdminMarketingReviewsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..fade220d22100
--- /dev/null
+++ b/app/code/Magento/Review/Test/Mftf/Test/AdminMarketingReviewsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Review/Test/Mftf/Test/AdminReportsByCustomersNavigateMenuTest.xml b/app/code/Magento/Review/Test/Mftf/Test/AdminReportsByCustomersNavigateMenuTest.xml
new file mode 100644
index 0000000000000..58492424e76f7
--- /dev/null
+++ b/app/code/Magento/Review/Test/Mftf/Test/AdminReportsByCustomersNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Review/Test/Mftf/Test/AdminReportsByProductsNavigateMenuTest.xml b/app/code/Magento/Review/Test/Mftf/Test/AdminReportsByProductsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..e848aa4f22023
--- /dev/null
+++ b/app/code/Magento/Review/Test/Mftf/Test/AdminReportsByProductsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Review/Test/Mftf/Test/AdminStoresRatingNavigateMenuTest.xml b/app/code/Magento/Review/Test/Mftf/Test/AdminStoresRatingNavigateMenuTest.xml
new file mode 100644
index 0000000000000..511ed5439dc3d
--- /dev/null
+++ b/app/code/Magento/Review/Test/Mftf/Test/AdminStoresRatingNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Review/etc/acl.xml b/app/code/Magento/Review/etc/acl.xml
index 09b80750da14d..46fdb20dee4a1 100644
--- a/app/code/Magento/Review/etc/acl.xml
+++ b/app/code/Magento/Review/etc/acl.xml
@@ -16,8 +16,8 @@
-
diff --git a/app/code/Magento/Review/etc/adminhtml/menu.xml b/app/code/Magento/Review/etc/adminhtml/menu.xml
index 0a2e49450e0cf..7376329471921 100644
--- a/app/code/Magento/Review/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Review/etc/adminhtml/menu.xml
@@ -8,8 +8,8 @@
+
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderStatusFormFillAndSaveActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderStatusFormFillAndSaveActionGroup.xml
new file mode 100644
index 0000000000000..8108577145421
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderStatusFormFillAndSaveActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusExistsInGridActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusExistsInGridActionGroup.xml
new file mode 100644
index 0000000000000..5f69f52987688
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusExistsInGridActionGroup.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveDuplicateErrorActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveDuplicateErrorActionGroup.xml
new file mode 100644
index 0000000000000..5b4c3115744c9
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveDuplicateErrorActionGroup.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveSuccessActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveSuccessActionGroup.xml
new file mode 100644
index 0000000000000..d82f4b9dd25e8
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveSuccessActionGroup.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Sales/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..4f6faccbb26d4
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Data/AdminMenuData.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+ Credit Memos
+ Credit Memos
+ magento-sales-sales-creditmemo
+
+
+ Invoices
+ Invoices
+ magento-sales-sales-invoice
+
+
+ Orders
+ Orders
+ magento-sales-sales-order
+
+
+ Shipments
+ Shipments
+ magento-sales-sales-shipment
+
+
+ Transactions
+ Transactions
+ magento-sales-sales-transactions
+
+
+ Order Status
+ Order Status
+ magento-sales-system-order-statuses
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Data/OrderStatusData.xml b/app/code/Magento/Sales/Test/Mftf/Data/OrderStatusData.xml
new file mode 100644
index 0000000000000..aecd7fcf1b703
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Data/OrderStatusData.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+ order_status
+ orderLabel
+
+
+ pending
+ orderLabel
+
+
+ order_status
+ Suspected Fraud
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderStatusPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderStatusPage.xml
new file mode 100644
index 0000000000000..b158e4923074a
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderStatusPage.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml
index bc7fc8145af33..011500fac3f69 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml
@@ -9,7 +9,7 @@
-
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusFormSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusFormSection.xml
new file mode 100644
index 0000000000000..1058b2d6f2177
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusFormSection.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusGridSection.xml
new file mode 100644
index 0000000000000..b624639281187
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusGridSection.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml
index 9180636db7821..e405173429b2c 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml
@@ -25,6 +25,7 @@
@@ -33,62 +34,53 @@
+
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+ $grabGroupValue
+ 3
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml
index 7c83f35468ce6..f869841153aea 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml
@@ -81,7 +81,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingLabelTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingLabelTest.xml
new file mode 100644
index 0000000000000..d1381bbb1efb0
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingLabelTest.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusTest.xml
new file mode 100644
index 0000000000000..c2daaac84dd42
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusTest.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesCreditMemosNavigateMenuTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesCreditMemosNavigateMenuTest.xml
new file mode 100644
index 0000000000000..af7cc1822d215
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesCreditMemosNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesInvoicesNavigateMenuTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesInvoicesNavigateMenuTest.xml
new file mode 100644
index 0000000000000..5a38a66d1f4b2
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesInvoicesNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesOrdersNavigateMenuTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesOrdersNavigateMenuTest.xml
new file mode 100644
index 0000000000000..8099254923a2c
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesOrdersNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesShipmentsNavigateMenuTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesShipmentsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..5717c6c90fc17
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesShipmentsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesTransactionsNavigateMenuTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesTransactionsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..68933be92efe6
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesTransactionsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminStoresOrderStatusNavigateMenuTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminStoresOrderStatusNavigateMenuTest.xml
new file mode 100644
index 0000000000000..d55cde1449033
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminStoresOrderStatusNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml
new file mode 100644
index 0000000000000..d418751c736e1
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/NewActionTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/NewActionTest.php
index 05c99c9f9ef98..87e27fdb2206b 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/NewActionTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/NewActionTest.php
@@ -6,12 +6,14 @@
namespace Magento\Sales\Test\Unit\Controller\Adminhtml\Order\Invoice;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Sales\Api\OrderRepositoryInterface;
/**
* Class NewActionTest
* @package Magento\Sales\Controller\Adminhtml\Order\Invoice
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
*/
class NewActionTest extends \PHPUnit\Framework\TestCase
{
@@ -90,6 +92,11 @@ class NewActionTest extends \PHPUnit\Framework\TestCase
*/
protected $invoiceServiceMock;
+ /**
+ * @var OrderRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $orderRepositoryMock;
+
protected function setUp()
{
$objectManager = new ObjectManager($this);
@@ -215,12 +222,15 @@ protected function setUp()
->disableOriginalConstructor()
->getMock();
+ $this->orderRepositoryMock = $this->createMock(OrderRepositoryInterface::class);
+
$this->controller = $objectManager->getObject(
\Magento\Sales\Controller\Adminhtml\Order\Invoice\NewAction::class,
[
'context' => $contextMock,
'resultPageFactory' => $this->resultPageFactoryMock,
- 'invoiceService' => $this->invoiceServiceMock
+ 'invoiceService' => $this->invoiceServiceMock,
+ 'orderRepository' => $this->orderRepositoryMock
]
);
}
@@ -250,19 +260,17 @@ public function testExecute()
$orderMock = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
->disableOriginalConstructor()
- ->setMethods(['load', 'getId', 'canInvoice'])
+ ->setMethods(['load', 'canInvoice'])
->getMock();
- $orderMock->expects($this->once())
- ->method('load')
- ->with($orderId)
- ->willReturnSelf();
- $orderMock->expects($this->once())
- ->method('getId')
- ->willReturn($orderId);
$orderMock->expects($this->once())
->method('canInvoice')
->willReturn(true);
+ $this->orderRepositoryMock->expects($this->once())
+ ->method('get')
+ ->with($orderId)
+ ->willReturn($orderMock);
+
$this->invoiceServiceMock->expects($this->once())
->method('prepareInvoice')
->with($orderMock, [])
@@ -285,11 +293,7 @@ public function testExecute()
->with(true)
->will($this->returnValue($commentText));
- $this->objectManagerMock->expects($this->at(0))
- ->method('create')
- ->with(\Magento\Sales\Model\Order::class)
- ->willReturn($orderMock);
- $this->objectManagerMock->expects($this->at(1))
+ $this->objectManagerMock->expects($this->once())
->method('get')
->with(\Magento\Backend\Model\Session::class)
->will($this->returnValue($this->sessionMock));
@@ -318,19 +322,12 @@ public function testExecuteNoOrder()
$orderMock = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
->disableOriginalConstructor()
- ->setMethods(['load', 'getId', 'canInvoice'])
+ ->setMethods(['canInvoice'])
->getMock();
- $orderMock->expects($this->once())
- ->method('load')
- ->with($orderId)
- ->willReturnSelf();
- $orderMock->expects($this->once())
- ->method('getId')
- ->willReturn(null);
- $this->objectManagerMock->expects($this->at(0))
- ->method('create')
- ->with(\Magento\Sales\Model\Order::class)
+ $this->orderRepositoryMock->expects($this->once())
+ ->method('get')
+ ->with($orderId)
->willReturn($orderMock);
$resultRedirect = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class)
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php
index 9fd2a8b0d929f..467476c9bb406 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php
@@ -1,5 +1,4 @@
creditmemoMock->expects($this->once())
->method('setSendEmail')
- ->with(true);
+ ->with($emailSendingResult);
if (!$configValue || $forceSyncMode) {
$transport = [
@@ -279,7 +278,7 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
->method('setTemplateVars')
->with($transport->getData());
- $this->identityContainerMock->expects($this->once())
+ $this->identityContainerMock->expects($this->exactly(2))
->method('isEnabled')
->willReturn($emailSendingResult);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
index 31bf846689230..1f074d7262f4d 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
@@ -7,6 +7,9 @@
use Magento\Sales\Model\Order\Email\Sender\CreditmemoSender;
+/**
+ * Test for Magento\Sales\Model\Order\Email\Sender\CreditmemoSender class.
+ */
class CreditmemoSenderTest extends AbstractSenderTest
{
/**
@@ -90,7 +93,7 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
$this->creditmemoMock->expects($this->once())
->method('setSendEmail')
- ->with(true);
+ ->with($emailSendingResult);
$this->globalConfig->expects($this->once())
->method('getValue')
@@ -130,7 +133,7 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
]
);
- $this->identityContainerMock->expects($this->once())
+ $this->identityContainerMock->expects($this->exactly(2))
->method('isEnabled')
->willReturn($emailSendingResult);
@@ -197,6 +200,8 @@ public function sendDataProvider()
* @param bool $isVirtualOrder
* @param int $formatCallCount
* @param string|null $expectedShippingAddress
+ *
+ * @return void
* @dataProvider sendVirtualOrderDataProvider
*/
public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expectedShippingAddress)
@@ -207,7 +212,7 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
$this->creditmemoMock->expects($this->once())
->method('setSendEmail')
- ->with(true);
+ ->with(false);
$this->globalConfig->expects($this->once())
->method('getValue')
@@ -242,7 +247,7 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
]
);
- $this->identityContainerMock->expects($this->once())
+ $this->identityContainerMock->expects($this->exactly(2))
->method('isEnabled')
->willReturn(false);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php
index 9c54c716e4207..d1aa5af53da4d 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php
@@ -7,6 +7,9 @@
use Magento\Sales\Model\Order\Email\Sender\InvoiceSender;
+/**
+ * Test for Magento\Sales\Model\Order\Email\Sender\InvoiceSender class.
+ */
class InvoiceSenderTest extends AbstractSenderTest
{
/**
@@ -90,7 +93,7 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
$this->invoiceMock->expects($this->once())
->method('setSendEmail')
- ->with(true);
+ ->with($emailSendingResult);
$this->globalConfig->expects($this->once())
->method('getValue')
@@ -136,7 +139,7 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
]
);
- $this->identityContainerMock->expects($this->once())
+ $this->identityContainerMock->expects($this->exactly(2))
->method('isEnabled')
->willReturn($emailSendingResult);
@@ -212,7 +215,7 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
$this->invoiceMock->expects($this->once())
->method('setSendEmail')
- ->with(true);
+ ->with(false);
$this->globalConfig->expects($this->once())
->method('getValue')
@@ -247,7 +250,7 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
]
);
- $this->identityContainerMock->expects($this->once())
+ $this->identityContainerMock->expects($this->exactly(2))
->method('isEnabled')
->willReturn(false);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php
index b1b18af63b590..2d7b42bccae5a 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php
@@ -7,6 +7,9 @@
use Magento\Sales\Model\Order\Email\Sender\ShipmentSender;
+/**
+ * Test for Magento\Sales\Model\Order\Email\Sender\ShipmentSender class.
+ */
class ShipmentSenderTest extends AbstractSenderTest
{
/**
@@ -90,7 +93,7 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
$this->shipmentMock->expects($this->once())
->method('setSendEmail')
- ->with(true);
+ ->with($emailSendingResult);
$this->globalConfig->expects($this->once())
->method('getValue')
@@ -136,7 +139,7 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
]
);
- $this->identityContainerMock->expects($this->once())
+ $this->identityContainerMock->expects($this->exactly(2))
->method('isEnabled')
->willReturn($emailSendingResult);
@@ -212,7 +215,7 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
$this->shipmentMock->expects($this->once())
->method('setSendEmail')
- ->with(true);
+ ->with(false);
$this->globalConfig->expects($this->once())
->method('getValue')
@@ -247,7 +250,7 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
]
);
- $this->identityContainerMock->expects($this->once())
+ $this->identityContainerMock->expects($this->exactly(2))
->method('isEnabled')
->willReturn(false);
$this->shipmentResourceMock->expects($this->once())
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Sender/EmailSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Sender/EmailSenderTest.php
index 8a4e2920ba207..dcf689cf7d53b 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Sender/EmailSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Sender/EmailSenderTest.php
@@ -247,7 +247,7 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
$this->invoiceMock->expects($this->once())
->method('setSendEmail')
- ->with(true);
+ ->with($emailSendingResult);
if (!$configValue || $forceSyncMode) {
$transport = [
@@ -277,7 +277,7 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
->method('setTemplateVars')
->with($transport->getData());
- $this->identityContainerMock->expects($this->once())
+ $this->identityContainerMock->expects($this->exactly(2))
->method('isEnabled')
->willReturn($emailSendingResult);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php
index 94347e8b32d54..391e99ba6f835 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php
@@ -249,7 +249,7 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
$this->shipmentMock->expects($this->once())
->method('setSendEmail')
- ->with(true);
+ ->with($emailSendingResult);
if (!$configValue || $forceSyncMode) {
$transport = [
@@ -279,7 +279,7 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
->method('setTemplateVars')
->with($transport->getData());
- $this->identityContainerMock->expects($this->once())
+ $this->identityContainerMock->expects($this->exactly(2))
->method('isEnabled')
->willReturn($emailSendingResult);
diff --git a/app/code/Magento/Sales/etc/di.xml b/app/code/Magento/Sales/etc/di.xml
index 5a5dd925a3098..68fcd17122bd2 100644
--- a/app/code/Magento/Sales/etc/di.xml
+++ b/app/code/Magento/Sales/etc/di.xml
@@ -1015,4 +1015,9 @@
+
+
+
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
index b0a88b8fa37dc..d1a90783c68c7 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
@@ -89,11 +89,8 @@ endif; ?>
getForm()->toHtml() ?>
{{/depend}}
- {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
+ {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
{{/depend}}
- {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
+ {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
{{/depend}}
- {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
+ {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
+
diff --git a/app/code/Magento/Persistent/Model/QuoteManager.php b/app/code/Magento/Persistent/Model/QuoteManager.php
index 35c2c70be30dc..8ae22e4c26c6f 100644
--- a/app/code/Magento/Persistent/Model/QuoteManager.php
+++ b/app/code/Magento/Persistent/Model/QuoteManager.php
@@ -7,6 +7,8 @@
/**
* Class QuoteManager
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
*/
class QuoteManager
{
@@ -87,6 +89,7 @@ public function setGuest($checkQuote = false)
->setCustomerLastname(null)
->setCustomerGroupId(\Magento\Customer\Api\Data\GroupInterface::NOT_LOGGED_IN_ID)
->setIsPersistent(false)
+ ->setCustomerIsGuest(true)
->removeAllAddresses();
//Create guest addresses
$quote->getShippingAddress();
diff --git a/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php b/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php
index f3720960ca6e5..79fdf44c3c551 100644
--- a/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php
+++ b/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php
@@ -1,6 +1,5 @@
_persistentSession->isPersistent() &&
!$this->_customerSession->isLoggedIn() &&
$this->_checkoutSession->getQuoteId() &&
- !$this->isRequestFromCheckoutPage($this->request)
+ !$this->isRequestFromCheckoutPage($this->request) &&
// persistent session does not expire on onepage checkout page
+ (
+ $this->_checkoutSession->getQuote()->getIsPersistent() ||
+ $this->_checkoutSession->getQuote()->getCustomerIsGuest()
+ )
) {
$this->_eventManager->dispatch('persistent_session_expired');
$this->quoteManager->expire();
diff --git a/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php b/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php
index db6b6d1ee370d..2803bc998dcbe 100644
--- a/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php
+++ b/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php
@@ -1,6 +1,5 @@
_persistentSession->isPersistent() && !$this->_customerSession->isLoggedIn())
- && !$this->_persistentData->isShoppingCartPersist()
+ ($this->_persistentSession->isPersistent())
+ && $this->_persistentData->isShoppingCartPersist()
)
&& $this->quoteManager->isPersistent()
) {
diff --git a/app/code/Magento/Persistent/Test/Mftf/Test/ShippingQuotePersistedForGuestTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/ShippingQuotePersistedForGuestTest.xml
new file mode 100644
index 0000000000000..e5c77ee414362
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Mftf/Test/ShippingQuotePersistedForGuestTest.xml
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- getDontSaveInAddressBook() && $block->getAddress()->getSaveInAddressBook()): ?> checked="checked"
- class="admin__control-checkbox"/>
+ getDontSaveInAddressBook()): ?> checked="checked" class="admin__control-checkbox"/>
diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_new.html b/app/code/Magento/Sales/view/frontend/email/shipment_new.html
index 8af49f322c682..84f5acb29ea3b 100644
--- a/app/code/Magento/Sales/view/frontend/email/shipment_new.html
+++ b/app/code/Magento/Sales/view/frontend/email/shipment_new.html
@@ -53,7 +53,7 @@ {{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship {{/depend}} - {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}} + {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html b/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
index df1677f56a500..bb181126724da 100644
--- a/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
@@ -51,7 +51,7 @@ {{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship |
|
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_track.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_track.xml
new file mode 100644
index 0000000000000..91414663951d3
--- /dev/null
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_track.xml
@@ -0,0 +1,13 @@
+
+
+ |
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
index 68f1886986c5b..385110f8f037e 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
@@ -49,7 +49,7 @@ {{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship |
|
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
index f2b9c9274bbcf..1be46c8239ee2 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
@@ -398,6 +398,17 @@
&.orders-recent {
&:extend(.abs-account-table-margin-mobile all);
&:extend(.abs-no-border-top all);
+ .table-order-items {
+ &.table {
+ tbody {
+ > tr {
+ > td.col {
+ padding-left: 0;
+ }
+ }
+ }
+ }
+ }
}
}
diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
index 4d990a82cb7e4..dfcc51e0a0a26 100644
--- a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
@@ -112,6 +112,10 @@
font-size: @font-size__base;
margin: 0 0 0 15px;
+ &.customer-welcome {
+ margin: 0 0 0 5px;
+ }
+
> a {
.lib-link(
@_link-color: @header-panel__text-color,
@@ -453,7 +457,7 @@
}
}
-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
.logo {
margin-bottom: 13px;
margin-top: 4px;
diff --git a/app/design/frontend/Magento/luma/web/css/source/_forms.less b/app/design/frontend/Magento/luma/web/css/source/_forms.less
index 98dd57dead74c..8533318a12d1b 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_forms.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_forms.less
@@ -104,6 +104,10 @@
.select-styling();
}
+ select.admin__control-multiselect {
+ height: auto;
+ }
+
.field-error,
div.mage-error[generated] {
margin-top: 7px;
@@ -113,6 +117,18 @@
.lib-form-validation-note();
}
+ .product-options-wrapper {
+ .date {
+ &.required {
+ div[for*='options'] {
+ &.mage-error {
+ display: none !important;
+ }
+ }
+ }
+ }
+ }
+
// TEMP
.field .tooltip {
diff --git a/app/etc/di.xml b/app/etc/di.xml
index 19543375aad58..47e7e419e3b50 100755
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -38,7 +38,7 @@
- Give your sales a boost when you advertise financing. PayPal helps turn browsers into buyers with financing - from PayPal Credit®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise PayPal Credit® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details.]]> - - Give your sales a boost when you advertise financing. PayPal helps turn browsers into buyers with financing - from PayPal Credit®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise PayPal Credit® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details.]]> - - Give your sales a boost when you advertise financing. PayPal helps turn browsers into buyers with financing - from PayPal Credit®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise PayPal Credit® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details.]]> - - Give your sales a boost when you advertise financing. PayPal helps turn browsers into buyers with financing - from PayPal Credit®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise PayPal Credit® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details.]]> - - Give your sales a boost when you advertise financing. PayPal helps turn browsers into buyers with financing - from PayPal Credit®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise PayPal Credit® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details.]]> - |