diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php
index ff53299b00e33..e910a5c8be4cd 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php
@@ -7,7 +7,7 @@
namespace Magento\CatalogGraphQl\Model\Resolver;
-use Magento\CatalogGraphQl\Model\Resolver\Layer\DataProvider\Filters;
+use Magento\Framework\Exception\InputException;
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
use Magento\CatalogGraphQl\Model\Resolver\Products\Query\Filter;
use Magento\CatalogGraphQl\Model\Resolver\Products\Query\Search;
@@ -17,6 +17,7 @@
use Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria\SearchFilter;
use Magento\Framework\GraphQl\Query\ResolverInterface;
use Magento\Catalog\Model\Layer\Resolver;
+use Magento\Framework\Api\Search\SearchCriteriaInterface;
/**
* Products field resolver, used for GraphQL request processing.
@@ -81,10 +82,10 @@ public function resolve(
} elseif (isset($args['search'])) {
$layerType = Resolver::CATALOG_LAYER_SEARCH;
$this->searchFilter->add($args['search'], $searchCriteria);
- $searchResult = $this->searchQuery->getResult($searchCriteria, $info);
+ $searchResult = $this->getSearchResult($this->searchQuery, $searchCriteria, $info);
} else {
$layerType = Resolver::CATALOG_LAYER_CATEGORY;
- $searchResult = $this->filterQuery->getResult($searchCriteria, $info);
+ $searchResult = $this->getSearchResult($this->filterQuery, $searchCriteria, $info);
}
//possible division by 0
if ($searchCriteria->getPageSize()) {
@@ -116,4 +117,25 @@ public function resolve(
return $data;
}
+
+ /**
+ * Get search result.
+ *
+ * @param Filter|Search $query
+ * @param SearchCriteriaInterface $searchCriteria
+ * @param ResolveInfo $info
+ *
+ * @return \Magento\CatalogGraphQl\Model\Resolver\Products\SearchResult
+ * @throws GraphQlInputException
+ */
+ private function getSearchResult($query, SearchCriteriaInterface $searchCriteria, ResolveInfo $info)
+ {
+ try {
+ $searchResult = $query->getResult($searchCriteria, $info);
+ } catch (InputException $e) {
+ throw new GraphQlInputException(__($e->getMessage()));
+ }
+
+ return $searchResult;
+ }
}
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php b/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
index 7e6ada724a81a..3ac7f98818d70 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
@@ -180,9 +180,9 @@ public function move($fileName, $renameFileOff = false)
}
$fileName = preg_replace('/[^a-z0-9\._-]+/i', '', $fileName);
- $filePath = $this->_directory->getRelativePath($filePath . $fileName);
+ $relativePath = $this->_directory->getRelativePath($filePath . $fileName);
$this->_directory->writeFile(
- $filePath,
+ $relativePath,
$read->readAll()
);
}
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php b/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php
index 5d93e6f216866..6b7c12dfdf463 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php
@@ -10,6 +10,9 @@
use Magento\Framework\DataObject\IdentityInterface;
use Magento\Framework\Indexer\CacheContext;
+/**
+ * Abstract class for CatalogRule indexers.
+ */
abstract class AbstractIndexer implements IndexerActionInterface, MviewActionInterface, IdentityInterface
{
/**
@@ -66,7 +69,6 @@ public function executeFull()
{
$this->indexBuilder->reindexFull();
$this->_eventManager->dispatch('clean_cache_by_tags', ['object' => $this]);
- //TODO: remove after fix fpc. MAGETWO-50668
$this->getCacheManager()->clean($this->getIdentities());
}
@@ -137,8 +139,9 @@ public function executeRow($id)
abstract protected function doExecuteRow($id);
/**
- * @return \Magento\Framework\App\CacheInterface|mixed
+ * Get cache manager
*
+ * @return \Magento\Framework\App\CacheInterface|mixed
* @deprecated 100.0.7
*/
private function getCacheManager()
diff --git a/app/code/Magento/CatalogRule/etc/db_schema.xml b/app/code/Magento/CatalogRule/etc/db_schema.xml
index 6f7d713e49fe3..894f057ba73d1 100644
--- a/app/code/Magento/CatalogRule/etc/db_schema.xml
+++ b/app/code/Magento/CatalogRule/etc/db_schema.xml
@@ -23,7 +23,7 @@
-
@@ -49,7 +49,7 @@
default="0" comment="Product Id"/>
-
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php
index 49caede8c4ac2..93ae2c94e2105 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php
@@ -110,7 +110,9 @@ public function processAttributeValue($attribute, $value)
&& in_array($attribute->getFrontendInput(), ['text', 'textarea'])
) {
$result = $value;
- } elseif ($this->isTermFilterableAttribute($attribute)) {
+ } elseif ($this->isTermFilterableAttribute($attribute)
+ || ($attribute->getIsSearchable() && in_array($attribute->getFrontendInput(), ['select', 'multiselect']))
+ ) {
$result = '';
}
@@ -119,6 +121,7 @@ public function processAttributeValue($attribute, $value)
/**
* Prepare index array as a string glued by separator
+ *
* Support 2 level array gluing
*
* @param array $index
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php
index 5d7e323e8b2d8..3cfd49b1d210a 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php
@@ -100,16 +100,19 @@ public function execute(\Magento\Framework\Event\Observer $observer)
}
$mapsGenerated = false;
- if ($category->dataHasChangedFor('url_key')
- || $category->dataHasChangedFor('is_anchor')
- || !empty($category->getChangedProductIds())
- ) {
+ if ($this->isCategoryHasChanged($category)) {
if ($category->dataHasChangedFor('url_key')) {
$categoryUrlRewriteResult = $this->categoryUrlRewriteGenerator->generate($category);
$this->urlRewriteBunchReplacer->doBunchReplace($categoryUrlRewriteResult);
}
- $productUrlRewriteResult = $this->urlRewriteHandler->generateProductUrlRewrites($category);
- $this->urlRewriteBunchReplacer->doBunchReplace($productUrlRewriteResult);
+ if ($this->isChangedOnlyProduct($category)) {
+ $productUrlRewriteResult =
+ $this->urlRewriteHandler->updateProductUrlRewritesForChangedProduct($category);
+ $this->urlRewriteBunchReplacer->doBunchReplace($productUrlRewriteResult);
+ } else {
+ $productUrlRewriteResult = $this->urlRewriteHandler->generateProductUrlRewrites($category);
+ $this->urlRewriteBunchReplacer->doBunchReplace($productUrlRewriteResult);
+ }
$mapsGenerated = true;
}
@@ -119,6 +122,38 @@ public function execute(\Magento\Framework\Event\Observer $observer)
}
}
+ /**
+ * Check is category changed changed.
+ *
+ * @param Category $category
+ * @return bool
+ */
+ private function isCategoryHasChanged(Category $category): bool
+ {
+ if ($category->dataHasChangedFor('url_key')
+ || $category->dataHasChangedFor('is_anchor')
+ || !empty($category->getChangedProductIds())) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Check is only product changed.
+ *
+ * @param Category $category
+ * @return bool
+ */
+ private function isChangedOnlyProduct(Category $category): bool
+ {
+ if (!empty($category->getChangedProductIds())
+ && !$category->dataHasChangedFor('is_anchor')
+ && !$category->dataHasChangedFor('url_key')) {
+ return true;
+ }
+ return false;
+ }
+
/**
* In case store_id is not set for category then we can assume that it was passed through product import.
* Store group must have only one root category, so receiving category's path and checking if one of it parts
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
index c4ec0bb3a74b2..b4a35f323e1bc 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
@@ -24,6 +24,8 @@
use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
/**
+ * Class for management url rewrites.
+ *
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class UrlRewriteHandler
@@ -156,6 +158,30 @@ public function generateProductUrlRewrites(Category $category): array
}
/**
+ * Update product url rewrites for changed product.
+ *
+ * @param Category $category
+ * @return array
+ */
+ public function updateProductUrlRewritesForChangedProduct(Category $category): array
+ {
+ $mergeDataProvider = clone $this->mergeDataProviderPrototype;
+ $this->isSkippedProduct[$category->getEntityId()] = [];
+ $saveRewriteHistory = (bool)$category->getData('save_rewrites_history');
+ $storeIds = $this->getCategoryStoreIds($category);
+
+ if ($category->getChangedProductIds()) {
+ foreach ($storeIds as $storeId) {
+ $this->generateChangedProductUrls($mergeDataProvider, $category, (int)$storeId, $saveRewriteHistory);
+ }
+ }
+
+ return $mergeDataProvider->getData();
+ }
+
+ /**
+ * Delete category rewrites for children.
+ *
* @param Category $category
* @return void
*/
@@ -184,6 +210,8 @@ public function deleteCategoryRewritesForChildren(Category $category)
}
/**
+ * Get category products url rewrites.
+ *
* @param Category $category
* @param int $storeId
* @param bool $saveRewriteHistory
diff --git a/app/code/Magento/Checkout/Block/Onepage.php b/app/code/Magento/Checkout/Block/Onepage.php
index ca6b045ddbb5d..e01d5835b4cf0 100644
--- a/app/code/Magento/Checkout/Block/Onepage.php
+++ b/app/code/Magento/Checkout/Block/Onepage.php
@@ -38,7 +38,7 @@ class Onepage extends \Magento\Framework\View\Element\Template
protected $layoutProcessors;
/**
- * @var \Magento\Framework\Serialize\Serializer\Json
+ * @var \Magento\Framework\Serialize\SerializerInterface
*/
private $serializer;
@@ -48,8 +48,9 @@ class Onepage extends \Magento\Framework\View\Element\Template
* @param \Magento\Checkout\Model\CompositeConfigProvider $configProvider
* @param array $layoutProcessors
* @param array $data
- * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
- * @throws \RuntimeException
+ * @param \Magento\Framework\Serialize\Serializer\Json $serializer
+ * @param \Magento\Framework\Serialize\SerializerInterface $serializerInterface
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function __construct(
\Magento\Framework\View\Element\Template\Context $context,
@@ -57,7 +58,8 @@ public function __construct(
\Magento\Checkout\Model\CompositeConfigProvider $configProvider,
array $layoutProcessors = [],
array $data = [],
- \Magento\Framework\Serialize\Serializer\Json $serializer = null
+ \Magento\Framework\Serialize\Serializer\Json $serializer = null,
+ \Magento\Framework\Serialize\SerializerInterface $serializerInterface = null
) {
parent::__construct($context, $data);
$this->formKey = $formKey;
@@ -65,12 +67,12 @@ public function __construct(
$this->jsLayout = isset($data['jsLayout']) && is_array($data['jsLayout']) ? $data['jsLayout'] : [];
$this->configProvider = $configProvider;
$this->layoutProcessors = $layoutProcessors;
- $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
- ->get(\Magento\Framework\Serialize\Serializer\Json::class);
+ $this->serializer = $serializerInterface ?: \Magento\Framework\App\ObjectManager::getInstance()
+ ->get(\Magento\Framework\Serialize\Serializer\JsonHexTag::class);
}
/**
- * @return string
+ * @inheritdoc
*/
public function getJsLayout()
{
@@ -78,7 +80,7 @@ public function getJsLayout()
$this->jsLayout = $processor->process($this->jsLayout);
}
- return json_encode($this->jsLayout, JSON_HEX_TAG);
+ return $this->serializer->serialize($this->jsLayout);
}
/**
@@ -115,11 +117,13 @@ public function getBaseUrl()
}
/**
+ * Retrieve serialized checkout config.
+ *
* @return bool|string
* @since 100.2.0
*/
public function getSerializedCheckoutConfig()
{
- return json_encode($this->getCheckoutConfig(), JSON_HEX_TAG);
+ return $this->serializer->serialize($this->getCheckoutConfig());
}
}
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
index ab82d9fdd93b5..0d3c6e419cc07 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
@@ -31,5 +31,6 @@
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml
index 34819f641cbc9..bc65f8a2c0816 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml
@@ -16,6 +16,7 @@
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml
new file mode 100644
index 0000000000000..aa90b7c1b54db
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
index cc5e723c72ea0..8537e10ce5a03 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
@@ -79,8 +79,12 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
index 54f77c95148ac..b54339aa2c1d8 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
@@ -35,7 +35,7 @@ class OnepageTest extends \PHPUnit\Framework\TestCase
/**
* @var \PHPUnit_Framework_MockObject_MockObject
*/
- private $serializer;
+ private $serializerMock;
protected function setUp()
{
@@ -49,7 +49,7 @@ protected function setUp()
\Magento\Checkout\Block\Checkout\LayoutProcessorInterface::class
);
- $this->serializer = $this->createMock(\Magento\Framework\Serialize\Serializer\Json::class);
+ $this->serializerMock = $this->createMock(\Magento\Framework\Serialize\Serializer\JsonHexTag::class);
$this->model = new \Magento\Checkout\Block\Onepage(
$contextMock,
@@ -57,7 +57,8 @@ protected function setUp()
$this->configProviderMock,
[$this->layoutProcessorMock],
[],
- $this->serializer
+ $this->serializerMock,
+ $this->serializerMock
);
}
@@ -93,6 +94,7 @@ public function testGetJsLayout()
$processedLayout = ['layout' => ['processed' => true]];
$jsonLayout = '{"layout":{"processed":true}}';
$this->layoutProcessorMock->expects($this->once())->method('process')->with([])->willReturn($processedLayout);
+ $this->serializerMock->expects($this->once())->method('serialize')->willReturn($jsonLayout);
$this->assertEquals($jsonLayout, $this->model->getJsLayout());
}
@@ -101,6 +103,7 @@ public function testGetSerializedCheckoutConfig()
{
$checkoutConfig = ['checkout', 'config'];
$this->configProviderMock->expects($this->once())->method('getConfig')->willReturn($checkoutConfig);
+ $this->serializerMock->expects($this->once())->method('serialize')->willReturn(json_encode($checkoutConfig));
$this->assertEquals(json_encode($checkoutConfig), $this->model->getSerializedCheckoutConfig());
}
diff --git a/app/code/Magento/Checkout/etc/frontend/di.xml b/app/code/Magento/Checkout/etc/frontend/di.xml
index d80f88786c87b..00bcd2a27005a 100644
--- a/app/code/Magento/Checkout/etc/frontend/di.xml
+++ b/app/code/Magento/Checkout/etc/frontend/di.xml
@@ -59,6 +59,7 @@
- Magento\Checkout\Block\Checkout\TotalsProcessor
- Magento\Checkout\Block\Checkout\DirectoryDataProcessor
+ Magento\Framework\Serialize\Serializer\JsonHexTag
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js b/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js
index 22b37b2da0b2f..1858ce946fb07 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js
@@ -10,7 +10,8 @@
*/
define([
'jquery',
- 'Magento_Customer/js/customer-data'
+ 'Magento_Customer/js/customer-data',
+ 'jquery/jquery-storageapi'
], function ($, storage) {
'use strict';
@@ -23,6 +24,22 @@ define([
storage.set(cacheKey, data);
},
+ /**
+ * @return {*}
+ */
+ initData = function () {
+ return {
+ 'selectedShippingAddress': null, //Selected shipping address pulled from persistence storage
+ 'shippingAddressFromData': null, //Shipping address pulled from persistence storage
+ 'newCustomerShippingAddress': null, //Shipping address pulled from persistence storage for customer
+ 'selectedShippingRate': null, //Shipping rate pulled from persistence storage
+ 'selectedPaymentMethod': null, //Payment method pulled from persistence storage
+ 'selectedBillingAddress': null, //Selected billing address pulled from persistence storage
+ 'billingAddressFromData': null, //Billing address pulled from persistence storage
+ 'newCustomerBillingAddress': null //Billing address pulled from persistence storage for new customer
+ };
+ },
+
/**
* @return {*}
*/
@@ -30,17 +47,12 @@ define([
var data = storage.get(cacheKey)();
if ($.isEmptyObject(data)) {
- data = {
- 'selectedShippingAddress': null, //Selected shipping address pulled from persistence storage
- 'shippingAddressFromData': null, //Shipping address pulled from persistence storage
- 'newCustomerShippingAddress': null, //Shipping address pulled from persistence storage for customer
- 'selectedShippingRate': null, //Shipping rate pulled from persistence storage
- 'selectedPaymentMethod': null, //Payment method pulled from persistence storage
- 'selectedBillingAddress': null, //Selected billing address pulled from persistence storage
- 'billingAddressFromData': null, //Billing address pulled from persistence storage
- 'newCustomerBillingAddress': null //Billing address pulled from persistence storage for new customer
- };
- saveData(data);
+ data = $.initNamespaceStorage('mage-cache-storage').localStorage.get(cacheKey);
+
+ if ($.isEmptyObject(data)) {
+ data = initData();
+ saveData(data);
+ }
}
return data;
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
index dde1ad72ba15e..e66c66006246c 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
@@ -25,6 +25,7 @@ define([
}
},
scrollHeight: 0,
+ shoppingCartUrl: window.checkout.shoppingCartUrl,
/**
* Create sidebar.
@@ -227,6 +228,10 @@ define([
if (!_.isUndefined(productData)) {
$(document).trigger('ajax:updateCartItemQty');
+
+ if (window.location.href === this.shoppingCartUrl) {
+ window.location.reload(false);
+ }
}
this._hideItemButton(elem);
},
diff --git a/app/code/Magento/Config/Block/System/Config/Form.php b/app/code/Magento/Config/Block/System/Config/Form.php
index 81e39a83296d7..2a29fa33feb74 100644
--- a/app/code/Magento/Config/Block/System/Config/Form.php
+++ b/app/code/Magento/Config/Block/System/Config/Form.php
@@ -134,6 +134,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
* @param \Magento\Config\Block\System\Config\Form\Fieldset\Factory $fieldsetFactory
* @param \Magento\Config\Block\System\Config\Form\Field\Factory $fieldFactory
* @param array $data
+ * @param SettingChecker|null $settingChecker
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
@@ -143,13 +144,15 @@ public function __construct(
\Magento\Config\Model\Config\Structure $configStructure,
\Magento\Config\Block\System\Config\Form\Fieldset\Factory $fieldsetFactory,
\Magento\Config\Block\System\Config\Form\Field\Factory $fieldFactory,
- array $data = []
+ array $data = [],
+ SettingChecker $settingChecker = null
) {
parent::__construct($context, $registry, $formFactory, $data);
$this->_configFactory = $configFactory;
$this->_configStructure = $configStructure;
$this->_fieldsetFactory = $fieldsetFactory;
$this->_fieldFactory = $fieldFactory;
+ $this->settingChecker = $settingChecker ?: ObjectManager::getInstance()->get(SettingChecker::class);
$this->_scopeLabels = [
self::SCOPE_DEFAULT => __('[GLOBAL]'),
@@ -158,18 +161,6 @@ public function __construct(
];
}
- /**
- * @deprecated 100.1.2
- * @return SettingChecker
- */
- private function getSettingChecker()
- {
- if ($this->settingChecker === null) {
- $this->settingChecker = ObjectManager::getInstance()->get(SettingChecker::class);
- }
- return $this->settingChecker;
- }
-
/**
* Initialize objects required to render config form
*
@@ -366,9 +357,8 @@ protected function _initElement(
$sharedClass = $this->_getSharedCssClass($field);
$requiresClass = $this->_getRequiresCssClass($field, $fieldPrefix);
+ $isReadOnly = $this->isReadOnly($field, $path);
- $isReadOnly = $this->getElementVisibility()->isDisabled($field->getPath())
- ?: $this->getSettingChecker()->isReadOnly($path, $this->getScope(), $this->getStringScopeCode());
$formField = $fieldset->addField(
$elementId,
$field->getType(),
@@ -417,7 +407,7 @@ private function getFieldData(\Magento\Config\Model\Config\Structure\Element\Fie
{
$data = $this->getAppConfigDataValue($path);
- $placeholderValue = $this->getSettingChecker()->getPlaceholderValue(
+ $placeholderValue = $this->settingChecker->getPlaceholderValue(
$path,
$this->getScope(),
$this->getStringScopeCode()
@@ -541,7 +531,7 @@ public function getConfigValue($path)
}
/**
- * @return \Magento\Backend\Block\Widget\Form|\Magento\Framework\View\Element\AbstractBlock
+ * @inheritdoc
*/
protected function _beforeToHtml()
{
@@ -718,6 +708,7 @@ protected function _getAdditionalElementTypes()
*
* @TODO delete this methods when {^see above^} is done
* @return string
+ * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
*/
public function getSectionCode()
{
@@ -729,6 +720,7 @@ public function getSectionCode()
*
* @TODO delete this methods when {^see above^} is done
* @return string
+ * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
*/
public function getWebsiteCode()
{
@@ -740,6 +732,7 @@ public function getWebsiteCode()
*
* @TODO delete this methods when {^see above^} is done
* @return string
+ * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
*/
public function getStoreCode()
{
@@ -797,6 +790,26 @@ private function getAppConfig()
return $this->appConfig;
}
+ /**
+ * Check Path is Readonly
+ *
+ * @param \Magento\Config\Model\Config\Structure\Element\Field $field
+ * @param string $path
+ * @return boolean
+ */
+ private function isReadOnly(\Magento\Config\Model\Config\Structure\Element\Field $field, $path)
+ {
+ $isReadOnly = $this->settingChecker->isReadOnly(
+ $path,
+ ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+ );
+ if (!$isReadOnly) {
+ $isReadOnly = $this->getElementVisibility()->isDisabled($field->getPath())
+ ?: $this->settingChecker->isReadOnly($path, $this->getScope(), $this->getStringScopeCode());
+ }
+ return $isReadOnly;
+ }
+
/**
* Retrieve deployment config data value by path
*
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php
index 93650dd62657c..4e260b0fb2bb1 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php
@@ -102,6 +102,9 @@ protected function setUp()
\Magento\Config\Block\System\Config\Form\Fieldset\Factory::class
);
$this->_fieldFactoryMock = $this->createMock(\Magento\Config\Block\System\Config\Form\Field\Factory::class);
+ $settingCheckerMock = $this->getMockBuilder(SettingChecker::class)
+ ->disableOriginalConstructor()
+ ->getMock();
$this->_coreConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
$this->_backendConfigMock = $this->createMock(\Magento\Config\Model\Config::class);
@@ -153,6 +156,7 @@ protected function setUp()
'fieldsetFactory' => $this->_fieldsetFactoryMock,
'fieldFactory' => $this->_fieldFactoryMock,
'context' => $context,
+ 'settingChecker' => $settingCheckerMock,
];
$objectArguments = $helper->getConstructArguments(\Magento\Config\Block\System\Config\Form::class, $data);
@@ -532,7 +536,7 @@ public function testInitFields(
$elementVisibilityMock = $this->getMockBuilder(ElementVisibilityInterface::class)
->getMockForAbstractClass();
- $elementVisibilityMock->expects($this->once())
+ $elementVisibilityMock->expects($this->any())
->method('isDisabled')
->willReturn($isDisabled);
diff --git a/app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtender.php b/app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtender.php
new file mode 100644
index 0000000000000..92b7ab0d88ea8
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtender.php
@@ -0,0 +1,48 @@
+configurableType = $configurableType;
+ }
+
+ /**
+ * Add child identities to product identities
+ *
+ * @param Product $subject
+ * @param array $identities
+ * @return array
+ */
+ public function afterGetIdentities(Product $subject, array $identities): array
+ {
+ foreach ($this->configurableType->getChildrenIds($subject->getId()) as $childIds) {
+ foreach ($childIds as $childId) {
+ $identities[] = Product::CACHE_TAG . '_' . $childId;
+ }
+ }
+
+ return array_unique($identities);
+ }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Plugin/SalesRule/Model/Rule/Condition/Product.php b/app/code/Magento/ConfigurableProduct/Plugin/SalesRule/Model/Rule/Condition/Product.php
new file mode 100644
index 0000000000000..1ed4432347b7a
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Plugin/SalesRule/Model/Rule/Condition/Product.php
@@ -0,0 +1,69 @@
+getProductToValidate($subject, $model);
+ if ($model->getProduct() !== $product) {
+ // We need to replace product only for validation and keep original product for all other cases.
+ $clone = clone $model;
+ $clone->setProduct($product);
+ $model = $clone;
+ }
+
+ return [$model];
+ }
+
+ /**
+ * Select proper product for validation.
+ *
+ * @param \Magento\SalesRule\Model\Rule\Condition\Product $subject
+ * @param \Magento\Framework\Model\AbstractModel $model
+ *
+ * @return \Magento\Catalog\Api\Data\ProductInterface|\Magento\Catalog\Model\Product
+ */
+ private function getProductToValidate(
+ \Magento\SalesRule\Model\Rule\Condition\Product $subject,
+ \Magento\Framework\Model\AbstractModel $model
+ ) {
+ /** @var \Magento\Catalog\Model\Product $product */
+ $product = $model->getProduct();
+
+ $attrCode = $subject->getAttribute();
+
+ /* Check for attributes which are not available for configurable products */
+ if ($product->getTypeId() == Configurable::TYPE_CODE && !$product->hasData($attrCode)) {
+ /** @var \Magento\Catalog\Model\AbstractModel $childProduct */
+ $childProduct = current($model->getChildren())->getProduct();
+ if ($childProduct->hasData($attrCode)) {
+ $product = $childProduct;
+ }
+ }
+
+ return $product;
+ }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml
index 72fce95ade68d..57c45ee1e8997 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml
@@ -153,9 +153,9 @@
-
-
-
+
+
+
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Plugin/Frontend/ProductIdentitiesExtenderTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Plugin/Frontend/ProductIdentitiesExtenderTest.php
new file mode 100644
index 0000000000000..b4fb5ccfaa558
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Plugin/Frontend/ProductIdentitiesExtenderTest.php
@@ -0,0 +1,77 @@
+product = $this->getMockBuilder(Product::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getId'])
+ ->getMock();
+
+ $this->configurableTypeMock = $this->getMockBuilder(Configurable::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->plugin = new ProductIdentitiesExtender($this->configurableTypeMock);
+ }
+
+ public function testAfterGetIdentities()
+ {
+ $identities = [
+ 'SomeCacheId',
+ 'AnotherCacheId',
+ ];
+ $productId = 12345;
+ $childIdentities = [
+ 0 => [1, 2, 5, 100500]
+ ];
+ $expectedIdentities = [
+ 'SomeCacheId',
+ 'AnotherCacheId',
+ Product::CACHE_TAG . '_' . 1,
+ Product::CACHE_TAG . '_' . 2,
+ Product::CACHE_TAG . '_' . 5,
+ Product::CACHE_TAG . '_' . 100500,
+ ];
+
+ $this->product->expects($this->once())
+ ->method('getId')
+ ->willReturn($productId);
+
+ $this->configurableTypeMock->expects($this->once())
+ ->method('getChildrenIds')
+ ->with($productId)
+ ->willReturn($childIdentities);
+
+ $productIdentities = $this->plugin->afterGetIdentities($this->product, $identities);
+ $this->assertEquals($expectedIdentities, $productIdentities);
+ }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/SalesRule/Model/Rule/Condition/ProductTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/SalesRule/Model/Rule/Condition/ProductTest.php
new file mode 100644
index 0000000000000..80979148c4959
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/SalesRule/Model/Rule/Condition/ProductTest.php
@@ -0,0 +1,226 @@
+objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $this->validator = $this->createValidator();
+ $this->validatorPlugin = $this->objectManager->getObject(ValidatorPlugin::class);
+ }
+
+ /**
+ * @return \Magento\SalesRule\Model\Rule\Condition\Product
+ */
+ private function createValidator(): SalesRuleProduct
+ {
+ /** @var Context|\PHPUnit_Framework_MockObject_MockObject $contextMock */
+ $contextMock = $this->getMockBuilder(Context::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ /** @var Data|\PHPUnit_Framework_MockObject_MockObject $backendHelperMock */
+ $backendHelperMock = $this->getMockBuilder(Data::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ /** @var Config|\PHPUnit_Framework_MockObject_MockObject $configMock */
+ $configMock = $this->getMockBuilder(Config::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ /** @var ProductFactory|\PHPUnit_Framework_MockObject_MockObject $productFactoryMock */
+ $productFactoryMock = $this->getMockBuilder(ProductFactory::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ /** @var ProductRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject $productRepositoryMock */
+ $productRepositoryMock = $this->getMockBuilder(ProductRepositoryInterface::class)
+ ->getMockForAbstractClass();
+ $attributeLoaderInterfaceMock = $this->getMockBuilder(AbstractEntity::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getAttributesByCode'])
+ ->getMock();
+ $attributeLoaderInterfaceMock
+ ->expects($this->any())
+ ->method('getAttributesByCode')
+ ->willReturn([]);
+ /** @var Product|\PHPUnit_Framework_MockObject_MockObject $productMock */
+ $productMock = $this->getMockBuilder(Product::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['loadAllAttributes', 'getConnection', 'getTable'])
+ ->getMock();
+ $productMock->expects($this->any())
+ ->method('loadAllAttributes')
+ ->willReturn($attributeLoaderInterfaceMock);
+ /** @var Collection|\PHPUnit_Framework_MockObject_MockObject $collectionMock */
+ $collectionMock = $this->getMockBuilder(Collection::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ /** @var FormatInterface|\PHPUnit_Framework_MockObject_MockObject $formatMock */
+ $formatMock = new Format(
+ $this->getMockBuilder(ScopeResolverInterface::class)->disableOriginalConstructor()->getMock(),
+ $this->getMockBuilder(ResolverInterface::class)->disableOriginalConstructor()->getMock(),
+ $this->getMockBuilder(CurrencyFactory::class)->disableOriginalConstructor()->getMock()
+ );
+
+ return new SalesRuleProduct(
+ $contextMock,
+ $backendHelperMock,
+ $configMock,
+ $productFactoryMock,
+ $productRepositoryMock,
+ $productMock,
+ $collectionMock,
+ $formatMock
+ );
+ }
+
+ public function testChildIsUsedForValidation()
+ {
+ $configurableProductMock = $this->createProductMock();
+ $configurableProductMock
+ ->expects($this->any())
+ ->method('getTypeId')
+ ->willReturn(Configurable::TYPE_CODE);
+ $configurableProductMock
+ ->expects($this->any())
+ ->method('hasData')
+ ->with($this->equalTo('special_price'))
+ ->willReturn(false);
+
+ /* @var AbstractItem|\PHPUnit_Framework_MockObject_MockObject $item */
+ $item = $this->getMockBuilder(AbstractItem::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['setProduct', 'getProduct', 'getChildren'])
+ ->getMockForAbstractClass();
+ $item->expects($this->any())
+ ->method('getProduct')
+ ->willReturn($configurableProductMock);
+
+ $simpleProductMock = $this->createProductMock();
+ $simpleProductMock
+ ->expects($this->any())
+ ->method('getTypeId')
+ ->willReturn(Type::TYPE_SIMPLE);
+ $simpleProductMock
+ ->expects($this->any())
+ ->method('hasData')
+ ->with($this->equalTo('special_price'))
+ ->willReturn(true);
+
+ $childItem = $this->getMockBuilder(AbstractItem::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getProduct'])
+ ->getMockForAbstractClass();
+ $childItem->expects($this->any())
+ ->method('getProduct')
+ ->willReturn($simpleProductMock);
+
+ $item->expects($this->any())
+ ->method('getChildren')
+ ->willReturn([$childItem]);
+ $item->expects($this->once())
+ ->method('setProduct')
+ ->with($simpleProductMock);
+
+ $this->validator->setAttribute('special_price');
+
+ $this->validatorPlugin->beforeValidate($this->validator, $item);
+ }
+
+ /**
+ * @return Product|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private function createProductMock(): \PHPUnit_Framework_MockObject_MockObject
+ {
+ $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+ ->disableOriginalConstructor()
+ ->setMethods([
+ 'getAttribute',
+ 'getId',
+ 'setQuoteItemQty',
+ 'setQuoteItemPrice',
+ 'getTypeId',
+ 'hasData',
+ ])
+ ->getMock();
+ $productMock
+ ->expects($this->any())
+ ->method('setQuoteItemQty')
+ ->willReturnSelf();
+ $productMock
+ ->expects($this->any())
+ ->method('setQuoteItemPrice')
+ ->willReturnSelf();
+
+ return $productMock;
+ }
+
+ public function testChildIsNotUsedForValidation()
+ {
+ $simpleProductMock = $this->createProductMock();
+ $simpleProductMock
+ ->expects($this->any())
+ ->method('getTypeId')
+ ->willReturn(Type::TYPE_SIMPLE);
+ $simpleProductMock
+ ->expects($this->any())
+ ->method('hasData')
+ ->with($this->equalTo('special_price'))
+ ->willReturn(true);
+
+ /* @var AbstractItem|\PHPUnit_Framework_MockObject_MockObject $item */
+ $item = $this->getMockBuilder(AbstractItem::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['setProduct', 'getProduct'])
+ ->getMockForAbstractClass();
+ $item->expects($this->any())
+ ->method('getProduct')
+ ->willReturn($simpleProductMock);
+
+ $this->validator->setAttribute('special_price');
+
+ $this->validatorPlugin->beforeValidate($this->validator, $item);
+ }
+}
diff --git a/app/code/Magento/ConfigurableProduct/etc/di.xml b/app/code/Magento/ConfigurableProduct/etc/di.xml
index 102ed1314f864..0ae9ffde66f43 100644
--- a/app/code/Magento/ConfigurableProduct/etc/di.xml
+++ b/app/code/Magento/ConfigurableProduct/etc/di.xml
@@ -242,4 +242,7 @@
+
+
+
diff --git a/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml b/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
index bb830c36b929d..df96829b354c8 100644
--- a/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
+++ b/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
@@ -10,4 +10,7 @@
+
+
+
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/price-configurable.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/price-configurable.js
index 28e775b984b05..6bbab77a3a0ab 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/price-configurable.js
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/price-configurable.js
@@ -53,6 +53,8 @@ define([
if (isConfigurable) {
this.disable();
this.clear();
+ } else {
+ this.enable();
}
}
});
diff --git a/app/code/Magento/Customer/Block/Address/Book.php b/app/code/Magento/Customer/Block/Address/Book.php
index 8b38946a063db..04669446ffee9 100644
--- a/app/code/Magento/Customer/Block/Address/Book.php
+++ b/app/code/Magento/Customer/Block/Address/Book.php
@@ -6,8 +6,8 @@
namespace Magento\Customer\Block\Address;
use Magento\Customer\Api\AddressRepositoryInterface;
-use Magento\Customer\Api\CustomerRepositoryInterface;
use Magento\Customer\Model\Address\Mapper;
+use Magento\Customer\Block\Address\Grid as AddressesGrid;
/**
* Customer address book block
@@ -24,7 +24,7 @@ class Book extends \Magento\Framework\View\Element\Template
protected $currentCustomer;
/**
- * @var CustomerRepositoryInterface
+ * @var \Magento\Customer\Api\CustomerRepositoryInterface
*/
protected $customerRepository;
@@ -43,33 +43,44 @@ class Book extends \Magento\Framework\View\Element\Template
*/
protected $addressMapper;
+ /**
+ * @var AddressesGrid
+ */
+ private $addressesGrid;
+
/**
* @param \Magento\Framework\View\Element\Template\Context $context
- * @param CustomerRepositoryInterface $customerRepository
+ * @param CustomerRepositoryInterface|null $customerRepository
* @param AddressRepositoryInterface $addressRepository
* @param \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer
* @param \Magento\Customer\Model\Address\Config $addressConfig
* @param Mapper $addressMapper
* @param array $data
+ * @param AddressesGrid|null $addressesGrid
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function __construct(
\Magento\Framework\View\Element\Template\Context $context,
- CustomerRepositoryInterface $customerRepository,
+ \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository = null,
AddressRepositoryInterface $addressRepository,
\Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer,
\Magento\Customer\Model\Address\Config $addressConfig,
Mapper $addressMapper,
- array $data = []
+ array $data = [],
+ Grid $addressesGrid = null
) {
- $this->customerRepository = $customerRepository;
$this->currentCustomer = $currentCustomer;
$this->addressRepository = $addressRepository;
$this->_addressConfig = $addressConfig;
$this->addressMapper = $addressMapper;
+ $this->addressesGrid = $addressesGrid ?: \Magento\Framework\App\ObjectManager::getInstance()
+ ->get(AddressesGrid::class);
parent::__construct($context, $data);
}
/**
+ * Prepare the Address Book section layout
+ *
* @return $this
*/
protected function _prepareLayout()
@@ -79,14 +90,20 @@ protected function _prepareLayout()
}
/**
+ * Generate and return "New Address" URL
+ *
* @return string
+ * @deprecated not used in this block
+ * @see \Magento\Customer\Block\Address\Grid::getAddAddressUrl
*/
public function getAddAddressUrl()
{
- return $this->getUrl('customer/address/new', ['_secure' => true]);
+ return $this->addressesGrid->getAddAddressUrl();
}
/**
+ * Generate and return "Back" URL
+ *
* @return string
*/
public function getBackUrl()
@@ -98,24 +115,37 @@ public function getBackUrl()
}
/**
+ * Generate and return "Delete" URL
+ *
* @return string
+ * @deprecated not used in this block
+ * @see \Magento\Customer\Block\Address\Grid::getDeleteUrl
*/
public function getDeleteUrl()
{
- return $this->getUrl('customer/address/delete');
+ return $this->addressesGrid->getDeleteUrl();
}
/**
+ * Generate and return "Edit Address" URL.
+ *
+ * Address ID passed in parameters
+ *
* @param int $addressId
* @return string
+ * @deprecated not used in this block
+ * @see \Magento\Customer\Block\Address\Grid::getAddressEditUrl
*/
public function getAddressEditUrl($addressId)
{
- return $this->getUrl('customer/address/edit', ['_secure' => true, 'id' => $addressId]);
+ return $this->addressesGrid->getAddressEditUrl($addressId);
}
/**
+ * Determines is the address primary (billing or shipping)
+ *
* @return bool
+ * @throws \Magento\Framework\Exception\LocalizedException
*/
public function hasPrimaryAddress()
{
@@ -123,22 +153,22 @@ public function hasPrimaryAddress()
}
/**
+ * Get current additional customer addresses
+ *
+ * Will return array of address interfaces if customer have additional addresses and false in other case.
+ *
* @return \Magento\Customer\Api\Data\AddressInterface[]|bool
+ * @throws \Magento\Framework\Exception\LocalizedException
+ * @deprecated not used in this block
+ * @see \Magento\Customer\Block\Address\Grid::getAdditionalAddresses
*/
public function getAdditionalAddresses()
{
try {
- $addresses = $this->customerRepository->getById($this->currentCustomer->getCustomerId())->getAddresses();
+ $addresses = $this->addressesGrid->getAdditionalAddresses();
} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
- return false;
- }
- $primaryAddressIds = [$this->getDefaultBilling(), $this->getDefaultShipping()];
- foreach ($addresses as $address) {
- if (!in_array($address->getId(), $primaryAddressIds)) {
- $additional[] = $address;
- }
}
- return empty($additional) ? false : $additional;
+ return empty($addresses) ? false : $addresses;
}
/**
@@ -158,23 +188,23 @@ public function getAddressHtml(\Magento\Customer\Api\Data\AddressInterface $addr
}
/**
+ * Get current customer
+ *
* @return \Magento\Customer\Api\Data\CustomerInterface|null
*/
public function getCustomer()
{
- $customer = $this->getData('customer');
- if ($customer === null) {
- try {
- $customer = $this->customerRepository->getById($this->currentCustomer->getCustomerId());
- } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
- return null;
- }
- $this->setData('customer', $customer);
+ $customer = null;
+ try {
+ $customer = $this->currentCustomer->getCustomer();
+ } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
}
return $customer;
}
/**
+ * Get customer's default billing address
+ *
* @return int|null
*/
public function getDefaultBilling()
@@ -188,8 +218,11 @@ public function getDefaultBilling()
}
/**
+ * Get customer address by ID
+ *
* @param int $addressId
* @return \Magento\Customer\Api\Data\AddressInterface|null
+ * @throws \Magento\Framework\Exception\LocalizedException
*/
public function getAddressById($addressId)
{
@@ -201,6 +234,8 @@ public function getAddressById($addressId)
}
/**
+ * Get customer's default shipping address
+ *
* @return int|null
*/
public function getDefaultShipping()
diff --git a/app/code/Magento/Customer/Block/Address/Grid.php b/app/code/Magento/Customer/Block/Address/Grid.php
new file mode 100644
index 0000000000000..de6767a0ef92a
--- /dev/null
+++ b/app/code/Magento/Customer/Block/Address/Grid.php
@@ -0,0 +1,245 @@
+currentCustomer = $currentCustomer;
+ $this->addressCollectionFactory = $addressCollectionFactory;
+ $this->countryFactory = $countryFactory;
+
+ parent::__construct($context, $data);
+ }
+
+ /**
+ * Prepare the Address Book section layout
+ *
+ * @return void
+ * @throws \Magento\Framework\Exception\LocalizedException
+ */
+ protected function _prepareLayout(): void
+ {
+ parent::_prepareLayout();
+ $this->preparePager();
+ }
+
+ /**
+ * Generate and return "New Address" URL
+ *
+ * @return string
+ */
+ public function getAddAddressUrl(): string
+ {
+ return $this->getUrl('customer/address/new', ['_secure' => true]);
+ }
+
+ /**
+ * Generate and return "Delete" URL
+ *
+ * @return string
+ */
+ public function getDeleteUrl(): string
+ {
+ return $this->getUrl('customer/address/delete');
+ }
+
+ /**
+ * Generate and return "Edit Address" URL.
+ *
+ * Address ID passed in parameters
+ *
+ * @param int $addressId
+ * @return string
+ */
+ public function getAddressEditUrl($addressId): string
+ {
+ return $this->getUrl('customer/address/edit', ['_secure' => true, 'id' => $addressId]);
+ }
+
+ /**
+ * Get current additional customer addresses
+ *
+ * Return array of address interfaces if customer has additional addresses and false in other cases
+ *
+ * @return \Magento\Customer\Api\Data\AddressInterface[]
+ * @throws \Magento\Framework\Exception\LocalizedException
+ * @throws NoSuchEntityException
+ */
+ public function getAdditionalAddresses(): array
+ {
+ $additional = [];
+ $addresses = $this->getAddressCollection();
+ $primaryAddressIds = [$this->getDefaultBilling(), $this->getDefaultShipping()];
+ foreach ($addresses as $address) {
+ if (!in_array((int)$address->getId(), $primaryAddressIds, true)) {
+ $additional[] = $address->getDataModel();
+ }
+ }
+ return $additional;
+ }
+
+ /**
+ * Get current customer
+ *
+ * Return stored customer or get it from session
+ *
+ * @return \Magento\Customer\Api\Data\CustomerInterface
+ */
+ public function getCustomer(): \Magento\Customer\Api\Data\CustomerInterface
+ {
+ $customer = $this->getData('customer');
+ if ($customer === null) {
+ $customer = $this->currentCustomer->getCustomer();
+ $this->setData('customer', $customer);
+ }
+ return $customer;
+ }
+
+ /**
+ * Get one string street address from the Address DTO passed in parameters
+ *
+ * @param \Magento\Customer\Api\Data\AddressInterface $address
+ * @return string
+ */
+ public function getStreetAddress(\Magento\Customer\Api\Data\AddressInterface $address): string
+ {
+ $street = $address->getStreet();
+ if (is_array($street)) {
+ $street = implode(', ', $street);
+ }
+ return $street;
+ }
+
+ /**
+ * Get country name by $countryCode
+ *
+ * Using \Magento\Directory\Model\Country to get country name by $countryCode
+ *
+ * @param string $countryCode
+ * @return string
+ */
+ public function getCountryByCode(string $countryCode): string
+ {
+ /** @var \Magento\Directory\Model\Country $country */
+ $country = $this->countryFactory->create();
+ return $country->loadByCode($countryCode)->getName();
+ }
+
+ /**
+ * Get default billing address
+ *
+ * Return address string if address found and null if not
+ *
+ * @return int
+ * @throws \Magento\Framework\Exception\LocalizedException
+ */
+ private function getDefaultBilling(): int
+ {
+ $customer = $this->getCustomer();
+
+ return (int)$customer->getDefaultBilling();
+ }
+
+ /**
+ * Get default shipping address
+ *
+ * Return address string if address found and null if not
+ *
+ * @return int
+ * @throws \Magento\Framework\Exception\LocalizedException
+ */
+ private function getDefaultShipping(): int
+ {
+ $customer = $this->getCustomer();
+
+ return (int)$customer->getDefaultShipping();
+ }
+
+ /**
+ * Get pager layout
+ *
+ * @return void
+ * @throws \Magento\Framework\Exception\LocalizedException
+ */
+ private function preparePager(): void
+ {
+ $addressCollection = $this->getAddressCollection();
+ if (null !== $addressCollection) {
+ $pager = $this->getLayout()->createBlock(
+ \Magento\Theme\Block\Html\Pager::class,
+ 'customer.addresses.pager'
+ )->setCollection($addressCollection);
+ $this->setChild('pager', $pager);
+ }
+ }
+
+ /**
+ * Get customer addresses collection.
+ *
+ * Filters collection by customer id
+ *
+ * @return \Magento\Customer\Model\ResourceModel\Address\Collection
+ * @throws NoSuchEntityException
+ */
+ private function getAddressCollection(): \Magento\Customer\Model\ResourceModel\Address\Collection
+ {
+ if (null === $this->addressCollection) {
+ if (null === $this->getCustomer()) {
+ throw new NoSuchEntityException(__('Customer not logged in'));
+ }
+ /** @var \Magento\Customer\Model\ResourceModel\Address\Collection $collection */
+ $collection = $this->addressCollectionFactory->create();
+ $collection->setOrder('entity_id', 'desc')
+ ->setCustomerFilter([$this->getCustomer()->getId()]);
+ $this->addressCollection = $collection;
+ }
+ return $this->addressCollection;
+ }
+}
diff --git a/app/code/Magento/Customer/Model/Address.php b/app/code/Magento/Customer/Model/Address.php
index 4976ec546609f..e9aa2839095d5 100644
--- a/app/code/Magento/Customer/Model/Address.php
+++ b/app/code/Magento/Customer/Model/Address.php
@@ -172,12 +172,9 @@ public function updateData(AddressInterface $address)
public function getDataModel($defaultBillingAddressId = null, $defaultShippingAddressId = null)
{
if ($this->getCustomerId() || $this->getParentId()) {
- if ($this->getCustomer()->getDefaultBillingAddress()) {
- $defaultBillingAddressId = $this->getCustomer()->getDefaultBillingAddress()->getId();
- }
- if ($this->getCustomer()->getDefaultShippingAddress()) {
- $defaultShippingAddressId = $this->getCustomer()->getDefaultShippingAddress()->getId();
- }
+ $customer = $this->getCustomer();
+ $defaultBillingAddressId = $customer->getDefaultBilling() ?: $defaultBillingAddressId;
+ $defaultShippingAddressId = $customer->getDefaultShipping() ?: $defaultShippingAddressId;
}
return parent::getDataModel($defaultBillingAddressId, $defaultShippingAddressId);
}
diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php
index 972cb63ed452e..b00f393f53734 100644
--- a/app/code/Magento/Customer/Model/Customer.php
+++ b/app/code/Magento/Customer/Model/Customer.php
@@ -219,6 +219,13 @@ class Customer extends \Magento\Framework\Model\AbstractModel
*/
private $accountConfirmation;
+ /**
+ * Caching property to store customer address data models by the address ID.
+ *
+ * @var array
+ */
+ private $storedAddress;
+
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
@@ -314,7 +321,10 @@ public function getDataModel()
$addressesData = [];
/** @var \Magento\Customer\Model\Address $address */
foreach ($this->getAddresses() as $address) {
- $addressesData[] = $address->getDataModel();
+ if (!isset($this->storedAddress[$address->getId()])) {
+ $this->storedAddress[$address->getId()] = $address->getDataModel();
+ }
+ $addressesData[] = $this->storedAddress[$address->getId()];
}
$customerDataObject = $this->customerDataFactory->create();
$this->dataObjectHelper->populateWithArray(
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAddCustomerAddressActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAddCustomerAddressActionGroup.xml
new file mode 100644
index 0000000000000..a45fcf31f7b3f
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAddCustomerAddressActionGroup.xml
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
index c7335f9024218..85b94b67c0eda 100755
--- a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
@@ -44,12 +44,29 @@
Austin
Texas
US
+ United States
78729
512-345-6789
Yes
Yes
RegionTX
+
+ John
+ Doe
+ Magento
+
+ - 7700 West Parmer Lane
+
+ Austin
+ Texas
+ US
+ United States
+ 78729
+ 512-345-6789
+ Yes
+ RegionTX
+
John
Doe
@@ -68,6 +85,23 @@
RegionNY
United States
+
+ John
+ Doe
+ 368
+
+ - 368 Broadway St.
+ - 113
+
+ New York
+ New York
+ US
+ 10001
+ 512-345-6789
+ Yes
+ RegionNY
+ United States
+
John
Doe
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
index 44ac0981d9577..ab42dfe85e4ff 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
@@ -45,6 +45,16 @@
0
US_Address_TX
+
+ 1
+ John.Doe@example.com
+ John
+ Doe
+ John Doe
+ pwdTest123!
+ 0
+ 0
+
0
true
@@ -73,6 +83,20 @@
US_Address_NY_Not_Default_Address
UK_Not_Default_Address
+
+ 0
+ true
+ true
+ John.Doe@example.com
+ John
+ Doe
+ John Doe
+ pwdTest123!
+ 0
+ 0
+ US_Address_TX_Default_Billing
+ US_Address_NY_Default_Shipping
+
0
true
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressFormSection.xml
new file mode 100644
index 0000000000000..112ced1bc375f
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressFormSection.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml
index 05bbc559defac..29a2f549274a7 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml
@@ -9,7 +9,13 @@
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontAddCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontAddCustomerAddressTest.xml
new file mode 100644
index 0000000000000..413bbfd06a539
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontAddCustomerAddressTest.xml
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressTest.xml
new file mode 100644
index 0000000000000..d1b5fb2aa7d11
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressTest.xml
@@ -0,0 +1,125 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php b/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
new file mode 100644
index 0000000000000..31bcc37612302
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
@@ -0,0 +1,196 @@
+objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+ $this->currentCustomer = $this->getMockBuilder(\Magento\Customer\Helper\Session\CurrentCustomer::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getCustomer'])
+ ->getMock();
+
+ $this->addressCollectionFactory = $this->getMockBuilder(CollectionFactory::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['create'])
+ ->getMock();
+
+ $this->countryFactory = $this->getMockBuilder(\Magento\Directory\Model\CountryFactory::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['create'])
+ ->getMock();
+
+ $this->urlBuilder = $this->getMockForAbstractClass(\Magento\Framework\UrlInterface::class);
+
+ $this->gridBlock = $this->objectManager->getObject(
+ \Magento\Customer\Block\Address\Grid::class,
+ [
+ 'addressCollectionFactory' => $this->addressCollectionFactory,
+ 'currentCustomer' => $this->currentCustomer,
+ 'countryFactory' => $this->countryFactory,
+ '_urlBuilder' => $this->urlBuilder
+ ]
+ );
+ }
+
+ /**
+ * Test for \Magento\Customer\Block\Address\Book::getChildHtml method with 'pager' argument
+ */
+ public function testGetChildHtml()
+ {
+ $customerId = 1;
+
+ /** @var \Magento\Framework\View\Element\BlockInterface|\PHPUnit_Framework_MockObject_MockObject $block */
+ $block = $this->getMockBuilder(\Magento\Framework\View\Element\BlockInterface::class)
+ ->setMethods(['setCollection'])
+ ->getMockForAbstractClass();
+ /** @var $layout \Magento\Framework\View\LayoutInterface|\PHPUnit_Framework_MockObject_MockObject */
+ $layout = $this->getMockForAbstractClass(\Magento\Framework\View\LayoutInterface::class);
+ /** @var \Magento\Customer\Api\Data\CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $customer */
+ $customer = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\CustomerInterface::class);
+ /** @var \PHPUnit_Framework_MockObject_MockObject */
+ $addressCollection = $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Address\Collection::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['setOrder', 'setCustomerFilter', 'load'])
+ ->getMock();
+
+ $layout->expects($this->atLeastOnce())->method('getChildName')->with('NameInLayout', 'pager')
+ ->willReturn('ChildName');
+ $layout->expects($this->atLeastOnce())->method('renderElement')->with('ChildName', true)
+ ->willReturn('OutputString');
+ $layout->expects($this->atLeastOnce())->method('createBlock')
+ ->with(\Magento\Theme\Block\Html\Pager::class, 'customer.addresses.pager')->willReturn($block);
+ $customer->expects($this->atLeastOnce())->method('getId')->willReturn($customerId);
+ $this->currentCustomer->expects($this->atLeastOnce())->method('getCustomer')->willReturn($customer);
+ $addressCollection->expects($this->atLeastOnce())->method('setOrder')->with('entity_id', 'desc')
+ ->willReturnSelf();
+ $addressCollection->expects($this->atLeastOnce())->method('setCustomerFilter')->with([$customerId])
+ ->willReturnSelf();
+ $this->addressCollectionFactory->expects($this->atLeastOnce())->method('create')
+ ->willReturn($addressCollection);
+ $block->expects($this->atLeastOnce())->method('setCollection')->with($addressCollection)->willReturnSelf();
+ $this->gridBlock->setNameInLayout('NameInLayout');
+ $this->gridBlock->setLayout($layout);
+ $this->assertEquals('OutputString', $this->gridBlock->getChildHtml('pager'));
+ }
+
+ /**
+ * Test for \Magento\Customer\Block\Address\Grid::getAddressEditUrl method
+ */
+ public function testGetAddAddressUrl()
+ {
+ $addressId = 1;
+ $expectedUrl = 'expected_url';
+ $this->urlBuilder->expects($this->atLeastOnce())->method('getUrl')
+ ->with('customer/address/edit', ['_secure' => true, 'id' => $addressId])
+ ->willReturn($expectedUrl);
+ $this->assertEquals($expectedUrl, $this->gridBlock->getAddressEditUrl($addressId));
+ }
+
+ public function testGetAdditionalAddresses()
+ {
+ $customerId = 1;
+ /** @var \Magento\Customer\Api\Data\CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $customer */
+ $customer = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\CustomerInterface::class);
+ /** @var \PHPUnit_Framework_MockObject_MockObject */
+ $addressCollection = $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Address\Collection::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['setOrder', 'setCustomerFilter', 'load', 'getIterator'])
+ ->getMock();
+ $addressDataModel = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\AddressInterface::class);
+ $address = $this->getMockBuilder(\Magento\Customer\Model\Address::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getId', 'getDataModel'])
+ ->getMock();
+ $collection = [$address, $address, $address];
+ $address->expects($this->exactly(3))->method('getId')
+ ->willReturnOnConsecutiveCalls(1, 2, 3);
+ $address->expects($this->atLeastOnce())->method('getDataModel')->willReturn($addressDataModel);
+ $customer->expects($this->atLeastOnce())->method('getId')->willReturn($customerId);
+ $customer->expects($this->atLeastOnce())->method('getDefaultBilling')->willReturn('1');
+ $customer->expects($this->atLeastOnce())->method('getDefaultShipping')->willReturn('2');
+
+ $this->currentCustomer->expects($this->atLeastOnce())->method('getCustomer')->willReturn($customer);
+ $addressCollection->expects($this->atLeastOnce())->method('setOrder')->with('entity_id', 'desc')
+ ->willReturnSelf();
+ $addressCollection->expects($this->atLeastOnce())->method('setCustomerFilter')->with([$customerId])
+ ->willReturnSelf();
+ $addressCollection->expects($this->atLeastOnce())->method('getIterator')
+ ->willReturn(new \ArrayIterator($collection));
+ $this->addressCollectionFactory->expects($this->atLeastOnce())->method('create')
+ ->willReturn($addressCollection);
+
+ $this->assertEquals($addressDataModel, $this->gridBlock->getAdditionalAddresses()[0]);
+ }
+
+ /**
+ * Test for \Magento\Customer\ViewModel\CustomerAddress::getStreetAddress method
+ */
+ public function testGetStreetAddress()
+ {
+ $street = ['Line 1', 'Line 2'];
+ $expectedAddress = 'Line 1, Line 2';
+ $address = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\AddressInterface::class);
+ $address->expects($this->atLeastOnce())->method('getStreet')->willReturn($street);
+ $this->assertEquals($expectedAddress, $this->gridBlock->getStreetAddress($address));
+ }
+
+ /**
+ * Test for \Magento\Customer\ViewModel\CustomerAddress::getCountryByCode method
+ */
+ public function testGetCountryByCode()
+ {
+ $countryId = 'US';
+ $countryName = 'United States';
+ $country = $this->getMockBuilder(\Magento\Directory\Model\Country::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['loadByCode', 'getName'])
+ ->getMock();
+ $this->countryFactory->expects($this->atLeastOnce())->method('create')->willReturn($country);
+ $country->expects($this->atLeastOnce())->method('loadByCode')->with($countryId)->willReturnSelf();
+ $country->expects($this->atLeastOnce())->method('getName')->willReturn($countryName);
+ $this->assertEquals($countryName, $this->gridBlock->getCountryByCode($countryId));
+ }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php b/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php
index cb396e32509b7..65831069aa1fb 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php
@@ -13,9 +13,12 @@
use Magento\Customer\Model\Customer;
use Magento\Customer\Model\AccountConfirmation;
+use Magento\Customer\Model\ResourceModel\Address\CollectionFactory as AddressCollectionFactory;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
*/
class CustomerTest extends \PHPUnit\Framework\TestCase
{
@@ -68,6 +71,21 @@ class CustomerTest extends \PHPUnit\Framework\TestCase
*/
private $accountConfirmation;
+ /**
+ * @var AddressCollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $addressesFactory;
+
+ /**
+ * @var CustomerInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $customerDataFactory;
+
+ /**
+ * @var \Magento\Framework\Api\DataObjectHelper|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $dataObjectHelper;
+
protected function setUp()
{
$this->_website = $this->createMock(\Magento\Store\Model\Website::class);
@@ -100,6 +118,19 @@ protected function setUp()
$this->_encryptor = $this->createMock(\Magento\Framework\Encryption\EncryptorInterface::class);
$helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
$this->accountConfirmation = $this->createMock(AccountConfirmation::class);
+ $this->addressesFactory = $this->getMockBuilder(AddressCollectionFactory::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['create'])
+ ->getMock();
+ $this->customerDataFactory = $this->getMockBuilder(CustomerInterfaceFactory::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['create'])
+ ->getMock();
+ $this->dataObjectHelper = $this->getMockBuilder(\Magento\Framework\Api\DataObjectHelper::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['populateWithArray'])
+ ->getMock();
+
$this->_model = $helper->getObject(
\Magento\Customer\Model\Customer::class,
[
@@ -112,7 +143,10 @@ protected function setUp()
'registry' => $this->registryMock,
'resource' => $this->resourceMock,
'dataObjectProcessor' => $this->dataObjectProcessor,
- 'accountConfirmation' => $this->accountConfirmation
+ 'accountConfirmation' => $this->accountConfirmation,
+ '_addressesFactory' => $this->addressesFactory,
+ 'customerDataFactory' => $this->customerDataFactory,
+ 'dataObjectHelper' => $this->dataObjectHelper
]
);
}
@@ -186,13 +220,13 @@ public function testSendNewAccountEmailWithoutStoreId()
->will($this->returnValue($transportMock));
$this->_model->setData([
- 'website_id' => 1,
- 'store_id' => 1,
- 'email' => 'email@example.com',
- 'firstname' => 'FirstName',
- 'lastname' => 'LastName',
- 'middlename' => 'MiddleName',
- 'prefix' => 'Name Prefix',
+ 'website_id' => 1,
+ 'store_id' => 1,
+ 'email' => 'email@example.com',
+ 'firstname' => 'FirstName',
+ 'lastname' => 'LastName',
+ 'middlename' => 'MiddleName',
+ 'prefix' => 'Name Prefix',
]);
$this->_model->sendNewAccountEmail('registered');
}
@@ -310,4 +344,43 @@ public function testUpdateData()
$this->assertEquals($this->_model->getData(), $expectedResult);
}
+
+ /**
+ * Test for the \Magento\Customer\Model\Customer::getDataModel() method
+ */
+ public function testGetDataModel()
+ {
+ $customerId = 1;
+ $this->_model->setEntityId($customerId);
+ $this->_model->setId($customerId);
+ $addressDataModel = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\AddressInterface::class);
+ $address = $this->getMockBuilder(\Magento\Customer\Model\Address::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['setCustomer', 'getDataModel'])
+ ->getMock();
+ $address->expects($this->atLeastOnce())->method('getDataModel')->willReturn($addressDataModel);
+ $addresses = new \ArrayIterator([$address, $address]);
+ $addressCollection = $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Address\Collection::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['setCustomerFilter', 'addAttributeToSelect', 'getIterator', 'getItems'])
+ ->getMock();
+ $addressCollection->expects($this->atLeastOnce())->method('setCustomerFilter')->willReturnSelf();
+ $addressCollection->expects($this->atLeastOnce())->method('addAttributeToSelect')->willReturnSelf();
+ $addressCollection->expects($this->atLeastOnce())->method('getIterator')
+ ->willReturn($addresses);
+ $addressCollection->expects($this->atLeastOnce())->method('getItems')
+ ->willReturn($addresses);
+ $this->addressesFactory->expects($this->atLeastOnce())->method('create')->willReturn($addressCollection);
+ $customerDataObject = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\CustomerInterface::class);
+ $this->customerDataFactory->expects($this->atLeastOnce())->method('create')->willReturn($customerDataObject);
+ $this->dataObjectHelper->expects($this->atLeastOnce())->method('populateWithArray')
+ ->with($customerDataObject, $this->_model->getData(), \Magento\Customer\Api\Data\CustomerInterface::class)
+ ->willReturnSelf();
+ $customerDataObject->expects($this->atLeastOnce())->method('setAddresses')
+ ->with([$addressDataModel, $addressDataModel])
+ ->willReturnSelf();
+ $customerDataObject->expects($this->atLeastOnce())->method('setId')->with($customerId)->willReturnSelf();
+ $this->_model->getDataModel();
+ $this->assertEquals($customerDataObject, $this->_model->getDataModel());
+ }
}
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_address_index.xml b/app/code/Magento/Customer/view/frontend/layout/customer_address_index.xml
index bad120e46277f..2c5e5b98e5f7b 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_address_index.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_address_index.xml
@@ -13,6 +13,7 @@
+