-### Labels applied by the Magento team
+### Labels Applied by the Magento Team
We apply labels to public Pull Requests and Issues to help other participants retrieve additional information about current progress, component assignments, Magento release lines, and much more.
Please review the [Code Contributions guide](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#labels) for detailed information on labels used in Magento 2 repositories.
-## Reporting security issues
+## Reporting Security Issues
To report security vulnerabilities in Magento software or web sites, please create a Bugcrowd researcher account [there](https://bugcrowd.com/magento) to submit and follow-up your issue. Learn more about reporting security issues [here](https://magento.com/security/reporting-magento-security-issue).
diff --git a/app/bootstrap.php b/app/bootstrap.php
index 0b13d12cece58..ddbcaffd42962 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -8,6 +8,7 @@
* Environment initialization
*/
error_reporting(E_ALL);
+stream_wrapper_unregister('phar');
#ini_set('display_errors', 1);
/* PHP version validation */
diff --git a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
index 6f0e42bdcbef1..82f70d92e4930 100644
--- a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
+++ b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
@@ -8,6 +8,11 @@
namespace Magento\AdminNotification\Block\Grid\Renderer;
+/**
+ * Renderer class for action in the admin notifications grid
+ *
+ * @package Magento\AdminNotification\Block\Grid\Renderer
+ */
class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
{
/**
@@ -37,7 +42,9 @@ public function __construct(
*/
public function render(\Magento\Framework\DataObject $row)
{
- $readDetailsHtml = $row->getUrl() ? 'getUiId('content-header') ?>>
+ _resourceDb = $resourceDb;
$this->_resource = $resource;
$this->helper = $helper ?? ObjectManager::getInstance()->get(Helper::class);
+ $this->getListTables = $getListTables ?? ObjectManager::getInstance()->get(GetListTables::class);
+ $this->getViewsBackup = $getViewsBackup ?? ObjectManager::getInstance()->get(CreateViewsBackup::class);
}
/**
@@ -161,7 +180,7 @@ public function createBackup(\Magento\Framework\Backup\Db\BackupInterface $backu
$this->getResource()->beginTransaction();
- $tables = $this->getResource()->getTables();
+ $tables = $this->getListTables->execute();
$backup->write($this->getResource()->getHeader());
@@ -198,6 +217,8 @@ public function createBackup(\Magento\Framework\Backup\Db\BackupInterface $backu
$backup->write($this->getResource()->getTableDataAfterSql($table));
}
}
+ $this->getViewsBackup->execute($backup);
+
$backup->write($this->getResource()->getTableForeignKeysSql());
$backup->write($this->getResource()->getTableTriggersSql());
$backup->write($this->getResource()->getFooter());
diff --git a/app/code/Magento/Backup/Model/ResourceModel/Table/GetListTables.php b/app/code/Magento/Backup/Model/ResourceModel/Table/GetListTables.php
new file mode 100644
index 0000000000000..73c4221feba3f
--- /dev/null
+++ b/app/code/Magento/Backup/Model/ResourceModel/Table/GetListTables.php
@@ -0,0 +1,44 @@
+resource = $resource;
+ }
+
+ /**
+ * Get list of database tables excluding views.
+ *
+ * @return array
+ */
+ public function execute(): array
+ {
+ return $this->resource->getConnection('backup')->fetchCol(
+ "SHOW FULL TABLES WHERE `Table_type` = ?",
+ self::TABLE_TYPE
+ );
+ }
+}
diff --git a/app/code/Magento/Backup/Model/ResourceModel/View/CreateViewsBackup.php b/app/code/Magento/Backup/Model/ResourceModel/View/CreateViewsBackup.php
new file mode 100644
index 0000000000000..51b49dcb9e48a
--- /dev/null
+++ b/app/code/Magento/Backup/Model/ResourceModel/View/CreateViewsBackup.php
@@ -0,0 +1,116 @@
+getListViews = $getListViews;
+ $this->resourceConnection = $resourceConnection;
+ }
+
+ /**
+ * Write backup data to backup file.
+ *
+ * @param BackupInterface $backup
+ */
+ public function execute(BackupInterface $backup): void
+ {
+ $views = $this->getListViews->execute();
+
+ foreach ($views as $view) {
+ $backup->write($this->getViewHeader($view));
+ $backup->write($this->getDropViewSql($view));
+ $backup->write($this->getCreateView($view));
+ }
+ }
+
+ /**
+ * Retrieve Database connection for Backup.
+ *
+ * @return AdapterInterface
+ */
+ private function getConnection(): AdapterInterface
+ {
+ if (!$this->connection) {
+ $this->connection = $this->resourceConnection->getConnection('backup');
+ }
+
+ return $this->connection;
+ }
+
+ /**
+ * Get CREATE VIEW query for the specific view.
+ *
+ * @param string $viewName
+ * @return string
+ */
+ private function getCreateView(string $viewName): string
+ {
+ $quotedViewName = $this->getConnection()->quoteIdentifier($viewName);
+ $query = 'SHOW CREATE VIEW ' . $quotedViewName;
+ $row = $this->getConnection()->fetchRow($query);
+ $regExp = '/\sDEFINER\=\`([^`]*)\`\@\`([^`]*)\`/';
+ $sql = preg_replace($regExp, '', $row['Create View']);
+
+ return $sql . ';' . "\n";
+ }
+
+ /**
+ * Prepare a header for View being dumped.
+ *
+ * @param string $viewName
+ * @return string
+ */
+ public function getViewHeader(string $viewName): string
+ {
+ $quotedViewName = $this->getConnection()->quoteIdentifier($viewName);
+ return "\n--\n" . "-- Structure for view {$quotedViewName}\n" . "--\n\n";
+ }
+
+ /**
+ * Make sure that View being created is deleted if already exists.
+ *
+ * @param string $viewName
+ * @return string
+ */
+ public function getDropViewSql(string $viewName): string
+ {
+ $quotedViewName = $this->getConnection()->quoteIdentifier($viewName);
+ return sprintf('DROP VIEW IF EXISTS %s;\n', $quotedViewName);
+ }
+}
diff --git a/app/code/Magento/Backup/Model/ResourceModel/View/GetListViews.php b/app/code/Magento/Backup/Model/ResourceModel/View/GetListViews.php
new file mode 100644
index 0000000000000..c76ea2842180b
--- /dev/null
+++ b/app/code/Magento/Backup/Model/ResourceModel/View/GetListViews.php
@@ -0,0 +1,44 @@
+resource = $resource;
+ }
+
+ /**
+ * Get list of database views.
+ *
+ * @return array
+ */
+ public function execute(): array
+ {
+ return $this->resource->getConnection('backup')->fetchCol(
+ "SHOW FULL TABLES WHERE `Table_type` = ?",
+ self::TABLE_TYPE
+ );
+ }
+}
diff --git a/app/code/Magento/Backup/Test/Mftf/ActionGroup/DeleteBackupActionGroup.xml b/app/code/Magento/Backup/Test/Mftf/ActionGroup/DeleteBackupActionGroup.xml
index 4f34f24c3a806..ebc4ac1fb056a 100644
--- a/app/code/Magento/Backup/Test/Mftf/ActionGroup/DeleteBackupActionGroup.xml
+++ b/app/code/Magento/Backup/Test/Mftf/ActionGroup/DeleteBackupActionGroup.xml
@@ -17,9 +17,10 @@
+ WebSetupWizard
+ Database
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Controller/Paypal/Review.php b/app/code/Magento/Braintree/Controller/Paypal/Review.php
index 14ec829d98024..eb2de7c7b6e39 100644
--- a/app/code/Magento/Braintree/Controller/Paypal/Review.php
+++ b/app/code/Magento/Braintree/Controller/Paypal/Review.php
@@ -13,11 +13,12 @@
use Magento\Braintree\Model\Paypal\Helper\QuoteUpdater;
use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
/**
* Class Review
*/
-class Review extends AbstractAction implements HttpPostActionInterface
+class Review extends AbstractAction implements HttpPostActionInterface, HttpGetActionInterface
{
/**
* @var QuoteUpdater
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml
index be8abbad80cd1..ce1d0a9aecc90 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml
@@ -19,24 +19,24 @@
-
@@ -63,21 +60,25 @@
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductDropdownOrderSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductDropdownOrderSection.xml
new file mode 100644
index 0000000000000..787f7ade8ffab
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductDropdownOrderSection.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
index 574c0dccdb07f..c922b981aecd9 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
@@ -31,6 +31,10 @@
+
@@ -60,14 +69,14 @@
- canShowPriceInfo($_item)): ?>
+ canShowPriceInfo($_item) || $shipTogether): ?>
getColumnHtml($_item, 'price') ?>
- canShowPriceInfo($_item)): ?>
+ canShowPriceInfo($_item) || $shipTogether): ?>
+
+
diff --git a/app/code/Magento/MessageQueue/etc/db_schema_whitelist.json b/app/code/Magento/MessageQueue/etc/db_schema_whitelist.json
index f31981d2ec40f..d9d623a994b37 100644
--- a/app/code/Magento/MessageQueue/etc/db_schema_whitelist.json
+++ b/app/code/Magento/MessageQueue/etc/db_schema_whitelist.json
@@ -9,5 +9,13 @@
"PRIMARY": true,
"QUEUE_LOCK_MESSAGE_CODE": true
}
+ },
+ "queue_poison_pill": {
+ "column": {
+ "version": true
+ },
+ "constraint": {
+ "PRIMARY": true
+ }
}
-}
\ No newline at end of file
+}
diff --git a/app/code/Magento/MessageQueue/etc/di.xml b/app/code/Magento/MessageQueue/etc/di.xml
index c8f2edb862613..22cfea976a722 100644
--- a/app/code/Magento/MessageQueue/etc/di.xml
+++ b/app/code/Magento/MessageQueue/etc/di.xml
@@ -13,6 +13,10 @@
diff --git a/app/code/Magento/Msrp/Helper/Data.php b/app/code/Magento/Msrp/Helper/Data.php
index b4ec34ebee19c..2f6dd2da9bbc4 100644
--- a/app/code/Magento/Msrp/Helper/Data.php
+++ b/app/code/Magento/Msrp/Helper/Data.php
@@ -7,13 +7,17 @@
use Magento\Framework\App\Helper\AbstractHelper;
use Magento\Framework\App\Helper\Context;
+use Magento\Framework\App\ObjectManager;
use Magento\Msrp\Model\Product\Attribute\Source\Type;
+use Magento\Msrp\Pricing\MsrpPriceCalculatorInterface;
use Magento\Store\Model\StoreManagerInterface;
use Magento\Catalog\Model\Product;
use Magento\Catalog\Api\ProductRepositoryInterface;
/**
* Msrp data helper
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Data extends AbstractHelper
{
@@ -42,6 +46,11 @@ class Data extends AbstractHelper
*/
protected $productRepository;
+ /**
+ * @var MsrpPriceCalculatorInterface
+ */
+ private $msrpPriceCalculator;
+
/**
* @param Context $context
* @param StoreManagerInterface $storeManager
@@ -50,6 +59,7 @@ class Data extends AbstractHelper
* @param \Magento\Msrp\Model\Config $config
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
* @param ProductRepositoryInterface $productRepository
+ * @param MsrpPriceCalculatorInterface|null $msrpPriceCalculator
*/
public function __construct(
Context $context,
@@ -58,7 +68,8 @@ public function __construct(
\Magento\Msrp\Model\Msrp $msrp,
\Magento\Msrp\Model\Config $config,
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
- ProductRepositoryInterface $productRepository
+ ProductRepositoryInterface $productRepository,
+ MsrpPriceCalculatorInterface $msrpPriceCalculator = null
) {
parent::__construct($context);
$this->storeManager = $storeManager;
@@ -67,17 +78,19 @@ public function __construct(
$this->config = $config;
$this->priceCurrency = $priceCurrency;
$this->productRepository = $productRepository;
+ $this->msrpPriceCalculator = $msrpPriceCalculator
+ ?: ObjectManager::getInstance()->get(MsrpPriceCalculatorInterface::class);
}
/**
- * Check if can apply Minimum Advertise price to product
- * in specific visibility
+ * Check if can apply Minimum Advertise price to product in specific visibility
*
* @param int|Product $product
* @param int|null $visibility Check displaying price in concrete place (by default generally)
* @return bool
*
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function canApplyMsrp($product, $visibility = null)
{
@@ -111,6 +124,7 @@ public function canApplyMsrp($product, $visibility = null)
*
* @param Product $product
* @return string
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function getMsrpPriceMessage($product)
{
@@ -128,6 +142,7 @@ public function getMsrpPriceMessage($product)
*
* @param int|Product $product
* @return bool
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function isShowPriceOnGesture($product)
{
@@ -135,8 +150,11 @@ public function isShowPriceOnGesture($product)
}
/**
+ * Check if we should show MAP proce before order confirmation
+ *
* @param int|Product $product
* @return bool
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function isShowBeforeOrderConfirm($product)
{
@@ -144,23 +162,19 @@ public function isShowBeforeOrderConfirm($product)
}
/**
+ * Check if any MAP price is larger than as low as value.
+ *
* @param int|Product $product
- * @return bool|float
+ * @return bool
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function isMinimalPriceLessMsrp($product)
{
if (is_numeric($product)) {
$product = $this->productRepository->getById($product, false, $this->storeManager->getStore()->getId());
}
- $msrp = $product->getMsrp();
+ $msrp = $this->msrpPriceCalculator->getMsrpPriceValue($product);
$price = $product->getPriceInfo()->getPrice(\Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE);
- if ($msrp === null) {
- if ($product->getTypeId() !== \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE) {
- return false;
- } else {
- $msrp = $product->getTypeInstance()->getChildrenMsrp($product);
- }
- }
if ($msrp) {
$msrp = $this->priceCurrency->convertAndRound($msrp);
}
diff --git a/app/code/Magento/Msrp/Pricing/MsrpPriceCalculator.php b/app/code/Magento/Msrp/Pricing/MsrpPriceCalculator.php
new file mode 100644
index 0000000000000..3d1e5ef0b8e6c
--- /dev/null
+++ b/app/code/Magento/Msrp/Pricing/MsrpPriceCalculator.php
@@ -0,0 +1,64 @@
+msrpPriceCalculators = $this->getMsrpPriceCalculators($msrpPriceCalculators);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getMsrpPriceValue(ProductInterface $product): float
+ {
+ $productType = $product->getTypeId();
+ if (isset($this->msrpPriceCalculators[$productType])) {
+ $priceCalculator = $this->msrpPriceCalculators[$productType];
+ $msrp = $priceCalculator->getMsrpPriceValue($product);
+ } else {
+ $msrp = (float)$product->getMsrp();
+ }
+
+ return $msrp;
+ }
+
+ /**
+ * Convert the configuration of MSRP price calculators.
+ *
+ * @param array $msrpPriceCalculatorsConfig
+ * @return array
+ */
+ private function getMsrpPriceCalculators(array $msrpPriceCalculatorsConfig): array
+ {
+ $msrpPriceCalculators = [];
+ foreach ($msrpPriceCalculatorsConfig as $msrpPriceCalculator) {
+ if (isset($msrpPriceCalculator['productType'], $msrpPriceCalculator['priceCalculator'])) {
+ $msrpPriceCalculators[$msrpPriceCalculator['productType']] =
+ $msrpPriceCalculator['priceCalculator'];
+ }
+ }
+ return $msrpPriceCalculators;
+ }
+}
diff --git a/app/code/Magento/Msrp/Pricing/MsrpPriceCalculatorInterface.php b/app/code/Magento/Msrp/Pricing/MsrpPriceCalculatorInterface.php
new file mode 100644
index 0000000000000..c50a381a2efa4
--- /dev/null
+++ b/app/code/Magento/Msrp/Pricing/MsrpPriceCalculatorInterface.php
@@ -0,0 +1,23 @@
+msrpPriceCalculator = $msrpPriceCalculator;
+ parent::__construct($context, $saleableItem, $price, $rendererPool, $jsonHelper, $mathRandom);
+ }
+
+ /**
+ * Return MSRP price calculator.
+ *
+ * @return MsrpPriceCalculatorInterface
+ */
+ public function getMsrpPriceCalculator(): MsrpPriceCalculatorInterface
+ {
+ return $this->msrpPriceCalculator;
+ }
+}
diff --git a/app/code/Magento/Msrp/Test/Mftf/Data/MsrpSettingsData.xml b/app/code/Magento/Msrp/Test/Mftf/Data/MsrpSettingsData.xml
new file mode 100644
index 0000000000000..3922bb4868914
--- /dev/null
+++ b/app/code/Magento/Msrp/Test/Mftf/Data/MsrpSettingsData.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+ EnableMAP
+
+
+ 1
+
+
+
+ DisableMAP
+
+
+ 0
+
+
diff --git a/app/code/Magento/Msrp/Test/Mftf/Metadata/msrp_settings-meta.xml b/app/code/Magento/Msrp/Test/Mftf/Metadata/msrp_settings-meta.xml
new file mode 100644
index 0000000000000..be91a548ad909
--- /dev/null
+++ b/app/code/Magento/Msrp/Test/Mftf/Metadata/msrp_settings-meta.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Msrp/Test/Mftf/Test/StorefrontProductWithMapAssignedConfigProductIsCorrectTest.xml b/app/code/Magento/Msrp/Test/Mftf/Test/StorefrontProductWithMapAssignedConfigProductIsCorrectTest.xml
new file mode 100644
index 0000000000000..a874de3b223a2
--- /dev/null
+++ b/app/code/Magento/Msrp/Test/Mftf/Test/StorefrontProductWithMapAssignedConfigProductIsCorrectTest.xml
@@ -0,0 +1,157 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Msrp/Test/Unit/Helper/DataTest.php b/app/code/Magento/Msrp/Test/Unit/Helper/DataTest.php
index 19f46b06ac5af..e4cd411a2e0b8 100644
--- a/app/code/Magento/Msrp/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Msrp/Test/Unit/Helper/DataTest.php
@@ -6,6 +6,8 @@
namespace Magento\Msrp\Test\Unit\Helper;
+use Magento\Msrp\Pricing\MsrpPriceCalculatorInterface;
+
/**
* Class DataTest
*/
@@ -26,6 +28,14 @@ class DataTest extends \PHPUnit\Framework\TestCase
*/
protected $productMock;
+ /**
+ * @var MsrpPriceCalculatorInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $msrpPriceCalculator;
+
+ /**
+ * @inheritdoc
+ */
protected function setUp()
{
$this->priceCurrencyMock = $this->createMock(\Magento\Framework\Pricing\PriceCurrencyInterface::class);
@@ -33,6 +43,8 @@ protected function setUp()
->disableOriginalConstructor()
->setMethods(['getMsrp', 'getPriceInfo', '__wakeup'])
->getMock();
+ $this->msrpPriceCalculator = $this->getMockBuilder(MsrpPriceCalculatorInterface::class)
+ ->getMockForAbstractClass();
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -40,10 +52,14 @@ protected function setUp()
\Magento\Msrp\Helper\Data::class,
[
'priceCurrency' => $this->priceCurrencyMock,
+ 'msrpPriceCalculator' => $this->msrpPriceCalculator,
]
);
}
+ /**
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
+ */
public function testIsMinimalPriceLessMsrp()
{
$msrp = 120;
@@ -73,12 +89,13 @@ function ($arg) {
->with(\Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE)
->will($this->returnValue($finalPriceMock));
- $this->productMock->expects($this->any())
- ->method('getMsrp')
- ->will($this->returnValue($msrp));
+ $this->msrpPriceCalculator
+ ->expects($this->any())
+ ->method('getMsrpPriceValue')
+ ->willReturn($msrp);
$this->productMock->expects($this->any())
->method('getPriceInfo')
- ->will($this->returnValue($priceInfoMock));
+ ->willReturn($priceInfoMock);
$result = $this->helper->isMinimalPriceLessMsrp($this->productMock);
$this->assertTrue($result, "isMinimalPriceLessMsrp returned incorrect value");
diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json
index 6e7bf61063a2a..a2e6da6de5387 100644
--- a/app/code/Magento/Msrp/composer.json
+++ b/app/code/Magento/Msrp/composer.json
@@ -10,7 +10,6 @@
"magento/module-catalog": "*",
"magento/module-downloadable": "*",
"magento/module-eav": "*",
- "magento/module-grouped-product": "*",
"magento/module-store": "*",
"magento/module-tax": "*"
},
diff --git a/app/code/Magento/Msrp/etc/adminhtml/system.xml b/app/code/Magento/Msrp/etc/adminhtml/system.xml
index 8ce0ea67343f8..c20d753a2e794 100644
--- a/app/code/Magento/Msrp/etc/adminhtml/system.xml
+++ b/app/code/Magento/Msrp/etc/adminhtml/system.xml
@@ -10,7 +10,7 @@
-
+
Magento\Config\Model\Config\Source\Yesno
diff --git a/app/code/Magento/Msrp/etc/di.xml b/app/code/Magento/Msrp/etc/di.xml
index 6f197f769d412..b8392b0bb0fe4 100644
--- a/app/code/Magento/Msrp/etc/di.xml
+++ b/app/code/Magento/Msrp/etc/di.xml
@@ -7,6 +7,7 @@
-->
diff --git a/app/code/Magento/Msrp/i18n/en_US.csv b/app/code/Magento/Msrp/i18n/en_US.csv
index d647f8527ec15..d47d72b2bdc9a 100644
--- a/app/code/Magento/Msrp/i18n/en_US.csv
+++ b/app/code/Magento/Msrp/i18n/en_US.csv
@@ -13,6 +13,7 @@ Price,Price
"Add to Cart","Add to Cart"
"Minimum Advertised Price","Minimum Advertised Price"
"Enable MAP","Enable MAP"
+"Warning! Enabling MAP by default will hide all product prices on Storefront.","Warning! Enabling MAP by default will hide all product prices on Storefront."
"Display Actual Price","Display Actual Price"
"Default Popup Text Message","Default Popup Text Message"
"Default ""What's This"" Text Message","Default ""What's This"" Text Message"
diff --git a/app/code/Magento/Msrp/view/base/layout/catalog_product_prices.xml b/app/code/Magento/Msrp/view/base/layout/catalog_product_prices.xml
index 9e2dd20638646..b8a3910bf21bc 100644
--- a/app/code/Magento/Msrp/view/base/layout/catalog_product_prices.xml
+++ b/app/code/Magento/Msrp/view/base/layout/catalog_product_prices.xml
@@ -11,7 +11,7 @@
-
-
-
- Magento\Catalog\Pricing\Render\PriceBox
+ - Magento\Msrp\Pricing\Render\PriceBox
- Magento_Msrp::product/price/msrp.phtml
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 dd5abd433073d..a428df57ab113 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
@@ -9,7 +9,7 @@
/**
* Template for displaying product price at product view page, gift registry and wish-list
*
- * @var $block \Magento\Catalog\Pricing\Render\PriceBox
+ * @var $block \Magento\Msrp\Pricing\Render\PriceBox
*/
?>
getPrice();
/** @var $product \Magento\Catalog\Model\Product */
$product = $block->getSaleableItem();
$productId = $product->getId();
+
+$amount = $block->getMsrpPriceCalculator()->getMsrpPriceValue($product);
+
$msrpPrice = $block->renderAmount(
- $priceType->getCustomAmount($product->getMsrp() ?: $product->getTypeInstance()->getChildrenMsrp($product)),
+ $priceType->getCustomAmount($amount),
[
'price_id' => $block->getPriceId() ? $block->getPriceId() : 'old-price-' . $productId,
'include_container' => false,
@@ -29,54 +32,56 @@ $msrpPrice = $block->renderAmount(
]
);
$priceElementIdPrefix = $block->getPriceElementIdPrefix() ? $block->getPriceElementIdPrefix() : 'product-price-';
-
-$addToCartUrl = '';
-if ($product->isSaleable()) {
- /** @var Magento\Catalog\Block\Product\AbstractProduct $addToCartUrlGenerator */
- $addToCartUrlGenerator = $block->getLayout()->getBlockSingleton('Magento\Catalog\Block\Product\AbstractProduct');
- $addToCartUrl = $addToCartUrlGenerator->getAddToCartUrl(
- $product,
- ['_query' => [
- \Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED =>
- $this->helper('Magento\Framework\Url\Helper\Data')->getEncodedUrl(
- $addToCartUrlGenerator->getAddToCartUrl($product)
- ),
- ]]
- );
-}
?>
-getMsrp()): ?>
+
+
+
isShowPriceOnGesture()): ?>
getIdSuffix();
- $popupId = 'msrp-popup-' . $productId . $block->getRandomString(20);
- $data = ['addToCart' => [
- 'origin'=> 'msrp',
- 'popupId' => '#' . $popupId,
- 'productName' => $block->escapeJs($block->escapeHtml($product->getName())),
- 'productId' => $productId,
- 'productIdInput' => 'input[type="hidden"][name="product"]',
- 'realPrice' => $block->getRealPriceHtml(),
- 'isSaleable' => $product->isSaleable(),
- 'msrpPrice' => $msrpPrice,
- 'priceElementId' => $priceElementId,
- 'closeButtonId' => '#map-popup-close',
- 'addToCartUrl' => $addToCartUrl,
- 'paymentButtons' => '[data-label=or]'
- ]];
- if ($block->getRequest()->getFullActionName() === 'catalog_product_view') {
- $data['addToCart']['addToCartButton'] = '#product_addtocart_form [type=submit]';
- } 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
- );
- }
+
+ $addToCartUrl = '';
+ if ($product->isSaleable()) {
+ /** @var Magento\Catalog\Block\Product\AbstractProduct $addToCartUrlGenerator */
+ $addToCartUrlGenerator = $block->getLayout()->getBlockSingleton('Magento\Catalog\Block\Product\AbstractProduct');
+ $addToCartUrl = $addToCartUrlGenerator->getAddToCartUrl(
+ $product,
+ ['_query' => [
+ \Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED =>
+ $this->helper('Magento\Framework\Url\Helper\Data')->getEncodedUrl(
+ $addToCartUrlGenerator->getAddToCartUrl($product)
+ ),
+ ]]
+ );
+ }
+
+ $priceElementId = $priceElementIdPrefix . $productId . $block->getIdSuffix();
+ $popupId = 'msrp-popup-' . $productId . $block->getRandomString(20);
+ $data = ['addToCart' => [
+ 'origin'=> 'msrp',
+ 'popupId' => '#' . $popupId,
+ 'productName' => $block->escapeJs($block->escapeHtml($product->getName())),
+ 'productId' => $productId,
+ 'productIdInput' => 'input[type="hidden"][name="product"]',
+ 'realPrice' => $block->getRealPriceHtml(),
+ 'isSaleable' => $product->isSaleable(),
+ 'msrpPrice' => $msrpPrice,
+ 'priceElementId' => $priceElementId,
+ 'closeButtonId' => '#map-popup-close',
+ 'addToCartUrl' => $addToCartUrl,
+ 'paymentButtons' => '[data-label=or]'
+ ]];
+ if ($block->getRequest()->getFullActionName() === 'catalog_product_view') {
+ $data['addToCart']['addToCartButton'] = '#product_addtocart_form [type=submit]';
+ } 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));
+ }
?>
isSaleable()) {
"productName": "escapeJs($block->escapeHtml($product->getName())) ?>",
"closeButtonId": "#map-popup-close"}}'>
-
+
\ No newline at end of file
diff --git a/app/code/Magento/Msrp/view/base/web/js/msrp.js b/app/code/Magento/Msrp/view/base/web/js/msrp.js
index deeadd9b55b82..a0bd3ec132de6 100644
--- a/app/code/Magento/Msrp/view/base/web/js/msrp.js
+++ b/app/code/Magento/Msrp/view/base/web/js/msrp.js
@@ -4,11 +4,12 @@
*/
define([
'jquery',
+ 'Magento_Catalog/js/price-utils',
'underscore',
'jquery/ui',
'mage/dropdown',
'mage/template'
-], function ($) {
+], function ($, priceUtils, _) {
'use strict';
$.widget('mage.addToCart', {
@@ -24,7 +25,14 @@ define([
// Selectors
cartForm: '.form.map.checkout',
msrpLabelId: '#map-popup-msrp',
+ msrpPriceElement: '#map-popup-msrp .price-wrapper',
priceLabelId: '#map-popup-price',
+ priceElement: '#map-popup-price .price',
+ mapInfoLinks: '.map-show-info',
+ displayPriceElement: '.old-price.map-old-price .price-wrapper',
+ fallbackPriceElement: '.normal-price.map-fallback-price .price-wrapper',
+ displayPriceContainer: '.old-price.map-old-price',
+ fallbackPriceContainer: '.normal-price.map-fallback-price',
popUpAttr: '[data-role=msrp-popup-template]',
popupCartButtonId: '#map-popup-button',
paypalCheckoutButons: '[data-action=checkout-form-submit]',
@@ -59,9 +67,11 @@ define([
shadowHinter: 'popup popup-pointer'
},
popupOpened: false,
+ wasOpened: false,
/**
* Creates widget instance
+ *
* @private
*/
_create: function () {
@@ -73,10 +83,13 @@ define([
this.initTierPopup();
}
$(this.options.cartButtonId).on('click', this._addToCartSubmit.bind(this));
+ $(document).on('updateMsrpPriceBlock', this.onUpdateMsrpPrice.bind(this));
+ $(this.options.cartForm).on('submit', this._onSubmitForm.bind(this));
},
/**
* Init msrp popup
+ *
* @private
*/
initMsrpPopup: function () {
@@ -89,7 +102,7 @@ define([
$msrpPopup.find('button')
.on('click',
- this.handleMsrpAddToCart.bind(this))
+ this.handleMsrpAddToCart.bind(this))
.filter(this.options.popupCartButtonId)
.text($(this.options.addToCartButton).text());
@@ -104,6 +117,7 @@ define([
/**
* Init info popup
+ *
* @private
*/
initInfoPopup: function () {
@@ -212,8 +226,12 @@ define([
var options = this.tierOptions || this.options;
this.popUpOptions.position.of = $(event.target);
- this.$popup.find(this.options.msrpLabelId).html(options.msrpPrice);
- this.$popup.find(this.options.priceLabelId).html(options.realPrice);
+
+ if (!this.wasOpened) {
+ this.$popup.find(this.options.msrpLabelId).html(options.msrpPrice);
+ this.$popup.find(this.options.priceLabelId).html(options.realPrice);
+ this.wasOpened = true;
+ }
this.$popup.dropdownDialog(this.popUpOptions).dropdownDialog('open');
this._toggle(this.$popup);
@@ -223,6 +241,7 @@ define([
},
/**
+ * Toggle MAP popup visibility
*
* @param {HTMLElement} $elem
* @private
@@ -239,6 +258,7 @@ define([
},
/**
+ * Close MAP information popup
*
* @param {HTMLElement} $elem
*/
@@ -249,8 +269,10 @@ define([
/**
* Handler for addToCart action
+ *
+ * @param {Object} e
*/
- _addToCartSubmit: function () {
+ _addToCartSubmit: function (e) {
this.element.trigger('addToCart', this.element);
if (this.element.data('stop-processing')) {
@@ -266,9 +288,106 @@ define([
if (this.options.addToCartUrl) {
$('.mage-dropdown-dialog > .ui-dialog-content').dropdownDialog('close');
}
+
+ e.preventDefault();
$(this.options.cartForm).submit();
+ },
+ /**
+ * Call on event updatePrice. Proxy to updateMsrpPrice method.
+ *
+ * @param {Event} event
+ * @param {mixed} priceIndex
+ * @param {Object} prices
+ */
+ onUpdateMsrpPrice: function onUpdateMsrpPrice(event, priceIndex, prices) {
+
+ var defaultMsrp,
+ defaultPrice,
+ msrpPrice,
+ finalPrice;
+
+ defaultMsrp = _.chain(prices).map(function (price) {
+ return price.msrpPrice.amount;
+ }).reject(function (p) {
+ return p === null;
+ }).max().value();
+
+ defaultPrice = _.chain(prices).map(function (p) {
+ return p.finalPrice.amount;
+ }).min().value();
+
+ if (typeof priceIndex !== 'undefined') {
+ msrpPrice = prices[priceIndex].msrpPrice.amount;
+ finalPrice = prices[priceIndex].finalPrice.amount;
+
+ if (msrpPrice === null || msrpPrice <= finalPrice) {
+ this.updateNonMsrpPrice(priceUtils.formatPrice(finalPrice));
+ } else {
+ this.updateMsrpPrice(
+ priceUtils.formatPrice(finalPrice),
+ priceUtils.formatPrice(msrpPrice),
+ false);
+ }
+ } else {
+ this.updateMsrpPrice(
+ priceUtils.formatPrice(defaultPrice),
+ priceUtils.formatPrice(defaultMsrp),
+ true);
+ }
+ },
+
+ /**
+ * Update prices for configurable product with MSRP enabled
+ *
+ * @param {String} finalPrice
+ * @param {String} msrpPrice
+ * @param {Boolean} useDefaultPrice
+ */
+ updateMsrpPrice: function (finalPrice, msrpPrice, useDefaultPrice) {
+ var options = this.tierOptions || this.options;
+
+ $(this.options.fallbackPriceContainer).hide();
+ $(this.options.displayPriceContainer).show();
+ $(this.options.mapInfoLinks).show();
+
+ if (useDefaultPrice || !this.wasOpened) {
+ this.$popup.find(this.options.msrpLabelId).html(options.msrpPrice);
+ this.$popup.find(this.options.priceLabelId).html(options.realPrice);
+ $(this.options.displayPriceElement).html(msrpPrice);
+ this.wasOpened = true;
+ }
+
+ if (!useDefaultPrice) {
+ this.$popup.find(this.options.msrpPriceElement).html(msrpPrice);
+ this.$popup.find(this.options.priceElement).html(finalPrice);
+ $(this.options.displayPriceElement).html(msrpPrice);
+ }
+ },
+
+ /**
+ * Display non MAP price for irrelevant products
+ *
+ * @param {String} price
+ */
+ updateNonMsrpPrice: function (price) {
+ $(this.options.fallbackPriceElement).html(price);
+ $(this.options.displayPriceContainer).hide();
+ $(this.options.mapInfoLinks).hide();
+ $(this.options.fallbackPriceContainer).show();
+ },
+
+ /**
+ * Handler for submit form
+ *
+ * @private
+ */
+ _onSubmitForm: function () {
+ if ($(this.options.cartForm).valid()) {
+ $(this.options.cartButtonId).prop('disabled', true);
+ }
}
+
});
return $.mage.addToCart;
diff --git a/app/code/Magento/MsrpConfigurableProduct/Pricing/MsrpPriceCalculator.php b/app/code/Magento/MsrpConfigurableProduct/Pricing/MsrpPriceCalculator.php
new file mode 100644
index 0000000000000..b6f5194ab8cbe
--- /dev/null
+++ b/app/code/Magento/MsrpConfigurableProduct/Pricing/MsrpPriceCalculator.php
@@ -0,0 +1,46 @@
+getTypeId() !== Configurable::TYPE_CODE) {
+ return 0;
+ }
+
+ /** @var Configurable $configurableProduct */
+ $configurableProduct = $product->getTypeInstance();
+ $msrp = 0;
+ $prices = [];
+ foreach ($configurableProduct->getUsedProducts($product) as $item) {
+ if ($item->getMsrp() !== null) {
+ $prices[] = $item->getMsrp();
+ }
+ }
+ if ($prices) {
+ $msrp = (float)max($prices);
+ }
+
+ return $msrp;
+ }
+}
diff --git a/app/code/Magento/MsrpConfigurableProduct/README.md b/app/code/Magento/MsrpConfigurableProduct/README.md
new file mode 100644
index 0000000000000..8911b6e9e6667
--- /dev/null
+++ b/app/code/Magento/MsrpConfigurableProduct/README.md
@@ -0,0 +1,3 @@
+# MsrpConfigurableProduct
+
+**MsrpConfigurableProduct** provides type and resolver information for the Msrp module from the ConfigurableProduct module.
\ No newline at end of file
diff --git a/app/code/Magento/MsrpConfigurableProduct/composer.json b/app/code/Magento/MsrpConfigurableProduct/composer.json
new file mode 100644
index 0000000000000..00c3cf6b03078
--- /dev/null
+++ b/app/code/Magento/MsrpConfigurableProduct/composer.json
@@ -0,0 +1,27 @@
+{
+ "name": "magento/module-msrp-configurable-product",
+ "description": "N/A",
+ "config": {
+ "sort-packages": true
+ },
+ "require": {
+ "php": "~7.1.3||~7.2.0",
+ "magento/framework": "*",
+ "magento/module-catalog": "*",
+ "magento/module-msrp": "*",
+ "magento/module-configurable-product": "*"
+ },
+ "type": "magento2-module",
+ "license": [
+ "OSL-3.0",
+ "AFL-3.0"
+ ],
+ "autoload": {
+ "files": [
+ "registration.php"
+ ],
+ "psr-4": {
+ "Magento\\MsrpConfigurableProduct\\": ""
+ }
+ }
+}
diff --git a/app/code/Magento/MsrpConfigurableProduct/etc/di.xml b/app/code/Magento/MsrpConfigurableProduct/etc/di.xml
new file mode 100644
index 0000000000000..ea33c81ff7cf5
--- /dev/null
+++ b/app/code/Magento/MsrpConfigurableProduct/etc/di.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ -
+
- \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE
+ - \Magento\MsrpConfigurableProduct\Pricing\MsrpPriceCalculator
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/MsrpConfigurableProduct/etc/module.xml b/app/code/Magento/MsrpConfigurableProduct/etc/module.xml
new file mode 100644
index 0000000000000..b00e363b0b269
--- /dev/null
+++ b/app/code/Magento/MsrpConfigurableProduct/etc/module.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/MsrpConfigurableProduct/registration.php b/app/code/Magento/MsrpConfigurableProduct/registration.php
new file mode 100644
index 0000000000000..d4d58ec3c013b
--- /dev/null
+++ b/app/code/Magento/MsrpConfigurableProduct/registration.php
@@ -0,0 +1,9 @@
+getTypeId() !== Grouped::TYPE_CODE) {
+ return 0;
+ }
+
+ /** @var Grouped $groupedProduct */
+ $groupedProduct = $product->getTypeInstance();
+
+ return $groupedProduct->getChildrenMsrp($product);
+ }
+}
diff --git a/app/code/Magento/MsrpGroupedProduct/README.md b/app/code/Magento/MsrpGroupedProduct/README.md
new file mode 100644
index 0000000000000..d597ba7fc18a7
--- /dev/null
+++ b/app/code/Magento/MsrpGroupedProduct/README.md
@@ -0,0 +1,3 @@
+# MsrpGroupedProduct
+
+**MsrpGroupedProduct** provides type and resolver information for the Msrp module from the GroupedProduct module.
\ No newline at end of file
diff --git a/app/code/Magento/MsrpGroupedProduct/composer.json b/app/code/Magento/MsrpGroupedProduct/composer.json
new file mode 100644
index 0000000000000..a626f199ad6cc
--- /dev/null
+++ b/app/code/Magento/MsrpGroupedProduct/composer.json
@@ -0,0 +1,27 @@
+{
+ "name": "magento/module-msrp-grouped-product",
+ "description": "N/A",
+ "config": {
+ "sort-packages": true
+ },
+ "require": {
+ "php": "~7.1.3||~7.2.0",
+ "magento/framework": "*",
+ "magento/module-catalog": "*",
+ "magento/module-msrp": "*",
+ "magento/module-grouped-product": "*"
+ },
+ "type": "magento2-module",
+ "license": [
+ "OSL-3.0",
+ "AFL-3.0"
+ ],
+ "autoload": {
+ "files": [
+ "registration.php"
+ ],
+ "psr-4": {
+ "Magento\\MsrpGroupedProduct\\": ""
+ }
+ }
+}
diff --git a/app/code/Magento/MsrpGroupedProduct/etc/di.xml b/app/code/Magento/MsrpGroupedProduct/etc/di.xml
new file mode 100644
index 0000000000000..29b25f15bc2c1
--- /dev/null
+++ b/app/code/Magento/MsrpGroupedProduct/etc/di.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ -
+
- \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE
+ - \Magento\MsrpGroupedProduct\Pricing\MsrpPriceCalculator
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/MsrpGroupedProduct/etc/module.xml b/app/code/Magento/MsrpGroupedProduct/etc/module.xml
new file mode 100644
index 0000000000000..898dd904b5dfb
--- /dev/null
+++ b/app/code/Magento/MsrpGroupedProduct/etc/module.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/MsrpGroupedProduct/registration.php b/app/code/Magento/MsrpGroupedProduct/registration.php
new file mode 100644
index 0000000000000..c5a261e66c640
--- /dev/null
+++ b/app/code/Magento/MsrpGroupedProduct/registration.php
@@ -0,0 +1,9 @@
+getId() && $subscriber->getCode()) {
if ($subscriber->confirm($code)) {
- $this->messageManager->addSuccess(__('Your subscription has been confirmed.'));
+ $this->messageManager->addSuccessMessage(__('Your subscription has been confirmed.'));
} else {
- $this->messageManager->addError(__('This is an invalid subscription confirmation code.'));
+ $this->messageManager->addErrorMessage(__('This is an invalid subscription confirmation code.'));
}
} else {
- $this->messageManager->addError(__('This is an invalid subscription ID.'));
+ $this->messageManager->addErrorMessage(__('This is an invalid subscription ID.'));
}
}
-
- $resultRedirect = $this->resultRedirectFactory->create();
- $resultRedirect->setUrl($this->_storeManager->getStore()->getBaseUrl());
- return $resultRedirect;
+ /** @var \Magento\Framework\Controller\Result\Redirect $redirect */
+ $redirect = $this->resultFactory->create(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT);
+ $redirectUrl = $this->_storeManager->getStore()->getBaseUrl();
+ return $redirect->setUrl($redirectUrl);
}
}
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
index 4f46c84894f12..7557f1610b4f4 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
@@ -4,6 +4,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
namespace Magento\Newsletter\Controller\Subscriber;
use Magento\Customer\Api\AccountManagementInterface as CustomerAccountManagement;
@@ -131,7 +132,7 @@ protected function validateEmailFormat($email)
/**
* New subscription action
*
- * @return void
+ * @return \Magento\Framework\Controller\Result\Redirect
*/
public function execute()
{
@@ -160,7 +161,10 @@ public function execute()
$this->messageManager->addExceptionMessage($e, __('Something went wrong with the subscription.'));
}
}
- $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl());
+ /** @var \Magento\Framework\Controller\Result\Redirect $redirect */
+ $redirect = $this->resultFactory->create(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT);
+ $redirectUrl = $this->_redirect->getRedirectUrl();
+ return $redirect->setUrl($redirectUrl);
}
/**
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php b/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php
index 88fa128162700..e37a3786e140a 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php
@@ -3,6 +3,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
namespace Magento\Newsletter\Controller\Subscriber;
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
@@ -15,7 +16,7 @@ class Unsubscribe extends \Magento\Newsletter\Controller\Subscriber implements H
/**
* Unsubscribe newsletter.
*
- * @return \Magento\Backend\Model\View\Result\Redirect
+ * @return \Magento\Framework\Controller\Result\Redirect
*/
public function execute()
{
@@ -25,14 +26,14 @@ public function execute()
if ($id && $code) {
try {
$this->_subscriberFactory->create()->load($id)->setCheckCode($code)->unsubscribe();
- $this->messageManager->addSuccess(__('You unsubscribed.'));
+ $this->messageManager->addSuccessMessage(__('You unsubscribed.'));
} catch (\Magento\Framework\Exception\LocalizedException $e) {
- $this->messageManager->addException($e, $e->getMessage());
+ $this->messageManager->addErrorMessage($e, $e->getMessage());
} catch (\Exception $e) {
- $this->messageManager->addException($e, __('Something went wrong while unsubscribing you.'));
+ $this->messageManager->addErrorMessage($e, __('Something went wrong while unsubscribing you.'));
}
}
- /** @var \Magento\Backend\Model\View\Result\Redirect $redirect */
+ /** @var \Magento\Framework\Controller\Result\Redirect $redirect */
$redirect = $this->resultFactory->create(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT);
$redirectUrl = $this->_redirect->getRedirectUrl();
return $redirect->setUrl($redirectUrl);
diff --git a/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php b/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
index 035013e572833..309bfadab41b3 100644
--- a/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
+++ b/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
@@ -6,13 +6,11 @@
namespace Magento\Newsletter\Model\Plugin;
use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
-use Magento\Customer\Api\Data\CustomerExtensionInterface;
use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Newsletter\Model\SubscriberFactory;
use Magento\Framework\Api\ExtensionAttributesFactory;
-use Magento\Framework\App\ObjectManager;
use Magento\Newsletter\Model\ResourceModel\Subscriber;
-use Magento\Newsletter\Model\SubscriberFactory;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Customer\Api\Data\CustomerExtensionInterface;
/**
* Newsletter Plugin for customer
@@ -41,29 +39,21 @@ class CustomerPlugin
*/
private $customerSubscriptionStatus = [];
- /**
- * @var StoreManagerInterface
- */
- private $storeManager;
-
/**
* Initialize dependencies.
*
* @param SubscriberFactory $subscriberFactory
* @param ExtensionAttributesFactory $extensionFactory
* @param Subscriber $subscriberResource
- * @param StoreManagerInterface|null $storeManager
*/
public function __construct(
SubscriberFactory $subscriberFactory,
ExtensionAttributesFactory $extensionFactory,
- Subscriber $subscriberResource,
- StoreManagerInterface $storeManager = null
+ Subscriber $subscriberResource
) {
$this->subscriberFactory = $subscriberFactory;
$this->extensionFactory = $extensionFactory;
$this->subscriberResource = $subscriberResource;
- $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
}
/**
@@ -164,8 +154,7 @@ public function afterDelete(CustomerRepository $subject, $result, CustomerInterf
public function afterGetById(CustomerRepository $subject, CustomerInterface $customer)
{
$extensionAttributes = $customer->getExtensionAttributes();
- $storeId = $this->storeManager->getStore()->getId();
- $customer->setStoreId($storeId);
+
if ($extensionAttributes === null) {
/** @var CustomerExtensionInterface $extensionAttributes */
$extensionAttributes = $this->extensionFactory->create(CustomerInterface::class);
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml
index fde7daacebd5e..22ca214c94aec 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml
@@ -47,6 +47,8 @@
+ true
true
1
+
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
index a64185ce67958..532ecde456077 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
@@ -16,7 +16,16 @@
-
+
getChildHtml('preview_form') ?>
diff --git a/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/checkmo.phtml b/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/checkmo.phtml
new file mode 100644
index 0000000000000..4d63577319d5b
--- /dev/null
+++ b/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/checkmo.phtml
@@ -0,0 +1,26 @@
+
+escapeHtml($block->getMethod()->getTitle()) ?>
+ {{pdf_row_separator}}
+getInfo()->getAdditionalInformation()): ?>
+ {{pdf_row_separator}}
+ getPayableTo()): ?>
+ escapeHtml(__('Make Check payable to: %1', $block->getPayableTo())) ?>
+ {{pdf_row_separator}}
+
+ getMailingAddress()): ?>
+ escapeHtml(__('Send Check to:')) ?>
+ {{pdf_row_separator}}
+ escapeHtml($block->getMailingAddress())) ?>
+ {{pdf_row_separator}}
+
+
diff --git a/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/purchaseorder.phtml
new file mode 100644
index 0000000000000..4a6ea1c00b21c
--- /dev/null
+++ b/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/purchaseorder.phtml
@@ -0,0 +1,11 @@
+
+escapeHtml(__('Purchase Order Number: %1', $block->getInfo()->getPoNumber())) ?>
+ {{pdf_row_separator}}
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php b/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
index 26f3274688977..c2e6d0e922317 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
@@ -80,7 +80,7 @@ public function collectRates(RateRequest $request)
$this->_updateFreeMethodQuote($request);
- if ($request->getFreeShipping() || $request->getBaseSubtotalInclTax() >= $this->getConfigData(
+ if ($request->getFreeShipping() || $request->getPackageValueWithDiscount() >= $this->getConfigData(
'free_shipping_subtotal'
)
) {
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php b/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
index bb81f9ebb475f..373d64afc8cc3 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
@@ -227,12 +227,12 @@ public function getCode($type, $code = '')
$codes = [
'condition_name' => [
'package_weight' => __('Weight vs. Destination'),
- 'package_value' => __('Price vs. Destination'),
+ 'package_value_with_discount' => __('Price vs. Destination'),
'package_qty' => __('# of Items vs. Destination'),
],
'condition_name_short' => [
'package_weight' => __('Weight (and above)'),
- 'package_value' => __('Order Subtotal (and above)'),
+ 'package_value_with_discount' => __('Order Subtotal (and above)'),
'package_qty' => __('# of Items (and above)'),
],
];
diff --git a/app/code/Magento/OfflineShipping/Setup/Patch/Data/UpdateShippingTablerate.php b/app/code/Magento/OfflineShipping/Setup/Patch/Data/UpdateShippingTablerate.php
new file mode 100644
index 0000000000000..070105846fdd8
--- /dev/null
+++ b/app/code/Magento/OfflineShipping/Setup/Patch/Data/UpdateShippingTablerate.php
@@ -0,0 +1,73 @@
+moduleDataSetup = $moduleDataSetup;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function apply()
+ {
+ $this->moduleDataSetup->getConnection()->startSetup();
+ $connection = $this->moduleDataSetup->getConnection();
+ $connection->update(
+ $this->moduleDataSetup->getTable('shipping_tablerate'),
+ ['condition_name' => 'package_value_with_discount'],
+ [new \Zend_Db_Expr('condition_name = \'package_value\'')]
+ );
+ $connection->update(
+ $this->moduleDataSetup->getTable('core_config_data'),
+ ['value' => 'package_value_with_discount'],
+ [
+ new \Zend_Db_Expr('value = \'package_value\''),
+ new \Zend_Db_Expr('path = \'carriers/tablerate/condition_name\'')
+ ]
+ );
+ $this->moduleDataSetup->getConnection()->endSetup();
+
+ $connection->endSetup();
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public static function getDependencies()
+ {
+ return [];
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getAliases()
+ {
+ return [];
+ }
+}
diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
index 8d75cc32914b4..a1fb2e449d7bf 100644
--- a/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
+++ b/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
@@ -33,7 +33,10 @@ protected function setUp()
$testHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
$this->_object = $testHelper->getObject(
\Magento\OfflineShipping\Block\Adminhtml\Form\Field\Import::class,
- ['data' => $testData]
+ [
+ 'data' => $testData,
+ '_escaper' => $testHelper->getObject(\Magento\Framework\Escaper::class)
+ ]
);
$this->_object->setForm($this->_formMock);
}
diff --git a/app/code/Magento/OfflineShipping/etc/db_schema.xml b/app/code/Magento/OfflineShipping/etc/db_schema.xml
index 0510ce9b9b8eb..5129e8a29b2a1 100644
--- a/app/code/Magento/OfflineShipping/etc/db_schema.xml
+++ b/app/code/Magento/OfflineShipping/etc/db_schema.xml
@@ -18,7 +18,7 @@
default="0" comment="Destination Region Id"/>
setHost($host['host'])
- ->setPort(isset($host['port']) ? $host['port'] : self::DEFAULT_PORT)
- ;
+ ->setPort(isset($host['port']) ? $host['port'] : self::DEFAULT_PORT);
}
} elseif ($this->request->getHttpHost()) {
$servers[] = UriFactory::factory('')->setHost($this->request->getHttpHost())->setPort(self::DEFAULT_PORT);
diff --git a/app/code/Magento/PageCache/Model/System/Config/Backend/AccessList.php b/app/code/Magento/PageCache/Model/System/Config/Backend/AccessList.php
index e16584b0b17f8..7c9391ba22182 100644
--- a/app/code/Magento/PageCache/Model/System/Config/Backend/AccessList.php
+++ b/app/code/Magento/PageCache/Model/System/Config/Backend/AccessList.php
@@ -28,7 +28,7 @@ public function beforeSave()
throw new LocalizedException(
new Phrase(
'Access List value "%1" is not valid. '
- .'Please use only IP addresses and host names.',
+ . 'Please use only IP addresses and host names.',
[$value]
)
);
diff --git a/app/code/Magento/PageCache/Model/Varnish/VclGenerator.php b/app/code/Magento/PageCache/Model/Varnish/VclGenerator.php
index cf5a703142c84..a50fa090de2d8 100644
--- a/app/code/Magento/PageCache/Model/Varnish/VclGenerator.php
+++ b/app/code/Magento/PageCache/Model/Varnish/VclGenerator.php
@@ -9,6 +9,9 @@
use Magento\PageCache\Model\VclGeneratorInterface;
use Magento\PageCache\Model\VclTemplateLocatorInterface;
+/**
+ * Varnish vcl generator model.
+ */
class VclGenerator implements VclGeneratorInterface
{
/**
@@ -119,7 +122,7 @@ private function getReplacements()
private function getRegexForDesignExceptions()
{
$result = '';
- $tpl = "%s (req.http.user-agent ~ \"%s\") {\n"." hash_data(\"%s\");\n"." }";
+ $tpl = "%s (req.http.user-agent ~ \"%s\") {\n" . " hash_data(\"%s\");\n" . " }";
$expressions = $this->getDesignExceptions();
@@ -143,7 +146,8 @@ private function getRegexForDesignExceptions()
/**
* Get IPs access list that can purge Varnish configuration for config file generation
- * and transform it to appropriate view
+ *
+ * Tansform it to appropriate view
*
* acl purge{
* "127.0.0.1";
@@ -157,7 +161,7 @@ private function getTransformedAccessList()
$result = array_reduce(
$this->getAccessList(),
function ($ips, $ip) use ($tpl) {
- return $ips.sprintf($tpl, trim($ip)) . "\n";
+ return $ips . sprintf($tpl, trim($ip)) . "\n";
},
''
);
@@ -216,6 +220,8 @@ private function getSslOffloadedHeader()
}
/**
+ * Get design exceptions array.
+ *
* @return array
*/
private function getDesignExceptions()
diff --git a/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance.php b/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance.php
new file mode 100644
index 0000000000000..7017da27eee93
--- /dev/null
+++ b/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance.php
@@ -0,0 +1,108 @@
+cacheManager = $cacheManager;
+ $this->pageCacheStateStorage = $pageCacheStateStorage;
+ }
+
+ /**
+ * Switches Full Page Cache.
+ *
+ * Depending on enabling or disabling Maintenance Mode it turns off or restores Full Page Cache state.
+ *
+ * @param Observer $observer
+ * @return void
+ */
+ public function execute(Observer $observer): void
+ {
+ if ($observer->getData('isOn')) {
+ $this->pageCacheStateStorage->save($this->isFullPageCacheEnabled());
+ $this->turnOffFullPageCache();
+ } else {
+ $this->restoreFullPageCacheState();
+ }
+ }
+
+ /**
+ * Turns off Full Page Cache.
+ *
+ * @return void
+ */
+ private function turnOffFullPageCache(): void
+ {
+ if (!$this->isFullPageCacheEnabled()) {
+ return;
+ }
+
+ $this->cacheManager->clean([PageCacheType::TYPE_IDENTIFIER]);
+ $this->cacheManager->setEnabled([PageCacheType::TYPE_IDENTIFIER], false);
+ }
+
+ /**
+ * Full Page Cache state.
+ *
+ * @return bool
+ */
+ private function isFullPageCacheEnabled(): bool
+ {
+ $cacheStatus = $this->cacheManager->getStatus();
+
+ if (!array_key_exists(PageCacheType::TYPE_IDENTIFIER, $cacheStatus)) {
+ return false;
+ }
+
+ return (bool)$cacheStatus[PageCacheType::TYPE_IDENTIFIER];
+ }
+
+ /**
+ * Restores Full Page Cache state.
+ *
+ * Returns FPC to previous state that was before maintenance mode turning on.
+ *
+ * @return void
+ */
+ private function restoreFullPageCacheState(): void
+ {
+ $storedPageCacheState = $this->pageCacheStateStorage->isEnabled();
+ $this->pageCacheStateStorage->flush();
+
+ if ($storedPageCacheState) {
+ $this->cacheManager->setEnabled([PageCacheType::TYPE_IDENTIFIER], true);
+ }
+ }
+}
diff --git a/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance/PageCacheState.php b/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance/PageCacheState.php
new file mode 100644
index 0000000000000..e4cadf728f2ea
--- /dev/null
+++ b/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance/PageCacheState.php
@@ -0,0 +1,74 @@
+flagDir = $fileSystem->getDirectoryWrite(DirectoryList::VAR_DIR);
+ }
+
+ /**
+ * Saves Full Page Cache state.
+ *
+ * Saves FPC state across requests.
+ *
+ * @param bool $state
+ * @return void
+ */
+ public function save(bool $state): void
+ {
+ $this->flagDir->writeFile(self::PAGE_CACHE_STATE_FILENAME, (string)$state);
+ }
+
+ /**
+ * Returns stored Full Page Cache state.
+ *
+ * @return bool
+ */
+ public function isEnabled(): bool
+ {
+ if (!$this->flagDir->isExist(self::PAGE_CACHE_STATE_FILENAME)) {
+ return false;
+ }
+
+ return (bool)$this->flagDir->readFile(self::PAGE_CACHE_STATE_FILENAME);
+ }
+
+ /**
+ * Flushes Page Cache state storage.
+ *
+ * @return void
+ */
+ public function flush(): void
+ {
+ $this->flagDir->delete(self::PAGE_CACHE_STATE_FILENAME);
+ }
+}
diff --git a/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml b/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml
index 34a77095d524d..ee0c32633569a 100644
--- a/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml
+++ b/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml
@@ -30,5 +30,6 @@
diff --git a/app/code/Magento/PageCache/Test/Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml b/app/code/Magento/PageCache/Test/Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml
new file mode 100644
index 0000000000000..bd6f7ba362bf4
--- /dev/null
+++ b/app/code/Magento/PageCache/Test/Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml b/app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml
index c5871ddc3a373..a3c9e7b39217d 100644
--- a/app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml
+++ b/app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml
@@ -9,7 +9,7 @@
-
-
+
+
diff --git a/app/code/Magento/Payment/Model/CcConfigProvider.php b/app/code/Magento/Payment/Model/CcConfigProvider.php
index 15bdd0072a51a..497ce93c30c71 100644
--- a/app/code/Magento/Payment/Model/CcConfigProvider.php
+++ b/app/code/Magento/Payment/Model/CcConfigProvider.php
@@ -44,7 +44,7 @@ public function __construct(
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function getConfig()
{
@@ -69,7 +69,7 @@ public function getIcons()
}
$types = $this->ccConfig->getCcAvailableTypes();
- foreach (array_keys($types) as $code) {
+ foreach ($types as $code => $label) {
if (!array_key_exists($code, $this->icons)) {
$asset = $this->ccConfig->createAsset('Magento_Payment::images/cc/' . strtolower($code) . '.png');
$placeholder = $this->assetSource->findSource($asset);
@@ -78,7 +78,8 @@ public function getIcons()
$this->icons[$code] = [
'url' => $asset->getUrl(),
'width' => $width,
- 'height' => $height
+ 'height' => $height,
+ 'title' => __($label),
];
}
}
diff --git a/app/code/Magento/Payment/Model/Method/Cc.php b/app/code/Magento/Payment/Model/Method/Cc.php
index c23ad5b535dd8..11629308cd46b 100644
--- a/app/code/Magento/Payment/Model/Method/Cc.php
+++ b/app/code/Magento/Payment/Model/Method/Cc.php
@@ -10,6 +10,8 @@
use Magento\Quote\Model\Quote\Payment;
/**
+ * Credit Card payment method legacy implementation.
+ *
* @method \Magento\Quote\Api\Data\PaymentMethodExtensionInterface getExtensionAttributes()
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @deprecated 100.0.8
@@ -93,6 +95,7 @@ public function __construct(
* @throws \Magento\Framework\Exception\LocalizedException
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function validate()
{
@@ -148,6 +151,22 @@ public function validate()
'JCB' => '/^35(2[8-9][0-9]{12,15}|[3-8][0-9]{13,16})/',
'MI' => '/^(5(0|[6-9])|63|67(?!59|6770|6774))\d*$/',
'MD' => '/^(6759(?!24|38|40|6[3-9]|70|76)|676770|676774)\d*$/',
+
+ //Hipercard
+ 'HC' => '/^((606282)|(637095)|(637568)|(637599)|(637609)|(637612))\d*$/',
+ //Elo
+ 'ELO' => '/^((509091)|(636368)|(636297)|(504175)|(438935)|(40117[8-9])|(45763[1-2])|' .
+ '(457393)|(431274)|(50990[0-2])|(5099[7-9][0-9])|(50996[4-9])|(509[1-8][0-9][0-9])|' .
+ '(5090(0[0-2]|0[4-9]|1[2-9]|[24589][0-9]|3[1-9]|6[0-46-9]|7[0-24-9]))|' .
+ '(5067(0[0-24-8]|1[0-24-9]|2[014-9]|3[0-379]|4[0-9]|5[0-3]|6[0-5]|7[0-8]))|' .
+ '(6504(0[5-9]|1[0-9]|2[0-9]|3[0-9]))|' .
+ '(6504(8[5-9]|9[0-9])|6505(0[0-9]|1[0-9]|2[0-9]|3[0-8]))|' .
+ '(6505(4[1-9]|5[0-9]|6[0-9]|7[0-9]|8[0-9]|9[0-8]))|' .
+ '(6507(0[0-9]|1[0-8]))|(65072[0-7])|(6509(0[1-9]|1[0-9]|20))|' .
+ '(6516(5[2-9]|6[0-9]|7[0-9]))|(6550(0[0-9]|1[0-9]))|' .
+ '(6550(2[1-9]|3[0-9]|4[0-9]|5[0-8])))\d*$/',
+ //Aura
+ 'AU' => '/^5078\d*$/'
];
$ccNumAndTypeMatches = isset(
@@ -189,6 +208,8 @@ public function validate()
}
/**
+ * Check if verification should be used.
+ *
* @return bool
* @api
*/
@@ -202,6 +223,8 @@ public function hasVerification()
}
/**
+ * Get list of credit cards verification reg exp.
+ *
* @return array
* @api
*/
@@ -226,6 +249,8 @@ public function getVerificationRegEx()
}
/**
+ * Validate expiration date
+ *
* @param string $expYear
* @param string $expMonth
* @return bool
@@ -276,6 +301,8 @@ public function assignData(\Magento\Framework\DataObject $data)
}
/**
+ * Get code for "other" credit cards.
+ *
* @param string $type
* @return bool
* @api
diff --git a/app/code/Magento/Payment/Test/Unit/Model/CcConfigProviderTest.php b/app/code/Magento/Payment/Test/Unit/Model/CcConfigProviderTest.php
index a8856166995fc..ff6aea44645cf 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/CcConfigProviderTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/CcConfigProviderTest.php
@@ -42,12 +42,14 @@ public function testGetConfig()
'vi' => [
'url' => 'http://cc.card/vi.png',
'width' => getimagesize($imagesDirectoryPath . 'vi.png')[0],
- 'height' => getimagesize($imagesDirectoryPath . 'vi.png')[1]
+ 'height' => getimagesize($imagesDirectoryPath . 'vi.png')[1],
+ 'title' => __('Visa'),
],
'ae' => [
'url' => 'http://cc.card/ae.png',
'width' => getimagesize($imagesDirectoryPath . 'ae.png')[0],
- 'height' => getimagesize($imagesDirectoryPath . 'ae.png')[1]
+ 'height' => getimagesize($imagesDirectoryPath . 'ae.png')[1],
+ 'title' => __('American Express'),
]
]
]
@@ -56,11 +58,13 @@ public function testGetConfig()
$ccAvailableTypesMock = [
'vi' => [
+ 'title' => 'Visa',
'fileId' => 'Magento_Payment::images/cc/vi.png',
'path' => $imagesDirectoryPath . 'vi.png',
'url' => 'http://cc.card/vi.png'
],
'ae' => [
+ 'title' => 'American Express',
'fileId' => 'Magento_Payment::images/cc/ae.png',
'path' => $imagesDirectoryPath . 'ae.png',
'url' => 'http://cc.card/ae.png'
@@ -68,7 +72,11 @@ public function testGetConfig()
];
$assetMock = $this->createMock(\Magento\Framework\View\Asset\File::class);
- $this->ccConfigMock->expects($this->once())->method('getCcAvailableTypes')->willReturn($ccAvailableTypesMock);
+ $this->ccConfigMock->expects($this->once())->method('getCcAvailableTypes')
+ ->willReturn(array_combine(
+ array_keys($ccAvailableTypesMock),
+ array_column($ccAvailableTypesMock, 'title')
+ ));
$this->ccConfigMock->expects($this->atLeastOnce())
->method('createAsset')
diff --git a/app/code/Magento/Payment/etc/payment.xml b/app/code/Magento/Payment/etc/payment.xml
index 19b5eb709c649..4afb6b01b366c 100644
--- a/app/code/Magento/Payment/etc/payment.xml
+++ b/app/code/Magento/Payment/etc/payment.xml
@@ -41,5 +41,14 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Payment/view/base/templates/info/pdf/default.phtml b/app/code/Magento/Payment/view/base/templates/info/pdf/default.phtml
new file mode 100644
index 0000000000000..7acac62f65d38
--- /dev/null
+++ b/app/code/Magento/Payment/view/base/templates/info/pdf/default.phtml
@@ -0,0 +1,23 @@
+
+escapeHtml($block->getMethod()->getTitle()) ?>{{pdf_row_separator}}
+
+getSpecificInformation()):?>
+ $value):?>
+ escapeHtml($label) ?>:
+ escapeHtml(implode(' ', $block->getValueAsArray($value))) ?>
+ {{pdf_row_separator}}
+
+
+
+escapeHtml(implode('{{pdf_row_separator}}', $block->getChildPdfAsArray())) ?>
diff --git a/app/code/Magento/Payment/view/base/web/images/cc/au.png b/app/code/Magento/Payment/view/base/web/images/cc/au.png
new file mode 100644
index 0000000000000..04cb2df8fa332
Binary files /dev/null and b/app/code/Magento/Payment/view/base/web/images/cc/au.png differ
diff --git a/app/code/Magento/Payment/view/base/web/images/cc/elo.png b/app/code/Magento/Payment/view/base/web/images/cc/elo.png
new file mode 100644
index 0000000000000..eba0296a09104
Binary files /dev/null and b/app/code/Magento/Payment/view/base/web/images/cc/elo.png differ
diff --git a/app/code/Magento/Payment/view/base/web/images/cc/hc.png b/app/code/Magento/Payment/view/base/web/images/cc/hc.png
new file mode 100644
index 0000000000000..203e0b7e305c1
Binary files /dev/null and b/app/code/Magento/Payment/view/base/web/images/cc/hc.png differ
diff --git a/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator/credit-card-type.js b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator/credit-card-type.js
index 3ac67f6f31002..1b387b384104f 100644
--- a/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator/credit-card-type.js
+++ b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator/credit-card-type.js
@@ -110,6 +110,48 @@ define([
name: 'CVC',
size: 3
}
+ },
+ {
+ title: 'Hipercard',
+ type: 'HC',
+ pattern: '^((606282)|(637095)|(637568)|(637599)|(637609)|(637612))\\d*$',
+ gaps: [4, 8, 12],
+ lengths: [13, 16],
+ code: {
+ name: 'CVC',
+ size: 3
+ }
+ },
+ {
+ title: 'Elo',
+ type: 'ELO',
+ pattern: '^((509091)|(636368)|(636297)|(504175)|(438935)|(40117[8-9])|(45763[1-2])|' +
+ '(457393)|(431274)|(50990[0-2])|(5099[7-9][0-9])|(50996[4-9])|(509[1-8][0-9][0-9])|' +
+ '(5090(0[0-2]|0[4-9]|1[2-9]|[24589][0-9]|3[1-9]|6[0-46-9]|7[0-24-9]))|' +
+ '(5067(0[0-24-8]|1[0-24-9]|2[014-9]|3[0-379]|4[0-9]|5[0-3]|6[0-5]|7[0-8]))|' +
+ '(6504(0[5-9]|1[0-9]|2[0-9]|3[0-9]))|' +
+ '(6504(8[5-9]|9[0-9])|6505(0[0-9]|1[0-9]|2[0-9]|3[0-8]))|' +
+ '(6505(4[1-9]|5[0-9]|6[0-9]|7[0-9]|8[0-9]|9[0-8]))|' +
+ '(6507(0[0-9]|1[0-8]))|(65072[0-7])|(6509(0[1-9]|1[0-9]|20))|' +
+ '(6516(5[2-9]|6[0-9]|7[0-9]))|(6550(0[0-9]|1[0-9]))|' +
+ '(6550(2[1-9]|3[0-9]|4[0-9]|5[0-8])))\\d*$',
+ gaps: [4, 8, 12],
+ lengths: [16],
+ code: {
+ name: 'CVC',
+ size: 3
+ }
+ },
+ {
+ title: 'Aura',
+ type: 'AU',
+ pattern: '^5078\\d*$',
+ gaps: [4, 8, 12],
+ lengths: [19],
+ code: {
+ name: 'CVC',
+ size: 3
+ }
}
];
diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ShippingOptionsCallback.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ShippingOptionsCallback.php
index cb1b3388dc06a..fc3a45e1e1397 100644
--- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ShippingOptionsCallback.php
+++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ShippingOptionsCallback.php
@@ -6,7 +6,17 @@
*/
namespace Magento\Paypal\Controller\Express\AbstractExpress;
-class ShippingOptionsCallback extends \Magento\Paypal\Controller\Express\AbstractExpress
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Paypal\Controller\Express\AbstractExpress;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\RequestInterface;
+
+/**
+ * Returns shipping rates by server-to-server request from PayPal.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ShippingOptionsCallback extends AbstractExpress implements CsrfAwareActionInterface
{
/**
* @var \Magento\Quote\Api\CartRepositoryInterface
@@ -65,4 +75,21 @@ public function execute()
$this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
}
}
+
+ /**
+ * @inheritDoc
+ */
+ public function createCsrfValidationException(
+ RequestInterface $request
+ ): ?InvalidRequestException {
+ return null;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function validateForCsrf(RequestInterface $request): ?bool
+ {
+ return true;
+ }
}
diff --git a/app/code/Magento/Paypal/Controller/Ipn/Index.php b/app/code/Magento/Paypal/Controller/Ipn/Index.php
index 4bcc3a9b3606c..a879266bc1915 100644
--- a/app/code/Magento/Paypal/Controller/Ipn/Index.php
+++ b/app/code/Magento/Paypal/Controller/Ipn/Index.php
@@ -4,6 +4,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
namespace Magento\Paypal\Controller\Ipn;
@@ -16,6 +17,8 @@
/**
* Unified IPN controller for all supported PayPal methods
+ *
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
*/
class Index extends \Magento\Framework\App\Action\Action implements CsrfAwareActionInterface
{
@@ -73,7 +76,6 @@ public function validateForCsrf(RequestInterface $request): ?bool
* Instantiate IPN model and pass IPN request to it
*
* @return void
- * @SuppressWarnings(PHPMD.ExitExpression)
*/
public function execute()
{
@@ -95,6 +97,7 @@ public function execute()
$this->_logger->critical($e);
$this->getResponse()->setStatusHeader(503, '1.1', 'Service Unavailable')->sendResponse();
/** @todo eliminate usage of exit statement */
+ // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
exit;
} catch (\Exception $e) {
$this->_logger->critical($e);
diff --git a/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php b/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
index 847388eb755a1..f4b4c39ca4021 100644
--- a/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
+++ b/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
@@ -12,6 +12,7 @@
use Magento\Framework\Controller\ResultInterface;
use Magento\Framework\Session\Generic;
use Magento\Framework\Session\SessionManager;
+use Magento\Framework\Session\SessionManagerInterface;
use Magento\Paypal\Model\Payflow\Service\Request\SecureToken;
use Magento\Paypal\Model\Payflow\Transparent;
use Magento\Quote\Model\Quote;
@@ -40,7 +41,7 @@ class RequestSecureToken extends \Magento\Framework\App\Action\Action implements
private $secureTokenService;
/**
- * @var SessionManager
+ * @var SessionManager|SessionManagerInterface
*/
private $sessionManager;
@@ -56,6 +57,7 @@ class RequestSecureToken extends \Magento\Framework\App\Action\Action implements
* @param SecureToken $secureTokenService
* @param SessionManager $sessionManager
* @param Transparent $transparent
+ * @param SessionManagerInterface|null $sessionInterface
*/
public function __construct(
Context $context,
@@ -63,12 +65,13 @@ public function __construct(
Generic $sessionTransparent,
SecureToken $secureTokenService,
SessionManager $sessionManager,
- Transparent $transparent
+ Transparent $transparent,
+ SessionManagerInterface $sessionInterface = null
) {
$this->resultJsonFactory = $resultJsonFactory;
$this->sessionTransparent = $sessionTransparent;
$this->secureTokenService = $secureTokenService;
- $this->sessionManager = $sessionManager;
+ $this->sessionManager = $sessionInterface ?: $sessionManager;
$this->transparent = $transparent;
parent::__construct($context);
}
diff --git a/app/code/Magento/Paypal/CustomerData/BillingAgreement.php b/app/code/Magento/Paypal/CustomerData/BillingAgreement.php
index 2c4cdf55bff92..a6304f32197bf 100644
--- a/app/code/Magento/Paypal/CustomerData/BillingAgreement.php
+++ b/app/code/Magento/Paypal/CustomerData/BillingAgreement.php
@@ -79,7 +79,7 @@ public function __construct(
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function getSectionData()
{
@@ -93,7 +93,7 @@ public function getSectionData()
[\Magento\Paypal\Model\Express\Checkout::PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT => 1]
)
),
- 'confirmMessage' => $this->escaper->escapeJs(
+ 'confirmMessage' => $this->escaper->escapeHtml(
__('Would you like to sign a billing agreement to streamline further purchases with PayPal?')
)
];
diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php
index 38ba0983514b0..72f166e8d07c1 100644
--- a/app/code/Magento/Paypal/Model/Express/Checkout.php
+++ b/app/code/Magento/Paypal/Model/Express/Checkout.php
@@ -1076,6 +1076,7 @@ protected static function cmpShippingOptions(DataObject $option1, DataObject $op
*/
protected function _matchShippingMethodCode(Address $address, $selectedCode)
{
+ $address->collectShippingRates();
$options = $this->_prepareShippingOptions($address, false);
foreach ($options as $option) {
if ($selectedCode === $option['code'] // the proper case as outlined in documentation
diff --git a/app/code/Magento/Paypal/Model/Payflowpro.php b/app/code/Magento/Paypal/Model/Payflowpro.php
index aeea4c75933b5..2ba72c4b26bd7 100644
--- a/app/code/Magento/Paypal/Model/Payflowpro.php
+++ b/app/code/Magento/Paypal/Model/Payflowpro.php
@@ -894,7 +894,7 @@ public function addRequestOrderInfo(DataObject $request, Order $order)
$orderIncrementId = $order->getIncrementId();
$request->setCustref($orderIncrementId)
->setInvnum($orderIncrementId)
- ->setComment1($orderIncrementId);
+ ->setData('comment1', $orderIncrementId);
}
/**
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OpenPayPalButtonCheckoutPageActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OpenPayPalButtonCheckoutPageActionGroup.xml
index 97c7fbc471e97..32c2fab40e97a 100644
--- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OpenPayPalButtonCheckoutPageActionGroup.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OpenPayPalButtonCheckoutPageActionGroup.xml
@@ -8,12 +8,15 @@
-
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OtherPayPalConfigurationActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OtherPayPalConfigurationActionGroup.xml
new file mode 100644
index 0000000000000..08ca6c7834384
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OtherPayPalConfigurationActionGroup.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PayPalExpressCheckoutConfigurationActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PayPalExpressCheckoutConfigurationActionGroup.xml
index 7bf26aceb316a..bae517ffe2f3e 100644
--- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PayPalExpressCheckoutConfigurationActionGroup.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PayPalExpressCheckoutConfigurationActionGroup.xml
@@ -8,18 +8,22 @@
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml b/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml
index d97e60043cc5d..ae34476e9ac0b 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml
@@ -38,6 +38,9 @@
0
+
+ someMerchantId
+
@@ -89,4 +92,11 @@
silver
black
+
+ myBusinessAccount@magento.com
+ myApiUsername.magento.com
+ somePassword
+ someApiSignature
+ someMerchantId
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/OtherPayPalPaymentsConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/OtherPayPalPaymentsConfigSection.xml
new file mode 100644
index 0000000000000..ca8438d5ee06a
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Section/OtherPayPalPaymentsConfigSection.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection.xml
index 3ac0bb2707556..85f94cd8691a5 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection.xml
@@ -9,20 +9,24 @@
-
+
+
-
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPal.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPal.xml
new file mode 100644
index 0000000000000..b485fcb2a8f9a
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPal.xml
@@ -0,0 +1,276 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php
index b33d2f5723961..b9ea53c154014 100644
--- a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php
@@ -5,6 +5,8 @@
*/
namespace Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Field\Enable;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
/**
* Class AbstractEnableTest
*
@@ -43,8 +45,18 @@ protected function setUp()
)->disableOriginalConstructor()
->getMockForAbstractClass();
+ $objectManager = new ObjectManager($this);
+ $escaper = $objectManager->getObject(\Magento\Framework\Escaper::class);
+ $reflection = new \ReflectionClass($this->elementMock);
+ $reflection_property = $reflection->getProperty('_escaper');
+ $reflection_property->setAccessible(true);
+ $reflection_property->setValue($this->elementMock, $escaper);
+
$this->abstractEnable = $objectManager->getObject(
- \Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Field\Enable\AbstractEnable\Stub::class
+ \Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Field\Enable\AbstractEnable\Stub::class,
+ [
+ '_escaper' => $objectManager->getObject(\Magento\Framework\Escaper::class)
+ ]
);
}
diff --git a/app/code/Magento/Paypal/Test/Unit/CustomerData/BillingAgreementTest.php b/app/code/Magento/Paypal/Test/Unit/CustomerData/BillingAgreementTest.php
index 010c3f8f71de6..82e94462445ae 100644
--- a/app/code/Magento/Paypal/Test/Unit/CustomerData/BillingAgreementTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/CustomerData/BillingAgreementTest.php
@@ -11,6 +11,7 @@
use Magento\Paypal\Model\Config;
use Magento\Paypal\Model\ConfigFactory;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Escaper;
class BillingAgreementTest extends \PHPUnit\Framework\TestCase
{
@@ -35,9 +36,16 @@ class BillingAgreementTest extends \PHPUnit\Framework\TestCase
*/
private $billingAgreement;
+ /**
+ * @var Escaper
+ */
+ private $escaperMock;
+
protected function setUp()
{
+ $helper = new ObjectManager($this);
$this->paypalConfig = $this->createMock(Config::class);
+ $this->escaperMock = $helper->getObject(Escaper::class);
$this->paypalConfig
->expects($this->once())
->method('setMethod')
@@ -59,14 +67,13 @@ protected function setUp()
->willReturn($customerId);
$this->paypalData = $this->createMock(Data::class);
-
- $helper = new ObjectManager($this);
$this->billingAgreement = $helper->getObject(
BillingAgreement::class,
[
'paypalConfigFactory' => $paypalConfigFactory,
'paypalData' => $this->paypalData,
- 'currentCustomer' => $this->currentCustomer
+ 'currentCustomer' => $this->currentCustomer,
+ 'escaper' => $this->escaperMock
]
);
}
@@ -83,6 +90,10 @@ public function testGetSectionData()
$this->assertArrayHasKey('askToCreate', $result);
$this->assertArrayHasKey('confirmUrl', $result);
$this->assertArrayHasKey('confirmMessage', $result);
+ $this->assertEquals(
+ 'Would you like to sign a billing agreement to streamline further purchases with PayPal?',
+ $result['confirmMessage']
+ );
$this->assertTrue($result['askToCreate']);
}
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/PayflowlinkTest.php b/app/code/Magento/Paypal/Test/Unit/Model/PayflowlinkTest.php
index 80c8194e07654..5ac436bcf0a3a 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/PayflowlinkTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/PayflowlinkTest.php
@@ -131,7 +131,7 @@ public function testInitialize()
->method('postRequest')
->willReturn($response);
- $this->payflowRequest->expects($this->exactly(3))
+ $this->payflowRequest->expects($this->exactly(4))
->method('setData')
->willReturnMap(
[
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/PayflowproTest.php b/app/code/Magento/Paypal/Test/Unit/Model/PayflowproTest.php
index 3e8af6b2ee766..7c352fc497a38 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/PayflowproTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/PayflowproTest.php
@@ -580,6 +580,40 @@ public function testPostRequestException()
$this->payflowpro->postRequest($request, $config);
}
+ /**
+ * @covers \Magento\Paypal\Model\Payflowpro::addRequestOrderInfo
+ */
+ public function testAddRequestOrderInfo()
+ {
+ $orderData = [
+ 'id' => 1,
+ 'increment_id' => '0000001'
+ ];
+ $data = [
+ 'ponum' => $orderData['id'],
+ 'custref' => $orderData['increment_id'],
+ 'invnum' => $orderData['increment_id'],
+ 'comment1' => $orderData['increment_id']
+ ];
+ $expectedData = new DataObject($data);
+ $actualData = new DataObject();
+
+ $orderMock = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getIncrementId', 'getId'])
+ ->getMock();
+ $orderMock->expects(static::once())
+ ->method('getId')
+ ->willReturn($orderData['id']);
+ $orderMock->expects(static::atLeastOnce())
+ ->method('getIncrementId')
+ ->willReturn($orderData['increment_id']);
+
+ $this->payflowpro->addRequestOrderInfo($actualData, $orderMock);
+
+ $this->assertEquals($expectedData, $actualData);
+ }
+
/**
* @covers \Magento\Paypal\Model\Payflowpro::assignData
*/
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml
index 565962518881b..d8b765b9b4d22 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml
@@ -15,7 +15,7 @@
+ >
wps_express
@@ -39,16 +39,16 @@
+ >
payments_pro_hosted_solution_with_express_checkout
- express_checkout_us
+ express_checkout_gb
-
+
@@ -56,19 +56,19 @@
payments_pro_hosted_solution_with_express_checkout
- express_checkout_us
+ express_checkout_gb
-
+
+ >
wps_express
@@ -98,4 +98,4 @@
-
+
\ No newline at end of file
diff --git a/app/code/Magento/ProductAlert/Model/Email.php b/app/code/Magento/ProductAlert/Model/Email.php
index 7aee4ca01240d..3351166aa6a12 100644
--- a/app/code/Magento/ProductAlert/Model/Email.php
+++ b/app/code/Magento/ProductAlert/Model/Email.php
@@ -39,6 +39,8 @@
*
* @api
* @since 100.0.2
+ * @method int getStoreId()
+ * @method $this setStoreId()
*/
class Email extends AbstractModel
{
@@ -136,11 +138,6 @@ class Email extends AbstractModel
*/
protected $_customerHelper;
- /**
- * @var int
- */
- private $storeId = null;
-
/**
* @param Context $context
* @param Registry $registry
@@ -215,18 +212,6 @@ public function setWebsite(\Magento\Store\Model\Website $website)
return $this;
}
- /**
- * Set store id from product alert.
- *
- * @param int $storeId
- * @return $this
- */
- public function setStoreId(int $storeId)
- {
- $this->storeId = $storeId;
- return $this;
- }
-
/**
* Set website id
*
@@ -357,7 +342,7 @@ public function send()
return false;
}
- $storeId = $this->storeId ?: (int) $this->_customer->getStoreId();
+ $storeId = $this->getStoreId() ?: (int) $this->_customer->getStoreId();
$store = $this->getStore($storeId);
$this->_appEmulation->startEnvironmentEmulation($storeId);
diff --git a/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js b/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
index 20deba5b9b46a..cd0f3b3d630a6 100644
--- a/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
+++ b/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
@@ -177,12 +177,14 @@ define([
* @private
*/
clearEvents: function () {
- this.fotoramaItem.off(
- 'fotorama:show.' + this.PV +
- ' fotorama:showend.' + this.PV +
- ' fotorama:fullscreenenter.' + this.PV +
- ' fotorama:fullscreenexit.' + this.PV
- );
+ if (this.fotoramaItem !== undefined) {
+ this.fotoramaItem.off(
+ 'fotorama:show.' + this.PV +
+ ' fotorama:showend.' + this.PV +
+ ' fotorama:fullscreenenter.' + this.PV +
+ ' fotorama:fullscreenexit.' + this.PV
+ );
+ }
},
/**
diff --git a/app/code/Magento/Quote/Model/Cart/CartTotalRepository.php b/app/code/Magento/Quote/Model/Cart/CartTotalRepository.php
index e18ab8587fc71..60e5ad9f4caff 100644
--- a/app/code/Magento/Quote/Model/Cart/CartTotalRepository.php
+++ b/app/code/Magento/Quote/Model/Cart/CartTotalRepository.php
@@ -79,7 +79,7 @@ public function __construct(
}
/**
- * {@inheritDoc}
+ * @inheritdoc
*
* @param int $cartId The cart ID.
* @return Totals Quote totals data.
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
index 17d3b9205625f..b1f68d0411cf0 100644
--- a/app/code/Magento/Quote/Model/Quote.php
+++ b/app/code/Magento/Quote/Model/Quote.php
@@ -1375,14 +1375,13 @@ public function addShippingAddress(\Magento\Quote\Api\Data\AddressInterface $add
*
* @param bool $useCache
* @return \Magento\Eav\Model\Entity\Collection\AbstractCollection
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getItemsCollection($useCache = true)
{
- if ($this->hasItemsCollection()) {
+ if ($this->hasItemsCollection() && $useCache) {
return $this->getData('items_collection');
}
- if (null === $this->_items) {
+ if (null === $this->_items || !$useCache) {
$this->_items = $this->_quoteItemCollectionFactory->create();
$this->extensionAttributesJoinProcessor->process($this->_items);
$this->_items->setQuote($this);
diff --git a/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php b/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php
index c5b8dc1c4b124..6fdb70350ed72 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php
@@ -12,6 +12,9 @@
use Magento\Quote\Model\QuoteAddressValidator;
use Magento\Customer\Api\AddressRepositoryInterface;
+/**
+ * Saves billing address for quotes.
+ */
class BillingAddressPersister
{
/**
@@ -37,6 +40,8 @@ public function __construct(
}
/**
+ * Save address for billing.
+ *
* @param CartInterface $quote
* @param AddressInterface $address
* @param bool $useForShipping
@@ -47,7 +52,7 @@ public function __construct(
public function save(CartInterface $quote, AddressInterface $address, $useForShipping = false)
{
/** @var \Magento\Quote\Model\Quote $quote */
- $this->addressValidator->validate($address);
+ $this->addressValidator->validateForCart($quote, $address);
$customerAddressId = $address->getCustomerAddressId();
$shippingAddress = null;
$addressData = [];
diff --git a/app/code/Magento/Quote/Model/QuoteAddressValidator.php b/app/code/Magento/Quote/Model/QuoteAddressValidator.php
index 9a86829bfc4ce..e7750f5879de5 100644
--- a/app/code/Magento/Quote/Model/QuoteAddressValidator.php
+++ b/app/code/Magento/Quote/Model/QuoteAddressValidator.php
@@ -6,10 +6,13 @@
namespace Magento\Quote\Model;
use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Api\Data\AddressInterface;
+use Magento\Quote\Api\Data\CartInterface;
/**
* Quote shipping/billing address validator service.
*
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
*/
class QuoteAddressValidator
{
@@ -28,7 +31,7 @@ class QuoteAddressValidator
protected $customerRepository;
/**
- * @var \Magento\Customer\Model\Session
+ * @deprecated This class is not a part of HTML presentation layer and should not use sessions.
*/
protected $customerSession;
@@ -50,44 +53,80 @@ public function __construct(
}
/**
- * Validates the fields in a specified address data object.
+ * Validate address.
*
- * @param \Magento\Quote\Api\Data\AddressInterface $addressData The address data object.
- * @return bool
+ * @param AddressInterface $address
+ * @param int|null $customerId Cart belongs to
+ * @return void
* @throws \Magento\Framework\Exception\InputException The specified address belongs to another customer.
* @throws \Magento\Framework\Exception\NoSuchEntityException The specified customer ID or address ID is not valid.
*/
- public function validate(\Magento\Quote\Api\Data\AddressInterface $addressData)
+ private function doValidate(AddressInterface $address, ?int $customerId): void
{
//validate customer id
- if ($addressData->getCustomerId()) {
- $customer = $this->customerRepository->getById($addressData->getCustomerId());
+ if ($customerId) {
+ $customer = $this->customerRepository->getById($customerId);
if (!$customer->getId()) {
throw new \Magento\Framework\Exception\NoSuchEntityException(
- __('Invalid customer id %1', $addressData->getCustomerId())
+ __('Invalid customer id %1', $customerId)
);
}
}
- if ($addressData->getCustomerAddressId()) {
+ if ($address->getCustomerAddressId()) {
+ //Existing address cannot belong to a guest
+ if (!$customerId) {
+ throw new \Magento\Framework\Exception\NoSuchEntityException(
+ __('Invalid customer address id %1', $address->getCustomerAddressId())
+ );
+ }
+ //Validating address ID
try {
- $this->addressRepository->getById($addressData->getCustomerAddressId());
+ $this->addressRepository->getById($address->getCustomerAddressId());
} catch (NoSuchEntityException $e) {
throw new \Magento\Framework\Exception\NoSuchEntityException(
- __('Invalid address id %1', $addressData->getId())
+ __('Invalid address id %1', $address->getId())
);
}
-
+ //Finding available customer's addresses
$applicableAddressIds = array_map(function ($address) {
/** @var \Magento\Customer\Api\Data\AddressInterface $address */
return $address->getId();
- }, $this->customerRepository->getById($addressData->getCustomerId())->getAddresses());
- if (!in_array($addressData->getCustomerAddressId(), $applicableAddressIds)) {
+ }, $this->customerRepository->getById($customerId)->getAddresses());
+ if (!in_array($address->getCustomerAddressId(), $applicableAddressIds)) {
throw new \Magento\Framework\Exception\NoSuchEntityException(
- __('Invalid customer address id %1', $addressData->getCustomerAddressId())
+ __('Invalid customer address id %1', $address->getCustomerAddressId())
);
}
}
+ }
+
+ /**
+ * Validates the fields in a specified address data object.
+ *
+ * @param \Magento\Quote\Api\Data\AddressInterface $addressData The address data object.
+ * @return bool
+ * @throws \Magento\Framework\Exception\InputException The specified address belongs to another customer.
+ * @throws \Magento\Framework\Exception\NoSuchEntityException The specified customer ID or address ID is not valid.
+ */
+ public function validate(AddressInterface $addressData)
+ {
+ $this->doValidate($addressData, $addressData->getCustomerId());
+
return true;
}
+
+ /**
+ * Validate address to be used for cart.
+ *
+ * @param CartInterface $cart
+ * @param AddressInterface $address
+ * @return void
+ * @throws \Magento\Framework\Exception\InputException The specified address belongs to another customer.
+ * @throws \Magento\Framework\Exception\NoSuchEntityException The specified customer ID or address ID is not valid.
+ */
+ public function validateForCart(CartInterface $cart, AddressInterface $address): void
+ {
+ $this->doValidate($address, $cart->getCustomerIsGuest() ? null : $cart->getCustomer()->getId());
+ }
}
diff --git a/app/code/Magento/Quote/Model/QuoteManagement.php b/app/code/Magento/Quote/Model/QuoteManagement.php
index 6ed8393f80658..2fcfd2dfadabb 100644
--- a/app/code/Magento/Quote/Model/QuoteManagement.php
+++ b/app/code/Magento/Quote/Model/QuoteManagement.php
@@ -25,6 +25,7 @@
/**
* Class QuoteManagement
*
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @SuppressWarnings(PHPMD.TooManyFields)
*/
@@ -356,6 +357,13 @@ public function placeOrder($cartId, PaymentInterface $paymentMethod = null)
if ($quote->getCheckoutMethod() === self::METHOD_GUEST) {
$quote->setCustomerId(null);
$quote->setCustomerEmail($quote->getBillingAddress()->getEmail());
+ if ($quote->getCustomerFirstname() === null && $quote->getCustomerLastname() === null) {
+ $quote->setCustomerFirstname($quote->getBillingAddress()->getFirstname());
+ $quote->setCustomerLastname($quote->getBillingAddress()->getLastname());
+ if ($quote->getBillingAddress()->getMiddlename() === null) {
+ $quote->setCustomerMiddlename($quote->getBillingAddress()->getMiddlename());
+ }
+ }
$quote->setCustomerIsGuest(true);
$quote->setCustomerGroupId(\Magento\Customer\Api\Data\GroupInterface::NOT_LOGGED_IN_ID);
}
@@ -524,19 +532,7 @@ protected function submitQuote(QuoteEntity $quote, $orderData = [])
);
$this->quoteRepository->save($quote);
} catch (\Exception $e) {
- if (!empty($this->addressesToSync)) {
- foreach ($this->addressesToSync as $addressId) {
- $this->addressRepository->deleteById($addressId);
- }
- }
- $this->eventManager->dispatch(
- 'sales_model_service_quote_submit_failure',
- [
- 'order' => $order,
- 'quote' => $quote,
- 'exception' => $e
- ]
- );
+ $this->rollbackAddresses($quote, $order, $e);
throw $e;
}
return $order;
@@ -603,4 +599,41 @@ protected function _prepareCustomerQuote($quote)
$shipping->setIsDefaultBilling(true);
}
}
+
+ /**
+ * Remove related to order and quote addresses and submit exception to further processing.
+ *
+ * @param Quote $quote
+ * @param \Magento\Sales\Api\Data\OrderInterface $order
+ * @param \Exception $e
+ * @throws \Exception
+ */
+ private function rollbackAddresses(
+ QuoteEntity $quote,
+ \Magento\Sales\Api\Data\OrderInterface $order,
+ \Exception $e
+ ): void {
+ try {
+ if (!empty($this->addressesToSync)) {
+ foreach ($this->addressesToSync as $addressId) {
+ $this->addressRepository->deleteById($addressId);
+ }
+ }
+ $this->eventManager->dispatch(
+ 'sales_model_service_quote_submit_failure',
+ [
+ 'order' => $order,
+ 'quote' => $quote,
+ 'exception' => $e,
+ ]
+ );
+ } catch (\Exception $consecutiveException) {
+ $message = sprintf(
+ "An exception occurred on 'sales_model_service_quote_submit_failure' event: %s",
+ $consecutiveException->getMessage()
+ );
+
+ throw new \Exception($message, 0, $e);
+ }
+ }
}
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote.php b/app/code/Magento/Quote/Model/ResourceModel/Quote.php
index 946c0e0c5f3b8..ae26407c74522 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote.php
@@ -23,8 +23,8 @@ class Quote extends AbstractDb
/**
* @param \Magento\Framework\Model\ResourceModel\Db\Context $context
- * @param Snapshot $entitySnapshot,
- * @param RelationComposite $entityRelationComposite,
+ * @param Snapshot $entitySnapshot
+ * @param RelationComposite $entityRelationComposite
* @param \Magento\SalesSequence\Model\Manager $sequenceManager
* @param string $connectionName
*/
@@ -296,7 +296,7 @@ public function markQuotesRecollect($productIds)
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function save(\Magento\Framework\Model\AbstractModel $object)
{
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
index abecec395865d..392a815ed963c 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
@@ -256,9 +256,8 @@ protected function _assignProducts(): self
foreach ($this as $item) {
/** @var ProductInterface $product */
$product = $productCollection->getItemById($item->getProductId());
- $isValidProduct = $this->isValidProduct($product);
$qtyOptions = [];
- if ($isValidProduct) {
+ if ($product && $this->isValidProduct($product)) {
$product->setCustomOptions([]);
$optionProductIds = $this->getOptionProductIds($item, $product, $productCollection);
foreach ($optionProductIds as $optionProductId) {
diff --git a/app/code/Magento/Quote/Model/ShippingAddressManagement.php b/app/code/Magento/Quote/Model/ShippingAddressManagement.php
index d8e70c68ba33f..b9edcc13d0077 100644
--- a/app/code/Magento/Quote/Model/ShippingAddressManagement.php
+++ b/app/code/Magento/Quote/Model/ShippingAddressManagement.php
@@ -79,7 +79,7 @@ public function __construct(
}
/**
- * {@inheritDoc}
+ * @inheritDoc
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $address)
@@ -95,7 +95,7 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
$saveInAddressBook = $address->getSaveInAddressBook() ? 1 : 0;
$sameAsBilling = $address->getSameAsBilling() ? 1 : 0;
$customerAddressId = $address->getCustomerAddressId();
- $this->addressValidator->validate($address);
+ $this->addressValidator->validateForCart($quote, $address);
$quote->setShippingAddress($address);
$address = $quote->getShippingAddress();
@@ -123,7 +123,7 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
}
/**
- * {@inheritDoc}
+ * @inheritDoc
*/
public function get($cartId)
{
diff --git a/app/code/Magento/Quote/Plugin/UpdateQuoteItemStore.php b/app/code/Magento/Quote/Plugin/UpdateQuoteItemStore.php
new file mode 100644
index 0000000000000..19a7e03264d8a
--- /dev/null
+++ b/app/code/Magento/Quote/Plugin/UpdateQuoteItemStore.php
@@ -0,0 +1,72 @@
+quoteRepository = $quoteRepository;
+ $this->checkoutSession = $checkoutSession;
+ }
+
+ /**
+ * Update store id in active quote after store view switching.
+ *
+ * @param StoreSwitcherInterface $subject
+ * @param string $result
+ * @param StoreInterface $fromStore store where we came from
+ * @param StoreInterface $targetStore store where to go to
+ * @param string $redirectUrl original url requested for redirect after switching
+ * @return string url to be redirected after switching
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function afterSwitch(
+ StoreSwitcherInterface $subject,
+ $result,
+ StoreInterface $fromStore,
+ StoreInterface $targetStore,
+ string $redirectUrl
+ ): string {
+ $quote = $this->checkoutSession->getQuote();
+ if ($quote->getIsActive()) {
+ $quote->setStoreId(
+ $targetStore->getId()
+ );
+ $quote->getItemsCollection(false);
+ $this->quoteRepository->save($quote);
+ }
+ return $result;
+ }
+}
diff --git a/app/code/Magento/Quote/Setup/Patch/Data/ConvertSerializedDataToJson.php b/app/code/Magento/Quote/Setup/Patch/Data/ConvertSerializedDataToJson.php
index f537280272227..6c23379a37cf0 100644
--- a/app/code/Magento/Quote/Setup/Patch/Data/ConvertSerializedDataToJson.php
+++ b/app/code/Magento/Quote/Setup/Patch/Data/ConvertSerializedDataToJson.php
@@ -3,18 +3,15 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-
namespace Magento\Quote\Setup\Patch\Data;
-use Magento\Framework\App\ResourceConnection;
use Magento\Quote\Setup\ConvertSerializedDataToJsonFactory;
use Magento\Quote\Setup\QuoteSetupFactory;
use Magento\Framework\Setup\Patch\DataPatchInterface;
use Magento\Framework\Setup\Patch\PatchVersionInterface;
/**
- * Class ConvertSerializedDataToJson
- * @package Magento\Quote\Setup\Patch
+ * Convert quote serialized data to json.
*/
class ConvertSerializedDataToJson implements DataPatchInterface, PatchVersionInterface
{
@@ -36,6 +33,8 @@ class ConvertSerializedDataToJson implements DataPatchInterface, PatchVersionInt
/**
* PatchInitial constructor.
* @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+ * @param QuoteSetupFactory $quoteSetupFactory
+ * @param ConvertSerializedDataToJsonFactory $convertSerializedDataToJsonFactory
*/
public function __construct(
\Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
@@ -48,7 +47,7 @@ public function __construct(
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function apply()
{
@@ -57,7 +56,7 @@ public function apply()
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public static function getDependencies()
{
@@ -67,7 +66,7 @@ public static function getDependencies()
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public static function getVersion()
{
@@ -75,7 +74,7 @@ public static function getVersion()
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function getAliases()
{
diff --git a/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml b/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml
index ab0db2dac643e..4ec608a18a686 100644
--- a/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml
+++ b/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml
@@ -22,6 +22,9 @@
+
+
-
+
@@ -106,18 +108,44 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalRepositoryTest.php b/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalRepositoryTest.php
index 1e999cb5e523e..804f0863d2d2a 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalRepositoryTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalRepositoryTest.php
@@ -77,7 +77,8 @@ protected function setUp()
'getAllVisibleItems',
'getBaseCurrencyCode',
'getQuoteCurrencyCode',
- 'getItemsQty'
+ 'getItemsQty',
+ 'collectTotals'
]);
$this->quoteRepositoryMock = $this->createMock(\Magento\Quote\Api\CartRepositoryInterface::class);
$this->addressMock = $this->createPartialMock(
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteAddressValidatorTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteAddressValidatorTest.php
deleted file mode 100644
index 08f5f6a808561..0000000000000
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteAddressValidatorTest.php
+++ /dev/null
@@ -1,128 +0,0 @@
-objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-
- $this->addressRepositoryMock = $this->createMock(\Magento\Customer\Api\AddressRepositoryInterface::class);
- $this->quoteAddressMock = $this->createPartialMock(
- \Magento\Quote\Model\Quote\Address::class,
- ['getCustomerId', 'load', 'getId', '__wakeup']
- );
- $this->customerRepositoryMock = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class);
- $this->customerSessionMock = $this->createMock(\Magento\Customer\Model\Session::class);
- $this->model = $this->objectManager->getObject(
- \Magento\Quote\Model\QuoteAddressValidator::class,
- [
- 'addressRepository' => $this->addressRepositoryMock,
- 'customerRepository' => $this->customerRepositoryMock,
- 'customerSession' => $this->customerSessionMock
- ]
- );
- }
-
- /**
- * @expectedException \Magento\Framework\Exception\NoSuchEntityException
- * @expectedExceptionMessage Invalid customer id 100
- */
- public function testValidateInvalidCustomer()
- {
- $customerId = 100;
- $address = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
- $customerMock = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
-
- $address->expects($this->atLeastOnce())->method('getCustomerId')->willReturn($customerId);
- $this->customerRepositoryMock->expects($this->once())->method('getById')->with($customerId)
- ->willReturn($customerMock);
- $this->model->validate($address);
- }
-
- /**
- * @expectedException \Magento\Framework\Exception\NoSuchEntityException
- * @expectedExceptionMessage Invalid address id 101
- */
- public function testValidateInvalidAddress()
- {
- $address = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
- $this->customerRepositoryMock->expects($this->never())->method('getById');
- $address->expects($this->atLeastOnce())->method('getCustomerAddressId')->willReturn(101);
- $address->expects($this->once())->method('getId')->willReturn(101);
-
- $this->addressRepositoryMock->expects($this->once())->method('getById')
- ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException());
-
- $this->model->validate($address);
- }
-
- /**
- * Neither customer id used nor address id exists
- */
- public function testValidateNewAddress()
- {
- $this->customerRepositoryMock->expects($this->never())->method('getById');
- $this->addressRepositoryMock->expects($this->never())->method('getById');
- $address = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
- $this->assertTrue($this->model->validate($address));
- }
-
- public function testValidateWithValidAddress()
- {
- $addressCustomer = 100;
- $customerAddressId = 42;
-
- $address = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
- $address->expects($this->atLeastOnce())->method('getCustomerId')->willReturn($addressCustomer);
- $address->expects($this->atLeastOnce())->method('getCustomerAddressId')->willReturn($customerAddressId);
- $customerMock = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
- $customerAddress = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
-
- $this->customerRepositoryMock->expects($this->exactly(2))->method('getById')->willReturn($customerMock);
- $customerMock->expects($this->once())->method('getId')->willReturn($addressCustomer);
-
- $this->addressRepositoryMock->expects($this->once())->method('getById')->willReturn($this->quoteAddressMock);
- $this->quoteAddressMock->expects($this->any())->method('getCustomerId')->willReturn($addressCustomer);
-
- $customerMock->expects($this->once())->method('getAddresses')->willReturn([$customerAddress]);
- $customerAddress->expects($this->once())->method('getId')->willReturn(42);
-
- $this->assertTrue($this->model->validate($address));
- }
-}
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
index 72e516e35cd6e..b61f95b4eee6c 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
@@ -645,7 +645,7 @@ public function testPlaceOrderIfCustomerIsGuest()
$addressMock = $this->createPartialMock(\Magento\Quote\Model\Quote\Address::class, ['getEmail']);
$addressMock->expects($this->once())->method('getEmail')->willReturn($email);
- $this->quoteMock->expects($this->once())->method('getBillingAddress')->with()->willReturn($addressMock);
+ $this->quoteMock->expects($this->any())->method('getBillingAddress')->with()->willReturn($addressMock);
$this->quoteMock->expects($this->once())->method('setCustomerIsGuest')->with(true)->willReturnSelf();
$this->quoteMock->expects($this->once())
diff --git a/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php
deleted file mode 100644
index 89fea2bec73a8..0000000000000
--- a/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php
+++ /dev/null
@@ -1,282 +0,0 @@
-objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
- $this->quoteRepositoryMock = $this->createMock(\Magento\Quote\Api\CartRepositoryInterface::class);
- $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
-
- $this->quoteAddressMock = $this->createPartialMock(\Magento\Quote\Model\Quote\Address::class, [
- 'setSameAsBilling',
- 'setCollectShippingRates',
- '__wakeup',
- 'collectTotals',
- 'save',
- 'getId',
- 'getCustomerAddressId',
- 'getSaveInAddressBook',
- 'getSameAsBilling',
- 'importCustomerAddressData',
- 'setSaveInAddressBook',
- ]);
- $this->validatorMock = $this->createMock(\Magento\Quote\Model\QuoteAddressValidator::class);
- $this->totalsCollectorMock = $this->createMock(\Magento\Quote\Model\Quote\TotalsCollector::class);
- $this->addressRepository = $this->createMock(\Magento\Customer\Api\AddressRepositoryInterface::class);
-
- $this->amountErrorMessageMock = $this->createPartialMock(
- \Magento\Quote\Model\Quote\Validator\MinimumOrderAmount\ValidationMessage::class,
- ['getMessage']
- );
-
- $this->service = $this->objectManager->getObject(
- \Magento\Quote\Model\ShippingAddressManagement::class,
- [
- 'quoteRepository' => $this->quoteRepositoryMock,
- 'addressValidator' => $this->validatorMock,
- 'logger' => $this->createMock(\Psr\Log\LoggerInterface::class),
- 'scopeConfig' => $this->scopeConfigMock,
- 'totalsCollector' => $this->totalsCollectorMock,
- 'addressRepository' => $this->addressRepository
- ]
- );
- }
-
- /**
- * @expectedException \Magento\Framework\Exception\NoSuchEntityException
- * @expectedExceptionMessage error345
- */
- public function testSetAddressValidationFailed()
- {
- $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
- $this->quoteRepositoryMock->expects($this->once())
- ->method('getActive')
- ->with('cart654')
- ->will($this->returnValue($quoteMock));
-
- $this->validatorMock->expects($this->once())->method('validate')
- ->will($this->throwException(new \Magento\Framework\Exception\NoSuchEntityException(__('error345'))));
-
- $this->service->assign('cart654', $this->quoteAddressMock);
- }
-
- public function testSetAddress()
- {
- $addressId = 1;
- $customerAddressId = 150;
-
- $quoteMock = $this->createPartialMock(
- \Magento\Quote\Model\Quote::class,
- ['getIsMultiShipping', 'isVirtual', 'validateMinimumAmount', 'setShippingAddress', 'getShippingAddress']
- );
- $this->quoteRepositoryMock->expects($this->once())
- ->method('getActive')
- ->with('cart867')
- ->willReturn($quoteMock);
- $quoteMock->expects($this->once())->method('isVirtual')->will($this->returnValue(false));
- $quoteMock->expects($this->once())
- ->method('setShippingAddress')
- ->with($this->quoteAddressMock)
- ->willReturnSelf();
-
- $this->quoteAddressMock->expects($this->once())->method('getSaveInAddressBook')->willReturn(1);
- $this->quoteAddressMock->expects($this->once())->method('getSameAsBilling')->willReturn(1);
- $this->quoteAddressMock->expects($this->once())->method('getCustomerAddressId')->willReturn($customerAddressId);
-
- $customerAddressMock = $this->createMock(\Magento\Customer\Api\Data\AddressInterface::class);
-
- $this->addressRepository->expects($this->once())
- ->method('getById')
- ->with($customerAddressId)
- ->willReturn($customerAddressMock);
-
- $this->validatorMock->expects($this->once())->method('validate')
- ->with($this->quoteAddressMock)
- ->willReturn(true);
-
- $quoteMock->expects($this->exactly(3))->method('getShippingAddress')->willReturn($this->quoteAddressMock);
- $this->quoteAddressMock->expects($this->once())
- ->method('importCustomerAddressData')
- ->with($customerAddressMock)
- ->willReturnSelf();
-
- $this->quoteAddressMock->expects($this->once())->method('setSameAsBilling')->with(1)->willReturnSelf();
- $this->quoteAddressMock->expects($this->once())->method('setSaveInAddressBook')->with(1)->willReturnSelf();
- $this->quoteAddressMock->expects($this->once())
- ->method('setCollectShippingRates')
- ->with(true)
- ->willReturnSelf();
-
- $this->quoteAddressMock->expects($this->once())->method('save')->willReturnSelf();
- $this->quoteAddressMock->expects($this->once())->method('getId')->will($this->returnValue($addressId));
-
- $this->assertEquals($addressId, $this->service->assign('cart867', $this->quoteAddressMock));
- }
-
- /**
- * @expectedException \Magento\Framework\Exception\NoSuchEntityException
- * @expectedExceptionMessage The Cart includes virtual product(s) only, so a shipping address is not used.
- */
- public function testSetAddressForVirtualProduct()
- {
- $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
- $this->quoteRepositoryMock->expects($this->once())
- ->method('getActive')
- ->with('cart867')
- ->will($this->returnValue($quoteMock));
- $quoteMock->expects($this->once())->method('isVirtual')->will($this->returnValue(true));
- $quoteMock->expects($this->never())->method('setShippingAddress');
-
- $this->quoteAddressMock->expects($this->never())->method('getCustomerAddressId');
- $this->quoteAddressMock->expects($this->never())->method('setSaveInAddressBook');
-
- $quoteMock->expects($this->never())->method('save');
-
- $this->service->assign('cart867', $this->quoteAddressMock);
- }
-
- /**
- * @expectedException \Magento\Framework\Exception\InputException
- * @expectedExceptionMessage The address failed to save. Verify the address and try again.
- */
- public function testSetAddressWithInabilityToSaveQuote()
- {
- $this->quoteAddressMock->expects($this->once())->method('save')->willThrowException(
- new \Exception('The address failed to save. Verify the address and try again.')
- );
-
- $customerAddressId = 150;
-
- $quoteMock = $this->createPartialMock(
- \Magento\Quote\Model\Quote::class,
- ['getIsMultiShipping', 'isVirtual', 'validateMinimumAmount', 'setShippingAddress', 'getShippingAddress']
- );
- $this->quoteRepositoryMock->expects($this->once())
- ->method('getActive')
- ->with('cart867')
- ->willReturn($quoteMock);
- $quoteMock->expects($this->once())->method('isVirtual')->will($this->returnValue(false));
- $quoteMock->expects($this->once())
- ->method('setShippingAddress')
- ->with($this->quoteAddressMock)
- ->willReturnSelf();
-
- $customerAddressMock = $this->createMock(\Magento\Customer\Api\Data\AddressInterface::class);
-
- $this->addressRepository->expects($this->once())
- ->method('getById')
- ->with($customerAddressId)
- ->willReturn($customerAddressMock);
-
- $this->validatorMock->expects($this->once())->method('validate')
- ->with($this->quoteAddressMock)
- ->willReturn(true);
-
- $this->quoteAddressMock->expects($this->once())->method('getSaveInAddressBook')->willReturn(1);
- $this->quoteAddressMock->expects($this->once())->method('getSameAsBilling')->willReturn(1);
- $this->quoteAddressMock->expects($this->once())->method('getCustomerAddressId')->willReturn($customerAddressId);
-
- $quoteMock->expects($this->exactly(2))->method('getShippingAddress')->willReturn($this->quoteAddressMock);
- $this->quoteAddressMock->expects($this->once())
- ->method('importCustomerAddressData')
- ->with($customerAddressMock)
- ->willReturnSelf();
-
- $this->quoteAddressMock->expects($this->once())->method('setSameAsBilling')->with(1)->willReturnSelf();
- $this->quoteAddressMock->expects($this->once())->method('setSaveInAddressBook')->with(1)->willReturnSelf();
- $this->quoteAddressMock->expects($this->once())
- ->method('setCollectShippingRates')
- ->with(true)
- ->willReturnSelf();
-
- $this->service->assign('cart867', $this->quoteAddressMock);
- }
-
- public function testGetAddress()
- {
- $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
- $this->quoteRepositoryMock->expects($this->once())->method('getActive')->with('cartId')->will(
- $this->returnValue($quoteMock)
- );
-
- $addressMock = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
- $quoteMock->expects($this->any())->method('getShippingAddress')->will($this->returnValue($addressMock));
- $quoteMock->expects($this->any())->method('isVirtual')->will($this->returnValue(false));
- $this->assertEquals($addressMock, $this->service->get('cartId'));
- }
-
- /**
- * @expectedException \Exception
- * @expectedExceptionMessage The Cart includes virtual product(s) only, so a shipping address is not used.
- */
- public function testGetAddressOfQuoteWithVirtualProducts()
- {
- $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
- $this->quoteRepositoryMock->expects($this->once())->method('getActive')->with('cartId')->will(
- $this->returnValue($quoteMock)
- );
-
- $quoteMock->expects($this->any())->method('isVirtual')->will($this->returnValue(true));
- $quoteMock->expects($this->never())->method('getShippingAddress');
-
- $this->service->get('cartId');
- }
-}
diff --git a/app/code/Magento/Quote/etc/db_schema.xml b/app/code/Magento/Quote/etc/db_schema.xml
index 6f9f81ba6b3fa..48954f1af90fc 100644
--- a/app/code/Magento/Quote/etc/db_schema.xml
+++ b/app/code/Magento/Quote/etc/db_schema.xml
@@ -202,6 +202,8 @@
diff --git a/app/code/Magento/Quote/etc/frontend/di.xml b/app/code/Magento/Quote/etc/frontend/di.xml
index 125afb96f20fd..ecad94fbbc249 100644
--- a/app/code/Magento/Quote/etc/frontend/di.xml
+++ b/app/code/Magento/Quote/etc/frontend/di.xml
@@ -12,6 +12,9 @@
Magento\Checkout\Model\Session\Proxy
+
+
diff --git a/app/code/Magento/Quote/etc/sales.xml b/app/code/Magento/Quote/etc/sales.xml
index 3d54a6375c8d9..3db72a1226236 100644
--- a/app/code/Magento/Quote/etc/sales.xml
+++ b/app/code/Magento/Quote/etc/sales.xml
@@ -9,7 +9,7 @@
diff --git a/app/code/Magento/Quote/i18n/en_US.csv b/app/code/Magento/Quote/i18n/en_US.csv
index ae7453aa0d0cc..b24179297493a 100644
--- a/app/code/Magento/Quote/i18n/en_US.csv
+++ b/app/code/Magento/Quote/i18n/en_US.csv
@@ -65,3 +65,5 @@ error345,error345
Carts,Carts
"Manage carts","Manage carts"
"Invalid state change requested","Invalid state change requested"
+"Validated Country Code","Validated Country Code"
+"Validated Vat Number","Validated Vat Number"
diff --git a/app/code/Magento/QuoteAnalytics/composer.json b/app/code/Magento/QuoteAnalytics/composer.json
index 90dae1ec2adca..706bed674b4a9 100644
--- a/app/code/Magento/QuoteAnalytics/composer.json
+++ b/app/code/Magento/QuoteAnalytics/composer.json
@@ -4,7 +4,8 @@
"require": {
"php": "~7.1.3||~7.2.0",
"magento/framework": "*",
- "magento/module-quote": "*"
+ "magento/module-quote": "*",
+ "magento/module-analytics": "*"
},
"type": "magento2-module",
"license": [
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php
index 96259f2264943..005cf3a10ca80 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php
@@ -45,6 +45,8 @@ public function __construct(
* @param Quote $cart
* @param array $cartItems
* @throws GraphQlInputException
+ * @throws \Magento\Framework\Exception\LocalizedException
+ * @throws \Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException
*/
public function execute(Quote $cart, array $cartItems): void
{
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
index aa5b41daebdc3..6868ce3f7f1ff 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
@@ -61,11 +61,17 @@ public function __construct(
* @return void
* @throws GraphQlNoSuchEntityException
* @throws GraphQlInputException
+ * @throws \Magento\Framework\Exception\LocalizedException
*/
public function execute(Quote $cart, array $cartItemData): void
{
$sku = $this->extractSku($cartItemData);
$qty = $this->extractQty($cartItemData);
+ if ($qty <= 0) {
+ throw new GraphQlInputException(
+ __('Please enter a number greater than 0 in this field.')
+ );
+ }
$customizableOptions = $this->extractCustomizableOptions($cartItemData);
try {
@@ -74,7 +80,16 @@ public function execute(Quote $cart, array $cartItemData): void
throw new GraphQlNoSuchEntityException(__('Could not find a product with SKU "%sku"', ['sku' => $sku]));
}
- $result = $cart->addProduct($product, $this->createBuyRequest($qty, $customizableOptions));
+ try {
+ $result = $cart->addProduct($product, $this->createBuyRequest($qty, $customizableOptions));
+ } catch (\Exception $e) {
+ throw new GraphQlInputException(
+ __(
+ 'Could not add the product with SKU %sku to the shopping cart: %message',
+ ['sku' => $sku, 'message' => $e->getMessage()]
+ )
+ );
+ }
if (is_string($result)) {
throw new GraphQlInputException(__($result));
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/Address/AddressDataProvider.php b/app/code/Magento/QuoteGraphQl/Model/Cart/Address/AddressDataProvider.php
deleted file mode 100644
index fb742477ec99b..0000000000000
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/Address/AddressDataProvider.php
+++ /dev/null
@@ -1,94 +0,0 @@
-dataObjectConverter = $dataObjectConverter;
- }
-
- /**
- * Collect and return information about shipping and billing addresses
- *
- * @param CartInterface $cart
- * @return array
- */
- public function getCartAddresses(CartInterface $cart): array
- {
- $addressData = [];
- $shippingAddress = $cart->getShippingAddress();
- $billingAddress = $cart->getBillingAddress();
-
- if ($shippingAddress) {
- $shippingData = $this->dataObjectConverter->toFlatArray($shippingAddress, [], AddressInterface::class);
- $shippingData['address_type'] = 'SHIPPING';
- $addressData[] = array_merge($shippingData, $this->extractAddressData($shippingAddress));
- }
-
- if ($billingAddress) {
- $billingData = $this->dataObjectConverter->toFlatArray($billingAddress, [], AddressInterface::class);
- $billingData['address_type'] = 'BILLING';
- $addressData[] = array_merge($billingData, $this->extractAddressData($billingAddress));
- }
-
- return $addressData;
- }
-
- /**
- * Extract the necessary address fields from address model
- *
- * @param QuoteAddress $address
- * @return array
- */
- private function extractAddressData(QuoteAddress $address): array
- {
- $addressData = [
- 'country' => [
- 'code' => $address->getCountryId(),
- 'label' => $address->getCountry()
- ],
- 'region' => [
- 'code' => $address->getRegionCode(),
- 'label' => $address->getRegion()
- ],
- 'street' => $address->getStreet(),
- 'selected_shipping_method' => [
- 'code' => $address->getShippingMethod(),
- 'label' => $address->getShippingDescription(),
- 'free_shipping' => $address->getFreeShipping(),
- ],
- 'items_weight' => $address->getWeight(),
- 'customer_notes' => $address->getCustomerNotes()
- ];
-
- return $addressData;
- }
-}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AssignBillingAddressToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AssignBillingAddressToCart.php
new file mode 100644
index 0000000000000..dd6478b4873c6
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AssignBillingAddressToCart.php
@@ -0,0 +1,59 @@
+billingAddressManagement = $billingAddressManagement;
+ }
+
+ /**
+ * Assign billing address to cart
+ *
+ * @param CartInterface $cart
+ * @param AddressInterface $billingAddress
+ * @param bool $useForShipping
+ * @throws GraphQlInputException
+ * @throws GraphQlNoSuchEntityException
+ */
+ public function execute(
+ CartInterface $cart,
+ AddressInterface $billingAddress,
+ bool $useForShipping
+ ): void {
+ try {
+ $this->billingAddressManagement->assign($cart->getId(), $billingAddress, $useForShipping);
+ } catch (NoSuchEntityException $e) {
+ throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+ } catch (LocalizedException $e) {
+ throw new GraphQlInputException(__($e->getMessage()), $e);
+ }
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingAddressToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingAddressToCart.php
new file mode 100644
index 0000000000000..527999b245a4c
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingAddressToCart.php
@@ -0,0 +1,57 @@
+shippingAddressManagement = $shippingAddressManagement;
+ }
+
+ /**
+ * Assign shipping address to cart
+ *
+ * @param CartInterface $cart
+ * @param AddressInterface $shippingAddress
+ * @throws GraphQlInputException
+ * @throws GraphQlNoSuchEntityException
+ */
+ public function execute(
+ CartInterface $cart,
+ AddressInterface $shippingAddress
+ ): void {
+ try {
+ $this->shippingAddressManagement->assign($cart->getId(), $shippingAddress);
+ } catch (NoSuchEntityException $e) {
+ throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+ } catch (LocalizedException $e) {
+ throw new GraphQlInputException(__($e->getMessage()), $e);
+ }
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingMethodToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingMethodToCart.php
new file mode 100644
index 0000000000000..5b30c0774c22f
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingMethodToCart.php
@@ -0,0 +1,82 @@
+shippingInformationFactory = $shippingInformationFactory;
+ $this->shippingInformationManagement = $shippingInformationManagement;
+ }
+
+ /**
+ * Assign shipping method to cart
+ *
+ * @param CartInterface $cart
+ * @param AddressInterface $quoteAddress
+ * @param string $carrierCode
+ * @param string $methodCode
+ * @throws GraphQlInputException
+ * @throws GraphQlNoSuchEntityException
+ */
+ public function execute(
+ CartInterface $cart,
+ AddressInterface $quoteAddress,
+ string $carrierCode,
+ string $methodCode
+ ): void {
+ /** @var ShippingInformationInterface $shippingInformation */
+ $shippingInformation = $this->shippingInformationFactory->create([
+ 'data' => [
+ /* If the address is not a shipping address (but billing) the system will find the proper shipping
+ address for the selected cart and set the information there (actual for single shipping address) */
+ ShippingInformationInterface::SHIPPING_ADDRESS => $quoteAddress,
+ ShippingInformationInterface::SHIPPING_CARRIER_CODE => $carrierCode,
+ ShippingInformationInterface::SHIPPING_METHOD_CODE => $methodCode,
+ ],
+ ]);
+
+ try {
+ $this->shippingInformationManagement->saveAddressInformation($cart->getId(), $shippingInformation);
+ } catch (NoSuchEntityException $e) {
+ throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+ } catch (LocalizedException $e) {
+ throw new GraphQlInputException(__($e->getMessage()), $e);
+ }
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractDataFromCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractDataFromCart.php
deleted file mode 100644
index 438f28980918d..0000000000000
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractDataFromCart.php
+++ /dev/null
@@ -1,50 +0,0 @@
-getAllItems() as $cartItem) {
- $productData = $cartItem->getProduct()->getData();
- $productData['model'] = $cartItem->getProduct();
-
- $items[] = [
- 'id' => $cartItem->getItemId(),
- 'qty' => $cartItem->getQty(),
- 'product' => $productData,
- 'model' => $cartItem,
- ];
- }
-
- $appliedCoupon = $cart->getCouponCode();
-
- return [
- 'items' => $items,
- 'applied_coupon' => $appliedCoupon ? ['code' => $appliedCoupon] : null
- ];
- }
-}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php b/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php
new file mode 100644
index 0000000000000..840dedb4f274e
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php
@@ -0,0 +1,83 @@
+dataObjectConverter = $dataObjectConverter;
+ }
+
+ /**
+ * Converts Address model to flat array
+ *
+ * @param QuoteAddress $address
+ * @return array
+ */
+ public function execute(QuoteAddress $address): array
+ {
+ $addressData = $this->dataObjectConverter->toFlatArray($address, [], AddressInterface::class);
+ $addressData['model'] = $address;
+
+ if ($address->getAddressType() == AbstractAddress::TYPE_SHIPPING) {
+ $addressType = 'SHIPPING';
+ } elseif ($address->getAddressType() == AbstractAddress::TYPE_BILLING) {
+ $addressType = 'BILLING';
+ } else {
+ $addressType = null;
+ }
+
+ $addressData = array_merge($addressData, [
+ 'address_id' => $address->getId(),
+ 'address_type' => $addressType,
+ 'country' => [
+ 'code' => $address->getCountryId(),
+ 'label' => $address->getCountry()
+ ],
+ 'region' => [
+ 'code' => $address->getRegionCode(),
+ 'label' => $address->getRegion()
+ ],
+ 'street' => $address->getStreet(),
+ 'items_weight' => $address->getWeight(),
+ 'customer_notes' => $address->getCustomerNotes()
+ ]);
+
+ if (!$address->hasItems()) {
+ return $addressData;
+ }
+
+ $addressItemsData = [];
+ foreach ($address->getAllItems() as $addressItem) {
+ $addressItemsData[] = [
+ 'cart_item_id' => $addressItem->getQuoteItemId(),
+ 'quantity' => $addressItem->getQty()
+ ];
+ }
+ $addressData['cart_items'] = $addressItemsData;
+
+ return $addressData;
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
index c3207bf478bbe..145e9c01980a5 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
@@ -45,12 +45,12 @@ public function __construct(
* Get cart for user
*
* @param string $cartHash
- * @param int|null $userId
+ * @param int|null $customerId
* @return Quote
* @throws GraphQlAuthorizationException
* @throws GraphQlNoSuchEntityException
*/
- public function execute(string $cartHash, ?int $userId): Quote
+ public function execute(string $cartHash, ?int $customerId): Quote
{
try {
$cartId = $this->maskedQuoteIdToQuoteId->execute($cartHash);
@@ -69,14 +69,20 @@ public function execute(string $cartHash, ?int $userId): Quote
);
}
- $customerId = (int)$cart->getCustomerId();
+ if (false === (bool)$cart->getIsActive()) {
+ throw new GraphQlNoSuchEntityException(
+ __('Current user does not have an active cart.')
+ );
+ }
+
+ $cartCustomerId = (int)$cart->getCustomerId();
/* Guest cart, allow operations */
- if (!$customerId) {
+ if (!$cartCustomerId && null === $customerId) {
return $cart;
}
- if ($customerId !== $userId) {
+ if ($cartCustomerId !== $customerId) {
throw new GraphQlAuthorizationException(
__(
'The current user cannot perform operations on cart "%masked_cart_id"',
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/GetQuoteAddress.php b/app/code/Magento/QuoteGraphQl/Model/Cart/GetQuoteAddress.php
new file mode 100644
index 0000000000000..89124c594dd87
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/GetQuoteAddress.php
@@ -0,0 +1,83 @@
+quoteAddressFactory = $quoteAddressFactory;
+ $this->quoteAddressResource = $quoteAddressResource;
+ }
+
+ /**
+ * Get quote address
+ *
+ * @param CartInterface $cart
+ * @param int $quoteAddressId
+ * @param int|null $customerId
+ * @return AddressInterface
+ * @throws GraphQlAuthorizationException
+ * @throws GraphQlNoSuchEntityException
+ */
+ public function execute(CartInterface $cart, int $quoteAddressId, ?int $customerId): AddressInterface
+ {
+ $quoteAddress = $this->quoteAddressFactory->create();
+
+ $this->quoteAddressResource->load($quoteAddress, $quoteAddressId);
+ if (null === $quoteAddress->getId()) {
+ throw new GraphQlNoSuchEntityException(
+ __('Could not find a cart address with ID "%cart_address_id"', ['cart_address_id' => $quoteAddressId])
+ );
+ }
+
+ // TODO: GetQuoteAddress::execute should depend only on AddressInterface contract
+ // https://github.com/magento/graphql-ce/issues/550
+ if ($quoteAddress->getQuoteId() !== $cart->getId()) {
+ throw new GraphQlNoSuchEntityException(
+ __('Cart does not contain address with ID "%cart_address_id"', ['cart_address_id' => $quoteAddressId])
+ );
+ }
+
+ if ((int)$quoteAddress->getCustomerId() !== (int)$customerId) {
+ throw new GraphQlAuthorizationException(
+ __(
+ 'The current user cannot use cart address with ID "%cart_address_id"',
+ ['cart_address_id' => $quoteAddressId]
+ )
+ );
+ }
+ return $quoteAddress;
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
new file mode 100644
index 0000000000000..76bdc74611131
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
@@ -0,0 +1,67 @@
+quoteAddressFactory = $quoteAddressFactory;
+ }
+
+ /**
+ * Create QuoteAddress based on input data
+ *
+ * @param array $addressInput
+ * @return QuoteAddress
+ */
+ public function createBasedOnInputData(array $addressInput): QuoteAddress
+ {
+ $addressInput['country_id'] = $addressInput['country_code'] ?? '';
+
+ $quoteAddress = $this->quoteAddressFactory->create();
+ $quoteAddress->addData($addressInput);
+ return $quoteAddress;
+ }
+
+ /**
+ * Create QuoteAddress based on CustomerAddress
+ *
+ * @param CustomerAddress $customerAddress
+ * @return QuoteAddress
+ * @throws GraphQlInputException
+ */
+ public function createBasedOnCustomerAddress(CustomerAddress $customerAddress): QuoteAddress
+ {
+ $quoteAddress = $this->quoteAddressFactory->create();
+ try {
+ $quoteAddress->importCustomerAddressData($customerAddress);
+ } catch (LocalizedException $e) {
+ throw new GraphQlInputException(__($e->getMessage()), $e);
+ }
+ return $quoteAddress;
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
new file mode 100644
index 0000000000000..31524ea023222
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
@@ -0,0 +1,106 @@
+quoteAddressFactory = $quoteAddressFactory;
+ $this->getCustomer = $getCustomer;
+ $this->getCustomerAddress = $getCustomerAddress;
+ $this->assignBillingAddressToCart = $assignBillingAddressToCart;
+ }
+
+ /**
+ * Set billing address for a specified shopping cart
+ *
+ * @param ContextInterface $context
+ * @param CartInterface $cart
+ * @param array $billingAddressInput
+ * @return void
+ * @throws GraphQlInputException
+ * @throws GraphQlNoSuchEntityException
+ */
+ public function execute(ContextInterface $context, CartInterface $cart, array $billingAddressInput): void
+ {
+ $customerAddressId = $billingAddressInput['customer_address_id'] ?? null;
+ $addressInput = $billingAddressInput['address'] ?? null;
+ $useForShipping = isset($billingAddressInput['use_for_shipping'])
+ ? (bool)$billingAddressInput['use_for_shipping'] : false;
+
+ if (null === $customerAddressId && null === $addressInput) {
+ throw new GraphQlInputException(
+ __('The billing address must contain either "customer_address_id" or "address".')
+ );
+ }
+
+ if ($customerAddressId && $addressInput) {
+ throw new GraphQlInputException(
+ __('The billing address cannot contain "customer_address_id" and "address" at the same time.')
+ );
+ }
+
+ $addresses = $cart->getAllShippingAddresses();
+ if ($useForShipping && count($addresses) > 1) {
+ throw new GraphQlInputException(
+ __('Using the "use_for_shipping" option with multishipping is not possible.')
+ );
+ }
+
+ if (null === $customerAddressId) {
+ $billingAddress = $this->quoteAddressFactory->createBasedOnInputData($addressInput);
+ } else {
+ $customer = $this->getCustomer->execute($context);
+ $customerAddress = $this->getCustomerAddress->execute((int)$customerAddressId, (int)$customer->getId());
+ $billingAddress = $this->quoteAddressFactory->createBasedOnCustomerAddress($customerAddress);
+ }
+
+ $this->assignBillingAddressToCart->execute($cart, $billingAddress, $useForShipping);
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressOnCart.php
deleted file mode 100644
index b9fd5c7807d2f..0000000000000
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressOnCart.php
+++ /dev/null
@@ -1,98 +0,0 @@
-shippingAddressManagement = $shippingAddressManagement;
- $this->addressRepository = $addressRepository;
- $this->addressModel = $addressModel;
- $this->checkCustomerAccount = $checkCustomerAccount;
- }
-
- /**
- * @inheritdoc
- */
- public function execute(ContextInterface $context, CartInterface $cart, array $shippingAddresses): void
- {
- if (count($shippingAddresses) > 1) {
- throw new GraphQlInputException(
- __('You cannot specify multiple shipping addresses.')
- );
- }
- $shippingAddress = current($shippingAddresses);
- $customerAddressId = $shippingAddress['customer_address_id'] ?? null;
- $addressInput = $shippingAddress['address'] ?? null;
-
- if (null === $customerAddressId && null === $addressInput) {
- throw new GraphQlInputException(
- __('The shipping address must contain either "customer_address_id" or "address".')
- );
- }
- if ($customerAddressId && $addressInput) {
- throw new GraphQlInputException(
- __('The shipping address cannot contain "customer_address_id" and "address" at the same time.')
- );
- }
- if (null === $customerAddressId) {
- $shippingAddress = $this->addressModel->addData($addressInput);
- } else {
- $this->checkCustomerAccount->execute($context->getUserId(), $context->getUserType());
-
- /** @var AddressInterface $customerAddress */
- $customerAddress = $this->addressRepository->getById($customerAddressId);
- $shippingAddress = $this->addressModel->importCustomerAddressData($customerAddress);
- }
-
- $this->shippingAddressManagement->assign($cart->getId(), $shippingAddress);
- }
-}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
new file mode 100644
index 0000000000000..bbca7721754cb
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
@@ -0,0 +1,95 @@
+quoteAddressFactory = $quoteAddressFactory;
+ $this->getCustomer = $getCustomer;
+ $this->getCustomerAddress = $getCustomerAddress;
+ $this->assignShippingAddressToCart = $assignShippingAddressToCart;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function execute(ContextInterface $context, CartInterface $cart, array $shippingAddressesInput): void
+ {
+ if (count($shippingAddressesInput) > 1) {
+ throw new GraphQlInputException(
+ __('You cannot specify multiple shipping addresses.')
+ );
+ }
+ $shippingAddressInput = current($shippingAddressesInput);
+ $customerAddressId = $shippingAddressInput['customer_address_id'] ?? null;
+ $addressInput = $shippingAddressInput['address'] ?? null;
+
+ if (null === $customerAddressId && null === $addressInput) {
+ throw new GraphQlInputException(
+ __('The shipping address must contain either "customer_address_id" or "address".')
+ );
+ }
+
+ if ($customerAddressId && $addressInput) {
+ throw new GraphQlInputException(
+ __('The shipping address cannot contain "customer_address_id" and "address" at the same time.')
+ );
+ }
+
+ if (null === $customerAddressId) {
+ $shippingAddress = $this->quoteAddressFactory->createBasedOnInputData($addressInput);
+ } else {
+ $customer = $this->getCustomer->execute($context);
+ $customerAddress = $this->getCustomerAddress->execute((int)$customerAddressId, (int)$customer->getId());
+ $shippingAddress = $this->quoteAddressFactory->createBasedOnCustomerAddress($customerAddress);
+ }
+
+ $this->assignShippingAddressToCart->execute($cart, $shippingAddress);
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCartInterface.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCartInterface.php
index c5da3db75add7..eb0f3522102cf 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCartInterface.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCartInterface.php
@@ -7,7 +7,10 @@
namespace Magento\QuoteGraphQl\Model\Cart;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
use Magento\Quote\Api\Data\CartInterface;
@@ -24,9 +27,12 @@ interface SetShippingAddressesOnCartInterface
*
* @param ContextInterface $context
* @param CartInterface $cart
- * @param array $shippingAddresses
+ * @param array $shippingAddressesInput
* @return void
* @throws GraphQlInputException
+ * @throws GraphQlAuthorizationException
+ * @throws GraphQlAuthenticationException
+ * @throws GraphQlNoSuchEntityException
*/
- public function execute(ContextInterface $context, CartInterface $cart, array $shippingAddresses): void;
+ public function execute(ContextInterface $context, CartInterface $cart, array $shippingAddressesInput): void;
}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodOnCart.php
deleted file mode 100644
index a630b2d07c7df..0000000000000
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodOnCart.php
+++ /dev/null
@@ -1,101 +0,0 @@
-shippingInformationManagement = $shippingInformationManagement;
- $this->quoteAddressResource = $quoteAddressResource;
- $this->quoteAddressFactory = $quoteAddressFactory;
- $this->shippingInformationFactory = $shippingInformationFactory;
- }
-
- /**
- * Sets shipping method for a specified shopping cart address
- *
- * @param Quote $cart
- * @param int $cartAddressId
- * @param string $carrierCode
- * @param string $methodCode
- * @throws GraphQlInputException
- * @throws GraphQlNoSuchEntityException
- */
- public function execute(Quote $cart, int $cartAddressId, string $carrierCode, string $methodCode): void
- {
- $quoteAddress = $this->quoteAddressFactory->create();
- $this->quoteAddressResource->load($quoteAddress, $cartAddressId);
-
- /** @var ShippingInformation $shippingInformation */
- $shippingInformation = $this->shippingInformationFactory->create();
-
- /* If the address is not a shipping address (but billing) the system will find the proper shipping address for
- the selected cart and set the information there (actual for single shipping address) */
- $shippingInformation->setShippingAddress($quoteAddress);
- $shippingInformation->setShippingCarrierCode($carrierCode);
- $shippingInformation->setShippingMethodCode($methodCode);
-
- try {
- $this->shippingInformationManagement->saveAddressInformation($cart->getId(), $shippingInformation);
- } catch (NoSuchEntityException $exception) {
- throw new GraphQlNoSuchEntityException(__($exception->getMessage()));
- } catch (StateException $exception) {
- throw new GraphQlInputException(__($exception->getMessage()));
- } catch (InputException $exception) {
- throw new GraphQlInputException(__($exception->getMessage()));
- }
- }
-}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php
new file mode 100644
index 0000000000000..730cf1b0ffee3
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php
@@ -0,0 +1,71 @@
+getQuoteAddress = $getQuoteAddress;
+ $this->assignShippingMethodToCart = $assignShippingMethodToCart;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function execute(ContextInterface $context, CartInterface $cart, array $shippingMethodsInput): void
+ {
+ if (count($shippingMethodsInput) > 1) {
+ throw new GraphQlInputException(
+ __('You cannot specify multiple shipping methods.')
+ );
+ }
+ $shippingMethodInput = current($shippingMethodsInput);
+
+ if (!isset($shippingMethodInput['cart_address_id']) || empty($shippingMethodInput['cart_address_id'])) {
+ throw new GraphQlInputException(__('Required parameter "cart_address_id" is missing.'));
+ }
+ $cartAddressId = $shippingMethodInput['cart_address_id'];
+
+ if (!isset($shippingMethodInput['carrier_code']) || empty($shippingMethodInput['carrier_code'])) {
+ throw new GraphQlInputException(__('Required parameter "carrier_code" is missing.'));
+ }
+ $carrierCode = $shippingMethodInput['carrier_code'];
+
+ if (!isset($shippingMethodInput['method_code']) || empty($shippingMethodInput['method_code'])) {
+ throw new GraphQlInputException(__('Required parameter "method_code" is missing.'));
+ }
+ $methodCode = $shippingMethodInput['method_code'];
+
+ $quoteAddress = $this->getQuoteAddress->execute($cart, $cartAddressId, $context->getUserId());
+ $this->assignShippingMethodToCart->execute($cart, $quoteAddress, $carrierCode, $methodCode);
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCartInterface.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCartInterface.php
new file mode 100644
index 0000000000000..fa6c6cf0923e4
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCartInterface.php
@@ -0,0 +1,38 @@
+groupFactory($option->getType());
+ $optionTypeRenderer->setOption($option);
$priceValueUnits = $this->priceUnitLabel->getData($option->getPriceType());
$selectedOptionValueData = [
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/AddSimpleProductsToCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/AddSimpleProductsToCart.php
index f4335b262c854..82ffd0970d672 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/AddSimpleProductsToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/AddSimpleProductsToCart.php
@@ -11,9 +11,7 @@
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
use Magento\Framework\GraphQl\Query\ResolverInterface;
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Framework\Stdlib\ArrayManager;
use Magento\QuoteGraphQl\Model\Cart\AddProductsToCart;
-use Magento\QuoteGraphQl\Model\Cart\ExtractDataFromCart;
use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
/**
@@ -22,11 +20,6 @@
*/
class AddSimpleProductsToCart implements ResolverInterface
{
- /**
- * @var ArrayManager
- */
- private $arrayManager;
-
/**
* @var GetCartForUser
*/
@@ -38,26 +31,15 @@ class AddSimpleProductsToCart implements ResolverInterface
private $addProductsToCart;
/**
- * @var ExtractDataFromCart
- */
- private $extractDataFromCart;
-
- /**
- * @param ArrayManager $arrayManager
* @param GetCartForUser $getCartForUser
* @param AddProductsToCart $addProductsToCart
- * @param ExtractDataFromCart $extractDataFromCart
*/
public function __construct(
- ArrayManager $arrayManager,
GetCartForUser $getCartForUser,
- AddProductsToCart $addProductsToCart,
- ExtractDataFromCart $extractDataFromCart
+ AddProductsToCart $addProductsToCart
) {
- $this->arrayManager = $arrayManager;
$this->getCartForUser = $getCartForUser;
$this->addProductsToCart = $addProductsToCart;
- $this->extractDataFromCart = $extractDataFromCart;
}
/**
@@ -65,25 +47,25 @@ public function __construct(
*/
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
{
- $cartHash = $this->arrayManager->get('input/cart_id', $args);
- $cartItems = $this->arrayManager->get('input/cartItems', $args);
-
- if (!isset($cartHash)) {
- throw new GraphQlInputException(__('Missing key "cart_id" in cart data'));
+ if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
+ throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
}
+ $maskedCartId = $args['input']['cart_id'];
- if (!isset($cartItems) || !is_array($cartItems) || empty($cartItems)) {
- throw new GraphQlInputException(__('Missing key "cartItems" in cart data'));
+ if (!isset($args['input']['cartItems']) || empty($args['input']['cartItems'])
+ || !is_array($args['input']['cartItems'])
+ ) {
+ throw new GraphQlInputException(__('Required parameter "cartItems" is missing'));
}
+ $cartItems = $args['input']['cartItems'];
- $currentUserId = $context->getUserId();
- $cart = $this->getCartForUser->execute((string)$cartHash, $currentUserId);
-
+ $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId());
$this->addProductsToCart->execute($cart, $cartItems);
- $cartData = $this->extractDataFromCart->execute($cart);
return [
- 'cart' => $cartData,
+ 'cart' => [
+ 'model' => $cart,
+ ],
];
}
}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/AppliedCoupon.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/AppliedCoupon.php
new file mode 100644
index 0000000000000..ca69b763929be
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/AppliedCoupon.php
@@ -0,0 +1,34 @@
+getCouponCode();
+
+ return $appliedCoupon ? ['code' => $appliedCoupon] : null;
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php
index ec59416d49371..4de0464681186 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php
@@ -50,12 +50,12 @@ public function __construct(
*/
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
{
- if (!isset($args['input']['cart_id'])) {
+ if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
}
$maskedCartId = $args['input']['cart_id'];
- if (!isset($args['input']['coupon_code'])) {
+ if (!isset($args['input']['coupon_code']) || empty($args['input']['coupon_code'])) {
throw new GraphQlInputException(__('Required parameter "coupon_code" is missing'));
}
$couponCode = $args['input']['coupon_code'];
@@ -74,15 +74,20 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
try {
$this->couponManagement->set($cartId, $couponCode);
- } catch (NoSuchEntityException $exception) {
- throw new GraphQlNoSuchEntityException(__($exception->getMessage()));
- } catch (CouldNotSaveException $exception) {
- throw new LocalizedException(__($exception->getMessage()));
+ } catch (NoSuchEntityException $e) {
+ $message = $e->getMessage();
+ if (preg_match('/The "\d+" Cart doesn\'t contain products/', $message)) {
+ $message = 'Cart does not contain products.';
+ }
+ throw new GraphQlNoSuchEntityException(__($message), $e);
+ } catch (CouldNotSaveException $e) {
+ throw new LocalizedException(__($e->getMessage()), $e);
}
- $data['cart']['applied_coupon'] = [
- 'code' => $couponCode,
+ return [
+ 'cart' => [
+ 'model' => $cart,
+ ],
];
- return $data;
}
}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/AvailablePaymentMethods.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/AvailablePaymentMethods.php
new file mode 100644
index 0000000000000..907d778550593
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/AvailablePaymentMethods.php
@@ -0,0 +1,68 @@
+informationManagement = $informationManagement;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+ {
+ if (!isset($value['model'])) {
+ throw new LocalizedException(__('"model" value should be specified'));
+ }
+
+ $cart = $value['model'];
+ return $this->getPaymentMethodsData($cart);
+ }
+
+ /**
+ * Collect and return information about available payment methods
+ *
+ * @param CartInterface $cart
+ * @return array
+ */
+ private function getPaymentMethodsData(CartInterface $cart): array
+ {
+ $paymentInformation = $this->informationManagement->getPaymentInformation($cart->getId());
+ $paymentMethods = $paymentInformation->getPaymentMethods();
+
+ $paymentMethodsData = [];
+ foreach ($paymentMethods as $paymentMethod) {
+ $paymentMethodsData[] = [
+ 'title' => $paymentMethod->getTitle(),
+ 'code' => $paymentMethod->getCode(),
+ ];
+ }
+ return $paymentMethodsData;
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php
new file mode 100644
index 0000000000000..a6bb0b0d04df1
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php
@@ -0,0 +1,54 @@
+extractQuoteAddressData = $extractQuoteAddressData;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+ {
+ if (!isset($value['model'])) {
+ throw new LocalizedException(__('"model" value should be specified'));
+ }
+ /** @var CartInterface $cart */
+ $cart = $value['model'];
+
+ $billingAddress = $cart->getBillingAddress();
+ if (null === $billingAddress) {
+ return null;
+ }
+
+ $addressData = $this->extractQuoteAddressData->execute($billingAddress);
+ return $addressData;
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/Cart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/Cart.php
index 5023c186f1e6c..db74b1fa4174b 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/Cart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/Cart.php
@@ -12,18 +12,12 @@
use Magento\Framework\GraphQl\Query\ResolverInterface;
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
-use Magento\QuoteGraphQl\Model\Cart\ExtractDataFromCart;
/**
* @inheritdoc
*/
class Cart implements ResolverInterface
{
- /**
- * @var ExtractDataFromCart
- */
- private $extractDataFromCart;
-
/**
* @var GetCartForUser
*/
@@ -31,14 +25,11 @@ class Cart implements ResolverInterface
/**
* @param GetCartForUser $getCartForUser
- * @param ExtractDataFromCart $extractDataFromCart
*/
public function __construct(
- GetCartForUser $getCartForUser,
- ExtractDataFromCart $extractDataFromCart
+ GetCartForUser $getCartForUser
) {
$this->getCartForUser = $getCartForUser;
- $this->extractDataFromCart = $extractDataFromCart;
}
/**
@@ -46,7 +37,7 @@ public function __construct(
*/
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
{
- if (!isset($args['cart_id'])) {
+ if (!isset($args['cart_id']) || empty($args['cart_id'])) {
throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
}
$maskedCartId = $args['cart_id'];
@@ -54,14 +45,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
$currentUserId = $context->getUserId();
$cart = $this->getCartForUser->execute($maskedCartId, $currentUserId);
- $data = array_merge(
- [
- 'cart_id' => $maskedCartId,
- 'model' => $cart
- ],
- $this->extractDataFromCart->execute($cart)
- );
-
- return $data;
+ return [
+ 'model' => $cart,
+ ];
}
}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartItems.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartItems.php
new file mode 100644
index 0000000000000..da6619d15a489
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartItems.php
@@ -0,0 +1,48 @@
+getAllItems() as $cartItem) {
+ /**
+ * @var QuoteItem $cartItem
+ */
+ $productData = $cartItem->getProduct()->getData();
+ $productData['model'] = $cartItem->getProduct();
+
+ $itemsData[] = [
+ 'id' => $cartItem->getItemId(),
+ 'qty' => $cartItem->getQty(),
+ 'product' => $productData,
+ 'model' => $cartItem,
+ ];
+ }
+ return $itemsData;
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php
index c21d869ddac7d..5a708ceaedc28 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php
@@ -50,7 +50,7 @@ public function __construct(
*/
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
{
- if (!isset($args['input']['cart_id'])) {
+ if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
}
$maskedCartId = $args['input']['cart_id'];
@@ -61,15 +61,16 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
try {
$this->couponManagement->remove($cartId);
- } catch (NoSuchEntityException $exception) {
- throw new GraphQlNoSuchEntityException(__($exception->getMessage()));
- } catch (CouldNotDeleteException $exception) {
- throw new LocalizedException(__($exception->getMessage()));
+ } catch (NoSuchEntityException $e) {
+ throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+ } catch (CouldNotDeleteException $e) {
+ throw new LocalizedException(__($e->getMessage()), $e);
}
- $data['cart']['applied_coupon'] = [
- 'code' => '',
+ return [
+ 'cart' => [
+ 'model' => $cart,
+ ],
];
- return $data;
}
}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveItemFromCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveItemFromCart.php
new file mode 100644
index 0000000000000..63e66f121f555
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveItemFromCart.php
@@ -0,0 +1,78 @@
+getCartForUser = $getCartForUser;
+ $this->cartItemRepository = $cartItemRepository;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+ {
+ if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
+ throw new GraphQlInputException(__('Required parameter "cart_id" is missing.'));
+ }
+ $maskedCartId = $args['input']['cart_id'];
+
+ if (!isset($args['input']['cart_item_id']) || empty($args['input']['cart_item_id'])) {
+ throw new GraphQlInputException(__('Required parameter "cart_item_id" is missing.'));
+ }
+ $itemId = $args['input']['cart_item_id'];
+
+ $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId());
+
+ try {
+ $this->cartItemRepository->deleteById((int)$cart->getId(), $itemId);
+ } catch (NoSuchEntityException $e) {
+ throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+ } catch (LocalizedException $e) {
+ throw new GraphQlInputException(__($e->getMessage()), $e);
+ }
+
+ return [
+ 'cart' => [
+ 'model' => $cart,
+ ],
+ ];
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartAddresses.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SelectedPaymentMethod.php
similarity index 60%
rename from app/code/Magento/QuoteGraphQl/Model/Resolver/CartAddresses.php
rename to app/code/Magento/QuoteGraphQl/Model/Resolver/SelectedPaymentMethod.php
index 69544672bf12e..7a99b04638ac3 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartAddresses.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/SelectedPaymentMethod.php
@@ -11,27 +11,12 @@
use Magento\Framework\GraphQl\Config\Element\Field;
use Magento\Framework\GraphQl\Query\ResolverInterface;
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\QuoteGraphQl\Model\Cart\Address\AddressDataProvider;
/**
* @inheritdoc
*/
-class CartAddresses implements ResolverInterface
+class SelectedPaymentMethod implements ResolverInterface
{
- /**
- * @var AddressDataProvider
- */
- private $addressDataProvider;
-
- /**
- * @param AddressDataProvider $addressDataProvider
- */
- public function __construct(
- AddressDataProvider $addressDataProvider
- ) {
- $this->addressDataProvider = $addressDataProvider;
- }
-
/**
* @inheritdoc
*/
@@ -41,8 +26,17 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
throw new LocalizedException(__('"model" value should be specified'));
}
+ /** @var \Magento\Quote\Model\Quote $cart */
$cart = $value['model'];
- return $this->addressDataProvider->getCartAddresses($cart);
+ $payment = $cart->getPayment();
+ if (!$payment) {
+ return [];
+ }
+
+ return [
+ 'code' => $payment->getMethod(),
+ 'purchase_order_number' => $payment->getPoNumber(),
+ ];
}
}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetBillingAddressOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetBillingAddressOnCart.php
new file mode 100644
index 0000000000000..f7c9a4b0697b8
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetBillingAddressOnCart.php
@@ -0,0 +1,68 @@
+getCartForUser = $getCartForUser;
+ $this->setBillingAddressOnCart = $setBillingAddressOnCart;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+ {
+ if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
+ throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
+ }
+ $maskedCartId = $args['input']['cart_id'];
+
+ if (!isset($args['input']['billing_address']) || empty($args['input']['billing_address'])) {
+ throw new GraphQlInputException(__('Required parameter "billing_address" is missing'));
+ }
+ $billingAddress = $args['input']['billing_address'];
+
+ $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId());
+ $this->setBillingAddressOnCart->execute($context, $cart, $billingAddress);
+
+ return [
+ 'cart' => [
+ 'model' => $cart,
+ ],
+ ];
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php
new file mode 100644
index 0000000000000..d1dcb4a48a76b
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php
@@ -0,0 +1,100 @@
+getCartForUser = $getCartForUser;
+ $this->paymentMethodManagement = $paymentMethodManagement;
+ $this->paymentFactory = $paymentFactory;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+ {
+ if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
+ throw new GraphQlInputException(__('Required parameter "cart_id" is missing.'));
+ }
+ $maskedCartId = $args['input']['cart_id'];
+
+ if (!isset($args['input']['payment_method']['code']) || empty($args['input']['payment_method']['code'])) {
+ throw new GraphQlInputException(__('Required parameter "code" for "payment_method" is missing.'));
+ }
+ $paymentMethodCode = $args['input']['payment_method']['code'];
+
+ $poNumber = isset($args['input']['payment_method']['purchase_order_number'])
+ && empty($args['input']['payment_method']['purchase_order_number'])
+ ? $args['input']['payment_method']['purchase_order_number']
+ : null;
+
+ $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId());
+ $payment = $this->paymentFactory->create([
+ 'data' => [
+ PaymentInterface::KEY_METHOD => $paymentMethodCode,
+ PaymentInterface::KEY_PO_NUMBER => $poNumber,
+ PaymentInterface::KEY_ADDITIONAL_DATA => [],
+ ]
+ ]);
+
+ try {
+ $this->paymentMethodManagement->set($cart->getId(), $payment);
+ } catch (NoSuchEntityException $e) {
+ throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+ } catch (LocalizedException $e) {
+ throw new GraphQlInputException(__($e->getMessage()), $e);
+ }
+
+ return [
+ 'cart' => [
+ 'model' => $cart,
+ ],
+ ];
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingAddressesOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingAddressesOnCart.php
index b024e7b77af40..c3e1d371fe6a4 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingAddressesOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingAddressesOnCart.php
@@ -11,62 +11,33 @@
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
use Magento\Framework\GraphQl\Query\ResolverInterface;
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Framework\Stdlib\ArrayManager;
-use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
-use Magento\Quote\Model\ShippingAddressManagementInterface;
use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
use Magento\QuoteGraphQl\Model\Cart\SetShippingAddressesOnCartInterface;
/**
- * Class SetShippingAddressesOnCart
- *
* Mutation resolver for setting shipping addresses for shopping cart
*/
class SetShippingAddressesOnCart implements ResolverInterface
{
- /**
- * @var MaskedQuoteIdToQuoteIdInterface
- */
- private $maskedQuoteIdToQuoteId;
-
- /**
- * @var ShippingAddressManagementInterface
- */
- private $shippingAddressManagement;
-
/**
* @var GetCartForUser
*/
private $getCartForUser;
- /**
- * @var ArrayManager
- */
- private $arrayManager;
-
/**
* @var SetShippingAddressesOnCartInterface
*/
private $setShippingAddressesOnCart;
/**
- * @param MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId
- * @param ShippingAddressManagementInterface $shippingAddressManagement
* @param GetCartForUser $getCartForUser
- * @param ArrayManager $arrayManager
* @param SetShippingAddressesOnCartInterface $setShippingAddressesOnCart
*/
public function __construct(
- MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId,
- ShippingAddressManagementInterface $shippingAddressManagement,
GetCartForUser $getCartForUser,
- ArrayManager $arrayManager,
SetShippingAddressesOnCartInterface $setShippingAddressesOnCart
) {
- $this->maskedQuoteIdToQuoteId = $maskedQuoteIdToQuoteId;
- $this->shippingAddressManagement = $shippingAddressManagement;
$this->getCartForUser = $getCartForUser;
- $this->arrayManager = $arrayManager;
$this->setShippingAddressesOnCart = $setShippingAddressesOnCart;
}
@@ -75,26 +46,23 @@ public function __construct(
*/
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
{
- $shippingAddresses = $this->arrayManager->get('input/shipping_addresses', $args);
- $maskedCartId = $this->arrayManager->get('input/cart_id', $args);
-
- if (!$maskedCartId) {
+ if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
}
- if (!$shippingAddresses) {
+ $maskedCartId = $args['input']['cart_id'];
+
+ if (!isset($args['input']['shipping_addresses']) || empty($args['input']['shipping_addresses'])) {
throw new GraphQlInputException(__('Required parameter "shipping_addresses" is missing'));
}
+ $shippingAddresses = $args['input']['shipping_addresses'];
- $maskedCartId = $args['input']['cart_id'];
$cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId());
-
$this->setShippingAddressesOnCart->execute($context, $cart, $shippingAddresses);
return [
'cart' => [
- 'cart_id' => $maskedCartId,
'model' => $cart,
- ]
+ ],
];
}
}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingMethodsOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingMethodsOnCart.php
index 920829f5d67b1..e69ba47e7adf5 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingMethodsOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingMethodsOnCart.php
@@ -11,45 +11,34 @@
use Magento\Framework\GraphQl\Query\ResolverInterface;
use Magento\Framework\GraphQl\Config\Element\Field;
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Framework\Stdlib\ArrayManager;
use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
-use Magento\QuoteGraphQl\Model\Cart\SetShippingMethodOnCart;
+use Magento\QuoteGraphQl\Model\Cart\SetShippingMethodsOnCartInterface;
/**
- * Class SetShippingMethodsOnCart
- *
* Mutation resolver for setting shipping methods for shopping cart
*/
class SetShippingMethodsOnCart implements ResolverInterface
{
/**
- * @var SetShippingMethodOnCart
- */
- private $setShippingMethodOnCart;
-
- /**
- * @var ArrayManager
+ * @var GetCartForUser
*/
- private $arrayManager;
+ private $getCartForUser;
/**
- * @var GetCartForUser
+ * @var SetShippingMethodsOnCartInterface
*/
- private $getCartForUser;
+ private $setShippingMethodsOnCart;
/**
- * @param ArrayManager $arrayManager
* @param GetCartForUser $getCartForUser
- * @param SetShippingMethodOnCart $setShippingMethodOnCart
+ * @param SetShippingMethodsOnCartInterface $setShippingMethodsOnCart
*/
public function __construct(
- ArrayManager $arrayManager,
GetCartForUser $getCartForUser,
- SetShippingMethodOnCart $setShippingMethodOnCart
+ SetShippingMethodsOnCartInterface $setShippingMethodsOnCart
) {
- $this->arrayManager = $arrayManager;
$this->getCartForUser = $getCartForUser;
- $this->setShippingMethodOnCart = $setShippingMethodOnCart;
+ $this->setShippingMethodsOnCart = $setShippingMethodsOnCart;
}
/**
@@ -57,43 +46,23 @@ public function __construct(
*/
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
{
- $shippingMethods = $this->arrayManager->get('input/shipping_methods', $args);
- $maskedCartId = $this->arrayManager->get('input/cart_id', $args);
-
- if (!$maskedCartId) {
+ if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
}
- if (!$shippingMethods) {
- throw new GraphQlInputException(__('Required parameter "shipping_methods" is missing'));
- }
+ $maskedCartId = $args['input']['cart_id'];
- $shippingMethod = reset($shippingMethods); // This point can be extended for multishipping
-
- if (!$shippingMethod['cart_address_id']) {
- throw new GraphQlInputException(__('Required parameter "cart_address_id" is missing'));
- }
- if (!$shippingMethod['shipping_carrier_code']) {
- throw new GraphQlInputException(__('Required parameter "shipping_carrier_code" is missing'));
- }
- if (!$shippingMethod['shipping_method_code']) {
- throw new GraphQlInputException(__('Required parameter "shipping_method_code" is missing'));
+ if (!isset($args['input']['shipping_methods']) || empty($args['input']['shipping_methods'])) {
+ throw new GraphQlInputException(__('Required parameter "shipping_methods" is missing'));
}
+ $shippingMethods = $args['input']['shipping_methods'];
- $userId = $context->getUserId();
- $cart = $this->getCartForUser->execute((string) $maskedCartId, $userId);
-
- $this->setShippingMethodOnCart->execute(
- $cart,
- $shippingMethod['cart_address_id'],
- $shippingMethod['shipping_carrier_code'],
- $shippingMethod['shipping_method_code']
- );
+ $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId());
+ $this->setShippingMethodsOnCart->execute($context, $cart, $shippingMethods);
return [
'cart' => [
- 'cart_id' => $maskedCartId,
- 'model' => $cart
- ]
+ 'model' => $cart,
+ ],
];
}
}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddress/AvailableShippingMethods.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddress/AvailableShippingMethods.php
new file mode 100644
index 0000000000000..a9e0ba59d15d9
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddress/AvailableShippingMethods.php
@@ -0,0 +1,77 @@
+dataObjectConverter = $dataObjectConverter;
+ $this->shippingMethodConverter = $shippingMethodConverter;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+ {
+ if (!isset($value['model'])) {
+ throw new LocalizedException(__('"model" values should be specified'));
+ }
+ $address = $value['model'];
+
+ // Allow shipping rates by setting country id for new addresses
+ if (!$address->getCountryId() && $address->getCountryCode()) {
+ $address->setCountryId($address->getCountryCode());
+ }
+
+ $address->setCollectShippingRates(true);
+ $address->collectShippingRates();
+ $cart = $address->getQuote();
+
+ $methods = [];
+ $shippingRates = $address->getGroupedAllShippingRates();
+ foreach ($shippingRates as $carrierRates) {
+ foreach ($carrierRates as $rate) {
+ $methods[] = $this->dataObjectConverter->toFlatArray(
+ $this->shippingMethodConverter->modelToDataObject($rate, $cart->getQuoteCurrencyCode()),
+ [],
+ ShippingMethodInterface::class
+ );
+ }
+ }
+ return $methods;
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddress/SelectedShippingMethod.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddress/SelectedShippingMethod.php
new file mode 100644
index 0000000000000..c58affa064c89
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddress/SelectedShippingMethod.php
@@ -0,0 +1,43 @@
+getShippingMethod()) {
+ list($carrierCode, $methodCode) = explode('_', $address->getShippingMethod(), 2);
+ $shippingAmount = $address->getShippingAmount();
+ }
+
+ return [
+ 'carrier_code' => $carrierCode ?? null,
+ 'method_code' => $methodCode ?? null,
+ 'label' => $address->getShippingDescription(),
+ 'amount' => $shippingAmount ?? null,
+ ];
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddresses.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddresses.php
new file mode 100644
index 0000000000000..eb3b0966740eb
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddresses.php
@@ -0,0 +1,56 @@
+extractQuoteAddressData = $extractQuoteAddressData;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+ {
+ if (!isset($value['model'])) {
+ throw new LocalizedException(__('"model" value should be specified'));
+ }
+ /** @var Quote $cart */
+ $cart = $value['model'];
+
+ $addressesData = [];
+ $shippingAddresses = $cart->getAllShippingAddresses();
+
+ if (count($shippingAddresses)) {
+ foreach ($shippingAddresses as $shippingAddress) {
+ $addressesData[] = $this->extractQuoteAddressData->execute($shippingAddress);
+ }
+ }
+ return $addressesData;
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/UpdateCartItems.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/UpdateCartItems.php
new file mode 100644
index 0000000000000..78a07506556c0
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/UpdateCartItems.php
@@ -0,0 +1,118 @@
+getCartForUser = $getCartForUser;
+ $this->cartItemRepository = $cartItemRepository;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+ {
+ if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
+ throw new GraphQlInputException(__('Required parameter "cart_id" is missing.'));
+ }
+ $maskedCartId = $args['input']['cart_id'];
+
+ if (!isset($args['input']['cart_items']) || empty($args['input']['cart_items'])
+ || !is_array($args['input']['cart_items'])
+ ) {
+ throw new GraphQlInputException(__('Required parameter "cart_items" is missing.'));
+ }
+ $cartItems = $args['input']['cart_items'];
+
+ $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId());
+
+ try {
+ $this->processCartItems($cart, $cartItems);
+ } catch (NoSuchEntityException $e) {
+ throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+ } catch (LocalizedException $e) {
+ throw new GraphQlInputException(__($e->getMessage()), $e);
+ }
+
+ return [
+ 'cart' => [
+ 'model' => $cart,
+ ],
+ ];
+ }
+
+ /**
+ * Process cart items
+ *
+ * @param Quote $cart
+ * @param array $items
+ * @throws GraphQlInputException
+ * @throws LocalizedException
+ */
+ private function processCartItems(Quote $cart, array $items): void
+ {
+ foreach ($items as $item) {
+ if (!isset($item['cart_item_id']) || empty($item['cart_item_id'])) {
+ throw new GraphQlInputException(__('Required parameter "cart_item_id" for "cart_items" is missing.'));
+ }
+ $itemId = $item['cart_item_id'];
+
+ if (!isset($item['quantity'])) {
+ throw new GraphQlInputException(__('Required parameter "quantity" for "cart_items" is missing.'));
+ }
+ $qty = (float)$item['quantity'];
+
+ $cartItem = $cart->getItemById($itemId);
+ if ($cartItem === false) {
+ throw new GraphQlNoSuchEntityException(
+ __('Could not find cart item with id: %1.', $item['cart_item_id'])
+ );
+ }
+
+ if ($qty <= 0.0) {
+ $this->cartItemRepository->deleteById((int)$cart->getId(), $itemId);
+ } else {
+ $cartItem->setQty($qty);
+ $this->cartItemRepository->save($cartItem);
+ }
+ }
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/etc/di.xml b/app/code/Magento/QuoteGraphQl/etc/di.xml
index 63ad9e193b955..0697761a2a2a6 100644
--- a/app/code/Magento/QuoteGraphQl/etc/di.xml
+++ b/app/code/Magento/QuoteGraphQl/etc/di.xml
@@ -11,6 +11,8 @@
- SimpleCartItem
+ - VirtualCartItem
+ - ConfigurableCartItem
diff --git a/app/code/Magento/QuoteGraphQl/etc/graphql/di.xml b/app/code/Magento/QuoteGraphQl/etc/graphql/di.xml
index 86bc954ae4ac4..c7389cf667845 100644
--- a/app/code/Magento/QuoteGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/QuoteGraphQl/etc/graphql/di.xml
@@ -7,5 +7,7 @@
-->
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index 4c1101a5f90a8..79cea3855f6f3 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -2,30 +2,61 @@
# See COPYING.txt for license details.
type Query {
- Cart(cart_id: String!): Cart @resolver (class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\Cart") @doc(description:"Returns information about shopping cart")
+ cart(cart_id: String!): Cart @resolver (class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\Cart") @doc(description:"Returns information about shopping cart")
}
type Mutation {
createEmptyCart: String @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CreateEmptyCart") @doc(description:"Creates an empty shopping cart for a guest or logged in user")
- applyCouponToCart(input: ApplyCouponToCartInput): ApplyCouponToCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\Coupon\\ApplyCouponToCart")
- removeCouponFromCart(input: RemoveCouponFromCartInput): RemoveCouponFromCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\Coupon\\RemoveCouponFromCart")
- setShippingAddressesOnCart(input: SetShippingAddressesOnCartInput): SetShippingAddressesOnCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetShippingAddressesOnCart")
+ addSimpleProductsToCart(input: AddSimpleProductsToCartInput): AddSimpleProductsToCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AddSimpleProductsToCart")
+ addVirtualProductsToCart(input: AddVirtualProductsToCartInput): AddVirtualProductsToCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AddSimpleProductsToCart")
applyCouponToCart(input: ApplyCouponToCartInput): ApplyCouponToCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ApplyCouponToCart")
removeCouponFromCart(input: RemoveCouponFromCartInput): RemoveCouponFromCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\RemoveCouponFromCart")
- setBillingAddressOnCart(input: SetBillingAddressOnCartInput): SetBillingAddressOnCartOutput
+ updateCartItems(input: UpdateCartItemsInput): UpdateCartItemsOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\UpdateCartItems")
+ removeItemFromCart(input: RemoveItemFromCartInput): RemoveItemFromCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\RemoveItemFromCart")
+ setShippingAddressesOnCart(input: SetShippingAddressesOnCartInput): SetShippingAddressesOnCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetShippingAddressesOnCart")
+ setBillingAddressOnCart(input: SetBillingAddressOnCartInput): SetBillingAddressOnCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetBillingAddressOnCart")
setShippingMethodsOnCart(input: SetShippingMethodsOnCartInput): SetShippingMethodsOnCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetShippingMethodsOnCart")
- addSimpleProductsToCart(input: AddSimpleProductsToCartInput): AddSimpleProductsToCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AddSimpleProductsToCart")
+ setPaymentMethodOnCart(input: SetPaymentMethodOnCartInput): SetPaymentMethodOnCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\SetPaymentMethodOnCart")
}
-input SetShippingAddressesOnCartInput {
+input AddSimpleProductsToCartInput {
cart_id: String!
- shipping_addresses: [ShippingAddressInput!]!
+ cartItems: [SimpleProductCartItemInput!]!
}
-input ShippingAddressInput {
- customer_address_id: Int # Can be provided in one-page checkout and is required for multi-shipping checkout
- address: CartAddressInput
- cart_items: [CartItemQuantityInput!]
+input SimpleProductCartItemInput {
+ data: CartItemInput!
+ customizable_options:[CustomizableOptionInput!]
+}
+
+input AddVirtualProductsToCartInput {
+ cart_id: String!
+ cartItems: [VirtualProductCartItemInput!]!
+}
+
+input VirtualProductCartItemInput {
+ data: CartItemInput!
+ customizable_options:[CustomizableOptionInput!]
+}
+
+input CartItemInput {
+ sku: String!
+ qty: Float!
+}
+
+input CustomizableOptionInput {
+ id: Int!
+ value: String!
+}
+
+input ApplyCouponToCartInput {
+ cart_id: String!
+ coupon_code: String!
+}
+
+input UpdateCartItemsInput {
+ cart_id: String!
+ cart_items: [CartItemQuantityInput!]!
}
input CartItemQuantityInput {
@@ -33,11 +64,30 @@ input CartItemQuantityInput {
quantity: Float!
}
+input RemoveItemFromCartInput {
+ cart_id: String!
+ cart_item_id: Int!
+}
+
+input SetShippingAddressesOnCartInput {
+ cart_id: String!
+ shipping_addresses: [ShippingAddressInput!]!
+}
+
+input ShippingAddressInput {
+ customer_address_id: Int # If provided then will be used address from address book
+ address: CartAddressInput
+}
+
input SetBillingAddressOnCartInput {
cart_id: String!
+ billing_address: BillingAddressInput!
+}
+
+input BillingAddressInput {
customer_address_id: Int
address: CartAddressInput
- # TODO: consider adding "Same as shipping" option
+ use_for_shipping: Boolean
}
input CartAddressInput {
@@ -55,38 +105,39 @@ input CartAddressInput {
input SetShippingMethodsOnCartInput {
cart_id: String!
- shipping_methods: [ShippingMethodForAddressInput!]!
+ shipping_methods: [ShippingMethodInput!]!
}
-input ShippingMethodForAddressInput {
+input ShippingMethodInput {
cart_address_id: Int!
- shipping_carrier_code: String!
- shipping_method_code: String!
+ carrier_code: String!
+ method_code: String!
}
-type SetBillingAddressOnCartOutput {
- cart: Cart!
+input SetPaymentMethodOnCartInput {
+ cart_id: String!
+ payment_method: PaymentMethodInput!
}
-type SetShippingAddressesOnCartOutput {
+input PaymentMethodInput {
+ code: String! @doc(description:"Payment method code")
+ purchase_order_number: String @doc(description:"Purchase order number")
+}
+
+type SetPaymentMethodOnCartOutput {
cart: Cart!
}
-type SetShippingMethodsOnCartOutput {
+type SetBillingAddressOnCartOutput {
cart: Cart!
}
-# If no address is provided, the system get address assigned to a quote
-# If there's no address at all - the system returns all shipping methods
-input AvailableShippingMethodsOnCartInput {
- cart_id: String!
- customer_address_id: Int
- address: CartAddressInput
+type SetShippingAddressesOnCartOutput {
+ cart: Cart!
}
-input ApplyCouponToCartInput {
- cart_id: String!
- coupon_code: String!
+type SetShippingMethodsOnCartOutput {
+ cart: Cart!
}
type ApplyCouponToCartOutput {
@@ -94,13 +145,16 @@ type ApplyCouponToCartOutput {
}
type Cart {
- cart_id: String
- items: [CartItemInterface]
- applied_coupon: AppliedCoupon
- addresses: [CartAddress]! @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartAddresses")
+ items: [CartItemInterface] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartItems")
+ applied_coupon: AppliedCoupon @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\AppliedCoupon")
+ shipping_addresses: [CartAddress]! @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ShippingAddresses")
+ billing_address: CartAddress! @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\BillingAddress")
+ available_payment_methods: [AvailablePaymentMethod] @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AvailablePaymentMethods") @doc(description: "Available payment methods")
+ selected_payment_method: SelectedPaymentMethod @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SelectedPaymentMethod")
}
type CartAddress {
+ address_id: Int
firstname: String
lastname: String
company: String
@@ -111,15 +165,15 @@ type CartAddress {
country: CartAddressCountry
telephone: String
address_type: AdressTypeEnum
- selected_shipping_method: CheckoutShippingMethod
- available_shipping_methods: [CheckoutShippingMethod]
+ available_shipping_methods: [AvailableShippingMethod] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ShippingAddress\\AvailableShippingMethods")
+ selected_shipping_method: SelectedShippingMethod @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ShippingAddress\\SelectedShippingMethod")
items_weight: Float
customer_notes: String
cart_items: [CartItemQuantity]
}
type CartItemQuantity {
- cart_item_id: String!
+ cart_item_id: Int!
quantity: Float!
}
@@ -133,12 +187,33 @@ type CartAddressCountry {
label: String
}
-type CheckoutShippingMethod {
- code: String
+type SelectedShippingMethod {
+ carrier_code: String
+ method_code: String
label: String
- free_shipping: Boolean!
+ amount: Float
+}
+
+type AvailableShippingMethod {
+ carrier_code: String!
+ carrier_title: String!
+ method_code: String!
+ method_title: String!
error_message: String
- # TODO: Add more complex structure for shipping rates
+ amount: Float!
+ base_amount: Float!
+ price_excl_tax: Float!
+ price_incl_tax: Float!
+}
+
+type AvailablePaymentMethod {
+ code: String @doc(description: "The payment method code")
+ title: String @doc(description: "The payment method title.")
+}
+
+type SelectedPaymentMethod {
+ code: String @doc(description: "The payment method code")
+ purchase_order_number: String @doc(description: "The purchase order number.")
}
enum AdressTypeEnum {
@@ -158,22 +233,19 @@ type RemoveCouponFromCartOutput {
cart: Cart
}
-input AddSimpleProductsToCartInput {
- cart_id: String!
- cartItems: [SimpleProductCartItemInput!]!
+type AddSimpleProductsToCartOutput {
+ cart: Cart!
}
-input SimpleProductCartItemInput {
- data: CartItemInput!
- customizable_options:[CustomizableOptionInput!]
+type AddVirtualProductsToCartOutput {
+ cart: Cart!
}
-input CustomizableOptionInput {
- id: Int!
- value: String!
+type UpdateCartItemsOutput {
+ cart: Cart!
}
-type AddSimpleProductsToCartOutput {
+type RemoveItemFromCartOutput {
cart: Cart!
}
@@ -181,9 +253,8 @@ type SimpleCartItem implements CartItemInterface @doc(description: "Simple Cart
customizable_options: [SelectedCustomizableOption] @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\CustomizableOptions")
}
-input CartItemInput {
- sku: String!
- qty: Float!
+type VirtualCartItem implements CartItemInterface @doc(description: "Virtual Cart Item") {
+ customizable_options: [SelectedCustomizableOption] @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\CustomizableOptions")
}
interface CartItemInterface @typeResolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\CartItemTypeResolver") {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshLifetime.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshLifetime.php
index 1b7ae6398d30e..b868394593558 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshLifetime.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshLifetime.php
@@ -1,12 +1,17 @@
orderResource = $orderResource;
$this->quoteRepository = $quoteRepository;
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
index fd9adbe734101..d89a118bff94b 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
@@ -445,7 +445,7 @@ public function getDateRange($range, $customStart, $customEnd, $returnObjects =
break;
case 'custom':
- $dateStart = $customStart ? $customStart : $dateEnd;
+ $dateStart = $customStart ? $customStart : $dateStart;
$dateEnd = $customEnd ? $customEnd : $dateEnd;
break;
@@ -769,11 +769,12 @@ public function addOrdersCount()
*/
public function addRevenueToSelect($convertCurrency = false)
{
- $expr = $this->getTotalsExpression(
+ $expr = $this->getTotalsExpressionWithDiscountRefunded(
!$convertCurrency,
$this->getConnection()->getIfNullSql('main_table.base_subtotal_refunded', 0),
$this->getConnection()->getIfNullSql('main_table.base_subtotal_canceled', 0),
- $this->getConnection()->getIfNullSql('main_table.base_discount_canceled', 0)
+ $this->getConnection()->getIfNullSql('ABS(main_table.base_discount_refunded)', 0),
+ $this->getConnection()->getIfNullSql('ABS(main_table.base_discount_canceled)', 0)
);
$this->getSelect()->columns(['revenue' => $expr]);
@@ -791,11 +792,12 @@ public function addSumAvgTotals($storeId = 0)
/**
* calculate average and total amount
*/
- $expr = $this->getTotalsExpression(
+ $expr = $this->getTotalsExpressionWithDiscountRefunded(
$storeId,
$this->getConnection()->getIfNullSql('main_table.base_subtotal_refunded', 0),
$this->getConnection()->getIfNullSql('main_table.base_subtotal_canceled', 0),
- $this->getConnection()->getIfNullSql('main_table.base_discount_canceled', 0)
+ $this->getConnection()->getIfNullSql('ABS(main_table.base_discount_refunded)', 0),
+ $this->getConnection()->getIfNullSql('ABS(main_table.base_discount_canceled)', 0)
);
$this->getSelect()->columns(
@@ -808,13 +810,15 @@ public function addSumAvgTotals($storeId = 0)
}
/**
- * Get SQL expression for totals
+ * Get SQL expression for totals.
*
* @param int $storeId
* @param string $baseSubtotalRefunded
* @param string $baseSubtotalCanceled
* @param string $baseDiscountCanceled
* @return string
+ * @deprecated
+ * @see getTotalsExpressionWithDiscountRefunded
*/
protected function getTotalsExpression(
$storeId,
@@ -825,10 +829,40 @@ protected function getTotalsExpression(
$template = ($storeId != 0)
? '(main_table.base_subtotal - %2$s - %1$s - ABS(main_table.base_discount_amount) - %3$s)'
: '((main_table.base_subtotal - %1$s - %2$s - ABS(main_table.base_discount_amount) + %3$s) '
- . ' * main_table.base_to_global_rate)';
+ . ' * main_table.base_to_global_rate)';
return sprintf($template, $baseSubtotalRefunded, $baseSubtotalCanceled, $baseDiscountCanceled);
}
+ /**
+ * Get SQL expression for totals with discount refunded.
+ *
+ * @param int $storeId
+ * @param string $baseSubtotalRefunded
+ * @param string $baseSubtotalCanceled
+ * @param string $baseDiscountRefunded
+ * @param string $baseDiscountCanceled
+ * @return string
+ */
+ private function getTotalsExpressionWithDiscountRefunded(
+ $storeId,
+ $baseSubtotalRefunded,
+ $baseSubtotalCanceled,
+ $baseDiscountRefunded,
+ $baseDiscountCanceled
+ ) {
+ $template = ($storeId != 0)
+ ? '(main_table.base_subtotal - %2$s - %1$s - (ABS(main_table.base_discount_amount) - %3$s - %4$s))'
+ : '((main_table.base_subtotal - %1$s - %2$s - (ABS(main_table.base_discount_amount) - %3$s - %4$s)) '
+ . ' * main_table.base_to_global_rate)';
+ return sprintf(
+ $template,
+ $baseSubtotalRefunded,
+ $baseSubtotalCanceled,
+ $baseDiscountRefunded,
+ $baseDiscountCanceled
+ );
+ }
+
/**
* Sort order by total amount
*
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Collection.php
index 337c87f6da03d..451007960a1ce 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Product/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Collection.php
@@ -5,13 +5,20 @@
*/
/**
- * Products Report collection
- *
* @author Magento Core Team
*/
namespace Magento\Reports\Model\ResourceModel\Product;
+use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
+use Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver;
+use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Indexer\DimensionFactory;
+use Magento\Framework\Model\ResourceModel\ResourceModelPoolInterface;
+
/**
+ * Products Report collection.
+ *
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @api
* @since 100.0.2
@@ -89,7 +96,13 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
* @param \Magento\Catalog\Model\Product\Type $productType
* @param \Magento\Quote\Model\ResourceModel\Quote\Collection $quoteResource
* @param mixed $connection
- *
+ * @param ProductLimitationFactory|null $productLimitationFactory
+ * @param MetadataPool|null $metadataPool
+ * @param TableMaintainer|null $tableMaintainer
+ * @param PriceTableResolver|null $priceTableResolver
+ * @param DimensionFactory|null $dimensionFactory
+ * @param ResourceModelPoolInterface $resourceModelPool
+ * @throws \Magento\Framework\Exception\LocalizedException
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
@@ -116,7 +129,13 @@ public function __construct(
\Magento\Reports\Model\Event\TypeFactory $eventTypeFactory,
\Magento\Catalog\Model\Product\Type $productType,
\Magento\Quote\Model\ResourceModel\Quote\Collection $quoteResource,
- \Magento\Framework\DB\Adapter\AdapterInterface $connection = null
+ \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
+ ProductLimitationFactory $productLimitationFactory = null,
+ MetadataPool $metadataPool = null,
+ TableMaintainer $tableMaintainer = null,
+ PriceTableResolver $priceTableResolver = null,
+ DimensionFactory $dimensionFactory = null,
+ ResourceModelPoolInterface $resourceModelPool = null
) {
$this->setProductEntityId($product->getEntityIdField());
$this->setProductEntityTableName($product->getEntityTable());
@@ -141,7 +160,13 @@ public function __construct(
$customerSession,
$dateTime,
$groupManagement,
- $connection
+ $connection,
+ $productLimitationFactory,
+ $metadataPool,
+ $tableMaintainer,
+ $priceTableResolver,
+ $dimensionFactory,
+ $resourceModelPool
);
$this->_eventTypeFactory = $eventTypeFactory;
$this->_productType = $productType;
@@ -149,7 +174,8 @@ public function __construct(
}
/**
- * Set Type for COUNT SQL Select
+ * Set Type for COUNT SQL Select.
+ *
* @codeCoverageIgnore
*
* @param int $type
@@ -162,7 +188,8 @@ public function setSelectCountSqlType($type)
}
/**
- * Set product entity id
+ * Set product entity id.
+ *
* @codeCoverageIgnore
*
* @param string $entityId
@@ -175,7 +202,8 @@ public function setProductEntityId($entityId)
}
/**
- * Get product entity id
+ * Get product entity id.
+ *
* @codeCoverageIgnore
*
* @return int
@@ -186,7 +214,8 @@ public function getProductEntityId()
}
/**
- * Set product entity table name
+ * Set product entity table name.
+ *
* @codeCoverageIgnore
*
* @param string $value
@@ -199,7 +228,8 @@ public function setProductEntityTableName($value)
}
/**
- * Get product entity table name
+ * Get product entity table name.
+ *
* @codeCoverageIgnore
*
* @return string
@@ -210,7 +240,8 @@ public function getProductEntityTableName()
}
/**
- * Get product attribute set id
+ * Get product attribute set id.
+ *
* @codeCoverageIgnore
*
* @return int
@@ -221,7 +252,8 @@ public function getProductAttributeSetId()
}
/**
- * Set product attribute set id
+ * Set product attribute set id.
+ *
* @codeCoverageIgnore
*
* @param int $value
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Collection/AbstractCollection.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Collection/AbstractCollection.php
index 7371bc4359f46..bec8faaee0ca7 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Collection/AbstractCollection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Collection/AbstractCollection.php
@@ -5,13 +5,20 @@
*/
/**
- * Reports Product Index Abstract Product Resource Collection
- *
* @author Magento Core Team
*/
namespace Magento\Reports\Model\ResourceModel\Product\Index\Collection;
+use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
+use Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver;
+use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Indexer\DimensionFactory;
+use Magento\Framework\Model\ResourceModel\ResourceModelPoolInterface;
+
/**
+ * Reports Product Index Abstract Product Resource Collection.
+ *
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @api
* @since 100.0.2
@@ -53,7 +60,12 @@ abstract class AbstractCollection extends \Magento\Catalog\Model\ResourceModel\P
* @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
* @param \Magento\Customer\Model\Visitor $customerVisitor
* @param mixed $connection
- *
+ * @param ProductLimitationFactory|null $productLimitationFactory
+ * @param MetadataPool|null $metadataPool
+ * @param TableMaintainer|null $tableMaintainer
+ * @param PriceTableResolver|null $priceTableResolver
+ * @param DimensionFactory|null $dimensionFactory
+ * @param ResourceModelPoolInterface|null $resourceModelPool
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
@@ -77,7 +89,13 @@ public function __construct(
\Magento\Framework\Stdlib\DateTime $dateTime,
\Magento\Customer\Api\GroupManagementInterface $groupManagement,
\Magento\Customer\Model\Visitor $customerVisitor,
- \Magento\Framework\DB\Adapter\AdapterInterface $connection = null
+ \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
+ ProductLimitationFactory $productLimitationFactory = null,
+ MetadataPool $metadataPool = null,
+ TableMaintainer $tableMaintainer = null,
+ PriceTableResolver $priceTableResolver = null,
+ DimensionFactory $dimensionFactory = null,
+ ResourceModelPoolInterface $resourceModelPool = null
) {
parent::__construct(
$entityFactory,
@@ -99,7 +117,13 @@ public function __construct(
$customerSession,
$dateTime,
$groupManagement,
- $connection
+ $connection,
+ $productLimitationFactory,
+ $metadataPool,
+ $tableMaintainer,
+ $priceTableResolver,
+ $dimensionFactory,
+ $resourceModelPool
);
$this->_customerVisitor = $customerVisitor;
}
@@ -181,7 +205,8 @@ protected function _getWhereCondition()
}
/**
- * Set customer id, that will be used in 'whereCondition'
+ * Set customer id, that will be used in 'whereCondition'.
+ *
* @codeCoverageIgnore
*
* @param int $id
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Lowstock/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Lowstock/Collection.php
index 732d819e3b2cd..8bf50f4c1b8e7 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Product/Lowstock/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Lowstock/Collection.php
@@ -5,15 +5,21 @@
*/
/**
- * Product Low Stock Report Collection
- *
* @author Magento Core Team
*/
namespace Magento\Reports\Model\ResourceModel\Product\Lowstock;
+use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
+use Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver;
+use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
+use Magento\Framework\EntityManager\MetadataPool;
use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Indexer\DimensionFactory;
+use Magento\Framework\Model\ResourceModel\ResourceModelPoolInterface;
/**
+ * Product Low Stock Report Collection.
+ *
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @api
* @since 100.0.2
@@ -78,7 +84,13 @@ class Collection extends \Magento\Reports\Model\ResourceModel\Product\Collection
* @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
* @param \Magento\CatalogInventory\Model\ResourceModel\Stock\Item $itemResource
* @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection
- *
+ * @param ProductLimitationFactory|null $productLimitationFactory
+ * @param MetadataPool|null $metadataPool
+ * @param TableMaintainer|null $tableMaintainer
+ * @param PriceTableResolver|null $priceTableResolver
+ * @param DimensionFactory|null $dimensionFactory
+ * @param ResourceModelPoolInterface|null $resourceModelPool
+ * @throws LocalizedException
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
@@ -108,7 +120,13 @@ public function __construct(
\Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry,
\Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration,
\Magento\CatalogInventory\Model\ResourceModel\Stock\Item $itemResource,
- \Magento\Framework\DB\Adapter\AdapterInterface $connection = null
+ \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
+ ProductLimitationFactory $productLimitationFactory = null,
+ MetadataPool $metadataPool = null,
+ TableMaintainer $tableMaintainer = null,
+ PriceTableResolver $priceTableResolver = null,
+ DimensionFactory $dimensionFactory = null,
+ ResourceModelPoolInterface $resourceModelPool = null
) {
parent::__construct(
$entityFactory,
@@ -134,7 +152,13 @@ public function __construct(
$eventTypeFactory,
$productType,
$quoteResource,
- $connection
+ $connection,
+ $productLimitationFactory,
+ $metadataPool,
+ $tableMaintainer,
+ $priceTableResolver,
+ $dimensionFactory,
+ $resourceModelPool
);
$this->stockRegistry = $stockRegistry;
$this->stockConfiguration = $stockConfiguration;
diff --git a/app/code/Magento/Reports/Test/Mftf/ActionGroup/GenerateOrderReportActionGroup.xml b/app/code/Magento/Reports/Test/Mftf/ActionGroup/GenerateOrderReportActionGroup.xml
index b96a367903ac8..d367b2deb5922 100644
--- a/app/code/Magento/Reports/Test/Mftf/ActionGroup/GenerateOrderReportActionGroup.xml
+++ b/app/code/Magento/Reports/Test/Mftf/ActionGroup/GenerateOrderReportActionGroup.xml
@@ -19,4 +19,17 @@
+
+
+
diff --git a/app/code/Magento/Reports/Test/Mftf/Section/OrderReportMainSection.xml b/app/code/Magento/Reports/Test/Mftf/Section/OrderReportMainSection.xml
index fb71a67da87dc..7ad9bdfa8c12c 100644
--- a/app/code/Magento/Reports/Test/Mftf/Section/OrderReportMainSection.xml
+++ b/app/code/Magento/Reports/Test/Mftf/Section/OrderReportMainSection.xml
@@ -19,6 +19,7 @@
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml
index 38ad418865eac..7cb23e54aa1b7 100644
--- a/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml
+++ b/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml
@@ -40,6 +40,7 @@
+
+
-
diff --git a/app/code/Magento/Review/etc/adminhtml/menu.xml b/app/code/Magento/Review/etc/adminhtml/menu.xml
index e3532483f88af..7376329471921 100644
--- a/app/code/Magento/Review/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Review/etc/adminhtml/menu.xml
@@ -8,7 +8,8 @@
-
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
index aea04c8abfa60..0e09f3933c1aa 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
@@ -18,7 +18,8 @@
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
index eed9f80c251c8..a116a23dc02cd 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
@@ -14,7 +14,6 @@
+
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderStatusFormFillAndSaveActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderStatusFormFillAndSaveActionGroup.xml
new file mode 100644
index 0000000000000..8108577145421
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderStatusFormFillAndSaveActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusExistsInGridActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusExistsInGridActionGroup.xml
new file mode 100644
index 0000000000000..5f69f52987688
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusExistsInGridActionGroup.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveDuplicateErrorActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveDuplicateErrorActionGroup.xml
new file mode 100644
index 0000000000000..5b4c3115744c9
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveDuplicateErrorActionGroup.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveSuccessActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveSuccessActionGroup.xml
new file mode 100644
index 0000000000000..d82f4b9dd25e8
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveSuccessActionGroup.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
index 820de20c56d54..abc5698cc71e6 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
@@ -17,23 +17,23 @@
-
+
-
-
-
-
diff --git a/app/code/Magento/Sales/Test/Mftf/Data/OrderStatusData.xml b/app/code/Magento/Sales/Test/Mftf/Data/OrderStatusData.xml
new file mode 100644
index 0000000000000..aecd7fcf1b703
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Data/OrderStatusData.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+ order_status
+ orderLabel
+
+
+ pending
+ orderLabel
+
+
+ order_status
+ Suspected Fraud
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Data/SalesEnableRMAStorefrontConfigData.xml b/app/code/Magento/Sales/Test/Mftf/Data/SalesEnableRMAStorefrontConfigData.xml
deleted file mode 100644
index 76ff20813483e..0000000000000
--- a/app/code/Magento/Sales/Test/Mftf/Data/SalesEnableRMAStorefrontConfigData.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- EnableRMAStorefront
-
-
- 1
-
-
-
- DisableRMAStorefront
-
-
- 0
-
-
diff --git a/app/code/Magento/Sales/Test/Mftf/Metadata/sales_enable_rma_config-meta.xml b/app/code/Magento/Sales/Test/Mftf/Metadata/sales_enable_rma_config-meta.xml
deleted file mode 100644
index 86226265dd146..0000000000000
--- a/app/code/Magento/Sales/Test/Mftf/Metadata/sales_enable_rma_config-meta.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderProcessDataPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderProcessDataPage.xml
new file mode 100644
index 0000000000000..2041bf8f3c9ae
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderProcessDataPage.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderStatusPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderStatusPage.xml
new file mode 100644
index 0000000000000..b158e4923074a
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderStatusPage.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrdersAndReturnsPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrdersAndReturnsPage.xml
index 32d94c3175807..ee546174d9680 100644
--- a/app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrdersAndReturnsPage.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrdersAndReturnsPage.xml
@@ -9,7 +9,6 @@
-
-
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml
index bc7fc8145af33..011500fac3f69 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml
@@ -9,7 +9,7 @@
-
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormActionSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormActionSection.xml
index 2f6149dfa1cb7..027962282b2c3 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormActionSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormActionSection.xml
@@ -12,5 +12,8 @@
-
\ No newline at end of file
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsOrderedSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsOrderedSection.xml
index 11673f1f0fe26..beb566b20806c 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsOrderedSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsOrderedSection.xml
@@ -15,5 +15,6 @@
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusGridSection.xml
new file mode 100644
index 0000000000000..b624639281187
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusGridSection.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml
index 717022322698f..b716047a39008 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml
@@ -19,7 +19,7 @@
-
-
-
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml
index 9180636db7821..e405173429b2c 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml
@@ -25,6 +25,7 @@
@@ -33,62 +34,53 @@
+
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+ $grabGroupValue
+ 3
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml
new file mode 100644
index 0000000000000..f869841153aea
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml
@@ -0,0 +1,91 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 10
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
index 099cf7fbce914..ce66409ed9b3c 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
@@ -71,7 +71,6 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingLabelTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingLabelTest.xml
new file mode 100644
index 0000000000000..d1381bbb1efb0
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingLabelTest.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusTest.xml
new file mode 100644
index 0000000000000..c2daaac84dd42
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusTest.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderPaymentMethodValidationTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderPaymentMethodValidationTest.xml
new file mode 100644
index 0000000000000..e487c62b96727
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderPaymentMethodValidationTest.xml
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml
new file mode 100644
index 0000000000000..d418751c736e1
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/SaveTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
index 4ad2e314c8317..c3ff8a2acaf4f 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
@@ -203,10 +203,9 @@ public function testSaveActionWithNegativeCreditmemo()
$creditmemoMock = $this->createPartialMock(
\Magento\Sales\Model\Order\Creditmemo::class,
- ['load', 'getGrandTotal', 'isAllowZeroGrandTotal', '__wakeup']
+ ['load', 'isValidGrandTotal', '__wakeup']
);
- $creditmemoMock->expects($this->once())->method('getGrandTotal')->will($this->returnValue('0'));
- $creditmemoMock->expects($this->once())->method('isAllowZeroGrandTotal')->will($this->returnValue(false));
+ $creditmemoMock->expects($this->once())->method('isValidGrandTotal')->will($this->returnValue(false));
$this->memoLoaderMock->expects(
$this->once()
)->method(
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/NewActionTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/NewActionTest.php
index 05c99c9f9ef98..87e27fdb2206b 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/NewActionTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/NewActionTest.php
@@ -6,12 +6,14 @@
namespace Magento\Sales\Test\Unit\Controller\Adminhtml\Order\Invoice;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Sales\Api\OrderRepositoryInterface;
/**
* Class NewActionTest
* @package Magento\Sales\Controller\Adminhtml\Order\Invoice
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
*/
class NewActionTest extends \PHPUnit\Framework\TestCase
{
@@ -90,6 +92,11 @@ class NewActionTest extends \PHPUnit\Framework\TestCase
*/
protected $invoiceServiceMock;
+ /**
+ * @var OrderRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $orderRepositoryMock;
+
protected function setUp()
{
$objectManager = new ObjectManager($this);
@@ -215,12 +222,15 @@ protected function setUp()
->disableOriginalConstructor()
->getMock();
+ $this->orderRepositoryMock = $this->createMock(OrderRepositoryInterface::class);
+
$this->controller = $objectManager->getObject(
\Magento\Sales\Controller\Adminhtml\Order\Invoice\NewAction::class,
[
'context' => $contextMock,
'resultPageFactory' => $this->resultPageFactoryMock,
- 'invoiceService' => $this->invoiceServiceMock
+ 'invoiceService' => $this->invoiceServiceMock,
+ 'orderRepository' => $this->orderRepositoryMock
]
);
}
@@ -250,19 +260,17 @@ public function testExecute()
$orderMock = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
->disableOriginalConstructor()
- ->setMethods(['load', 'getId', 'canInvoice'])
+ ->setMethods(['load', 'canInvoice'])
->getMock();
- $orderMock->expects($this->once())
- ->method('load')
- ->with($orderId)
- ->willReturnSelf();
- $orderMock->expects($this->once())
- ->method('getId')
- ->willReturn($orderId);
$orderMock->expects($this->once())
->method('canInvoice')
->willReturn(true);
+ $this->orderRepositoryMock->expects($this->once())
+ ->method('get')
+ ->with($orderId)
+ ->willReturn($orderMock);
+
$this->invoiceServiceMock->expects($this->once())
->method('prepareInvoice')
->with($orderMock, [])
@@ -285,11 +293,7 @@ public function testExecute()
->with(true)
->will($this->returnValue($commentText));
- $this->objectManagerMock->expects($this->at(0))
- ->method('create')
- ->with(\Magento\Sales\Model\Order::class)
- ->willReturn($orderMock);
- $this->objectManagerMock->expects($this->at(1))
+ $this->objectManagerMock->expects($this->once())
->method('get')
->with(\Magento\Backend\Model\Session::class)
->will($this->returnValue($this->sessionMock));
@@ -318,19 +322,12 @@ public function testExecuteNoOrder()
$orderMock = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
->disableOriginalConstructor()
- ->setMethods(['load', 'getId', 'canInvoice'])
+ ->setMethods(['canInvoice'])
->getMock();
- $orderMock->expects($this->once())
- ->method('load')
- ->with($orderId)
- ->willReturnSelf();
- $orderMock->expects($this->once())
- ->method('getId')
- ->willReturn(null);
- $this->objectManagerMock->expects($this->at(0))
- ->method('create')
- ->with(\Magento\Sales\Model\Order::class)
+ $this->orderRepositoryMock->expects($this->once())
+ ->method('get')
+ ->with($orderId)
->willReturn($orderMock);
$resultRedirect = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class)
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoTest.php
index f299cd5accdb8..4d8dd00ac65b3 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoTest.php
@@ -117,27 +117,9 @@ public function testIsValidGrandTotalGrandTotalEmpty()
public function testIsValidGrandTotalGrandTotal()
{
$this->creditmemo->setGrandTotal(0);
- $this->creditmemo->isAllowZeroGrandTotal(true);
$this->assertFalse($this->creditmemo->isValidGrandTotal());
}
- /**
- * Test for isAllowZeroGrandTotal method.
- *
- * @return void
- */
- public function testIsAllowZeroGrandTotal()
- {
- $isAllowed = 0;
- $this->scopeConfigMock->expects($this->once())
- ->method('getValue')
- ->with(
- 'sales/zerograndtotal_creditmemo/allow_zero_grandtotal',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
- )->willReturn($isAllowed);
- $this->assertEquals($isAllowed, $this->creditmemo->isAllowZeroGrandTotal());
- }
-
public function testIsValidGrandTotal()
{
$this->creditmemo->setGrandTotal(1);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php
index 46c44c03b1514..88053ea684ce8 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php
@@ -64,7 +64,7 @@ public function testSend($configValue, $forceSyncMode, $emailSendingResult, $sen
$this->orderMock->expects($this->once())
->method('setSendEmail')
- ->with(true);
+ ->with($emailSendingResult);
$this->globalConfig->expects($this->once())
->method('getValue')
@@ -72,7 +72,7 @@ public function testSend($configValue, $forceSyncMode, $emailSendingResult, $sen
->willReturn($configValue);
if (!$configValue || $forceSyncMode) {
- $this->identityContainerMock->expects($this->once())
+ $this->identityContainerMock->expects($this->exactly(2))
->method('isEnabled')
->willReturn($emailSendingResult);
@@ -118,7 +118,7 @@ public function testSend($configValue, $forceSyncMode, $emailSendingResult, $sen
$this->orderMock->expects($this->once())
->method('setEmailSent')
- ->with(true);
+ ->with($emailSendingResult);
$this->orderResourceMock->expects($this->once())
->method('saveAttribute')
@@ -210,7 +210,7 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
->with('sales_email/general/async_sending')
->willReturn(false);
- $this->identityContainerMock->expects($this->once())
+ $this->identityContainerMock->expects($this->exactly(2))
->method('isEnabled')
->willReturn(true);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
index 759d60d9e6613..24cd54e3a46b3 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
@@ -76,7 +76,7 @@ protected function setUp()
'setTemplateIdentifier',
'setTemplateOptions',
'setTemplateVars',
- 'setFromByStore',
+ 'setFromByScope',
]
);
@@ -103,7 +103,7 @@ protected function setUp()
->method('getEmailIdentity')
->will($this->returnValue($emailIdentity));
$this->transportBuilder->expects($this->once())
- ->method('setFromByStore')
+ ->method('setFromByScope')
->with($this->equalTo($emailIdentity), 1);
$this->identityContainerMock->expects($this->once())
@@ -146,7 +146,7 @@ public function testSend()
->method('getId')
->willReturn(1);
$this->transportBuilder->expects($this->once())
- ->method('setFromByStore')
+ ->method('setFromByScope')
->with($identity, 1);
$this->transportBuilder->expects($this->once())
->method('addTo')
@@ -176,7 +176,7 @@ public function testSendCopyTo()
->method('addTo')
->with($this->equalTo('example@mail.com'));
$this->transportBuilder->expects($this->once())
- ->method('setFromByStore')
+ ->method('setFromByScope')
->with($identity, 1);
$this->identityContainerMock->expects($this->once())
->method('getStore')
diff --git a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
index 61ae9ae45e12f..705d2face2308 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
@@ -428,22 +428,6 @@ public function testCanCreditMemo()
$this->assertTrue($this->order->canCreditmemo());
}
- /**
- * Test canCreditMemo method when grand total and paid total are zero.
- *
- * @return void
- */
- public function testCanCreditMemoForZeroTotal()
- {
- $grandTotal = 0;
- $totalPaid = 0;
- $totalRefunded = 0;
- $this->prepareOrderItem();
- $this->order->setGrandTotal($grandTotal);
- $this->order->setTotalPaid($totalPaid);
- $this->assertFalse($this->order->canCreditmemoForZeroTotal($totalRefunded));
- }
-
public function testCanNotCreditMemoWithTotalNull()
{
$totalPaid = 0;
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
index d21e575245395..99a411c43c247 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
@@ -107,13 +107,13 @@ public function stateCheckDataProvider()
{
return [
'processing - !canCreditmemo!canShip -> closed' =>
- [false, 1, false, 0, Order::STATE_PROCESSING, Order::STATE_CLOSED],
+ [false, 1, false, 1, Order::STATE_PROCESSING, Order::STATE_CLOSED],
'complete - !canCreditmemo,!canShip -> closed' =>
- [false, 1, false, 0, Order::STATE_COMPLETE, Order::STATE_CLOSED],
- 'processing - !canCreditmemo,canShip -> closed' =>
- [false, 1, true, 0, Order::STATE_PROCESSING, Order::STATE_CLOSED],
- 'complete - !canCreditmemo,canShip -> closed' =>
- [false, 1, true, 0, Order::STATE_COMPLETE, Order::STATE_CLOSED],
+ [false, 1, false, 1, Order::STATE_COMPLETE, Order::STATE_CLOSED],
+ 'processing - !canCreditmemo,canShip -> processing' =>
+ [false, 1, true, 2, Order::STATE_PROCESSING, Order::STATE_PROCESSING],
+ 'complete - !canCreditmemo,canShip -> complete' =>
+ [false, 1, true, 1, Order::STATE_COMPLETE, Order::STATE_COMPLETE],
'processing - canCreditmemo,!canShip -> complete' =>
[true, 1, false, 1, Order::STATE_PROCESSING, Order::STATE_COMPLETE],
'complete - canCreditmemo,!canShip -> complete' =>
diff --git a/app/code/Magento/Sales/etc/di.xml b/app/code/Magento/Sales/etc/di.xml
index 5a5dd925a3098..68fcd17122bd2 100644
--- a/app/code/Magento/Sales/etc/di.xml
+++ b/app/code/Magento/Sales/etc/di.xml
@@ -1015,4 +1015,9 @@
+
+
+
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
index c69d453fb81d5..00fa55d38f5fc 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
@@ -7,7 +7,7 @@
?>
hasMethods()) : ?>
{{/depend}}
- {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
+ {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
{{/depend}}
- {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
+ {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
{{/depend}}
- {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
+ {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
{{/depend}}
- {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
+ {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
getUiId('content-header') ?>>
getChildHtml() ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html b/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html
index fe30ca7e83f19..0033f4c071e42 100644
--- a/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html
+++ b/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html
@@ -69,7 +69,7 @@
| @@ -116,7 +125,7 @@ |
- canShowPriceInfo($_item)): ?>
+ canShowPriceInfo($_item) || $shipTogether): ?>
canEditQty()) : ?>
qty) {
return;
diff --git a/app/code/Magento/BundleGraphQl/Model/BundleProductTypeResolver.php b/app/code/Magento/BundleGraphQl/Model/BundleProductTypeResolver.php
index b904d3f62a748..211d625fbc754 100644
--- a/app/code/Magento/BundleGraphQl/Model/BundleProductTypeResolver.php
+++ b/app/code/Magento/BundleGraphQl/Model/BundleProductTypeResolver.php
@@ -8,19 +8,22 @@
namespace Magento\BundleGraphQl\Model;
use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+use Magento\Bundle\Model\Product\Type as Type;
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
class BundleProductTypeResolver implements TypeResolverInterface
{
+ const BUNDLE_PRODUCT = 'BundleProduct';
+
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function resolveType(array $data) : string
{
- if (isset($data['type_id']) && $data['type_id'] == 'bundle') {
- return 'BundleProduct';
+ if (isset($data['type_id']) && $data['type_id'] == Type::TYPE_CODE) {
+ return self::BUNDLE_PRODUCT;
}
return '';
}
diff --git a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
index 2152f842d4a29..b2aa0d000e9cf 100644
--- a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
+++ b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
@@ -118,6 +118,7 @@ private function splitTags($tagsPattern)
private function sendPurgeRequestToServers($socketAdapter, $servers, $formattedTagsChunk)
{
$headers = [self::HEADER_X_MAGENTO_TAGS_PATTERN => $formattedTagsChunk];
+ $unresponsiveServerError = [];
foreach ($servers as $server) {
$headers['Host'] = $server->getHost();
try {
@@ -131,10 +132,30 @@ private function sendPurgeRequestToServers($socketAdapter, $servers, $formattedT
$socketAdapter->read();
$socketAdapter->close();
} catch (\Exception $e) {
- $this->logger->critical($e->getMessage(), compact('server', 'formattedTagsChunk'));
+ $unresponsiveServerError[] = "Cache host: " . $server->getHost() . ":" . $server->getPort() .
+ "resulted in error message: " . $e->getMessage();
+ }
+ }
+
+ $errorCount = count($unresponsiveServerError);
+
+ if ($errorCount > 0) {
+ $loggerMessage = implode(" ", $unresponsiveServerError);
+
+ if ($errorCount == count($servers)) {
+ $this->logger->critical(
+ 'No cache server(s) could be purged ' . $loggerMessage,
+ compact('server', 'formattedTagsChunk')
+ );
return false;
}
+
+ $this->logger->warning(
+ 'Unresponsive cache server(s) hit' . $loggerMessage,
+ compact('server', 'formattedTagsChunk')
+ );
}
+
$this->logger->execute(compact('servers', 'formattedTagsChunk'));
return true;
}
diff --git a/app/code/Magento/Captcha/Observer/CheckUserLoginObserver.php b/app/code/Magento/Captcha/Observer/CheckUserLoginObserver.php
index bdc8dfa218972..dd4974c5d842c 100644
--- a/app/code/Magento/Captcha/Observer/CheckUserLoginObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckUserLoginObserver.php
@@ -3,6 +3,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
namespace Magento\Captcha\Observer;
use Magento\Customer\Model\AuthenticationInterface;
@@ -11,7 +12,10 @@
use Magento\Customer\Api\CustomerRepositoryInterface;
/**
+ * Check captcha on user login page observer.
+ *
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
*/
class CheckUserLoginObserver implements ObserverInterface
{
@@ -140,7 +144,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
$customer = $this->getCustomerRepository()->get($login);
$this->getAuthentication()->processAuthenticationFailure($customer->getId());
} catch (NoSuchEntityException $e) {
- //do nothing as customer existance is validated later in authenticate method
+ //do nothing as customer existence is validated later in authenticate method
}
$this->messageManager->addError(__('Incorrect CAPTCHA'));
$this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
diff --git a/app/code/Magento/Catalog/Api/ProductRenderListInterface.php b/app/code/Magento/Catalog/Api/ProductRenderListInterface.php
index f79efa4c814d7..954acd35a07db 100644
--- a/app/code/Magento/Catalog/Api/ProductRenderListInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductRenderListInterface.php
@@ -4,18 +4,22 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
namespace Magento\Catalog\Api;
/**
- * Interface which provides product renders information for products
+ * Interface which provides product renders information for products.
+ *
* @api
* @since 101.1.0
*/
interface ProductRenderListInterface
{
/**
- * Collect and retrieve the list of product render info
- * This info contains raw prices and formated prices, product name, stock status, store_id, etc
+ * Collect and retrieve the list of product render info.
+ *
+ * This info contains raw prices and formatted prices, product name, stock status, store_id, etc.
+ *
* @see \Magento\Catalog\Api\Data\ProductRenderInfoDtoInterface
*
* @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php
index 331679874629b..ffb648cdf438a 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php
@@ -67,6 +67,8 @@ public function getCategory()
}
/**
+ * Get category id
+ *
* @return int|string|null
*/
public function getCategoryId()
@@ -78,6 +80,8 @@ public function getCategoryId()
}
/**
+ * Get category name
+ *
* @return string
*/
public function getCategoryName()
@@ -86,6 +90,8 @@ public function getCategoryName()
}
/**
+ * Get category path
+ *
* @return mixed
*/
public function getCategoryPath()
@@ -97,6 +103,8 @@ public function getCategoryPath()
}
/**
+ * Check store root category
+ *
* @return bool
*/
public function hasStoreRootCategory()
@@ -109,6 +117,8 @@ public function hasStoreRootCategory()
}
/**
+ * Get store from request
+ *
* @return Store
*/
public function getStore()
@@ -118,6 +128,8 @@ public function getStore()
}
/**
+ * Get root category for tree
+ *
* @param mixed|null $parentNodeCategory
* @param int $recursionLevel
* @return Node|array|null
@@ -149,10 +161,11 @@ public function getRoot($parentNodeCategory = null, $recursionLevel = 3)
$root = $tree->getNodeById($rootId);
- if ($root && $rootId != \Magento\Catalog\Model\Category::TREE_ROOT_ID) {
+ if ($root) {
$root->setIsVisible(true);
- } elseif ($root && $root->getId() == \Magento\Catalog\Model\Category::TREE_ROOT_ID) {
- $root->setName(__('Root'));
+ if ($root->getId() == \Magento\Catalog\Model\Category::TREE_ROOT_ID) {
+ $root->setName(__('Root'));
+ }
}
$this->_coreRegistry->register('root', $root);
@@ -162,6 +175,8 @@ public function getRoot($parentNodeCategory = null, $recursionLevel = 3)
}
/**
+ * Get Default Store Id
+ *
* @return int
*/
protected function _getDefaultStoreId()
@@ -170,6 +185,8 @@ protected function _getDefaultStoreId()
}
/**
+ * Get category collection
+ *
* @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
*/
public function getCategoryCollection()
@@ -227,6 +244,8 @@ public function getRootByIds($ids)
}
/**
+ * Get category node for tree
+ *
* @param mixed $parentNodeCategory
* @param int $recursionLevel
* @return Node
@@ -249,6 +268,8 @@ public function getNode($parentNodeCategory, $recursionLevel = 2)
}
/**
+ * Get category save url
+ *
* @param array $args
* @return string
*/
@@ -260,6 +281,8 @@ public function getSaveUrl(array $args = [])
}
/**
+ * Get category edit url
+ *
* @return string
*/
public function getEditUrl()
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php
index ad6df27b89334..8f1d1dcf7eedf 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php
@@ -4,13 +4,13 @@
* See COPYING.txt for license details.
*/
+namespace Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset;
+
/**
* Catalog fieldset element renderer
*
* @author Magento Core Team
@@ -132,7 +139,7 @@
diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
index 65090fa3ac461..578281f44c4cf 100644
--- a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
@@ -190,6 +190,13 @@
+
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
index 2daca51a2f5da..fb128a891aea2 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
@@ -97,7 +97,7 @@
escapeHtml(__($_data['label'])) ?> |
- productAttribute($_product, $_data['value'], $_data['code']) ?> |
+ escapeHtml($_data['label']) ?> |
+ productAttribute($_product, $_data['value'], $_data['code']) ?> |
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/action/update-shopping-cart.js b/app/code/Magento/Checkout/view/frontend/web/js/action/update-shopping-cart.js
index ce1527b3d72d6..1920bc4d7ac41 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/action/update-shopping-cart.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/action/update-shopping-cart.js
@@ -14,7 +14,8 @@ define([
$.widget('mage.updateShoppingCart', {
options: {
validationURL: '',
- eventName: 'updateCartItemQty'
+ eventName: 'updateCartItemQty',
+ updateCartActionContainer: ''
},
/** @inheritdoc */
@@ -31,7 +32,9 @@ define([
* @return {Boolean}
*/
onSubmit: function (event) {
- if (!this.options.validationURL) {
+ var action = this.element.find(this.options.updateCartActionContainer).val();
+
+ if (!this.options.validationURL || action === 'empty_cart') {
return true;
}
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/empty-cart.js b/app/code/Magento/Checkout/view/frontend/web/js/empty-cart.js
new file mode 100644
index 0000000000000..4b30ad8075274
--- /dev/null
+++ b/app/code/Magento/Checkout/view/frontend/web/js/empty-cart.js
@@ -0,0 +1,16 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'Magento_Customer/js/customer-data'
+], function (customerData) {
+ 'use strict';
+
+ var cartData = customerData.get('cart');
+
+ if (cartData().items && cartData().items.length !== 0) {
+ customerData.reload(['cart'], false);
+ }
+});
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/quote.js b/app/code/Magento/Checkout/view/frontend/web/js/model/quote.js
index 2510d1aced3d3..3486a92736617 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/quote.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/quote.js
@@ -7,7 +7,8 @@
*/
define([
'ko',
- 'underscore'
+ 'underscore',
+ 'domReady!'
], function (ko, _) {
'use strict';
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js b/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
index 3ea49cd981d90..eecfa65b189d1 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
@@ -14,7 +14,11 @@ define([
_create: function () {
var items, i, reload;
- $(this.options.emptyCartButton).on('click', $.proxy(function () {
+ $(this.options.emptyCartButton).on('click', $.proxy(function (event) {
+ if (event.detail === 0) {
+ return;
+ }
+
$(this.options.emptyCartButton).attr('name', 'update_cart_action_temp');
$(this.options.updateCartActionContainer)
.attr('name', 'update_cart_action').attr('value', 'empty_cart');
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
index 6f9a1a46826da..d68b0682eb511 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
@@ -202,6 +202,13 @@ function (
}
},
+ /**
+ * Manage cancel button visibility
+ */
+ canUseCancelBillingAddress: ko.computed(function () {
+ return quote.billingAddress() || lastSelectedBillingAddress;
+ }),
+
/**
* Restore billing address
*/
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js b/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js
index a2f8c8c56ff33..5e29fa209a641 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js
@@ -81,6 +81,7 @@ define([
maxItemsToDisplay: window.checkout.maxItemsToDisplay,
cart: {},
+ // jscs:disable requireCamelCaseOrUpperCaseIdentifiers
/**
* @override
*/
@@ -101,12 +102,16 @@ define([
self.isLoading(true);
});
- if (cartData()['website_id'] !== window.checkout.websiteId) {
+ if (cartData().website_id !== window.checkout.websiteId ||
+ cartData().store_id !== window.checkout.storeId
+ ) {
customerData.reload(['cart'], false);
}
return this._super();
},
+ //jscs:enable requireCamelCaseOrUpperCaseIdentifiers
+
isLoading: ko.observable(false),
initSidebar: initSidebar,
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html
index 5f735fbb4daa9..63edb5057b933 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html
@@ -22,7 +22,7 @@
-
@@ -49,6 +51,6 @@
getResultCount()): ?>
- getProductListHtml() ?>
+
getSearchCriterias(); ?>
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Products/AdaptUrlRewritesToVisibilityAttribute.php b/app/code/Magento/CatalogUrlRewrite/Model/Products/AdaptUrlRewritesToVisibilityAttribute.php
new file mode 100644
index 0000000000000..f5851cf1e11b1
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Products/AdaptUrlRewritesToVisibilityAttribute.php
@@ -0,0 +1,127 @@
+productCollectionFactory = $collectionFactory;
+ $this->urlRewriteGenerator = $urlRewriteGenerator;
+ $this->urlPersist = $urlPersist;
+ $this->urlPathGenerator = $urlPathGenerator;
+ }
+
+ /**
+ * Process Url Rewrites according to the products visibility attribute
+ *
+ * @param array $productIds
+ * @param int $visibility
+ * @throws UrlAlreadyExistsException
+ */
+ public function execute(array $productIds, int $visibility): void
+ {
+ $products = $this->getProductsByIds($productIds);
+
+ /** @var Product $product */
+ foreach ($products as $product) {
+ if ($visibility == Visibility::VISIBILITY_NOT_VISIBLE) {
+ $this->urlPersist->deleteByData(
+ [
+ UrlRewrite::ENTITY_ID => $product->getId(),
+ UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
+ ]
+ );
+ } elseif ($visibility !== Visibility::VISIBILITY_NOT_VISIBLE) {
+ $product->setVisibility($visibility);
+ $productUrlPath = $this->urlPathGenerator->getUrlPath($product);
+ $productUrlRewrite = $this->urlRewriteGenerator->generate($product);
+ $product->unsUrlPath();
+ $product->setUrlPath($productUrlPath);
+
+ try {
+ $this->urlPersist->replace($productUrlRewrite);
+ } catch (UrlAlreadyExistsException $e) {
+ throw new UrlAlreadyExistsException(
+ __(
+ 'Can not change the visibility of the product with SKU equals "%1". '
+ . 'URL key "%2" for specified store already exists.',
+ $product->getSku(),
+ $product->getUrlKey()
+ ),
+ $e,
+ $e->getCode(),
+ $e->getUrls()
+ );
+ }
+ }
+ }
+ }
+
+ /**
+ * Get Product Models by Id's
+ *
+ * @param array $productIds
+ * @return array
+ */
+ private function getProductsByIds(array $productIds): array
+ {
+ $productCollection = $this->productCollectionFactory->create();
+ $productCollection->addAttributeToSelect(ProductInterface::VISIBILITY);
+ $productCollection->addAttributeToSelect('url_key');
+ $productCollection->addFieldToFilter(
+ 'entity_id',
+ ['in' => array_unique($productIds)]
+ );
+
+ return $productCollection->getItems();
+ }
+}
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
index 9aaa384776855..7b60c85049767 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
@@ -263,6 +263,7 @@ protected function _populateForUrlGeneration($rowData)
if ($this->isGlobalScope($product->getStoreId())) {
$this->populateGlobalProduct($product);
} else {
+ $this->storesCache[$product->getStoreId()] = true;
$this->addProductToImport($product, $product->getStoreId());
}
return $this;
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeProductVisibilityObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeProductVisibilityObserver.php
new file mode 100644
index 0000000000000..2337bb3646bd7
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeProductVisibilityObserver.php
@@ -0,0 +1,54 @@
+adaptUrlRewritesToVisibility = $adaptUrlRewritesToVisibility;
+ }
+
+ /**
+ * Generate urls for UrlRewrites and save it in storage
+ *
+ * @param Observer $observer
+ * @return void
+ * @throws UrlAlreadyExistsException
+ */
+ public function execute(Observer $observer)
+ {
+ $event = $observer->getEvent();
+ $attrData = $event->getAttributesData();
+ $productIds = $event->getProductIds();
+ $visibility = $attrData[ProductInterface::VISIBILITY] ?? 0;
+
+ if (!$visibility || !$productIds) {
+ return;
+ }
+
+ $this->adaptUrlRewritesToVisibility->execute($productIds, (int)$visibility);
+ }
+}
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php
index fc2056e83ec70..44b47faf3d4b8 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php
@@ -13,7 +13,12 @@
use Magento\Store\Model\Store;
use Magento\UrlRewrite\Model\UrlPersistInterface;
use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use Magento\Store\Api\StoreWebsiteRelationInterface;
+use Magento\Framework\App\ObjectManager;
+/**
+ * Observer to assign the products to website
+ */
class ProductToWebsiteChangeObserver implements ObserverInterface
{
/**
@@ -36,22 +41,31 @@ class ProductToWebsiteChangeObserver implements ObserverInterface
*/
protected $request;
+ /**
+ * @var StoreWebsiteRelationInterface
+ */
+ private $storeWebsiteRelation;
+
/**
* @param ProductUrlRewriteGenerator $productUrlRewriteGenerator
* @param UrlPersistInterface $urlPersist
* @param ProductRepositoryInterface $productRepository
* @param RequestInterface $request
+ * @param StoreWebsiteRelationInterface $storeWebsiteRelation
*/
public function __construct(
ProductUrlRewriteGenerator $productUrlRewriteGenerator,
UrlPersistInterface $urlPersist,
ProductRepositoryInterface $productRepository,
- RequestInterface $request
+ RequestInterface $request,
+ StoreWebsiteRelationInterface $storeWebsiteRelation = null
) {
$this->productUrlRewriteGenerator = $productUrlRewriteGenerator;
$this->urlPersist = $urlPersist;
$this->productRepository = $productRepository;
$this->request = $request;
+ $this->storeWebsiteRelation = $storeWebsiteRelation ?:
+ ObjectManager::getInstance()->get(StoreWebsiteRelationInterface::class);
}
/**
@@ -69,12 +83,21 @@ public function execute(\Magento\Framework\Event\Observer $observer)
$this->request->getParam('store_id', Store::DEFAULT_STORE_ID)
);
- $this->urlPersist->deleteByData([
- UrlRewrite::ENTITY_ID => $product->getId(),
- UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
- ]);
- if ($product->getVisibility() != Visibility::VISIBILITY_NOT_VISIBLE) {
- $this->urlPersist->replace($this->productUrlRewriteGenerator->generate($product));
+ if (!empty($this->productUrlRewriteGenerator->generate($product))) {
+ if ($this->request->getParam('remove_website_ids')) {
+ foreach ($this->request->getParam('remove_website_ids') as $webId) {
+ foreach ($this->storeWebsiteRelation->getStoreByWebsiteId($webId) as $storeId) {
+ $this->urlPersist->deleteByData([
+ UrlRewrite::ENTITY_ID => $product->getId(),
+ UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
+ UrlRewrite::STORE_ID => $storeId
+ ]);
+ }
+ }
+ }
+ if ($product->getVisibility() != Visibility::VISIBILITY_NOT_VISIBLE) {
+ $this->urlPersist->replace($this->productUrlRewriteGenerator->generate($product));
+ }
}
}
}
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
new file mode 100644
index 0000000000000..30a4290d882fb
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
@@ -0,0 +1,82 @@
+
+
+
+
-
+
-
+
- |
|---|
-
-
+
-
getMethods();
$_methodsCount = count($_methods);
@@ -28,8 +28,8 @@
checked="checked"
-
- class="admin__control-radioescapeHtml($className); ?>"/>
+ data-validate="{'validate-one-required-by-name':true}"
+ class="admin__control-radio"/>
getCustomerViewUrl();
getBaseCurrencyCode() != $order->getOrderCurrencyCode()): ?>
{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship
diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html b/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
index df1677f56a500..bb181126724da 100644
--- a/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
@@ -51,7 +51,7 @@ {{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship |
|
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_track.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_track.xml
new file mode 100644
index 0000000000000..91414663951d3
--- /dev/null
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_track.xml
@@ -0,0 +1,13 @@
+
+
+
-
+
diff --git a/app/code/Magento/SalesAnalytics/composer.json b/app/code/Magento/SalesAnalytics/composer.json
index 64424c8f5bc61..b77dcd7e71c65 100644
--- a/app/code/Magento/SalesAnalytics/composer.json
+++ b/app/code/Magento/SalesAnalytics/composer.json
@@ -4,7 +4,8 @@
"require": {
"php": "~7.1.3||~7.2.0",
"magento/framework": "*",
- "magento/module-sales": "*"
+ "magento/module-sales": "*",
+ "magento/module-analytics": "*"
},
"type": "magento2-module",
"license": [
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php b/app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php
index 5802115d44b5e..3e592cf061dfc 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php
@@ -11,7 +11,7 @@
use Magento\Framework\GraphQl\Query\ResolverInterface;
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
use Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface;
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
/**
* Orders data reslover
@@ -24,20 +24,20 @@ class Orders implements ResolverInterface
private $collectionFactory;
/**
- * @var CheckCustomerAccount
+ * @var GetCustomer
*/
- private $checkCustomerAccount;
+ private $getCustomer;
/**
* @param CollectionFactoryInterface $collectionFactory
- * @param CheckCustomerAccount $checkCustomerAccount
+ * @param GetCustomer $getCustomer
*/
public function __construct(
CollectionFactoryInterface $collectionFactory,
- CheckCustomerAccount $checkCustomerAccount
+ GetCustomer $getCustomer
) {
$this->collectionFactory = $collectionFactory;
- $this->checkCustomerAccount = $checkCustomerAccount;
+ $this->getCustomer = $getCustomer;
}
/**
@@ -50,11 +50,10 @@ public function resolve(
array $value = null,
array $args = null
) {
- $customerId = $context->getUserId();
- $this->checkCustomerAccount->execute($customerId, $context->getUserType());
+ $customer = $this->getCustomer->execute($context);
$items = [];
- $orders = $this->collectionFactory->create($customerId);
+ $orders = $this->collectionFactory->create($customer->getId());
/** @var \Magento\Sales\Model\Order $order */
foreach ($orders as $order) {
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
index da05fd98e609b..cfafe110df22b 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
@@ -7,9 +7,13 @@
use Magento\Framework\App\Action\HttpPostActionInterface;
use Magento\SalesRule\Model\CouponGenerator;
+use Magento\Framework\MessageQueue\PublisherInterface;
+use Magento\SalesRule\Api\Data\CouponGenerationSpecInterfaceFactory;
/**
* Generate promo quote
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Generate extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote implements HttpPostActionInterface
{
@@ -18,6 +22,16 @@ class Generate extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote imple
*/
private $couponGenerator;
+ /**
+ * @var PublisherInterface
+ */
+ private $messagePublisher;
+
+ /**
+ * @var CouponGenerationSpecInterfaceFactory
+ */
+ private $generationSpecFactory;
+
/**
* Generate constructor.
* @param \Magento\Backend\App\Action\Context $context
@@ -25,17 +39,27 @@ class Generate extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote imple
* @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
* @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
* @param CouponGenerator|null $couponGenerator
+ * @param PublisherInterface|null $publisher
+ * @param CouponGenerationSpecInterfaceFactory|null $generationSpecFactory
*/
public function __construct(
\Magento\Backend\App\Action\Context $context,
\Magento\Framework\Registry $coreRegistry,
\Magento\Framework\App\Response\Http\FileFactory $fileFactory,
\Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
- CouponGenerator $couponGenerator = null
+ CouponGenerator $couponGenerator = null,
+ PublisherInterface $publisher = null,
+ CouponGenerationSpecInterfaceFactory $generationSpecFactory = null
) {
parent::__construct($context, $coreRegistry, $fileFactory, $dateFilter);
$this->couponGenerator = $couponGenerator ?:
$this->_objectManager->get(CouponGenerator::class);
+ $this->messagePublisher = $publisher ?: \Magento\Framework\App\ObjectManager::getInstance()
+ ->get(PublisherInterface::class);
+ $this->generationSpecFactory = $generationSpecFactory ?:
+ \Magento\Framework\App\ObjectManager::getInstance()->get(
+ CouponGenerationSpecInterfaceFactory::class
+ );
}
/**
@@ -64,9 +88,14 @@ public function execute()
$data = $inputFilter->getUnescaped();
}
- $couponCodes = $this->couponGenerator->generateCodes($data);
- $generated = count($couponCodes);
- $this->messageManager->addSuccessMessage(__('%1 coupon(s) have been generated.', $generated));
+ $data['quantity'] = isset($data['qty']) ? $data['qty'] : null;
+
+ $couponSpec = $this->generationSpecFactory->create(['data' => $data]);
+
+ $this->messagePublisher->publish('sales_rule.codegenerator', $couponSpec);
+ $this->messageManager->addSuccessMessage(
+ __('Message is added to queue, wait to get your coupons soon')
+ );
$this->_view->getLayout()->initMessages();
$result['messages'] = $this->_view->getLayout()->getMessagesBlock()->getGroupedHtml();
} catch (\Magento\Framework\Exception\InputException $inputException) {
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php
index a0238890d98af..50545fd864866 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php
@@ -1,12 +1,16 @@
timezone = $timezone ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
TimezoneInterface::class
);
+ $this->dataPersistor = $dataPersistor ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
+ DataPersistorInterface::class
+ );
}
/**
@@ -73,12 +84,8 @@ public function execute()
$data
);
$data = $inputFilter->getUnescaped();
- $id = $this->getRequest()->getParam('rule_id');
- if ($id) {
- $model->load($id);
- if ($id != $model->getId()) {
- throw new \Magento\Framework\Exception\LocalizedException(__('The wrong rule is specified.'));
- }
+ if (!$this->checkRuleExists($model)) {
+ throw new \Magento\Framework\Exception\LocalizedException(__('The wrong rule is specified.'));
}
$session = $this->_objectManager->get(\Magento\Backend\Model\Session::class);
@@ -89,6 +96,7 @@ public function execute()
$this->messageManager->addErrorMessage($errorMessage);
}
$session->setPageData($data);
+ $this->dataPersistor->set('sale_rule', $data);
$this->_redirect('sales_rule/*/edit', ['id' => $model->getId()]);
return;
}
@@ -147,4 +155,22 @@ public function execute()
}
$this->_redirect('sales_rule/*/');
}
+
+ /**
+ * Check if Cart Price Rule with provided id exists.
+ *
+ * @param \Magento\SalesRule\Model\Rule $model
+ * @return bool
+ */
+ private function checkRuleExists(\Magento\SalesRule\Model\Rule $model): bool
+ {
+ $id = $this->getRequest()->getParam('rule_id');
+ if ($id) {
+ $model->load($id);
+ if ($model->getId() != $id) {
+ return false;
+ }
+ }
+ return true;
+ }
}
diff --git a/app/code/Magento/SalesRule/Model/Coupon/Consumer.php b/app/code/Magento/SalesRule/Model/Coupon/Consumer.php
new file mode 100644
index 0000000000000..2354c72a3e293
--- /dev/null
+++ b/app/code/Magento/SalesRule/Model/Coupon/Consumer.php
@@ -0,0 +1,85 @@
+logger = $logger;
+ $this->couponManager = $couponManager;
+ $this->filesystem = $filesystem;
+ $this->notifier = $notifier;
+ }
+
+ /**
+ * Consumer logic.
+ *
+ * @param CouponGenerationSpecInterface $exportInfo
+ * @return void
+ */
+ public function process(CouponGenerationSpecInterface $exportInfo)
+ {
+ try {
+ $this->couponManager->generate($exportInfo);
+
+ $this->notifier->addMajor(
+ __('Your coupons are ready'),
+ __('You can check your coupons at sales rule page')
+ );
+ } catch (LocalizedException $exception) {
+ $this->notifier->addCritical(
+ __('Error during coupons generator process occurred'),
+ __('Error during coupons generator process occurred. Please check logs for detail')
+ );
+ $this->logger->critical(
+ 'Something went wrong while coupons generator process. ' . $exception->getMessage()
+ );
+ }
+ }
+}
diff --git a/app/code/Magento/SalesRule/Model/Quote/Address/Total/ShippingDiscount.php b/app/code/Magento/SalesRule/Model/Quote/Address/Total/ShippingDiscount.php
new file mode 100644
index 0000000000000..c37ca276e0ee2
--- /dev/null
+++ b/app/code/Magento/SalesRule/Model/Quote/Address/Total/ShippingDiscount.php
@@ -0,0 +1,101 @@
+calculator = $calculator;
+ }
+
+ /**
+ * @inheritdoc
+ *
+ * @param Quote $quote
+ * @param ShippingAssignment $shippingAssignment
+ * @param Total $total
+ * @return ShippingDiscount
+ */
+ public function collect(Quote $quote, ShippingAssignment $shippingAssignment, Total $total): self
+ {
+ parent::collect($quote, $shippingAssignment, $total);
+
+ $address = $shippingAssignment->getShipping()->getAddress();
+ $this->calculator->reset($address);
+
+ $items = $shippingAssignment->getItems();
+ if (!count($items)) {
+ return $this;
+ }
+
+ $address->setShippingDiscountAmount(0);
+ $address->setBaseShippingDiscountAmount(0);
+ if ($address->getShippingAmount()) {
+ $this->calculator->processShippingAmount($address);
+ $total->addTotalAmount(DiscountCollector::COLLECTOR_TYPE_CODE, -$address->getShippingDiscountAmount());
+ $total->addBaseTotalAmount(
+ DiscountCollector::COLLECTOR_TYPE_CODE,
+ -$address->getBaseShippingDiscountAmount()
+ );
+ $total->setShippingDiscountAmount($address->getShippingDiscountAmount());
+ $total->setBaseShippingDiscountAmount($address->getBaseShippingDiscountAmount());
+
+ $this->calculator->prepareDescription($address);
+ $total->setDiscountDescription($address->getDiscountDescription());
+ $total->setSubtotalWithDiscount($total->getSubtotal() + $total->getDiscountAmount());
+ $total->setBaseSubtotalWithDiscount($total->getBaseSubtotal() + $total->getBaseDiscountAmount());
+
+ $address->setDiscountAmount($total->getDiscountAmount());
+ $address->setBaseDiscountAmount($total->getBaseDiscountAmount());
+ }
+
+ return $this;
+ }
+
+ /**
+ * @inheritdoc
+ *
+ * @param \Magento\Quote\Model\Quote $quote
+ * @param \Magento\Quote\Model\Quote\Address\Total $total
+ * @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function fetch(Quote $quote, Total $total): array
+ {
+ $result = [];
+ $amount = $total->getDiscountAmount();
+
+ if ($amount != 0) {
+ $description = $total->getDiscountDescription() ?: '';
+ $result = [
+ 'code' => DiscountCollector::COLLECTOR_TYPE_CODE,
+ 'title' => strlen($description) ? __('Discount (%1)', $description) : __('Discount'),
+ 'value' => $amount
+ ];
+ }
+ return $result;
+ }
+}
diff --git a/app/code/Magento/SalesRule/Model/Quote/Discount.php b/app/code/Magento/SalesRule/Model/Quote/Discount.php
index 693a61b272f66..315ce874513a3 100644
--- a/app/code/Magento/SalesRule/Model/Quote/Discount.php
+++ b/app/code/Magento/SalesRule/Model/Quote/Discount.php
@@ -5,8 +5,13 @@
*/
namespace Magento\SalesRule\Model\Quote;
+/**
+ * Discount totals calculation model.
+ */
class Discount extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
{
+ const COLLECTOR_TYPE_CODE = 'discount';
+
/**
* Discount calculation object
*
@@ -43,7 +48,7 @@ public function __construct(
\Magento\SalesRule\Model\Validator $validator,
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
) {
- $this->setCode('discount');
+ $this->setCode(self::COLLECTOR_TYPE_CODE);
$this->eventManager = $eventManager;
$this->calculator = $validator;
$this->storeManager = $storeManager;
@@ -124,21 +129,14 @@ public function collect(
}
}
- /** Process shipping amount discount */
- $address->setShippingDiscountAmount(0);
- $address->setBaseShippingDiscountAmount(0);
- if ($address->getShippingAmount()) {
- $this->calculator->processShippingAmount($address);
- $total->addTotalAmount($this->getCode(), -$address->getShippingDiscountAmount());
- $total->addBaseTotalAmount($this->getCode(), -$address->getBaseShippingDiscountAmount());
- $total->setShippingDiscountAmount($address->getShippingDiscountAmount());
- $total->setBaseShippingDiscountAmount($address->getBaseShippingDiscountAmount());
- }
-
$this->calculator->prepareDescription($address);
$total->setDiscountDescription($address->getDiscountDescription());
$total->setSubtotalWithDiscount($total->getSubtotal() + $total->getDiscountAmount());
$total->setBaseSubtotalWithDiscount($total->getBaseSubtotal() + $total->getBaseDiscountAmount());
+
+ $address->setDiscountAmount($total->getDiscountAmount());
+ $address->setBaseDiscountAmount($total->getBaseDiscountAmount());
+
return $this;
}
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
index 59f24fa8b6e03..3e7b6ea281501 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
@@ -9,6 +9,9 @@
use Magento\Framework\DB\Select;
use Magento\Framework\Serialize\Serializer\Json;
use Magento\Quote\Model\Quote\Address;
+use Magento\SalesRule\Api\Data\CouponInterface;
+use Magento\SalesRule\Model\Coupon;
+use Magento\SalesRule\Model\Rule;
/**
* Sales Rules resource collection model.
@@ -80,6 +83,8 @@ protected function _construct()
}
/**
+ * Map data for associated entities
+ *
* @param string $entityType
* @param string $objectField
* @throws \Magento\Framework\Exception\LocalizedException
@@ -105,15 +110,20 @@ protected function mapAssociatedEntities($entityType, $objectField)
$associatedEntities = $this->getConnection()->fetchAll($select);
- array_map(function ($associatedEntity) use ($entityInfo, $ruleIdField, $objectField) {
- $item = $this->getItemByColumnValue($ruleIdField, $associatedEntity[$ruleIdField]);
- $itemAssociatedValue = $item->getData($objectField) === null ? [] : $item->getData($objectField);
- $itemAssociatedValue[] = $associatedEntity[$entityInfo['entity_id_field']];
- $item->setData($objectField, $itemAssociatedValue);
- }, $associatedEntities);
+ array_map(
+ function ($associatedEntity) use ($entityInfo, $ruleIdField, $objectField) {
+ $item = $this->getItemByColumnValue($ruleIdField, $associatedEntity[$ruleIdField]);
+ $itemAssociatedValue = $item->getData($objectField) ?? [];
+ $itemAssociatedValue[] = $associatedEntity[$entityInfo['entity_id_field']];
+ $item->setData($objectField, $itemAssociatedValue);
+ },
+ $associatedEntities
+ );
}
/**
+ * Add website ids and customer group ids to rules data
+ *
* @return $this
* @throws \Exception
* @since 100.1.0
@@ -137,6 +147,7 @@ protected function _afterLoad()
* @param string $couponCode
* @param string|null $now
* @param Address $address allow extensions to further filter out rules based on quote address
+ * @throws \Zend_Db_Select_Exception
* @use $this->addWebsiteGroupDateFilter()
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
* @return $this
@@ -149,77 +160,24 @@ public function setValidationFilter(
Address $address = null
) {
if (!$this->getFlag('validation_filter')) {
- /* We need to overwrite joinLeft if coupon is applied */
- $this->getSelect()->reset();
- parent::_initSelect();
+ $this->prepareSelect($websiteId, $customerGroupId, $now);
- $this->addWebsiteGroupDateFilter($websiteId, $customerGroupId, $now);
- $select = $this->getSelect();
+ $noCouponRules = $this->getNoCouponCodeSelect();
- $connection = $this->getConnection();
- if (strlen($couponCode)) {
- $select->joinLeft(
- ['rule_coupons' => $this->getTable('salesrule_coupon')],
- $connection->quoteInto(
- 'main_table.rule_id = rule_coupons.rule_id AND main_table.coupon_type != ?',
- \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON
- ),
- ['code']
- );
-
- $noCouponWhereCondition = $connection->quoteInto(
- 'main_table.coupon_type = ? ',
- \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON
- );
-
- $autoGeneratedCouponCondition = [
- $connection->quoteInto(
- "main_table.coupon_type = ?",
- \Magento\SalesRule\Model\Rule::COUPON_TYPE_AUTO
- ),
- $connection->quoteInto(
- "rule_coupons.type = ?",
- \Magento\SalesRule\Api\Data\CouponInterface::TYPE_GENERATED
- ),
- ];
-
- $orWhereConditions = [
- "(" . implode($autoGeneratedCouponCondition, " AND ") . ")",
- $connection->quoteInto(
- '(main_table.coupon_type = ? AND main_table.use_auto_generation = 1 AND rule_coupons.type = 1)',
- \Magento\SalesRule\Model\Rule::COUPON_TYPE_SPECIFIC
- ),
- $connection->quoteInto(
- '(main_table.coupon_type = ? AND main_table.use_auto_generation = 0 AND rule_coupons.type = 0)',
- \Magento\SalesRule\Model\Rule::COUPON_TYPE_SPECIFIC
- ),
- ];
-
- $andWhereConditions = [
- $connection->quoteInto(
- 'rule_coupons.code = ?',
- $couponCode
- ),
- $connection->quoteInto(
- '(rule_coupons.expiration_date IS NULL OR rule_coupons.expiration_date >= ?)',
- $this->_date->date()->format('Y-m-d')
- ),
- ];
-
- $orWhereCondition = implode(' OR ', $orWhereConditions);
- $andWhereCondition = implode(' AND ', $andWhereConditions);
-
- $select->where(
- $noCouponWhereCondition . ' OR ((' . $orWhereCondition . ') AND ' . $andWhereCondition . ')',
- null,
- Select::TYPE_CONDITION
- );
+ if ($couponCode) {
+ $couponRules = $this->getCouponCodeSelect($couponCode);
+
+ $allAllowedRules = $this->getConnection()->select();
+ $allAllowedRules->union([$noCouponRules, $couponRules], Select::SQL_UNION_ALL);
+
+ $wrapper = $this->getConnection()->select();
+ $wrapper->from($allAllowedRules);
+
+ $this->_select = $wrapper;
} else {
- $this->addFieldToFilter(
- 'main_table.coupon_type',
- \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON
- );
+ $this->_select = $noCouponRules;
}
+
$this->setOrder('sort_order', self::SORT_ORDER_ASC);
$this->setFlag('validation_filter', true);
}
@@ -227,6 +185,101 @@ public function setValidationFilter(
return $this;
}
+ /**
+ * Recreate the default select object for specific needs of salesrule evaluation with coupon codes.
+ *
+ * @param int $websiteId
+ * @param int $customerGroupId
+ * @param string $now
+ */
+ private function prepareSelect($websiteId, $customerGroupId, $now)
+ {
+ $this->getSelect()->reset();
+ parent::_initSelect();
+
+ $this->addWebsiteGroupDateFilter($websiteId, $customerGroupId, $now);
+ }
+
+ /**
+ * Return select object to determine all active rules not needing a coupon code.
+ *
+ * @return Select
+ */
+ private function getNoCouponCodeSelect()
+ {
+ $noCouponSelect = clone $this->getSelect();
+
+ $noCouponSelect->where(
+ 'main_table.coupon_type = ?',
+ Rule::COUPON_TYPE_NO_COUPON
+ );
+
+ $noCouponSelect->columns([Coupon::KEY_CODE => new \Zend_Db_Expr('NULL')]);
+
+ return $noCouponSelect;
+ }
+
+ /**
+ * Determine all active rules that are valid for the given coupon code.
+ *
+ * @param string $couponCode
+ * @return Select
+ */
+ private function getCouponCodeSelect($couponCode)
+ {
+ $couponSelect = clone $this->getSelect();
+
+ $this->joinCouponTable($couponCode, $couponSelect);
+
+ $notExpired = $this->getConnection()->quoteInto(
+ '(rule_coupons.expiration_date IS NULL OR rule_coupons.expiration_date >= ?)',
+ $this->_date->date()->format('Y-m-d')
+ );
+
+ $isAutogenerated =
+ $this->getConnection()->quoteInto('main_table.coupon_type = ?', Rule::COUPON_TYPE_AUTO)
+ . ' AND ' .
+ $this->getConnection()->quoteInto('rule_coupons.type = ?', CouponInterface::TYPE_GENERATED);
+
+ $isValidSpecific =
+ $this->getConnection()->quoteInto('(main_table.coupon_type = ?)', Rule::COUPON_TYPE_SPECIFIC)
+ . ' AND (' .
+ '(main_table.use_auto_generation = 1 AND rule_coupons.type = 1)'
+ . ' OR ' .
+ '(main_table.use_auto_generation = 0 AND rule_coupons.type = 0)'
+ . ')';
+
+ $couponSelect->where(
+ "$notExpired AND ($isAutogenerated OR $isValidSpecific)",
+ null,
+ Select::TYPE_CONDITION
+ );
+
+ return $couponSelect;
+ }
+
+ /**
+ * Join coupong table to select.
+ *
+ * @param string $couponCode
+ * @param Select $couponSelect
+ */
+ private function joinCouponTable($couponCode, Select $couponSelect)
+ {
+ $couponJoinCondition =
+ 'main_table.rule_id = rule_coupons.rule_id'
+ . ' AND ' .
+ $this->getConnection()->quoteInto('main_table.coupon_type <> ?', Rule::COUPON_TYPE_NO_COUPON)
+ . ' AND ' .
+ $this->getConnection()->quoteInto('rule_coupons.code = ?', $couponCode);
+
+ $couponSelect->joinInner(
+ ['rule_coupons' => $this->getTable('salesrule_coupon')],
+ $couponJoinCondition,
+ [Coupon::KEY_CODE]
+ );
+ }
+
/**
* Filter collection by website(s), customer group(s) and date.
* Filter collection to only active rules.
@@ -366,6 +419,8 @@ public function addCustomerGroupFilter($customerGroupId)
}
/**
+ * Getter for _associatedEntitiesMap property
+ *
* @return array
* @deprecated 100.1.0
*/
@@ -380,6 +435,8 @@ private function getAssociatedEntitiesMap()
}
/**
+ * Getter for dateApplier property
+ *
* @return DateApplier
* @deprecated 100.1.0
*/
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
index 89ec2b84572fc..cf6301cb31a9c 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
@@ -61,6 +61,7 @@ public function __construct(
public function loadAttributeOptions()
{
$attributes = [
+ 'base_subtotal_with_discount' => __('Subtotal (Excl. Tax)'),
'base_subtotal' => __('Subtotal'),
'total_qty' => __('Total Items Quantity'),
'weight' => __('Total Weight'),
diff --git a/app/code/Magento/SalesRule/Model/Rule/DataProvider.php b/app/code/Magento/SalesRule/Model/Rule/DataProvider.php
index 916825776373d..25f0ef91eae68 100644
--- a/app/code/Magento/SalesRule/Model/Rule/DataProvider.php
+++ b/app/code/Magento/SalesRule/Model/Rule/DataProvider.php
@@ -5,6 +5,7 @@
*/
namespace Magento\SalesRule\Model\Rule;
+use Magento\Framework\App\Request\DataPersistorInterface;
use Magento\SalesRule\Model\ResourceModel\Rule\Collection;
use Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory;
use Magento\SalesRule\Model\Rule;
@@ -36,6 +37,11 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
*/
protected $metadataValueProvider;
+ /**
+ * @var DataPersistorInterface
+ */
+ private $dataPersistor;
+
/**
* Initialize dependencies.
*
@@ -47,6 +53,7 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
* @param Metadata\ValueProvider $metadataValueProvider
* @param array $meta
* @param array $data
+ * @param DataPersistorInterface $dataPersistor
*/
public function __construct(
$name,
@@ -56,12 +63,16 @@ public function __construct(
\Magento\Framework\Registry $registry,
\Magento\SalesRule\Model\Rule\Metadata\ValueProvider $metadataValueProvider,
array $meta = [],
- array $data = []
+ array $data = [],
+ DataPersistorInterface $dataPersistor = null
) {
$this->collection = $collectionFactory->create();
$this->coreRegistry = $registry;
$this->metadataValueProvider = $metadataValueProvider;
$meta = array_replace_recursive($this->getMetadataValues(), $meta);
+ $this->dataPersistor = $dataPersistor ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
+ DataPersistorInterface::class
+ );
parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
}
@@ -77,7 +88,7 @@ protected function getMetadataValues()
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function getData()
{
@@ -93,6 +104,13 @@ public function getData()
$this->loadedData[$rule->getId()] = $rule->getData();
}
+ $data = $this->dataPersistor->get('sale_rule');
+ if (!empty($data)) {
+ $rule = $this->collection->getNewEmptyItem();
+ $rule->setData($data);
+ $this->loadedData[$rule->getId()] = $rule->getData();
+ $this->dataPersistor->clear('sale_rule');
+ }
return $this->loadedData;
}
diff --git a/app/code/Magento/SalesRule/Model/Validator.php b/app/code/Magento/SalesRule/Model/Validator.php
index 5c0f97ae0b08b..ea0221d8f072d 100644
--- a/app/code/Magento/SalesRule/Model/Validator.php
+++ b/app/code/Magento/SalesRule/Model/Validator.php
@@ -182,6 +182,8 @@ protected function _getRules(Address $address = null)
}
/**
+ * Address id getter.
+ *
* @param Address $address
* @return string
*/
@@ -327,21 +329,7 @@ public function processShippingAmount(Address $address)
$baseDiscountAmount = $rule->getDiscountAmount();
break;
case \Magento\SalesRule\Model\Rule::CART_FIXED_ACTION:
- $cartRules = $address->getCartFixedRules();
- if (!isset($cartRules[$rule->getId()])) {
- $cartRules[$rule->getId()] = $rule->getDiscountAmount();
- }
- if ($cartRules[$rule->getId()] > 0) {
- $quoteAmount = $this->priceCurrency->convert($cartRules[$rule->getId()], $quote->getStore());
- $discountAmount = min($shippingAmount - $address->getShippingDiscountAmount(), $quoteAmount);
- $baseDiscountAmount = min(
- $baseShippingAmount - $address->getBaseShippingDiscountAmount(),
- $cartRules[$rule->getId()]
- );
- $cartRules[$rule->getId()] -= $baseDiscountAmount;
- }
-
- $address->setCartFixedRules($cartRules);
+ // Shouldn't be proceed according to MAGETWO-96403
break;
}
@@ -519,6 +507,8 @@ public function sortItemsByPriority($items, Address $address = null)
}
/**
+ * Rule total items getter.
+ *
* @param int $key
* @return array
* @throws \Magento\Framework\Exception\LocalizedException
@@ -533,6 +523,8 @@ public function getRuleItemTotalsInfo($key)
}
/**
+ * Decrease rule items count.
+ *
* @param int $key
* @return $this
*/
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml
index e5907e1e9c0f5..210259f474ee9 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml
@@ -38,4 +38,27 @@
| diff --git a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html index d0b12549bd66d..e5d73a62b329e 100644 --- a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html +++ b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html @@ -58,7 +58,7 @@ |
+
+
- |
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
index 68f1886986c5b..385110f8f037e 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
@@ -49,7 +49,7 @@ {{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship |
|
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
index 1e4a92fa0701f..1be46c8239ee2 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
@@ -343,16 +343,22 @@
}
.product-item-name {
- display: inline-block;
+ float: left;
+ width: calc(100% - 20px);
+ }
+ .product-item::after {
+ clear: both;
+ content: '';
+ display: table;
}
-
.product-item {
.label {
&:extend(.abs-visually-hidden all);
}
.field.item {
- display: inline-block;
+ float: left;
+ width: 20px;
}
}
}
@@ -392,6 +398,17 @@
&.orders-recent {
&:extend(.abs-account-table-margin-mobile all);
&:extend(.abs-no-border-top all);
+ .table-order-items {
+ &.table {
+ tbody {
+ > tr {
+ > td.col {
+ padding-left: 0;
+ }
+ }
+ }
+ }
+ }
}
}
@@ -555,13 +572,13 @@
margin: 0 @tab-control__margin-right 0 0;
a {
- padding: @tab-control__padding-top @tab-control__padding-right;
+ padding: @tab-control__padding-top @indent__base;
}
strong {
border-bottom: 0;
margin-bottom: -1px;
- padding: @tab-control__padding-top @tab-control__padding-right @tab-control__padding-bottom + 1 @tab-control__padding-left;
+ padding: @tab-control__padding-top @indent__base @tab-control__padding-bottom + 1 @indent__base;
}
}
}
@@ -687,3 +704,19 @@
}
}
}
+
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__l) {
+ .order-links {
+ .item {
+ margin: 0 @tab-control__margin-right 0 0;
+
+ a {
+ padding: @tab-control__padding-top @tab-control__padding-right;
+ }
+
+ strong {
+ padding: @tab-control__padding-top @tab-control__padding-right @tab-control__padding-bottom + 1 @tab-control__padding-left;
+ }
+ }
+ }
+}
diff --git a/app/design/frontend/Magento/luma/Magento_SendFriend/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_SendFriend/web/css/source/_module.less
index baf5468b18485..3435736a54a6a 100644
--- a/app/design/frontend/Magento/luma/Magento_SendFriend/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_SendFriend/web/css/source/_module.less
@@ -10,6 +10,14 @@
& when (@media-common = true) {
.form.send.friend {
&:extend(.abs-add-fields all);
+
+ .fieldset {
+ .field {
+ .control {
+ width: 100%;
+ }
+ }
+ }
}
.product-social-links .action.mailto.friend {
@@ -44,3 +52,18 @@
}
}
}
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
+ .form.send.friend {
+ .fieldset {
+ padding-bottom: @indent__xs;
+ }
+
+ .action {
+ &.remove {
+ margin-left: 0;
+ right: 0;
+ top: 100%;
+ }
+ }
+ }
+}
diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
index 32bb22a632177..1f1ea93d0b54a 100644
--- a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
@@ -77,6 +77,14 @@
.lib-vendor-prefix-flex-grow(1);
}
+ .page-main {
+ > .page-title-wrapper {
+ .page-title {
+ word-break: break-all;
+ }
+ }
+ }
+
//
// Header
// ---------------------------------------------
@@ -445,7 +453,7 @@
}
}
-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
.logo {
margin-bottom: 13px;
margin-top: 4px;
@@ -458,7 +466,7 @@
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
.cms-page-view .page-main {
- padding-top: 41px;
+ padding-top: 0;
position: relative;
}
}
diff --git a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
index 3658902feb3a6..85e8aeb0b515c 100644
--- a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
@@ -182,6 +182,30 @@
}
}
}
+ .products-grid.wishlist {
+ .product-item-actions {
+ .action {
+ &.edit,
+ &.delete {
+ .lib-icon-font(
+ @icon-edit,
+ @_icon-font-size: 18px,
+ @_icon-font-line-height: 20px,
+ @_icon-font-text-hide: true,
+ @_icon-font-color: @minicart-icons-color,
+ @_icon-font-color-hover: @primary__color,
+ @_icon-font-color-active: @minicart-icons-color
+ );
+ }
+
+ &.delete {
+ .lib-icon-font-symbol(
+ @_icon-font-content: @icon-trash
+ );
+ }
+ }
+ }
+ }
}
//
@@ -229,15 +253,7 @@
&:last-child {
margin-right: 0;
}
-
- &.edit {
- float: left;
- }
-
- &.delete {
- float: right;
- }
-
+
&.edit,
&.delete {
margin-top: 7px;
@@ -379,9 +395,7 @@
width: auto;
}
}
-}
-.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
.wishlist-index-index {
.product-item-inner {
@_shadow: 3px 4px 4px 0 rgba(0, 0, 0, .3);
diff --git a/app/design/frontend/Magento/luma/etc/view.xml b/app/design/frontend/Magento/luma/etc/view.xml
index 55d43272caad9..7aa2e51481bd9 100644
--- a/app/design/frontend/Magento/luma/etc/view.xml
+++ b/app/design/frontend/Magento/luma/etc/view.xml
@@ -256,7 +256,7 @@
166
370
- 0
+ 1
|