+
+ escapeHtml(__('Additional Cache Management')); ?>
+
hasAccessToFlushCatalogImages()): ?>
-
- escapeHtml(__('Additional Cache Management')); ?>
-
escapeHtml(__('Flush Catalog Images Cache')); ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/ui_component/design_config_listing.xml b/app/code/Magento/Backend/view/adminhtml/ui_component/design_config_listing.xml
index 93309c9a22ef2..b0abec3aa9bec 100644
--- a/app/code/Magento/Backend/view/adminhtml/ui_component/design_config_listing.xml
+++ b/app/code/Magento/Backend/view/adminhtml/ui_component/design_config_listing.xml
@@ -6,6 +6,7 @@
*/
-->
+
diff --git a/app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml b/app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml
index 496bb79343092..26f8817c0a1bb 100644
--- a/app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml
+++ b/app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml
@@ -18,8 +18,7 @@
-
diff --git a/app/code/Magento/Braintree/Controller/Paypal/PlaceOrder.php b/app/code/Magento/Braintree/Controller/Paypal/PlaceOrder.php
index 1acd16708ff42..418cb93900610 100644
--- a/app/code/Magento/Braintree/Controller/Paypal/PlaceOrder.php
+++ b/app/code/Magento/Braintree/Controller/Paypal/PlaceOrder.php
@@ -9,6 +9,7 @@
use Magento\Braintree\Model\Paypal\Helper;
use Magento\Checkout\Model\Session;
use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface;
use Magento\Framework\App\ObjectManager;
use Magento\Framework\Controller\ResultFactory;
use Magento\Framework\Exception\LocalizedException;
@@ -17,7 +18,7 @@
/**
* Class PlaceOrder
*/
-class PlaceOrder extends AbstractAction
+class PlaceOrder extends AbstractAction implements HttpPostActionInterface
{
/**
* @var Helper\OrderPlace
@@ -54,6 +55,7 @@ public function __construct(
/**
* @inheritdoc
+ *
* @throws LocalizedException
*/
public function execute()
@@ -71,7 +73,10 @@ public function execute()
return $resultRedirect->setPath('checkout/onepage/success', ['_secure' => true]);
} catch (\Exception $e) {
$this->logger->critical($e);
- $this->messageManager->addExceptionMessage($e, $e->getMessage());
+ $this->messageManager->addExceptionMessage(
+ $e,
+ 'The order #' . $quote->getReservedOrderId() . ' cannot be processed.'
+ );
}
return $resultRedirect->setPath('checkout/cart', ['_secure' => true]);
diff --git a/app/code/Magento/Braintree/Model/Paypal/Helper/OrderPlace.php b/app/code/Magento/Braintree/Model/Paypal/Helper/OrderPlace.php
index 6c4332ef22a4c..314404c79939c 100644
--- a/app/code/Magento/Braintree/Model/Paypal/Helper/OrderPlace.php
+++ b/app/code/Magento/Braintree/Model/Paypal/Helper/OrderPlace.php
@@ -6,14 +6,15 @@
namespace Magento\Braintree\Model\Paypal\Helper;
-use Magento\Quote\Model\Quote;
+use Magento\Braintree\Model\Paypal\OrderCancellationService;
+use Magento\Checkout\Api\AgreementsValidatorInterface;
use Magento\Checkout\Helper\Data;
+use Magento\Checkout\Model\Type\Onepage;
use Magento\Customer\Model\Group;
use Magento\Customer\Model\Session;
-use Magento\Checkout\Model\Type\Onepage;
-use Magento\Quote\Api\CartManagementInterface;
use Magento\Framework\Exception\LocalizedException;
-use Magento\Checkout\Api\AgreementsValidatorInterface;
+use Magento\Quote\Api\CartManagementInterface;
+use Magento\Quote\Model\Quote;
/**
* Class OrderPlace
@@ -42,23 +43,29 @@ class OrderPlace extends AbstractHelper
private $checkoutHelper;
/**
- * Constructor
- *
+ * @var OrderCancellationService
+ */
+ private $orderCancellationService;
+
+ /**
* @param CartManagementInterface $cartManagement
* @param AgreementsValidatorInterface $agreementsValidator
* @param Session $customerSession
* @param Data $checkoutHelper
+ * @param OrderCancellationService $orderCancellationService
*/
public function __construct(
CartManagementInterface $cartManagement,
AgreementsValidatorInterface $agreementsValidator,
Session $customerSession,
- Data $checkoutHelper
+ Data $checkoutHelper,
+ OrderCancellationService $orderCancellationService
) {
$this->cartManagement = $cartManagement;
$this->agreementsValidator = $agreementsValidator;
$this->customerSession = $customerSession;
$this->checkoutHelper = $checkoutHelper;
+ $this->orderCancellationService = $orderCancellationService;
}
/**
@@ -67,7 +74,7 @@ public function __construct(
* @param Quote $quote
* @param array $agreement
* @return void
- * @throws LocalizedException
+ * @throws \Exception
*/
public function execute(Quote $quote, array $agreement)
{
@@ -84,7 +91,12 @@ public function execute(Quote $quote, array $agreement)
$this->disabledQuoteAddressValidation($quote);
$quote->collectTotals();
- $this->cartManagement->placeOrder($quote->getId());
+ try {
+ $this->cartManagement->placeOrder($quote->getId());
+ } catch (\Exception $e) {
+ $this->orderCancellationService->execute($quote->getReservedOrderId());
+ throw $e;
+ }
}
/**
diff --git a/app/code/Magento/Braintree/Model/Paypal/OrderCancellationService.php b/app/code/Magento/Braintree/Model/Paypal/OrderCancellationService.php
new file mode 100644
index 0000000000000..29757e35ea6f4
--- /dev/null
+++ b/app/code/Magento/Braintree/Model/Paypal/OrderCancellationService.php
@@ -0,0 +1,77 @@
+searchCriteriaBuilder = $searchCriteriaBuilder;
+ $this->orderRepository = $orderRepository;
+ }
+
+ /**
+ * Cancels an order and authorization transaction.
+ *
+ * @param string $incrementId
+ * @return bool
+ */
+ public function execute(string $incrementId): bool
+ {
+ $order = $this->getOrder($incrementId);
+ if ($order === null) {
+ return false;
+ }
+
+ // `\Magento\Sales\Model\Service\OrderService::cancel` cannot be used for cancellation as the service uses
+ // the order repository with outdated payment method instance (ex. contains Vault instead of Braintree)
+ $order->cancel();
+ $this->orderRepository->save($order);
+ return true;
+ }
+
+ /**
+ * Gets order by increment ID.
+ *
+ * @param string $incrementId
+ * @return OrderInterface|null
+ */
+ private function getOrder(string $incrementId)
+ {
+ $searchCriteria = $this->searchCriteriaBuilder->addFilter(OrderInterface::INCREMENT_ID, $incrementId)
+ ->create();
+
+ $items = $this->orderRepository->getList($searchCriteria)
+ ->getItems();
+
+ return array_pop($items);
+ }
+}
diff --git a/app/code/Magento/Braintree/Plugin/OrderCancellation.php b/app/code/Magento/Braintree/Plugin/OrderCancellation.php
new file mode 100644
index 0000000000000..90c72839d9777
--- /dev/null
+++ b/app/code/Magento/Braintree/Plugin/OrderCancellation.php
@@ -0,0 +1,81 @@
+orderCancellationService = $orderCancellationService;
+ $this->quoteRepository = $quoteRepository;
+ }
+
+ /**
+ * Cancels an order if an exception occurs during the order creation.
+ *
+ * @param CartManagementInterface $subject
+ * @param \Closure $proceed
+ * @param int $cartId
+ * @param PaymentInterface $payment
+ * @return int
+ * @throws \Exception
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function aroundPlaceOrder(
+ CartManagementInterface $subject,
+ \Closure $proceed,
+ $cartId,
+ PaymentInterface $payment = null
+ ) {
+ try {
+ return $proceed($cartId, $payment);
+ } catch (\Exception $e) {
+ $quote = $this->quoteRepository->get((int) $cartId);
+ $payment = $quote->getPayment();
+ $paymentCodes = [
+ ConfigProvider::CODE,
+ ConfigProvider::CC_VAULT_CODE,
+ PayPalConfigProvider::PAYPAL_CODE,
+ PayPalConfigProvider::PAYPAL_VAULT_CODE
+ ];
+ if (in_array($payment->getMethod(), $paymentCodes)) {
+ $incrementId = $quote->getReservedOrderId();
+ $this->orderCancellationService->execute($incrementId);
+ }
+
+ throw $e;
+ }
+ }
+}
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml
new file mode 100644
index 0000000000000..412513c59c63c
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml
index 65eddc0d9e51a..4d531214db150 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml
@@ -6,15 +6,15 @@
*/
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-
-
\ No newline at end of file
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml b/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml
index 61be90076539e..f00e3fa286b08 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml
@@ -42,6 +42,7 @@
MerchantId
PublicKey
PrivateKey
+ Status
Credit Card (Braintree)
diff --git a/app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml b/app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml
index 772c1c39a04ca..30345ec31bacd 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml
@@ -18,6 +18,7 @@
Yerevan
9999
9999
+ Armenia
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml
index 660c7393b4061..eb7a9ce2c376e 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml
@@ -13,7 +13,7 @@
+
+
+
+
+
+
+
+
+
+
+
+ 3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/PlaceOrderTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/PlaceOrderTest.php
index 4bea03153b93b..9c25846e56da0 100644
--- a/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/PlaceOrderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/PlaceOrderTest.php
@@ -3,6 +3,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
namespace Magento\Braintree\Test\Unit\Controller\Paypal;
@@ -16,6 +17,8 @@
use Magento\Framework\Controller\ResultInterface;
use Magento\Framework\Message\ManagerInterface;
use Magento\Quote\Model\Quote;
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
/**
* Class PlaceOrderTest
@@ -27,34 +30,34 @@
class PlaceOrderTest extends \PHPUnit\Framework\TestCase
{
/**
- * @var OrderPlace|\PHPUnit_Framework_MockObject_MockObject
+ * @var OrderPlace|MockObject
*/
- private $orderPlaceMock;
+ private $orderPlace;
/**
- * @var Config|\PHPUnit_Framework_MockObject_MockObject
+ * @var Config|MockObject
*/
- private $configMock;
+ private $config;
/**
- * @var Session|\PHPUnit_Framework_MockObject_MockObject
+ * @var Session|MockObject
*/
- private $checkoutSessionMock;
+ private $checkoutSession;
/**
- * @var RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var RequestInterface|MockObject
*/
- private $requestMock;
+ private $request;
/**
- * @var ResultFactory|\PHPUnit_Framework_MockObject_MockObject
+ * @var ResultFactory|MockObject
*/
- private $resultFactoryMock;
+ private $resultFactory;
/**
- * @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var ManagerInterface|MockObject
*/
- protected $messageManagerMock;
+ private $messageManager;
/**
* @var PlaceOrder
@@ -62,139 +65,143 @@ class PlaceOrderTest extends \PHPUnit\Framework\TestCase
private $placeOrder;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var MockObject
*/
- private $loggerMock;
+ private $logger;
+ /**
+ * @inheritdoc
+ */
protected function setUp()
{
- /** @var Context|\PHPUnit_Framework_MockObject_MockObject $contextMock */
- $contextMock = $this->getMockBuilder(Context::class)
+ /** @var Context|MockObject $context */
+ $context = $this->getMockBuilder(Context::class)
->disableOriginalConstructor()
->getMock();
- $this->requestMock = $this->getMockBuilder(RequestInterface::class)
+ $this->request = $this->getMockBuilder(RequestInterface::class)
->setMethods(['getPostValue'])
->getMockForAbstractClass();
- $this->resultFactoryMock = $this->getMockBuilder(ResultFactory::class)
+ $this->resultFactory = $this->getMockBuilder(ResultFactory::class)
->disableOriginalConstructor()
->getMock();
- $this->checkoutSessionMock = $this->getMockBuilder(Session::class)
+ $this->checkoutSession = $this->getMockBuilder(Session::class)
->disableOriginalConstructor()
->getMock();
- $this->configMock = $this->getMockBuilder(Config::class)
+ $this->config = $this->getMockBuilder(Config::class)
->disableOriginalConstructor()
->getMock();
- $this->orderPlaceMock = $this->getMockBuilder(OrderPlace::class)
+ $this->orderPlace = $this->getMockBuilder(OrderPlace::class)
->disableOriginalConstructor()
->getMock();
- $this->messageManagerMock = $this->getMockBuilder(ManagerInterface::class)
+ $this->messageManager = $this->getMockBuilder(ManagerInterface::class)
->getMockForAbstractClass();
- $contextMock->expects(self::once())
- ->method('getRequest')
- ->willReturn($this->requestMock);
- $contextMock->expects(self::once())
- ->method('getResultFactory')
- ->willReturn($this->resultFactoryMock);
- $contextMock->expects(self::once())
- ->method('getMessageManager')
- ->willReturn($this->messageManagerMock);
-
- $this->loggerMock = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
+ $context->method('getRequest')
+ ->willReturn($this->request);
+ $context->method('getResultFactory')
+ ->willReturn($this->resultFactory);
+ $context->method('getMessageManager')
+ ->willReturn($this->messageManager);
+
+ $this->logger = $this->getMockBuilder(LoggerInterface::class)
->disableOriginalConstructor()
->getMock();
$this->placeOrder = new PlaceOrder(
- $contextMock,
- $this->configMock,
- $this->checkoutSessionMock,
- $this->orderPlaceMock,
- $this->loggerMock
+ $context,
+ $this->config,
+ $this->checkoutSession,
+ $this->orderPlace,
+ $this->logger
);
}
+ /**
+ * Checks if an order is placed successfully.
+ *
+ * @throws \Magento\Framework\Exception\LocalizedException
+ * @throws \Magento\Framework\Exception\NotFoundException
+ */
public function testExecute()
{
$agreement = ['test-data'];
$quoteMock = $this->getQuoteMock();
- $quoteMock->expects(self::once())
- ->method('getItemsCount')
+ $quoteMock->method('getItemsCount')
->willReturn(1);
$resultMock = $this->getResultMock();
- $resultMock->expects(self::once())
- ->method('setPath')
+ $resultMock->method('setPath')
->with('checkout/onepage/success')
->willReturnSelf();
- $this->resultFactoryMock->expects(self::once())
- ->method('create')
+ $this->resultFactory->method('create')
->with(ResultFactory::TYPE_REDIRECT)
->willReturn($resultMock);
- $this->requestMock->expects(self::once())
- ->method('getPostValue')
+ $this->request->method('getPostValue')
->with('agreement', [])
->willReturn($agreement);
- $this->checkoutSessionMock->expects(self::once())
- ->method('getQuote')
+ $this->checkoutSession->method('getQuote')
->willReturn($quoteMock);
- $this->orderPlaceMock->expects(self::once())
- ->method('execute')
+ $this->orderPlace->method('execute')
->with($quoteMock, [0]);
- $this->messageManagerMock->expects(self::never())
+ $this->messageManager->expects(self::never())
->method('addExceptionMessage');
self::assertEquals($this->placeOrder->execute(), $resultMock);
}
+ /**
+ * Checks a negative scenario during place order action.
+ *
+ * @throws \Magento\Framework\Exception\LocalizedException
+ * @throws \Magento\Framework\Exception\NotFoundException
+ */
public function testExecuteException()
{
$agreement = ['test-data'];
$quote = $this->getQuoteMock();
- $quote->expects(self::once())
- ->method('getItemsCount')
+ $quote->method('getItemsCount')
->willReturn(0);
+ $quote->method('getReservedOrderId')
+ ->willReturn('000000111');
$resultMock = $this->getResultMock();
- $resultMock->expects(self::once())
- ->method('setPath')
+ $resultMock->method('setPath')
->with('checkout/cart')
->willReturnSelf();
- $this->resultFactoryMock->expects(self::once())
- ->method('create')
+ $this->resultFactory->method('create')
->with(ResultFactory::TYPE_REDIRECT)
->willReturn($resultMock);
- $this->requestMock->expects(self::once())
- ->method('getPostValue')
+ $this->request->method('getPostValue')
->with('agreement', [])
->willReturn($agreement);
- $this->checkoutSessionMock->expects(self::once())
- ->method('getQuote')
+ $this->checkoutSession->method('getQuote')
->willReturn($quote);
- $this->orderPlaceMock->expects(self::never())
+ $this->orderPlace->expects(self::never())
->method('execute');
- $this->messageManagerMock->expects(self::once())
- ->method('addExceptionMessage')
+ $this->messageManager->method('addExceptionMessage')
->with(
self::isInstanceOf('\InvalidArgumentException'),
- 'Checkout failed to initialize. Verify and try again.'
+ 'The order #000000111 cannot be processed.'
);
self::assertEquals($this->placeOrder->execute(), $resultMock);
}
/**
- * @return ResultInterface|\PHPUnit_Framework_MockObject_MockObject
+ * Gets mock object for a result.
+ *
+ * @return ResultInterface|MockObject
*/
private function getResultMock()
{
@@ -204,7 +211,9 @@ private function getResultMock()
}
/**
- * @return Quote|\PHPUnit_Framework_MockObject_MockObject
+ * Gets mock object for a quote.
+ *
+ * @return Quote|MockObject
*/
private function getQuoteMock()
{
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/OrderPlaceTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/OrderPlaceTest.php
index 1aecba91b9afc..c8524017274a4 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/OrderPlaceTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/OrderPlaceTest.php
@@ -3,9 +3,12 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\Braintree\Test\Unit\Model\Paypal\Helper;
use Magento\Braintree\Model\Paypal\Helper\OrderPlace;
+use Magento\Braintree\Model\Paypal\OrderCancellationService;
use Magento\Checkout\Api\AgreementsValidatorInterface;
use Magento\Checkout\Helper\Data;
use Magento\Checkout\Model\Type\Onepage;
@@ -14,6 +17,7 @@
use Magento\Quote\Api\CartManagementInterface;
use Magento\Quote\Model\Quote;
use Magento\Quote\Model\Quote\Address;
+use PHPUnit\Framework\MockObject\MockObject;
/**
* Class OrderPlaceTest
@@ -27,62 +31,80 @@ class OrderPlaceTest extends \PHPUnit\Framework\TestCase
const TEST_EMAIL = 'test@test.loc';
/**
- * @var CartManagementInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var CartManagementInterface|MockObject
*/
- private $cartManagementMock;
+ private $cartManagement;
/**
- * @var AgreementsValidatorInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var AgreementsValidatorInterface|MockObject
*/
- private $agreementsValidatorMock;
+ private $agreementsValidator;
/**
- * @var Session|\PHPUnit_Framework_MockObject_MockObject
+ * @var Session|MockObject
*/
- private $customerSessionMock;
+ private $customerSession;
/**
- * @var Data|\PHPUnit_Framework_MockObject_MockObject
+ * @var Data|MockObject
*/
- private $checkoutHelperMock;
+ private $checkoutHelper;
/**
- * @var Address|\PHPUnit_Framework_MockObject_MockObject
+ * @var Address|MockObject
*/
- private $billingAddressMock;
+ private $billingAddress;
/**
* @var OrderPlace
*/
private $orderPlace;
+ /**
+ * @var OrderCancellationService|MockObject
+ */
+ private $orderCancellation;
+
+ /**
+ * @inheritdoc
+ */
protected function setUp()
{
- $this->cartManagementMock = $this->getMockBuilder(CartManagementInterface::class)
+ $this->cartManagement = $this->getMockBuilder(CartManagementInterface::class)
->getMockForAbstractClass();
- $this->agreementsValidatorMock = $this->getMockBuilder(AgreementsValidatorInterface::class)
+ $this->agreementsValidator = $this->getMockBuilder(AgreementsValidatorInterface::class)
->getMockForAbstractClass();
- $this->customerSessionMock = $this->getMockBuilder(Session::class)
+ $this->customerSession = $this->getMockBuilder(Session::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->checkoutHelper = $this->getMockBuilder(Data::class)
->disableOriginalConstructor()
->getMock();
- $this->checkoutHelperMock = $this->getMockBuilder(Data::class)
+
+ $this->orderCancellation = $this->getMockBuilder(OrderCancellationService::class)
->disableOriginalConstructor()
->getMock();
$this->orderPlace = new OrderPlace(
- $this->cartManagementMock,
- $this->agreementsValidatorMock,
- $this->customerSessionMock,
- $this->checkoutHelperMock
+ $this->cartManagement,
+ $this->agreementsValidator,
+ $this->customerSession,
+ $this->checkoutHelper,
+ $this->orderCancellation
);
}
+ /**
+ * Checks a scenario for a guest customer.
+ *
+ * @throws \Exception
+ */
public function testExecuteGuest()
{
$agreement = ['test', 'test'];
$quoteMock = $this->getQuoteMock();
- $this->agreementsValidatorMock->expects(self::once())
+ $this->agreementsValidator->expects(self::once())
->method('isValid')
->willReturn(true);
@@ -97,7 +119,7 @@ public function testExecuteGuest()
->method('getId')
->willReturn(10);
- $this->cartManagementMock->expects(self::once())
+ $this->cartManagement->expects(self::once())
->method('placeOrder')
->with(10);
@@ -105,9 +127,11 @@ public function testExecuteGuest()
}
/**
- * @param \PHPUnit_Framework_MockObject_MockObject $quoteMock
+ * Disables address validation.
+ *
+ * @param MockObject $quoteMock
*/
- private function disabledQuoteAddressValidationStep(\PHPUnit_Framework_MockObject_MockObject $quoteMock)
+ private function disabledQuoteAddressValidationStep(MockObject $quoteMock)
{
$billingAddressMock = $this->getBillingAddressMock($quoteMock);
$shippingAddressMock = $this->getMockBuilder(Address::class)
@@ -115,26 +139,21 @@ private function disabledQuoteAddressValidationStep(\PHPUnit_Framework_MockObjec
->disableOriginalConstructor()
->getMock();
- $quoteMock->expects(self::once())
- ->method('getShippingAddress')
+ $quoteMock->method('getShippingAddress')
->willReturn($shippingAddressMock);
- $billingAddressMock->expects(self::once())
- ->method('setShouldIgnoreValidation')
+ $billingAddressMock->method('setShouldIgnoreValidation')
->with(true)
->willReturnSelf();
- $quoteMock->expects(self::once())
- ->method('getIsVirtual')
+ $quoteMock->method('getIsVirtual')
->willReturn(false);
- $shippingAddressMock->expects(self::once())
- ->method('setShouldIgnoreValidation')
+ $shippingAddressMock->method('setShouldIgnoreValidation')
->with(true)
->willReturnSelf();
- $billingAddressMock->expects(self::any())
- ->method('getEmail')
+ $billingAddressMock->method('getEmail')
->willReturn(self::TEST_EMAIL);
$billingAddressMock->expects(self::never())
@@ -142,25 +161,24 @@ private function disabledQuoteAddressValidationStep(\PHPUnit_Framework_MockObjec
}
/**
- * @param \PHPUnit_Framework_MockObject_MockObject $quoteMock
+ * Prepares checkout step.
+ *
+ * @param MockObject $quoteMock
*/
- private function getCheckoutMethodStep(\PHPUnit_Framework_MockObject_MockObject $quoteMock)
+ private function getCheckoutMethodStep(MockObject $quoteMock)
{
- $this->customerSessionMock->expects(self::once())
- ->method('isLoggedIn')
+ $this->customerSession->method('isLoggedIn')
->willReturn(false);
$quoteMock->expects(self::at(1))
->method('getCheckoutMethod')
->willReturn(null);
- $this->checkoutHelperMock->expects(self::once())
- ->method('isAllowedGuestCheckout')
+ $this->checkoutHelper->method('isAllowedGuestCheckout')
->with($quoteMock)
->willReturn(true);
- $quoteMock->expects(self::once())
- ->method('setCheckoutMethod')
+ $quoteMock->method('setCheckoutMethod')
->with(Onepage::METHOD_GUEST);
$quoteMock->expects(self::at(2))
@@ -169,9 +187,11 @@ private function getCheckoutMethodStep(\PHPUnit_Framework_MockObject_MockObject
}
/**
- * @param \PHPUnit_Framework_MockObject_MockObject $quoteMock
+ * Prepares quote.
+ *
+ * @param MockObject $quoteMock
*/
- private function prepareGuestQuoteStep(\PHPUnit_Framework_MockObject_MockObject $quoteMock)
+ private function prepareGuestQuoteStep(MockObject $quoteMock)
{
$billingAddressMock = $this->getBillingAddressMock($quoteMock);
@@ -184,44 +204,44 @@ private function prepareGuestQuoteStep(\PHPUnit_Framework_MockObject_MockObject
->method('getEmail')
->willReturn(self::TEST_EMAIL);
- $quoteMock->expects(self::once())
- ->method('setCustomerEmail')
+ $quoteMock->method('setCustomerEmail')
->with(self::TEST_EMAIL)
->willReturnSelf();
- $quoteMock->expects(self::once())
- ->method('setCustomerIsGuest')
+ $quoteMock->method('setCustomerIsGuest')
->with(true)
->willReturnSelf();
- $quoteMock->expects(self::once())
- ->method('setCustomerGroupId')
+ $quoteMock->method('setCustomerGroupId')
->with(Group::NOT_LOGGED_IN_ID)
->willReturnSelf();
}
/**
- * @param \PHPUnit_Framework_MockObject_MockObject $quoteMock
- * @return Address|\PHPUnit_Framework_MockObject_MockObject
+ * Gets a mock object for a billing address entity.
+ *
+ * @param MockObject $quoteMock
+ * @return Address|MockObject
*/
- private function getBillingAddressMock(\PHPUnit_Framework_MockObject_MockObject $quoteMock)
+ private function getBillingAddressMock(MockObject $quoteMock)
{
- if (!isset($this->billingAddressMock)) {
- $this->billingAddressMock = $this->getMockBuilder(Address::class)
+ if (!isset($this->billingAddress)) {
+ $this->billingAddress = $this->getMockBuilder(Address::class)
->setMethods(['setShouldIgnoreValidation', 'getEmail', 'setSameAsBilling'])
->disableOriginalConstructor()
->getMock();
}
- $quoteMock->expects(self::any())
- ->method('getBillingAddress')
- ->willReturn($this->billingAddressMock);
+ $quoteMock->method('getBillingAddress')
+ ->willReturn($this->billingAddress);
- return $this->billingAddressMock;
+ return $this->billingAddress;
}
/**
- * @return Quote|\PHPUnit_Framework_MockObject_MockObject
+ * Gets a mock object for a quote.
+ *
+ * @return Quote|MockObject
*/
private function getQuoteMock()
{
diff --git a/app/code/Magento/Braintree/etc/config.xml b/app/code/Magento/Braintree/etc/config.xml
index a830c29368755..9de4773af023a 100644
--- a/app/code/Magento/Braintree/etc/config.xml
+++ b/app/code/Magento/Braintree/etc/config.xml
@@ -42,6 +42,7 @@
cc_type,cc_number,avsPostalCodeResponseCode,avsStreetAddressResponseCode,cvvResponseCode,processorAuthorizationCode,processorResponseCode,processorResponseText,liabilityShifted,liabilityShiftPossible,riskDataId,riskDataDecision
Magento\Braintree\Model\AvsEmsCodeMapper
Magento\Braintree\Model\CvvEmsCodeMapper
+ braintree
BraintreePayPalFacade
@@ -67,6 +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
BraintreeCreditCardVaultFacade
@@ -76,6 +78,7 @@
Magento\Braintree\Model\InstantPurchase\CreditCard\TokenFormatter
Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider
+ braintree
BraintreePayPalVaultFacade
@@ -85,6 +88,7 @@
Magento\Braintree\Model\InstantPurchase\PayPal\TokenFormatter
Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider
+ braintree
diff --git a/app/code/Magento/Braintree/etc/di.xml b/app/code/Magento/Braintree/etc/di.xml
index 67c90e6991e28..b81513caf17a2 100644
--- a/app/code/Magento/Braintree/etc/di.xml
+++ b/app/code/Magento/Braintree/etc/di.xml
@@ -624,4 +624,8 @@
+
+
+
diff --git a/app/code/Magento/Braintree/etc/payment.xml b/app/code/Magento/Braintree/etc/payment.xml
new file mode 100644
index 0000000000000..dbabd91151022
--- /dev/null
+++ b/app/code/Magento/Braintree/etc/payment.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+ Braintree
+
+
+
diff --git a/app/code/Magento/Braintree/i18n/en_US.csv b/app/code/Magento/Braintree/i18n/en_US.csv
index 7bd305f546dc6..e9145b35b56ef 100644
--- a/app/code/Magento/Braintree/i18n/en_US.csv
+++ b/app/code/Magento/Braintree/i18n/en_US.csv
@@ -193,3 +193,4 @@ Currency,Currency
"Too many concurrent attempts to void this transaction. Try again later.","Too many concurrent attempts to void this transaction. Try again later."
"Braintree Settlement","Braintree Settlement"
"The Payment Token is not available to perform the request.","The Payment Token is not available to perform the request."
+"The order #%1 cannot be processed.","The order #%1 cannot be processed."
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php
index b220e2c98d77c..46db8a9907341 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php
@@ -20,9 +20,7 @@ class Checkbox extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Op
protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/checkbox.phtml';
/**
- * @param string $elementId
- * @param string $containerId
- * @return string
+ * @inheritdoc
*/
public function setValidationContainer($elementId, $containerId)
{
@@ -34,4 +32,15 @@ public function setValidationContainer($elementId, $containerId)
'\';
';
}
+
+ /**
+ * @inheritdoc
+ */
+ public function getSelectionPrice($selection)
+ {
+ $price = parent::getSelectionPrice($selection);
+ $qty = $selection->getSelectionQty();
+
+ return $price * $qty;
+ }
}
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php
index a4b8c6bde73aa..629f08dc75106 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php
@@ -20,9 +20,7 @@ class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/multi.phtml';
/**
- * @param string $elementId
- * @param string $containerId
- * @return string
+ * @inheritdoc
*/
public function setValidationContainer($elementId, $containerId)
{
@@ -34,4 +32,15 @@ public function setValidationContainer($elementId, $containerId)
'\';
';
}
+
+ /**
+ * @inheritdoc
+ */
+ public function getSelectionPrice($selection)
+ {
+ $price = parent::getSelectionPrice($selection);
+ $qty = $selection->getSelectionQty();
+
+ return $price * $qty;
+ }
}
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Crosssell.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Crosssell.php
index ba7b9b5fcb593..08fac66c4a4fe 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Crosssell.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Crosssell.php
@@ -6,6 +6,16 @@
*/
namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
-class Crosssell extends \Magento\Catalog\Controller\Adminhtml\Product\Crosssell
+use Magento\Catalog\Controller\Adminhtml\Product\Crosssell as CatalogCrossel;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class Crosssell
+ *
+ * @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
+ * @deprecated Not used since cross-sell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
+ */
+class Crosssell extends CatalogCrossel implements HttpPostActionInterface
{
}
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/CrosssellGrid.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/CrosssellGrid.php
index 87550d768ca8e..b301d6ee2fea9 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/CrosssellGrid.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/CrosssellGrid.php
@@ -6,6 +6,16 @@
*/
namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
-class CrosssellGrid extends \Magento\Catalog\Controller\Adminhtml\Product\CrosssellGrid
+use Magento\Catalog\Controller\Adminhtml\Product\CrosssellGrid as CatalogCrosssellGrid;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class CrosssellGrid
+ *
+ * @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
+ * @deprecated Not used since cross-sell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
+ */
+class CrosssellGrid extends CatalogCrosssellGrid implements HttpPostActionInterface
{
}
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Related.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Related.php
index 58f464fba3afe..7534cfddcaadf 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Related.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Related.php
@@ -6,6 +6,16 @@
*/
namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
-class Related extends \Magento\Catalog\Controller\Adminhtml\Product\Related
+use Magento\Catalog\Controller\Adminhtml\Product\Related as CatalogRelated;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class Related
+ *
+ * @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
+ * @deprecated Not used since related products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
+ */
+class Related extends CatalogRelated implements HttpPostActionInterface
{
}
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/RelatedGrid.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/RelatedGrid.php
index a27efe8bc2b68..e0fc9226663f4 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/RelatedGrid.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/RelatedGrid.php
@@ -6,6 +6,16 @@
*/
namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
-class RelatedGrid extends \Magento\Catalog\Controller\Adminhtml\Product\RelatedGrid
+use Magento\Catalog\Controller\Adminhtml\Product\RelatedGrid as CatalogRelatedGrid;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class RelatedGrid
+ *
+ * @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
+ * @deprecated Not used since related products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
+ */
+class RelatedGrid extends CatalogRelatedGrid implements HttpPostActionInterface
{
}
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Upsell.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Upsell.php
index d0a6343569ee8..239b13970e696 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Upsell.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Upsell.php
@@ -6,6 +6,16 @@
*/
namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
-class Upsell extends \Magento\Catalog\Controller\Adminhtml\Product\Upsell
+use Magento\Catalog\Controller\Adminhtml\Product\Upsell as CatalogUpsell;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class Upsell
+ *
+ * @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
+ * @deprecated Not used since upsell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
+ */
+class Upsell extends CatalogUpsell implements HttpPostActionInterface
{
}
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/UpsellGrid.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/UpsellGrid.php
index 74c87be5b7108..ed3312d3b0734 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/UpsellGrid.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/UpsellGrid.php
@@ -6,6 +6,13 @@
*/
namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
+/**
+ * Class UpsellGrid
+ *
+ * @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
+ * @deprecated Not used since upsell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
+ */
class UpsellGrid extends \Magento\Catalog\Controller\Adminhtml\Product\UpsellGrid
{
}
diff --git a/app/code/Magento/Bundle/Model/Product/SaveHandler.php b/app/code/Magento/Bundle/Model/Product/SaveHandler.php
index fc215aa6b8e20..99e8188146bbb 100644
--- a/app/code/Magento/Bundle/Model/Product/SaveHandler.php
+++ b/app/code/Magento/Bundle/Model/Product/SaveHandler.php
@@ -58,6 +58,8 @@ public function __construct(
}
/**
+ * Perform action on Bundle product relation/extension attribute
+ *
* @param object $entity
* @param array $arguments
*
@@ -83,7 +85,7 @@ public function execute($entity, $arguments = [])
: [];
if (!$entity->getCopyFromView()) {
- $this->processRemovedOptions($entity->getSku(), $existingOptionsIds, $optionIds);
+ $this->processRemovedOptions($entity, $existingOptionsIds, $optionIds);
$newOptionsIds = array_diff($optionIds, $existingOptionsIds);
$this->saveOptions($entity, $bundleProductOptions, $newOptionsIds);
} else {
@@ -96,6 +98,8 @@ public function execute($entity, $arguments = [])
}
/**
+ * Remove option product links
+ *
* @param string $entitySku
* @param \Magento\Bundle\Api\Data\OptionInterface $option
* @return void
@@ -154,16 +158,19 @@ private function getOptionIds(array $options): array
/**
* Removes old options that no longer exists.
*
- * @param string $entitySku
+ * @param ProductInterface $entity
* @param array $existingOptionsIds
* @param array $optionIds
* @return void
*/
- private function processRemovedOptions(string $entitySku, array $existingOptionsIds, array $optionIds): void
+ private function processRemovedOptions(ProductInterface $entity, array $existingOptionsIds, array $optionIds): void
{
+ $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
+ $parentId = $entity->getData($metadata->getLinkField());
foreach (array_diff($existingOptionsIds, $optionIds) as $optionId) {
- $option = $this->optionRepository->get($entitySku, $optionId);
- $this->removeOptionLinks($entitySku, $option);
+ $option = $this->optionRepository->get($entity->getSku(), $optionId);
+ $option->setParentId($parentId);
+ $this->removeOptionLinks($entity->getSku(), $option);
$this->optionRepository->delete($option);
}
}
diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index b61df8d7cb125..641f4490874da 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -737,7 +737,7 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
* for selection (not for all bundle)
*/
$price = $product->getPriceModel()
- ->getSelectionFinalTotalPrice($product, $selection, 0, $qty);
+ ->getSelectionFinalTotalPrice($product, $selection, 0, 1);
$attributes = [
'price' => $price,
'qty' => $qty,
@@ -823,11 +823,11 @@ private function recursiveIntval(array $array)
private function multiToFlatArray(array $array)
{
$flatArray = [];
- foreach ($array as $key => $value) {
+ foreach ($array as $value) {
if (is_array($value)) {
$flatArray = array_merge($flatArray, $this->multiToFlatArray($value));
} else {
- $flatArray[$key] = $value;
+ $flatArray[] = $value;
}
}
diff --git a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
index adb0777151b9e..04a6ee0bd459b 100644
--- a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
+++ b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
@@ -198,6 +198,8 @@ protected function getSelectionAmounts(Product $bundleProduct, $searchMin, $useR
}
/**
+ * Get selection price list provider.
+ *
* @return SelectionPriceListProviderInterface
* @deprecated 100.2.0
*/
@@ -281,7 +283,7 @@ public function calculateBundleAmount($basePriceValue, $bundleProduct, $selectio
* @param float $basePriceValue
* @param Product $bundleProduct
* @param \Magento\Bundle\Pricing\Price\BundleSelectionPrice[] $selectionPriceList
- * @param null|bool|string|arrayy $exclude
+ * @param null|bool|string|array $exclude
* @return \Magento\Framework\Pricing\Amount\AmountInterface
*/
protected function calculateFixedBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude)
diff --git a/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTytpes.php b/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTypes.php
similarity index 94%
rename from app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTytpes.php
rename to app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTypes.php
index 44647ea76a1c2..701def7fc13d8 100644
--- a/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTytpes.php
+++ b/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTypes.php
@@ -6,19 +6,19 @@
namespace Magento\Bundle\Setup\Patch\Data;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Eav\Setup\EavSetup;
use Magento\Eav\Setup\EavSetupFactory;
-use Magento\Framework\App\ResourceConnection;
use Magento\Framework\Setup\ModuleDataSetupInterface;
use Magento\Framework\Setup\Patch\DataPatchInterface;
use Magento\Framework\Setup\Patch\PatchVersionInterface;
-use Magento\Catalog\Api\Data\ProductAttributeInterface;
-use Magento\Eav\Setup\EavSetup;
/**
- * Class UpdateBundleRelatedEntityTytpes
+ * Class UpdateBundleRelatedEntityTypes
+ *
* @package Magento\Bundle\Setup\Patch
*/
-class UpdateBundleRelatedEntityTytpes implements DataPatchInterface, PatchVersionInterface
+class UpdateBundleRelatedEntityTypes implements DataPatchInterface, PatchVersionInterface
{
/**
* @var ModuleDataSetupInterface
@@ -31,7 +31,7 @@ class UpdateBundleRelatedEntityTytpes implements DataPatchInterface, PatchVersio
private $eavSetupFactory;
/**
- * UpdateBundleRelatedEntityTytpes constructor.
+ * UpdateBundleRelatedEntityTypes constructor.
* @param ModuleDataSetupInterface $moduleDataSetup
* @param EavSetupFactory $eavSetupFactory
*/
@@ -44,7 +44,7 @@ public function __construct(
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function apply()
{
@@ -177,7 +177,7 @@ private function upgradeShipmentType(EavSetup $eavSetup)
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public static function getDependencies()
{
@@ -187,7 +187,7 @@ public static function getDependencies()
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public static function getVersion()
{
@@ -195,7 +195,7 @@ public static function getVersion()
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function getAliases()
{
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
index f28ffbdc40acc..e36730a87b41a 100644
--- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
@@ -24,4 +24,18 @@
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleProductWithZeroPriceToShoppingCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleProductWithZeroPriceToShoppingCartTest.xml
new file mode 100644
index 0000000000000..33181d6e920eb
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleProductWithZeroPriceToShoppingCartTest.xml
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php b/app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php
index b0794f4564645..a8650a4e6e9e3 100644
--- a/app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php
+++ b/app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php
@@ -242,7 +242,7 @@ public function testSaveData($skus, $bunch, $allowImport)
'price_type' => 'fixed',
'shipment_type' => '1',
'default_qty' => '1',
- 'is_defaul' => '1',
+ 'is_default' => '1',
'position' => '1',
'option_id' => '1']
]
@@ -264,7 +264,7 @@ public function testSaveData($skus, $bunch, $allowImport)
'price_type' => 'percent',
'shipment_type' => 0,
'default_qty' => '2',
- 'is_defaul' => '1',
+ 'is_default' => '1',
'position' => '6',
'option_id' => '6']
]
@@ -324,7 +324,7 @@ public function saveDataProvider()
. 'price_type=fixed,'
. 'shipment_type=separately,'
. 'default_qty=1,'
- . 'is_defaul=1,'
+ . 'is_default=1,'
. 'position=1,'
. 'option_id=1 | name=Bundle2,'
. 'type=dropdown,'
@@ -333,7 +333,7 @@ public function saveDataProvider()
. 'price=10,'
. 'price_type=fixed,'
. 'default_qty=1,'
- . 'is_defaul=1,'
+ . 'is_default=1,'
. 'position=2,'
. 'option_id=2'
],
diff --git a/app/code/Magento/Captcha/CustomerData/Captcha.php b/app/code/Magento/Captcha/CustomerData/Captcha.php
new file mode 100644
index 0000000000000..a744daacdc673
--- /dev/null
+++ b/app/code/Magento/Captcha/CustomerData/Captcha.php
@@ -0,0 +1,61 @@
+helper = $helper;
+ $this->formIds = $formIds;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getSectionData() :array
+ {
+ $data = [];
+
+ foreach ($this->formIds as $formId) {
+ $captchaModel = $this->helper->getCaptcha($formId);
+ $data[$formId] = [
+ 'isRequired' => $captchaModel->isRequired(),
+ 'timestamp' => time()
+ ];
+ }
+
+ return $data;
+ }
+}
diff --git a/app/code/Magento/Captcha/Model/Checkout/ConfigProvider.php b/app/code/Magento/Captcha/Model/Checkout/ConfigProvider.php
index ef5f5a8edce71..34ee62044ff57 100644
--- a/app/code/Magento/Captcha/Model/Checkout/ConfigProvider.php
+++ b/app/code/Magento/Captcha/Model/Checkout/ConfigProvider.php
@@ -5,6 +5,9 @@
*/
namespace Magento\Captcha\Model\Checkout;
+/**
+ * Configuration provider for Captcha rendering.
+ */
class ConfigProvider implements \Magento\Checkout\Model\ConfigProviderInterface
{
/**
@@ -38,7 +41,7 @@ public function __construct(
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function getConfig()
{
@@ -49,7 +52,8 @@ public function getConfig()
'imageHeight' => $this->getImageHeight($formId),
'imageSrc' => $this->getImageSrc($formId),
'refreshUrl' => $this->getRefreshUrl(),
- 'isRequired' => $this->isRequired($formId)
+ 'isRequired' => $this->isRequired($formId),
+ 'timestamp' => time()
];
}
return $config;
diff --git a/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php b/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php
index f04e9ac8611bc..84ac71046c343 100644
--- a/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php
+++ b/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php
@@ -3,18 +3,15 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-declare(strict_types=1);
namespace Magento\Captcha\Model\Customer\Plugin;
use Magento\Captcha\Helper\Data as CaptchaHelper;
-use Magento\Customer\Controller\Ajax\Login;
-use Magento\Framework\Controller\Result\Json;
-use Magento\Framework\Controller\Result\JsonFactory;
use Magento\Framework\Session\SessionManagerInterface;
+use Magento\Framework\Controller\Result\JsonFactory;
/**
- * The plugin for ajax login controller.
+ * Around plugin for login action.
*/
class AjaxLogin
{
@@ -67,14 +64,16 @@ public function __construct(
}
/**
- * Validates captcha during request execution.
+ * Check captcha data on login action.
*
- * @param Login $subject
+ * @param \Magento\Customer\Controller\Ajax\Login $subject
* @param \Closure $proceed
* @return $this
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function aroundExecute(
- Login $subject,
+ \Magento\Customer\Controller\Ajax\Login $subject,
\Closure $proceed
) {
$captchaFormIdField = 'captcha_form_id';
@@ -99,15 +98,13 @@ public function aroundExecute(
foreach ($this->formIds as $formId) {
if ($formId === $loginFormId) {
$captchaModel = $this->helper->getCaptcha($formId);
-
if ($captchaModel->isRequired($username)) {
if (!$captchaModel->isCorrect($captchaString)) {
$this->sessionManager->setUsername($username);
$captchaModel->logAttempt($username);
- return $this->returnJsonError(__('Incorrect CAPTCHA'), true);
+ return $this->returnJsonError(__('Incorrect CAPTCHA'));
}
}
-
$captchaModel->logAttempt($username);
}
}
@@ -115,15 +112,14 @@ public function aroundExecute(
}
/**
- * Gets Json response.
+ * Format JSON response.
*
* @param \Magento\Framework\Phrase $phrase
- * @param bool $isCaptchaRequired
- * @return Json
+ * @return \Magento\Framework\Controller\Result\Json
*/
- private function returnJsonError(\Magento\Framework\Phrase $phrase, bool $isCaptchaRequired = false): Json
+ private function returnJsonError(\Magento\Framework\Phrase $phrase): \Magento\Framework\Controller\Result\Json
{
$resultJson = $this->resultJsonFactory->create();
- return $resultJson->setData(['errors' => true, 'message' => $phrase, 'captcha' => $isCaptchaRequired]);
+ return $resultJson->setData(['errors' => true, 'message' => $phrase]);
}
}
diff --git a/app/code/Magento/Captcha/Model/DefaultModel.php b/app/code/Magento/Captcha/Model/DefaultModel.php
index cf6690df5c85d..483f9c3fb4d20 100644
--- a/app/code/Magento/Captcha/Model/DefaultModel.php
+++ b/app/code/Magento/Captcha/Model/DefaultModel.php
@@ -78,6 +78,11 @@ class DefaultModel extends \Zend\Captcha\Image implements \Magento\Captcha\Model
*/
protected $session;
+ /**
+ * @var string
+ */
+ private $words;
+
/**
* @param \Magento\Framework\Session\SessionManagerInterface $session
* @param \Magento\Captcha\Helper\Data $captchaData
@@ -311,18 +316,18 @@ public function getImgUrl()
*/
public function isCorrect($word)
{
- $storedWord = $this->getWord();
+ $storedWords = $this->getWords();
$this->clearWord();
- if (!$word || !$storedWord) {
+ if (!$word || !$storedWords) {
return false;
}
if (!$this->isCaseSensitive()) {
- $storedWord = strtolower($storedWord);
+ $storedWords = strtolower($storedWords);
$word = strtolower($word);
}
- return $word === $storedWord;
+ return in_array($word, explode(',', $storedWords));
}
/**
@@ -481,7 +486,7 @@ private function getTargetForms()
/**
* Get captcha word
*
- * @return string
+ * @return string|null
*/
public function getWord()
{
@@ -489,6 +494,17 @@ public function getWord()
return time() < $sessionData['expires'] ? $sessionData['data'] : null;
}
+ /**
+ * Get captcha words
+ *
+ * @return string|null
+ */
+ private function getWords()
+ {
+ $sessionData = $this->session->getData($this->getFormIdKey(self::SESSION_WORD));
+ return time() < $sessionData['expires'] ? $sessionData['words'] : null;
+ }
+
/**
* Set captcha word
*
@@ -498,9 +514,10 @@ public function getWord()
*/
protected function setWord($word)
{
+ $this->words = $this->words ? $this->words . ',' . $word : $word;
$this->session->setData(
$this->getFormIdKey(self::SESSION_WORD),
- ['data' => $word, 'expires' => time() + $this->getTimeout()]
+ ['data' => $word, 'words' => $this->words, 'expires' => time() + $this->getTimeout()]
);
$this->word = $word;
return $this;
diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
new file mode 100644
index 0000000000000..7a0557c4a2744
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest.xml
index 8f764899706ac..a088266f760a5 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest.xml
@@ -64,6 +64,52 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Unit/Model/Checkout/ConfigProviderTest.php b/app/code/Magento/Captcha/Test/Unit/Model/Checkout/ConfigProviderTest.php
index 655fcd6118e25..8764dbd4cec11 100644
--- a/app/code/Magento/Captcha/Test/Unit/Model/Checkout/ConfigProviderTest.php
+++ b/app/code/Magento/Captcha/Test/Unit/Model/Checkout/ConfigProviderTest.php
@@ -77,6 +77,7 @@ public function testGetConfig($isRequired, $captchaGenerations, $expectedConfig)
->will($this->returnValue('https://magento.com/captcha'));
$config = $this->model->getConfig();
+ unset($config['captcha'][$this->formId]['timestamp']);
$this->assertEquals($config, $expectedConfig);
}
diff --git a/app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php b/app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php
index 0764ea36897d1..ec2a49f3fc566 100644
--- a/app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php
+++ b/app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php
@@ -158,7 +158,7 @@ public function testAroundExecuteIncorrectCaptcha()
$this->resultJsonMock
->expects($this->once())
->method('setData')
- ->with(['errors' => true, 'message' => __('Incorrect CAPTCHA'), 'captcha' => true])
+ ->with(['errors' => true, 'message' => __('Incorrect CAPTCHA')])
->will($this->returnSelf());
$closure = function () {
diff --git a/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php b/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php
index 1edbcc029e4ce..eef75d2c01ec7 100644
--- a/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php
+++ b/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php
@@ -183,7 +183,13 @@ public function testIsCorrect()
{
self::$_defaultConfig['case_sensitive'] = '1';
$this->assertFalse($this->_object->isCorrect('abcdef5'));
- $sessionData = ['user_create_word' => ['data' => 'AbCdEf5', 'expires' => time() + self::EXPIRE_FRAME]];
+ $sessionData = [
+ 'user_create_word' => [
+ 'data' => 'AbCdEf5',
+ 'words' => 'AbCdEf5',
+ 'expires' => time() + self::EXPIRE_FRAME
+ ]
+ ];
$this->_object->getSession()->setData($sessionData);
self::$_defaultConfig['case_sensitive'] = '0';
$this->assertTrue($this->_object->isCorrect('abcdef5'));
@@ -224,7 +230,7 @@ public function testGetWord()
{
$this->assertEquals($this->_object->getWord(), 'AbCdEf5');
$this->_object->getSession()->setData(
- ['user_create_word' => ['data' => 'AbCdEf5', 'expires' => time() - 360]]
+ ['user_create_word' => ['data' => 'AbCdEf5', 'words' => 'AbCdEf5','expires' => time() - 360]]
);
$this->assertNull($this->_object->getWord());
}
@@ -247,7 +253,13 @@ protected function _getSessionStub()
->getMock();
$session->expects($this->any())->method('isLoggedIn')->will($this->returnValue(false));
- $session->setData(['user_create_word' => ['data' => 'AbCdEf5', 'expires' => time() + self::EXPIRE_FRAME]]);
+ $session->setData([
+ 'user_create_word' => [
+ 'data' => 'AbCdEf5',
+ 'words' => 'AbCdEf5',
+ 'expires' => time() + self::EXPIRE_FRAME
+ ]
+ ]);
return $session;
}
diff --git a/app/code/Magento/Captcha/etc/db_schema.xml b/app/code/Magento/Captcha/etc/db_schema.xml
index b8987363569ca..158e2f43b9f5d 100644
--- a/app/code/Magento/Captcha/etc/db_schema.xml
+++ b/app/code/Magento/Captcha/etc/db_schema.xml
@@ -9,7 +9,7 @@
xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+
+
+ - user_login
+
+
+
+
+
+
+ - Magento\Captcha\CustomerData\Captcha
+
+
+
diff --git a/app/code/Magento/Captcha/etc/frontend/sections.xml b/app/code/Magento/Captcha/etc/frontend/sections.xml
new file mode 100644
index 0000000000000..7f2070e10c8a9
--- /dev/null
+++ b/app/code/Magento/Captcha/etc/frontend/sections.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/view/frontend/requirejs-config.js b/app/code/Magento/Captcha/view/frontend/requirejs-config.js
index 0f3394e41e7c2..42c80632d3e92 100644
--- a/app/code/Magento/Captcha/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Captcha/view/frontend/requirejs-config.js
@@ -6,7 +6,8 @@
var config = {
map: {
'*': {
- captcha: 'Magento_Captcha/js/captcha'
+ captcha: 'Magento_Captcha/js/captcha',
+ 'Magento_Captcha/captcha': 'Magento_Captcha/js/captcha'
}
}
};
diff --git a/app/code/Magento/Captcha/view/frontend/web/js/model/captcha.js b/app/code/Magento/Captcha/view/frontend/web/js/model/captcha.js
index 52968e507e6bf..e79cfb35ee08d 100644
--- a/app/code/Magento/Captcha/view/frontend/web/js/model/captcha.js
+++ b/app/code/Magento/Captcha/view/frontend/web/js/model/captcha.js
@@ -22,6 +22,7 @@ define([
imageHeight: captchaData.imageHeight,
refreshUrl: captchaData.refreshUrl,
isLoading: ko.observable(false),
+ timestamp: null,
/**
* @return {String}
diff --git a/app/code/Magento/Captcha/view/frontend/web/js/view/checkout/defaultCaptcha.js b/app/code/Magento/Captcha/view/frontend/web/js/view/checkout/defaultCaptcha.js
index f78b848312702..d79c42a711565 100644
--- a/app/code/Magento/Captcha/view/frontend/web/js/view/checkout/defaultCaptcha.js
+++ b/app/code/Magento/Captcha/view/frontend/web/js/view/checkout/defaultCaptcha.js
@@ -7,8 +7,10 @@ define([
'jquery',
'uiComponent',
'Magento_Captcha/js/model/captcha',
- 'Magento_Captcha/js/model/captchaList'
-], function ($, Component, Captcha, captchaList) {
+ 'Magento_Captcha/js/model/captchaList',
+ 'Magento_Customer/js/customer-data',
+ 'underscore'
+], function ($, Component, Captcha, captchaList, customerData, _) {
'use strict';
var captchaConfig;
@@ -34,12 +36,49 @@ define([
if (window[this.configSource] && window[this.configSource].captcha) {
captchaConfig = window[this.configSource].captcha;
$.each(captchaConfig, function (formId, captchaData) {
+ var captcha;
+
captchaData.formId = formId;
- captchaList.add(Captcha(captchaData));
- });
+ captcha = Captcha(captchaData);
+ this.checkCustomerData(formId, customerData.get('captcha')(), captcha);
+ this.subscribeCustomerData(formId, captcha);
+ captchaList.add(captcha);
+ }.bind(this));
+ }
+ },
+
+ /**
+ * Check customer data for captcha configuration.
+ *
+ * @param {String} formId
+ * @param {Object} captchaData
+ * @param {Object} captcha
+ */
+ checkCustomerData: function (formId, captchaData, captcha) {
+ if (!_.isEmpty(captchaData) &&
+ !_.isEmpty(captchaData)[formId] &&
+ captchaData[formId].timestamp > captcha.timestamp
+ ) {
+ if (!captcha.isRequired() && captchaData[formId].isRequired) {
+ captcha.refresh();
+ }
+ captcha.isRequired(captchaData[formId].isRequired);
+ captcha.timestamp = captchaData[formId].timestamp;
}
},
+ /**
+ * Subscribe for customer data updates.
+ *
+ * @param {String} formId
+ * @param {Object} captcha
+ */
+ subscribeCustomerData: function (formId, captcha) {
+ customerData.get('captcha').subscribe(function (captchaData) {
+ this.checkCustomerData(formId, captchaData, captcha);
+ }.bind(this));
+ },
+
/**
* @return {Boolean}
*/
@@ -90,6 +129,8 @@ define([
},
/**
+ * Set isRequired on current captcha model.
+ *
* @param {Boolean} flag
*/
setIsRequired: function (flag) {
diff --git a/app/code/Magento/Captcha/view/frontend/web/js/view/checkout/loginCaptcha.js b/app/code/Magento/Captcha/view/frontend/web/js/view/checkout/loginCaptcha.js
index a8efd0865bbb8..49528f6ce8501 100644
--- a/app/code/Magento/Captcha/view/frontend/web/js/view/checkout/loginCaptcha.js
+++ b/app/code/Magento/Captcha/view/frontend/web/js/view/checkout/loginCaptcha.js
@@ -4,44 +4,36 @@
*/
define([
- 'underscore',
- 'Magento_Captcha/js/view/checkout/defaultCaptcha',
- 'Magento_Captcha/js/model/captchaList',
- 'Magento_Customer/js/action/login'
- ],
- function (_, defaultCaptcha, captchaList, loginAction) {
- 'use strict';
-
- return defaultCaptcha.extend({
- /** @inheritdoc */
- initialize: function () {
- var self = this,
- currentCaptcha;
-
- this._super();
- currentCaptcha = captchaList.getCaptchaByFormId(this.formId);
-
- if (currentCaptcha != null) {
- currentCaptcha.setIsVisible(true);
- this.setCurrentCaptcha(currentCaptcha);
-
- loginAction.registerLoginCallback(function (loginData, response) {
- if (!loginData['captcha_form_id'] || loginData['captcha_form_id'] !== self.formId) {
- return;
- }
-
- if (_.isUndefined(response) || !response.errors) {
- return;
- }
-
- // check if captcha should be required after login attempt
- if (!self.isRequired() && response.captcha && self.isRequired() !== response.captcha) {
- self.setIsRequired(response.captcha);
- }
-
- self.refresh();
- });
- }
+ 'Magento_Captcha/js/view/checkout/defaultCaptcha',
+ 'Magento_Captcha/js/model/captchaList',
+ 'Magento_Customer/js/action/login',
+ 'underscore'
+],
+function (defaultCaptcha, captchaList, loginAction, _) {
+ 'use strict';
+
+ return defaultCaptcha.extend({
+ /** @inheritdoc */
+ initialize: function () {
+ var self = this,
+ currentCaptcha;
+
+ this._super();
+ currentCaptcha = captchaList.getCaptchaByFormId(this.formId);
+
+ if (currentCaptcha != null) {
+ currentCaptcha.setIsVisible(true);
+ this.setCurrentCaptcha(currentCaptcha);
+
+ loginAction.registerLoginCallback(function (loginData) {
+ if (loginData['captcha_form_id'] &&
+ loginData['captcha_form_id'] === self.formId &&
+ self.isRequired()
+ ) {
+ _.defer(self.refresh.bind(self));
+ }
+ });
}
- });
+ }
});
+});
diff --git a/app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html b/app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html
index 8923c81bf4bb3..3f48ec330c0a4 100644
--- a/app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html
+++ b/app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html
@@ -4,14 +4,12 @@
* See COPYING.txt for license details.
*/
-->
-
-
+
diff --git a/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php b/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php
index 30ac06107ba1d..34656d522a72c 100644
--- a/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php
+++ b/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php
@@ -32,18 +32,20 @@ public function save(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $pro
*
* @throws \Magento\Framework\Exception\CouldNotSaveException
* @throws \Magento\Framework\Exception\StateException
+ * @throws \Magento\Framework\Exception\InputException
*/
public function delete(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $productLink);
/**
* Remove the product assignment from the category by category id and sku
*
- * @param string $sku
+ * @param string $categoryId
* @param string $sku
* @return bool will returned True if products successfully deleted
*
* @throws \Magento\Framework\Exception\CouldNotSaveException
* @throws \Magento\Framework\Exception\StateException
+ * @throws \Magento\Framework\Exception\InputException
*/
public function deleteByIds($categoryId, $sku);
}
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
index 1b188de40710f..3b9036c1fbbc0 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
@@ -6,13 +6,13 @@
namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set;
/**
- * Adminhtml Catalog Attribute Set Main Block
- *
* @author Magento Core Team
*/
use Magento\Catalog\Model\Entity\Product\Attribute\Group\AttributeMapperInterface;
/**
+ * Adminhtml Catalog Attribute Set Main Block.
+ *
* @api
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @since 100.0.2
@@ -140,7 +140,7 @@ protected function _prepareLayout()
) . '\', \'' . $this->getUrl(
'catalog/*/delete',
['id' => $setId]
- ) . '\')',
+ ) . '\',{data: {}})',
'class' => 'delete'
]
);
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
index e4f700e5790a2..e5ce59c550af1 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
@@ -10,9 +10,13 @@
use Magento\Catalog\Model\Product;
/**
+ * Crossel product edit tab
+ *
* @api
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @since 100.0.2
+ * @deprecated Not used since cross-sell products grid moved to UI components.
+ * @see \Magento\Catalog\Ui\DataProvider\Product\Related\CrossSellDataProvider
*/
class Crosssell extends Extended
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
index 0c59a7402dac1..c8153df41430e 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
@@ -9,8 +9,12 @@
use Magento\Backend\Block\Widget\Grid\Extended;
/**
+ * Related product edit tab
+ *
* @api
* @since 100.0.2
+ * @deprecated Not used since related products grid moved to UI components.
+ * @see \Magento\Catalog\Ui\DataProvider\Product\Related\RelatedDataProvider
*/
class Related extends Extended
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
index 323b1785bc96e..41ad72ca39e53 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
@@ -6,8 +6,12 @@
namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab;
/**
+ * Upsell product edit tab
+ *
* @api
* @since 100.0.2
+ * @deprecated Not used since upsell products grid moved to UI components.
+ * @see \Magento\Catalog\Ui\DataProvider\Product\Related\CrossSellDataProvider
*/
class Upsell extends \Magento\Backend\Block\Widget\Grid\Extended
{
diff --git a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php
index 4102c82a0a316..c8da0f70f73b6 100644
--- a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php
+++ b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php
@@ -125,6 +125,7 @@ public function __construct(\Magento\Catalog\Block\Product\Context $context, arr
/**
* Retrieve url for add product to cart
+ *
* Will return product view page URL if product has required options
*
* @param \Magento\Catalog\Model\Product $product
@@ -473,7 +474,9 @@ public function getProductDetailsHtml(\Magento\Catalog\Model\Product $product)
}
/**
- * @param null $type
+ * Get the renderer that will be used to render the details block
+ *
+ * @param string|null $type
* @return bool|\Magento\Framework\View\Element\AbstractBlock
*/
public function getDetailsRenderer($type = null)
@@ -489,6 +492,8 @@ public function getDetailsRenderer($type = null)
}
/**
+ * Return the list of details
+ *
* @return \Magento\Framework\View\Element\RendererList
*/
protected function getDetailsRendererList()
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php
index 5089b37f90c58..a5be6223bee75 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php
@@ -8,6 +8,9 @@
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+/**
+ * Controller for category listing
+ */
class Index extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpGetActionInterface
{
/**
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php
index bbef1de28e5b6..09eacbbf0731c 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php
@@ -6,8 +6,10 @@
namespace Magento\Catalog\Controller\Adminhtml\Product;
+use Magento\Backend\App\Action\Context;
use Magento\Catalog\Api\AttributeSetRepositoryInterface;
use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Controller\Adminhtml\Product;
use Magento\Eav\Api\AttributeGroupRepositoryInterface;
use Magento\Eav\Api\AttributeManagementInterface;
use Magento\Eav\Api\AttributeRepositoryInterface;
@@ -16,8 +18,14 @@
use Magento\Eav\Api\Data\AttributeInterface;
use Magento\Eav\Api\Data\AttributeSetInterface;
use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\DataObject;
use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\App\ObjectManager;
use Psr\Log\LoggerInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Framework\Api\ExtensionAttributesFactory;
/**
@@ -25,10 +33,10 @@
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
-class AddAttributeToTemplate extends \Magento\Catalog\Controller\Adminhtml\Product
+class AddAttributeToTemplate extends Product implements HttpPostActionInterface
{
/**
- * @var \Magento\Framework\Controller\Result\JsonFactory
+ * @var JsonFactory
*/
protected $resultJsonFactory;
@@ -75,33 +83,34 @@ class AddAttributeToTemplate extends \Magento\Catalog\Controller\Adminhtml\Produ
/**
* Constructor
*
- * @param \Magento\Backend\App\Action\Context $context
+ * @param Context $context
* @param Builder $productBuilder
- * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
- * @param \Magento\Eav\Api\Data\AttributeGroupInterfaceFactory|null $attributeGroupFactory
+ * @param JsonFactory $resultJsonFactory
+ * @param AttributeGroupInterfaceFactory|null $attributeGroupFactory
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
+ * @SuppressWarnings(PHPMD.LongVariable)
*/
public function __construct(
- \Magento\Backend\App\Action\Context $context,
- \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder,
- \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
- \Magento\Eav\Api\Data\AttributeGroupInterfaceFactory $attributeGroupFactory = null
+ Context $context,
+ Builder $productBuilder,
+ JsonFactory $resultJsonFactory,
+ AttributeGroupInterfaceFactory $attributeGroupFactory = null
) {
parent::__construct($context, $productBuilder);
$this->resultJsonFactory = $resultJsonFactory;
- $this->attributeGroupFactory = $attributeGroupFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
- ->get(\Magento\Eav\Api\Data\AttributeGroupInterfaceFactory::class);
+ $this->attributeGroupFactory = $attributeGroupFactory ?: ObjectManager::getInstance()
+ ->get(AttributeGroupInterfaceFactory::class);
}
/**
* Add attribute to attribute set
*
- * @return \Magento\Framework\Controller\Result\Json
+ * @return Json
*/
public function execute()
{
$request = $this->getRequest();
- $response = new \Magento\Framework\DataObject();
+ $response = new DataObject();
$response->setError(false);
try {
@@ -124,12 +133,12 @@ public function execute()
->getItems();
if (!$attributeGroupItems) {
- throw new \Magento\Framework\Exception\NoSuchEntityException;
+ throw new NoSuchEntityException;
}
/** @var AttributeGroupInterface $attributeGroup */
$attributeGroup = reset($attributeGroupItems);
- } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+ } catch (NoSuchEntityException $e) {
/** @var AttributeGroupInterface $attributeGroup */
$attributeGroup = $this->attributeGroupFactory->create();
}
@@ -176,101 +185,114 @@ public function execute()
* Adding basic filters
*
* @return SearchCriteriaBuilder
- * @throws \Magento\Framework\Exception\LocalizedException
+ * @throws LocalizedException
*/
private function getBasicAttributeSearchCriteriaBuilder()
{
- $attributeIds = (array)$this->getRequest()->getParam('attributeIds', []);
+ $attributeIds = (array) $this->getRequest()->getParam('attributeIds', []);
if (empty($attributeIds['selected'])) {
throw new LocalizedException(__('Attributes were missing and must be specified.'));
}
return $this->getSearchCriteriaBuilder()
- ->addFilter('attribute_set_id', new \Zend_Db_Expr('null'), 'is')
->addFilter('attribute_id', [$attributeIds['selected']], 'in');
}
/**
+ * Get AttributeRepositoryInterface
+ *
* @return AttributeRepositoryInterface
*/
private function getAttributeRepository()
{
if (null === $this->attributeRepository) {
- $this->attributeRepository = \Magento\Framework\App\ObjectManager::getInstance()
- ->get(\Magento\Eav\Api\AttributeRepositoryInterface::class);
+ $this->attributeRepository = ObjectManager::getInstance()
+ ->get(AttributeRepositoryInterface::class);
}
return $this->attributeRepository;
}
/**
+ * Get AttributeSetRepositoryInterface
+ *
* @return AttributeSetRepositoryInterface
*/
private function getAttributeSetRepository()
{
if (null === $this->attributeSetRepository) {
- $this->attributeSetRepository = \Magento\Framework\App\ObjectManager::getInstance()
- ->get(\Magento\Catalog\Api\AttributeSetRepositoryInterface::class);
+ $this->attributeSetRepository = ObjectManager::getInstance()
+ ->get(AttributeSetRepositoryInterface::class);
}
return $this->attributeSetRepository;
}
/**
+ * Get AttributeGroupInterface
+ *
* @return AttributeGroupRepositoryInterface
*/
private function getAttributeGroupRepository()
{
if (null === $this->attributeGroupRepository) {
- $this->attributeGroupRepository = \Magento\Framework\App\ObjectManager::getInstance()
- ->get(\Magento\Eav\Api\AttributeGroupRepositoryInterface::class);
+ $this->attributeGroupRepository = ObjectManager::getInstance()
+ ->get(AttributeGroupRepositoryInterface::class);
}
return $this->attributeGroupRepository;
}
/**
+ * Get SearchCriteriaBuilder
+ *
* @return SearchCriteriaBuilder
*/
private function getSearchCriteriaBuilder()
{
if (null === $this->searchCriteriaBuilder) {
- $this->searchCriteriaBuilder = \Magento\Framework\App\ObjectManager::getInstance()
- ->get(\Magento\Framework\Api\SearchCriteriaBuilder::class);
+ $this->searchCriteriaBuilder = ObjectManager::getInstance()
+ ->get(SearchCriteriaBuilder::class);
}
return $this->searchCriteriaBuilder;
}
/**
+ * Get AttributeManagementInterface
+ *
* @return AttributeManagementInterface
*/
private function getAttributeManagement()
{
if (null === $this->attributeManagement) {
- $this->attributeManagement = \Magento\Framework\App\ObjectManager::getInstance()
- ->get(\Magento\Eav\Api\AttributeManagementInterface::class);
+ $this->attributeManagement = ObjectManager::getInstance()
+ ->get(AttributeManagementInterface::class);
}
return $this->attributeManagement;
}
/**
+ * Get LoggerInterface
+ *
* @return LoggerInterface
*/
private function getLogger()
{
if (null === $this->logger) {
- $this->logger = \Magento\Framework\App\ObjectManager::getInstance()
- ->get(\Psr\Log\LoggerInterface::class);
+ $this->logger = ObjectManager::getInstance()
+ ->get(LoggerInterface::class);
}
return $this->logger;
}
/**
+ * Get ExtensionAttributesFactory.
+ *
* @return ExtensionAttributesFactory
*/
private function getExtensionAttributesFactory()
{
if (null === $this->extensionAttributesFactory) {
- $this->extensionAttributesFactory = \Magento\Framework\App\ObjectManager::getInstance()
- ->get(\Magento\Framework\Api\ExtensionAttributesFactory::class);
+ $this->extensionAttributesFactory = ObjectManager::getInstance()
+ ->get(ExtensionAttributesFactory::class);
}
return $this->extensionAttributesFactory;
}
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 49e601357c605..39ed11b1806cd 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
@@ -197,12 +197,12 @@ public function execute()
$attributeCode = $attributeCode ?: $this->generateCode($this->getRequest()->getParam('frontend_label')[0]);
if (strlen($attributeCode) > 0) {
$validatorAttrCode = new \Zend_Validate_Regex(
- ['pattern' => '/^[a-z\x{600}-\x{6FF}][a-z\x{600}-\x{6FF}_0-9]{0,30}$/u']
+ ['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), ' .
+ '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
)
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 8a9d0c9b612cb..381ca5d08d82a 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
@@ -105,7 +105,7 @@ public function execute()
$attributeCode
);
- if ($attribute->getId() && !$attributeId) {
+ if ($attribute->getId() && !$attributeId || $attributeCode === 'product_type') {
$message = strlen($this->getRequest()->getParam('attribute_code'))
? __('An attribute with this code already exists.')
: __('An attribute with the same code (%1) already exists.', $attributeCode);
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Crosssell.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Crosssell.php
index fa94a2fb7be2c..e51d3ffe94ae2 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Crosssell.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Crosssell.php
@@ -6,7 +6,17 @@
*/
namespace Magento\Catalog\Controller\Adminhtml\Product;
-class Crosssell extends \Magento\Catalog\Controller\Adminhtml\Product
+use Magento\Catalog\Controller\Adminhtml\Product;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class Crosssell
+ *
+ * @package Magento\Catalog\Controller\Adminhtml\Product
+ * @deprecated Not used since cross-sell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
+ */
+class Crosssell extends Product implements HttpPostActionInterface
{
/**
* @var \Magento\Framework\View\Result\LayoutFactory
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/CrosssellGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/CrosssellGrid.php
index daaf2c21ee2b9..5039d0c052b5d 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/CrosssellGrid.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/CrosssellGrid.php
@@ -6,7 +6,17 @@
*/
namespace Magento\Catalog\Controller\Adminhtml\Product;
-class CrosssellGrid extends \Magento\Catalog\Controller\Adminhtml\Product
+use Magento\Catalog\Controller\Adminhtml\Product;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class CrosssellGrid
+ *
+ * @package Magento\Catalog\Controller\Adminhtml\Product
+ * @deprecated Not used since cross-sell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
+ */
+class CrosssellGrid extends Product implements HttpPostActionInterface
{
/**
* @var \Magento\Framework\View\Result\LayoutFactory
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Related.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Related.php
index 4bc15d14a29b1..f54f8d469c3e8 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Related.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Related.php
@@ -7,7 +7,17 @@
*/
namespace Magento\Catalog\Controller\Adminhtml\Product;
-class Related extends \Magento\Catalog\Controller\Adminhtml\Product
+use Magento\Catalog\Controller\Adminhtml\Product;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class Related
+ *
+ * @package Magento\Catalog\Controller\Adminhtml\Product
+ * @deprecated Not used since related products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
+ */
+class Related extends Product implements HttpPostActionInterface
{
/**
* @var \Magento\Framework\View\Result\LayoutFactory
@@ -29,6 +39,8 @@ public function __construct(
}
/**
+ * Execute
+ *
* @return \Magento\Framework\View\Result\Layout
*/
public function execute()
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/RelatedGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/RelatedGrid.php
index b2fc7ebe1eb31..b1092bba0d369 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/RelatedGrid.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/RelatedGrid.php
@@ -7,6 +7,15 @@
*/
namespace Magento\Catalog\Controller\Adminhtml\Product;
-class RelatedGrid extends Related
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class RelatedGrid
+ *
+ * @package Magento\Catalog\Controller\Adminhtml\Product
+ * @deprecated Not used since related products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
+ */
+class RelatedGrid extends Related implements HttpPostActionInterface
{
}
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Upsell.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Upsell.php
index 614bddd0ebc87..1cec8e8678797 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Upsell.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Upsell.php
@@ -6,7 +6,17 @@
*/
namespace Magento\Catalog\Controller\Adminhtml\Product;
-class Upsell extends \Magento\Catalog\Controller\Adminhtml\Product
+use Magento\Catalog\Controller\Adminhtml\Product;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class Upsell
+ *
+ * @package Magento\Catalog\Controller\Adminhtml\Product
+ * @deprecated Not used since upsell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
+ */
+class Upsell extends Product implements HttpPostActionInterface
{
/**
* @var \Magento\Framework\View\Result\LayoutFactory
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/UpsellGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/UpsellGrid.php
index 50beb588b15df..581531e7c93fb 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/UpsellGrid.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/UpsellGrid.php
@@ -6,7 +6,17 @@
*/
namespace Magento\Catalog\Controller\Adminhtml\Product;
-class UpsellGrid extends \Magento\Catalog\Controller\Adminhtml\Product
+use Magento\Catalog\Controller\Adminhtml\Product;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class UpsellGrid
+ *
+ * @package Magento\Catalog\Controller\Adminhtml\Product
+ * @deprecated Not used since upsell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
+ */
+class UpsellGrid extends Product implements HttpPostActionInterface
{
/**
* @var \Magento\Framework\View\Result\LayoutFactory
diff --git a/app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php b/app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php
index 7cc3eb9e3d2da..25f6d0c323687 100644
--- a/app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php
+++ b/app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php
@@ -12,6 +12,8 @@
use Magento\Store\Model\Store;
/**
+ * Cron job for removing outdated prices.
+ *
* Cron operation is responsible for deleting all product prices on WEBSITE level
* in case 'Catalog Price Scope' configuration parameter is set to GLOBAL.
*/
@@ -76,7 +78,7 @@ public function execute()
/**
* Checks if price scope config option explicitly equal to global value.
*
- * Such strict comparision is required to prevent price deleting when
+ * Such strict comparison is required to prevent price deleting when
* price scope config option is null for some reason.
*
* @return bool
diff --git a/app/code/Magento/Catalog/Helper/Product/Compare.php b/app/code/Magento/Catalog/Helper/Product/Compare.php
index 90d98874e00cb..d6d35c5c76dd8 100644
--- a/app/code/Magento/Catalog/Helper/Product/Compare.php
+++ b/app/code/Magento/Catalog/Helper/Product/Compare.php
@@ -166,7 +166,15 @@ public function getListUrl()
*/
public function getPostDataParams($product)
{
- return $this->postHelper->getPostData($this->getAddUrl(), ['product' => $product->getId()]);
+ $params = ['product' => $product->getId()];
+ $requestingPageUrl = $this->_getRequest()->getParam('requesting_page_url');
+
+ if (!empty($requestingPageUrl)) {
+ $encodedUrl = $this->urlEncoder->encode($requestingPageUrl);
+ $params[\Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED] = $encodedUrl;
+ }
+
+ return $this->postHelper->getPostData($this->getAddUrl(), $params);
}
/**
diff --git a/app/code/Magento/Catalog/Model/Category/Link/SaveHandler.php b/app/code/Magento/Catalog/Model/Category/Link/SaveHandler.php
index f22c6903a230c..4ea06d4e34d71 100644
--- a/app/code/Magento/Catalog/Model/Category/Link/SaveHandler.php
+++ b/app/code/Magento/Catalog/Model/Category/Link/SaveHandler.php
@@ -6,7 +6,6 @@
namespace Magento\Catalog\Model\Category\Link;
use Magento\Catalog\Api\Data\CategoryLinkInterface;
-use Magento\Catalog\Model\Indexer\Product\Category;
use Magento\Framework\EntityManager\Operation\ExtensionInterface;
/**
@@ -40,6 +39,8 @@ public function __construct(
}
/**
+ * Execute
+ *
* @param object $entity
* @param array $arguments
* @return object
@@ -78,6 +79,8 @@ public function execute($entity, $arguments = [])
}
/**
+ * Get category links positions
+ *
* @param object $entity
* @return array
*/
@@ -106,27 +109,19 @@ private function getCategoryLinksPositions($entity)
*/
private function mergeCategoryLinks($newCategoryPositions, $oldCategoryPositions)
{
- $result = [];
if (empty($newCategoryPositions)) {
- return $result;
+ return [];
}
+ $categoryPositions = array_combine(array_column($oldCategoryPositions, 'category_id'), $oldCategoryPositions);
foreach ($newCategoryPositions as $newCategoryPosition) {
- $key = array_search(
- $newCategoryPosition['category_id'],
- array_column($oldCategoryPositions, 'category_id')
- );
-
- if ($key === false) {
- $result[] = $newCategoryPosition;
- } elseif (isset($oldCategoryPositions[$key])
- && $oldCategoryPositions[$key]['position'] != $newCategoryPosition['position']
- ) {
- $result[] = $newCategoryPositions[$key];
- unset($oldCategoryPositions[$key]);
+ $categoryId = $newCategoryPosition['category_id'];
+ if (!isset($categoryPositions[$categoryId])) {
+ $categoryPositions[$categoryId] = ['category_id' => $categoryId];
}
+ $categoryPositions[$categoryId]['position'] = $newCategoryPosition['position'];
}
- $result = array_merge($result, $oldCategoryPositions);
+ $result = array_values($categoryPositions);
return $result;
}
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
index 6762602aecaf1..ad734b96d59d7 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
@@ -118,9 +118,10 @@ public function removeDisabledProducts(array &$ids, $storeId)
private function getSelectForProducts(array $ids)
{
$productTable = $this->productIndexerHelper->getTable('catalog_product_entity');
- $select = $this->connection->select()->from($productTable)
+ $select = $this->connection->select()
+ ->from(['product_table' => $productTable])
->columns('entity_id')
- ->where('entity_id IN(?)', $ids);
+ ->where('product_table.entity_id IN(?)', $ids);
return $select;
}
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
index 466ba746fa108..a669fb73f64fc 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
@@ -9,6 +9,7 @@
use Magento\Catalog\Api\Data\ProductInterface;
use Magento\Framework\App\ResourceConnection;
use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Store\Model\Store;
/**
* Class Indexer
@@ -84,7 +85,7 @@ public function write($storeId, $productId, $valueFieldSuffix = '')
[
'entity_id' => 'e.entity_id',
'attribute_id' => 't.attribute_id',
- 'value' => $this->_connection->getIfNullSql('`t2`.`value`', '`t`.`value`'),
+ 'value' => 't.value'
]
);
@@ -99,32 +100,30 @@ public function write($storeId, $productId, $valueFieldSuffix = '')
sprintf('e.%s = t.%s ', $linkField, $linkField) . $this->_connection->quoteInto(
' AND t.attribute_id IN (?)',
array_keys($ids)
- ) . ' AND t.store_id = 0',
- []
- )->joinLeft(
- ['t2' => $tableName],
- sprintf('t.%s = t2.%s ', $linkField, $linkField) .
- ' AND t.attribute_id = t2.attribute_id ' .
- $this->_connection->quoteInto(
- ' AND t2.store_id = ?',
- $storeId
- ),
+ ) . ' AND ' . $this->_connection->quoteInto('t.store_id IN(?)', [
+ Store::DEFAULT_STORE_ID,
+ $storeId
+ ]),
[]
)->where(
'e.entity_id = ' . $productId
- );
+ )->order('t.store_id ASC');
$cursor = $this->_connection->query($select);
while ($row = $cursor->fetch(\Zend_Db::FETCH_ASSOC)) {
$updateData[$ids[$row['attribute_id']]] = $row['value'];
$valueColumnName = $ids[$row['attribute_id']] . $valueFieldSuffix;
if (isset($describe[$valueColumnName])) {
- $valueColumns[$row['value']] = $valueColumnName;
+ $valueColumns[$row['attribute_id']] = [
+ 'value' => $row['value'],
+ 'column_name' => $valueColumnName
+ ];
}
}
//Update not simple attributes (eg. dropdown)
if (!empty($valueColumns)) {
- $valueIds = array_keys($valueColumns);
+ $valueIds = array_column($valueColumns, 'value');
+ $optionIdToAttributeName = array_column($valueColumns, 'column_name', 'value');
$select = $this->_connection->select()->from(
['t' => $this->_productIndexerHelper->getTable('eav_attribute_option_value')],
@@ -133,14 +132,14 @@ public function write($storeId, $productId, $valueFieldSuffix = '')
$this->_connection->quoteInto('t.option_id IN (?)', $valueIds)
)->where(
$this->_connection->quoteInto('t.store_id IN(?)', [
- \Magento\Store\Model\Store::DEFAULT_STORE_ID,
+ Store::DEFAULT_STORE_ID,
$storeId
])
)
->order('t.store_id ASC');
$cursor = $this->_connection->query($select);
while ($row = $cursor->fetch(\Zend_Db::FETCH_ASSOC)) {
- $valueColumnName = $valueColumns[$row['option_id']];
+ $valueColumnName = $optionIdToAttributeName[$row['option_id']];
if (isset($describe[$valueColumnName])) {
$updateData[$valueColumnName] = $row['value'];
}
@@ -150,6 +149,7 @@ public function write($storeId, $productId, $valueFieldSuffix = '')
$columnNames = array_keys($columns);
$columnNames[] = 'attribute_set_id';
$columnNames[] = 'type_id';
+ $columnNames[] = $linkField;
$select->from(
['e' => $entityTableName],
$columnNames
@@ -159,6 +159,7 @@ public function write($storeId, $productId, $valueFieldSuffix = '')
$cursor = $this->_connection->query($select);
$row = $cursor->fetch(\Zend_Db::FETCH_ASSOC);
if (!empty($row)) {
+ $linkFieldId = $linkField;
foreach ($row as $columnName => $value) {
$updateData[$columnName] = $value;
}
@@ -170,7 +171,7 @@ public function write($storeId, $productId, $valueFieldSuffix = '')
if (!empty($updateData)) {
$updateData += ['entity_id' => $productId];
if ($linkField !== $metadata->getIdentifierField()) {
- $updateData += [$linkField => $productId];
+ $updateData += [$linkField => $linkFieldId];
}
$updateFields = [];
foreach ($updateData as $key => $value) {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
index d9bfc96b7817a..64a7c4be4e03c 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
@@ -96,15 +96,17 @@ public function execute($id = null)
/* @var $status \Magento\Eav\Model\Entity\Attribute */
$status = $this->_productIndexerHelper->getAttribute(ProductInterface::STATUS);
$statusTable = $status->getBackend()->getTable();
+ $catalogProductEntityTable = $this->_productIndexerHelper->getTable('catalog_product_entity');
$statusConditions = [
- 'store_id IN(0,' . (int)$store->getId() . ')',
- 'attribute_id = ' . (int)$status->getId(),
- $linkField . ' = ' . (int)$id,
+ 's.store_id IN(0,' . (int)$store->getId() . ')',
+ 's.attribute_id = ' . (int)$status->getId(),
+ 'e.entity_id = ' . (int)$id,
];
$select = $this->_connection->select();
- $select->from($statusTable, ['value'])
+ $select->from(['e' => $catalogProductEntityTable], ['s.value'])
->where(implode(' AND ', $statusConditions))
- ->order('store_id DESC')
+ ->joinLeft(['s' => $statusTable], "e.{$linkField} = s.{$linkField}", [])
+ ->order('s.store_id DESC')
->limit(1);
$result = $this->_connection->query($select);
$status = $result->fetchColumn(0);
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
index fbe0d4b550fa6..2252b3e3d5506 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
@@ -10,7 +10,8 @@
use Magento\Framework\EntityManager\MetadataPool;
/**
- * Class FlatTableBuilder
+ * Class for building flat index
+ *
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class FlatTableBuilder
@@ -346,12 +347,21 @@ protected function _updateTemporaryTableByStoreValues(
}
//Update not simple attributes (eg. dropdown)
- if (isset($flatColumns[$attributeCode . $valueFieldSuffix])) {
- $select = $this->_connection->select()->joinInner(
- ['t' => $this->_productIndexerHelper->getTable('eav_attribute_option_value')],
- 't.option_id = et.' . $attributeCode . ' AND t.store_id=' . $storeId,
- [$attributeCode . $valueFieldSuffix => 't.value']
- );
+ $columnName = $attributeCode . $valueFieldSuffix;
+ if (isset($flatColumns[$columnName])) {
+ $columnValue = $this->_connection->getIfNullSql('ts.value', 't0.value');
+ $select = $this->_connection->select();
+ $select->joinLeft(
+ ['t0' => $this->_productIndexerHelper->getTable('eav_attribute_option_value')],
+ 't0.option_id = et.' . $attributeCode . ' AND t0.store_id = 0',
+ []
+ )->joinLeft(
+ ['ts' => $this->_productIndexerHelper->getTable('eav_attribute_option_value')],
+ 'ts.option_id = et.' . $attributeCode . ' AND ts.store_id = ' . $storeId,
+ []
+ )->columns(
+ [$columnName => $columnValue]
+ )->where($columnValue . ' IS NOT NULL');
if (!empty($changedIds)) {
$select->where($this->_connection->quoteInto('et.entity_id IN (?)', $changedIds));
}
@@ -374,6 +384,8 @@ protected function _getTemporaryTableName($tableName)
}
/**
+ * Get metadata pool
+ *
* @return \Magento\Framework\EntityManager\MetadataPool
*/
private function getMetadataPool()
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
index a32379b8c0a67..a3d958ea537e1 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
@@ -7,6 +7,9 @@
use Magento\Catalog\Model\Indexer\Product\Flat\Table\BuilderInterfaceFactory;
+/**
+ * Class TableBuilder
+ */
class TableBuilder
{
/**
@@ -137,13 +140,23 @@ protected function _createTemporaryTable($tableName, array $columns, $valueField
);
$flatColumns = $this->_productIndexerHelper->getFlatColumns();
- $temporaryTableBuilder->addColumn('entity_id', \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER);
+ $temporaryTableBuilder->addColumn(
+ 'entity_id',
+ \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+ null,
+ ['unsigned'=>true]
+ );
$temporaryTableBuilder->addColumn('type_id', \Magento\Framework\DB\Ddl\Table::TYPE_TEXT);
$temporaryTableBuilder->addColumn('attribute_set_id', \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER);
- $valueTemporaryTableBuilder->addColumn('entity_id', \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER);
+ $valueTemporaryTableBuilder->addColumn(
+ 'entity_id',
+ \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+ null,
+ ['unsigned'=>true]
+ );
/** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
foreach ($columns as $columnName => $attribute) {
@@ -198,9 +211,10 @@ protected function _getTemporaryTableName($tableName)
* Fill temporary entity table
*
* @param string $tableName
- * @param array $columns
- * @param array $changedIds
+ * @param array $columns
+ * @param array $changedIds
* @return void
+ * @throws \Exception
*/
protected function _fillTemporaryEntityTable($tableName, array $columns, array $changedIds = [])
{
@@ -244,11 +258,12 @@ protected function _addPrimaryKeyToTable($tableName, $columnName = 'entity_id')
* Fill temporary table by data from products EAV attributes by type
*
* @param string $tableName
- * @param array $tableColumns
- * @param array $changedIds
+ * @param array $tableColumns
+ * @param array $changedIds
* @param string $valueFieldSuffix
* @param int $storeId
* @return void
+ * @throws \Exception
*/
protected function _fillTemporaryTable(
$tableName,
@@ -345,6 +360,8 @@ protected function _fillTemporaryTable(
}
/**
+ * Get Metadata Pool
+ *
* @return \Magento\Framework\EntityManager\MetadataPool
* @deprecated 101.1.0
*/
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php b/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
index d21a8666ec0ac..f2e2e67f944e9 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
@@ -139,7 +139,7 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
}
/**
- * Get fiter items count
+ * Get filter items count
*
* @return int
*/
diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
index 44c5c891f4d6a..5d47e85768fad 100644
--- a/app/code/Magento/Catalog/Model/Product.php
+++ b/app/code/Magento/Catalog/Model/Product.php
@@ -727,7 +727,7 @@ public function getIdBySku($sku)
public function getCategoryId()
{
$category = $this->_registry->registry('current_category');
- if ($category) {
+ if ($category && in_array($category->getId(), $this->getCategoryIds())) {
return $category->getId();
}
return false;
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Boolean.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Boolean.php
index c2108b0273bdb..be1e523960f27 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Boolean.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Boolean.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\Attribute\Backend;
use Magento\Catalog\Model\Product\Attribute\Source\Boolean as BooleanSource;
@@ -25,7 +27,9 @@ public function beforeSave($object)
$attributeCode = $this->getAttribute()->getName();
if ($object->getData('use_config_' . $attributeCode)) {
$object->setData($attributeCode, BooleanSource::VALUE_USE_CONFIG);
+ return $this;
}
- return $this;
+
+ return parent::beforeSave($object);
}
}
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/AbstractHandler.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/AbstractHandler.php
new file mode 100644
index 0000000000000..fc0f090937db9
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/AbstractHandler.php
@@ -0,0 +1,101 @@
+groupManagement = $groupManagement;
+ }
+
+ /**
+ * Get additional tier price fields.
+ *
+ * @param array $objectArray
+ * @return array
+ */
+ protected function getAdditionalFields(array $objectArray): array
+ {
+ $percentageValue = $this->getPercentage($objectArray);
+
+ return [
+ 'value' => $percentageValue ? null : $objectArray['price'],
+ 'percentage_value' => $percentageValue ?: null,
+ ];
+ }
+
+ /**
+ * Check whether price has percentage value.
+ *
+ * @param array $priceRow
+ * @return float|null
+ */
+ protected function getPercentage(array $priceRow): ?float
+ {
+ return isset($priceRow['percentage_value']) && is_numeric($priceRow['percentage_value'])
+ ? (float)$priceRow['percentage_value']
+ : null;
+ }
+
+ /**
+ * Prepare tier price data by provided price row data.
+ *
+ * @param array $data
+ * @return array
+ * @throws \Magento\Framework\Exception\LocalizedException
+ */
+ protected function prepareTierPrice(array $data): array
+ {
+ $useForAllGroups = (int)$data['cust_group'] === $this->groupManagement->getAllCustomersGroup()->getId();
+ $customerGroupId = $useForAllGroups ? 0 : $data['cust_group'];
+ $tierPrice = array_merge(
+ $this->getAdditionalFields($data),
+ [
+ 'website_id' => $data['website_id'],
+ 'all_groups' => (int)$useForAllGroups,
+ 'customer_group_id' => $customerGroupId,
+ 'value' => $data['price'] ?? null,
+ 'qty' => $this->parseQty($data['price_qty']),
+ ]
+ );
+
+ return $tierPrice;
+ }
+
+ /**
+ * Parse quantity value into float.
+ *
+ * @param mixed $value
+ * @return float|int
+ */
+ protected function parseQty($value)
+ {
+ return $value * 1;
+ }
+}
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/SaveHandler.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/SaveHandler.php
index 248d8ed221250..9cb2ac0145898 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/SaveHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/SaveHandler.php
@@ -18,7 +18,7 @@
/**
* Process tier price data for handled new product
*/
-class SaveHandler implements ExtensionInterface
+class SaveHandler extends AbstractHandler
{
/**
* @var \Magento\Store\Model\StoreManagerInterface
@@ -30,11 +30,6 @@ class SaveHandler implements ExtensionInterface
*/
private $attributeRepository;
- /**
- * @var \Magento\Customer\Api\GroupManagementInterface
- */
- private $groupManagement;
-
/**
* @var \Magento\Framework\EntityManager\MetadataPool
*/
@@ -59,9 +54,10 @@ public function __construct(
MetadataPool $metadataPool,
Tierprice $tierPriceResource
) {
+ parent::__construct($groupManagement);
+
$this->storeManager = $storeManager;
$this->attributeRepository = $attributeRepository;
- $this->groupManagement = $groupManagement;
$this->metadataPoll = $metadataPool;
$this->tierPriceResource = $tierPriceResource;
}
@@ -72,8 +68,6 @@ public function __construct(
* @param \Magento\Catalog\Api\Data\ProductInterface|object $entity
* @param array $arguments
* @return \Magento\Catalog\Api\Data\ProductInterface|object
- * @throws \Magento\Framework\Exception\NoSuchEntityException
- * @throws \Magento\Framework\Exception\LocalizedException
* @throws \Magento\Framework\Exception\InputException
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
@@ -115,57 +109,4 @@ public function execute($entity, $arguments = [])
return $entity;
}
-
- /**
- * Get additional tier price fields
- *
- * @param array $objectArray
- * @return array
- */
- private function getAdditionalFields(array $objectArray): array
- {
- $percentageValue = $this->getPercentage($objectArray);
- return [
- 'value' => $percentageValue ? null : $objectArray['price'],
- 'percentage_value' => $percentageValue ?: null,
- ];
- }
-
- /**
- * Check whether price has percentage value.
- *
- * @param array $priceRow
- * @return int|null
- */
- private function getPercentage(array $priceRow): ?int
- {
- return isset($priceRow['percentage_value']) && is_numeric($priceRow['percentage_value'])
- ? (int)$priceRow['percentage_value']
- : null;
- }
-
- /**
- * Prepare tier price data by provided price row data
- *
- * @param array $data
- * @return array
- * @throws \Magento\Framework\Exception\LocalizedException
- */
- private function prepareTierPrice(array $data): array
- {
- $useForAllGroups = (int)$data['cust_group'] === $this->groupManagement->getAllCustomersGroup()->getId();
- $customerGroupId = $useForAllGroups ? 0 : $data['cust_group'];
- $tierPrice = array_merge(
- $this->getAdditionalFields($data),
- [
- 'website_id' => $data['website_id'],
- 'all_groups' => (int)$useForAllGroups,
- 'customer_group_id' => $customerGroupId,
- 'value' => $data['price'] ?? null,
- 'qty' => (int)$data['price_qty']
- ]
- );
-
- return $tierPrice;
- }
}
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/UpdateHandler.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/UpdateHandler.php
index aef3e87586015..663b7facf4257 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/UpdateHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/UpdateHandler.php
@@ -16,9 +16,9 @@
use Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice;
/**
- * Process tier price data for handled existing product
+ * Process tier price data for handled existing product.
*/
-class UpdateHandler implements ExtensionInterface
+class UpdateHandler extends AbstractHandler
{
/**
* @var \Magento\Store\Model\StoreManagerInterface
@@ -30,11 +30,6 @@ class UpdateHandler implements ExtensionInterface
*/
private $attributeRepository;
- /**
- * @var \Magento\Customer\Api\GroupManagementInterface
- */
- private $groupManagement;
-
/**
* @var \Magento\Framework\EntityManager\MetadataPool
*/
@@ -59,9 +54,10 @@ public function __construct(
MetadataPool $metadataPool,
Tierprice $tierPriceResource
) {
+ parent::__construct($groupManagement);
+
$this->storeManager = $storeManager;
$this->attributeRepository = $attributeRepository;
- $this->groupManagement = $groupManagement;
$this->metadataPoll = $metadataPool;
$this->tierPriceResource = $tierPriceResource;
}
@@ -72,8 +68,7 @@ public function __construct(
* @param \Magento\Catalog\Api\Data\ProductInterface|object $entity
* @param array $arguments
* @return \Magento\Catalog\Api\Data\ProductInterface|object
- * @throws \Magento\Framework\Exception\NoSuchEntityException
- * @throws \Magento\Framework\Exception\LocalizedException
+ * @throws \Magento\Framework\Exception\InputException
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function execute($entity, $arguments = [])
@@ -119,34 +114,6 @@ public function execute($entity, $arguments = [])
return $entity;
}
- /**
- * Get additional tier price fields
- *
- * @param array $objectArray
- * @return array
- */
- private function getAdditionalFields(array $objectArray): array
- {
- $percentageValue = $this->getPercentage($objectArray);
- return [
- 'value' => $percentageValue ? null : $objectArray['price'],
- 'percentage_value' => $percentageValue ?: null,
- ];
- }
-
- /**
- * Check whether price has percentage value.
- *
- * @param array $priceRow
- * @return int|null
- */
- private function getPercentage(array $priceRow): ?int
- {
- return isset($priceRow['percentage_value']) && is_numeric($priceRow['percentage_value'])
- ? (int)$priceRow['percentage_value']
- : null;
- }
-
/**
* Update existing tier prices for processed product
*
@@ -226,39 +193,15 @@ private function deleteValues(int $productId, array $valuesToDelete): bool
*/
private function getPriceKey(array $priceData): string
{
+ $qty = $this->parseQty($priceData['price_qty']);
$key = implode(
'-',
- array_merge([$priceData['website_id'], $priceData['cust_group']], [(int)$priceData['price_qty']])
+ array_merge([$priceData['website_id'], $priceData['cust_group']], [$qty])
);
return $key;
}
- /**
- * Prepare tier price data by provided price row data
- *
- * @param array $data
- * @return array
- * @throws \Magento\Framework\Exception\LocalizedException
- */
- private function prepareTierPrice(array $data): array
- {
- $useForAllGroups = (int)$data['cust_group'] === $this->groupManagement->getAllCustomersGroup()->getId();
- $customerGroupId = $useForAllGroups ? 0 : $data['cust_group'];
- $tierPrice = array_merge(
- $this->getAdditionalFields($data),
- [
- 'website_id' => $data['website_id'],
- 'all_groups' => (int)$useForAllGroups,
- 'customer_group_id' => $customerGroupId,
- 'value' => $data['price'] ?? null,
- 'qty' => (int)$data['price_qty']
- ]
- );
-
- return $tierPrice;
- }
-
/**
* Check by id is website global
*
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
index f2039a5002dcc..8b638feafaafc 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
@@ -8,6 +8,9 @@
use Magento\Framework\Exception\InputException;
+/**
+ * Option management model for product attribute.
+ */
class OptionManagement implements \Magento\Catalog\Api\ProductAttributeOptionManagementInterface
{
/**
@@ -25,7 +28,7 @@ public function __construct(
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function getItems($attributeCode)
{
@@ -36,7 +39,7 @@ public function getItems($attributeCode)
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function add($attributeCode, $option)
{
@@ -47,7 +50,7 @@ public function add($attributeCode, $option)
/** @var \Magento\Eav\Api\Data\AttributeOptionInterface $attributeOption */
$attributeOption = $attributeOption->getLabel();
});
- if (in_array($option->getLabel(), $currentOptions)) {
+ if (in_array($option->getLabel(), $currentOptions, true)) {
return false;
}
}
@@ -59,7 +62,7 @@ public function add($attributeCode, $option)
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function delete($attributeCode, $optionId)
{
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php b/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php
index 99d5016f5cdb9..08455430ccac8 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php
@@ -28,13 +28,20 @@ class DefaultValidator extends \Magento\Framework\Validator\AbstractValidator
*/
protected $priceTypes;
+ /**
+ * @var \Magento\Framework\Locale\FormatInterface
+ */
+ private $localeFormat;
+
/**
* @param \Magento\Catalog\Model\ProductOptions\ConfigInterface $productOptionConfig
* @param \Magento\Catalog\Model\Config\Source\Product\Options\Price $priceConfig
+ * @param \Magento\Framework\Locale\FormatInterface|null $localeFormat
*/
public function __construct(
\Magento\Catalog\Model\ProductOptions\ConfigInterface $productOptionConfig,
- \Magento\Catalog\Model\Config\Source\Product\Options\Price $priceConfig
+ \Magento\Catalog\Model\Config\Source\Product\Options\Price $priceConfig,
+ \Magento\Framework\Locale\FormatInterface $localeFormat = null
) {
foreach ($productOptionConfig->getAll() as $option) {
foreach ($option['types'] as $type) {
@@ -45,6 +52,9 @@ public function __construct(
foreach ($priceConfig->toOptionArray() as $item) {
$this->priceTypes[] = $item['value'];
}
+
+ $this->localeFormat = $localeFormat ?: \Magento\Framework\App\ObjectManager::getInstance()
+ ->get(\Magento\Framework\Locale\FormatInterface::class);
}
/**
@@ -137,11 +147,11 @@ protected function validateOptionType(Option $option)
*/
protected function validateOptionValue(Option $option)
{
- return $this->isInRange($option->getPriceType(), $this->priceTypes);
+ return $this->isInRange($option->getPriceType(), $this->priceTypes) && $this->isNumber($option->getPrice());
}
/**
- * Check whether value is empty
+ * Check whether the value is empty
*
* @param mixed $value
* @return bool
@@ -152,7 +162,7 @@ protected function isEmpty($value)
}
/**
- * Check whether value is in range
+ * Check whether the value is in range
*
* @param string $value
* @param array $range
@@ -164,13 +174,24 @@ protected function isInRange($value, array $range)
}
/**
- * Check whether value is not negative
+ * Check whether the value is negative
*
* @param string $value
* @return bool
*/
protected function isNegative($value)
{
- return (int) $value < 0;
+ return $this->localeFormat->getNumber($value) < 0;
+ }
+
+ /**
+ * Check whether the value is a number
+ *
+ * @param string $value
+ * @return bool
+ */
+ public function isNumber($value)
+ {
+ return is_numeric($this->localeFormat->getNumber($value));
}
}
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php b/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php
index 44756890b6ed7..209531f599811 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php
@@ -8,6 +8,9 @@
use Magento\Catalog\Model\Product\Option;
+/**
+ * Select validator class
+ */
class Select extends DefaultValidator
{
/**
@@ -83,7 +86,7 @@ protected function isValidOptionPrice($priceType, $price, $storeId)
if (!$priceType && !$price) {
return true;
}
- if (!$this->isInRange($priceType, $this->priceTypes)) {
+ if (!$this->isInRange($priceType, $this->priceTypes) || !$this->isNumber($price)) {
return false;
}
diff --git a/app/code/Magento/Catalog/Model/Product/Price/TierPriceStorage.php b/app/code/Magento/Catalog/Model/Product/Price/TierPriceStorage.php
index 1bddd2d07cd81..3ee064670a460 100644
--- a/app/code/Magento/Catalog/Model/Product/Price/TierPriceStorage.php
+++ b/app/code/Magento/Catalog/Model/Product/Price/TierPriceStorage.php
@@ -97,7 +97,7 @@ public function __construct(
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function get(array $skus)
{
@@ -107,7 +107,7 @@ public function get(array $skus)
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function update(array $prices)
{
@@ -128,7 +128,7 @@ public function update(array $prices)
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function replace(array $prices)
{
@@ -144,7 +144,7 @@ public function replace(array $prices)
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function delete(array $prices)
{
@@ -171,16 +171,17 @@ private function getExistingPrices(array $skus, $groupBySku = false)
$ids = $this->retrieveAffectedIds($skus);
$rawPrices = $this->tierPricePersistence->get($ids);
$prices = [];
-
- $linkField = $this->tierPricePersistence->getEntityLinkField();
- $skuByIdLookup = $this->buildSkuByIdLookup($skus);
- foreach ($rawPrices as $rawPrice) {
- $sku = $skuByIdLookup[$rawPrice[$linkField]];
- $price = $this->tierPriceFactory->create($rawPrice, $sku);
- if ($groupBySku) {
- $prices[$sku][] = $price;
- } else {
- $prices[] = $price;
+ if ($rawPrices) {
+ $linkField = $this->tierPricePersistence->getEntityLinkField();
+ $skuByIdLookup = $this->buildSkuByIdLookup($skus);
+ foreach ($rawPrices as $rawPrice) {
+ $sku = $skuByIdLookup[$rawPrice[$linkField]];
+ $price = $this->tierPriceFactory->create($rawPrice, $sku);
+ if ($groupBySku) {
+ $prices[$sku][] = $price;
+ } else {
+ $prices[] = $price;
+ }
}
}
diff --git a/app/code/Magento/Catalog/Model/ProductIdLocator.php b/app/code/Magento/Catalog/Model/ProductIdLocator.php
index 2d9af6829ad6e..2d382164f2649 100644
--- a/app/code/Magento/Catalog/Model/ProductIdLocator.php
+++ b/app/code/Magento/Catalog/Model/ProductIdLocator.php
@@ -37,23 +37,43 @@ class ProductIdLocator implements \Magento\Catalog\Model\ProductIdLocatorInterfa
*/
private $idsBySku = [];
+ /**
+ * Batch size to iterate collection
+ *
+ * @var int
+ */
+ private $batchSize;
+
/**
* @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
* @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory
- * @param string $limitIdsBySkuValues
+ * @param string $idsLimit
+ * @param int $batchSize defines how many items can be processed by one iteration
*/
public function __construct(
\Magento\Framework\EntityManager\MetadataPool $metadataPool,
\Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory,
- $idsLimit
+ $idsLimit,
+ int $batchSize = 5000
) {
$this->metadataPool = $metadataPool;
$this->collectionFactory = $collectionFactory;
$this->idsLimit = (int)$idsLimit;
+ $this->batchSize = $batchSize;
}
/**
- * {@inheritdoc}
+ * @inheritdoc
+ *
+ * Load product items by provided products SKUs.
+ * Products collection will be iterated by pages with the $this->batchSize as a page size (for a cases when to many
+ * products SKUs were provided in parameters.
+ * Loaded products will be chached in the $this->idsBySku variable, but in the end of the method these storage will
+ * be truncated to $idsLimit quantity.
+ * As a result array with the products data will be returned with the following scheme:
+ * $data['product_sku']['link_field_value' => 'product_type']
+ *
+ * @throws \Exception
*/
public function retrieveProductIdsBySkus(array $skus)
{
@@ -72,8 +92,16 @@ public function retrieveProductIdsBySkus(array $skus)
$linkField = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class)
->getLinkField();
- foreach ($collection as $item) {
- $this->idsBySku[strtolower(trim($item->getSku()))][$item->getData($linkField)] = $item->getTypeId();
+ $collection->setPageSize($this->batchSize);
+ $pages = $collection->getLastPageNumber();
+ for ($currentPage = 1; $currentPage <= $pages; $currentPage++) {
+ $collection->setCurPage($currentPage);
+ foreach ($collection->getItems() as $item) {
+ $sku = strtolower(trim($item->getSku()));
+ $itemIdentifier = $item->getData($linkField);
+ $this->idsBySku[$sku][$itemIdentifier] = $item->getTypeId();
+ }
+ $collection->clear();
}
}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category.php b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
index 5b420c33b3184..90f55cd44bdb9 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
@@ -486,8 +486,20 @@ public function getProductsPosition($category)
$this->getCategoryProductTable(),
['product_id', 'position']
)->where(
- 'category_id = :category_id'
+ "{$this->getTable('catalog_category_product')}.category_id = ?",
+ $category->getId()
);
+ $websiteId = $category->getStore()->getWebsiteId();
+ if ($websiteId) {
+ $select->join(
+ ['product_website' => $this->getTable('catalog_product_website')],
+ "product_website.product_id = {$this->getTable('catalog_category_product')}.product_id",
+ []
+ )->where(
+ 'product_website.website_id = ?',
+ $websiteId
+ );
+ }
$bind = ['category_id' => (int)$category->getId()];
return $this->getConnection()->fetchPairs($select, $bind);
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php
index 4562aa0b0e75f..618abda0a942d 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php
@@ -322,7 +322,9 @@ public function loadProductCount($items, $countRegular = true, $countAnchor = tr
['e' => $this->getTable('catalog_category_entity')],
'main_table.category_id=e.entity_id',
[]
- )->where('e.entity_id = :entity_id OR e.path LIKE :c_path');
+ )->where(
+ '(e.entity_id = :entity_id OR e.path LIKE :c_path)'
+ );
if ($websiteId) {
$select->join(
['w' => $this->getProductWebsiteTable()],
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php
index 9db2c8248ce52..05950531e2178 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php
@@ -699,8 +699,20 @@ public function getProductsPosition($category)
$this->getTable('catalog_category_product'),
['product_id', 'position']
)->where(
- 'category_id = :category_id'
+ "{$this->getTable('catalog_category_product')}.category_id = ?",
+ $category->getId()
);
+ $websiteId = $category->getStore()->getWebsiteId();
+ if ($websiteId) {
+ $select->join(
+ ['product_website' => $this->getTable('catalog_product_website')],
+ "product_website.product_id = {$this->getTable('catalog_category_product')}.product_id",
+ []
+ )->where(
+ 'product_website.website_id = ?',
+ $websiteId
+ );
+ }
$bind = ['category_id' => (int)$category->getId()];
return $this->getConnection()->fetchPairs($select, $bind);
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/CategoryLink.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/CategoryLink.php
index b54c19a111508..cf5760b0c33a9 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/CategoryLink.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/CategoryLink.php
@@ -93,6 +93,8 @@ public function saveCategoryLinks(ProductInterface $product, array $categoryLink
}
/**
+ * Get category link metadata
+ *
* @return \Magento\Framework\EntityManager\EntityMetadataInterface
*/
private function getCategoryLinkMetadata()
@@ -114,16 +116,22 @@ private function getCategoryLinkMetadata()
private function processCategoryLinks($newCategoryPositions, &$oldCategoryPositions)
{
$result = ['changed' => [], 'updated' => []];
+
+ $oldCategoryPositions = array_values($oldCategoryPositions);
foreach ($newCategoryPositions as $newCategoryPosition) {
- $key = array_search(
- $newCategoryPosition['category_id'],
- array_column($oldCategoryPositions, 'category_id')
- );
+ $key = false;
+
+ foreach ($oldCategoryPositions as $oldKey => $oldCategoryPosition) {
+ if ((int)$oldCategoryPosition['category_id'] === (int)$newCategoryPosition['category_id']) {
+ $key = $oldKey;
+ break;
+ }
+ }
if ($key === false) {
$result['changed'][] = $newCategoryPosition;
} elseif ($oldCategoryPositions[$key]['position'] != $newCategoryPosition['position']) {
- $result['updated'][] = $newCategoryPositions[$key];
+ $result['updated'][] = $newCategoryPosition;
unset($oldCategoryPositions[$key]);
}
}
@@ -132,6 +140,8 @@ private function processCategoryLinks($newCategoryPositions, &$oldCategoryPositi
}
/**
+ * Update category links
+ *
* @param ProductInterface $product
* @param array $insertLinks
* @param bool $insert
@@ -175,6 +185,8 @@ private function updateCategoryLinks(ProductInterface $product, array $insertLin
}
/**
+ * Delete category links
+ *
* @param ProductInterface $product
* @param array $deleteLinks
* @return array
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
index 14ae38667d873..bd314c0192d38 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
@@ -290,6 +290,11 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
*/
private $dimensionFactory;
+ /**
+ * @var \Magento\Framework\DataObject
+ */
+ private $emptyItem;
+
/**
* Collection constructor
* @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
@@ -550,7 +555,10 @@ protected function _prepareStaticFields()
*/
public function getNewEmptyItem()
{
- $object = parent::getNewEmptyItem();
+ if (null === $this->emptyItem) {
+ $this->emptyItem = parent::getNewEmptyItem();
+ }
+ $object = clone $this->emptyItem;
if ($this->isEnabledFlat()) {
$object->setIdFieldName($this->getEntity()->getIdFieldName());
}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php
index 3a61e7e364454..7730d7cc9a7fd 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php
@@ -7,6 +7,7 @@
use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
/**
* Catalog Product Eav Select and Multiply Select Attributes Indexer resource model
@@ -24,6 +25,16 @@ class Source extends AbstractEav
*/
protected $_resourceHelper;
+ /**
+ * @var \Magento\Eav\Api\AttributeRepositoryInterface
+ */
+ private $attributeRepository;
+
+ /**
+ * @var \Magento\Framework\Api\SearchCriteriaBuilder
+ */
+ private $criteriaBuilder;
+
/**
* Construct
*
@@ -33,6 +44,8 @@ class Source extends AbstractEav
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
* @param null|string $connectionName
+ * @param \Magento\Eav\Api\AttributeRepositoryInterface|null $attributeRepository
+ * @param \Magento\Framework\Api\SearchCriteriaBuilder|null $criteriaBuilder
*/
public function __construct(
\Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -40,7 +53,9 @@ public function __construct(
\Magento\Eav\Model\Config $eavConfig,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
- $connectionName = null
+ $connectionName = null,
+ \Magento\Eav\Api\AttributeRepositoryInterface $attributeRepository = null,
+ \Magento\Framework\Api\SearchCriteriaBuilder $criteriaBuilder = null
) {
parent::__construct(
$context,
@@ -50,6 +65,12 @@ public function __construct(
$connectionName
);
$this->_resourceHelper = $resourceHelper;
+ $this->attributeRepository = $attributeRepository
+ ?: \Magento\Framework\App\ObjectManager::getInstance()
+ ->get(\Magento\Eav\Api\AttributeRepositoryInterface::class);
+ $this->criteriaBuilder = $criteriaBuilder
+ ?: \Magento\Framework\App\ObjectManager::getInstance()
+ ->get(\Magento\Framework\Api\SearchCriteriaBuilder::class);
}
/**
@@ -234,6 +255,10 @@ protected function _prepareMultiselectIndex($entityIds = null, $attributeId = nu
$options[$row['attribute_id']][$row['option_id']] = true;
}
+ // Retrieve any custom source model options
+ $sourceModelOptions = $this->getMultiSelectAttributeWithSourceModels($attrIds);
+ $options = array_replace_recursive($options, $sourceModelOptions);
+
// prepare get multiselect values query
$productValueExpression = $connection->getCheckSql('pvs.value_id > 0', 'pvs.value', 'pvd.value');
$select = $connection->select()->from(
@@ -297,6 +322,39 @@ protected function _prepareMultiselectIndex($entityIds = null, $attributeId = nu
return $this;
}
+ /**
+ * Get options for multiselect attributes using custom source models
+ * Based on @maderlock's fix from:
+ * https://github.com/magento/magento2/issues/417#issuecomment-265146285
+ *
+ * @param array $attrIds
+ *
+ * @return array
+ */
+ private function getMultiSelectAttributeWithSourceModels($attrIds)
+ {
+ // Add options from custom source models
+ $this->criteriaBuilder
+ ->addFilter('attribute_id', $attrIds, 'in')
+ ->addFilter('source_model', true, 'notnull');
+ $criteria = $this->criteriaBuilder->create();
+ $attributes = $this->attributeRepository->getList(
+ ProductAttributeInterface::ENTITY_TYPE_CODE,
+ $criteria
+ )->getItems();
+
+ $options = [];
+ foreach ($attributes as $attribute) {
+ $sourceModelOptions = $attribute->getOptions();
+ // Add options to list used below
+ foreach ($sourceModelOptions as $option) {
+ $options[$attribute->getAttributeId()][$option->getValue()] = true;
+ }
+ }
+
+ return $options;
+ }
+
/**
* Save a data to temporary source index table
*
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignImageRolesActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignImageRolesActionGroup.xml
new file mode 100644
index 0000000000000..90ceb1e4a1f96
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignImageRolesActionGroup.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index 01b31430793cc..28587e6405e49 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -70,6 +70,7 @@
+
@@ -121,7 +122,6 @@
+
+
+
+ {{amount}}
+ $grabProductTierPriceInput
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
index fd1b6add8391f..817da18f5f2b7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
@@ -179,7 +179,6 @@
+
+
+
+
@@ -233,6 +243,7 @@
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
index 5c79c321c9431..ff3c5cb4403bf 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
@@ -42,4 +42,24 @@
true
+ FirstLevelSubCategory
+ subcategory
+
+
+ SecondLevelSubCategory
+ subcategory
+
+
+ ThirdLevelSubCategory
+ subcategory
+
+
+ FourthLevelSubCategory
+ subcategory
+
+
+ FifthLevelCategory
+ category
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index e5b23fe3a3c34..74492ed416206 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -181,6 +181,9 @@
EavStockItem
CustomAttributeProductUrlKey
+
+ 1
+
Image1
1.00
@@ -477,4 +480,30 @@
EavStock1
CustomAttributeProductAttribute
+
+ Test
+ testsku
+ simple
+ 4
+ 4
+ 560.00
+ testurl-
+ 1
+ 25
+ 1
+ EavStock100
+
+
+ Product With Long Name And Sku - But not too long
+ Product With Long Name And Sku - But not too long
+
+
+ Magento3
+ 1.00
+ Upload File
+ Yes
+ magento3.jpg
+ magento3
+ jpg
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryPage.xml
index 9349e188430f4..f7d8abf8b2fea 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryPage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryPage.xml
@@ -8,7 +8,7 @@
-
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection.xml
index 9a0dd8f5b387d..651ee54c08339 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection.xml
@@ -22,6 +22,7 @@
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsGridSection.xml
index 40ea919226d6e..a449836fa08f4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsGridSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsGridSection.xml
@@ -15,5 +15,6 @@
+
-
\ No newline at end of file
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
index 7ea74d7913758..178e58ef2d649 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
@@ -28,7 +28,8 @@
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml
index 54b289a89c705..4dcda8dcd41ae 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml
@@ -11,5 +11,6 @@
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
index 83c3ca5348606..45e0b03e8d995 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
@@ -10,5 +10,6 @@
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml
index c87af1224ed30..e9c8f53f97e5f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml
@@ -9,14 +9,18 @@
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml
index d38a8e4190c82..03f3e93bb30ec 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml
@@ -16,9 +16,6 @@
-
grabTextFromMiniCartSubtotalField2
+
+
+
+
+
+ 100
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml
new file mode 100644
index 0000000000000..9115004ad9585
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithCustomRootCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithCustomRootCategoryTest.xml
new file mode 100644
index 0000000000000..e8c6da476a3d6
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithCustomRootCategoryTest.xml
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithFiveNestingTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithFiveNestingTest.xml
new file mode 100644
index 0000000000000..530bafaef24c2
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithFiveNestingTest.xml
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ['Home', {{FirstLevelSubCat.name}}, {{SecondLevelSubCat.name}}, {{ThirdLevelSubCat.name}}, {{FourthLevelSubCat.name}}, {{FifthLevelCat.name}} ]
+ breadcrumbs
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveCategoryTest.xml
new file mode 100644
index 0000000000000..96f945da138b0
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveCategoryTest.xml
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveIncludeInMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveIncludeInMenuTest.xml
new file mode 100644
index 0000000000000..c983089163f78
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveIncludeInMenuTest.xml
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilter.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilter.xml
new file mode 100644
index 0000000000000..7c24a8aba27bd
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilter.xml
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithRequiredFieldsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithRequiredFieldsTest.xml
new file mode 100644
index 0000000000000..1b6c9707b0656
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithRequiredFieldsTest.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryRequiredFieldsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryRequiredFieldsTest.xml
new file mode 100644
index 0000000000000..f98f9acc46961
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryRequiredFieldsTest.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml
index 9e323745835c2..e0e214342ad72 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml
@@ -19,19 +19,19 @@
-
+
-
-
+
-
-
+
@@ -50,54 +50,46 @@
-
-
+
+
+
-
-
+
+
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 100
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
index 281bad4e49591..7da668df59022 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
@@ -108,6 +108,10 @@
-
-
+
+
-
+
x ']]),
- '{"breadcrumbs":{"categoryUrlSuffix":"."html","userCategoryPathInUrl":0,"product":'
+ '{"breadcrumbs":{"categoryUrlSuffix":"."html","useCategoryPathInUrl":0,"product":'
. '"Test <b>x<\/b>"}}',
],
[
$this->getObjectManager()->getObject(Product::class, ['data' => ['name' => 'Test \'abc\'']]),
'{"breadcrumbs":'
- . '{"categoryUrlSuffix":"."html","userCategoryPathInUrl":0,"product":"Test 'abc'"}}'
+ . '{"categoryUrlSuffix":"."html","useCategoryPathInUrl":0,"product":"Test 'abc'"}}'
],
];
}
diff --git a/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php b/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php
index cbc67fee8a5a3..1903bcd144831 100644
--- a/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php
+++ b/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php
@@ -6,6 +6,8 @@
namespace Magento\Catalog\Ui\Component;
/**
+ * Column Factory
+ *
* @api
* @since 100.0.2
*/
@@ -47,10 +49,14 @@ public function __construct(\Magento\Framework\View\Element\UiComponentFactory $
}
/**
+ * Create Factory
+ *
* @param \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute
* @param \Magento\Framework\View\Element\UiComponent\ContextInterface $context
* @param array $config
+ *
* @return \Magento\Ui\Component\Listing\Columns\ColumnInterface
+ * @throws \Magento\Framework\Exception\LocalizedException
*/
public function create($attribute, $context, array $config = [])
{
@@ -82,7 +88,10 @@ public function create($attribute, $context, array $config = [])
}
/**
+ * Get Js Component
+ *
* @param string $dataType
+ *
* @return string
*/
protected function getJsComponent($dataType)
@@ -91,14 +100,15 @@ protected function getJsComponent($dataType)
}
/**
+ * Get Data Type
+ *
* @param \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute
+ *
* @return string
*/
protected function getDataType($attribute)
{
- return isset($this->dataTypeMap[$attribute->getFrontendInput()])
- ? $this->dataTypeMap[$attribute->getFrontendInput()]
- : $this->dataTypeMap['default'];
+ return $this->dataTypeMap[$attribute->getFrontendInput()] ?? $this->dataTypeMap['default'];
}
/**
@@ -111,6 +121,6 @@ protected function getFilterType($frontendInput)
{
$filtersMap = ['date' => 'dateRange'];
$result = array_replace_recursive($this->dataTypeMap, $filtersMap);
- return isset($result[$frontendInput]) ? $result[$frontendInput] : $result['default'];
+ return $result[$frontendInput] ?? $result['default'];
}
}
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Thumbnail.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Thumbnail.php
index d4dc9ddd7ca3b..09c9782fc0e32 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Thumbnail.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Thumbnail.php
@@ -9,6 +9,8 @@
use Magento\Framework\View\Element\UiComponent\ContextInterface;
/**
+ * Class Thumbnail
+ *
* @api
* @since 100.0.2
*/
@@ -67,6 +69,8 @@ public function prepareDataSource(array $dataSource)
}
/**
+ * Get Alt
+ *
* @param array $row
*
* @return null|string
@@ -74,6 +78,6 @@ public function prepareDataSource(array $dataSource)
protected function getAlt($row)
{
$altField = $this->getData('config/altField') ?: self::ALT_FIELD;
- return isset($row[$altField]) ? $row[$altField] : null;
+ return $row[$altField] ?? null;
}
}
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php
index 524927ac1c4b4..4fcb87ab1396e 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php
@@ -14,6 +14,7 @@
use Magento\Catalog\Model\Product\Image\NotLoadInfoImageException;
use Magento\Catalog\Ui\DataProvider\Product\ProductRenderCollectorInterface;
use Magento\Framework\App\State;
+use Magento\Framework\View\Design\ThemeInterface;
use Magento\Framework\View\DesignInterface;
use Magento\Store\Model\StoreManager;
use Magento\Store\Model\StoreManagerInterface;
@@ -104,6 +105,8 @@ public function __construct(
public function collect(ProductInterface $product, ProductRenderInterface $productRender)
{
$images = [];
+ /** @var ThemeInterface $currentTheme */
+ $currentTheme = $this->design->getDesignTheme();
foreach ($this->imageCodes as $imageCode) {
/** @var ImageInterface $image */
@@ -132,6 +135,7 @@ public function collect(ProductInterface $product, ProductRenderInterface $produ
$images[] = $image;
}
+ $this->design->setDesignTheme($currentTheme);
$productRender->setImages($images);
}
diff --git a/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php b/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php
index 95f2531e5fdca..d1424d637937b 100644
--- a/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php
+++ b/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php
@@ -105,7 +105,7 @@ public function getJsonConfigurationHtmlEscaped() : string
[
'breadcrumbs' => [
'categoryUrlSuffix' => $this->escaper->escapeHtml($this->getCategoryUrlSuffix()),
- 'userCategoryPathInUrl' => (int)$this->isCategoryUsedInProductUrl(),
+ 'useCategoryPathInUrl' => (int)$this->isCategoryUsedInProductUrl(),
'product' => $this->escaper->escapeHtml($this->getProductName())
]
],
diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssell.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssell.xml
index 4a27158be5f7c..d7aa058a1f446 100644
--- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssell.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssell.xml
@@ -5,6 +5,10 @@
* See COPYING.txt for license details.
*/
-->
+
-
diff --git a/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php b/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php
index 17d70e38d3b61..184fd9cfd5b37 100644
--- a/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php
+++ b/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php
@@ -17,6 +17,11 @@
*/
class Result extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface, HttpPostActionInterface
{
+ /**
+ * No results default handle.
+ */
+ const DEFAULT_NO_RESULT_HANDLE = 'catalogsearch_advanced_result_noresults';
+
/**
* Url factory
*
@@ -55,7 +60,16 @@ public function execute()
{
try {
$this->_catalogSearchAdvanced->addFilters($this->getRequest()->getQueryValue());
- $this->_view->loadLayout();
+ $size = $this->_catalogSearchAdvanced->getProductCollection()->getSize();
+
+ $handles = null;
+ if ($size == 0) {
+ $this->_view->getPage()->initLayout();
+ $handles = $this->_view->getLayout()->getUpdate()->getHandles();
+ $handles[] = static::DEFAULT_NO_RESULT_HANDLE;
+ }
+
+ $this->_view->loadLayout($handles);
$this->_view->renderLayout();
} catch (\Magento\Framework\Exception\LocalizedException $e) {
$this->messageManager->addError($e->getMessage());
diff --git a/app/code/Magento/CatalogSearch/Controller/Result/Index.php b/app/code/Magento/CatalogSearch/Controller/Result/Index.php
index fba4572cf2c10..975c6ba1e7eb9 100644
--- a/app/code/Magento/CatalogSearch/Controller/Result/Index.php
+++ b/app/code/Magento/CatalogSearch/Controller/Result/Index.php
@@ -20,6 +20,11 @@
*/
class Index extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface, HttpPostActionInterface
{
+ /**
+ * No results default handle.
+ */
+ const DEFAULT_NO_RESULT_HANDLE = 'catalogsearch_result_index_noresults';
+
/**
* Catalog session
*
@@ -90,12 +95,19 @@ public function execute()
$getAdditionalRequestParameters = $this->getRequest()->getParams();
unset($getAdditionalRequestParameters[QueryFactory::QUERY_VAR_NAME]);
+ $handles = null;
+ if ($query->getNumResults() == 0) {
+ $this->_view->getPage()->initLayout();
+ $handles = $this->_view->getLayout()->getUpdate()->getHandles();
+ $handles[] = static::DEFAULT_NO_RESULT_HANDLE;
+ }
+
if (empty($getAdditionalRequestParameters) &&
$this->_objectManager->get(PopularSearchTerms::class)->isCacheable($queryText, $storeId)
) {
- $this->getCacheableResult($catalogSearchHelper, $query);
+ $this->getCacheableResult($catalogSearchHelper, $query, $handles);
} else {
- $this->getNotCacheableResult($catalogSearchHelper, $query);
+ $this->getNotCacheableResult($catalogSearchHelper, $query, $handles);
}
} else {
$this->getResponse()->setRedirect($this->_redirect->getRedirectUrl());
@@ -107,9 +119,10 @@ public function execute()
*
* @param \Magento\CatalogSearch\Helper\Data $catalogSearchHelper
* @param \Magento\Search\Model\Query $query
+ * @param array $handles
* @return void
*/
- private function getCacheableResult($catalogSearchHelper, $query)
+ private function getCacheableResult($catalogSearchHelper, $query, $handles)
{
if (!$catalogSearchHelper->isMinQueryLength()) {
$redirect = $query->getRedirect();
@@ -121,7 +134,7 @@ private function getCacheableResult($catalogSearchHelper, $query)
$catalogSearchHelper->checkNotes();
- $this->_view->loadLayout();
+ $this->_view->loadLayout($handles);
$this->_view->renderLayout();
}
@@ -130,11 +143,12 @@ private function getCacheableResult($catalogSearchHelper, $query)
*
* @param \Magento\CatalogSearch\Helper\Data $catalogSearchHelper
* @param \Magento\Search\Model\Query $query
+ * @param array $handles
* @return void
*
* @throws \Magento\Framework\Exception\LocalizedException
*/
- private function getNotCacheableResult($catalogSearchHelper, $query)
+ private function getNotCacheableResult($catalogSearchHelper, $query, $handles)
{
if ($catalogSearchHelper->isMinQueryLength()) {
$query->setId(0)->setIsActive(1)->setIsProcessed(1);
@@ -149,7 +163,7 @@ private function getNotCacheableResult($catalogSearchHelper, $query)
$catalogSearchHelper->checkNotes();
- $this->_view->loadLayout();
+ $this->_view->loadLayout($handles);
$this->getResponse()->setNoCacheHeaders();
$this->_view->renderLayout();
}
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
index 7aac6e98fc044..7b239d84bf962 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
@@ -91,12 +91,10 @@ protected function _getItemsData()
return $this->itemDataBuilder->build();
}
- $productSize = $productCollection->getSize();
-
$options = $attribute->getFrontend()
->getSelectOptions();
foreach ($options as $option) {
- $this->buildOptionData($option, $isAttributeFilterable, $optionsFacetedData, $productSize);
+ $this->buildOptionData($option, $isAttributeFilterable, $optionsFacetedData);
}
return $this->itemDataBuilder->build();
@@ -108,17 +106,16 @@ protected function _getItemsData()
* @param array $option
* @param boolean $isAttributeFilterable
* @param array $optionsFacetedData
- * @param int $productSize
* @return void
*/
- private function buildOptionData($option, $isAttributeFilterable, $optionsFacetedData, $productSize)
+ private function buildOptionData($option, $isAttributeFilterable, $optionsFacetedData)
{
$value = $this->getOptionValue($option);
if ($value === false) {
return;
}
$count = $this->getOptionCount($value, $optionsFacetedData);
- if ($isAttributeFilterable && (!$this->isOptionReducesResults($count, $productSize) || $count === 0)) {
+ if ($isAttributeFilterable && $count === 0) {
return;
}
diff --git a/app/code/Magento/CatalogSearch/Model/Search/QueryChecker/FullTextSearchCheck.php b/app/code/Magento/CatalogSearch/Model/Search/QueryChecker/FullTextSearchCheck.php
index c122bae15cb0c..a47ea54375205 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/QueryChecker/FullTextSearchCheck.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/QueryChecker/FullTextSearchCheck.php
@@ -25,7 +25,7 @@ class FullTextSearchCheck
* to join catalog_eav_attribute table to search query or not
*
* In case when the $query does not requires full text search
- * - we can skipp joining catalog_eav_attribute table because it becomes excessive
+ * - we can skip joining catalog_eav_attribute table because it becomes excessive
*
* @param QueryInterface $query
* @return bool
@@ -37,6 +37,8 @@ public function isRequiredForQuery(QueryInterface $query)
}
/**
+ * Process query
+ *
* @param QueryInterface $query
* @return bool
* @throws \InvalidArgumentException
@@ -62,6 +64,8 @@ private function processQuery(QueryInterface $query)
}
/**
+ * Process boolean query
+ *
* @param BoolExpression $query
* @return bool
* @throws \InvalidArgumentException
@@ -90,6 +94,8 @@ private function processBoolQuery(BoolExpression $query)
}
/**
+ * Process filter query
+ *
* @param Filter $query
* @return bool
* @throws \InvalidArgumentException
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Controller/Advanced/ResultTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Controller/Advanced/ResultTest.php
index 891f008979e17..2faacea24262c 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Controller/Advanced/ResultTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Controller/Advanced/ResultTest.php
@@ -10,6 +10,11 @@
*/
class ResultTest extends \PHPUnit\Framework\TestCase
{
+ /**
+ * Test result action filters set before load layout scenario
+ *
+ * @return void
+ */
public function testResultActionFiltersSetBeforeLoadLayout()
{
$filters = null;
@@ -27,9 +32,15 @@ function () use (&$filters, $expectedQuery) {
$request = $this->createPartialMock(\Magento\Framework\App\Console\Request::class, ['getQueryValue']);
$request->expects($this->once())->method('getQueryValue')->will($this->returnValue($expectedQuery));
+ $collection = $this->createPartialMock(
+ \Magento\CatalogSearch\Model\ResourceModel\Advanced\Collection::class,
+ ['getSize']
+ );
+ $collection->expects($this->once())->method('getSize')->will($this->returnValue(1));
+
$catalogSearchAdvanced = $this->createPartialMock(
\Magento\CatalogSearch\Model\Advanced::class,
- ['addFilters', '__wakeup']
+ ['addFilters', '__wakeup', 'getProductCollection']
);
$catalogSearchAdvanced->expects($this->once())->method('addFilters')->will(
$this->returnCallback(
@@ -38,6 +49,8 @@ function ($added) use (&$filters) {
}
)
);
+ $catalogSearchAdvanced->expects($this->once())->method('getProductCollection')
+ ->will($this->returnValue($collection));
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
$context = $objectManager->getObject(
@@ -53,6 +66,11 @@ function ($added) use (&$filters) {
$instance->execute();
}
+ /**
+ * Test url set on exception scenario
+ *
+ * @return void
+ */
public function testUrlSetOnException()
{
$redirectResultMock = $this->createMock(\Magento\Framework\Controller\Result\Redirect::class);
@@ -131,11 +149,71 @@ public function testUrlSetOnException()
/** @var \Magento\CatalogSearch\Controller\Advanced\Result $instance */
$instance = $objectManager->getObject(
\Magento\CatalogSearch\Controller\Advanced\Result::class,
- ['context' => $contextMock,
- 'catalogSearchAdvanced' => $catalogSearchAdvanced,
- 'urlFactory' => $urlFactoryMock
+ [
+ 'context' => $contextMock,
+ 'catalogSearchAdvanced' => $catalogSearchAdvanced,
+ 'urlFactory' => $urlFactoryMock
]
);
$this->assertEquals($redirectResultMock, $instance->execute());
}
+
+ /**
+ * Test no result handle scenario
+ *
+ * @return void
+ */
+ public function testNoResultsHandle()
+ {
+ $expectedQuery = 'notExistTerm';
+
+ $update = $this->createPartialMock(\Magento\Framework\View\Model\Layout\Merge::class, ['getHandles']);
+ $update->expects($this->once())->method('getHandles')->will($this->returnValue([]));
+
+ $layout = $this->createPartialMock(\Magento\Framework\View\Result\Layout::class, ['getUpdate']);
+ $layout->expects($this->once())->method('getUpdate')->will($this->returnValue($update));
+
+ $page = $this->createPartialMock(\Magento\Framework\View\Result\Page::class, ['initLayout']);
+
+ $view = $this->createPartialMock(
+ \Magento\Framework\App\View::class,
+ ['loadLayout', 'renderLayout', 'getPage', 'getLayout']
+ );
+
+ $view->expects($this->once())->method('loadLayout')
+ ->with([\Magento\CatalogSearch\Controller\Advanced\Result::DEFAULT_NO_RESULT_HANDLE]);
+
+ $view->expects($this->once())->method('getPage')->will($this->returnValue($page));
+ $view->expects($this->once())->method('getLayout')->will($this->returnValue($layout));
+
+ $request = $this->createPartialMock(\Magento\Framework\App\Console\Request::class, ['getQueryValue']);
+ $request->expects($this->once())->method('getQueryValue')->will($this->returnValue($expectedQuery));
+
+ $collection = $this->createPartialMock(
+ \Magento\CatalogSearch\Model\ResourceModel\Advanced\Collection::class,
+ ['getSize']
+ );
+ $collection->expects($this->once())->method('getSize')->will($this->returnValue(0));
+
+ $catalogSearchAdvanced = $this->createPartialMock(
+ \Magento\CatalogSearch\Model\Advanced::class,
+ ['addFilters', '__wakeup', 'getProductCollection']
+ );
+
+ $catalogSearchAdvanced->expects($this->once())->method('getProductCollection')
+ ->will($this->returnValue($collection));
+
+ $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $context = $objectManager->getObject(
+ \Magento\Framework\App\Action\Context::class,
+ ['view' => $view, 'request' => $request]
+ );
+
+ /** @var \Magento\CatalogSearch\Controller\Advanced\Result $instance */
+ $instance = $objectManager->getObject(
+ \Magento\CatalogSearch\Controller\Advanced\Result::class,
+ ['context' => $context, 'catalogSearchAdvanced' => $catalogSearchAdvanced]
+ );
+ $instance->execute();
+ }
}
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/AttributeTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/AttributeTest.php
index abc0fdd1069fe..69e2c33d02d1a 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/AttributeTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/AttributeTest.php
@@ -321,10 +321,6 @@ public function testGetItemsWithoutApply()
->method('build')
->will($this->returnValue($builtData));
- $this->fulltextCollection->expects($this->once())
- ->method('getSize')
- ->will($this->returnValue(50));
-
$expectedFilterItems = [
$this->createFilterItem(0, $builtData[0]['label'], $builtData[0]['value'], $builtData[0]['count']),
$this->createFilterItem(1, $builtData[1]['label'], $builtData[1]['value'], $builtData[1]['count']),
@@ -383,9 +379,6 @@ public function testGetItemsOnlyWithResults()
$this->fulltextCollection->expects($this->once())
->method('getFacetedData')
->willReturn($facetedData);
- $this->fulltextCollection->expects($this->once())
- ->method('getSize')
- ->will($this->returnValue(50));
$this->itemDataBuilder->expects($this->once())
->method('addItemData')
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ObjectRegistry.php b/app/code/Magento/CatalogUrlRewrite/Model/ObjectRegistry.php
index 019959f9c1fea..a048c216139e3 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/ObjectRegistry.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/ObjectRegistry.php
@@ -5,6 +5,9 @@
*/
namespace Magento\CatalogUrlRewrite\Model;
+/**
+ * Class ObjectRegistry
+ */
class ObjectRegistry
{
/**
@@ -26,15 +29,19 @@ public function __construct($entities)
}
/**
+ * Get Entity
+ *
* @param int $entityId
* @return \Magento\Framework\DataObject|null
*/
public function get($entityId)
{
- return isset($this->entitiesMap[$entityId]) ? $this->entitiesMap[$entityId] : null;
+ return $this->entitiesMap[$entityId] ?? null;
}
/**
+ * List Entities
+ *
* @return \Magento\Framework\DataObject[]
*/
public function getList()
diff --git a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
index 55f4d67273379..2b95de24d0201 100644
--- a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
+++ b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
@@ -11,11 +11,13 @@
use Magento\Framework\Pricing\PriceCurrencyInterface;
use Magento\Framework\Serialize\Serializer\Json;
use Magento\Widget\Block\BlockInterface;
+use Magento\Framework\Url\EncoderInterface;
/**
* Catalog Products List widget block
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implements BlockInterface, IdentityInterface
{
@@ -94,6 +96,11 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
*/
private $json;
+ /**
+ * @var \Magento\Framework\Url\EncoderInterface|null
+ */
+ private $urlEncoder;
+
/**
* @param \Magento\Catalog\Block\Product\Context $context
* @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
@@ -104,6 +111,7 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
* @param \Magento\Widget\Helper\Conditions $conditionsHelper
* @param array $data
* @param Json|null $json
+ * @param \Magento\Framework\Url\EncoderInterface|null $urlEncoder
*/
public function __construct(
\Magento\Catalog\Block\Product\Context $context,
@@ -114,7 +122,8 @@ public function __construct(
\Magento\CatalogWidget\Model\Rule $rule,
\Magento\Widget\Helper\Conditions $conditionsHelper,
array $data = [],
- Json $json = null
+ Json $json = null,
+ EncoderInterface $urlEncoder = null
) {
$this->productCollectionFactory = $productCollectionFactory;
$this->catalogProductVisibility = $catalogProductVisibility;
@@ -123,6 +132,7 @@ public function __construct(
$this->rule = $rule;
$this->conditionsHelper = $conditionsHelper;
$this->json = $json ?: ObjectManager::getInstance()->get(Json::class);
+ $this->urlEncoder = $urlEncoder ?: ObjectManager::getInstance()->get(EncoderInterface::class);
parent::__construct(
$context,
$data
@@ -153,6 +163,7 @@ protected function _construct()
* Get key pieces for caching block content
*
* @return array
+ * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
*/
public function getCacheKeyInfo()
{
@@ -230,6 +241,7 @@ protected function _beforeToHtml()
* Prepare and return product collection
*
* @return \Magento\Catalog\Model\ResourceModel\Product\Collection
+ * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
*/
public function createCollection()
{
@@ -409,6 +421,22 @@ private function getPriceCurrency()
return $this->priceCurrency;
}
+ /**
+ * @inheritdoc
+ */
+ public function getAddToCartUrl($product, $additional = [])
+ {
+ $requestingPageUrl = $this->getRequest()->getParam('requesting_page_url');
+
+ if (!empty($requestingPageUrl)) {
+ $additional['useUencPlaceholder'] = true;
+ $url = parent::getAddToCartUrl($product, $additional);
+ return str_replace('%25uenc%25', $this->urlEncoder->encode($requestingPageUrl), $url);
+ }
+
+ return parent::getAddToCartUrl($product, $additional);
+ }
+
/**
* Get widget block name
*
diff --git a/app/code/Magento/CatalogWidget/Test/Mftf/Section/ProductListWidgetSection.xml b/app/code/Magento/CatalogWidget/Test/Mftf/Section/ProductListWidgetSection.xml
new file mode 100644
index 0000000000000..03bef8ffa3b7d
--- /dev/null
+++ b/app/code/Magento/CatalogWidget/Test/Mftf/Section/ProductListWidgetSection.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Checkout/Block/Onepage.php b/app/code/Magento/Checkout/Block/Onepage.php
index ca6b045ddbb5d..e01d5835b4cf0 100644
--- a/app/code/Magento/Checkout/Block/Onepage.php
+++ b/app/code/Magento/Checkout/Block/Onepage.php
@@ -38,7 +38,7 @@ class Onepage extends \Magento\Framework\View\Element\Template
protected $layoutProcessors;
/**
- * @var \Magento\Framework\Serialize\Serializer\Json
+ * @var \Magento\Framework\Serialize\SerializerInterface
*/
private $serializer;
@@ -48,8 +48,9 @@ class Onepage extends \Magento\Framework\View\Element\Template
* @param \Magento\Checkout\Model\CompositeConfigProvider $configProvider
* @param array $layoutProcessors
* @param array $data
- * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
- * @throws \RuntimeException
+ * @param \Magento\Framework\Serialize\Serializer\Json $serializer
+ * @param \Magento\Framework\Serialize\SerializerInterface $serializerInterface
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function __construct(
\Magento\Framework\View\Element\Template\Context $context,
@@ -57,7 +58,8 @@ public function __construct(
\Magento\Checkout\Model\CompositeConfigProvider $configProvider,
array $layoutProcessors = [],
array $data = [],
- \Magento\Framework\Serialize\Serializer\Json $serializer = null
+ \Magento\Framework\Serialize\Serializer\Json $serializer = null,
+ \Magento\Framework\Serialize\SerializerInterface $serializerInterface = null
) {
parent::__construct($context, $data);
$this->formKey = $formKey;
@@ -65,12 +67,12 @@ public function __construct(
$this->jsLayout = isset($data['jsLayout']) && is_array($data['jsLayout']) ? $data['jsLayout'] : [];
$this->configProvider = $configProvider;
$this->layoutProcessors = $layoutProcessors;
- $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
- ->get(\Magento\Framework\Serialize\Serializer\Json::class);
+ $this->serializer = $serializerInterface ?: \Magento\Framework\App\ObjectManager::getInstance()
+ ->get(\Magento\Framework\Serialize\Serializer\JsonHexTag::class);
}
/**
- * @return string
+ * @inheritdoc
*/
public function getJsLayout()
{
@@ -78,7 +80,7 @@ public function getJsLayout()
$this->jsLayout = $processor->process($this->jsLayout);
}
- return json_encode($this->jsLayout, JSON_HEX_TAG);
+ return $this->serializer->serialize($this->jsLayout);
}
/**
@@ -115,11 +117,13 @@ public function getBaseUrl()
}
/**
+ * Retrieve serialized checkout config.
+ *
* @return bool|string
* @since 100.2.0
*/
public function getSerializedCheckoutConfig()
{
- return json_encode($this->getCheckoutConfig(), JSON_HEX_TAG);
+ return $this->serializer->serialize($this->getCheckoutConfig());
}
}
diff --git a/app/code/Magento/Checkout/CustomerData/Cart.php b/app/code/Magento/Checkout/CustomerData/Cart.php
index ddb077462ef10..01e91d75c02d9 100644
--- a/app/code/Magento/Checkout/CustomerData/Cart.php
+++ b/app/code/Magento/Checkout/CustomerData/Cart.php
@@ -82,7 +82,7 @@ public function __construct(
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function getSectionData()
{
@@ -158,11 +158,10 @@ protected function getRecentItems()
: $item->getProduct();
$products = $this->catalogUrl->getRewriteByProductStore([$product->getId() => $item->getStoreId()]);
- if (!isset($products[$product->getId()])) {
- continue;
+ if (isset($products[$product->getId()])) {
+ $urlDataObject = new \Magento\Framework\DataObject($products[$product->getId()]);
+ $item->getProduct()->setUrlDataObject($urlDataObject);
}
- $urlDataObject = new \Magento\Framework\DataObject($products[$product->getId()]);
- $item->getProduct()->setUrlDataObject($urlDataObject);
}
$items[] = $this->itemPoolInterface->getItemData($item);
}
diff --git a/app/code/Magento/Checkout/Model/DefaultConfigProvider.php b/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
index fd120f0a37a4b..f30bd73deeae2 100644
--- a/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
+++ b/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
@@ -282,10 +282,12 @@ public function getConfig()
$quote = $this->checkoutSession->getQuote();
$quoteId = $quote->getId();
$email = $quote->getShippingAddress()->getEmail();
+ $quoteItemData = $this->getQuoteItemData();
$output['formKey'] = $this->formKey->getFormKey();
$output['customerData'] = $this->getCustomerData();
$output['quoteData'] = $this->getQuoteData();
- $output['quoteItemData'] = $this->getQuoteItemData();
+ $output['quoteItemData'] = $quoteItemData;
+ $output['quoteMessages'] = $this->getQuoteItemsMessages($quoteItemData);
$output['isCustomerLoggedIn'] = $this->isCustomerLoggedIn();
$output['selectedShippingMethod'] = $this->getSelectedShippingMethod();
if ($email && !$this->isCustomerLoggedIn()) {
@@ -316,6 +318,7 @@ public function getConfig()
);
$output['postCodes'] = $this->postCodesConfig->getPostCodes();
$output['imageData'] = $this->imageProvider->getImages($quoteId);
+
$output['totalsData'] = $this->getTotalsData();
$output['shippingPolicy'] = [
'isEnabled' => $this->scopeConfig->isSetFlag(
@@ -450,6 +453,7 @@ private function getQuoteItemData()
$quoteItem->getProduct(),
'product_thumbnail_image'
)->getUrl();
+ $quoteItemData[$index]['message'] = $quoteItem->getMessage();
}
}
return $quoteItemData;
@@ -776,4 +780,22 @@ private function getAttributeLabels(array $customAttribute, string $customAttrib
return $attributeOptionLabels;
}
+
+ /**
+ * Get notification messages for the quote items
+ *
+ * @param array $quoteItemData
+ * @return array
+ */
+ private function getQuoteItemsMessages(array $quoteItemData): array
+ {
+ $quoteItemsMessages = [];
+ if ($quoteItemData) {
+ foreach ($quoteItemData as $item) {
+ $quoteItemsMessages[$item['item_id']] = $item['message'];
+ }
+ }
+
+ return $quoteItemsMessages;
+ }
}
diff --git a/app/code/Magento/Checkout/Observer/SalesQuoteSaveAfterObserver.php b/app/code/Magento/Checkout/Observer/SalesQuoteSaveAfterObserver.php
index d926e33d54113..6bc7965ff5e34 100644
--- a/app/code/Magento/Checkout/Observer/SalesQuoteSaveAfterObserver.php
+++ b/app/code/Magento/Checkout/Observer/SalesQuoteSaveAfterObserver.php
@@ -7,6 +7,9 @@
use Magento\Framework\Event\ObserverInterface;
+/**
+ * Class SalesQuoteSaveAfterObserver
+ */
class SalesQuoteSaveAfterObserver implements ObserverInterface
{
/**
@@ -24,15 +27,18 @@ public function __construct(\Magento\Checkout\Model\Session $checkoutSession)
}
/**
+ * Assign quote to session
+ *
* @param \Magento\Framework\Event\Observer $observer
* @return void
*/
public function execute(\Magento\Framework\Event\Observer $observer)
{
+ /* @var \Magento\Quote\Model\Quote $quote */
$quote = $observer->getEvent()->getQuote();
- /* @var $quote \Magento\Quote\Model\Quote */
+
if ($quote->getIsCheckoutCart()) {
- $this->checkoutSession->getQuoteId($quote->getId());
+ $this->checkoutSession->setQuoteId($quote->getId());
}
}
}
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
index 18bf70a613b50..464ccc1913335 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
@@ -21,11 +21,22 @@
+
+
+
+
+
+
+
@@ -88,11 +104,18 @@
+
+
+
+
-
+
+
+
+
+
+
+
@@ -161,7 +202,7 @@
@@ -236,6 +277,7 @@
+
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/FillShippingZipFormActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/FillShippingZipFormActionGroup.xml
new file mode 100644
index 0000000000000..f12bf4344ab12
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/FillShippingZipFormActionGroup.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml
index 62dd6b67b78a6..34f2cfe7f7fff 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml
@@ -65,4 +65,11 @@
+
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
index 0499a57a9211a..72c5648991ef5 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
@@ -90,7 +90,7 @@
- Bahamas
+
+
+ - Australia
+ - Brazil
+ - Canada
+ - Croatia
+ - Estonia
+ - India
+ - Latvia
+ - Lithuania
+ - Romania
+ - Spain
+ - Switzerland
+ - United States
+ - Australia
+
+
+
+
+ - United Kingdom
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
index 3dcf399c9ad54..0206c18b819c2 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
@@ -23,7 +23,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
index 00d80cc2a94d9..35e0058440f6e 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
@@ -158,13 +158,13 @@
-
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
index 05a6939941f3e..371826c9e7841 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
@@ -158,13 +158,13 @@
-
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
index 1ef7403e94ce1..e7c2ad3dd28a4 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
@@ -15,7 +15,7 @@
@@ -26,10 +26,13 @@
-
@@ -48,6 +51,8 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
index cc5e723c72ea0..8537e10ce5a03 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
@@ -79,8 +79,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml
index f9533fd946f35..7b81f12624864 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml
@@ -69,6 +69,25 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontShoppingCartCheckCustomerDefaultShippingAddressForVirtualQuoteTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontShoppingCartCheckCustomerDefaultShippingAddressForVirtualQuoteTest.xml
new file mode 100644
index 0000000000000..70f950f6f6c35
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontShoppingCartCheckCustomerDefaultShippingAddressForVirtualQuoteTest.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{US_Address_CA.postcode}}
+ grabTextPostCode
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/ZeroSubtotalOrdersWithProcessingStatusTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/ZeroSubtotalOrdersWithProcessingStatusTest.xml
index ace50aa3e6d33..2cc21df85ab67 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/ZeroSubtotalOrdersWithProcessingStatusTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/ZeroSubtotalOrdersWithProcessingStatusTest.xml
@@ -36,6 +36,7 @@
- Magento\Checkout\Block\Checkout\TotalsProcessor
- Magento\Checkout\Block\Checkout\DirectoryDataProcessor
+ Magento\Framework\Serialize\Serializer\JsonHexTag
diff --git a/app/code/Magento/Checkout/view/adminhtml/email/failed_payment.html b/app/code/Magento/Checkout/view/adminhtml/email/failed_payment.html
index fb55f9b601dc9..03ad7d9e8d848 100644
--- a/app/code/Magento/Checkout/view/adminhtml/email/failed_payment.html
+++ b/app/code/Magento/Checkout/view/adminhtml/email/failed_payment.html
@@ -23,43 +23,43 @@ {{trans "Payment Transaction Failed"}}
- {{trans "Reason"}} {{trans "Reason"}}
- {{trans "Checkout Type"}} {{trans "Checkout Type"}}
- {{trans "Customer:"}} {{trans "Customer:"}} {{var customer}} <{{var customerEmail}}>
- {{trans "Items"}} {{trans "Items"}}
- {{trans "Total:"}} {{trans "Total:"}}
- {{trans "Billing Address:"}} {{trans "Billing Address:"}}
- {{trans "Shipping Address:"}} {{trans "Shipping Address:"}}
- {{trans "Shipping Method:"}} {{trans "Shipping Method:"}}
- {{trans "Payment Method:"}} {{trans "Payment Method:"}}
- {{trans "Date & Time:"}} {{trans "Date & Time:"}}
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
index d4fadedf5d7a0..64b70e80bd84f 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
@@ -404,6 +404,10 @@
- Magento_Checkout/js/view/summary/item/details/subtotal
- after_details
+ -
+
- Magento_Checkout/js/view/summary/item/details/message
+ - item_message
+
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
index e6d0260cf2305..20be9cd010c64 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
@@ -41,6 +41,14 @@
getChildHtml('minicart.addons') ?>
+
+
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
index 086b7423befec..faa15f7240235 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
@@ -104,7 +104,7 @@
getConfig('general/region/display_all') ? ' disabled="disabled"' : '' ?>>
+ class="validate-select region_id" getConfig('general/region/display_all') ? ' disabled="disabled"' : '' ?>>
escapeHtml(__('Please select a region, state or province.')) ?>
getData('customer_address');
+?>
+
+
+
escapeHtml(__('Additional Address Entries')) ?>
+
+ getAdditionalAddresses()): ?>
+
+
+
+
+
+
+
+
+
+
+
+ escapeHtml($address->getFirstname()) ?>
+ escapeHtml($address->getLastname()) ?>
+ escapeHtml($block->getStreetAddress($address)) ?>
+ escapeHtml($address->getCity()) ?>
+ getCountryByCode($address->getCountryId()) ?>
+ getRegion()->getRegion() ?>
+ escapeHtml($address->getPostcode()) ?>
+ escapeHtml($address->getTelephone()) ?>
+
+ escapeHtml(__('Edit')) ?> escapeHtml(__('Delete')) ?>
+
+
+
+
+
+ getChildHtml('pager')): ?>
+
getChildHtml('pager') ?>
+
+
+
escapeHtml(__('You have no other address entries in your address book.')) ?>
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
index bb86c9f453dfb..f11177ae19f7c 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -94,7 +94,7 @@
getAttributeData()->getFrontendLabel('region') ?>
-
+
escapeHtml(__('Please select a region, state or province.')) ?>
-
-
-
-
+
diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
index ca4ac6cc245a7..c92753b96225c 100644
--- a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
@@ -10,6 +10,40 @@ type Mutation {
changeCustomerPassword(currentPassword: String!, newPassword: String!): Customer @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\ChangePassword") @doc(description:"Changes the password for the logged-in customer")
updateCustomer (input: UpdateCustomerInput!): UpdateCustomerOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\UpdateCustomer") @doc(description:"Update the customer's personal information")
revokeCustomerToken: RevokeCustomerTokenOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\RevokeCustomerToken") @doc(description:"Revoke the customer token")
+ createCustomerAddress(input: CustomerAddressInput!): CustomerAddress @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\CreateCustomerAddress") @doc(description: "Create customer address")
+ updateCustomerAddress(id: Int!, input: CustomerAddressInput): CustomerAddress @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\UpdateCustomerAddress") @doc(description: "Update customer address")
+ deleteCustomerAddress(id: Int!): Boolean @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\DeleteCustomerAddress") @doc(description: "Delete customer address")
+}
+
+input CustomerAddressInput {
+ firstname: String @doc(description: "The first name of the person associated with the shipping/billing address")
+ lastname: String @doc(description: "The family name of the person associated with the shipping/billing address")
+ company: String @doc(description: "The customer's company")
+ telephone: String @doc(description: "The telephone number")
+ street: [String] @doc(description: "An array of strings that define the street number and name")
+ city: String @doc(description: "The city or town")
+ region: CustomerAddressRegionInput @doc(description: "An object containing the region name, region code, and region ID")
+ postcode: String @doc(description: "The customer's ZIP or postal code")
+ country_id: CountryCodeEnum @doc(description: "The customer's country")
+ default_shipping: Boolean @doc(description: "Indicates whether the address is the default shipping address")
+ default_billing: Boolean @doc(description: "Indicates whether the address is the default billing address")
+ fax: String @doc(description: "The fax number")
+ middlename: String @doc(description: "The middle name of the person associated with the shipping/billing address")
+ prefix: String @doc(description: "An honorific, such as Dr., Mr., or Mrs.")
+ suffix: String @doc(description: "A value such as Sr., Jr., or III")
+ vat_id: String @doc(description: "The customer's Tax/VAT number (for corporate customers)")
+ custom_attributes: [CustomerAddressAttributeInput] @doc(description: "Address custom attributes")
+}
+
+input CustomerAddressRegionInput @doc(description: "CustomerAddressRegionInput defines the customer's state or province") {
+ region_code: String @doc(description: "The address region code")
+ region: String @doc(description: "The state or province name")
+ region_id: Int @doc(description: "Uniquely identifies the region")
+}
+
+input CustomerAddressAttributeInput {
+ attribute_code: String! @doc(description: "Attribute code")
+ value: String! @doc(description: "Attribute value")
}
type CustomerToken {
@@ -70,6 +104,8 @@ type CustomerAddress @doc(description: "CustomerAddress contains detailed inform
vat_id: String @doc(description: "The customer's Tax/VAT number (for corporate customers)")
default_shipping: Boolean @doc(description: "Indicates whether the address is the default shipping address")
default_billing: Boolean @doc(description: "Indicates whether the address is the default billing address")
+ custom_attributes: [CustomerAddressAttribute] @doc(description: "Address custom attributes")
+ extension_attributes: [CustomerAddressAttribute] @doc(description: "Address extension attributes")
}
type CustomerAddressRegion @doc(description: "CustomerAddressRegion defines the customer's state or province") {
@@ -77,3 +113,256 @@ type CustomerAddressRegion @doc(description: "CustomerAddressRegion defines the
region: String @doc(description: "The state or province name")
region_id: Int @doc(description: "Uniquely identifies the region")
}
+
+type CustomerAddressAttribute {
+ attribute_code: String @doc(description: "Attribute code")
+ value: String @doc(description: "Attribute value")
+}
+
+enum CountryCodeEnum @doc(description: "The list of countries codes") {
+ AF @doc(description: "Afghanistan")
+ AX @doc(description: "Åland Islands")
+ AL @doc(description: "Albania")
+ DZ @doc(description: "Algeria")
+ AS @doc(description: "American Samoa")
+ AD @doc(description: "Andorra")
+ AO @doc(description: "Angola")
+ AI @doc(description: "Anguilla")
+ AQ @doc(description: "Antarctica")
+ AG @doc(description: "Antigua & Barbuda")
+ AR @doc(description: "Argentina")
+ AM @doc(description: "Armenia")
+ AW @doc(description: "Aruba")
+ AU @doc(description: "Australia")
+ AT @doc(description: "Austria")
+ AZ @doc(description: "Azerbaijan")
+ BS @doc(description: "Bahamas")
+ BH @doc(description: "Bahrain")
+ BD @doc(description: "Bangladesh")
+ BB @doc(description: "Barbados")
+ BY @doc(description: "Belarus")
+ BE @doc(description: "Belgium")
+ BZ @doc(description: "Belize")
+ BJ @doc(description: "Benin")
+ BM @doc(description: "Bermuda")
+ BT @doc(description: "Bhutan")
+ BO @doc(description: "Bolivia")
+ BA @doc(description: "Bosnia & Herzegovina")
+ BW @doc(description: "Botswana")
+ BV @doc(description: "Bouvet Island")
+ BR @doc(description: "Brazil")
+ IO @doc(description: "British Indian Ocean Territory")
+ VG @doc(description: "British Virgin Islands")
+ BN @doc(description: "Brunei")
+ BG @doc(description: "Bulgaria")
+ BF @doc(description: "Burkina Faso")
+ BI @doc(description: "Burundi")
+ KH @doc(description: "Cambodia")
+ CM @doc(description: "Cameroon")
+ CA @doc(description: "Canada")
+ CV @doc(description: "Cape Verde")
+ KY @doc(description: "Cayman Islands")
+ CF @doc(description: "Central African Republic")
+ TD @doc(description: "Chad")
+ CL @doc(description: "Chile")
+ CN @doc(description: "China")
+ CX @doc(description: "Christmas Island")
+ CC @doc(description: "Cocos (Keeling) Islands")
+ CO @doc(description: "Colombia")
+ KM @doc(description: "Comoros")
+ CG @doc(description: "Congo -Brazzaville")
+ CD @doc(description: "Congo - Kinshasa")
+ CK @doc(description: "Cook Islands")
+ CR @doc(description: "Costa Rica")
+ CI @doc(description: "Côte d’Ivoire")
+ HR @doc(description: "Croatia")
+ CU @doc(description: "Cuba")
+ CY @doc(description: "Cyprus")
+ CZ @doc(description: "Czech Republic")
+ DK @doc(description: "Denmark")
+ DJ @doc(description: "Djibouti")
+ DM @doc(description: "Dominica")
+ DO @doc(description: "Dominican Republic")
+ EC @doc(description: "Ecuador")
+ EG @doc(description: "Egypt")
+ SV @doc(description: "El Salvador")
+ GQ @doc(description: "Equatorial Guinea")
+ ER @doc(description: "Eritrea")
+ EE @doc(description: "Estonia")
+ ET @doc(description: "Ethiopia")
+ FK @doc(description: "Falkland Islands")
+ FO @doc(description: "Faroe Islands")
+ FJ @doc(description: "Fiji")
+ FI @doc(description: "Finland")
+ FR @doc(description: "France")
+ GF @doc(description: "French Guiana")
+ PF @doc(description: "French Polynesia")
+ TF @doc(description: "French Southern Territories")
+ GA @doc(description: "Gabon")
+ GM @doc(description: "Gambia")
+ GE @doc(description: "Georgia")
+ DE @doc(description: "Germany")
+ GH @doc(description: "Ghana")
+ GI @doc(description: "Gibraltar")
+ GR @doc(description: "Greece")
+ GL @doc(description: "Greenland")
+ GD @doc(description: "Grenada")
+ GP @doc(description: "Guadeloupe")
+ GU @doc(description: "Guam")
+ GT @doc(description: "Guatemala")
+ GG @doc(description: "Guernsey")
+ GN @doc(description: "Guinea")
+ GW @doc(description: "Guinea-Bissau")
+ GY @doc(description: "Guyana")
+ HT @doc(description: "Haiti")
+ HM @doc(description: "Heard & McDonald Islands")
+ HN @doc(description: "Honduras")
+ HK @doc(description: "Hong Kong SAR China")
+ HU @doc(description: "Hungary")
+ IS @doc(description: "Iceland")
+ IN @doc(description: "India")
+ ID @doc(description: "Indonesia")
+ IR @doc(description: "Iran")
+ IQ @doc(description: "Iraq")
+ IE @doc(description: "Ireland")
+ IM @doc(description: "Isle of Man")
+ IL @doc(description: "Israel")
+ IT @doc(description: "Italy")
+ JM @doc(description: "Jamaica")
+ JP @doc(description: "Japan")
+ JE @doc(description: "Jersey")
+ JO @doc(description: "Jordan")
+ KZ @doc(description: "Kazakhstan")
+ KE @doc(description: "Kenya")
+ KI @doc(description: "Kiribati")
+ KW @doc(description: "Kuwait")
+ KG @doc(description: "Kyrgyzstan")
+ LA @doc(description: "Laos")
+ LV @doc(description: "Latvia")
+ LB @doc(description: "Lebanon")
+ LS @doc(description: "Lesotho")
+ LR @doc(description: "Liberia")
+ LY @doc(description: "Libya")
+ LI @doc(description: "Liechtenstein")
+ LT @doc(description: "Lithuania")
+ LU @doc(description: "Luxembourg")
+ MO @doc(description: "Macau SAR China")
+ MK @doc(description: "Macedonia")
+ MG @doc(description: "Madagascar")
+ MW @doc(description: "Malawi")
+ MY @doc(description: "Malaysia")
+ MV @doc(description: "Maldives")
+ ML @doc(description: "Mali")
+ MT @doc(description: "Malta")
+ MH @doc(description: "Marshall Islands")
+ MQ @doc(description: "Martinique")
+ MR @doc(description: "Mauritania")
+ MU @doc(description: "Mauritius")
+ YT @doc(description: "Mayotte")
+ MX @doc(description: "Mexico")
+ FM @doc(description: "Micronesia")
+ MD @doc(description: "Moldova")
+ MC @doc(description: "Monaco")
+ MN @doc(description: "Mongolia")
+ ME @doc(description: "Montenegro")
+ MS @doc(description: "Montserrat")
+ MA @doc(description: "Morocco")
+ MZ @doc(description: "Mozambique")
+ MM @doc(description: "Myanmar (Burma)")
+ NA @doc(description: "Namibia")
+ NR @doc(description: "Nauru")
+ NP @doc(description: "Nepal")
+ NL @doc(description: "Netherlands")
+ AN @doc(description: "Netherlands Antilles")
+ NC @doc(description: "New Caledonia")
+ NZ @doc(description: "New Zealand")
+ NI @doc(description: "Nicaragua")
+ NE @doc(description: "Niger")
+ NG @doc(description: "Nigeria")
+ NU @doc(description: "Niue")
+ NF @doc(description: "Norfolk Island")
+ MP @doc(description: "Northern Mariana Islands")
+ KP @doc(description: "North Korea")
+ NO @doc(description: "Norway")
+ OM @doc(description: "Oman")
+ PK @doc(description: "Pakistan")
+ PW @doc(description: "Palau")
+ PS @doc(description: "Palestinian Territories")
+ PA @doc(description: "Panama")
+ PG @doc(description: "Papua New Guinea")
+ PY @doc(description: "Paraguay")
+ PE @doc(description: "Peru")
+ PH @doc(description: "Philippines")
+ PN @doc(description: "Pitcairn Islands")
+ PL @doc(description: "Poland")
+ PT @doc(description: "Portugal")
+ QA @doc(description: "Qatar")
+ RE @doc(description: "Réunion")
+ RO @doc(description: "Romania")
+ RU @doc(description: "Russia")
+ RW @doc(description: "Rwanda")
+ WS @doc(description: "Samoa")
+ SM @doc(description: "San Marino")
+ ST @doc(description: "São Tomé & Príncipe")
+ SA @doc(description: "Saudi Arabia")
+ SN @doc(description: "Senegal")
+ RS @doc(description: "Serbia")
+ SC @doc(description: "Seychelles")
+ SL @doc(description: "Sierra Leone")
+ SG @doc(description: "Singapore")
+ SK @doc(description: "Slovakia")
+ SI @doc(description: "Slovenia")
+ SB @doc(description: "Solomon Islands")
+ SO @doc(description: "Somalia")
+ ZA @doc(description: "South Africa")
+ GS @doc(description: "South Georgia & South Sandwich Islands")
+ KR @doc(description: "South Korea")
+ ES @doc(description: "Spain")
+ LK @doc(description: "Sri Lanka")
+ BL @doc(description: "St. Barthélemy")
+ SH @doc(description: "St. Helena")
+ KN @doc(description: "St. Kitts & Nevis")
+ LC @doc(description: "St. Lucia")
+ MF @doc(description: "St. Martin")
+ PM @doc(description: "St. Pierre & Miquelon")
+ VC @doc(description: "St. Vincent & Grenadines")
+ SD @doc(description: "Sudan")
+ SR @doc(description: "Suriname")
+ SJ @doc(description: "Svalbard & Jan Mayen")
+ SZ @doc(description: "Swaziland")
+ SE @doc(description: "Sweden")
+ CH @doc(description: "Switzerland")
+ SY @doc(description: "Syria")
+ TW @doc(description: "Taiwan")
+ TJ @doc(description: "Tajikistan")
+ TZ @doc(description: "Tanzania")
+ TH @doc(description: "Thailand")
+ TL @doc(description: "Timor-Leste")
+ TG @doc(description: "Togo")
+ TK @doc(description: "Tokelau")
+ TO @doc(description: "Tonga")
+ TT @doc(description: "Trinidad & Tobago")
+ TN @doc(description: "Tunisia")
+ TR @doc(description: "Turkey")
+ TM @doc(description: "Turkmenistan")
+ TC @doc(description: "Turks & Caicos Islands")
+ TV @doc(description: "Tuvalu")
+ UG @doc(description: "Uganda")
+ UA @doc(description: "Ukraine")
+ AE @doc(description: "United Arab Emirates")
+ GB @doc(description: "United Kingdom")
+ US @doc(description: "United States")
+ UY @doc(description: "Uruguay")
+ UM @doc(description: "U.S. Outlying Islands")
+ VI @doc(description: "U.S. Virgin Islands")
+ UZ @doc(description: "Uzbekistan")
+ VU @doc(description: "Vanuatu")
+ VA @doc(description: "Vatican City")
+ VE @doc(description: "Venezuela")
+ VN @doc(description: "Vietnam")
+ WF @doc(description: "Wallis & Futuna")
+ EH @doc(description: "Western Sahara")
+ YE @doc(description: "Yemen")
+ ZM @doc(description: "Zambia")
+ ZW @doc(description: "Zimbabwe")
+}
\ No newline at end of file
diff --git a/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php b/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php
index f779505a38011..43623019c005e 100644
--- a/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php
+++ b/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php
@@ -13,6 +13,9 @@
use Magento\ImportExport\Model\ResourceModel\CollectionByPagesIteratorFactory;
use Magento\ImportExport\Model\ResourceModel\CollectionByPagesIterator;
+/**
+ * Storage to check existing customers.
+ */
class Storage
{
/**
@@ -48,6 +51,11 @@ class Storage
*/
private $customerCollectionFactory;
+ /**
+ * @var CustomerCollection
+ */
+ public $_customerCollection;
+
/**
* @param CustomerCollectionFactory $collectionFactory
* @param CollectionByPagesIteratorFactory $colIteratorFactory
@@ -112,6 +120,8 @@ private function loadCustomersData(array $customerIdentifiers)
}
/**
+ * Add a customer by an array
+ *
* @param array $customer
* @return $this
*/
diff --git a/app/code/Magento/Deploy/Collector/Collector.php b/app/code/Magento/Deploy/Collector/Collector.php
index b02c8e478d639..5974297a76cc7 100644
--- a/app/code/Magento/Deploy/Collector/Collector.php
+++ b/app/code/Magento/Deploy/Collector/Collector.php
@@ -8,6 +8,8 @@
use Magento\Deploy\Source\SourcePool;
use Magento\Deploy\Package\Package;
use Magento\Deploy\Package\PackageFactory;
+use Magento\Deploy\Package\PackageFile;
+use Magento\Framework\Module\Manager;
use Magento\Framework\View\Asset\PreProcessor\FileNameResolver;
/**
@@ -43,6 +45,9 @@ class Collector implements CollectorInterface
* @var PackageFactory
*/
private $packageFactory;
+
+ /** @var \Magento\Framework\Module\Manager */
+ private $moduleManager;
/**
* Default values for package primary identifiers
@@ -61,15 +66,19 @@ class Collector implements CollectorInterface
* @param SourcePool $sourcePool
* @param FileNameResolver $fileNameResolver
* @param PackageFactory $packageFactory
+ * @param Manager|null $moduleManager
*/
public function __construct(
SourcePool $sourcePool,
FileNameResolver $fileNameResolver,
- PackageFactory $packageFactory
+ PackageFactory $packageFactory,
+ Manager $moduleManager = null
) {
$this->sourcePool = $sourcePool;
$this->fileNameResolver = $fileNameResolver;
$this->packageFactory = $packageFactory;
+ $this->moduleManager = $moduleManager ?: \Magento\Framework\App\ObjectManager::getInstance()
+ ->get(\Magento\Framework\Module\Manager::class);
}
/**
@@ -81,19 +90,11 @@ public function collect()
foreach ($this->sourcePool->getAll() as $source) {
$files = $source->get();
foreach ($files as $file) {
- $file->setDeployedFileName($this->fileNameResolver->resolve($file->getFileName()));
- $params = [
- 'area' => $file->getArea(),
- 'theme' => $file->getTheme(),
- 'locale' => $file->getLocale(),
- 'module' => $file->getModule(),
- 'isVirtual' => (!$file->getLocale() || !$file->getTheme() || !$file->getArea())
- ];
- foreach ($this->packageDefaultValues as $name => $value) {
- if (!isset($params[$name])) {
- $params[$name] = $value;
- }
+ if ($file->getModule() && !$this->moduleManager->isEnabled($file->getModule())) {
+ continue;
}
+ $file->setDeployedFileName($this->fileNameResolver->resolve($file->getFileName()));
+ $params = $this->getParams($file);
$packagePath = "{$params['area']}/{$params['theme']}/{$params['locale']}";
if (!isset($packages[$packagePath])) {
$packages[$packagePath] = $this->packageFactory->create($params);
@@ -105,4 +106,27 @@ public function collect()
}
return $packages;
}
+
+ /**
+ * Retrieve package params
+ *
+ * @param PackageFile $file
+ * @return array
+ */
+ private function getParams(PackageFile $file)
+ {
+ $params = [
+ 'area' => $file->getArea(),
+ 'theme' => $file->getTheme(),
+ 'locale' => $file->getLocale(),
+ 'module' => $file->getModule(),
+ 'isVirtual' => (!$file->getLocale() || !$file->getTheme() || !$file->getArea())
+ ];
+ foreach ($this->packageDefaultValues as $name => $value) {
+ if (!isset($params[$name])) {
+ $params[$name] = $value;
+ }
+ }
+ return $params;
+ }
}
diff --git a/app/code/Magento/Deploy/Model/Filesystem.php b/app/code/Magento/Deploy/Model/Filesystem.php
index 59880d2d669b4..e7d4d31e6f144 100644
--- a/app/code/Magento/Deploy/Model/Filesystem.php
+++ b/app/code/Magento/Deploy/Model/Filesystem.php
@@ -29,8 +29,8 @@ class Filesystem
* Access permissions to the files are set during deploy Magento 2, directly after
* uploading code of Magento. Also it is possible to specify the value
* of inverse mask for setting access permissions to files generated by Magento.
- * @link http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
- * @link http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
+ * @link https://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
+ * @link https://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
*/
const PERMISSIONS_FILE = 0640;
@@ -41,8 +41,8 @@ class Filesystem
* Access permissions to the directories are set during deploy Magento 2, directly after
* uploading code of Magento. Also it is possible to specify the value
* of inverse mask for setting access permissions to directories generated by Magento.
- * @link http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
- * @link http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
+ * @link https://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
+ * @link https://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
*/
const PERMISSIONS_DIR = 0750;
@@ -320,8 +320,8 @@ public function cleanupFilesystem($directoryCodeList)
* Access permissions to the files and directories are set during deploy Magento 2, directly after
* uploading code of Magento. Also it is possible to specify the value
* of inverse mask for setting access permissions to files and directories generated by Magento.
- * @link http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
- * @link http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
+ * @link https://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
+ * @link https://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
*/
protected function changePermissions($directoryCodeList, $dirPermissions, $filePermissions)
{
@@ -345,8 +345,8 @@ protected function changePermissions($directoryCodeList, $dirPermissions, $fileP
* Access permissions to the files and directories are set during deploy Magento 2, directly after
* uploading code of Magento. Also it is possible to specify the value
* of inverse mask for setting access permissions to files and directories generated by Magento.
- * @link http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
- * @link http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
+ * @link https://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
+ * @link https://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
*/
public function lockStaticResources()
{
diff --git a/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php b/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php
index 4e2758b362a43..97d22633af03c 100644
--- a/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php
+++ b/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php
@@ -3,6 +3,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
namespace Magento\Directory\Model\Config\Source;
/**
@@ -14,10 +15,23 @@
class WeightUnit implements \Magento\Framework\Option\ArrayInterface
{
/**
- * {@inheritdoc}
+ * @var string
+ */
+ const CODE_LBS = 'lbs';
+
+ /**
+ * @var string
+ */
+ const CODE_KGS = 'kgs';
+
+ /**
+ * @inheritdoc
*/
public function toOptionArray()
{
- return [['value' => 'lbs', 'label' => __('lbs')], ['value' => 'kgs', 'label' => __('kgs')]];
+ return [
+ ['value' => self::CODE_LBS, 'label' => __('lbs')],
+ ['value' => self::CODE_KGS, 'label' => __('kgs')]
+ ];
}
}
diff --git a/app/code/Magento/Directory/Model/PriceCurrency.php b/app/code/Magento/Directory/Model/PriceCurrency.php
index a211242d377f3..08d320abd8b53 100644
--- a/app/code/Magento/Directory/Model/PriceCurrency.php
+++ b/app/code/Magento/Directory/Model/PriceCurrency.php
@@ -46,7 +46,7 @@ public function __construct(
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function convert($amount, $scope = null, $currency = null)
{
@@ -58,17 +58,15 @@ public function convert($amount, $scope = null, $currency = null)
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function convertAndRound($amount, $scope = null, $currency = null, $precision = self::DEFAULT_PRECISION)
{
- $currentCurrency = $this->getCurrency($scope, $currency);
- $convertedValue = $this->getStore($scope)->getBaseCurrency()->convert($amount, $currentCurrency);
- return round($convertedValue, $precision);
+ return $this->roundPrice($this->convert($amount, $scope, $currency), $precision);
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function format(
$amount,
@@ -82,7 +80,7 @@ public function format(
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function convertAndFormat(
$amount,
@@ -97,7 +95,7 @@ public function convertAndFormat(
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function getCurrency($scope = null, $currency = null)
{
@@ -118,6 +116,8 @@ public function getCurrency($scope = null, $currency = null)
}
/**
+ * Get currrency symbol
+ *
* @param null|string|bool|int|\Magento\Framework\App\ScopeInterface $scope
* @param \Magento\Framework\Model\AbstractModel|string|null $currency
* @return string
@@ -148,13 +148,22 @@ protected function getStore($scope = null)
}
/**
- * Round price
+ * @inheritdoc
+ */
+ public function round($price)
+ {
+ return round($price, 2);
+ }
+
+ /**
+ * Round price with precision
*
* @param float $price
+ * @param int $precision
* @return float
*/
- public function round($price)
+ public function roundPrice($price, $precision = self::DEFAULT_PRECISION)
{
- return round($price, 2);
+ return round($price, $precision);
}
}
diff --git a/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php b/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php
index 20140baae01b6..f90a7b3b519b5 100644
--- a/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php
+++ b/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php
@@ -129,8 +129,8 @@ public function __construct(
/**
* Add top destinition countries to head of option array
*
- * @param $emptyLabel
- * @param $options
+ * @param string $emptyLabel
+ * @param array $options
* @return array
*/
private function addForegroundCountriesToOptionArray($emptyLabel, $options)
@@ -207,7 +207,7 @@ public function getItemById($countryId)
* Add filter by country code to collection.
* $countryCode can be either array of country codes or string representing one country code.
* $iso can be either array containing 'iso2', 'iso3' values or string with containing one of that values directly.
- * The collection will contain countries where at least one of contry $iso fields matches $countryCode.
+ * The collection will contain countries where at least one of country $iso fields matches $countryCode.
*
* @param string|string[] $countryCode
* @param string|string[] $iso
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Crosssell.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Crosssell.php
index e7b1fff27680e..85f9ad39c4df5 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Crosssell.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Crosssell.php
@@ -6,6 +6,16 @@
*/
namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit;
-class Crosssell extends \Magento\Catalog\Controller\Adminhtml\Product\Crosssell
+use Magento\Catalog\Controller\Adminhtml\Product\Crosssell as CatalogCrosssell;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class Crosssell
+ *
+ * @package Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit
+ * @deprecated Not used since cross-sell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
+ */
+class Crosssell extends CatalogCrosssell implements HttpPostActionInterface
{
}
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/CrosssellGrid.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/CrosssellGrid.php
index 8a77cb2c01011..b6c25bdec9f14 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/CrosssellGrid.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/CrosssellGrid.php
@@ -6,6 +6,16 @@
*/
namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit;
-class CrosssellGrid extends \Magento\Catalog\Controller\Adminhtml\Product\CrosssellGrid
+use Magento\Catalog\Controller\Adminhtml\Product\CrosssellGrid as CatalogCrosssellGrid;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class CrosssellGrid
+ *
+ * @package Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit
+ * @deprecated Not used since cross-sell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
+ */
+class CrosssellGrid extends CatalogCrosssellGrid implements HttpPostActionInterface
{
}
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Related.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Related.php
index 8c10377f74e83..0352d97bca93a 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Related.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Related.php
@@ -6,6 +6,16 @@
*/
namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit;
-class Related extends \Magento\Catalog\Controller\Adminhtml\Product\Related
+use Magento\Catalog\Controller\Adminhtml\Product\Related as CatalogRelated;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class Related
+ *
+ * @package Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit
+ * @deprecated Not used since related products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
+ */
+class Related extends CatalogRelated implements HttpPostActionInterface
{
}
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/RelatedGrid.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/RelatedGrid.php
index 403b3828e39a0..11e9c4eb5e3af 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/RelatedGrid.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/RelatedGrid.php
@@ -6,6 +6,16 @@
*/
namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit;
-class RelatedGrid extends \Magento\Catalog\Controller\Adminhtml\Product\RelatedGrid
+use Magento\Catalog\Controller\Adminhtml\Product\RelatedGrid as CatalogRelatedGrid;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class RelatedGrid
+ *
+ * @package Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit
+ * @deprecated Not used since related products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
+ */
+class RelatedGrid extends CatalogRelatedGrid implements HttpPostActionInterface
{
}
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Upsell.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Upsell.php
index d712a7ec80d18..a8581f38c419b 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Upsell.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Upsell.php
@@ -6,6 +6,16 @@
*/
namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit;
-class Upsell extends \Magento\Catalog\Controller\Adminhtml\Product\Upsell
+use Magento\Catalog\Controller\Adminhtml\Product\Upsell as CatalogUpsell;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class Upsell
+ *
+ * @package Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit
+ * @deprecated Not used since upsell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
+ */
+class Upsell extends CatalogUpsell implements HttpPostActionInterface
{
}
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/UpsellGrid.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/UpsellGrid.php
index 960909ca1b399..3e28a96948a77 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/UpsellGrid.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/UpsellGrid.php
@@ -6,6 +6,16 @@
*/
namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit;
-class UpsellGrid extends \Magento\Catalog\Controller\Adminhtml\Product\UpsellGrid
+use Magento\Catalog\Controller\Adminhtml\Product\UpsellGrid as CatalogUpsellGrid;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class UpsellGrid
+ *
+ * @package Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit
+ * @deprecated Not used since upsell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
+ */
+class UpsellGrid extends CatalogUpsellGrid implements HttpPostActionInterface
{
}
diff --git a/app/code/Magento/Downloadable/Setup/Patch/Data/UpdateLinksExistDefaultAttributeValue.php b/app/code/Magento/Downloadable/Setup/Patch/Data/UpdateLinksExistDefaultAttributeValue.php
new file mode 100644
index 0000000000000..bde9accc39d79
--- /dev/null
+++ b/app/code/Magento/Downloadable/Setup/Patch/Data/UpdateLinksExistDefaultAttributeValue.php
@@ -0,0 +1,82 @@
+moduleDataSetup = $moduleDataSetup;
+ $this->eavSetupFactory = $eavSetupFactory;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function apply()
+ {
+ /** @var EavSetup $eavSetup */
+ $eavSetup = $this->eavSetupFactory->create(['setup' => $this->moduleDataSetup]);
+ // remove default value
+ $eavSetup->updateAttribute(
+ \Magento\Catalog\Model\Product::ENTITY,
+ 'links_exist',
+ 'default_value',
+ null
+ );
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public static function getDependencies()
+ {
+ return [InstallDownloadableAttributes::class];
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public static function getVersion()
+ {
+ return '2.0.3';
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getAliases()
+ {
+ return [];
+ }
+}
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultVideoDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultVideoDownloadableProductTest.xml
index 83d859ee7421a..d8bbbb2b4d62b 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultVideoDownloadableProductTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultVideoDownloadableProductTest.xml
@@ -17,9 +17,6 @@
-
diff --git a/app/code/Magento/Downloadable/view/frontend/requirejs-config.js b/app/code/Magento/Downloadable/view/frontend/requirejs-config.js
index c3d33949eb012..f615966d801f7 100644
--- a/app/code/Magento/Downloadable/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Downloadable/view/frontend/requirejs-config.js
@@ -6,7 +6,8 @@
var config = {
map: {
'*': {
- downloadable: 'Magento_Downloadable/js/downloadable'
+ downloadable: 'Magento_Downloadable/js/downloadable',
+ 'Magento_Downloadable/downloadable': 'Magento_Downloadable/js/downloadable'
}
}
};
diff --git a/app/code/Magento/DownloadableImportExport/Helper/Uploader.php b/app/code/Magento/DownloadableImportExport/Helper/Uploader.php
index 46081f77cc66a..197250faaea91 100644
--- a/app/code/Magento/DownloadableImportExport/Helper/Uploader.php
+++ b/app/code/Magento/DownloadableImportExport/Helper/Uploader.php
@@ -38,6 +38,11 @@ class Uploader extends \Magento\Framework\App\Helper\AbstractHelper
*/
protected $parameters = [];
+ /**
+ * @var \Magento\Framework\DB\Adapter\AdapterInterface
+ */
+ public $connection;
+
/**
* Construct
*
diff --git a/app/code/Magento/Eav/Api/AttributeSetRepositoryInterface.php b/app/code/Magento/Eav/Api/AttributeSetRepositoryInterface.php
index 8bd65ba85abef..be4b5a3fa0fe5 100644
--- a/app/code/Magento/Eav/Api/AttributeSetRepositoryInterface.php
+++ b/app/code/Magento/Eav/Api/AttributeSetRepositoryInterface.php
@@ -17,7 +17,7 @@ interface AttributeSetRepositoryInterface
* Retrieve list of Attribute Sets
*
* This call returns an array of objects, but detailed information about each object’s attributes might not be
- * included. See http://devdocs.magento.com/codelinks/attributes.html#AttributeSetRepositoryInterface to determine
+ * included. See https://devdocs.magento.com/codelinks/attributes.html#AttributeSetRepositoryInterface to determine
* which call to use to get detailed information about all attributes for an object.
*
* @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
index 29ead9ff810e5..7ed455eccf4e0 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
@@ -3,6 +3,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
namespace Magento\Eav\Model\Entity\Attribute;
@@ -418,7 +419,7 @@ public function getIsVisibleOnFront()
/**
* Returns default value
*
- * @return string|int|bool|float
+ * @return string|null
* @codeCoverageIgnore
*/
public function getDefaultValue()
@@ -812,7 +813,7 @@ public function getBackendTable()
if ($this->isStatic()) {
$this->_dataTable = $this->getEntityType()->getValueTablePrefix();
} else {
- $backendTable = trim($this->_getData('backend_table'));
+ $backendTable = trim((string)$this->_getData('backend_table'));
if (empty($backendTable)) {
$entityTable = [$this->getEntityType()->getEntityTablePrefix(), $this->getBackendType()];
$backendTable = $this->getResource()->getTable($entityTable);
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/AbstractBackend.php b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/AbstractBackend.php
index 53c32e1cbfba4..86ab6f6ea6e9f 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/AbstractBackend.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/AbstractBackend.php
@@ -3,6 +3,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
namespace Magento\Eav\Model\Entity\Attribute\Backend;
@@ -204,12 +205,12 @@ public function getEntityValueId($entity)
/**
* Retrieve default value
*
- * @return mixed
+ * @return string
*/
public function getDefaultValue()
{
if ($this->_defaultValue === null) {
- if ($this->getAttribute()->getDefaultValue()) {
+ if ($this->getAttribute()->getDefaultValue() !== null) {
$this->_defaultValue = $this->getAttribute()->getDefaultValue();
} else {
$this->_defaultValue = "";
@@ -285,7 +286,7 @@ public function afterLoad($object)
public function beforeSave($object)
{
$attrCode = $this->getAttribute()->getAttributeCode();
- if (!$object->hasData($attrCode) && $this->getDefaultValue()) {
+ if (!$object->hasData($attrCode) && $this->getDefaultValue() !== '') {
$object->setData($attrCode, $this->getDefaultValue());
}
@@ -348,9 +349,8 @@ public function getAffectedFields($object)
}
/**
- * By default attribute value is considered scalar that can be stored in a generic way
+ * By default attribute value is considered scalar that can be stored in a generic way {@inheritdoc}
*
- * {@inheritdoc}
* @codeCoverageIgnore
*/
public function isScalar()
diff --git a/app/code/Magento/Elasticsearch/etc/di.xml b/app/code/Magento/Elasticsearch/etc/di.xml
index b10d30e48064a..6a42e4b3c9fe2 100644
--- a/app/code/Magento/Elasticsearch/etc/di.xml
+++ b/app/code/Magento/Elasticsearch/etc/di.xml
@@ -416,7 +416,7 @@
- - 2147483647
+ - 10000
- 2147483647
diff --git a/app/code/Magento/Email/Model/Transport.php b/app/code/Magento/Email/Model/Transport.php
index 28d2d171eecf4..90a4e6571c9b6 100644
--- a/app/code/Magento/Email/Model/Transport.php
+++ b/app/code/Magento/Email/Model/Transport.php
@@ -87,7 +87,7 @@ public function __construct(
public function sendMessage()
{
try {
- $zendMessage = Message::fromString($this->message->getRawMessage());
+ $zendMessage = Message::fromString($this->message->getRawMessage())->setEncoding('utf-8');
if (2 === $this->isSetReturnPath && $this->returnPathValue) {
$zendMessage->setSender($this->returnPathValue);
} elseif (1 === $this->isSetReturnPath && $zendMessage->getFrom()->count()) {
diff --git a/app/code/Magento/EncryptionKey/Setup/Patch/Data/SodiumChachaPatch.php b/app/code/Magento/EncryptionKey/Setup/Patch/Data/SodiumChachaPatch.php
index aae30026b2b77..9331b68675b67 100644
--- a/app/code/Magento/EncryptionKey/Setup/Patch/Data/SodiumChachaPatch.php
+++ b/app/code/Magento/EncryptionKey/Setup/Patch/Data/SodiumChachaPatch.php
@@ -8,12 +8,18 @@
namespace Magento\EncryptionKey\Setup\Patch\Data;
use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\App\ObjectManager;
/**
* Migrate encrypted configuration values to the latest cipher
*/
class SodiumChachaPatch implements DataPatchInterface
{
+ /**
+ * @var \Magento\Framework\Config\ScopeInterface
+ */
+ private $scope;
+
/**
* @var \Magento\Framework\Setup\ModuleDataSetupInterface
*/
@@ -35,25 +41,29 @@ class SodiumChachaPatch implements DataPatchInterface
private $state;
/**
+ * SodiumChachaPatch constructor.
* @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
* @param \Magento\Config\Model\Config\Structure\Proxy $structure
* @param \Magento\Framework\Encryption\EncryptorInterface $encryptor
* @param \Magento\Framework\App\State $state
+ * @param \Magento\Framework\Config\ScopeInterface|null $scope
*/
public function __construct(
\Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
\Magento\Config\Model\Config\Structure\Proxy $structure,
\Magento\Framework\Encryption\EncryptorInterface $encryptor,
- \Magento\Framework\App\State $state
+ \Magento\Framework\App\State $state,
+ \Magento\Framework\Config\ScopeInterface $scope = null
) {
$this->moduleDataSetup = $moduleDataSetup;
$this->structure = $structure;
$this->encryptor = $encryptor;
$this->state = $state;
+ $this->scope = $scope ?? ObjectManager::getInstance()->get(\Magento\Framework\Config\ScopeInterface::class);
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function apply()
{
@@ -65,7 +75,7 @@ public function apply()
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public static function getDependencies()
{
@@ -73,41 +83,67 @@ public static function getDependencies()
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function getAliases()
{
return [];
}
+ /**
+ * Re encrypt sensitive data in the system configuration
+ */
private function reEncryptSystemConfigurationValues()
{
- $structure = $this->structure;
- $paths = $this->state->emulateAreaCode(
- \Magento\Framework\App\Area::AREA_ADMINHTML,
- function () use ($structure) {
- return $structure->getFieldPathsByAttribute(
- 'backend_model',
- \Magento\Config\Model\Config\Backend\Encrypted::class
- );
- }
+ $table = $this->moduleDataSetup->getTable('core_config_data');
+ $hasEncryptedData = $this->moduleDataSetup->getConnection()->fetchOne(
+ $this->moduleDataSetup->getConnection()
+ ->select()
+ ->from($table, [new \Zend_Db_Expr('count(value)')])
+ ->where('value LIKE ?', '0:2%')
);
- // walk through found data and re-encrypt it
- if ($paths) {
- $table = $this->moduleDataSetup->getTable('core_config_data');
- $values = $this->moduleDataSetup->getConnection()->fetchPairs(
- $this->moduleDataSetup->getConnection()
- ->select()
- ->from($table, ['config_id', 'value'])
- ->where('path IN (?)', $paths)
- ->where('value NOT LIKE ?', '')
+ if ($hasEncryptedData !== '0') {
+ $currentScope = $this->scope->getCurrentScope();
+ $structure = $this->structure;
+ $paths = $this->state->emulateAreaCode(
+ \Magento\Framework\App\Area::AREA_ADMINHTML,
+ function () use ($structure) {
+ $this->scope->setCurrentScope(\Magento\Framework\App\Area::AREA_ADMINHTML);
+ /** Returns list of structure paths to be re encrypted */
+ $paths = $structure->getFieldPathsByAttribute(
+ 'backend_model',
+ \Magento\Config\Model\Config\Backend\Encrypted::class
+ );
+ /** Returns list of mapping between configPath => [structurePaths] */
+ $mappedPaths = $structure->getFieldPaths();
+ foreach ($mappedPaths as $mappedPath => $data) {
+ foreach ($data as $structurePath) {
+ if ($structurePath !== $mappedPath && $key = array_search($structurePath, $paths)) {
+ $paths[$key] = $mappedPath;
+ }
+ }
+ }
+
+ return array_unique($paths);
+ }
);
- foreach ($values as $configId => $value) {
- $this->moduleDataSetup->getConnection()->update(
- $table,
- ['value' => $this->encryptor->encrypt($this->encryptor->decrypt($value))],
- ['config_id = ?' => (int)$configId]
+ $this->scope->setCurrentScope($currentScope);
+ // walk through found data and re-encrypt it
+ if ($paths) {
+ $values = $this->moduleDataSetup->getConnection()->fetchPairs(
+ $this->moduleDataSetup->getConnection()
+ ->select()
+ ->from($table, ['config_id', 'value'])
+ ->where('path IN (?)', $paths)
+ ->where('value NOT LIKE ?', '')
);
+ foreach ($values as $configId => $value) {
+ $this->moduleDataSetup->getConnection()->update(
+ $table,
+ ['value' => $this->encryptor->encrypt($this->encryptor->decrypt($value))],
+ ['config_id = ?' => (int)$configId]
+ );
+ }
}
}
}
diff --git a/app/code/Magento/Fedex/Model/Carrier.php b/app/code/Magento/Fedex/Model/Carrier.php
index f6e63e04ac559..955345851e67a 100644
--- a/app/code/Magento/Fedex/Model/Carrier.php
+++ b/app/code/Magento/Fedex/Model/Carrier.php
@@ -986,6 +986,7 @@ public function getCode($type, $code = '')
* Return FeDex currency ISO code by Magento Base Currency Code
*
* @return string 3-digit currency code
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function getCurrencyCode()
{
@@ -1008,7 +1009,7 @@ public function getCurrencyCode()
];
$currencyCode = $this->_storeManager->getStore()->getBaseCurrencyCode();
- return isset($codes[$currencyCode]) ? $codes[$currencyCode] : $currencyCode;
+ return $codes[$currencyCode] ?? $currencyCode;
}
/**
@@ -1438,6 +1439,8 @@ protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
}
/**
+ * Return Tracking Number
+ *
* @param array|object $trackingIds
* @return string
*/
@@ -1452,10 +1455,10 @@ function ($val) {
}
/**
- * For multi package shipments. Delete requested shipments if the current shipment
- * request is failed
+ * For multi package shipments. Delete requested shipments if the current shipment request is failed
*
* @param array $data
+ *
* @return bool
*/
public function rollBack($data)
@@ -1475,6 +1478,7 @@ public function rollBack($data)
* Return container types of carrier
*
* @param \Magento\Framework\DataObject|null $params
+ *
* @return array|bool
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
@@ -1542,6 +1546,7 @@ public function getContainerTypesFilter()
* Return delivery confirmation types of carrier
*
* @param \Magento\Framework\DataObject|null $params
+ *
* @return array
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
@@ -1552,6 +1557,7 @@ public function getDeliveryConfirmationTypes(\Magento\Framework\DataObject $para
/**
* Recursive replace sensitive fields in debug data by the mask
+ *
* @param string $data
* @return string
*/
@@ -1569,6 +1575,7 @@ protected function filterDebugData($data)
/**
* Parse track details response from Fedex
+ *
* @param \stdClass $trackInfo
* @return array
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -1639,6 +1646,7 @@ private function processTrackingDetails(\stdClass $trackInfo)
/**
* Parse delivery datetime from tracking details
+ *
* @param \stdClass $trackInfo
* @return \Datetime|null
*/
@@ -1655,8 +1663,7 @@ private function getDeliveryDateTime(\stdClass $trackInfo)
}
/**
- * Get delivery address details in string representation
- * Return City, State, Country Code
+ * Get delivery address details in string representation Return City, State, Country Code
*
* @param \stdClass $address
* @return \Magento\Framework\Phrase|string
@@ -1718,6 +1725,7 @@ private function processTrackDetailsEvents(array $events)
/**
* Append error message to rate result instance
+ *
* @param string $trackingValue
* @param string $errorMessage
*/
@@ -1759,8 +1767,7 @@ private function parseDate($timestamp)
}
/**
- * Defines payment type by request.
- * Two values are available: RECIPIENT or SENDER.
+ * Defines payment type by request. Two values are available: RECIPIENT or SENDER.
*
* @param DataObject $request
* @return string
diff --git a/app/code/Magento/Fedex/etc/wsdl/RateService_v10.wsdl b/app/code/Magento/Fedex/etc/wsdl/RateService_v10.wsdl
index 6ae04ccee0775..62795f07239a6 100644
--- a/app/code/Magento/Fedex/etc/wsdl/RateService_v10.wsdl
+++ b/app/code/Magento/Fedex/etc/wsdl/RateService_v10.wsdl
@@ -355,7 +355,7 @@
- Shows the specific combination of service options combined with the service type that produced this committment in the set returned to the caller.
+ Shows the specific combination of service options combined with the service type that produced this commitment in the set returned to the caller.
@@ -473,7 +473,7 @@
For international multiple piece shipments, commodity information must be passed in the Master and on each child transaction.
- If this shipment cotains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
+ If this shipment contains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
@@ -916,7 +916,7 @@
- For customers producing their own Ground labels, this field specifies which secondary barcode will be printed on the label; so that the primary barcode produced by FedEx has the corect SCNC.
+ For customers producing their own Ground labels, this field specifies which secondary barcode will be printed on the label; so that the primary barcode produced by FedEx has the correct SCNC.
@@ -1006,7 +1006,7 @@
For international multiple piece shipments, commodity information must be passed in the Master and on each child transaction.
- If this shipment cotains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
+ If this shipment contains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
@@ -1151,7 +1151,7 @@
- Data required to complete the Destionation Control Statement for US exports.
+ Data required to complete the Destination Control Statement for US exports.
- For thermal printer lables this indicates the size of the label and the location of the doc tab if present.
+ For thermal printer labels this indicates the size of the label and the location of the doc tab if present.
@@ -2780,7 +2780,7 @@
- The descriptive data for a person or company entitiy doing business with FedEx.
+ The descriptive data for a person or company entity doing business with FedEx.
@@ -3069,7 +3069,7 @@
- Shows the specific combination of service options combined with the service type that produced this committment in the set returned to the caller.
+ Shows the specific combination of service options combined with the service type that produced this commitment in the set returned to the caller.
@@ -3195,7 +3195,7 @@
- If requesting rates using the PackageDetails element (one package at a time) in the request, the rates for each package will be returned in this element. Currently total piece total weight rates are also retuned in this element.
+ If requesting rates using the PackageDetails element (one package at a time) in the request, the rates for each package will be returned in this element. Currently total piece total weight rates are also returned in this element.
@@ -3416,7 +3416,7 @@
- Identifies the total weight of the shipment being conveyed to FedEx.This is only applicable to International shipments and should only be used on the first package of a mutiple piece shipment.This value contains 1 explicit decimal position
+ Identifies the total weight of the shipment being conveyed to FedEx.This is only applicable to International shipments and should only be used on the first package of a multiple piece shipment.This value contains 1 explicit decimal position
@@ -3582,7 +3582,7 @@
- The type of return shipment that is being requested. At present the only type of retrun shipment that is supported is PRINT_RETURN_LABEL. With this option you can print a return label to insert into the box of an outbound shipment. This option can not be used to print an outbound label.
+ The type of return shipment that is being requested. At present the only type of return shipment that is supported is PRINT_RETURN_LABEL. With this option you can print a return label to insert into the box of an outbound shipment. This option can not be used to print an outbound label.
@@ -3655,7 +3655,7 @@
- These values control the optional features of service that may be combined in a commitment/rate comparision transaction.
+ These values control the optional features of service that may be combined in a commitment/rate comparison transaction.
- The calculated varibale handling charge plus the net charge.
+ The calculated variable handling charge plus the net charge.
diff --git a/app/code/Magento/Fedex/etc/wsdl/RateService_v9.wsdl b/app/code/Magento/Fedex/etc/wsdl/RateService_v9.wsdl
index efbf75076c2cb..17a6f74cc09b8 100644
--- a/app/code/Magento/Fedex/etc/wsdl/RateService_v9.wsdl
+++ b/app/code/Magento/Fedex/etc/wsdl/RateService_v9.wsdl
@@ -354,7 +354,7 @@
- Shows the specific combination of service options combined with the service type that produced this committment in the set returned to the caller.
+ Shows the specific combination of service options combined with the service type that produced this commitment in the set returned to the caller.
@@ -472,7 +472,7 @@
For international multiple piece shipments, commodity information must be passed in the Master and on each child transaction.
- If this shipment cotains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
+ If this shipment commitment more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
@@ -1006,7 +1006,7 @@
For international multiple piece shipments, commodity information must be passed in the Master and on each child transaction.
- If this shipment cotains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
+ If this shipment contains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
@@ -1148,7 +1148,7 @@
- Data required to complete the Destionation Control Statement for US exports.
+ Data required to complete the Destination Control Statement for US exports.
- For thermal printer lables this indicates the size of the label and the location of the doc tab if present.
+ For thermal printer labels this indicates the size of the label and the location of the doc tab if present.
@@ -3099,7 +3099,7 @@
- Shows the specific combination of service options combined with the service type that produced this committment in the set returned to the caller.
+ Shows the specific combination of service options combined with the service type that produced this commitment in the set returned to the caller.
@@ -3216,7 +3216,7 @@
- If requesting rates using the PackageDetails element (one package at a time) in the request, the rates for each package will be returned in this element. Currently total piece total weight rates are also retuned in this element.
+ If requesting rates using the PackageDetails element (one package at a time) in the request, the rates for each package will be returned in this element. Currently total piece total weight rates are also returned in this element.
@@ -3622,7 +3622,7 @@
- The type of return shipment that is being requested. At present the only type of retrun shipment that is supported is PRINT_RETURN_LABEL. With this option you can print a return label to insert into the box of an outbound shipment. This option can not be used to print an outbound label.
+ The type of return shipment that is being requested. At present the only type of return shipment that is supported is PRINT_RETURN_LABEL. With this option you can print a return label to insert into the box of an outbound shipment. This option can not be used to print an outbound label.
@@ -3687,7 +3687,7 @@
- These values control the optional features of service that may be combined in a commitment/rate comparision transaction.
+ These values control the optional features of service that may be combined in a commitment/rate comparison transaction.
- The calculated varibale handling charge plus the net charge.
+ The calculated variable handling charge plus the net charge.
diff --git a/app/code/Magento/Fedex/etc/wsdl/ShipService_v10.wsdl b/app/code/Magento/Fedex/etc/wsdl/ShipService_v10.wsdl
index 6c43af98ef682..54bb57d490c76 100644
--- a/app/code/Magento/Fedex/etc/wsdl/ShipService_v10.wsdl
+++ b/app/code/Magento/Fedex/etc/wsdl/ShipService_v10.wsdl
@@ -498,7 +498,7 @@
For international multiple piece shipments, commodity information must be passed in the Master and on each child transaction.
- If this shipment cotains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
+ If this shipment contains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
@@ -1515,12 +1515,12 @@
- Data required to complete the Destionation Control Statement for US exports.
+ Data required to complete the Destination Control Statement for US exports.
- List of applicable Statment types.
+ List of applicable Statement types.
@@ -2524,7 +2524,7 @@
- For thermal printer lables this indicates the size of the label and the location of the doc tab if present.
+ For thermal printer labels this indicates the size of the label and the location of the doc tab if present.
@@ -5225,7 +5225,7 @@
- The calculated varibale handling charge plus the net charge.
+ The calculated variable handling charge plus the net charge.
diff --git a/app/code/Magento/Fedex/etc/wsdl/ShipService_v9.wsdl b/app/code/Magento/Fedex/etc/wsdl/ShipService_v9.wsdl
index 8c11a5f660351..d8dc0fdfed4ab 100644
--- a/app/code/Magento/Fedex/etc/wsdl/ShipService_v9.wsdl
+++ b/app/code/Magento/Fedex/etc/wsdl/ShipService_v9.wsdl
@@ -498,7 +498,7 @@
For international multiple piece shipments, commodity information must be passed in the Master and on each child transaction.
- If this shipment cotains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
+ If this shipment contains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
@@ -1515,12 +1515,12 @@
- Data required to complete the Destionation Control Statement for US exports.
+ Data required to complete the Destination Control Statement for US exports.
- List of applicable Statment types.
+ List of applicable Statement types.
@@ -2524,7 +2524,7 @@
- For thermal printer lables this indicates the size of the label and the location of the doc tab if present.
+ For thermal printer labels this indicates the size of the label and the location of the doc tab if present.
@@ -5225,7 +5225,7 @@
- The calculated varibale handling charge plus the net charge.
+ The calculated variable handling charge plus the net charge.
diff --git a/app/code/Magento/GiftMessage/Test/Mftf/Data/GiftOptionsData.xml b/app/code/Magento/GiftMessage/Test/Mftf/Data/GiftOptionsData.xml
index 951bbd3b787b7..bb3f566f1cbc6 100644
--- a/app/code/Magento/GiftMessage/Test/Mftf/Data/GiftOptionsData.xml
+++ b/app/code/Magento/GiftMessage/Test/Mftf/Data/GiftOptionsData.xml
@@ -7,23 +7,21 @@
-->
-
- 0
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+
+ AllowGiftMessageForOrder
-
- 0
+
+ 1
-
-
- defaultWrappingAllowOrder
- defaultAllowGiftReceipt
- defaultAllowPrintedCard
+
+ OrderDefault
+ ItemsDefault
-
- 1
+
+ 0
-
- 1
+
+ 0
diff --git a/app/code/Magento/GiftMessage/Test/Mftf/Metadata/gift_options-meta.xml b/app/code/Magento/GiftMessage/Test/Mftf/Metadata/gift_options-meta.xml
new file mode 100644
index 0000000000000..d4b7997e77d15
--- /dev/null
+++ b/app/code/Magento/GiftMessage/Test/Mftf/Metadata/gift_options-meta.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+ string
+
+
+ string
+
+
+
+
+
+
diff --git a/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js b/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js
index c3f8ecc45da38..f8a463bec37f9 100644
--- a/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js
+++ b/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js
@@ -7,7 +7,9 @@ var config = {
map: {
'*': {
giftOptions: 'Magento_GiftMessage/js/gift-options',
- extraOptions: 'Magento_GiftMessage/js/extra-options'
+ extraOptions: 'Magento_GiftMessage/js/extra-options',
+ 'Magento_GiftMessage/gift-options': 'Magento_GiftMessage/js/gift-options',
+ 'Magento_GiftMessage/extra-options': 'Magento_GiftMessage/js/extra-options'
}
}
};
diff --git a/app/code/Magento/GroupedCatalogInventory/LICENSE.txt b/app/code/Magento/GroupedCatalogInventory/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/GroupedCatalogInventory/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/GroupedCatalogInventory/LICENSE_AFL.txt b/app/code/Magento/GroupedCatalogInventory/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/GroupedCatalogInventory/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/GroupedCatalogInventory/Plugin/OutOfStockFilter.php b/app/code/Magento/GroupedCatalogInventory/Plugin/OutOfStockFilter.php
new file mode 100644
index 0000000000000..599f40deddde0
--- /dev/null
+++ b/app/code/Magento/GroupedCatalogInventory/Plugin/OutOfStockFilter.php
@@ -0,0 +1,88 @@
+stockStatusRepository = $stockStatusRepository;
+ $this->criteriaInterfaceFactory = $criteriaInterfaceFactory;
+ }
+
+ /**
+ * Removes out of stock products for requests that don't specify the super group
+ *
+ * @param Grouped $subject
+ * @param array|string $result
+ * @param \Magento\Framework\DataObject $buyRequest
+ * @return string|array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function afterPrepareForCartAdvanced(
+ Grouped $subject,
+ $result,
+ \Magento\Framework\DataObject $buyRequest
+ ) {
+ if (!is_array($result) && $result instanceof Product) {
+ $result = [$result];
+ }
+
+ // Only remove out-of-stock products if no quantities were specified
+ if (is_array($result) && !empty($result) && !$buyRequest->getData('super_group')) {
+ $productIds = [];
+ $productIdMap = [];
+
+ foreach ($result as $index => $cartItem) {
+ $productIds[] = $cartItem->getId();
+ $productIdMap[$cartItem->getId()] = $index;
+ }
+
+ $criteria = $this->criteriaInterfaceFactory->create();
+ $criteria->setProductsFilter($productIds);
+
+ $stockStatusCollection = $this->stockStatusRepository->getList($criteria);
+ foreach ($stockStatusCollection->getItems() as $status) {
+ /** @var $status StockStatusInterface */
+ if ($status->getStockStatus() == StockStatusInterface::STATUS_OUT_OF_STOCK) {
+ unset($result[$productIdMap[$status->getProductId()]]);
+ }
+ }
+
+ unset($productIdMap);
+ }
+
+ return $result;
+ }
+}
diff --git a/app/code/Magento/GroupedCatalogInventory/README.md b/app/code/Magento/GroupedCatalogInventory/README.md
new file mode 100644
index 0000000000000..c229c7e9919ad
--- /dev/null
+++ b/app/code/Magento/GroupedCatalogInventory/README.md
@@ -0,0 +1 @@
+Magento_GroupedCatalogInventory contains behavior related to the inventory status of items within grouped products.
diff --git a/app/code/Magento/GroupedCatalogInventory/Test/Unit/Plugin/OutOfStockFilterTest.php b/app/code/Magento/GroupedCatalogInventory/Test/Unit/Plugin/OutOfStockFilterTest.php
new file mode 100644
index 0000000000000..07877938e36ae
--- /dev/null
+++ b/app/code/Magento/GroupedCatalogInventory/Test/Unit/Plugin/OutOfStockFilterTest.php
@@ -0,0 +1,221 @@
+searchCriteriaMock->expects($this->never())->method('setProductsFilter');
+ $this->stockStatusRepositoryMock->expects($this->never())->method('getList');
+
+ $plugin = $this->getPluginInstance();
+
+ $result = $plugin->afterPrepareForCartAdvanced(
+ $this->subjectMock,
+ $nonArrayResult,
+ new DataObject()
+ );
+
+ $this->assertSame($nonArrayResult, $result);
+ }
+
+ public function testFilterIgnoresResultIfSuperGroupIsPresent()
+ {
+ $this->searchCriteriaMock->expects($this->never())->method('setProductsFilter');
+ $this->stockStatusRepositoryMock->expects($this->never())->method('getList');
+
+ $plugin = $this->getPluginInstance();
+
+ $product = $this->createProductMock();
+
+ $result = $plugin->afterPrepareForCartAdvanced(
+ $this->subjectMock,
+ [$product],
+ new DataObject(['super_group' => [123 => '1']])
+ );
+
+ $this->assertSame([$product], $result);
+ }
+
+ /**
+ * @param $originalResult
+ * @param $stockStatusCollection
+ * @param $expectedResult
+ * @dataProvider outOfStockProductData
+ */
+ public function testFilterRemovesOutOfStockProductsWhenSuperGroupIsNotPresent(
+ $originalResult,
+ $stockStatusCollection,
+ $expectedResult
+ ) {
+ $this->stockStatusRepositoryMock
+ ->expects($this->once())
+ ->method('getList')
+ ->with($this->searchCriteriaMock)
+ ->willReturn($stockStatusCollection);
+
+ $plugin = $this->getPluginInstance();
+
+ $result = $plugin->afterPrepareForCartAdvanced(
+ $this->subjectMock,
+ $originalResult,
+ new DataObject()
+ );
+
+ $this->assertSame($expectedResult, $result);
+ }
+
+ public function outOfStockProductData()
+ {
+ $product1 = $this->createProductMock();
+ $product1->method('getId')->willReturn(123);
+
+ $product2 = $this->createProductMock();
+ $product2->method('getId')->willReturn(321);
+
+ return [
+ [[$product1, $product2], $this->createStatusResult([123 => false, 321 => true]), [1 => $product2]],
+ [[$product1], $this->createStatusResult([123 => true]), [0 => $product1]],
+ [$product1, $this->createStatusResult([123 => true]), [0 => $product1]]
+ ];
+ }
+
+ public function nonArrayResults()
+ {
+ return [
+ [123],
+ ['abc'],
+ [new \stdClass()]
+ ];
+ }
+
+ protected function setUp()
+ {
+ $this->subjectMock = $this->getMockBuilder(Grouped::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->stockStatusRepositoryMock = $this->getMockBuilder(StockStatusRepositoryInterface::class)
+ ->getMock();
+
+ $this->searchCriteriaFactoryMock = $this->getMockBuilder(StockStatusCriteriaInterfaceFactory::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->searchCriteriaMock = $this->getMockBuilder(StockStatusCriteriaInterface::class)
+ ->getMock();
+
+ $this->stockStatusCollectionMock = $this->getMockBuilder(StockStatusCollectionInterface::class)
+ ->getMock();
+
+ $this->searchCriteriaFactoryMock
+ ->expects($this->any())
+ ->method('create')
+ ->willReturn($this->searchCriteriaMock);
+ }
+
+ private function createProductMock()
+ {
+ return $this->getMockBuilder(Product::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ }
+
+ /**
+ * @return OutOfStockFilter
+ */
+ private function getPluginInstance()
+ {
+ $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+ /** @var OutOfStockFilter $filter */
+ $filter = $objectManager->getObject(OutOfStockFilter::class, [
+ 'stockStatusRepository' => $this->stockStatusRepositoryMock,
+ 'criteriaInterfaceFactory' => $this->searchCriteriaFactoryMock
+ ]);
+
+ return $filter;
+ }
+
+ private function createStatusResult(array $productStatuses)
+ {
+ $result = [];
+
+ foreach ($productStatuses as $productId => $status) {
+ $mock = $this->getMockBuilder(StockStatusInterface::class)
+ ->getMock();
+
+ $mock->expects($this->any())
+ ->method('getProductId')
+ ->willReturn($productId);
+
+ $mock->expects($this->any())
+ ->method('getStockStatus')
+ ->willReturn(
+ $status
+ ? StockStatusInterface::STATUS_IN_STOCK
+ : StockStatusInterface::STATUS_OUT_OF_STOCK
+ );
+
+ $result[] = $mock;
+ }
+
+ $stockStatusCollection = $this->getMockBuilder(StockStatusCollectionInterface::class)
+ ->getMock();
+
+ $stockStatusCollection
+ ->expects($this->once())
+ ->method('getItems')
+ ->willReturn($result);
+
+ return $stockStatusCollection;
+ }
+}
diff --git a/app/code/Magento/GroupedCatalogInventory/composer.json b/app/code/Magento/GroupedCatalogInventory/composer.json
new file mode 100644
index 0000000000000..c9946bc3f36ac
--- /dev/null
+++ b/app/code/Magento/GroupedCatalogInventory/composer.json
@@ -0,0 +1,27 @@
+{
+ "name": "magento/module-grouped-catalog-inventory",
+ "description": "N/A",
+ "config": {
+ "sort-packages": true
+ },
+ "require": {
+ "php": "~7.1.3||~7.2.0",
+ "magento/framework": "*",
+ "magento/module-catalog": "*",
+ "magento/module-catalog-inventory": "*",
+ "magento/module-grouped-product": "*"
+ },
+ "type": "magento2-module",
+ "license": [
+ "OSL-3.0",
+ "AFL-3.0"
+ ],
+ "autoload": {
+ "files": [
+ "registration.php"
+ ],
+ "psr-4": {
+ "Magento\\GroupedCatalogInventory\\": ""
+ }
+ }
+}
diff --git a/app/code/Magento/GroupedCatalogInventory/etc/di.xml b/app/code/Magento/GroupedCatalogInventory/etc/di.xml
new file mode 100644
index 0000000000000..f38a9e845a159
--- /dev/null
+++ b/app/code/Magento/GroupedCatalogInventory/etc/di.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/GroupedCatalogInventory/etc/module.xml b/app/code/Magento/GroupedCatalogInventory/etc/module.xml
new file mode 100644
index 0000000000000..246f10ff67934
--- /dev/null
+++ b/app/code/Magento/GroupedCatalogInventory/etc/module.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/GroupedCatalogInventory/registration.php b/app/code/Magento/GroupedCatalogInventory/registration.php
new file mode 100644
index 0000000000000..8899a48edf6d5
--- /dev/null
+++ b/app/code/Magento/GroupedCatalogInventory/registration.php
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
index 4f4ed9de03e43..8721dd05a0fa6 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
@@ -244,7 +244,7 @@ protected function _getSelectHtmlWithValue(Attribute $attribute, $value)
$options = $attribute->getSource()->getAllOptions(false);
}
if ($size = count($options)) {
- // add empty vaue option
+ // add empty value option
$firstOption = reset($options);
if ('' === $firstOption['value']) {
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php
index 8fd73e466083a..68b4d849099c1 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php
@@ -113,6 +113,7 @@ protected function _prepareForm()
'class' => $behaviorCode,
'onchange' => 'varienImport.handleImportBehaviorSelector();',
'note' => ' ',
+ 'after_element_html' => $this->getImportBehaviorTooltip(),
]
);
$fieldsets[$behaviorCode]->addField(
@@ -252,4 +253,19 @@ protected function getDownloadSampleFileHtml()
. '';
return $html;
}
+
+ /**
+ * Get Import Behavior field tooltip
+ *
+ * @return string
+ */
+ private function getImportBehaviorTooltip()
+ {
+ $html = '';
+ return $html;
+ }
}
diff --git a/app/code/Magento/ImportExport/Model/Source/Import/Behavior/Basic.php b/app/code/Magento/ImportExport/Model/Source/Import/Behavior/Basic.php
index f28aae9f8ae1c..e0002474e1917 100644
--- a/app/code/Magento/ImportExport/Model/Source/Import/Behavior/Basic.php
+++ b/app/code/Magento/ImportExport/Model/Source/Import/Behavior/Basic.php
@@ -5,6 +5,8 @@
*/
namespace Magento\ImportExport\Model\Source\Import\Behavior;
+use Magento\ImportExport\Model\Import;
+
/**
* Import behavior source model used for defining the behaviour during the import.
*
@@ -14,19 +16,19 @@
class Basic extends \Magento\ImportExport\Model\Source\Import\AbstractBehavior
{
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function toArray()
{
return [
- \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND => __('Add/Update'),
- \Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE => __('Replace'),
- \Magento\ImportExport\Model\Import::BEHAVIOR_DELETE => __('Delete')
+ Import::BEHAVIOR_APPEND => __('Add/Update'),
+ Import::BEHAVIOR_REPLACE => __('Replace'),
+ Import::BEHAVIOR_DELETE => __('Delete')
];
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function getCode()
{
@@ -34,12 +36,23 @@ public function getCode()
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function getNotes($entityCode)
{
$messages = ['catalog_product' => [
- \Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE => __("Note: Product IDs will be regenerated.")
+ Import::BEHAVIOR_APPEND => __(
+ "New product data is added to the existing product data for the existing entries in the database. "
+ . "All fields except sku can be updated."
+ ),
+ Import::BEHAVIOR_REPLACE => __(
+ "The existing product data is replaced with new data. Exercise caution when replacing data "
+ . "because the existing product data will be completely cleared and all references "
+ . "in the system will be lost. "
+ ),
+ Import::BEHAVIOR_DELETE => __(
+ "Any entities in the import data that already exist in the database are deleted from the database."
+ ),
]];
return isset($messages[$entityCode]) ? $messages[$entityCode] : [];
}
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Page/AdminImportIndexPage.xml b/app/code/Magento/ImportExport/Test/Mftf/Page/AdminImportIndexPage.xml
new file mode 100644
index 0000000000000..87807eb9b0e85
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Page/AdminImportIndexPage.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportHeaderSection.xml b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportHeaderSection.xml
new file mode 100644
index 0000000000000..748580be09406
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportHeaderSection.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportMainSection.xml b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportMainSection.xml
new file mode 100644
index 0000000000000..2ce6b1e35777f
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportMainSection.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteBehaviorTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteBehaviorTest.xml
new file mode 100644
index 0000000000000..4cbb0603d9073
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteBehaviorTest.xml
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+ Simple Product for Test
+ Simple Product for Test
+
+
+
+ Virtual Product for Test
+ Virtual Product for Test
+
+
+
+ Api Downloadable Product for Test
+ Api Downloadable Product for Test
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/ErrorProcessing/ProcessingErrorAggregatorTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/ErrorProcessing/ProcessingErrorAggregatorTest.php
index a4c380d51ebe3..b81b9f9093d1f 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Import/ErrorProcessing/ProcessingErrorAggregatorTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Import/ErrorProcessing/ProcessingErrorAggregatorTest.php
@@ -191,7 +191,7 @@ public function testInitValidationStrategyExceed()
}
/**
- * Test for method initValidationStrategy. Expected exeption due null incoming parameter
+ * Test for method initValidationStrategy. Expected exception due null incoming parameter
*/
public function testInitValidationStrategyException()
{
@@ -316,7 +316,7 @@ public function testAddTheSameErrorTwice()
}
/**
- * Test for method getErrorsByCode. Expects receive errors with code, which present in incomming parameter.
+ * Test for method getErrorsByCode. Expects receive errors with code, which present in incoming parameter.
*/
public function testGetErrorsByCodeInArray()
{
@@ -328,7 +328,7 @@ public function testGetErrorsByCodeInArray()
}
/**
- * Test for method getErrorsByCode. Unexpects receive errors with code, which present in incomming parameter.
+ * Test for method getErrorsByCode. Unexpects receive errors with code, which present in incoming parameter.
*/
public function testGetErrorsByCodeNotInArray()
{
diff --git a/app/code/Magento/ImportExport/i18n/en_US.csv b/app/code/Magento/ImportExport/i18n/en_US.csv
index 60c9ee4c5a960..cae4d6e19868d 100644
--- a/app/code/Magento/ImportExport/i18n/en_US.csv
+++ b/app/code/Magento/ImportExport/i18n/en_US.csv
@@ -119,3 +119,6 @@ User,User
"Error File","Error File"
"Execution Time","Execution Time"
Summary,Summary
+"New product data is added to existing product data entries in the database. All fields except SKU can be updated.","New product data is added to existing product data entries in the database. All fields except SKU can be updated."
+"All existing product data is replaced with the imported new data. Exercise caution when replacing data. All existing product data will be completely cleared and all references in the system will be lost. ","All existing product data is replaced with the imported new data. Exercise caution when replacing data. All existing product data will be completely cleared and all references in the system will be lost. "
+"Any entities in the import data that match existing entities in the database are deleted from the database.","Any entities in the import data that match existing entities in the database are deleted from the database."
diff --git a/app/code/Magento/Indexer/Model/Message/Invalid.php b/app/code/Magento/Indexer/Model/Message/Invalid.php
index 5a3f879b0ad80..79f9fcef9641e 100644
--- a/app/code/Magento/Indexer/Model/Message/Invalid.php
+++ b/app/code/Magento/Indexer/Model/Message/Invalid.php
@@ -6,6 +6,9 @@
namespace Magento\Indexer\Model\Message;
+/**
+ * Message about invalid indexers.
+ */
class Invalid implements \Magento\Framework\Notification\MessageInterface
{
/**
@@ -71,7 +74,7 @@ public function getText()
return __(
'One or more indexers are invalid . Make sure your Magento cron job is running.',
$url,
- 'http://devdocs.magento.com/guides/v2.2/config-guide/cli/config-cli-subcommands-cron.html#create-or-remove-the-magento-crontab'
+ 'https://devdocs.magento.com/guides/v2.2/config-guide/cli/config-cli-subcommands-cron.html#create-or-remove-the-magento-crontab'
);
//@codingStandardsIgnoreEnd
}
diff --git a/app/code/Magento/InstantPurchase/PaymentMethodIntegration/IntegrationFactory.php b/app/code/Magento/InstantPurchase/PaymentMethodIntegration/IntegrationFactory.php
index cdca81ed98b7a..0b698afea1de3 100644
--- a/app/code/Magento/InstantPurchase/PaymentMethodIntegration/IntegrationFactory.php
+++ b/app/code/Magento/InstantPurchase/PaymentMethodIntegration/IntegrationFactory.php
@@ -65,13 +65,13 @@ public function create(VaultPaymentInterface $paymentMethod, int $storeId): Inte
/**
* Reads value from config.
*
- * @param $config
+ * @param array $config
* @param string $field
* @param string $default
* @return string
*/
private function extractFromConfig($config, string $field, string $default): string
{
- return isset($config[$field]) ? $config[$field] : $default;
+ return $config[$field] ?? $default;
}
}
diff --git a/app/code/Magento/InstantPurchase/README.md b/app/code/Magento/InstantPurchase/README.md
index 534696bf353fc..9b618eaca997d 100644
--- a/app/code/Magento/InstantPurchase/README.md
+++ b/app/code/Magento/InstantPurchase/README.md
@@ -10,7 +10,7 @@ Prerequisites to display the Instant Purchase button:
## Structure
-In addition to [a typical file structure for a Magento 2 module](http://devdocs.magento.com/guides/v2.2/extension-dev-guide/build/module-file-structure.html) `PaymentMethodsIntegration` directory contains interfaces and basic implementation of integration vault payment method to the instant purchase.
+In addition to [a typical file structure for a Magento 2 module](https://devdocs.magento.com/guides/v2.2/extension-dev-guide/build/module-file-structure.html) `PaymentMethodsIntegration` directory contains interfaces and basic implementation of integration vault payment method to the instant purchase.
## Extensibility
@@ -22,7 +22,7 @@ All payments created for instant purchase also have `'instant-purchase' => true`
### Payment method integration
-Instant purchase support may be implemented for any payment method with [vault support](http://devdocs.magento.com/guides/v2.1/payments-integrations/vault/vault-intro.html).
+Instant purchase support may be implemented for any payment method with [vault support](https://devdocs.magento.com/guides/v2.1/payments-integrations/vault/vault-intro.html).
Basic implementation provided in `Magento\InstantPurchase\PaymentMethodIntegration` should be enough in most cases. It is not enabled by default to avoid issues on production sites and authors of vault payment method should verify correct work for instant purchase manually.
To enable basic implementation just add single option to configuration of payemnt method in `config.xml`:
@@ -52,7 +52,7 @@ Basic implementation is a good start point but it's recommended to provide own i
The `Magento_InstantPurchase` module does not introduce backward incompatible changes.
-You can track [backward incompatible changes in patch releases](http://devdocs.magento.com/guides/v2.2/release-notes/changes/ce_changes.html).
+You can track [backward incompatible changes in patch releases](https://devdocs.magento.com/guides/v2.2/release-notes/changes/ce_changes.html).
***
diff --git a/app/code/Magento/Integration/view/adminhtml/web/js/integration.js b/app/code/Magento/Integration/view/adminhtml/web/js/integration.js
index 6921f645a2330..a2acc40c6b86e 100644
--- a/app/code/Magento/Integration/view/adminhtml/web/js/integration.js
+++ b/app/code/Magento/Integration/view/adminhtml/web/js/integration.js
@@ -187,7 +187,7 @@ define([
},
/**
- * Function to check the location of the child popoup window.
+ * Function to check the location of the child popup window.
* Once detected if the callback is successful, parent window will be reloaded
*/
fnCheckLocation: function () {
diff --git a/app/code/Magento/Msrp/view/base/layout/cms_index_index.xml b/app/code/Magento/Msrp/view/base/layout/cms_index_index.xml
new file mode 100644
index 0000000000000..b60bc71e9e70d
--- /dev/null
+++ b/app/code/Magento/Msrp/view/base/layout/cms_index_index.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
index 869d81563645a..dd5abd433073d 100644
--- a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
+++ b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
@@ -72,6 +72,8 @@ if ($product->isSaleable()) {
} else {
$data['addToCart']['addToCartButton'] = sprintf(
'form:has(input[type="hidden"][name="product"][value="%s"]) button[type="submit"]',
+ (int) $productId) . ',' .
+ sprintf('.block.widget .price-box[data-product-id=%s]+.product-item-actions button.tocart',
(int) $productId
);
}
diff --git a/app/code/Magento/Msrp/view/frontend/templates/popup.phtml b/app/code/Magento/Msrp/view/frontend/templates/popup.phtml
index 7ccd606b8f113..e0b3dd77dedcb 100644
--- a/app/code/Magento/Msrp/view/frontend/templates/popup.phtml
+++ b/app/code/Magento/Msrp/view/frontend/templates/popup.phtml
@@ -30,12 +30,11 @@
-
//
-
-// # .lib-url-check()
-//
-// The .lib-url-check() mixin wraps passed value with 'url( ... )' and returns @lib-url-check-output variable. Can be used with .lib-css() mixin.
-//
-
-.example-url-check {
- // Set image path variable
- @_icon-image: '/images/test.png';
-
- // "Call" the mixin
- .lib-url-check(@_icon-image);
-
- // Will return url('/images/test.png')
- .lib-css(background, #eee @lib-url-check-output no-repeat 0 0);
-}
-
-//
-// If the variable is set to false, the .lib-url-check() will return false.
-//
-// ```
-//
-// Block with background.
-//
-// ```
-//
-
-.example-url-check-false {
- // Set usage image path to false
- @_icon-image: false;
-
- // "Call" the mixin
- .lib-url-check(@_icon-image);
-
- // Will return 'false' and outputs nothing
- .lib-css(background, #eee @lib-url-check-output no-repeat 0 0);
-}
-
-// ```
-//
-// Block with no background.
-//
-// ```
-//
-
-// # .lib-url-check() variables
-//
-//
-//
-//
-// Mixin variable
-// Allowed values
-// Output variable
-// Comment
-//
-//
-// @_path
-// '' | false | value
-// @lib-url-check-output
-// Passed url to wrap in 'url( ... )'. If the 'false' value passed mixin will return 'false'
-//
-//
-//
diff --git a/lib/web/css/docs/variables.html b/lib/web/css/docs/variables.html
index 4f353dc1554a4..ebbf2122ab209 100644
--- a/lib/web/css/docs/variables.html
+++ b/lib/web/css/docs/variables.html
@@ -3507,7 +3507,7 @@
-