-
- getChildHtml('billing_method') ?>
-
-
- getChildHtml('shipping_method') ?>
-
+
+
+
+ getChildHtml('billing_method') ?>
-
+
-
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
index 1b188de40710f..3b9036c1fbbc0 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
@@ -6,13 +6,13 @@
namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set;
/**
- * Adminhtml Catalog Attribute Set Main Block
- *
* @author Magento Core Team
*/
use Magento\Catalog\Model\Entity\Product\Attribute\Group\AttributeMapperInterface;
/**
+ * Adminhtml Catalog Attribute Set Main Block.
+ *
* @api
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @since 100.0.2
@@ -140,7 +140,7 @@ protected function _prepareLayout()
) . '\', \'' . $this->getUrl(
'catalog/*/delete',
['id' => $setId]
- ) . '\')',
+ ) . '\',{data: {}})',
'class' => 'delete'
]
);
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php
index 5089b37f90c58..a5be6223bee75 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php
@@ -8,6 +8,9 @@
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+/**
+ * Controller for category listing
+ */
class Index extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpGetActionInterface
{
/**
diff --git a/app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php b/app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php
index 7cc3eb9e3d2da..25f6d0c323687 100644
--- a/app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php
+++ b/app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php
@@ -12,6 +12,8 @@
use Magento\Store\Model\Store;
/**
+ * Cron job for removing outdated prices.
+ *
* Cron operation is responsible for deleting all product prices on WEBSITE level
* in case 'Catalog Price Scope' configuration parameter is set to GLOBAL.
*/
@@ -76,7 +78,7 @@ public function execute()
/**
* Checks if price scope config option explicitly equal to global value.
*
- * Such strict comparision is required to prevent price deleting when
+ * Such strict comparison is required to prevent price deleting when
* price scope config option is null for some reason.
*
* @return bool
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormActionSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormActionSection.xml
index c7d4cd16d788a..aa752e0e2289c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormActionSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormActionSection.xml
@@ -15,6 +15,7 @@
+
+
+
+
- Bahamas
+
+
+ - Australia
+ - Brazil
+ - Canada
+ - Croatia
+ - Estonia
+ - India
+ - Latvia
+ - Lithuania
+ - Romania
+ - Spain
+ - Switzerland
+ - United States
+ - Australia
+
+
+
+
+ - United Kingdom
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithoutRegionTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithoutRegionTest.xml
new file mode 100644
index 0000000000000..0cc0dcf38e312
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithoutRegionTest.xml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js b/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js
index 3b7fac3d19ea5..c0de643d3a223 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js
@@ -180,7 +180,7 @@ define([
},
/**
- * Resolves an initial sate of a login form.
+ * Resolves an initial state of a login form.
*
* @returns {Boolean} - initial visibility state.
*/
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
index 395d15bc02f36..c811d3a1e8369 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
@@ -265,7 +265,11 @@ define([
addressData,
loginFormSelector = 'form[data-role=email-with-possible-login]',
emailValidationResult = customer.isLoggedIn(),
- field;
+ field,
+ country = registry.get(this.parentName + '.shippingAddress.shipping-address-fieldset.country_id'),
+ countryIndexedOptions = country.indexedOptions,
+ option = countryIndexedOptions[quote.shippingAddress().countryId],
+ messageContainer = registry.get('checkout.errors').messageContainer;
if (!quote.shippingMethod()) {
this.errorValidationMessage(
@@ -318,6 +322,16 @@ define([
shippingAddress['save_in_address_book'] = 1;
}
selectShippingAddress(shippingAddress);
+ } else if (customer.isLoggedIn() &&
+ option &&
+ option['is_region_required'] &&
+ !quote.shippingAddress().region
+ ) {
+ messageContainer.addErrorMessage({
+ message: $t('Please specify a regionId in shipping address.')
+ });
+
+ return false;
}
if (!emailValidationResult) {
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php
index a19e3846a8d89..08ba2c3fff330 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php
@@ -33,15 +33,25 @@ public function __construct(\Magento\Framework\UrlInterface $frontendUrlBuilder)
*/
public function getUrl($routePath, $scope, $store)
{
- $this->frontendUrlBuilder->setScope($scope);
- $href = $this->frontendUrlBuilder->getUrl(
- $routePath,
- [
- '_current' => false,
- '_nosid' => true,
- '_query' => [\Magento\Store\Model\StoreManagerInterface::PARAM_NAME => $store]
- ]
- );
+ if ($scope) {
+ $this->frontendUrlBuilder->setScope($scope);
+ $href = $this->frontendUrlBuilder->getUrl(
+ $routePath,
+ [
+ '_current' => false,
+ '_nosid' => true,
+ '_query' => [\Magento\Store\Model\StoreManagerInterface::PARAM_NAME => $store]
+ ]
+ );
+ } else {
+ $href = $this->frontendUrlBuilder->getUrl(
+ $routePath,
+ [
+ '_current' => false,
+ '_nosid' => true
+ ]
+ );
+ }
return $href;
}
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
index de8a2adccc360..11d8bb23313fb 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
@@ -17,7 +17,7 @@
+
+
+
+
+
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/GeneralConfigurationActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/GeneralConfigurationActionGroup.xml
index fca48dfb49cfb..f05cf5be3448e 100644
--- a/app/code/Magento/Config/Test/Mftf/ActionGroup/GeneralConfigurationActionGroup.xml
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/GeneralConfigurationActionGroup.xml
@@ -37,4 +37,17 @@
+
+
+
diff --git a/app/code/Magento/Config/Test/Mftf/Page/AdminStoresCustomerConfigurationPage.xml b/app/code/Magento/Config/Test/Mftf/Page/AdminStoresCustomerConfigurationPage.xml
new file mode 100644
index 0000000000000..6a4efb6b9e152
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Page/AdminStoresCustomerConfigurationPage.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Config/Test/Mftf/Section/AdminStoresCustomerConfigurationSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminStoresCustomerConfigurationSection.xml
new file mode 100644
index 0000000000000..823be383ce123
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminStoresCustomerConfigurationSection.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml b/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml
index 88532dc091f45..66b40f74d8e98 100644
--- a/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml
+++ b/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml
@@ -38,4 +38,9 @@
+
+
diff --git a/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php b/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php
index 58462b873d8b1..7146108f61fe1 100644
--- a/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php
+++ b/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php
@@ -3,14 +3,21 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\ConfigurableImportExport\Model\Export;
-use Magento\CatalogImportExport\Model\Export\RowCustomizerInterface;
use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableProductType;
+use Magento\CatalogImportExport\Model\Export\RowCustomizerInterface;
use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableProductType;
use Magento\ImportExport\Model\Import;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+/**
+ * Customizes output during export
+ */
class RowCustomizer implements RowCustomizerInterface
{
/**
@@ -36,6 +43,19 @@ class RowCustomizer implements RowCustomizerInterface
self::CONFIGURABLE_VARIATIONS_LABELS_COLUMN
];
+ /**
+ * @var StoreManagerInterface
+ */
+ private $storeManager;
+
+ /**
+ * @param StoreManagerInterface $storeManager
+ */
+ public function __construct(StoreManagerInterface $storeManager)
+ {
+ $this->storeManager = $storeManager;
+ }
+
/**
* Prepare configurable data for export
*
@@ -49,6 +69,9 @@ public function prepareData($collection, $productIds)
$productCollection->addAttributeToFilter('entity_id', ['in' => $productIds])
->addAttributeToFilter('type_id', ['eq' => ConfigurableProductType::TYPE_CODE]);
+ // set global scope during export
+ $this->storeManager->setCurrentStore(Store::DEFAULT_STORE_ID);
+
while ($product = $productCollection->fetchItem()) {
$productAttributesOptions = $product->getTypeInstance()->getConfigurableOptions($product);
$this->configurableData[$product->getId()] = [];
diff --git a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
index fdbd8560c2664..3f4565771e70b 100644
--- a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
@@ -248,7 +248,7 @@ public function __construct(
*/
protected function _addAttributeParams($attrSetName, array $attrParams, $attribute)
{
- // save super attributes for simplier and quicker search in future
+ // save super attributes for simpler and quicker search in future
if ('select' == $attrParams['type'] && 1 == $attrParams['is_global']) {
$this->_superAttributes[$attrParams['code']] = $attrParams;
}
diff --git a/app/code/Magento/ConfigurableImportExport/composer.json b/app/code/Magento/ConfigurableImportExport/composer.json
index c1aab3e7a148f..419a08e14b0a2 100644
--- a/app/code/Magento/ConfigurableImportExport/composer.json
+++ b/app/code/Magento/ConfigurableImportExport/composer.json
@@ -11,7 +11,8 @@
"magento/module-catalog-import-export": "*",
"magento/module-configurable-product": "*",
"magento/module-eav": "*",
- "magento/module-import-export": "*"
+ "magento/module-import-export": "*",
+ "magento/module-store": "*"
},
"type": "magento2-module",
"license": [
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml
index c93b216fc89d5..72fce95ade68d 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml
@@ -16,6 +16,9 @@
+
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/CancelButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/CancelButton.php
new file mode 100644
index 0000000000000..d94b956918370
--- /dev/null
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/CancelButton.php
@@ -0,0 +1,42 @@
+ __('Cancel'),
+ 'on_click' => '',
+ 'data_attribute' => [
+ 'mage-init' => [
+ 'Magento_Ui/js/form/button-adapter' => [
+ 'actions' => [
+ [
+ 'targetName' => 'customer_form.areas.address.address.customer_address_update_modal',
+ 'actionName' => 'closeModal'
+ ],
+ ],
+ ],
+ ],
+ ],
+ 'sort_order' => 20
+ ];
+ }
+}
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/DeleteButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/DeleteButton.php
new file mode 100644
index 0000000000000..da589a25df28e
--- /dev/null
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/DeleteButton.php
@@ -0,0 +1,65 @@
+getAddressId()) {
+ $data = [
+ 'label' => __('Delete'),
+ 'on_click' => '',
+ 'data_attribute' => [
+ 'mage-init' => [
+ 'Magento_Ui/js/form/button-adapter' => [
+ 'actions' => [
+ [
+ 'targetName' => 'customer_address_form.customer_address_form',
+ 'actionName' => 'deleteAddress',
+ 'params' => [
+ $this->getDeleteUrl(),
+ ],
+
+ ]
+ ],
+ ],
+ ],
+ ],
+ 'sort_order' => 20
+ ];
+ }
+ return $data;
+ }
+
+ /**
+ * Get delete button url.
+ *
+ * @return string
+ * @throws \Magento\Framework\Exception\LocalizedException
+ */
+ private function getDeleteUrl(): string
+ {
+ return $this->getUrl(
+ Actions::CUSTOMER_ADDRESS_PATH_DELETE,
+ ['parent_id' => $this->getCustomerId(), 'id' => $this->getAddressId()]
+ );
+ }
+}
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/GenericButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/GenericButton.php
new file mode 100644
index 0000000000000..ae09ee6896891
--- /dev/null
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/GenericButton.php
@@ -0,0 +1,110 @@
+addressFactory = $addressFactory;
+ $this->urlBuilder = $urlBuilder;
+ $this->addressResourceModel = $addressResourceModel;
+ $this->request = $request;
+ $this->addressRepository = $addressRepository;
+ }
+
+ /**
+ * Return address Id.
+ *
+ * @return int|null
+ */
+ public function getAddressId()
+ {
+ $address = $this->addressFactory->create();
+
+ $entityId = $this->request->getParam('entity_id');
+ $this->addressResourceModel->load(
+ $address,
+ $entityId
+ );
+
+ return $address->getEntityId() ?: null;
+ }
+
+ /**
+ * Get customer id.
+ *
+ * @return int|null
+ * @throws \Magento\Framework\Exception\LocalizedException
+ */
+ public function getCustomerId()
+ {
+ $addressId = $this->request->getParam('entity_id');
+
+ $address = $this->addressRepository->getById($addressId);
+
+ return $address->getCustomerId() ?: null;
+ }
+
+ /**
+ * Generate url by route and parameters
+ *
+ * @param string $route
+ * @param array $params
+ * @return string
+ */
+ public function getUrl($route = '', array $params = []): string
+ {
+ return $this->urlBuilder->getUrl($route, $params);
+ }
+}
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/SaveButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/SaveButton.php
new file mode 100644
index 0000000000000..9d403185ca888
--- /dev/null
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/SaveButton.php
@@ -0,0 +1,34 @@
+ __('Save'),
+ 'class' => 'save primary',
+ 'data_attribute' => [
+ 'mage-init' => ['button' => ['event' => 'save']],
+ 'form-role' => 'save',
+ ],
+ 'sort_order' => 10
+ ];
+ }
+}
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php
index 76c33f143e671..5eeacca4c73a5 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php
@@ -147,10 +147,12 @@ public function _beforeToHtml()
*/
public function getWebsiteCount($websiteId)
{
- return isset($this->_websiteCounts[$websiteId]) ? $this->_websiteCounts[$websiteId] : 0;
+ return $this->_websiteCounts[$websiteId] ?? 0;
}
/**
+ * Returns Grouped Collection Rows
+ *
* @return array
*/
public function getRows()
@@ -159,6 +161,8 @@ public function getRows()
}
/**
+ * Return totals data
+ *
* @return \Magento\Framework\DataObject
*/
public function getTotals()
@@ -171,7 +175,9 @@ public function getTotals()
*
* @param float $price
* @param null|int $websiteId
+ *
* @return string
+ * @throws \Magento\Framework\Exception\LocalizedException
*/
public function formatCurrency($price, $websiteId = null)
{
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Address/DefaultBillingAddress.php b/app/code/Magento/Customer/Controller/Adminhtml/Address/DefaultBillingAddress.php
new file mode 100644
index 0000000000000..bf8ca4aeb5cd7
--- /dev/null
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Address/DefaultBillingAddress.php
@@ -0,0 +1,109 @@
+addressRepository = $addressRepository;
+ $this->logger = $logger;
+ $this->resultJsonFactory = $resultJsonFactory;
+ }
+
+ /**
+ * Execute action to set customer default billing address
+ *
+ * @return Json
+ */
+ public function execute(): Json
+ {
+ $customerId = $this->getRequest()->getParam('parent_id', false);
+ $addressId = $this->getRequest()->getParam('id', false);
+ $error = true;
+ $message = __('There is no address id in setting default billing address.');
+
+ if ($addressId) {
+ try {
+ $address = $this->addressRepository->getById($addressId)->setCustomerId($customerId);
+ $this->setAddressAsDefault($address);
+ $this->addressRepository->save($address);
+ $message = __('Default billing address has been changed.');
+ $error = false;
+ } catch (\Exception $e) {
+ $message = __('We can\'t change default billing address right now.');
+ $this->logger->critical($e);
+ }
+ }
+
+ $resultJson = $this->resultJsonFactory->create();
+ $resultJson->setData(
+ [
+ 'message' => $message,
+ 'error' => $error,
+ ]
+ );
+
+ return $resultJson;
+ }
+
+ /**
+ * Set address as default billing address
+ *
+ * @param AddressInterface $address
+ * @return void
+ */
+ private function setAddressAsDefault(AddressInterface $address): void
+ {
+ $address->setIsDefaultBilling(true);
+ }
+}
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Address/DefaultShippingAddress.php b/app/code/Magento/Customer/Controller/Adminhtml/Address/DefaultShippingAddress.php
new file mode 100644
index 0000000000000..81928ae2d28d0
--- /dev/null
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Address/DefaultShippingAddress.php
@@ -0,0 +1,109 @@
+addressRepository = $addressRepository;
+ $this->logger = $logger;
+ $this->resultJsonFactory = $resultJsonFactory;
+ }
+
+ /**
+ * Execute action to set customer default shipping address
+ *
+ * @return Json
+ */
+ public function execute(): Json
+ {
+ $customerId = $this->getRequest()->getParam('parent_id', false);
+ $addressId = $this->getRequest()->getParam('id', false);
+ $error = true;
+ $message = __('There is no address id in setting default shipping address.');
+
+ if ($addressId) {
+ try {
+ $address = $this->addressRepository->getById($addressId)->setCustomerId($customerId);
+ $this->setAddressAsDefault($address);
+ $this->addressRepository->save($address);
+ $message = __('Default shipping address has been changed.');
+ $error = false;
+ } catch (\Exception $e) {
+ $message = __('We can\'t change default shipping address right now.');
+ $this->logger->critical($e);
+ }
+ }
+
+ $resultJson = $this->resultJsonFactory->create();
+ $resultJson->setData(
+ [
+ 'message' => $message,
+ 'error' => $error,
+ ]
+ );
+
+ return $resultJson;
+ }
+
+ /**
+ * Set address as default shipping address
+ *
+ * @param AddressInterface $address
+ * @return void
+ */
+ private function setAddressAsDefault(AddressInterface $address): void
+ {
+ $address->setIsDefaultShipping(true);
+ }
+}
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Address/Delete.php b/app/code/Magento/Customer/Controller/Adminhtml/Address/Delete.php
new file mode 100644
index 0000000000000..711cd2473cdc5
--- /dev/null
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Address/Delete.php
@@ -0,0 +1,95 @@
+addressRepository = $addressRepository;
+ $this->resultJsonFactory = $resultJsonFactory;
+ $this->logger = $logger;
+ }
+
+ /**
+ * Delete customer address action
+ *
+ * @return Json
+ * @throws \Magento\Framework\Exception\LocalizedException
+ */
+ public function execute(): Json
+ {
+ $customerId = $this->getRequest()->getParam('parent_id', false);
+ $addressId = $this->getRequest()->getParam('id', false);
+ $error = false;
+ $message = '';
+ if ($addressId && $this->addressRepository->getById($addressId)->getCustomerId() === $customerId) {
+ try {
+ $this->addressRepository->deleteById($addressId);
+ $message = __('You deleted the address.');
+ } catch (\Exception $e) {
+ $error = true;
+ $message = __('We can\'t delete the address right now.');
+ $this->logger->critical($e);
+ }
+ }
+
+ $resultJson = $this->resultJsonFactory->create();
+ $resultJson->setData(
+ [
+ 'message' => $message,
+ 'error' => $error,
+ ]
+ );
+
+ return $resultJson;
+ }
+}
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Address/MassDelete.php b/app/code/Magento/Customer/Controller/Adminhtml/Address/MassDelete.php
new file mode 100644
index 0000000000000..cd319d662a093
--- /dev/null
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Address/MassDelete.php
@@ -0,0 +1,131 @@
+filter = $filter;
+ $this->collectionFactory = $collectionFactory;
+ $this->addressRepository = $addressRepository;
+ $this->logger = $logger;
+ $this->resultJsonFactory = $resultJsonFactory;
+ parent::__construct($context);
+ }
+
+ /**
+ * Delete specified customer addresses using grid massaction
+ *
+ * @return Json
+ * @throws LocalizedException
+ */
+ public function execute(): Json
+ {
+ $customerData = $this->_session->getData('customer_data');
+ /** @var \Magento\Customer\Model\ResourceModel\Address\Collection $collection */
+ $collection = $this->filter->getCollection($this->collectionFactory->create());
+ $error = false;
+
+ try {
+ if ($customerData && $customerData['customer_id']) {
+ $collection->addFieldToFilter('parent_id', $customerData['customer_id']);
+ } else {
+ throw new \Exception();
+ }
+ $collectionSize = $collection->getSize();
+ /** @var \Magento\Customer\Model\Address $address */
+ foreach ($collection as $address) {
+ $this->addressRepository->deleteById($address->getId());
+ }
+ $message = __('A total of %1 record(s) have been deleted.', $collectionSize);
+ } catch (NoSuchEntityException $e) {
+ $message = __('There is no such address entity to delete.');
+ $error = true;
+ $this->logger->critical($e);
+ } catch (LocalizedException $e) {
+ $message = __($e->getMessage());
+ $error = true;
+ $this->logger->critical($e);
+ } catch (\Exception $e) {
+ $message = __('We can\'t mass delete the addresses right now.');
+ $error = true;
+ $this->logger->critical($e);
+ }
+
+ $resultJson = $this->resultJsonFactory->create();
+ $resultJson->setData(
+ [
+ 'message' => $message,
+ 'error' => $error,
+ ]
+ );
+
+ return $resultJson;
+ }
+}
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Address/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Address/Save.php
new file mode 100644
index 0000000000000..e4daea6f59fdb
--- /dev/null
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Address/Save.php
@@ -0,0 +1,174 @@
+addressRepository = $addressRepository;
+ $this->formFactory = $formFactory;
+ $this->customerRepository = $customerRepository;
+ $this->dataObjectHelper = $dataObjectHelper;
+ $this->addressDataFactory = $addressDataFactory;
+ $this->logger = $logger;
+ $this->resultJsonFactory = $resultJsonFactory;
+ }
+
+ /**
+ * Save customer address action
+ *
+ * @return Json
+ */
+ public function execute(): Json
+ {
+ $customerId = $this->getRequest()->getParam('parent_id', false);
+ $addressId = $this->getRequest()->getParam('entity_id', false);
+
+ $error = false;
+ try {
+ /** @var \Magento\Customer\Api\Data\CustomerInterface $customer */
+ $customer = $this->customerRepository->getById($customerId);
+
+ $addressForm = $this->formFactory->create(
+ 'customer_address',
+ 'adminhtml_customer_address',
+ [],
+ false,
+ false
+ );
+ $addressData = $addressForm->extractData($this->getRequest());
+ $addressData = $addressForm->compactData($addressData);
+
+ $addressData['region'] = [
+ 'region' => $addressData['region'] ?? null,
+ 'region_id' => $addressData['region_id'] ?? null,
+ ];
+ $addressToSave = $this->addressDataFactory->create();
+ $this->dataObjectHelper->populateWithArray(
+ $addressToSave,
+ $addressData,
+ \Magento\Customer\Api\Data\AddressInterface::class
+ );
+ $addressToSave->setCustomerId($customer->getId());
+ $addressToSave->setIsDefaultBilling(
+ (bool)$this->getRequest()->getParam('default_billing', false)
+ );
+ $addressToSave->setIsDefaultShipping(
+ (bool)$this->getRequest()->getParam('default_shipping', false)
+ );
+ if ($addressId) {
+ $addressToSave->setId($addressId);
+ $message = __('Customer address has been updated.');
+ } else {
+ $addressToSave->setId(null);
+ $message = __('New customer address has been added.');
+ }
+ $savedAddress = $this->addressRepository->save($addressToSave);
+ $addressId = $savedAddress->getId();
+ } catch (NoSuchEntityException $e) {
+ $this->logger->critical($e);
+ $error = true;
+ $message = __('There is no customer with such id.');
+ } catch (LocalizedException $e) {
+ $error = true;
+ $message = __($e->getMessage());
+ $this->logger->critical($e);
+ } catch (\Exception $e) {
+ $error = true;
+ $message = __('We can\'t change customer address right now.');
+ $this->logger->critical($e);
+ }
+
+ $addressId = empty($addressId) ? null : $addressId;
+ $resultJson = $this->resultJsonFactory->create();
+ $resultJson->setData(
+ [
+ 'message' => $message,
+ 'error' => $error,
+ 'data' => [
+ 'entity_id' => $addressId
+ ]
+ ]
+ );
+
+ return $resultJson;
+ }
+}
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Address/Validate.php b/app/code/Magento/Customer/Controller/Adminhtml/Address/Validate.php
new file mode 100644
index 0000000000000..16a40fd9016f8
--- /dev/null
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Address/Validate.php
@@ -0,0 +1,99 @@
+resultJsonFactory = $resultJsonFactory;
+ $this->formFactory = $formFactory;
+ }
+
+ /**
+ * AJAX customer address validation action
+ *
+ * @return Json
+ */
+ public function execute(): Json
+ {
+ /** @var \Magento\Framework\DataObject $response */
+ $response = new \Magento\Framework\DataObject();
+ $response->setError(false);
+
+ /** @var \Magento\Framework\DataObject $validatedResponse */
+ $validatedResponse = $this->validateCustomerAddress($response);
+ $resultJson = $this->resultJsonFactory->create();
+ if ($validatedResponse->getError()) {
+ $validatedResponse->setError(true);
+ $validatedResponse->setMessages($response->getMessages());
+ }
+
+ $resultJson->setData($validatedResponse);
+
+ return $resultJson;
+ }
+
+ /**
+ * Customer address validation.
+ *
+ * @param DataObject $response
+ * @return \Magento\Framework\DataObject
+ */
+ private function validateCustomerAddress(DataObject $response): DataObject
+ {
+ $addressForm = $this->formFactory->create('customer_address', 'adminhtml_customer_address');
+ $formData = $addressForm->extractData($this->getRequest());
+
+ $errors = $addressForm->validateData($formData);
+ if ($errors !== true) {
+ $messages = $response->hasMessages() ? $response->getMessages() : [];
+ foreach ($errors as $error) {
+ $messages[] = $error;
+ }
+ $response->setMessages($messages);
+ $response->setError(true);
+ }
+
+ return $response;
+ }
+}
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php b/app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php
index 506eac3230200..e9034c8050383 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php
@@ -10,11 +10,16 @@
use Magento\Customer\Api\AddressMetadataInterface;
use Magento\Customer\Model\FileUploader;
use Magento\Customer\Model\FileUploaderFactory;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
use Magento\Framework\Controller\ResultFactory;
use Magento\Framework\Exception\LocalizedException;
use Psr\Log\LoggerInterface;
-class Upload extends Action
+/**
+ * Uploads files for customer address
+ */
+class Upload extends Action implements HttpGetActionInterface, HttpPostActionInterface
{
/**
* Authorization level of a basic admin session
@@ -38,21 +43,29 @@ class Upload extends Action
*/
private $logger;
+ /**
+ * @var string
+ */
+ private $scope;
+
/**
* @param Context $context
* @param FileUploaderFactory $fileUploaderFactory
* @param AddressMetadataInterface $addressMetadataService
* @param LoggerInterface $logger
+ * @param string $scope
*/
public function __construct(
Context $context,
FileUploaderFactory $fileUploaderFactory,
AddressMetadataInterface $addressMetadataService,
- LoggerInterface $logger
+ LoggerInterface $logger,
+ string $scope = 'address'
) {
$this->fileUploaderFactory = $fileUploaderFactory;
$this->addressMetadataService = $addressMetadataService;
$this->logger = $logger;
+ $this->scope = $scope;
parent::__construct($context);
}
@@ -69,14 +82,14 @@ public function execute()
// Must be executed before any operations with $_FILES!
$this->convertFilesArray();
- $attributeCode = key($_FILES['address']['name']);
+ $attributeCode = key($_FILES[$this->scope]['name']);
$attributeMetadata = $this->addressMetadataService->getAttributeMetadata($attributeCode);
/** @var FileUploader $fileUploader */
$fileUploader = $this->fileUploaderFactory->create([
'attributeMetadata' => $attributeMetadata,
'entityTypeCode' => AddressMetadataInterface::ENTITY_TYPE_ADDRESS,
- 'scope' => 'address',
+ 'scope' => $this->scope,
]);
$errors = $fileUploader->validate();
@@ -114,14 +127,11 @@ public function execute()
*/
private function convertFilesArray()
{
- foreach ($_FILES['address'] as $itemKey => $item) {
- foreach ($item as $value) {
- if (is_array($value)) {
- $_FILES['address'][$itemKey] = [
- key($value) => current($value),
- ];
- }
+ foreach ($_FILES as $itemKey => $item) {
+ foreach ($item as $fieldName => $value) {
+ $_FILES[$this->scope][$fieldName] = [$itemKey => $value];
}
+ unset($_FILES[$itemKey]);
}
}
}
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
index 45a7c0182d41c..adb420f983006 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
@@ -15,6 +15,8 @@
use Magento\Framework\Exception\LocalizedException;
/**
+ * Save customer action.
+ *
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Save extends \Magento\Customer\Controller\Adminhtml\Index implements HttpPostActionInterface
@@ -108,6 +110,7 @@ protected function _extractData(
/**
* Saves default_billing and default_shipping flags for customer address
*
+ * @deprecated must be removed because addresses are save separately for now
* @param array $addressIdList
* @param array $extractedCustomerData
* @return array
@@ -150,6 +153,7 @@ protected function saveDefaultFlags(array $addressIdList, array & $extractedCust
/**
* Reformat customer addresses data to be compatible with customer service interface
*
+ * @deprecated addresses are saved separately for now
* @param array $extractedCustomerData
* @return array
*/
@@ -188,7 +192,6 @@ public function execute()
try {
// optional fields might be set in request for future processing by observers in other modules
$customerData = $this->_extractCustomerData();
- $addressesData = $this->_extractCustomerAddressData($customerData);
if ($customerId) {
$currentCustomer = $this->_customerRepository->getById($customerId);
@@ -206,28 +209,12 @@ public function execute()
$customerData,
\Magento\Customer\Api\Data\CustomerInterface::class
);
- $addresses = [];
- foreach ($addressesData as $addressData) {
- $region = isset($addressData['region']) ? $addressData['region'] : null;
- $regionId = isset($addressData['region_id']) ? $addressData['region_id'] : null;
- $addressData['region'] = [
- 'region' => $region,
- 'region_id' => $regionId,
- ];
- $addressDataObject = $this->addressDataFactory->create();
- $this->dataObjectHelper->populateWithArray(
- $addressDataObject,
- $addressData,
- \Magento\Customer\Api\Data\AddressInterface::class
- );
- $addresses[] = $addressDataObject;
- }
$this->_eventManager->dispatch(
'adminhtml_customer_prepare_save',
['customer' => $customer, 'request' => $this->getRequest()]
);
- $customer->setAddresses($addresses);
+
if (isset($customerData['sendemail_store_id'])) {
$customer->setStoreId($customerData['sendemail_store_id']);
}
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php
index be09eb7daff76..d91bc7424bffe 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php
@@ -11,6 +11,9 @@
use Magento\Framework\Message\Error;
use Magento\Customer\Controller\Adminhtml\Index as CustomerAction;
+/**
+ * Class for validation of customer
+ */
class Validate extends CustomerAction implements HttpPostActionInterface, HttpGetActionInterface
{
/**
@@ -72,40 +75,6 @@ protected function _validateCustomer($response)
return $customer;
}
- /**
- * Customer address validation.
- *
- * @param \Magento\Framework\DataObject $response
- * @return void
- */
- protected function _validateCustomerAddress($response)
- {
- $addresses = $this->getRequest()->getPost('address');
- if (!is_array($addresses)) {
- return;
- }
- foreach (array_keys($addresses) as $index) {
- if ($index == '_template_') {
- continue;
- }
-
- $addressForm = $this->_formFactory->create('customer_address', 'adminhtml_customer_address');
-
- $requestScope = sprintf('address/%s', $index);
- $formData = $addressForm->extractData($this->getRequest(), $requestScope);
-
- $errors = $addressForm->validateData($formData);
- if ($errors !== true) {
- $messages = $response->hasMessages() ? $response->getMessages() : [];
- foreach ($errors as $error) {
- $messages[] = $error;
- }
- $response->setMessages($messages);
- $response->setError(1);
- }
- }
- }
-
/**
* AJAX customer validation action
*
@@ -116,10 +85,7 @@ public function execute()
$response = new \Magento\Framework\DataObject();
$response->setError(0);
- $customer = $this->_validateCustomer($response);
- if ($customer) {
- $this->_validateCustomerAddress($response);
- }
+ $this->_validateCustomer($response);
$resultJson = $this->resultJsonFactory->create();
if ($response->getError()) {
$response->setError(true);
diff --git a/app/code/Magento/Customer/Controller/Ajax/Login.php b/app/code/Magento/Customer/Controller/Ajax/Login.php
index 6d0f8c036b290..203f2d014f3a0 100644
--- a/app/code/Magento/Customer/Controller/Ajax/Login.php
+++ b/app/code/Magento/Customer/Controller/Ajax/Login.php
@@ -202,17 +202,15 @@ public function execute()
$response['redirectUrl'] = $this->_redirect->success($redirectRoute);
$this->getAccountRedirect()->clearRedirectCookie();
}
- } catch (LocalizedException | InvalidEmailOrPasswordException | EmailNotConfirmedException $e) {
+ } catch (LocalizedException $e) {
$response = [
'errors' => true,
'message' => $e->getMessage(),
- 'captcha' => $this->customerSession->getData('user_login_show_captcha')
];
} catch (\Exception $e) {
$response = [
'errors' => true,
'message' => __('Invalid login or password.'),
- 'captcha' => $this->customerSession->getData('user_login_show_captcha')
];
}
/** @var \Magento\Framework\Controller\Result\Json $resultJson */
diff --git a/app/code/Magento/Customer/Model/Address/AbstractAddress.php b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
index 1b7e3ca6aead0..146fec4c79f46 100644
--- a/app/code/Magento/Customer/Model/Address/AbstractAddress.php
+++ b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
@@ -230,7 +230,7 @@ public function getStreet()
public function getStreetLine($number)
{
$lines = $this->getStreet();
- return isset($lines[$number - 1]) ? $lines[$number - 1] : '';
+ return $lines[$number - 1] ?? '';
}
/**
@@ -271,8 +271,9 @@ public function setStreet($street)
* Enforce format of the street field or other multiline custom attributes
*
* @param array|string $key
- * @param mixed $value
- * @return $this
+ * @param array|string|null $value
+ *
+ * @return \Magento\Framework\DataObject
*/
public function setData($key, $value = null)
{
@@ -404,7 +405,7 @@ public function getRegionCode()
}
/**
- * Get region id
+ * Return Region ID
*
* @return int
*/
@@ -507,7 +508,7 @@ public function getConfig()
}
/**
- * Before save handler
+ * Processing object before save data
*
* @return $this
*/
@@ -523,10 +524,12 @@ public function beforeSave()
*
* @param int|null $defaultBillingAddressId
* @param int|null $defaultShippingAddressId
+ *
* @return AddressInterface
* Use Api/Data/AddressInterface as a result of service operations. Don't rely on the model to provide
* the instance of Api/Data/AddressInterface
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @throws \Magento\Framework\Exception\LocalizedException
*/
public function getDataModel($defaultBillingAddressId = null, $defaultShippingAddressId = null)
{
@@ -633,6 +636,7 @@ public function unsRegion()
*
* @return bool
* @since 100.2.0
+ * @throws \Magento\Framework\Exception\LocalizedException
*/
protected function isCompanyRequired()
{
@@ -644,6 +648,7 @@ protected function isCompanyRequired()
*
* @return bool
* @since 100.2.0
+ * @throws \Magento\Framework\Exception\LocalizedException
*/
protected function isTelephoneRequired()
{
@@ -655,6 +660,7 @@ protected function isTelephoneRequired()
*
* @return bool
* @since 100.2.0
+ * @throws \Magento\Framework\Exception\LocalizedException
*/
protected function isFaxRequired()
{
diff --git a/app/code/Magento/Customer/Model/Address/DataProvider.php b/app/code/Magento/Customer/Model/Address/DataProvider.php
new file mode 100644
index 0000000000000..e1dd68207cae5
--- /dev/null
+++ b/app/code/Magento/Customer/Model/Address/DataProvider.php
@@ -0,0 +1,233 @@
+collection = $addressCollectionFactory->create();
+ $this->collection->addAttributeToSelect('*');
+ $this->customerRepository = $customerRepository;
+ $this->allowToShowHiddenAttributes = $allowToShowHiddenAttributes;
+ $this->context = $context;
+ $this->fileUploaderDataResolver = $fileUploaderDataResolver;
+ $this->attributeMetadataResolver = $attributeMetadataResolver;
+ $this->meta['general']['children'] = $this->getAttributesMeta(
+ $eavConfig->getEntityType('customer_address')
+ );
+ }
+
+ /**
+ * Get Addresses data and process customer default billing & shipping addresses
+ *
+ * @return array
+ * @throws \Magento\Framework\Exception\LocalizedException
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
+ */
+ public function getData(): array
+ {
+ if (null !== $this->loadedData) {
+ return $this->loadedData;
+ }
+ $items = $this->collection->getItems();
+ /** @var Address $item */
+ foreach ($items as $item) {
+ $addressId = $item->getEntityId();
+ $item->load($addressId);
+ $this->loadedData[$addressId] = $item->getData();
+ $customerId = $this->loadedData[$addressId]['parent_id'];
+ /** @var \Magento\Customer\Model\Customer $customer */
+ $customer = $this->customerRepository->getById($customerId);
+ $defaultBilling = $customer->getDefaultBilling();
+ $defaultShipping = $customer->getDefaultShipping();
+ $this->prepareAddressData($addressId, $this->loadedData, $defaultBilling, $defaultShipping);
+ $this->fileUploaderDataResolver->overrideFileUploaderData($item, $this->loadedData[$addressId]);
+ }
+
+ if (null === $this->loadedData) {
+ $this->loadedData[''] = $this->getDefaultData();
+ }
+
+ return $this->loadedData;
+ }
+
+ /**
+ * Prepare address data
+ *
+ * @param int $addressId
+ * @param array $addresses
+ * @param string|null $defaultBilling
+ * @param string|null $defaultShipping
+ * @return void
+ */
+ private function prepareAddressData($addressId, array &$addresses, $defaultBilling, $defaultShipping): void
+ {
+ if (null !== $defaultBilling && $addressId === $defaultBilling) {
+ $addresses[$addressId]['default_billing'] = '1';
+ }
+ if (null !== $defaultShipping && $addressId === $defaultShipping) {
+ $addresses[$addressId]['default_shipping'] = '1';
+ }
+ foreach ($this->meta['general']['children'] as $attributeName => $attributeMeta) {
+ if ($attributeMeta['arguments']['data']['config']['dataType'] === Multiline::NAME
+ && isset($this->loadedData[$addressId][$attributeName])
+ && !\is_array($this->loadedData[$addressId][$attributeName])
+ ) {
+ $this->loadedData[$addressId][$attributeName] = explode(
+ "\n",
+ $this->loadedData[$addressId][$attributeName]
+ );
+ }
+ }
+ }
+
+ /**
+ * Get default customer data for adding new address
+ *
+ * @throws \Magento\Framework\Exception\LocalizedException
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
+ * @return array
+ */
+ private function getDefaultData(): array
+ {
+ $parentId = $this->context->getRequestParam('parent_id');
+ $customer = $this->customerRepository->getById($parentId);
+ $data = [
+ 'parent_id' => $parentId,
+ 'firstname' => $customer->getFirstname(),
+ 'lastname' => $customer->getLastname()
+ ];
+
+ return $data;
+ }
+
+ /**
+ * Get attributes meta
+ *
+ * @param Type $entityType
+ * @return array
+ * @throws \Magento\Framework\Exception\LocalizedException
+ */
+ private function getAttributesMeta(Type $entityType): array
+ {
+ $meta = [];
+ $attributes = $entityType->getAttributeCollection();
+ /* @var AbstractAttribute $attribute */
+ foreach ($attributes as $attribute) {
+ if (\in_array($attribute->getFrontendInput(), $this->bannedInputTypes, true)) {
+ continue;
+ }
+ if (\in_array($attribute->getAttributeCode(), self::$attributesToEliminate, true)) {
+ continue;
+ }
+
+ $meta[$attribute->getAttributeCode()] = $this->attributeMetadataResolver->getAttributesMeta(
+ $attribute,
+ $entityType,
+ $this->allowToShowHiddenAttributes,
+ $this->getRequestFieldName()
+ );
+ }
+ $this->attributeMetadataResolver->processWebsiteMeta($meta);
+
+ return $meta;
+ }
+}
diff --git a/app/code/Magento/Customer/Model/AttributeMetadataResolver.php b/app/code/Magento/Customer/Model/AttributeMetadataResolver.php
new file mode 100644
index 0000000000000..c22cc9a4f23f4
--- /dev/null
+++ b/app/code/Magento/Customer/Model/AttributeMetadataResolver.php
@@ -0,0 +1,241 @@
+ 'frontend_input',
+ 'visible' => 'is_visible',
+ 'required' => 'is_required',
+ 'label' => 'frontend_label',
+ 'sortOrder' => 'sort_order',
+ 'notice' => 'note',
+ 'default' => 'default_value',
+ 'size' => 'multiline_count',
+ ];
+
+ /**
+ * Form element mapping
+ *
+ * @var array
+ */
+ private static $formElement = [
+ 'text' => 'input',
+ 'hidden' => 'input',
+ 'boolean' => 'checkbox',
+ ];
+
+ /**
+ * @var CountryWithWebsites
+ */
+ private $countryWithWebsiteSource;
+
+ /**
+ * @var EavValidationRules
+ */
+ private $eavValidationRules;
+
+ /**
+ * @var FileUploaderDataResolver
+ */
+ private $fileUploaderDataResolver;
+
+ /**
+ * @var ContextInterface
+ */
+ private $context;
+
+ /**
+ * @var ShareConfig
+ */
+ private $shareConfig;
+
+ /**
+ * @param CountryWithWebsites $countryWithWebsiteSource
+ * @param EavValidationRules $eavValidationRules
+ * @param \Magento\Customer\Model\FileUploaderDataResolver $fileUploaderDataResolver
+ * @param ContextInterface $context
+ * @param ShareConfig $shareConfig
+ */
+ public function __construct(
+ CountryWithWebsites $countryWithWebsiteSource,
+ EavValidationRules $eavValidationRules,
+ fileUploaderDataResolver $fileUploaderDataResolver,
+ ContextInterface $context,
+ ShareConfig $shareConfig
+ ) {
+ $this->countryWithWebsiteSource = $countryWithWebsiteSource;
+ $this->eavValidationRules = $eavValidationRules;
+ $this->fileUploaderDataResolver = $fileUploaderDataResolver;
+ $this->context = $context;
+ $this->shareConfig = $shareConfig;
+ }
+
+ /**
+ * Get meta data of the customer or customer address attribute
+ *
+ * @param AbstractAttribute $attribute
+ * @param Type $entityType
+ * @param bool $allowToShowHiddenAttributes
+ * @param string $requestFieldName
+ * @return array
+ * @throws \Magento\Framework\Exception\LocalizedException
+ */
+ public function getAttributesMeta(
+ AbstractAttribute $attribute,
+ Type $entityType,
+ bool $allowToShowHiddenAttributes,
+ string $requestFieldName
+ ): array {
+ $meta = $this->modifyBooleanAttributeMeta($attribute);
+ // use getDataUsingMethod, since some getters are defined and apply additional processing of returning value
+ foreach (self::$metaProperties as $metaName => $origName) {
+ $value = $attribute->getDataUsingMethod($origName);
+ $meta['arguments']['data']['config'][$metaName] = ($metaName === 'label') ? __($value) : $value;
+ if ('frontend_input' === $origName) {
+ $meta['arguments']['data']['config']['formElement'] = self::$formElement[$value] ?? $value;
+ }
+ }
+
+ if ($attribute->usesSource()) {
+ if ($attribute->getAttributeCode() === AddressInterface::COUNTRY_ID) {
+ $meta['arguments']['data']['config']['options'] = $this->countryWithWebsiteSource
+ ->getAllOptions();
+ } else {
+ $meta['arguments']['data']['config']['options'] = $attribute->getSource()->getAllOptions();
+ }
+ }
+
+ $rules = $this->eavValidationRules->build($attribute, $meta['arguments']['data']['config']);
+ if (!empty($rules)) {
+ $meta['arguments']['data']['config']['validation'] = $rules;
+ }
+
+ $meta['arguments']['data']['config']['componentType'] = Field::NAME;
+ $meta['arguments']['data']['config']['visible'] = $this->canShowAttribute(
+ $attribute,
+ $requestFieldName,
+ $allowToShowHiddenAttributes
+ );
+
+ $this->fileUploaderDataResolver->overrideFileUploaderMetadata(
+ $entityType,
+ $attribute,
+ $meta['arguments']['data']['config']
+ );
+
+ return $meta;
+ }
+
+ /**
+ * Detect can we show attribute on specific form or not
+ *
+ * @param AbstractAttribute $customerAttribute
+ * @param string $requestFieldName
+ * @param bool $allowToShowHiddenAttributes
+ * @return bool
+ */
+ private function canShowAttribute(
+ AbstractAttribute $customerAttribute,
+ string $requestFieldName,
+ bool $allowToShowHiddenAttributes
+ ) {
+ $userDefined = (bool)$customerAttribute->getIsUserDefined();
+ if (!$userDefined) {
+ return $customerAttribute->getIsVisible();
+ }
+
+ $canShowOnForm = $this->canShowAttributeInForm($customerAttribute, $requestFieldName);
+
+ return ($allowToShowHiddenAttributes && $canShowOnForm) ||
+ (!$allowToShowHiddenAttributes && $canShowOnForm && $customerAttribute->getIsVisible());
+ }
+
+ /**
+ * Check whether the specific attribute can be shown in form: customer registration, customer edit, etc...
+ *
+ * @param AbstractAttribute $customerAttribute
+ * @param string $requestFieldName
+ * @return bool
+ */
+ private function canShowAttributeInForm(AbstractAttribute $customerAttribute, string $requestFieldName): bool
+ {
+ $isRegistration = $this->context->getRequestParam($requestFieldName) === null;
+
+ if ($customerAttribute->getEntityType()->getEntityTypeCode() === 'customer') {
+ return \is_array($customerAttribute->getUsedInForms()) &&
+ (
+ (\in_array('customer_account_create', $customerAttribute->getUsedInForms(), true)
+ && $isRegistration) ||
+ (\in_array('customer_account_edit', $customerAttribute->getUsedInForms(), true)
+ && !$isRegistration)
+ );
+ }
+ return \is_array($customerAttribute->getUsedInForms()) &&
+ \in_array('customer_address_edit', $customerAttribute->getUsedInForms(), true);
+ }
+
+ /**
+ * Modify boolean attribute meta data
+ *
+ * @param AttributeInterface $attribute
+ * @return array
+ */
+ private function modifyBooleanAttributeMeta(AttributeInterface $attribute): array
+ {
+ $meta = [];
+ if ($attribute->getFrontendInput() === 'boolean') {
+ $meta['arguments']['data']['config']['prefer'] = 'toggle';
+ $meta['arguments']['data']['config']['valueMap'] = [
+ 'true' => '1',
+ 'false' => '0',
+ ];
+ }
+
+ return $meta;
+ }
+
+ /**
+ * Add global scope parameter and filter options to website meta
+ *
+ * @param array $meta
+ * @return void
+ */
+ public function processWebsiteMeta(&$meta): void
+ {
+ if (isset($meta[CustomerInterface::WEBSITE_ID]) && $this->shareConfig->isGlobalScope()) {
+ $meta[CustomerInterface::WEBSITE_ID]['arguments']['data']['config']['isGlobalScope'] = 1;
+ }
+
+ if (isset($meta[AddressInterface::COUNTRY_ID]) && !$this->shareConfig->isGlobalScope()) {
+ $meta[AddressInterface::COUNTRY_ID]['arguments']['data']['config']['filterBy'] = [
+ 'target' => 'customer_form.customer_form_data_source:data.customer.website_id',
+ 'field' => 'website_ids'
+ ];
+ }
+ }
+}
diff --git a/app/code/Magento/Customer/Model/Customer/DataProvider.php b/app/code/Magento/Customer/Model/Customer/DataProvider.php
index 31f126e937c92..16739c6e61864 100644
--- a/app/code/Magento/Customer/Model/Customer/DataProvider.php
+++ b/app/code/Magento/Customer/Model/Customer/DataProvider.php
@@ -34,6 +34,7 @@
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*
+ * @deprecated \Magento\Customer\Model\Address\DataProvider is used instead
* @api
* @since 100.0.2
*/
@@ -162,7 +163,6 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
* @param array $data
* @param ContextInterface $context
* @param bool $allowToShowHiddenAttributes
- * @throws \Magento\Framework\Exception\LocalizedException
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
diff --git a/app/code/Magento/Customer/Model/Customer/DataProviderWithDefaultAddresses.php b/app/code/Magento/Customer/Model/Customer/DataProviderWithDefaultAddresses.php
new file mode 100644
index 0000000000000..4d1bb2e6b9e99
--- /dev/null
+++ b/app/code/Magento/Customer/Model/Customer/DataProviderWithDefaultAddresses.php
@@ -0,0 +1,200 @@
+collection = $customerCollectionFactory->create();
+ $this->collection->addAttributeToSelect('*');
+ $this->allowToShowHiddenAttributes = $allowToShowHiddenAttributes;
+ $this->session = $session;
+ $this->countryFactory = $countryFactory;
+ $this->fileUploaderDataResolver = $fileUploaderDataResolver;
+ $this->attributeMetadataResolver = $attributeMetadataResolver;
+ $this->meta['customer']['children'] = $this->getAttributesMeta(
+ $eavConfig->getEntityType('customer')
+ );
+ }
+
+ /**
+ * Get data
+ *
+ * @return array
+ */
+ public function getData(): array
+ {
+ if (!empty($this->loadedData)) {
+ return $this->loadedData;
+ }
+ $items = $this->collection->getItems();
+ /** @var Customer $customer */
+ foreach ($items as $customer) {
+ $result['customer'] = $customer->getData();
+
+ $this->fileUploaderDataResolver->overrideFileUploaderData($customer, $result['customer']);
+
+ $result['customer'] = array_diff_key(
+ $result['customer'],
+ array_flip(self::$forbiddenCustomerFields)
+ );
+ unset($result['address']);
+
+ $result['default_billing_address'] = $this->prepareDefaultAddress(
+ $customer->getDefaultBillingAddress()
+ );
+ $result['default_shipping_address'] = $this->prepareDefaultAddress(
+ $customer->getDefaultShippingAddress()
+ );
+ $result['customer_id'] = $customer->getId();
+
+ $this->loadedData[$customer->getId()] = $result;
+ }
+
+ $data = $this->session->getCustomerFormData();
+ if (!empty($data)) {
+ $customerId = $data['customer']['entity_id'] ?? null;
+ $this->loadedData[$customerId] = $data;
+ $this->session->unsCustomerFormData();
+ }
+
+ return $this->loadedData;
+ }
+
+ /**
+ * Prepare default address data.
+ *
+ * @param Address|false $address
+ * @return array
+ */
+ private function prepareDefaultAddress($address): array
+ {
+ $addressData = [];
+
+ if (!empty($address)) {
+ $addressData = $address->getData();
+ if (isset($addressData['street']) && !\is_array($address['street'])) {
+ $addressData['street'] = explode("\n", $addressData['street']);
+ }
+ $addressData['country'] = $this->countryFactory->create()
+ ->loadByCode($addressData['country_id'])->getName();
+ }
+
+ return $addressData;
+ }
+
+ /**
+ * Get attributes meta
+ *
+ * @param Type $entityType
+ * @return array
+ * @throws \Magento\Framework\Exception\LocalizedException
+ */
+ private function getAttributesMeta(Type $entityType): array
+ {
+ $meta = [];
+ $attributes = $entityType->getAttributeCollection();
+ /* @var AbstractAttribute $attribute */
+ foreach ($attributes as $attribute) {
+ $meta[$attribute->getAttributeCode()] = $this->attributeMetadataResolver->getAttributesMeta(
+ $attribute,
+ $entityType,
+ $this->allowToShowHiddenAttributes,
+ $this->getRequestFieldName()
+ );
+ }
+ $this->attributeMetadataResolver->processWebsiteMeta($meta);
+
+ return $meta;
+ }
+}
diff --git a/app/code/Magento/Customer/Model/FileUploaderDataResolver.php b/app/code/Magento/Customer/Model/FileUploaderDataResolver.php
new file mode 100644
index 0000000000000..535bfe97bc457
--- /dev/null
+++ b/app/code/Magento/Customer/Model/FileUploaderDataResolver.php
@@ -0,0 +1,204 @@
+fileProcessorFactory = $fileProcessorFactory;
+ }
+
+ /**
+ * Override file uploader UI component data
+ *
+ * Overrides data for attributes with frontend_input equal to 'image' or 'file'.
+ *
+ * @param Customer|Address $entity
+ * @param array $entityData
+ * @return void
+ */
+ public function overrideFileUploaderData($entity, array &$entityData): void
+ {
+ $attributes = $entity->getAttributes();
+ foreach ($attributes as $attribute) {
+ /** @var Attribute $attribute */
+ if (\in_array($attribute->getFrontendInput(), $this->fileUploaderTypes, true)) {
+ $entityData[$attribute->getAttributeCode()] = $this->getFileUploaderData(
+ $entity->getEntityType(),
+ $attribute,
+ $entityData
+ );
+ }
+ }
+ }
+
+ /**
+ * Retrieve array of values required by file uploader UI component
+ *
+ * @param Type $entityType
+ * @param Attribute $attribute
+ * @param array $customerData
+ * @return array
+ */
+ private function getFileUploaderData(
+ Type $entityType,
+ Attribute $attribute,
+ array $customerData
+ ): array {
+ $attributeCode = $attribute->getAttributeCode();
+
+ $file = $customerData[$attributeCode] ?? null;
+
+ /** @var FileProcessor $fileProcessor */
+ $fileProcessor = $this->fileProcessorFactory->create([
+ 'entityTypeCode' => $entityType->getEntityTypeCode(),
+ ]);
+
+ if (!empty($file)
+ && $fileProcessor->isExist($file)
+ ) {
+ $stat = $fileProcessor->getStat($file);
+ $viewUrl = $fileProcessor->getViewUrl($file, $attribute->getFrontendInput());
+
+ return [
+ [
+ 'file' => $file,
+ 'size' => null !== $stat ? $stat['size'] : 0,
+ 'url' => $viewUrl ?? '',
+ 'name' => basename($file),
+ 'type' => $fileProcessor->getMimeType($file),
+ ],
+ ];
+ }
+
+ return [];
+ }
+
+ /**
+ * Override file uploader UI component metadata
+ *
+ * Overrides metadata for attributes with frontend_input equal to 'image' or 'file'.
+ *
+ * @param Type $entityType
+ * @param AbstractAttribute $attribute
+ * @param array $config
+ * @return void
+ */
+ public function overrideFileUploaderMetadata(
+ Type $entityType,
+ AbstractAttribute $attribute,
+ array &$config
+ ): void {
+ if (\in_array($attribute->getFrontendInput(), $this->fileUploaderTypes, true)) {
+ $maxFileSize = self::MAX_FILE_SIZE;
+
+ if (isset($config['validation']['max_file_size'])) {
+ $maxFileSize = (int)$config['validation']['max_file_size'];
+ }
+
+ $allowedExtensions = [];
+
+ if (isset($config['validation']['file_extensions'])) {
+ $allowedExtensions = explode(',', $config['validation']['file_extensions']);
+ array_walk($allowedExtensions, function (&$value) {
+ $value = strtolower(trim($value));
+ });
+ }
+
+ $allowedExtensions = implode(' ', $allowedExtensions);
+
+ $entityTypeCode = $entityType->getEntityTypeCode();
+ $url = $this->getFileUploadUrl($entityTypeCode);
+
+ $config = [
+ 'formElement' => 'fileUploader',
+ 'componentType' => 'fileUploader',
+ 'maxFileSize' => $maxFileSize,
+ 'allowedExtensions' => $allowedExtensions,
+ 'uploaderConfig' => [
+ 'url' => $url,
+ ],
+ 'label' => $this->getMetadataValue($config, 'label'),
+ 'sortOrder' => $this->getMetadataValue($config, 'sortOrder'),
+ 'required' => $this->getMetadataValue($config, 'required'),
+ 'visible' => $this->getMetadataValue($config, 'visible'),
+ 'validation' => $this->getMetadataValue($config, 'validation'),
+ ];
+ }
+ }
+
+ /**
+ * Retrieve metadata value
+ *
+ * @param array $config
+ * @param string $name
+ * @param mixed $default
+ * @return mixed
+ */
+ private function getMetadataValue($config, $name, $default = null)
+ {
+ return $config[$name] ?? $default;
+ }
+
+ /**
+ * Retrieve URL to file upload
+ *
+ * @param string $entityTypeCode
+ * @return string
+ */
+ private function getFileUploadUrl($entityTypeCode): string
+ {
+ switch ($entityTypeCode) {
+ case CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER:
+ $url = 'customer/file/customer_upload';
+ break;
+
+ case AddressMetadataInterface::ENTITY_TYPE_ADDRESS:
+ $url = 'customer/file/address_upload';
+ break;
+
+ default:
+ $url = '';
+ break;
+ }
+ return $url;
+ }
+}
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/File.php b/app/code/Magento/Customer/Model/Metadata/Form/File.php
index e6e9c2b50c068..227e85ed98f91 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/File.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/File.php
@@ -15,6 +15,8 @@
use Magento\Framework\Filesystem;
/**
+ * Processes files that are save for customer.
+ *
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class File extends AbstractData
@@ -66,7 +68,7 @@ class File extends AbstractData
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Customer\Api\Data\AttributeMetadataInterface $attribute
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
- * @param null $value
+ * @param string|array $value
* @param string $entityTypeCode
* @param bool $isAjax
* @param \Magento\Framework\Url\EncoderInterface $urlEncoder
@@ -101,7 +103,7 @@ public function __construct(
}
/**
- * {@inheritdoc}
+ * @inheritdoc
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function extractValue(\Magento\Framework\App\RequestInterface $request)
@@ -109,7 +111,7 @@ public function extractValue(\Magento\Framework\App\RequestInterface $request)
$extend = $this->_getRequestValue($request);
$attrCode = $this->getAttribute()->getAttributeCode();
- if ($this->_requestScope) {
+ if ($this->_requestScope || !isset($_FILES[$attrCode])) {
$value = [];
if (strpos($this->_requestScope, '/') !== false) {
$scopes = explode('/', $this->_requestScope);
@@ -160,8 +162,7 @@ public function extractValue(\Magento\Framework\App\RequestInterface $request)
}
/**
- * Validate file by attribute validate rules
- * Return array of errors
+ * Validate file by attribute validate rules. Returns array of errors.
*
* @param array $value
* @return string[]
@@ -232,7 +233,7 @@ protected function _isUploadedFile($filename)
}
/**
- * {@inheritdoc}
+ * @inheritdoc
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
@@ -273,7 +274,7 @@ public function validateValue($value)
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*
* @return ImageContentInterface|array|string|null
*/
@@ -358,7 +359,7 @@ protected function processInputFieldValue($value)
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function restoreValue($value)
{
@@ -366,7 +367,7 @@ public function restoreValue($value)
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function outputValue($format = \Magento\Customer\Model\Metadata\ElementFactory::OUTPUT_FORMAT_TEXT)
{
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Grid/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Grid/Collection.php
new file mode 100644
index 0000000000000..4e0347059086f
--- /dev/null
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Grid/Collection.php
@@ -0,0 +1,143 @@
+_eventPrefix = $eventPrefix;
+ $this->_eventObject = $eventObject;
+ $this->_init($model, $resourceModel);
+ $this->setMainTable($mainTable);
+ $this->_idFieldName = 'entity_id';
+ parent::__construct(
+ $entityFactory,
+ $logger,
+ $fetchStrategy,
+ $eventManager,
+ $connection,
+ $resource
+ );
+ }
+
+ /**
+ * @inheritdoc
+ *
+ * @return AggregationInterface
+ */
+ public function getAggregations()
+ {
+ return $this->aggregations;
+ }
+
+ /**
+ * @inheritdoc
+ *
+ * @param AggregationInterface $aggregations
+ * @return $this
+ */
+ public function setAggregations($aggregations)
+ {
+ $this->aggregations = $aggregations;
+ return $this;
+ }
+
+ /**
+ * Get search criteria.
+ *
+ * @return \Magento\Framework\Api\SearchCriteriaInterface|null
+ */
+ public function getSearchCriteria()
+ {
+ return null;
+ }
+
+ /**
+ * Set search criteria.
+ *
+ * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
+ * @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria = null)
+ {
+ return $this;
+ }
+
+ /**
+ * Get total count.
+ *
+ * @return int
+ */
+ public function getTotalCount()
+ {
+ return $this->getSize();
+ }
+
+ /**
+ * Set total count.
+ *
+ * @param int $totalCount
+ * @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function setTotalCount($totalCount)
+ {
+ return $this;
+ }
+
+ /**
+ * Set items list.
+ *
+ * @param \Magento\Framework\Api\ExtensibleDataInterface[] $items
+ * @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function setItems(array $items = null)
+ {
+ return $this;
+ }
+}
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Relation.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Relation.php
index d473a4dc01891..ae342a1b10dd8 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address/Relation.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Relation.php
@@ -7,6 +7,8 @@
*/
namespace Magento\Customer\Model\ResourceModel\Address;
+use Magento\Customer\Model\Address;
+use Magento\Customer\Model\Customer;
use Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationInterface;
/**
@@ -36,19 +38,14 @@ public function __construct(\Magento\Customer\Model\CustomerFactory $customerFac
public function processRelation(\Magento\Framework\Model\AbstractModel $object)
{
/**
- * @var $object \Magento\Customer\Model\Address
+ * @var $object Address
*/
- if (!$object->getIsCustomerSaveTransaction() && $this->isAddressDefault($object)) {
+ if (!$object->getIsCustomerSaveTransaction() && $object->getId()) {
$customer = $this->customerFactory->create()->load($object->getCustomerId());
- $changedAddresses = [];
-
- if ($object->getIsDefaultBilling()) {
- $changedAddresses['default_billing'] = $object->getId();
- }
- if ($object->getIsDefaultShipping()) {
- $changedAddresses['default_shipping'] = $object->getId();
- }
+ $changedAddresses = [];
+ $changedAddresses = $this->getDefaultBillingChangedAddress($object, $customer, $changedAddresses);
+ $changedAddresses = $this->getDefaultShippingChangedAddress($object, $customer, $changedAddresses);
if ($changedAddresses) {
$customer->getResource()->getConnection()->update(
@@ -60,9 +57,62 @@ public function processRelation(\Magento\Framework\Model\AbstractModel $object)
}
}
+ /**
+ * Get default billing changed address
+ *
+ * @param Address $object
+ * @param Customer $customer
+ * @param array $changedAddresses
+ * @return array
+ */
+ private function getDefaultBillingChangedAddress(
+ Address $object,
+ Customer $customer,
+ array $changedAddresses
+ ): array {
+ if ($object->getIsDefaultBilling()) {
+ $changedAddresses['default_billing'] = $object->getId();
+ } elseif ($customer->getDefaultBillingAddress()
+ && $object->getIsDefaultBilling() === false
+ && (int)$customer->getDefaultBillingAddress()->getId() === (int)$object->getId()
+ ) {
+ $changedAddresses['default_billing'] = null;
+ }
+
+ return $changedAddresses;
+ }
+
+ /**
+ * Get default shipping changed address
+ *
+ * @param Address $object
+ * @param Customer $customer
+ * @param array $changedAddresses
+ * @return array
+ */
+ private function getDefaultShippingChangedAddress(
+ Address $object,
+ Customer $customer,
+ array $changedAddresses
+ ): array {
+ if ($object->getIsDefaultShipping()) {
+ $changedAddresses['default_shipping'] = $object->getId();
+ } elseif ($customer->getDefaultShippingAddress()
+ && $object->getIsDefaultShipping() === false
+ && (int)$customer->getDefaultShippingAddress()->getId() === (int)$object->getId()
+ ) {
+ $changedAddresses['default_shipping'] = null;
+ }
+
+ return $changedAddresses;
+ }
+
/**
* Checks if address has chosen as default and has had an id
*
+ * @deprecated Is not used anymore due to changes in logic of save of address.
+ * If address was default and becomes not default than default address id for customer must be
+ * set to null
* @param \Magento\Framework\Model\AbstractModel $object
* @return bool
*/
diff --git a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
index 77049dac5aa0c..d3be40bdc5cc7 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
@@ -204,6 +204,10 @@ public function save(CustomerInterface $customer, $passwordHash = null)
if ($storeId === null) {
$customerModel->setStoreId($this->storeManager->getStore()->getId());
}
+ // Need to use attribute set or future updates can cause data loss
+ if (!$customerModel->getAttributeSetId()) {
+ $customerModel->setAttributeSetId(CustomerMetadataInterface::ATTRIBUTE_SET_ID_CUSTOMER);
+ }
$this->populateCustomerWithSecureData($customerModel, $passwordHash);
// If customer email was changed, reset RpToken info
if ($prevCustomerData && $prevCustomerData->getEmail() !== $customerModel->getEmail()) {
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerGroupActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerGroupActionGroup.xml
new file mode 100644
index 0000000000000..ba984a4d82562
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerGroupActionGroup.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
index 0071acf2ef1e0..4c458c66ca65b 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
@@ -22,6 +22,9 @@
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
index 2bbe7930f6dbf..eafb85d662c81 100755
--- a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
@@ -108,4 +108,11 @@
GB
444-44-444-44
+
+
+ - 172, Westminster Bridge Rd
+ - 7700 xyz street
+
+ California
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigurationData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigurationData.xml
new file mode 100644
index 0000000000000..60d8b13887ec9
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigurationData.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+ EnableAutomaticAssignmentCustomerGroup
+ EnableValidateEachTransaction
+ EnableShowVATNumberStorefront
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+ DefaultAutomaticAssignmentCustomerGroup
+ DefaultValidateEachTransaction
+ DefaultShowVATNumberStorefront
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
index 6f5ade53e6790..a61871105a5f3 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
@@ -102,4 +102,17 @@
0
US_Address_CA
+
+ 0
+ true
+ true
+ Jane.Doe@example.com
+ Jane
+ Doe
+ Jane Doe
+ pwdTest123!
+ 0
+ 0
+ UK_Not_Default_Address
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Metadata/customer_create_new_account-meta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_create_new_account-meta.xml
new file mode 100644
index 0000000000000..89ed477cb32d1
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_create_new_account-meta.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerGroupPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerGroupPage.xml
new file mode 100644
index 0000000000000..9adda6a74ba99
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerGroupPage.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/AdminNewCustomerGroupPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/AdminNewCustomerGroupPage.xml
new file mode 100644
index 0000000000000..2c52b3ec05c2e
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/AdminNewCustomerGroupPage.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
index 76f692db1db3e..d5a410164a6f1 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
@@ -20,6 +20,7 @@
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressGridMainActionsSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressGridMainActionsSection.xml
new file mode 100644
index 0000000000000..f226d49e3bf54
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressGridMainActionsSection.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressGridSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressGridSection.xml
new file mode 100644
index 0000000000000..fb153a7c102a5
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressGridSection.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesSection.xml
index 175c7ab573d37..6f70c2d087e62 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesSection.xml
@@ -9,16 +9,18 @@
-
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupMainSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupMainSection.xml
new file mode 100644
index 0000000000000..1fdb15f189ace
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupMainSection.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminNewCustomerGroupSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminNewCustomerGroupSection.xml
new file mode 100644
index 0000000000000..ec4a64b01467b
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminNewCustomerGroupSection.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
index 8480dc6e9d2a6..25c07ca9cb3c9 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
@@ -13,4 +13,10 @@
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCheckTaxAddingValidVATIdTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCheckTaxAddingValidVATIdTest.xml
new file mode 100644
index 0000000000000..229e81e877292
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCheckTaxAddingValidVATIdTest.xml
@@ -0,0 +1,148 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Address/DeleteButtonTest.php b/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Address/DeleteButtonTest.php
new file mode 100644
index 0000000000000..7b0da3bd422a6
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Address/DeleteButtonTest.php
@@ -0,0 +1,106 @@
+addressFactory = $this->getMockBuilder(\Magento\Customer\Model\AddressFactory::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->urlBuilder = $this->getMockForAbstractClass(\Magento\Framework\UrlInterface::class);
+ $this->addressResourceModel = $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Address::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->request = $this->getMockForAbstractClass(\Magento\Framework\App\RequestInterface::class);
+ $this->addressRepository = $this->getMockBuilder(
+ \Magento\Customer\Model\ResourceModel\AddressRepository::class
+ )
+ ->disableOriginalConstructor()
+ ->getMock();
+ $objectManagerHelper = new ObjectManagerHelper($this);
+
+ $this->deleteButton = $objectManagerHelper->getObject(
+ \Magento\Customer\Block\Adminhtml\Edit\Address\DeleteButton::class,
+ [
+ 'addressFactory' => $this->addressFactory,
+ 'urlBuilder' => $this->urlBuilder,
+ 'addressResourceModel' => $this->addressResourceModel,
+ 'request' => $this->request,
+ 'addressRepository' => $this->addressRepository,
+ ]
+ );
+ }
+
+ /**
+ * Unit test for \Magento\Customer\Block\Adminhtml\Edit\Address\DeleteButton::getButtonData() method
+ */
+ public function testGetButtonData()
+ {
+ $addressId = 1;
+ $customerId = 2;
+
+ /** @var \Magento\Customer\Model\Address|\PHPUnit_Framework_MockObject_MockObject $address */
+ $address = $this->getMockBuilder(\Magento\Customer\Model\Address::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $address->expects($this->atLeastOnce())->method('getEntityId')->willReturn($addressId);
+ $address->expects($this->atLeastOnce())->method('getCustomerId')->willReturn($customerId);
+ $this->addressFactory->expects($this->atLeastOnce())->method('create')->willReturn($address);
+ $this->request->expects($this->atLeastOnce())->method('getParam')->with('entity_id')
+ ->willReturn($addressId);
+ $this->addressResourceModel->expects($this->atLeastOnce())->method('load')->with($address, $addressId);
+ $this->addressRepository->expects($this->atLeastOnce())->method('getById')->with($addressId)
+ ->willReturn($address);
+ $this->urlBuilder->expects($this->atLeastOnce())->method('getUrl')
+ ->with(
+ \Magento\Customer\Ui\Component\Listing\Address\Column\Actions::CUSTOMER_ADDRESS_PATH_DELETE,
+ ['parent_id' => $customerId, 'id' => $addressId]
+ )->willReturn('url');
+
+ $buttonData = $this->deleteButton->getButtonData();
+ $this->assertEquals('Delete', (string)$buttonData['label']);
+ }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Address/SaveTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Address/SaveTest.php
new file mode 100644
index 0000000000000..1bf881ff0a933
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Address/SaveTest.php
@@ -0,0 +1,213 @@
+addressRepositoryMock = $this->createMock(\Magento\Customer\Api\AddressRepositoryInterface::class);
+ $this->formFactoryMock = $this->createMock(\Magento\Customer\Model\Metadata\FormFactory::class);
+ $this->customerRepositoryMock = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class);
+ $this->dataObjectHelperMock = $this->createMock(\Magento\Framework\Api\DataObjectHelper ::class);
+ $this->addressDataFactoryMock = $this->createMock(\Magento\Customer\Api\Data\AddressInterfaceFactory::class);
+ $this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
+ $this->requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
+ $this->address = $this->getMockBuilder(AddressInterface::class)
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+ $this->resultJsonFactory = $this->getMockBuilder(JsonFactory::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['create'])
+ ->getMock();
+ $this->json = $this->getMockBuilder(Json::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $objectManager = new ObjectManagerHelper($this);
+
+ $this->model = $objectManager->getObject(
+ \Magento\Customer\Controller\Adminhtml\Address\Save::class,
+ [
+ 'addressRepository' => $this->addressRepositoryMock,
+ 'formFactory' => $this->formFactoryMock,
+ 'customerRepository' => $this->customerRepositoryMock,
+ 'dataObjectHelper' => $this->dataObjectHelperMock,
+ 'addressDataFactory' => $this->addressDataFactoryMock,
+ 'logger' => $this->loggerMock,
+ 'request' => $this->requestMock,
+ 'resultJsonFactory' => $this->resultJsonFactory
+ ]
+ );
+ }
+
+ public function testExecute(): void
+ {
+ $addressId = 11;
+ $customerId = 22;
+
+ $addressExtractedData = [
+ 'entity_id' => $addressId,
+ 'code' => 'value',
+ 'coolness' => false,
+ 'region' => 'region',
+ 'region_id' => 'region_id',
+ ];
+
+ $addressCompactedData = [
+ 'entity_id' => $addressId,
+ 'default_billing' => 'true',
+ 'default_shipping' => 'true',
+ 'code' => 'value',
+ 'coolness' => false,
+ 'region' => 'region',
+ 'region_id' => 'region_id',
+ ];
+
+ $mergedAddressData = [
+ 'entity_id' => $addressId,
+ 'default_billing' => true,
+ 'default_shipping' => true,
+ 'code' => 'value',
+ 'region' => [
+ 'region' => 'region',
+ 'region_id' => 'region_id',
+ ],
+ 'region_id' => 'region_id',
+ 'id' => $addressId,
+ ];
+
+ $this->requestMock->method('getParam')
+ ->withConsecutive(['parent_id'], ['entity_id'])
+ ->willReturnOnConsecutiveCalls(22, 1);
+
+ $customerMock = $this->getMockBuilder(
+ \Magento\Customer\Api\Data\CustomerInterface::class
+ )->disableOriginalConstructor()->getMock();
+
+ $this->customerRepositoryMock->expects($this->atLeastOnce())
+ ->method('getById')
+ ->with($customerId)
+ ->willReturn($customerMock);
+
+ $customerAddressFormMock = $this->createMock(\Magento\Customer\Model\Metadata\Form::class);
+ $customerAddressFormMock->expects($this->atLeastOnce())
+ ->method('extractData')
+ ->with($this->requestMock)
+ ->willReturn($addressExtractedData);
+ $customerAddressFormMock->expects($this->once())
+ ->method('compactData')
+ ->with($addressExtractedData)
+ ->willReturn($addressCompactedData);
+
+ $this->formFactoryMock->expects($this->exactly(1))
+ ->method('create')
+ ->willReturn($customerAddressFormMock);
+
+ $addressMock = $this->getMockBuilder(AddressInterface::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->addressDataFactoryMock->expects($this->once())->method('create')->willReturn($addressMock);
+
+ $this->dataObjectHelperMock->expects($this->atLeastOnce())
+ ->method('populateWithArray')
+ ->willReturn(
+ [
+ $addressMock,
+ $mergedAddressData, AddressInterface::class,
+ $this->dataObjectHelperMock,
+ ]
+ );
+ $this->addressRepositoryMock->expects($this->once())->method('save')->willReturn($this->address);
+ $this->address->expects($this->once())->method('getId')->willReturn($addressId);
+
+ $this->resultJsonFactory->expects($this->once())
+ ->method('create')
+ ->willReturn($this->json);
+ $this->json->expects($this->once())
+ ->method('setData')
+ ->with(
+ [
+ 'message' => __('Customer address has been updated.'),
+ 'error' => false,
+ 'data' => [
+ 'entity_id' => $addressId
+ ]
+ ]
+ )->willReturnSelf();
+
+ $this->assertEquals($this->json, $this->model->execute());
+ }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Address/ValidateTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Address/ValidateTest.php
new file mode 100644
index 0000000000000..a724bdd24959b
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Address/ValidateTest.php
@@ -0,0 +1,118 @@
+formFactoryMock = $this->createMock(\Magento\Customer\Model\Metadata\FormFactory::class);
+ $this->requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
+ $this->resultJsonFactoryMock = $this->createMock(\Magento\Framework\Controller\Result\JsonFactory::class);
+ $this->resultRedirectFactoryMock = $this->createMock(\Magento\Backend\Model\View\Result\RedirectFactory::class);
+
+ $objectManager = new ObjectManagerHelper($this);
+
+ $this->model = $objectManager->getObject(
+ \Magento\Customer\Controller\Adminhtml\Address\Validate::class,
+ [
+ 'formFactory' => $this->formFactoryMock,
+ 'request' => $this->requestMock,
+ 'resultRedirectFactory' => $this->resultRedirectFactoryMock,
+ 'resultJsonFactory' => $this->resultJsonFactoryMock,
+ ]
+ );
+ }
+
+ /**
+ * Test method \Magento\Customer\Controller\Adminhtml\Address\Save::execute
+ *
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
+ */
+ public function testExecute()
+ {
+ $addressId = 11;
+ $errors = ['Error Message 1', 'Error Message 2'];
+
+ $addressExtractedData = [
+ 'entity_id' => $addressId,
+ 'default_billing' => true,
+ 'default_shipping' => true,
+ 'code' => 'value',
+ 'region' => [
+ 'region' => 'region',
+ 'region_id' => 'region_id',
+ ],
+ 'region_id' => 'region_id',
+ 'id' => $addressId,
+ ];
+
+ $customerAddressFormMock = $this->createMock(\Magento\Customer\Model\Metadata\Form::class);
+
+ $customerAddressFormMock->expects($this->atLeastOnce())
+ ->method('extractData')
+ ->with($this->requestMock)
+ ->willReturn($addressExtractedData);
+ $customerAddressFormMock->expects($this->once())
+ ->method('validateData')
+ ->with($addressExtractedData)
+ ->willReturn($errors);
+
+ $this->formFactoryMock->expects($this->exactly(1))
+ ->method('create')
+ ->willReturn($customerAddressFormMock);
+
+ $resultJson = $this->createMock(\Magento\Framework\Controller\Result\Json::class);
+ $this->resultJsonFactoryMock->method('create')
+ ->willReturn($resultJson);
+
+ $validateResponseMock = $this->createPartialMock(
+ \Magento\Framework\DataObject::class,
+ ['getError', 'setMessages']
+ );
+ $validateResponseMock->method('setMessages')->willReturnSelf();
+ $validateResponseMock->method('getError')->willReturn(1);
+
+ $resultJson->method('setData')->willReturnSelf();
+
+ $this->assertEquals($resultJson, $this->model->execute());
+ }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/File/Address/UploadTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/File/Address/UploadTest.php
index 20177ab0b0db6..8f8ed0e37a46b 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/File/Address/UploadTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/File/Address/UploadTest.php
@@ -70,7 +70,8 @@ protected function setUp()
$this->context,
$this->fileUploaderFactory,
$this->addressMetadataService,
- $this->logger
+ $this->logger,
+ 'address'
);
}
@@ -104,27 +105,27 @@ public function testExecuteEmptyFiles()
public function testExecute()
{
- $attributeCode = 'attribute_code';
+ $attributeCode = 'file_address_attribute';
+ $resultFileSize = 20000;
+ $resultFileName = 'text.txt';
+ $resultType = 'text/plain';
$_FILES = [
- 'address' => [
- 'name' => [
- 'new_0' => [
- $attributeCode => 'filename',
- ],
- ],
+ $attributeCode => [
+ 'name' => $resultFileName,
+ 'type' => $resultType,
+ 'size' => $resultFileSize
],
];
- $resultFileName = '/filename.ext1';
$resultFilePath = 'filepath';
$resultFileUrl = 'viewFileUrl';
$result = [
'name' => $resultFileName,
- 'file' => $resultFileName,
- 'path' => $resultFilePath,
- 'tmp_name' => $resultFilePath . $resultFileName,
+ 'type' => $resultType,
+ 'size' => $resultFileSize,
+ 'tmp_name' => $resultFilePath . '/' . $resultFileName,
'url' => $resultFileUrl,
];
@@ -173,15 +174,16 @@ public function testExecute()
public function testExecuteWithErrors()
{
- $attributeCode = 'attribute_code';
+ $attributeCode = 'file_address_attribute';
+ $resultFileSize = 20000;
+ $resultFileName = 'text.txt';
+ $resultType = 'text/plain';
$_FILES = [
- 'address' => [
- 'name' => [
- 'new_0' => [
- $attributeCode => 'filename',
- ],
- ],
+ $attributeCode => [
+ 'name' => $resultFileName,
+ 'type' => $resultType,
+ 'size' => $resultFileSize
],
];
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php
index 5372bb11a89b5..c52d5b2fb370f 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php
@@ -5,7 +5,6 @@
*/
namespace Magento\Customer\Test\Unit\Controller\Adminhtml\Index;
-use Magento\Customer\Api\AddressMetadataInterface;
use Magento\Customer\Api\CustomerMetadataInterface;
use Magento\Customer\Api\Data\AttributeMetadataInterface;
use Magento\Customer\Api\Data\CustomerInterface;
@@ -281,7 +280,6 @@ protected function setUp()
public function testExecuteWithExistentCustomer()
{
$customerId = 22;
- $addressId = 11;
$subscription = 'true';
$postValue = [
'customer' => [
@@ -290,18 +288,6 @@ public function testExecuteWithExistentCustomer()
'coolness' => false,
'disable_auto_group_change' => 'false',
],
- 'address' => [
- '_template_' => '_template_',
- $addressId => [
- 'entity_id' => $addressId,
- 'default_billing' => 'true',
- 'default_shipping' => 'true',
- 'code' => 'value',
- 'coolness' => false,
- 'region' => 'region',
- 'region_id' => 'region_id',
- ],
- ],
'subscription' => $subscription,
];
$extractedData = [
@@ -318,22 +304,6 @@ public function testExecuteWithExistentCustomer()
CustomerInterface::DEFAULT_BILLING => 2,
CustomerInterface::DEFAULT_SHIPPING => 2
];
- $addressExtractedData = [
- 'entity_id' => $addressId,
- 'code' => 'value',
- 'coolness' => false,
- 'region' => 'region',
- 'region_id' => 'region_id',
- ];
- $addressCompactedData = [
- 'entity_id' => $addressId,
- 'default_billing' => 'true',
- 'default_shipping' => 'true',
- 'code' => 'value',
- 'coolness' => false,
- 'region' => 'region',
- 'region_id' => 'region_id',
- ];
$savedData = [
'entity_id' => $customerId,
'darkness' => true,
@@ -341,61 +311,40 @@ public function testExecuteWithExistentCustomer()
CustomerInterface::DEFAULT_BILLING => false,
CustomerInterface::DEFAULT_SHIPPING => false,
];
- $savedAddressData = [
- 'entity_id' => $addressId,
- 'default_billing' => true,
- 'default_shipping' => true,
- ];
$mergedData = [
'entity_id' => $customerId,
'darkness' => true,
'name' => 'Name',
'code' => 'value',
'disable_auto_group_change' => 0,
- CustomerInterface::DEFAULT_BILLING => $addressId,
- CustomerInterface::DEFAULT_SHIPPING => $addressId,
'confirmation' => false,
'sendemail_store_id' => '1',
'id' => $customerId,
];
- $mergedAddressData = [
- 'entity_id' => $addressId,
- 'default_billing' => true,
- 'default_shipping' => true,
- 'code' => 'value',
- 'region' => [
- 'region' => 'region',
- 'region_id' => 'region_id',
- ],
- 'region_id' => 'region_id',
- 'id' => $addressId,
- ];
/** @var AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject $customerFormMock */
$attributeMock = $this->getMockBuilder(
\Magento\Customer\Api\Data\AttributeMetadataInterface::class
)->disableOriginalConstructor()->getMock();
- $attributeMock->expects($this->exactly(2))
+ $attributeMock->expects($this->atLeastOnce())
->method('getAttributeCode')
->willReturn('coolness');
- $attributeMock->expects($this->exactly(2))
+ $attributeMock->expects($this->atLeastOnce())
->method('getFrontendInput')
->willReturn('int');
$attributes = [$attributeMock];
- $this->requestMock->expects($this->any())
+ $this->requestMock->expects($this->atLeastOnce())
->method('getPostValue')
->willReturnMap([
[null, null, $postValue],
[CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, null, $postValue['customer']],
- ['address/' . $addressId, null, $postValue['address'][$addressId]],
]);
- $this->requestMock->expects($this->exactly(3))
+ $this->requestMock->expects($this->atLeastOnce())
->method('getPost')
->willReturnMap(
[
['customer', null, $postValue['customer']],
- ['address', null, $postValue['address']],
['subscription', null, $subscription],
]
);
@@ -404,16 +353,15 @@ public function testExecuteWithExistentCustomer()
$objectMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
->disableOriginalConstructor()
->getMock();
- $objectMock->expects($this->exactly(2))
+ $objectMock->expects($this->atLeastOnce())
->method('getData')
->willReturnMap(
[
['customer', null, $postValue['customer']],
- ['address/' . $addressId, null, $postValue['address'][$addressId]],
]
);
- $this->objectFactoryMock->expects($this->exactly(2))
+ $this->objectFactoryMock->expects($this->exactly(1))
->method('create')
->with(['data' => $postValue])
->willReturn($objectMock);
@@ -432,23 +380,7 @@ public function testExecuteWithExistentCustomer()
$customerFormMock->expects($this->once())
->method('getAttributes')
->willReturn($attributes);
-
- $customerAddressFormMock = $this->getMockBuilder(
- \Magento\Customer\Model\Metadata\Form::class
- )->disableOriginalConstructor()->getMock();
- $customerAddressFormMock->expects($this->once())
- ->method('extractData')
- ->with($this->requestMock, 'address/' . $addressId)
- ->willReturn($addressExtractedData);
- $customerAddressFormMock->expects($this->once())
- ->method('compactData')
- ->with($addressExtractedData)
- ->willReturn($addressCompactedData);
- $customerAddressFormMock->expects($this->once())
- ->method('getAttributes')
- ->willReturn($attributes);
-
- $this->formFactoryMock->expects($this->exactly(2))
+ $this->formFactoryMock->expects($this->exactly(1))
->method('create')
->willReturnMap(
[
@@ -461,15 +393,6 @@ public function testExecuteWithExistentCustomer()
[],
$customerFormMock
],
- [
- AddressMetadataInterface::ENTITY_TYPE_ADDRESS,
- 'adminhtml_customer_address',
- $savedAddressData,
- false,
- Form::DONT_IGNORE_INVISIBLE,
- [],
- $customerAddressFormMock
- ],
]
);
@@ -492,25 +415,7 @@ public function testExecuteWithExistentCustomer()
->with($customerMock)
->willReturn($savedData);
- $addressMock = $this->getMockBuilder(\Magento\Customer\Api\Data\AddressInterface::class)
- ->disableOriginalConstructor()
- ->getMock();
-
- $this->customerAddressRepositoryMock->expects($this->once())
- ->method('getById')
- ->with($addressId)
- ->willReturn($addressMock);
-
- $this->customerAddressMapperMock->expects($this->once())
- ->method('toFlatArray')
- ->with($addressMock)
- ->willReturn($savedAddressData);
-
- $this->addressDataFactoryMock->expects($this->once())
- ->method('create')
- ->willReturn($addressMock);
-
- $this->dataHelperMock->expects($this->exactly(2))
+ $this->dataHelperMock->expects($this->atLeastOnce())
->method('populateWithArray')
->willReturnMap(
[
@@ -519,19 +424,9 @@ public function testExecuteWithExistentCustomer()
$mergedData, \Magento\Customer\Api\Data\CustomerInterface::class,
$this->dataHelperMock
],
- [
- $addressMock,
- $mergedAddressData, \Magento\Customer\Api\Data\AddressInterface::class,
- $this->dataHelperMock
- ],
]
);
- $customerMock->expects($this->once())
- ->method('setAddresses')
- ->with([$addressMock])
- ->willReturnSelf();
-
$this->customerRepositoryMock->expects($this->once())
->method('save')
->with($customerMock)
@@ -608,63 +503,33 @@ public function testExecuteWithExistentCustomer()
public function testExecuteWithNewCustomer()
{
$customerId = 22;
- $addressId = 11;
+
$subscription = '0';
$postValue = [
'customer' => [
'coolness' => false,
'disable_auto_group_change' => 'false',
],
- 'address' => [
- '_template_' => '_template_',
- $addressId => [
- 'entity_id' => $addressId,
- 'code' => 'value',
- 'coolness' => false,
- 'region' => 'region',
- 'region_id' => 'region_id',
- ],
- ],
'subscription' => $subscription,
];
$extractedData = [
'coolness' => false,
'disable_auto_group_change' => 'false',
];
- $addressExtractedData = [
- 'entity_id' => $addressId,
- 'code' => 'value',
- 'coolness' => false,
- 'region' => 'region',
- 'region_id' => 'region_id',
- ];
$mergedData = [
'disable_auto_group_change' => 0,
CustomerInterface::DEFAULT_BILLING => null,
CustomerInterface::DEFAULT_SHIPPING => null,
'confirmation' => false,
];
- $mergedAddressData = [
- 'entity_id' => $addressId,
- 'default_billing' => false,
- 'default_shipping' => false,
- 'code' => 'value',
- 'region' => [
- 'region' => 'region',
- 'region_id' => 'region_id',
- ],
- 'region_id' => 'region_id',
- 'id' => $addressId,
- ];
-
/** @var AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject $customerFormMock */
$attributeMock = $this->getMockBuilder(
\Magento\Customer\Api\Data\AttributeMetadataInterface::class
)->disableOriginalConstructor()->getMock();
- $attributeMock->expects($this->exactly(2))
+ $attributeMock->expects($this->atLeastOnce())
->method('getAttributeCode')
->willReturn('coolness');
- $attributeMock->expects($this->exactly(2))
+ $attributeMock->expects($this->atLeastOnce())
->method('getFrontendInput')
->willReturn('int');
$attributes = [$attributeMock];
@@ -674,14 +539,12 @@ public function testExecuteWithNewCustomer()
->willReturnMap([
[null, null, $postValue],
[CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, null, $postValue['customer']],
- ['address/' . $addressId, null, $postValue['address'][$addressId]],
]);
- $this->requestMock->expects($this->exactly(3))
+ $this->requestMock->expects($this->atLeastOnce())
->method('getPost')
->willReturnMap(
[
['customer', null, $postValue['customer']],
- ['address', null, $postValue['address']],
['subscription', null, $subscription],
]
);
@@ -690,16 +553,15 @@ public function testExecuteWithNewCustomer()
$objectMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
->disableOriginalConstructor()
->getMock();
- $objectMock->expects($this->exactly(2))
+ $objectMock->expects($this->atLeastOnce())
->method('getData')
->willReturnMap(
[
['customer', null, $postValue['customer']],
- ['address/' . $addressId, null, $postValue['address'][$addressId]],
]
);
- $this->objectFactoryMock->expects($this->exactly(2))
+ $this->objectFactoryMock->expects($this->atLeastOnce())
->method('create')
->with(['data' => $postValue])
->willReturn($objectMock);
@@ -719,22 +581,7 @@ public function testExecuteWithNewCustomer()
->method('getAttributes')
->willReturn($attributes);
- $customerAddressFormMock = $this->getMockBuilder(
- \Magento\Customer\Model\Metadata\Form::class
- )->disableOriginalConstructor()->getMock();
- $customerAddressFormMock->expects($this->once())
- ->method('extractData')
- ->with($this->requestMock, 'address/' . $addressId)
- ->willReturn($addressExtractedData);
- $customerAddressFormMock->expects($this->once())
- ->method('compactData')
- ->with($addressExtractedData)
- ->willReturn($addressExtractedData);
- $customerAddressFormMock->expects($this->once())
- ->method('getAttributes')
- ->willReturn($attributes);
-
- $this->formFactoryMock->expects($this->exactly(2))
+ $this->formFactoryMock->expects($this->exactly(1))
->method('create')
->willReturnMap(
[
@@ -747,15 +594,6 @@ public function testExecuteWithNewCustomer()
[],
$customerFormMock
],
- [
- AddressMetadataInterface::ENTITY_TYPE_ADDRESS,
- 'adminhtml_customer_address',
- [],
- false,
- Form::DONT_IGNORE_INVISIBLE,
- [],
- $customerAddressFormMock
- ],
]
);
@@ -768,25 +606,7 @@ public function testExecuteWithNewCustomer()
->method('create')
->willReturn($customerMock);
- $addressMock = $this->getMockBuilder(\Magento\Customer\Api\Data\AddressInterface::class)
- ->disableOriginalConstructor()
- ->getMock();
-
- $this->addressDataFactoryMock->expects($this->once())
- ->method('create')
- ->willReturn($addressMock);
-
- $this->customerAddressRepositoryMock->expects($this->once())
- ->method('getById')
- ->with($addressId)
- ->willReturn($addressMock);
-
- $this->customerAddressMapperMock->expects($this->once())
- ->method('toFlatArray')
- ->with($addressMock)
- ->willReturn([]);
-
- $this->dataHelperMock->expects($this->exactly(2))
+ $this->dataHelperMock->expects($this->atLeastOnce())
->method('populateWithArray')
->willReturnMap(
[
@@ -795,11 +615,6 @@ public function testExecuteWithNewCustomer()
$mergedData, \Magento\Customer\Api\Data\CustomerInterface::class,
$this->dataHelperMock
],
- [
- $addressMock,
- $mergedAddressData, \Magento\Customer\Api\Data\AddressInterface::class,
- $this->dataHelperMock
- ],
]
);
@@ -904,12 +719,11 @@ public function testExecuteWithNewCustomerAndValidationException()
[null, null, $postValue],
[CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, null, $postValue['customer']],
]);
- $this->requestMock->expects($this->exactly(2))
+ $this->requestMock->expects($this->atLeastOnce())
->method('getPost')
->willReturnMap(
[
['customer', null, $postValue['customer']],
- ['address', null, null],
]
);
@@ -1047,12 +861,11 @@ public function testExecuteWithNewCustomerAndLocalizedException()
[null, null, $postValue],
[CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, null, $postValue['customer']],
]);
- $this->requestMock->expects($this->exactly(2))
+ $this->requestMock->expects($this->atLeastOnce())
->method('getPost')
->willReturnMap(
[
['customer', null, $postValue['customer']],
- ['address', null, null],
]
);
@@ -1190,12 +1003,11 @@ public function testExecuteWithNewCustomerAndException()
[null, null, $postValue],
[CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, null, $postValue['customer']],
]);
- $this->requestMock->expects($this->exactly(2))
+ $this->requestMock->expects($this->atLeastOnce())
->method('getPost')
->willReturnMap(
[
['customer', null, $postValue['customer']],
- ['address', null, null],
]
);
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ValidateTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ValidateTest.php
index 7209ac9fd24b0..5adb902601630 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ValidateTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ValidateTest.php
@@ -141,12 +141,6 @@ protected function setUp()
public function testExecute()
{
- $this->request->expects($this->once())
- ->method('getPost')
- ->willReturn([
- '_template_' => null,
- 'address_index' => null
- ]);
$customerEntityId = 2;
$this->request->expects($this->once())
->method('getParam')
@@ -162,11 +156,6 @@ public function testExecute()
$this->form->expects($this->once())->method('setInvisibleIgnored');
$this->form->expects($this->atLeastOnce())->method('extractData')->willReturn([]);
- $error = $this->createMock(\Magento\Framework\Message\Error::class);
- $this->form->expects($this->once())
- ->method('validateData')
- ->willReturn([$error]);
-
$validationResult = $this->getMockForAbstractClass(
\Magento\Customer\Api\Data\ValidationResultsInterface::class,
[],
@@ -188,9 +177,6 @@ public function testExecute()
public function testExecuteWithoutAddresses()
{
- $this->request->expects($this->once())
- ->method('getPost')
- ->willReturn(null);
$this->form->expects($this->once())
->method('setInvisibleIgnored');
$this->form->expects($this->atLeastOnce())
@@ -223,9 +209,6 @@ public function testExecuteWithoutAddresses()
public function testExecuteWithException()
{
- $this->request->expects($this->once())
- ->method('getPost')
- ->willReturn(null);
$this->form->expects($this->once())
->method('setInvisibleIgnored');
$this->form->expects($this->atLeastOnce())
@@ -265,12 +248,6 @@ public function testExecuteWithException()
public function testExecuteWithNewCustomerAndNoEntityId()
{
- $this->request->expects($this->once())
- ->method('getPost')
- ->willReturn([
- '_template_' => null,
- 'address_index' => null
- ]);
$this->request->expects($this->once())
->method('getParam')
->with('customer')
@@ -282,11 +259,6 @@ public function testExecuteWithNewCustomerAndNoEntityId()
$this->form->expects($this->once())->method('setInvisibleIgnored');
$this->form->expects($this->atLeastOnce())->method('extractData')->willReturn([]);
- $error = $this->createMock(\Magento\Framework\Message\Error::class);
- $this->form->expects($this->once())
- ->method('validateData')
- ->willReturn([$error]);
-
$validationResult = $this->getMockForAbstractClass(
\Magento\Customer\Api\Data\ValidationResultsInterface::class,
[],
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Ajax/LoginTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Ajax/LoginTest.php
index 628727b202ba7..14ed09f73325b 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Ajax/LoginTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Ajax/LoginTest.php
@@ -260,14 +260,10 @@ public function testLoginFailure(): void
->with($customer);
$this->customerSession->expects(self::never())
->method('regenerateId');
- $this->customerSession->method('getData')
- ->with('user_login_show_captcha')
- ->willReturn(false);
$result = [
'errors' => true,
- 'message' => __('Invalid login or password.'),
- 'captcha' => false
+ 'message' => __('Invalid login or password.')
];
$this->resultJson->method('setData')
->with($result)
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Address/DataProviderTest.php b/app/code/Magento/Customer/Test/Unit/Model/Address/DataProviderTest.php
new file mode 100644
index 0000000000000..4dafd305d619d
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Model/Address/DataProviderTest.php
@@ -0,0 +1,351 @@
+fileUploaderDataResolver = $this->getMockBuilder(FileUploaderDataResolver::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->attributeMetadataResolver = $this->getMockBuilder(AttributeMetadataResolver::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->addressCollectionFactory = $this->getMockBuilder(CollectionFactory::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['create'])
+ ->getMock();
+ $this->collection = $this->getMockBuilder(AddressCollection::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->customerRepository = $this->getMockForAbstractClass(CustomerRepositoryInterface::class);
+ $this->context = $this->getMockForAbstractClass(ContextInterface::class);
+ $this->addressCollectionFactory->expects($this->once())
+ ->method('create')
+ ->willReturn($this->collection);
+ $this->eavConfig = $this->getMockBuilder(Config::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->eavConfig->expects($this->once())
+ ->method('getEntityType')
+ ->with('customer_address')
+ ->willReturn($this->getTypeAddressMock([]));
+ $this->customer = $this->getMockForAbstractClass(CustomerInterface::class);
+ $this->address = $this->getMockBuilder(AddressModel::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->attributeMetadataResolver->expects($this->at(0))
+ ->method('getAttributesMeta')
+ ->willReturn(
+ [
+ 'arguments' => [
+ 'data' => [
+ 'config' => [
+ 'dataType' => Multiline::NAME,
+ 'formElement' => 'frontend_input',
+ 'options' => 'test-options',
+ 'visible' => null,
+ 'required' => 'is_required',
+ 'label' => __('Street'),
+ 'sortOrder' => 'sort_order',
+ 'default' => 'default_value',
+ 'size' => 'multiline_count',
+ 'componentType' => Field::NAME,
+ ],
+ ],
+ ],
+ ]
+ );
+ $this->attributeMetadataResolver->expects($this->at(1))
+ ->method('getAttributesMeta')
+ ->willReturn(
+ [
+ 'arguments' => [
+ 'data' => [
+ 'config' => [
+ 'dataType' => 'frontend_input',
+ 'formElement' => 'frontend_input',
+ 'visible' => null,
+ 'required' => 'is_required',
+ 'label' => __('frontend_label'),
+ 'sortOrder' => 'sort_order',
+ 'default' => 'default_value',
+ 'size' => 'multiline_count',
+ 'componentType' => Field::NAME,
+ 'prefer' => 'toggle',
+ 'valueMap' => [
+ 'true' => 1,
+ 'false' => 0,
+ ],
+ ],
+ ],
+ ],
+ ]
+ );
+ $this->model = $objectManagerHelper->getObject(
+ DataProvider::class,
+ [
+ 'name' => 'test-name',
+ 'primaryFieldName' => 'primary-field-name',
+ 'requestFieldName' => 'request-field-name',
+ 'addressCollectionFactory' => $this->addressCollectionFactory,
+ 'customerRepository' => $this->customerRepository,
+ 'eavConfig' => $this->eavConfig,
+ 'context' => $this->context,
+ 'fileUploaderDataResolver' => $this->fileUploaderDataResolver,
+ 'attributeMetadataResolver' => $this->attributeMetadataResolver,
+ [],
+ [],
+ true
+ ]
+ );
+ }
+
+ public function testGetDefaultData(): void
+ {
+ $expectedData = [
+ '' => [
+ 'parent_id' => 1,
+ 'firstname' => 'John',
+ 'lastname' => 'Doe'
+ ]
+ ];
+
+ $this->collection->expects($this->once())
+ ->method('getItems')
+ ->willReturn([]);
+
+ $this->context->expects($this->once())
+ ->method('getRequestParam')
+ ->willReturn(1);
+ $this->customerRepository->expects($this->once())
+ ->method('getById')
+ ->willReturn($this->customer);
+ $this->customer->expects($this->once())
+ ->method('getFirstname')
+ ->willReturn('John');
+ $this->customer->expects($this->once())
+ ->method('getLastname')
+ ->willReturn('Doe');
+
+ $this->assertEquals($expectedData, $this->model->getData());
+ }
+
+ public function testGetData(): void
+ {
+ $expectedData = [
+ '1' => [
+ 'parent_id' => '1',
+ 'default_billing' => '1',
+ 'default_shipping' => '1',
+ 'firstname' => 'John',
+ 'lastname' => 'Doe',
+ 'street' => [
+ '42000 Ave W 55 Cedar City',
+ 'Apt. 33'
+ ]
+ ]
+ ];
+
+ $this->collection->expects($this->once())
+ ->method('getItems')
+ ->willReturn([
+ $this->address
+ ]);
+
+ $this->customerRepository->expects($this->once())
+ ->method('getById')
+ ->willReturn($this->customer);
+ $this->customer->expects($this->once())
+ ->method('getDefaultBilling')
+ ->willReturn('1');
+ $this->customer->expects($this->once())
+ ->method('getDefaultShipping')
+ ->willReturn('1');
+
+ $this->address->expects($this->once())
+ ->method('getEntityId')
+ ->willReturn('1');
+ $this->address->expects($this->once())
+ ->method('load')
+ ->with('1')
+ ->willReturnSelf();
+ $this->address->expects($this->once())
+ ->method('getData')
+ ->willReturn([
+ 'parent_id' => '1',
+ 'firstname' => 'John',
+ 'lastname' => 'Doe',
+ 'street' => "42000 Ave W 55 Cedar City\nApt. 33"
+ ]);
+ $this->fileUploaderDataResolver->expects($this->once())
+ ->method('overrideFileUploaderData')
+ ->willReturnSelf();
+
+ $this->assertEquals($expectedData, $this->model->getData());
+ }
+
+ /**
+ * Get customer address type mock
+ *
+ * @param array $customerAttributes
+ * @return Type|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected function getTypeAddressMock($customerAttributes = [])
+ {
+ $typeAddressMock = $this->getMockBuilder(Type::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $attributesCollection = !empty($customerAttributes) ? $customerAttributes : $this->getAttributeMock();
+ foreach ($attributesCollection as $attribute) {
+ $attribute->expects($this->any())
+ ->method('getEntityType')
+ ->willReturn($typeAddressMock);
+ }
+
+ $typeAddressMock->expects($this->once())
+ ->method('getAttributeCollection')
+ ->willReturn($attributesCollection);
+
+ return $typeAddressMock;
+ }
+
+ /**
+ * Get attribute mock
+ *
+ * @param array $options
+ * @return AbstractAttribute[]|\PHPUnit_Framework_MockObject_MockObject[]
+ */
+ protected function getAttributeMock($options = []): array
+ {
+ $attributeMock = $this->getMockBuilder(AbstractAttribute::class)
+ ->setMethods(
+ [
+ 'getAttributeCode',
+ 'getDataUsingMethod',
+ 'getFrontendInput',
+ 'getIsVisible',
+ 'getSource',
+ 'getIsUserDefined',
+ 'getUsedInForms',
+ 'getEntityType',
+ ]
+ )
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+
+ $attributeCode = self::ATTRIBUTE_CODE;
+ if (isset($options[self::ATTRIBUTE_CODE]['specific_code_prefix'])) {
+ $attributeCode .= $options[self::ATTRIBUTE_CODE]['specific_code_prefix'];
+ }
+
+ $attributeMock->expects($this->exactly(2))
+ ->method('getAttributeCode')
+ ->willReturn($attributeCode);
+
+ $attributeBooleanMock = $this->getMockBuilder(AbstractAttribute::class)
+ ->setMethods(
+ [
+ 'getAttributeCode',
+ 'getDataUsingMethod',
+ 'getFrontendInput',
+ 'getIsVisible',
+ 'getIsUserDefined',
+ 'getUsedInForms',
+ 'getSource',
+ 'getEntityType',
+ ]
+ )
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+
+ $booleanAttributeCode = 'test-code-boolean';
+ if (isset($options['test-code-boolean']['specific_code_prefix'])) {
+ $booleanAttributeCode .= $options['test-code-boolean']['specific_code_prefix'];
+ }
+
+ $attributeBooleanMock->expects($this->exactly(2))
+ ->method('getAttributeCode')
+ ->willReturn($booleanAttributeCode);
+
+ $mocks = [$attributeMock, $attributeBooleanMock];
+ return $mocks;
+ }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderWithDefaultAddressesTest.php b/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderWithDefaultAddressesTest.php
new file mode 100644
index 0000000000000..2fc3cdb927723
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderWithDefaultAddressesTest.php
@@ -0,0 +1,422 @@
+eavConfigMock = $this->getMockBuilder(Config::class)->disableOriginalConstructor()->getMock();
+ $this->customerCollectionFactoryMock = $this->createPartialMock(CustomerCollectionFactory::class, ['create']);
+ $this->sessionMock = $this->getMockBuilder(\Magento\Framework\Session\SessionManagerInterface::class)
+ ->setMethods(['getCustomerFormData', 'unsCustomerFormData'])
+ ->getMockForAbstractClass();
+ $this->countryFactoryMock = $this->getMockBuilder(\Magento\Directory\Model\CountryFactory::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['create', 'loadByCode', 'getName'])
+ ->getMock();
+ $this->customerMock = $this->getMockBuilder(\Magento\Customer\Model\Customer::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->customerCollectionMock = $this->getMockBuilder(CustomerCollection::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->customerCollectionMock->expects($this->once())->method('addAttributeToSelect')->with('*');
+ $this->customerCollectionFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($this->customerCollectionMock);
+ $this->eavConfigMock->expects($this->atLeastOnce())
+ ->method('getEntityType')
+ ->with('customer')
+ ->willReturn($this->getTypeCustomerMock([]));
+ $this->fileUploaderDataResolver = $this->getMockBuilder(FileUploaderDataResolver::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->attributeMetadataResolver = $this->getMockBuilder(AttributeMetadataResolver::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getAttributesMeta'])
+ ->getMock();
+ $this->attributeMetadataResolver->expects($this->at(0))
+ ->method('getAttributesMeta')
+ ->willReturn(
+ [
+ 'arguments' => [
+ 'data' => [
+ 'config' => [
+ 'dataType' => 'frontend_input',
+ 'formElement' => 'frontend_input',
+ 'options' => 'test-options',
+ 'visible' => null,
+ 'required' => 'is_required',
+ 'label' => __('frontend_label'),
+ 'sortOrder' => 'sort_order',
+ 'notice' => 'note',
+ 'default' => 'default_value',
+ 'size' => 'multiline_count',
+ 'componentType' => Field::NAME,
+ ],
+ ],
+ ],
+ ]
+ );
+ $this->attributeMetadataResolver->expects($this->at(1))
+ ->method('getAttributesMeta')
+ ->willReturn(
+ [
+ 'arguments' => [
+ 'data' => [
+ 'config' => [
+ 'dataType' => 'frontend_input',
+ 'formElement' => 'frontend_input',
+ 'visible' => null,
+ 'required' => 'is_required',
+ 'label' => __('frontend_label'),
+ 'sortOrder' => 'sort_order',
+ 'notice' => 'note',
+ 'default' => 'default_value',
+ 'size' => 'multiline_count',
+ 'componentType' => Field::NAME,
+ 'prefer' => 'toggle',
+ 'valueMap' => [
+ 'true' => 1,
+ 'false' => 0,
+ ],
+ ],
+ ],
+ ],
+ ]
+ );
+ $helper = new ObjectManager($this);
+ $this->dataProvider = $helper->getObject(
+ DataProviderWithDefaultAddresses::class,
+ [
+ 'name' => 'test-name',
+ 'primaryFieldName' => 'primary-field-name',
+ 'requestFieldName' => 'request-field-name',
+ 'customerCollectionFactory' => $this->customerCollectionFactoryMock,
+ 'eavConfig' => $this->eavConfigMock,
+ 'countryFactory' => $this->countryFactoryMock,
+ 'session' => $this->sessionMock,
+ 'fileUploaderDataResolver' => $this->fileUploaderDataResolver,
+ 'attributeMetadataResolver' => $this->attributeMetadataResolver,
+ true
+ ]
+ );
+ }
+
+ /**
+ * Run test getAttributesMeta method
+ *
+ * @param array $expected
+ * @return void
+ *
+ * @dataProvider getAttributesMetaDataProvider
+ */
+ public function testGetAttributesMetaWithOptions(array $expected): void
+ {
+ $meta = $this->dataProvider->getMeta();
+ $this->assertNotEmpty($meta);
+ $this->assertEquals($expected, $meta);
+ }
+
+ /**
+ * Data provider for testGetAttributesMeta
+ *
+ * @return array
+ */
+ public function getAttributesMetaDataProvider(): array
+ {
+ return [
+ [
+ 'expected' => [
+ 'customer' => [
+ 'children' => [
+ self::ATTRIBUTE_CODE => [
+ 'arguments' => [
+ 'data' => [
+ 'config' => [
+ 'dataType' => 'frontend_input',
+ 'formElement' => 'frontend_input',
+ 'options' => 'test-options',
+ 'visible' => null,
+ 'required' => 'is_required',
+ 'label' => __('frontend_label'),
+ 'sortOrder' => 'sort_order',
+ 'notice' => 'note',
+ 'default' => 'default_value',
+ 'size' => 'multiline_count',
+ 'componentType' => Field::NAME,
+ ],
+ ],
+ ],
+ ],
+ 'test-code-boolean' => [
+ 'arguments' => [
+ 'data' => [
+ 'config' => [
+ 'dataType' => 'frontend_input',
+ 'formElement' => 'frontend_input',
+ 'visible' => null,
+ 'required' => 'is_required',
+ 'label' => __('frontend_label'),
+ 'sortOrder' => 'sort_order',
+ 'notice' => 'note',
+ 'default' => 'default_value',
+ 'size' => 'multiline_count',
+ 'componentType' => Field::NAME,
+ 'prefer' => 'toggle',
+ 'valueMap' => [
+ 'true' => 1,
+ 'false' => 0,
+ ],
+ ],
+ ],
+ ],
+ ],
+ ],
+ ],
+ ]
+ ]
+ ];
+ }
+
+ /**
+ * @param array $customerAttributes
+ * @return Type|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected function getTypeCustomerMock($customerAttributes = [])
+ {
+ $typeCustomerMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Type::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $attributesCollection = !empty($customerAttributes) ? $customerAttributes : $this->getAttributeMock();
+ foreach ($attributesCollection as $attribute) {
+ $attribute->expects($this->any())
+ ->method('getEntityType')
+ ->willReturn($typeCustomerMock);
+ }
+
+ $typeCustomerMock->expects($this->atLeastOnce())
+ ->method('getAttributeCollection')
+ ->willReturn($attributesCollection);
+
+ return $typeCustomerMock;
+ }
+
+ /**
+ * @param array $options
+ * @return AbstractAttribute[]|\PHPUnit_Framework_MockObject_MockObject[]
+ */
+ protected function getAttributeMock($options = []): array
+ {
+ $attributeMock = $this->getMockBuilder(AbstractAttribute::class)
+ ->setMethods(
+ [
+ 'getAttributeCode',
+ 'getDataUsingMethod',
+ 'getFrontendInput',
+ 'getIsVisible',
+ 'getSource',
+ 'getIsUserDefined',
+ 'getUsedInForms',
+ 'getEntityType',
+ ]
+ )
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+
+ $attributeCode = self::ATTRIBUTE_CODE;
+ if (isset($options[self::ATTRIBUTE_CODE]['specific_code_prefix'])) {
+ $attributeCode .= $options[self::ATTRIBUTE_CODE]['specific_code_prefix'];
+ }
+
+ $attributeMock->expects($this->once())
+ ->method('getAttributeCode')
+ ->willReturn($attributeCode);
+
+ $attributeBooleanMock = $this->getMockBuilder(AbstractAttribute::class)
+ ->setMethods(
+ [
+ 'getAttributeCode',
+ 'getDataUsingMethod',
+ 'getFrontendInput',
+ 'getIsVisible',
+ 'getIsUserDefined',
+ 'getUsedInForms',
+ 'getSource',
+ 'getEntityType',
+ ]
+ )
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+
+ $booleanAttributeCode = 'test-code-boolean';
+ if (isset($options['test-code-boolean']['specific_code_prefix'])) {
+ $booleanAttributeCode .= $options['test-code-boolean']['specific_code_prefix'];
+ }
+
+ $attributeBooleanMock->expects($this->once())
+ ->method('getAttributeCode')
+ ->willReturn($booleanAttributeCode);
+
+ $mocks = [$attributeMock, $attributeBooleanMock];
+ return $mocks;
+ }
+
+ /**
+ * @return void
+ */
+ public function testGetData(): void
+ {
+ $customerData = [
+ 'email' => 'test@test.ua',
+ 'default_billing' => 2,
+ 'default_shipping' => 2,
+ 'password_hash' => 'password_hash',
+ 'rp_token' => 'rp_token',
+ 'confirmation' => 'confirmation',
+ ];
+
+ $address = $this->getMockBuilder(\Magento\Customer\Model\Address::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->customerCollectionMock->expects($this->once())->method('getItems')->willReturn([$this->customerMock]);
+ $this->customerMock->expects($this->once())->method('getData')->willReturn($customerData);
+ $this->customerMock->expects($this->atLeastOnce())->method('getId')->willReturn(1);
+
+ $this->customerMock->expects($this->once())->method('getDefaultBillingAddress')->willReturn($address);
+ $this->countryFactoryMock->expects($this->once())->method('create')->willReturnSelf();
+ $this->countryFactoryMock->expects($this->once())->method('loadByCode')->willReturnSelf();
+ $this->countryFactoryMock->expects($this->once())->method('getName')->willReturn('Ukraine');
+
+ $this->sessionMock->expects($this->once())
+ ->method('getCustomerFormData')
+ ->willReturn(null);
+
+ $this->assertEquals(
+ [
+ 1 => [
+ 'customer' => [
+ 'email' => 'test@test.ua',
+ 'default_billing' => 2,
+ 'default_shipping' => 2,
+ ],
+ 'default_billing_address' => [
+ 'country' => 'Ukraine',
+ ],
+ 'default_shipping_address' => [],
+ 'customer_id' => 1
+ ]
+ ],
+ $this->dataProvider->getData()
+ );
+ }
+
+ /**
+ * @return void
+ */
+ public function testGetDataWithCustomerFormData(): void
+ {
+ $customerId = 11;
+ $customerFormData = [
+ 'customer' => [
+ 'email' => 'test1@test1.ua',
+ 'default_billing' => 3,
+ 'default_shipping' => 3,
+ 'entity_id' => $customerId,
+ ],
+ 'address' => [
+ 3 => [
+ 'firstname' => 'firstname1',
+ 'lastname' => 'lastname1',
+ 'street' => [
+ 'street1',
+ 'street2',
+ ],
+ 'default_billing' => 3,
+ 'default_shipping' => 3,
+ ],
+ ],
+ ];
+
+ $this->customerCollectionMock->expects($this->once())->method('getItems')->willReturn([$this->customerMock]);
+ $this->customerMock->expects($this->once())
+ ->method('getData')
+ ->willReturn([
+ 'email' => 'test@test.ua',
+ 'default_billing' => 2,
+ 'default_shipping' => 2,
+ ]);
+ $this->customerMock->expects($this->atLeastOnce())->method('getId')->willReturn($customerId);
+
+ $this->sessionMock->expects($this->once())->method('getCustomerFormData')->willReturn($customerFormData);
+ $this->sessionMock->expects($this->once())->method('unsCustomerFormData');
+
+ $this->assertEquals([$customerId => $customerFormData], $this->dataProvider->getData());
+ }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Address/RelationTest.php b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Address/RelationTest.php
index e81637cfb23b2..319179c5e279a 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Address/RelationTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Address/RelationTest.php
@@ -6,6 +6,7 @@
namespace Magento\Customer\Test\Unit\Model\ResourceModel\Address;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Customer\Model\Address;
/**
* Class AddressTest
@@ -40,7 +41,7 @@ protected function setUp()
*/
public function testProcessRelation($addressId, $isDefaultBilling, $isDefaultShipping)
{
- $addressModel = $this->createPartialMock(\Magento\Framework\Model\AbstractModel::class, [
+ $addressModel = $this->createPartialMock(Address::class, [
'__wakeup',
'getId',
'getEntityTypeId',
@@ -55,7 +56,17 @@ public function testProcessRelation($addressId, $isDefaultBilling, $isDefaultShi
]);
$customerModel = $this->createPartialMock(
\Magento\Customer\Model\Customer::class,
- ['__wakeup', 'setDefaultBilling', 'setDefaultShipping', 'save', 'load', 'getResource', 'getId']
+ [
+ '__wakeup',
+ 'setDefaultBilling',
+ 'setDefaultShipping',
+ 'save',
+ 'load',
+ 'getResource',
+ 'getId',
+ 'getDefaultShippingAddress',
+ 'getDefaultBillingAddress'
+ ]
);
$customerResource = $this->getMockForAbstractClass(
\Magento\Framework\Model\ResourceModel\Db\AbstractDb::class,
@@ -88,6 +99,7 @@ public function testProcessRelation($addressId, $isDefaultBilling, $isDefaultShi
$this->customerFactoryMock->expects($this->any())
->method('create')
->willReturn($customerModel);
+
if ($addressId && ($isDefaultBilling || $isDefaultShipping)) {
$customerId = 1;
$customerResource->expects($this->exactly(2))->method('getConnection')->willReturn($connectionMock);
diff --git a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php
index a142f87dcf6c4..9d2411dd4c57d 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php
@@ -195,35 +195,6 @@ public function testSave()
$customerId = 1;
$storeId = 2;
- $region = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\RegionInterface::class, [], '', false);
- $address = $this->getMockForAbstractClass(
- \Magento\Customer\Api\Data\AddressInterface::class,
- [],
- '',
- false,
- false,
- true,
- [
- 'setCustomerId',
- 'setRegion',
- 'getRegion',
- 'getId'
- ]
- );
- $address2 = $this->getMockForAbstractClass(
- \Magento\Customer\Api\Data\AddressInterface::class,
- [],
- '',
- false,
- false,
- true,
- [
- 'setCustomerId',
- 'setRegion',
- 'getRegion',
- 'getId'
- ]
- );
$customerModel = $this->createPartialMock(\Magento\Customer\Model\Customer::class, [
'getId',
'setId',
@@ -243,10 +214,6 @@ public function testSave()
$origCustomer = $this->customer;
- $this->customer->expects($this->atLeastOnce())
- ->method('__toArray')
- ->willReturn(['default_billing', 'default_shipping']);
-
$customerAttributesMetaData = $this->getMockForAbstractClass(
\Magento\Framework\Api\CustomAttributesDataInterface::class,
[],
@@ -273,6 +240,9 @@ public function testSave()
$this->customer->expects($this->atLeastOnce())
->method('getId')
->willReturn($customerId);
+ $this->customer->expects($this->atLeastOnce())
+ ->method('__toArray')
+ ->willReturn([]);
$this->customerRegistry->expects($this->atLeastOnce())
->method('retrieve')
->with($customerId)
@@ -287,28 +257,6 @@ public function testSave()
$this->customerRegistry->expects($this->atLeastOnce())
->method("remove")
->with($customerId);
- $address->expects($this->once())
- ->method('setCustomerId')
- ->with($customerId)
- ->willReturnSelf();
- $address->expects($this->once())
- ->method('getRegion')
- ->willReturn($region);
- $address->expects($this->atLeastOnce())
- ->method('getId')
- ->willReturn(7);
- $address->expects($this->once())
- ->method('setRegion')
- ->with($region);
- $customerAttributesMetaData->expects($this->atLeastOnce())
- ->method('getAddresses')
- ->willReturn([$address]);
- $customerAttributesMetaData->expects($this->at(1))
- ->method('setAddresses')
- ->with([]);
- $customerAttributesMetaData->expects($this->at(2))
- ->method('setAddresses')
- ->with([$address]);
$this->extensibleDataObjectConverter->expects($this->once())
->method('toNestedArray')
->with($customerAttributesMetaData, [], \Magento\Customer\Api\Data\CustomerInterface::class)
@@ -393,12 +341,6 @@ public function testSave()
$this->customerRegistry->expects($this->once())
->method('push')
->with($customerModel);
- $this->customer->expects($this->once())
- ->method('getAddresses')
- ->willReturn([$address, $address2]);
- $this->addressRepository->expects($this->once())
- ->method('save')
- ->with($address);
$customerAttributesMetaData->expects($this->once())
->method('getEmail')
->willReturn('example@example.com');
@@ -440,47 +382,8 @@ public function testSaveWithPasswordHash()
'getFirstFailure',
'getLockExpires',
]);
- $region = $this->getMockForAbstractClass(
- \Magento\Customer\Api\Data\RegionInterface::class,
- [],
- '',
- false
- );
- $address = $this->getMockForAbstractClass(
- \Magento\Customer\Api\Data\AddressInterface::class,
- [],
- '',
- false,
- false,
- true,
- [
- 'setCustomerId',
- 'setRegion',
- 'getRegion',
- 'getId'
- ]
- );
- $address2 = $this->getMockForAbstractClass(
- \Magento\Customer\Api\Data\AddressInterface::class,
- [],
- '',
- false,
- false,
- true,
- [
- 'setCustomerId',
- 'setRegion',
- 'getRegion',
- 'getId'
- ]
- );
-
$origCustomer = $this->customer;
- $this->customer->expects($this->atLeastOnce())
- ->method('__toArray')
- ->willReturn(['default_billing', 'default_shipping']);
-
$customerModel = $this->createPartialMock(\Magento\Customer\Model\Customer::class, [
'getId',
'setId',
@@ -548,6 +451,9 @@ public function testSaveWithPasswordHash()
$this->customer->expects($this->atLeastOnce())
->method('getId')
->willReturn($customerId);
+ $this->customer->expects($this->atLeastOnce())
+ ->method('__toArray')
+ ->willReturn([]);
$this->customerRegistry->expects($this->atLeastOnce())
->method('retrieve')
->with($customerId)
@@ -559,28 +465,6 @@ public function testSaveWithPasswordHash()
->method('save')
->with($this->customer, CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, $this->customer)
->willReturn($customerAttributesMetaData);
- $address->expects($this->once())
- ->method('setCustomerId')
- ->with($customerId)
- ->willReturnSelf();
- $address->expects($this->once())
- ->method('getRegion')
- ->willReturn($region);
- $address->expects($this->atLeastOnce())
- ->method('getId')
- ->willReturn(7);
- $address->expects($this->once())
- ->method('setRegion')
- ->with($region);
- $customerAttributesMetaData->expects($this->any())
- ->method('getAddresses')
- ->willReturn([$address]);
- $customerAttributesMetaData->expects($this->at(1))
- ->method('setAddresses')
- ->with([]);
- $customerAttributesMetaData->expects($this->at(2))
- ->method('setAddresses')
- ->with([$address]);
$customerAttributesMetaData
->expects($this->atLeastOnce())
->method('getId')
@@ -618,12 +502,6 @@ public function testSaveWithPasswordHash()
$this->customerRegistry->expects($this->once())
->method('push')
->with($customerModel);
- $this->customer->expects($this->any())
- ->method('getAddresses')
- ->willReturn([$address, $address2]);
- $this->addressRepository->expects($this->once())
- ->method('save')
- ->with($address);
$customerAttributesMetaData->expects($this->once())
->method('getEmail')
->willReturn('example@example.com');
diff --git a/app/code/Magento/Customer/Test/Unit/Ui/Component/Form/AddressFieldsetTest.php b/app/code/Magento/Customer/Test/Unit/Ui/Component/Form/AddressFieldsetTest.php
new file mode 100644
index 0000000000000..65a0443aed86f
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Ui/Component/Form/AddressFieldsetTest.php
@@ -0,0 +1,69 @@
+context = $this->getMockForAbstractClass(
+ \Magento\Framework\View\Element\UiComponent\ContextInterface::class
+ );
+ $this->fieldset = new AddressFieldset(
+ $this->context,
+ [],
+ []
+ );
+ }
+
+ /**
+ * Run test for canShow() method
+ *
+ * @return void
+ *
+ */
+ public function testCanShow()
+ {
+ $this->context->expects($this->atLeastOnce())->method('getRequestParam')->with('id')
+ ->willReturn(1);
+ $this->assertTrue($this->fieldset->isComponentVisible());
+ }
+
+ /**
+ * Run test for canShow() method without customer id in context
+ *
+ * @return void
+ *
+ */
+ public function testCanShowWithoutId()
+ {
+ $this->context->expects($this->atLeastOnce())->method('getRequestParam')->with('id')
+ ->willReturn(null);
+ $this->assertEquals(false, $this->fieldset->isComponentVisible());
+ }
+}
diff --git a/app/code/Magento/Customer/Ui/Component/Form/AddressFieldset.php b/app/code/Magento/Customer/Ui/Component/Form/AddressFieldset.php
new file mode 100644
index 0000000000000..3e3a6e74166a1
--- /dev/null
+++ b/app/code/Magento/Customer/Ui/Component/Form/AddressFieldset.php
@@ -0,0 +1,46 @@
+context = $context;
+
+ parent::__construct($context, $components, $data);
+ }
+
+ /**
+ * Can show customer addresses tab in tabs or not
+ *
+ * Will return false for not registered customer in a case when admin user created new customer account.
+ * Needed to hide addresses tab from create new customer page
+ *
+ * @return boolean
+ */
+ public function isComponentVisible(): bool
+ {
+ $customerId = $this->context->getRequestParam('id');
+ return (bool)$customerId;
+ }
+}
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Address/Column/Actions.php b/app/code/Magento/Customer/Ui/Component/Listing/Address/Column/Actions.php
new file mode 100644
index 0000000000000..6d1d7472a798b
--- /dev/null
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Address/Column/Actions.php
@@ -0,0 +1,128 @@
+urlBuilder = $urlBuilder;
+ parent::__construct($context, $uiComponentFactory, $components, $data);
+ }
+
+ /**
+ * Prepare Data Source
+ *
+ * @param array $dataSource
+ * @return array
+ */
+ public function prepareDataSource(array $dataSource): array
+ {
+ if (isset($dataSource['data']['items'])) {
+ foreach ($dataSource['data']['items'] as &$item) {
+ $name = $this->getData('name');
+ if (isset($item['entity_id'])) {
+ $item[$name]['edit'] = [
+ 'callback' => [
+ [
+ 'provider' => 'customer_form.areas.address.address'
+ . '.customer_address_update_modal.update_customer_address_form_loader',
+ 'target' => 'destroyInserted',
+ ],
+ [
+ 'provider' => 'customer_form.areas.address.address'
+ . '.customer_address_update_modal',
+ 'target' => 'openModal',
+ ],
+ [
+ 'provider' => 'customer_form.areas.address.address'
+ . '.customer_address_update_modal.update_customer_address_form_loader',
+ 'target' => 'render',
+ 'params' => [
+ 'entity_id' => $item['entity_id'],
+ ],
+ ]
+ ],
+ 'href' => '#',
+ 'label' => __('Edit'),
+ 'hidden' => false,
+ ];
+
+ $item[$name]['setDefaultBilling'] = [
+ 'href' => $this->urlBuilder->getUrl(
+ self::CUSTOMER_ADDRESS_PATH_DEFAULT_BILLING,
+ ['parent_id' => $item['parent_id'], 'id' => $item['entity_id']]
+ ),
+ 'label' => __('Set as default billing'),
+ 'isAjax' => true,
+ 'confirm' => [
+ 'title' => __('Set address as default billing'),
+ 'message' => __('Are you sure you want to set the address as default billing address?')
+ ]
+ ];
+
+ $item[$name]['setDefaultShipping'] = [
+ 'href' => $this->urlBuilder->getUrl(
+ self::CUSTOMER_ADDRESS_PATH_DEFAULT_SHIPPING,
+ ['parent_id' => $item['parent_id'], 'id' => $item['entity_id']]
+ ),
+ 'label' => __('Set as default shipping'),
+ 'isAjax' => true,
+ 'confirm' => [
+ 'title' => __('Set address as default shipping'),
+ 'message' => __('Are you sure you want to set the address as default shipping address?')
+ ]
+ ];
+
+ $item[$name]['delete'] = [
+ 'href' => $this->urlBuilder->getUrl(
+ self::CUSTOMER_ADDRESS_PATH_DELETE,
+ ['parent_id' => $item['parent_id'], 'id' => $item['entity_id']]
+ ),
+ 'label' => __('Delete'),
+ 'isAjax' => true,
+ 'confirm' => [
+ 'title' => __('Delete address'),
+ 'message' => __('Are you sure you want to delete the address?')
+ ]
+ ];
+ }
+ }
+ }
+
+ return $dataSource;
+ }
+}
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Address/Column/Countries.php b/app/code/Magento/Customer/Ui/Component/Listing/Address/Column/Countries.php
new file mode 100644
index 0000000000000..d05d5d1c592a7
--- /dev/null
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Address/Column/Countries.php
@@ -0,0 +1,41 @@
+countryCollectionFactory = $collectionFactory;
+ }
+
+ /**
+ * Get list of countries with country id as value and code as label
+ *
+ * @return array
+ */
+ public function toOptionArray(): array
+ {
+ /** @var \Magento\Directory\Model\ResourceModel\Country\Collection $countryCollection */
+ $countryCollection = $this->countryCollectionFactory->create();
+ return $countryCollection->toOptionArray();
+ }
+}
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Address/DataProvider.php b/app/code/Magento/Customer/Ui/Component/Listing/Address/DataProvider.php
new file mode 100644
index 0000000000000..c70e25ee99ec3
--- /dev/null
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Address/DataProvider.php
@@ -0,0 +1,113 @@
+collection = $collectionFactory->create();
+ $this->countryDirectory = $countryFactory->create();
+ $this->request = $request;
+ }
+
+ /**
+ * Add country key for default billing/shipping blocks on customer addresses tab
+ *
+ * @return array
+ */
+ public function getData(): array
+ {
+ $collection = $this->getCollection();
+ $data['items'] = [];
+ if ($this->request->getParam('parent_id')) {
+ $collection->addFieldToFilter('parent_id', $this->request->getParam('parent_id'));
+ $data = $collection->toArray();
+ }
+ foreach ($data['items'] as $key => $item) {
+ if (isset($item['country_id']) && !isset($item['country'])) {
+ $data['items'][$key]['country'] = $this->countryDirectory->loadByCode($item['country_id'])->getName();
+ }
+ }
+
+ return $data;
+ }
+
+ /**
+ * Add full text search filter to collection
+ *
+ * @param Filter $filter
+ * @return void
+ */
+ public function addFilter(Filter $filter): void
+ {
+ if ($filter->getField() !== 'fulltext') {
+ $this->collection->addFieldToFilter(
+ $filter->getField(),
+ [$filter->getConditionType() => $filter->getValue()]
+ );
+ } else {
+ $value = trim($filter->getValue());
+ $this->collection->addFieldToFilter(
+ [
+ ['attribute' => 'firstname'],
+ ['attribute' => 'lastname'],
+ ['attribute' => 'street'],
+ ['attribute' => 'city'],
+ ['attribute' => 'region'],
+ ['attribute' => 'postcode'],
+ ['attribute' => 'telephone']
+ ],
+ [
+ ['like' => "%{$value}%"],
+ ['like' => "%{$value}%"],
+ ['like' => "%{$value}%"],
+ ['like' => "%{$value}%"],
+ ['like' => "%{$value}%"],
+ ['like' => "%{$value}%"],
+ ['like' => "%{$value}%"],
+ ['like' => "%{$value}%"],
+ ]
+ );
+ }
+ }
+}
diff --git a/app/code/Magento/Customer/etc/db_schema_whitelist.json b/app/code/Magento/Customer/etc/db_schema_whitelist.json
index 4aada8f0d81fe..ec7a53945aba3 100644
--- a/app/code/Magento/Customer/etc/db_schema_whitelist.json
+++ b/app/code/Magento/Customer/etc/db_schema_whitelist.json
@@ -73,7 +73,8 @@
"vat_request_success": true
},
"index": {
- "CUSTOMER_ADDRESS_ENTITY_PARENT_ID": true
+ "CUSTOMER_ADDRESS_ENTITY_PARENT_ID": true,
+ "FTI_BA70344390184AC3F063AB2EB38BC0ED": true
},
"constraint": {
"PRIMARY": true,
diff --git a/app/code/Magento/Customer/etc/di.xml b/app/code/Magento/Customer/etc/di.xml
index 209f4794c6fcf..a181d6dd217fd 100644
--- a/app/code/Magento/Customer/etc/di.xml
+++ b/app/code/Magento/Customer/etc/di.xml
@@ -230,6 +230,7 @@
- Magento\Customer\Model\ResourceModel\Grid\Collection
- Magento\Customer\Model\ResourceModel\Online\Grid\Collection
- Magento\Customer\Model\ResourceModel\Group\Grid\Collection
+ - Magento\Customer\Model\ResourceModel\Address\Grid\Collection
@@ -456,6 +457,14 @@
Magento\Customer\Model\ResourceModel\Group
+
+
+ customer_address_entity
+ customer_address_entity_grid_collection
+ customer_address_entity_grid_collection
+ Magento\Customer\Model\ResourceModel\Address
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/view/adminhtml/ui_component/customer_address_form.xml b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_address_form.xml
new file mode 100644
index 0000000000000..35f0ed8f1dae2
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_address_form.xml
@@ -0,0 +1,250 @@
+
+
+
diff --git a/app/code/Magento/Customer/view/adminhtml/ui_component/customer_address_listing.xml b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_address_listing.xml
new file mode 100644
index 0000000000000..fb42a2c5a0787
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_address_listing.xml
@@ -0,0 +1,162 @@
+
+
+
+
+ -
+
- customer_address_listing.customer_address_listing_data_source
+
+
+
+ customer_address_columns
+
+ customer_address_listing.customer_address_listing_data_source
+
+
+
+
+
+ *
+
+
+ entity_id
+
+
+ Magento_Customer::manage
+
+
+ id
+ entity_id
+
+
+
+
+
+
+
+ customer_address_listing.customer_address_listing.listing_top.bookmarks
+ current.filters
+
+
+ customer_address_listing.customer_address_listing.listing_top.listing_filters
+
+ - customer_address_listing.customer_address_listing.listing_top.bookmarks:current.columns.${ $.index }.visible
+
+
+
+
+
+
+
+ -
+
- true
+
+
+
+ delete
+
+
+ Are you sure to delete selected address?
+ Delete items
+
+
+
+
+
+
+
+
+
+ - false
+
+ entity_id
+ true
+ customer_address_listing.customer_address_listing.address_columns.ids
+
+
+
+ - customer_address_listing.customer_address_listing.address_columns_editor
+ - startEdit
+ -
+
- ${ $.$data.rowIndex }
+ - true
+
+
+
+
+
+
+ entity_id
+
+
+
+
+ text
+
+
+
+
+
+ text
+
+
+
+
+
+ text
+
+
+
+
+
+ text
+
+
+
+
+
+ text
+
+
+
+
+
+ text
+
+
+
+
+
+ select
+ select
+
+
+
+
+
+ text
+
+ text
+
+
+
+
+
+
+ entity_id
+
+
+
+
diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/address/default-address.js b/app/code/Magento/Customer/view/adminhtml/web/js/address/default-address.js
new file mode 100644
index 0000000000000..07662cd9b105b
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/web/js/address/default-address.js
@@ -0,0 +1,50 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'Magento_Ui/js/form/components/button',
+ 'underscore'
+], function (Button, _) {
+ 'use strict';
+
+ return Button.extend({
+ defaults: {
+ entityId: null,
+ parentId: null,
+ listens: {
+ entity: 'changeVisibility'
+ }
+ },
+
+ /**
+ * Apply action on target component,
+ * but previously create this component from template if it is not existed
+ *
+ * @param {Object} action - action configuration
+ */
+ applyAction: function (action) {
+ if (action.params && action.params[0]) {
+ action.params[0]['entity_id'] = this.entityId;
+ action.params[0]['parent_id'] = this.parentId;
+ } else {
+ action.params = [{
+ 'entity_id': this.entityId,
+ 'parent_id': this.parentId
+ }];
+ }
+
+ this._super();
+ },
+
+ /**
+ * Change visibility of the default address shipping/billing blocks
+ *
+ * @param {Object} entity - customer address
+ */
+ changeVisibility: function (entity) {
+ this.visible(!_.isEmpty(entity));
+ }
+ });
+});
diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/form/components/form.js b/app/code/Magento/Customer/view/adminhtml/web/js/form/components/form.js
new file mode 100644
index 0000000000000..812dbe5975c70
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/web/js/form/components/form.js
@@ -0,0 +1,81 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+ 'jquery',
+ 'Magento_Ui/js/modal/alert',
+ 'Magento_Ui/js/modal/confirm',
+ 'Magento_Ui/js/form/form',
+ 'underscore',
+ 'mage/translate'
+], function ($, uiAlert, uiConfirm, Form, _, $t) {
+ 'use strict';
+
+ return Form.extend({
+ defaults: {
+ deleteConfirmationMessage: '',
+ ajaxSettings: {
+ method: 'POST',
+ dataType: 'json'
+ }
+ },
+
+ /**
+ * Delete customer address by provided url.
+ * Will call confirmation message to be sure that user is really wants to delete this address
+ *
+ * @param {String} url - ajax url
+ */
+ deleteAddress: function (url) {
+ var that = this;
+
+ uiConfirm({
+ content: this.deleteConfirmationMessage,
+ actions: {
+ /** @inheritdoc */
+ confirm: function () {
+ that._delete(url);
+ }
+ }
+ });
+ },
+
+ /**
+ * Perform asynchronous DELETE request to server.
+ * @param {String} url - ajax url
+ * @returns {Deferred}
+ */
+ _delete: function (url) {
+ var settings = _.extend({}, this.ajaxSettings, {
+ url: url,
+ data: {
+ 'form_key': window.FORM_KEY
+ }
+ }),
+ that = this;
+
+ $('body').trigger('processStart');
+
+ return $.ajax(settings)
+ .done(function (response) {
+ if (response.error) {
+ uiAlert({
+ content: response.message
+ });
+ } else {
+ that.trigger('deleteAddressAction', that.source.get('data.entity_id'));
+ }
+ })
+ .fail(function () {
+ uiAlert({
+ content: $t('Sorry, there has been an error processing your request. Please try again later.')
+ });
+ })
+ .always(function () {
+ $('body').trigger('processStop');
+ });
+
+ }
+ });
+});
diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/form/components/insert-form.js b/app/code/Magento/Customer/view/adminhtml/web/js/form/components/insert-form.js
new file mode 100644
index 0000000000000..a1ffbde62d4d0
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/web/js/form/components/insert-form.js
@@ -0,0 +1,80 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'Magento_Ui/js/form/components/insert-form'
+], function (Insert) {
+ 'use strict';
+
+ return Insert.extend({
+ defaults: {
+ listens: {
+ responseData: 'onResponse'
+ },
+ modules: {
+ addressListing: '${ $.addressListingProvider }',
+ addressModal: '${ $.addressModalProvider }'
+ }
+ },
+
+ /**
+ * Close modal, reload customer address listing and save customer address
+ *
+ * @param {Object} responseData
+ */
+ onResponse: function (responseData) {
+ var data;
+
+ if (!responseData.error) {
+ this.addressModal().closeModal();
+ this.addressListing().reload({
+ refresh: true
+ });
+ data = this.externalSource().get('data');
+ this.saveAddress(responseData, data);
+ }
+ },
+
+ /**
+ * Save customer address to customer form data source
+ *
+ * @param {Object} responseData
+ * @param {Object} data - customer address
+ */
+ saveAddress: function (responseData, data) {
+ data['entity_id'] = responseData.data['entity_id'];
+
+ if (parseFloat(data['default_billing'])) {
+ this.source.set('data.default_billing_address', data);
+ } else if (
+ parseFloat(this.source.get('data.default_billing_address')['entity_id']) === data['entity_id']
+ ) {
+ this.source.set('data.default_billing_address', []);
+ }
+
+ if (parseFloat(data['default_shipping'])) {
+ this.source.set('data.default_shipping_address', data);
+ } else if (
+ parseFloat(this.source.get('data.default_shipping_address')['entity_id']) === data['entity_id']
+ ) {
+ this.source.set('data.default_shipping_address', []);
+ }
+ },
+
+ /**
+ * Event method that closes "Edit customer address" modal and refreshes grid after customer address
+ * was removed through "Delete" button on the "Edit customer address" modal
+ *
+ * @param {String} id - customer address ID to delete
+ */
+ onAddressDelete: function (id) {
+ this.addressModal().closeModal();
+ this.addressListing().reload({
+ refresh: true
+ });
+ this.addressListing()._delete([parseFloat(id)]);
+ }
+ });
+});
diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/form/components/insert-listing.js b/app/code/Magento/Customer/view/adminhtml/web/js/form/components/insert-listing.js
new file mode 100644
index 0000000000000..912d4b32130ec
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/web/js/form/components/insert-listing.js
@@ -0,0 +1,90 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'Magento_Ui/js/form/components/insert-listing',
+ 'underscore'
+], function (Insert, _) {
+ 'use strict';
+
+ return Insert.extend({
+
+ /**
+ * On action call
+ *
+ * @param {Object} data - customer address and actions
+ */
+ onAction: function (data) {
+ this[data.action + 'Action'].call(this, data.data);
+ },
+
+ /**
+ * On mass action call
+ *
+ * @param {Object} data - customer address
+ */
+ onMassAction: function (data) {
+ this[data.action + 'Massaction'].call(this, data.data);
+ },
+
+ /**
+ * Set default billing address
+ *
+ * @param {Object} data - customer address
+ */
+ setDefaultBillingAction: function (data) {
+ this.source.set('data.default_billing_address', data);
+ },
+
+ /**
+ * Set default shipping address
+ *
+ * @param {Object} data - customer address
+ */
+ setDefaultShippingAction: function (data) {
+ this.source.set('data.default_shipping_address', data);
+ },
+
+ /**
+ * Delete customer address
+ *
+ * @param {Object} data - customer address
+ */
+ deleteAction: function (data) {
+ this._delete([parseFloat(data[data['id_field_name']])]);
+ },
+
+ /**
+ * Mass action delete
+ *
+ * @param {Object} data - customer address
+ */
+ deleteMassaction: function (data) {
+ var ids = _.map(data, function (val) {
+ return parseFloat(val);
+ });
+
+ this._delete(ids);
+ },
+
+ /**
+ * Delete customer address by ids
+ *
+ * @param {Array} ids
+ */
+ _delete: function (ids) {
+ var defaultShippingId = parseFloat(this.source.get('data.default_shipping_address.entity_id')),
+ defaultBillingId = parseFloat(this.source.get('data.default_billing_address.entity_id'));
+
+ if (ids.indexOf(defaultShippingId) !== -1) {
+ this.source.set('data.default_shipping_address', []);
+ }
+
+ if (ids.indexOf(defaultBillingId) !== -1) {
+ this.source.set('data.default_billing_address', []);
+ }
+ }
+ });
+});
diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/form/element/country.js b/app/code/Magento/Customer/view/adminhtml/web/js/form/element/country.js
new file mode 100644
index 0000000000000..1ed30ae388b47
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/web/js/form/element/country.js
@@ -0,0 +1,29 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'Magento_Ui/js/form/element/country'
+], function (Country) {
+ 'use strict';
+
+ return Country.extend({
+ defaults: {
+ countryScope: 'data.country'
+ },
+
+ /**
+ * Set country to customer address form
+ *
+ * @param {String} value - country
+ */
+ setDifferedFromDefault: function (value) {
+ this._super();
+
+ if (value) {
+ this.source.set(this.countryScope, this.indexedOptions[value].label);
+ }
+ }
+ });
+});
diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/form/element/region.js b/app/code/Magento/Customer/view/adminhtml/web/js/form/element/region.js
new file mode 100644
index 0000000000000..755a8e6df3dbe
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/web/js/form/element/region.js
@@ -0,0 +1,29 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'Magento_Ui/js/form/element/region'
+], function (Region) {
+ 'use strict';
+
+ return Region.extend({
+ defaults: {
+ regionScope: 'data.region'
+ },
+
+ /**
+ * Set region to customer address form
+ *
+ * @param {String} value - region
+ */
+ setDifferedFromDefault: function (value) {
+ this._super();
+
+ if (parseFloat(value)) {
+ this.source.set(this.regionScope, this.indexedOptions[value].label);
+ }
+ }
+ });
+});
diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/grid/columns/actions.js b/app/code/Magento/Customer/view/adminhtml/web/js/grid/columns/actions.js
new file mode 100644
index 0000000000000..66ef89c9413c7
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/web/js/grid/columns/actions.js
@@ -0,0 +1,103 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'Magento_Ui/js/grid/columns/actions',
+ 'Magento_Ui/js/modal/alert',
+ 'underscore',
+ 'jquery',
+ 'mage/translate'
+], function (Actions, uiAlert, _, $, $t) {
+ 'use strict';
+
+ return Actions.extend({
+ defaults: {
+ ajaxSettings: {
+ method: 'POST',
+ dataType: 'json'
+ },
+ listens: {
+ action: 'onAction'
+ }
+ },
+
+ /**
+ * Reload customer address listing data source after customer address delete action
+ *
+ * @param {Object} data
+ */
+ onAction: function (data) {
+ if (data.action === 'delete') {
+ this.source().reload({
+ refresh: true
+ });
+ }
+ },
+
+ /**
+ * Default action callback. Redirects to
+ * the specified in action's data url.
+ *
+ * @param {String} actionIndex - Action's identifier.
+ * @param {(Number|String)} recordId - Id of the record associated
+ * with a specified action.
+ * @param {Object} action - Action's data.
+ */
+ defaultCallback: function (actionIndex, recordId, action) {
+ if (action.isAjax) {
+ this.request(action.href).done(function (response) {
+ var data;
+
+ if (!response.error) {
+ data = _.findWhere(this.rows, {
+ _rowIndex: action.rowIndex
+ });
+
+ this.trigger('action', {
+ action: actionIndex,
+ data: data
+ });
+ }
+ }.bind(this));
+
+ } else {
+ this._super();
+ }
+ },
+
+ /**
+ * Send customer address listing ajax request
+ *
+ * @param {String} href
+ */
+ request: function (href) {
+ var settings = _.extend({}, this.ajaxSettings, {
+ url: href,
+ data: {
+ 'form_key': window.FORM_KEY
+ }
+ });
+
+ $('body').trigger('processStart');
+
+ return $.ajax(settings)
+ .done(function (response) {
+ if (response.error) {
+ uiAlert({
+ content: response.message
+ });
+ }
+ })
+ .fail(function () {
+ uiAlert({
+ content: $t('Sorry, there has been an error processing your request. Please try again later.')
+ });
+ })
+ .always(function () {
+ $('body').trigger('processStop');
+ });
+ }
+ });
+});
diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/grid/filters/chips.js b/app/code/Magento/Customer/view/adminhtml/web/js/grid/filters/chips.js
new file mode 100644
index 0000000000000..5dbf62a209b3b
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/web/js/grid/filters/chips.js
@@ -0,0 +1,23 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'Magento_Ui/js/grid/filters/chips'
+], function (Chips) {
+ 'use strict';
+
+ return Chips.extend({
+
+ /**
+ * Clear previous filters while initializing element to prevent filters sharing between customers
+ *
+ * @param {Object} elem
+ */
+ initElement: function (elem) {
+ this.clear();
+ this._super(elem);
+ }
+ });
+});
diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/grid/filters/filters.js b/app/code/Magento/Customer/view/adminhtml/web/js/grid/filters/filters.js
new file mode 100644
index 0000000000000..f8bf7d3d7ec46
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/web/js/grid/filters/filters.js
@@ -0,0 +1,20 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'Magento_Ui/js/grid/filters/filters'
+], function (Filters) {
+ 'use strict';
+
+ return Filters.extend({
+ defaults: {
+ chipsConfig: {
+ name: '${ $.name }_chips',
+ provider: '${ $.chipsConfig.name }',
+ component: 'Magento_Customer/js/grid/filters/chips'
+ }
+ }
+ });
+});
diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/grid/massactions.js b/app/code/Magento/Customer/view/adminhtml/web/js/grid/massactions.js
new file mode 100644
index 0000000000000..384f48554a917
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/web/js/grid/massactions.js
@@ -0,0 +1,106 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'Magento_Ui/js/grid/massactions',
+ 'Magento_Ui/js/modal/alert',
+ 'underscore',
+ 'jquery',
+ 'mage/translate'
+], function (Massactions, uiAlert, _, $, $t) {
+ 'use strict';
+
+ return Massactions.extend({
+ defaults: {
+ ajaxSettings: {
+ method: 'POST',
+ dataType: 'json'
+ },
+ listens: {
+ massaction: 'onAction'
+ }
+ },
+
+ /**
+ * Reload customer addresses listing
+ *
+ * @param {Object} data
+ */
+ onAction: function (data) {
+ if (data.action === 'delete') {
+ this.source.reload({
+ refresh: true
+ });
+ }
+ },
+
+ /**
+ * Default action callback. Send selections data
+ * via POST request.
+ *
+ * @param {Object} action - Action data.
+ * @param {Object} data - Selections data.
+ */
+ defaultCallback: function (action, data) {
+ var itemsType, selections;
+
+ if (action.isAjax) {
+ itemsType = data.excludeMode ? 'excluded' : 'selected';
+ selections = {};
+
+ selections[itemsType] = data[itemsType];
+
+ if (!selections[itemsType].length) {
+ selections[itemsType] = false;
+ }
+
+ _.extend(selections, data.params || {});
+
+ this.request(action.url, selections).done(function (response) {
+ if (!response.error) {
+ this.trigger('massaction', {
+ action: action.type,
+ data: selections
+ });
+ }
+ }.bind(this));
+ } else {
+ this._super();
+ }
+ },
+
+ /**
+ * Send customer address listing mass action ajax request
+ *
+ * @param {String} href
+ * @param {Object} data
+ */
+ request: function (href, data) {
+ var settings = _.extend({}, this.ajaxSettings, {
+ url: href,
+ data: data
+ });
+
+ $('body').trigger('processStart');
+
+ return $.ajax(settings)
+ .done(function (response) {
+ if (response.error) {
+ uiAlert({
+ content: response.message
+ });
+ }
+ })
+ .fail(function () {
+ uiAlert({
+ content: $t('Sorry, there has been an error processing your request. Please try again later.')
+ });
+ })
+ .always(function () {
+ $('body').trigger('processStop');
+ });
+ }
+ });
+});
diff --git a/app/code/Magento/Customer/view/adminhtml/web/template/default-address-wrapper.html b/app/code/Magento/Customer/view/adminhtml/web/template/default-address-wrapper.html
new file mode 100644
index 0000000000000..2af366b03342c
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/web/template/default-address-wrapper.html
@@ -0,0 +1,7 @@
+
+
diff --git a/app/code/Magento/Customer/view/adminhtml/web/template/default-address.html b/app/code/Magento/Customer/view/adminhtml/web/template/default-address.html
new file mode 100644
index 0000000000000..8d68b93445b85
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/web/template/default-address.html
@@ -0,0 +1,47 @@
+
+
id
entity_id
@@ -303,262 +303,196 @@
-
-
+
+
diff --git a/app/code/Magento/Customer/view/base/ui_component/customer_form.xml b/app/code/Magento/Customer/view/base/ui_component/customer_form.xml
index d2a9b3f44624d..7e6b7bbe9cd09 100644
--- a/app/code/Magento/Customer/view/base/ui_component/customer_form.xml
+++ b/app/code/Magento/Customer/view/base/ui_component/customer_form.xml
@@ -43,7 +43,7 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
index 4f724fb0047e6..b3395bd4afaa9 100644
--- a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
+++ b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
@@ -95,6 +95,13 @@
+
+
diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxCodeData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxCodeData.xml
index 36929ef2e3fa1..27c89162b5cea 100644
--- a/app/code/Magento/Tax/Test/Mftf/Data/TaxCodeData.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxCodeData.xml
@@ -8,6 +8,18 @@
+
+ California
+ United Kingdom
+ *
+ 50
+
+
+ California
+ United Kingdom
+ *
+ 0
+
New York
United States
diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml
index b3f341b687ba7..e11f856c5f57c 100644
--- a/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml
@@ -23,4 +23,10 @@
true
+
+ TaxName
+
+
+ TaxNameZeroRate
+
diff --git a/app/code/Magento/Tax/Test/Mftf/Section/AdminConfigureTaxSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminConfigureTaxSection.xml
index 681b3a37f506c..bfb082c145f07 100644
--- a/app/code/Magento/Tax/Test/Mftf/Section/AdminConfigureTaxSection.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Section/AdminConfigureTaxSection.xml
@@ -57,5 +57,10 @@
diff --git a/app/code/Magento/Tax/Test/Mftf/Section/AdminProductTaxClassSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminProductTaxClassSection.xml
new file mode 100644
index 0000000000000..f32caf88f2133
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Section/AdminProductTaxClassSection.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRulesSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRulesSection.xml
index 3d58238c96ff9..29c53242b90f6 100644
--- a/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRulesSection.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRulesSection.xml
@@ -9,6 +9,11 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
index 7263db10073e0..a2b100143a306 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
@@ -75,7 +75,7 @@
 ?> "<?= /* @escapeNotVerified */ $block->getLogoAlt() ?>")
getLogoWidth() ? 'width="' . $block->getLogoWidth() . '"' : '' ?>
- getLogoHeight() ? 'height="' . $block->getLogoHeight() . '"' : '' ?>
- />
-isHomePage()):?>
-
-
-
-
+
+ getLogoWidth() ? 'width="' . $block->getLogoWidth() . '"' : '' ?>
+ getLogoHeight() ? 'height="' . $block->getLogoHeight() . '"' : '' ?>
+ />
+
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/Formatter.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/Formatter.js
index 5f05d3f3015ad..f74282afd32a6 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/Formatter.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/Formatter.js
@@ -1856,7 +1856,7 @@
}
};
- // Applies formatting to the caret postion
+ // Applies formatting to the caret position
function applyCaretFormat() {
var rng, caretContainer, textNode, offset, bookmark, container, text;
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Writer.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Writer.js
index 2abfac6478a0a..f37607f73270b 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Writer.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Writer.js
@@ -110,7 +110,7 @@ tinymce.html.Writer = function(settings) {
*
* @method text
* @param {String} text String to write out.
- * @param {Boolean} raw Optional raw state if true the contents wont get encoded.
+ * @param {Boolean} raw Optional raw state if true the contents won't get encoded.
*/
text: function(text, raw) {
if (text.length > 0)
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/example/editor_plugin_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/example/editor_plugin_src.js
index edc1e776e5524..bd805e6370274 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/example/editor_plugin_src.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/example/editor_plugin_src.js
@@ -49,7 +49,7 @@
},
/**
- * Creates control instances based in the incomming name. This method is normally not
+ * Creates control instances based in the incoming name. This method is normally not
* needed since the addButton method of the tinymce.Editor class is a more easy way of adding buttons
* but you sometimes need to create more complex controls like listboxes, split buttons etc then this
* method can be used to create those.
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_jquery_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_jquery_src.js
index b3d77f6ce3139..2d9d859caa6fa 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_jquery_src.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_jquery_src.js
@@ -15682,7 +15682,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
}
};
- // Applies formatting to the caret postion
+ // Applies formatting to the caret position
function applyCaretFormat() {
var rng, caretContainer, textNode, offset, bookmark, container, text;
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_prototype_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_prototype_src.js
index daf2ad4e71bac..aaa207da3e4a9 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_prototype_src.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_prototype_src.js
@@ -16532,7 +16532,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
}
};
- // Applies formatting to the caret postion
+ // Applies formatting to the caret position
function applyCaretFormat() {
var rng, caretContainer, textNode, offset, bookmark, container, text;
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_src.js
index 2634633d8eee5..8448152ed5d2f 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_src.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_src.js
@@ -16506,7 +16506,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
}
};
- // Applies formatting to the caret postion
+ // Applies formatting to the caret position
function applyCaretFormat() {
var rng, caretContainer, textNode, offset, bookmark, container, text;
diff --git a/app/code/Magento/Ui/Component/Form/Element/DataType/Media.php b/app/code/Magento/Ui/Component/Form/Element/DataType/Media.php
index c2460fd8385c1..d4b1937bd06ba 100644
--- a/app/code/Magento/Ui/Component/Form/Element/DataType/Media.php
+++ b/app/code/Magento/Ui/Component/Form/Element/DataType/Media.php
@@ -31,14 +31,16 @@ public function prepare()
{
if ($this->getData('config/uploaderConfig/url')) {
$url = $this->getContext()->getUrl($this->getData('config/uploaderConfig/url'), ['_secure' => true]);
+ $updateConfig = [
+ 'uploaderConfig' => ['url' => $url]
+ ];
+ if (!isset($this->getConfiguration()['dataScope'])) {
+ $updateConfig['dataScope'] = $this->getName();
+ }
$data = array_replace_recursive(
$this->getData(),
[
- 'config' => [
- 'uploaderConfig' => [
- 'url' => $url
- ],
- ],
+ 'config' => $updateConfig,
]
);
$this->setData($data);
diff --git a/app/code/Magento/Ui/Component/Form/Fieldset.php b/app/code/Magento/Ui/Component/Form/Fieldset.php
index 745068ca0fa8a..2525d0a4923c1 100644
--- a/app/code/Magento/Ui/Component/Form/Fieldset.php
+++ b/app/code/Magento/Ui/Component/Form/Fieldset.php
@@ -5,13 +5,11 @@
*/
namespace Magento\Ui\Component\Form;
-use Magento\Ui\Component\Container;
use Magento\Ui\Component\AbstractComponent;
-use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Framework\View\Element\UiComponentInterface;
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
/**
+ * Fieldset UI Component.
+ *
* @api
* @since 100.0.2
*/
diff --git a/app/code/Magento/Ui/Component/Layout/Tabs.php b/app/code/Magento/Ui/Component/Layout/Tabs.php
index 8ceac716ae218..0d176d7241653 100644
--- a/app/code/Magento/Ui/Component/Layout/Tabs.php
+++ b/app/code/Magento/Ui/Component/Layout/Tabs.php
@@ -5,18 +5,17 @@
*/
namespace Magento\Ui\Component\Layout;
-use Magento\Framework\View\Element\Template;
use Magento\Framework\View\Element\UiComponent\BlockWrapperInterface;
use Magento\Framework\View\Element\UiComponent\DataSourceInterface;
-use Magento\Framework\View\Element\UiComponent\LayoutInterface;
use Magento\Framework\View\Element\UiComponentFactory;
use Magento\Framework\View\Element\UiComponentInterface;
+use Magento\Framework\View\Element\ComponentVisibilityInterface;
use Magento\Ui\Component\Layout\Tabs\TabInterface;
/**
* Class Tabs
*/
-class Tabs extends \Magento\Framework\View\Layout\Generic implements LayoutInterface
+class Tabs extends \Magento\Framework\View\Layout\Generic
{
/**
* @var string
@@ -89,58 +88,15 @@ protected function addChildren(array &$topNode, UiComponentInterface $component,
$this->addWrappedBlock($childComponent, $childrenAreas);
continue;
}
+ if ($childComponent instanceof ComponentVisibilityInterface && !$childComponent->isComponentVisible()) {
+ continue;
+ }
$name = $childComponent->getName();
$config = $childComponent->getData('config');
$collectedComponents[$name] = true;
- if (isset($config['is_collection']) && $config['is_collection'] === true) {
- $label = $childComponent->getData('config/label');
- $this->component->getContext()->addComponentDefinition(
- 'collection',
- [
- 'component' => 'Magento_Ui/js/form/components/collection',
- 'extends' => $this->namespace
- ]
- );
-
- /**
- * @var UiComponentInterface $childComponent
- * @var array $structure
- */
- list($childComponent, $structure) = $this->prepareChildComponents($childComponent, $name);
-
- $childrenStructure = $structure[$name]['children'];
-
- $structure[$name]['children'] = [
- $name . '_collection' => [
- 'type' => 'collection',
- 'config' => [
- 'active' => 1,
- 'removeLabel' => __('Remove %1', $label),
- 'addLabel' => __('Add New %1', $label),
- 'removeMessage' => $childComponent->getData('config/removeMessage'),
- 'itemTemplate' => 'item_template',
- ],
- 'children' => [
- 'item_template' => ['type' => $this->namespace,
- 'isTemplate' => true,
- 'component' => 'Magento_Ui/js/form/components/collection/item',
- 'childType' => 'group',
- 'config' => [
- 'label' => __('New %1', $label),
- ],
- 'children' => $childrenStructure
- ]
- ]
- ]
- ];
- } else {
- /**
- * @var UiComponentInterface $childComponent
- * @var array $structure
- */
- list($childComponent, $structure) = $this->prepareChildComponents($childComponent, $name);
- }
+
+ [$childComponent, $structure] = $this->buildChildComponentStructure($config, $childComponent);
$tabComponent = $this->createTabComponent($childComponent, $name);
@@ -168,6 +124,67 @@ protected function addChildren(array &$topNode, UiComponentInterface $component,
$topNode = $this->structure;
}
+ /**
+ * Build child components structure of the tab
+ *
+ * @param array $config
+ * @param UiComponentInterface $childComponent
+ * @return array
+ */
+ private function buildChildComponentStructure(array $config, $childComponent): array
+ {
+ $name = $childComponent->getName();
+ if (isset($config['is_collection']) && $config['is_collection'] === true) {
+ $label = $childComponent->getData('config/label');
+ $this->component->getContext()->addComponentDefinition(
+ 'collection',
+ [
+ 'component' => 'Magento_Ui/js/form/components/collection',
+ 'extends' => $this->namespace
+ ]
+ );
+ /**
+ * @var UiComponentInterface $childComponent
+ * @var array $structure
+ */
+ [$childComponent, $structure] = $this->prepareChildComponents($childComponent, $name);
+
+ $childrenStructure = $structure[$name]['children'];
+
+ $structure[$name]['children'] = [
+ $name . '_collection' => [
+ 'type' => 'collection',
+ 'config' => [
+ 'active' => 1,
+ 'removeLabel' => __('Remove %1', $label),
+ 'addLabel' => __('Add New %1', $label),
+ 'removeMessage' => $childComponent->getData('config/removeMessage'),
+ 'itemTemplate' => 'item_template',
+ ],
+ 'children' => [
+ 'item_template' => ['type' => $this->namespace,
+ 'isTemplate' => true,
+ 'component' => 'Magento_Ui/js/form/components/collection/item',
+ 'childType' => 'group',
+ 'config' => [
+ 'label' => __('New %1', $label),
+ ],
+ 'children' => $childrenStructure
+ ]
+ ]
+ ]
+ ];
+ } else {
+ /**
+ * @var UiComponentInterface $childComponent
+ * @var array $structure
+ */
+ [$childComponent, $structure] = $this->prepareChildComponents($childComponent, $name);
+ }
+
+ return [$childComponent, $structure];
+ }
+
/**
* Add wrapped layout block
*
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/MediaTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/MediaTest.php
index 7af173cf2a96f..9653ecd7ded44 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/MediaTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/MediaTest.php
@@ -21,6 +21,9 @@ class MediaTest extends \PHPUnit\Framework\TestCase
/** @var Media */
protected $media;
+ /**
+ * @inheritdoc
+ */
public function setUp()
{
$this->context = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\ContextInterface::class)
@@ -29,8 +32,13 @@ public function setUp()
->getMockForAbstractClass();
$this->media = new Media($this->context);
+ }
+
+ public function testPrepareWithoutDataScope()
+ {
$this->media->setData(
[
+ 'name' => 'test_name',
'config' => [
'uploaderConfig' => [
'url' => 'module/actionPath/path'
@@ -38,19 +46,54 @@ public function setUp()
],
]
);
+ $url = 'http://magento2.com/module/actionPath/path/key/34523456234523trdg';
+ $expectedConfig = [
+ 'uploaderConfig' => ['url' => $url],
+ 'dataScope' => 'test_name'
+ ];
+
+ $this->processor = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Processor::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->context->expects($this->atLeastOnce())->method('getProcessor')->willReturn($this->processor);
+ $this->context->expects($this->once())
+ ->method('getUrl')
+ ->with('module/actionPath/path', ['_secure' => true])
+ ->willReturn($url);
+ $this->media->prepare();
+ $configuration = $this->media->getConfiguration();
+ $this->assertEquals($expectedConfig, $configuration);
}
- public function testPrepare()
+ public function testPrepareWithDataScope()
{
+ $this->media->setData(
+ [
+ 'name' => 'test_name',
+ 'config' => [
+ 'dataScope' => 'other_data_scope',
+ 'uploaderConfig' => [
+ 'url' => 'module/actionPath/path'
+ ],
+ ],
+ ]
+ );
+ $url = 'http://magento2.com/module/actionPath/path/key/34523456234523trdg';
+ $expectedConfig = [
+ 'uploaderConfig' => ['url' => $url],
+ 'dataScope' => 'other_data_scope'
+ ];
+
$this->processor = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Processor::class)
->disableOriginalConstructor()
->getMock();
$this->context->expects($this->atLeastOnce())->method('getProcessor')->willReturn($this->processor);
- $url = 'http://magento2.com/module/actionPath/path/key/34523456234523trdg';
$this->context->expects($this->once())
->method('getUrl')
->with('module/actionPath/path', ['_secure' => true])
->willReturn($url);
$this->media->prepare();
+ $configuration = $this->media->getConfiguration();
+ $this->assertEquals($expectedConfig, $configuration);
}
}
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/FieldsetTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/FieldsetTest.php
new file mode 100644
index 0000000000000..d243507580807
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/FieldsetTest.php
@@ -0,0 +1,58 @@
+context = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\ContextInterface::class)
+ ->getMockForAbstractClass();
+
+ $this->fieldset = new Fieldset(
+ $this->context,
+ [],
+ []
+ );
+ }
+
+ /**
+ * Run test for getComponentName() method
+ *
+ * @return void
+ *
+ */
+ public function testGetComponentName()
+ {
+ $this->assertEquals(self::NAME, $this->fieldset->getComponentName());
+ }
+}
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/area.js b/app/code/Magento/Ui/view/base/web/js/form/components/area.js
index 5967b8c57b5d3..741e6d3065023 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/area.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/area.js
@@ -44,7 +44,7 @@ define([
/**
* Calls parent's initElement method.
- * Assignes callbacks on various events of incoming element.
+ * Assigns callbacks on various events of incoming element.
* @param {Object} elem
* @return {Object} - reference to instance
*/
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/collection.js b/app/code/Magento/Ui/view/base/web/js/form/components/collection.js
index 2c12486ceb519..c31963e98627d 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/collection.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/collection.js
@@ -91,7 +91,7 @@ define([
},
/**
- * Returnes true if current set of items differ from initial one,
+ * Returns true if current set of items differ from initial one,
* or if some child has been changed.
*
* @returns {Boolean}
@@ -153,6 +153,7 @@ define([
* Creates function that removes element
* from collection using '_removeChild' method.
* @param {Object} elem - Element that should be removed.
+ * @deprecated Not used anymore
*/
removeAddress: function (elem) {
var self = this;
@@ -169,7 +170,7 @@ define([
},
/**
- * Removes elememt from both collection and data storage,
+ * Removes element from both collection and data storage,
* activates first element if removed one was active,
* triggers 'update' event.
*
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/collection/item.js b/app/code/Magento/Ui/view/base/web/js/form/components/collection/item.js
index c2a65371471c5..045c25ab7911f 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/collection/item.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/collection/item.js
@@ -19,7 +19,7 @@ define([
};
/**
- * Parses incoming data and returnes result merged with default preview config
+ * Parses incoming data and returns result merged with default preview config
*
* @param {Object|String} data
* @return {Object}
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js b/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js
index 6d33386fa1f1c..1ddc4dc247b24 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js
@@ -68,7 +68,7 @@ define([
/**
* Calls parent's initElement method.
- * Assignes callbacks on various events of incoming element.
+ * Assigns callbacks on various events of incoming element.
*
* @param {Object} elem
* @return {Object} - reference to instance
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js b/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
index 6492d0821fc21..357571350a268 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
@@ -324,7 +324,7 @@ define([
/**
* Handler which is invoked when files are choosed for upload.
- * May be used for implementation of aditional validation rules,
+ * May be used for implementation of additional validation rules,
* e.g. total files and a total size rules.
*
* @param {Event} e - Event object.
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js b/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
index 070761fff53e3..3d02afcc40a9e 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
@@ -20,7 +20,7 @@ define([
return Abstract.extend({
defaults: {
elementSelector: 'textarea',
- suffixRegExpPattern: '\\${ \\$.wysiwygUniqueSuffix }',
+ suffixRegExpPattern: '${ $.wysiwygUniqueSuffix }',
$wysiwygEditorButton: '',
links: {
value: '${ $.provider }:${ $.dataScope }'
@@ -65,6 +65,7 @@ define([
initConfig: function (config) {
var pattern = config.suffixRegExpPattern || this.constructor.defaults.suffixRegExpPattern;
+ pattern = pattern.replace(/\$/g, '\\$&');
config.content = config.content.replace(new RegExp(pattern, 'g'), this.getUniqueSuffix(config));
this._super();
diff --git a/app/code/Magento/Ui/view/base/web/js/form/provider.js b/app/code/Magento/Ui/view/base/web/js/form/provider.js
index d070e23c708bb..49765f589bd9d 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/provider.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/provider.js
@@ -82,7 +82,7 @@ define([
},
/**
- * Set data to provder based on current data.
+ * Set data to provider based on current data.
*
* @param {Object} oldData
* @param {Object} newData
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/dnd.js b/app/code/Magento/Ui/view/base/web/js/grid/dnd.js
index 5a71fca673ec9..660e3cb3bd2bb 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/dnd.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/dnd.js
@@ -406,7 +406,7 @@ define([
*
* @param {Number} x - X coordinate of a grabbed point.
* @param {Number} y - Y coordinate of a grabbed point.
- * @param {HTMLElement} elem - Grabbed elemenet.
+ * @param {HTMLElement} elem - Grabbed element.
*/
grab: function (x, y, elem) {
this.initDrag = true;
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/editing/editor.js b/app/code/Magento/Ui/view/base/web/js/grid/editing/editor.js
index 589aed4c9837b..a4785aea03743 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/editing/editor.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/editing/editor.js
@@ -164,7 +164,7 @@ define([
},
/**
- * Adds listeners on a new recrod.
+ * Adds listeners on a new record.
*
* @param {Record} record
* @returns {Editor} Chainable.
@@ -208,7 +208,7 @@ define([
},
/**
- * Starts editing of a specfied record. If records'
+ * Starts editing of a specified record. If records'
* instance doesn't exist, than it will be created.
*
* @param {(Number|String)} id - See 'getId' method.
@@ -401,7 +401,7 @@ define([
},
/**
- * Disables editing of specfied fields.
+ * Disables editing of specified fields.
*
* @param {Array} fields - An array of fields indeces to be disabled.
* @returns {Editor} Chainable.
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js b/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js
index 390aedf193b91..aa83083cac3c9 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js
@@ -141,7 +141,7 @@ define([
},
/**
- * Creates fields for the specfied columns.
+ * Creates fields for the specified columns.
*
* @param {Array} columns - An array of column instances.
* @returns {Record} Chainable.
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/massactions.js b/app/code/Magento/Ui/view/base/web/js/grid/massactions.js
index f26ca8697c2ff..3626f52806881 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/massactions.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/massactions.js
@@ -95,7 +95,7 @@ define([
},
/**
- * Adds new action. If action with a specfied identifier
+ * Adds new action. If action with a specified identifier
* already exists, than the original one will be overrided.
*
* @param {Object} action - Action object.
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/resize.js b/app/code/Magento/Ui/view/base/web/js/grid/resize.js
index 50781c9afd8c3..792c997f060c6 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/resize.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/resize.js
@@ -624,7 +624,7 @@ define([
},
/**
- * Generate index that will indentify context
+ * Generate index that will identify context
*
* @param {Object} ctx
* @return {String}
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/search/search.js b/app/code/Magento/Ui/view/base/web/js/grid/search/search.js
index fa445a2577adb..19536e7ff8c18 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/search/search.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/search/search.js
@@ -102,7 +102,7 @@ define([
/**
* Applies search query.
*
- * @param {String} [value=inputValue] - If not specfied, then
+ * @param {String} [value=inputValue] - If not specified, then
* value of the input field will be used.
* @returns {Search} Chainable.
*/
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/toolbar.js b/app/code/Magento/Ui/view/base/web/js/grid/toolbar.js
index 8a17e3ed46f29..fd2d09c6a65f6 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/toolbar.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/toolbar.js
@@ -557,7 +557,7 @@ define([
},
/**
- * Handles changes of windows' top scroll postion.
+ * Handles changes of windows' top scroll position.
*/
onWindowScrollTop: function () {
this.updateTableOffset()
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/core/collection.js b/app/code/Magento/Ui/view/base/web/js/lib/core/collection.js
index 607d217837fcc..eb4f2b39128e2 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/core/collection.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/core/collection.js
@@ -15,7 +15,7 @@ define([
'use strict';
/**
- * Removes non plain object items from the specfied array.
+ * Removes non plain object items from the specified array.
*
* @param {Array} container - Array whose value should be filtered.
* @returns {Array}
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/core/storage/local.js b/app/code/Magento/Ui/view/base/web/js/lib/core/storage/local.js
index 34ceced2c6873..87b5b2f5fe8fe 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/core/storage/local.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/core/storage/local.js
@@ -51,7 +51,7 @@ define([
},
/**
- * Retrieves specfied item.
+ * Retrieves specified item.
*
* @param {String} key - Key of the property to be retrieved.
*/
@@ -60,7 +60,7 @@ define([
},
/**
- * Removes specfied item.
+ * Removes specified item.
*
* @param {String} key - Key of the property to be removed.
*/
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/outer_click.js b/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/outer_click.js
index cc9dc5e0a2202..98e86de23221d 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/outer_click.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/outer_click.js
@@ -42,7 +42,7 @@ define([
/**
* Document click handler which in case if event target is not
* a descendant of provided container element,
- * invokes specfied in configuration callback.
+ * invokes specified in configuration callback.
*
* @param {HTMLElement} container
* @param {Object} config
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/observable_source.js b/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/observable_source.js
index 98ffd83b56466..916666d70d1bd 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/observable_source.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/observable_source.js
@@ -29,7 +29,7 @@ define([
* Else, writes into it.
* @param {String} key - key to write to or to read from
* @param {*} value
- * @return {*} - if 1 arg provided, returnes _data[key] property
+ * @return {*} - if 1 arg provided, Returns _data[key] property
*/
data: function (key, value) {
if (arguments.length === 1) {
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js b/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js
index 31362644d415a..be8fd2ce9fcef 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js
@@ -60,7 +60,7 @@ define([
}
/**
- * Validates provied value by a specfied set of rules.
+ * Validates provied value by a specified set of rules.
*
* @param {(String|Object)} rules - One or many validation rules.
* @param {*} value - Value to be checked.
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/view/utils/bindings.js b/app/code/Magento/Ui/view/base/web/js/lib/view/utils/bindings.js
index f6afdf7846388..77de8a1ceb0ed 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/view/utils/bindings.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/view/utils/bindings.js
@@ -88,7 +88,7 @@ define([
};
/**
- * Adds specfied bindings to each DOM elemenet in
+ * Adds specified bindings to each DOM element in
* collection and evalutes them with provided context.
*
* @param {(Object|Function)} data - Either bindings object or a function
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/insert.html b/app/code/Magento/Ui/view/base/web/templates/form/insert.html
index e19b2784e6bc6..e590b5e2adedf 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/insert.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/insert.html
@@ -6,9 +6,6 @@
-->
diff --git a/app/code/Magento/Widget/Model/ResourceModel/Layout/Update.php b/app/code/Magento/Widget/Model/ResourceModel/Layout/Update.php
index d7e3bf94f548f..6c0aef9e67186 100644
--- a/app/code/Magento/Widget/Model/ResourceModel/Layout/Update.php
+++ b/app/code/Magento/Widget/Model/ResourceModel/Layout/Update.php
@@ -51,7 +51,9 @@ protected function _construct()
* @param string $handle
* @param \Magento\Framework\View\Design\ThemeInterface $theme
* @param \Magento\Framework\App\ScopeInterface $store
+ *
* @return string
+ * @throws \Magento\Framework\Exception\LocalizedException
*/
public function fetchUpdatesByHandle(
$handle,
@@ -69,14 +71,16 @@ public function fetchUpdatesByHandle(
$this->layoutUpdateCache[$cacheKey][$layout['handle']] .= $layout['xml'];
}
}
- return isset($this->layoutUpdateCache[$cacheKey][$handle]) ? $this->layoutUpdateCache[$cacheKey][$handle] : '';
+ return $this->layoutUpdateCache[$cacheKey][$handle] ?? '';
}
/**
* Get select to fetch updates by handle
*
* @param bool $loadAllUpdates
+ *
* @return \Magento\Framework\DB\Select
+ * @throws \Magento\Framework\Exception\LocalizedException
*/
protected function _getFetchUpdatesByHandleSelect($loadAllUpdates = false)
{
diff --git a/app/code/Magento/Widget/Test/Mftf/Test/ProductsListWidgetTest.xml b/app/code/Magento/Widget/Test/Mftf/Test/ProductsListWidgetTest.xml
new file mode 100644
index 0000000000000..4407991ff5a93
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/Test/ProductsListWidgetTest.xml
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/design/adminhtml/Magento/backend/Magento_Customer/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Customer/web/css/source/_module.less
index a80cc9a5163f8..c8f2530df22e0 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Customer/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Customer/web/css/source/_module.less
@@ -3,14 +3,77 @@
// * See COPYING.txt for license details.
// */
-// General rule hides group legend and shows first field label instead
-// in app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
-// This must be reset for Customer Address page
-.address-item-edit-content {
+.customer_form_areas_address_address_customer_address_update_modal_update_customer_address_form_loader {
.admin__field {
- legend {
- &.admin__field-label {
- opacity: 1;
+ .admin__field {
+ .admin__field-label {
+ background: none;
+ }
+ }
+ }
+}
+
+.customer-address-form {
+
+ *,
+ *:after,
+ *:before {
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+ }
+
+ address {
+ font-style: normal;
+ }
+
+ .customer-default-address-wrapper {
+ align-items: flex-start;
+ display: flex;
+ float: left;
+ position: relative;
+ width: 50%;
+
+ .action-additional {
+ margin: 2px 0 0 2px;
+ }
+ }
+
+ .edit-default-billing-address-button,
+ .edit-default-shipping-address-button {
+ position: absolute;
+ }
+
+ .edit-default-billing-address-button {
+ left: 210px;
+ }
+
+ .edit-default-shipping-address-button {
+ left: 230px;
+ }
+
+ .customer_form_areas_address_address_customer_address_listing {
+ clear: both;
+ }
+
+ .add-new-address-button {
+ clear: both;
+ float: right;
+ margin-bottom: 30px;
+ position: relative;
+ }
+
+ .address-information {
+ float: left;
+ margin-bottom: 20px;
+
+ address {
+ float: left;
+
+ .address_caption {
+ font-size: 18px;
+ font-weight: bold;
+ margin-bottom: 16px;
}
}
}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
index 984556816b035..1e76679f594c1 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
@@ -55,7 +55,6 @@
}
.order-billing-address,
- .order-billing-method,
.order-history,
.order-information,
.order-payment-method,
@@ -65,7 +64,6 @@
}
.order-shipping-address,
- .order-shipping-method,
.order-totals,
.order-view-account-information .order-account-information {
float: right;
@@ -300,38 +298,4 @@
}
}
-// ToDo UI: review the collapsible block
-//.order-subtotal {
-// .summary-collapse {
-// cursor: pointer;
-// display: inline-block;
-// &:before {
-// @iconsize: 16px;
-//
-// -webkit-font-smoothing: antialiased;
-// background: #f2ebde;
-// border-radius: 2px;
-// border: 1px solid #ada89e;
-// color: #816063;
-// content: '+';
-// display: inline-block;
-// font-size: @iconsize;
-// font-style: normal;
-// font-weight: normal;
-// height: @iconsize;
-// line-height: @iconsize;
-// margin-right: 7px;
-// overflow: hidden;
-// speak: none;
-// text-indent: 0;
-// vertical-align: top;
-// width: @iconsize;
-// }
-// &:hover:before {
-// background: #cac3b4;
-// }
-// }
-// &.show-details .summary-collapse:before {
-// content: '\e03a';
-// }
-//}
+// ToDo: MAGETWO-32299 UI: review the collapsible block
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_payment-shipping.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_payment-shipping.less
index 1e40fe1fa3403..029594625ed1c 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_payment-shipping.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_payment-shipping.less
@@ -9,6 +9,7 @@
.admin__payment-method-wrapper {
margin: 0;
+ width: calc(50% - @indent__l);
.admin__field {
margin-left: 0;
&:first-child {
@@ -34,6 +35,7 @@
margin: 0;
}
+.order-billing-method-summary,
.order-shipping-method-summary {
padding-top: @field-option__padding-top;
}
@@ -43,6 +45,7 @@
position: relative;
}
+.order-billing-method-summary,
.order-shipping-method-summary,
.order-shipping-method-info {
.action-default {
diff --git a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/tooltips/_tooltips.less b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/tooltips/_tooltips.less
index c535047e37682..0049022204619 100644
--- a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/tooltips/_tooltips.less
+++ b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/tooltips/_tooltips.less
@@ -93,7 +93,7 @@
}
}
-// ToDo UI: Only right tooltip arrow is styled, if we will neeed more need to add another ones
+// ToDo UI: Only right tooltip arrow is styled, if we will need more need to add another ones
.tooltip {
&.top {
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
index fe9cbe9b9771d..02925881253ea 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
@@ -685,9 +685,11 @@
margin: 0;
opacity: 1;
position: static;
- text-align: left;
}
}
+ & > .admin__field-label {
+ text-align: left;
+ }
&:nth-child(n + 2) {
&:not(.admin__field-option):not(.admin__field-group-show-label):not(.admin__field-date) {
diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
index cb718a646ae5c..26381367c72f5 100644
--- a/app/design/adminhtml/Magento/backend/web/css/styles-old.less
+++ b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
@@ -1188,7 +1188,7 @@
}
//
- // Collapsable fieldset-wrapper
+ // collapsible fieldset-wrapper
// --------------------------------------
// Fieldset styles in another fieldset
@@ -2544,6 +2544,8 @@
.order-summary:after,
.order-methods:before,
.order-methods:after,
+ .payment-methods:before,
+ .payment-methods:after,
.grid-actions:before,
.grid-actions:after,
.fieldset-wrapper-title:before,
@@ -2559,6 +2561,7 @@
.order-addresses:after,
.order-summary:after,
.order-methods:after,
+ .payment-methods:after,
.grid-actions:after,
.fieldset-wrapper-title:after {
clear: both;
@@ -2898,6 +2901,7 @@
.style28();
}
+ #order-billing-method-summary a,
#order-shipping-method-summary a {
.style3();
}
@@ -2936,7 +2940,8 @@
margin: 0 0 0 20px;
}
- #order-data .order-methods ul {
+ #order-data .order-methods ul,
+ #order-data .payment-methods ul {
list-style: none;
margin: 0;
padding: 0;
diff --git a/app/design/adminhtml/Magento/backend/web/js/theme.js b/app/design/adminhtml/Magento/backend/web/js/theme.js
index a2511e27e9f67..8e3b89dcf7e4e 100644
--- a/app/design/adminhtml/Magento/backend/web/js/theme.js
+++ b/app/design/adminhtml/Magento/backend/web/js/theme.js
@@ -599,7 +599,7 @@ define('js/theme', [
], function ($, keyboardHandler) {
'use strict';
- /* @TODO refactor collapsable as widget and avoid logic binding with such a general selectors */
+ /* @TODO refactor collapsible as widget and avoid logic binding with such a general selectors */
$('.collapse').collapsable();
$.each($('.entry-edit'), function (i, entry) {
diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less
index 2468d2a3104e4..8e7f36389c417 100644
--- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less
+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less
@@ -65,6 +65,11 @@
.products.wrapper ~ .toolbar & {
display: none;
}
+
+ .sorter-action {
+ position: relative;
+ top: -2px;
+ }
}
.sorter-options {
diff --git a/app/design/frontend/Magento/blank/web/css/source/_extends.less b/app/design/frontend/Magento/blank/web/css/source/_extends.less
index 5f24c0db8cc88..74dfd48d87a87 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_extends.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_extends.less
@@ -253,7 +253,7 @@
}
//
-// Marging for blocks & widgets
+// Margin for blocks & widgets
// ---------------------------------------------
& when (@media-common = true) {
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_toolbar.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_toolbar.less
index 0997b9739125d..6bddc46003cbf 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_toolbar.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_toolbar.less
@@ -38,7 +38,10 @@
.lib-css(box-shadow, @button__shadow);
border-radius: 3px;
}
-
+ .sorter-action {
+ position: relative;
+ top: -2px;
+ }
&-amount {
left: 0;
line-height: @toolbar-mode-icon-font-size + 2;
diff --git a/app/design/frontend/Magento/luma/web/css/source/_extends.less b/app/design/frontend/Magento/luma/web/css/source/_extends.less
index ad677b45e52db..3eb189468a9f7 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_extends.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_extends.less
@@ -277,7 +277,7 @@
}
//
-// Marging for blocks & widgets
+// Margin for blocks & widgets
// ---------------------------------------------
& when (@media-common = true) {
diff --git a/composer.json b/composer.json
index 07aaa31f28fa4..0519980e00152 100644
--- a/composer.json
+++ b/composer.json
@@ -167,6 +167,7 @@
"magento/module-cms-graph-ql": "*",
"magento/module-grouped-import-export": "*",
"magento/module-grouped-product": "*",
+ "magento/module-grouped-catalog-inventory": "*",
"magento/module-grouped-product-graph-ql": "*",
"magento/module-import-export": "*",
"magento/module-indexer": "*",
diff --git a/composer.lock b/composer.lock
index f26b71f1cc392..a844a8c737e64 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "93418bd14ad2d9f54f4059550ded7061",
+ "content-hash": "d39adccaf053de23715ebdd9df4725b6",
"packages": [
{
"name": "braintree/braintree_php",
@@ -257,16 +257,16 @@
},
{
"name": "composer/composer",
- "version": "1.7.2",
+ "version": "1.7.3",
"source": {
"type": "git",
"url": "https://github.com/composer/composer.git",
- "reference": "576aab9b5abb2ed11a1c52353a759363216a4ad2"
+ "reference": "e965b9aaa8854c3067f1ed2ae45f436572d73eb7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/composer/zipball/576aab9b5abb2ed11a1c52353a759363216a4ad2",
- "reference": "576aab9b5abb2ed11a1c52353a759363216a4ad2",
+ "url": "https://api.github.com/repos/composer/composer/zipball/e965b9aaa8854c3067f1ed2ae45f436572d73eb7",
+ "reference": "e965b9aaa8854c3067f1ed2ae45f436572d73eb7",
"shasum": ""
},
"require": {
@@ -333,7 +333,7 @@
"dependency",
"package"
],
- "time": "2018-08-16T14:57:12+00:00"
+ "time": "2018-11-01T09:05:06+00:00"
},
{
"name": "composer/semver",
@@ -399,16 +399,16 @@
},
{
"name": "composer/spdx-licenses",
- "version": "1.4.0",
+ "version": "1.5.0",
"source": {
"type": "git",
"url": "https://github.com/composer/spdx-licenses.git",
- "reference": "cb17687e9f936acd7e7245ad3890f953770dec1b"
+ "reference": "7a9556b22bd9d4df7cad89876b00af58ef20d3a2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/cb17687e9f936acd7e7245ad3890f953770dec1b",
- "reference": "cb17687e9f936acd7e7245ad3890f953770dec1b",
+ "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/7a9556b22bd9d4df7cad89876b00af58ef20d3a2",
+ "reference": "7a9556b22bd9d4df7cad89876b00af58ef20d3a2",
"shasum": ""
},
"require": {
@@ -456,7 +456,7 @@
"spdx",
"validator"
],
- "time": "2018-04-30T10:33:04+00:00"
+ "time": "2018-11-01T09:45:54+00:00"
},
{
"name": "composer/xdebug-handler",
@@ -919,16 +919,16 @@
},
{
"name": "monolog/monolog",
- "version": "1.23.0",
+ "version": "1.24.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4"
+ "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
- "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
+ "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
"shasum": ""
},
"require": {
@@ -993,7 +993,7 @@
"logging",
"psr-3"
],
- "time": "2017-06-19T01:22:40+00:00"
+ "time": "2018-11-05T09:00:11+00:00"
},
{
"name": "oyejorge/less.php",
@@ -1375,16 +1375,16 @@
},
{
"name": "phpseclib/phpseclib",
- "version": "2.0.11",
+ "version": "2.0.12",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
- "reference": "7053f06f91b3de78e143d430e55a8f7889efc08b"
+ "reference": "8814dc7841db159daed0b32c2b08fb7e03c6afe7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/7053f06f91b3de78e143d430e55a8f7889efc08b",
- "reference": "7053f06f91b3de78e143d430e55a8f7889efc08b",
+ "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/8814dc7841db159daed0b32c2b08fb7e03c6afe7",
+ "reference": "8814dc7841db159daed0b32c2b08fb7e03c6afe7",
"shasum": ""
},
"require": {
@@ -1463,7 +1463,7 @@
"x.509",
"x509"
],
- "time": "2018-04-15T16:55:05+00:00"
+ "time": "2018-11-04T05:45:48+00:00"
},
{
"name": "psr/container",
@@ -1566,16 +1566,16 @@
},
{
"name": "psr/log",
- "version": "1.0.2",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+ "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
- "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+ "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
"shasum": ""
},
"require": {
@@ -1609,7 +1609,7 @@
"psr",
"psr-3"
],
- "time": "2016-10-10T12:19:37+00:00"
+ "time": "2018-11-20T15:27:04+00:00"
},
{
"name": "ramsey/uuid",
@@ -1834,16 +1834,16 @@
},
{
"name": "symfony/console",
- "version": "v4.1.6",
+ "version": "v4.1.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "dc7122fe5f6113cfaba3b3de575d31112c9aa60b"
+ "reference": "c74f4d1988dfcd8760273e53551694da32b056d0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/dc7122fe5f6113cfaba3b3de575d31112c9aa60b",
- "reference": "dc7122fe5f6113cfaba3b3de575d31112c9aa60b",
+ "url": "https://api.github.com/repos/symfony/console/zipball/c74f4d1988dfcd8760273e53551694da32b056d0",
+ "reference": "c74f4d1988dfcd8760273e53551694da32b056d0",
"shasum": ""
},
"require": {
@@ -1898,20 +1898,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2018-10-03T08:15:46+00:00"
+ "time": "2018-11-26T14:00:40+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v4.1.6",
+ "version": "v4.1.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "bfb30c2ad377615a463ebbc875eba64a99f6aa3e"
+ "reference": "8b93ce06506d58485893e2da366767dcc5390862"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/bfb30c2ad377615a463ebbc875eba64a99f6aa3e",
- "reference": "bfb30c2ad377615a463ebbc875eba64a99f6aa3e",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8b93ce06506d58485893e2da366767dcc5390862",
+ "reference": "8b93ce06506d58485893e2da366767dcc5390862",
"shasum": ""
},
"require": {
@@ -1961,20 +1961,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2018-07-26T09:10:45+00:00"
+ "time": "2018-11-26T10:26:29+00:00"
},
{
"name": "symfony/filesystem",
- "version": "v4.1.6",
+ "version": "v4.1.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "596d12b40624055c300c8b619755b748ca5cf0b5"
+ "reference": "71cc7693940bdad4dac4b038acd46b4f1ae7d2ca"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/596d12b40624055c300c8b619755b748ca5cf0b5",
- "reference": "596d12b40624055c300c8b619755b748ca5cf0b5",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/71cc7693940bdad4dac4b038acd46b4f1ae7d2ca",
+ "reference": "71cc7693940bdad4dac4b038acd46b4f1ae7d2ca",
"shasum": ""
},
"require": {
@@ -2011,20 +2011,20 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
- "time": "2018-10-02T12:40:59+00:00"
+ "time": "2018-11-11T19:51:29+00:00"
},
{
"name": "symfony/finder",
- "version": "v4.1.6",
+ "version": "v4.1.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "1f17195b44543017a9c9b2d437c670627e96ad06"
+ "reference": "68fbdcafe915db67adb13fddaec4532e684f6689"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/1f17195b44543017a9c9b2d437c670627e96ad06",
- "reference": "1f17195b44543017a9c9b2d437c670627e96ad06",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/68fbdcafe915db67adb13fddaec4532e684f6689",
+ "reference": "68fbdcafe915db67adb13fddaec4532e684f6689",
"shasum": ""
},
"require": {
@@ -2060,11 +2060,11 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2018-10-03T08:47:56+00:00"
+ "time": "2018-11-11T19:51:29+00:00"
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.9.0",
+ "version": "v1.10.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
@@ -2122,16 +2122,16 @@
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.9.0",
+ "version": "v1.10.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8"
+ "reference": "c79c051f5b3a46be09205c73b80b346e4153e494"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8",
- "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494",
+ "reference": "c79c051f5b3a46be09205c73b80b346e4153e494",
"shasum": ""
},
"require": {
@@ -2177,20 +2177,20 @@
"portable",
"shim"
],
- "time": "2018-08-06T14:22:27+00:00"
+ "time": "2018-09-21T13:07:52+00:00"
},
{
"name": "symfony/process",
- "version": "v4.1.6",
+ "version": "v4.1.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "ee33c0322a8fee0855afcc11fff81e6b1011b529"
+ "reference": "471f6e24172366a97365baaae588ddaafbba9b20"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/ee33c0322a8fee0855afcc11fff81e6b1011b529",
- "reference": "ee33c0322a8fee0855afcc11fff81e6b1011b529",
+ "url": "https://api.github.com/repos/symfony/process/zipball/471f6e24172366a97365baaae588ddaafbba9b20",
+ "reference": "471f6e24172366a97365baaae588ddaafbba9b20",
"shasum": ""
},
"require": {
@@ -2226,7 +2226,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2018-10-02T12:40:59+00:00"
+ "time": "2018-11-20T16:14:00+00:00"
},
{
"name": "tedivm/jshrink",
@@ -4804,20 +4804,20 @@
},
{
"name": "consolidation/annotated-command",
- "version": "2.9.1",
+ "version": "2.10.0",
"source": {
"type": "git",
"url": "https://github.com/consolidation/annotated-command.git",
- "reference": "4bdbb8fa149e1cc1511bd77b0bc4729fd66bccac"
+ "reference": "8e7d1a05230dc1159c751809e98b74f2b7f71873"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/4bdbb8fa149e1cc1511bd77b0bc4729fd66bccac",
- "reference": "4bdbb8fa149e1cc1511bd77b0bc4729fd66bccac",
+ "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/8e7d1a05230dc1159c751809e98b74f2b7f71873",
+ "reference": "8e7d1a05230dc1159c751809e98b74f2b7f71873",
"shasum": ""
},
"require": {
- "consolidation/output-formatters": "^3.1.12",
+ "consolidation/output-formatters": "^3.4",
"php": ">=5.4.0",
"psr/log": "^1",
"symfony/console": "^2.8|^3|^4",
@@ -4852,7 +4852,7 @@
}
],
"description": "Initialize Symfony Console commands from annotated command class methods.",
- "time": "2018-09-19T17:47:18+00:00"
+ "time": "2018-11-15T01:46:18+00:00"
},
{
"name": "consolidation/config",
@@ -5015,16 +5015,16 @@
},
{
"name": "consolidation/robo",
- "version": "1.3.1",
+ "version": "1.3.2",
"source": {
"type": "git",
"url": "https://github.com/consolidation/Robo.git",
- "reference": "31f2d2562c4e1dcde70f2659eefd59aa9c7f5b2d"
+ "reference": "a9bd9ecf00751aa92754903c0d17612c4e840ce8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/consolidation/Robo/zipball/31f2d2562c4e1dcde70f2659eefd59aa9c7f5b2d",
- "reference": "31f2d2562c4e1dcde70f2659eefd59aa9c7f5b2d",
+ "url": "https://api.github.com/repos/consolidation/Robo/zipball/a9bd9ecf00751aa92754903c0d17612c4e840ce8",
+ "reference": "a9bd9ecf00751aa92754903c0d17612c4e840ce8",
"shasum": ""
},
"require": {
@@ -5033,7 +5033,6 @@
"consolidation/log": "~1",
"consolidation/output-formatters": "^3.1.13",
"consolidation/self-update": "^1",
- "g1a/composer-test-scenarios": "^2",
"grasmash/yaml-expander": "^1.3",
"league/container": "^2.2",
"php": ">=5.5.0",
@@ -5050,14 +5049,15 @@
"codeception/aspect-mock": "^1|^2.1.1",
"codeception/base": "^2.3.7",
"codeception/verify": "^0.3.2",
+ "g1a/composer-test-scenarios": "^3",
"goaop/framework": "~2.1.2",
"goaop/parser-reflection": "^1.1.0",
"natxet/cssmin": "3.0.4",
"nikic/php-parser": "^3.1.5",
"patchwork/jsqueeze": "~2",
"pear/archive_tar": "^1.4.2",
+ "php-coveralls/php-coveralls": "^1",
"phpunit/php-code-coverage": "~2|~4",
- "satooshi/php-coveralls": "^2",
"squizlabs/php_codesniffer": "^2.8"
},
"suggest": {
@@ -5071,9 +5071,36 @@
],
"type": "library",
"extra": {
+ "scenarios": {
+ "symfony4": {
+ "require": {
+ "symfony/console": "^4"
+ },
+ "config": {
+ "platform": {
+ "php": "7.1.3"
+ }
+ }
+ },
+ "symfony2": {
+ "require": {
+ "symfony/console": "^2.8"
+ },
+ "remove": [
+ "goaop/framework"
+ ],
+ "config": {
+ "platform": {
+ "php": "5.5.9"
+ }
+ },
+ "scenario-options": {
+ "create-lockfile": "false"
+ }
+ }
+ },
"branch-alias": {
- "dev-master": "1.x-dev",
- "dev-state": "1.x-dev"
+ "dev-master": "1.x-dev"
}
},
"autoload": {
@@ -5092,7 +5119,7 @@
}
],
"description": "Modern task runner",
- "time": "2018-08-17T18:44:18+00:00"
+ "time": "2018-11-22T05:43:44+00:00"
},
{
"name": "consolidation/self-update",
@@ -5734,39 +5761,6 @@
],
"time": "2018-07-12T10:23:15+00:00"
},
- {
- "name": "g1a/composer-test-scenarios",
- "version": "2.2.0",
- "source": {
- "type": "git",
- "url": "https://github.com/g1a/composer-test-scenarios.git",
- "reference": "a166fd15191aceab89f30c097e694b7cf3db4880"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/g1a/composer-test-scenarios/zipball/a166fd15191aceab89f30c097e694b7cf3db4880",
- "reference": "a166fd15191aceab89f30c097e694b7cf3db4880",
- "shasum": ""
- },
- "bin": [
- "scripts/create-scenario",
- "scripts/dependency-licenses",
- "scripts/install-scenario"
- ],
- "type": "library",
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Greg Anderson",
- "email": "greg.1.anderson@greenknowe.org"
- }
- ],
- "description": "Useful scripts for testing multiple sets of Composer dependencies.",
- "time": "2018-08-08T23:37:23+00:00"
- },
{
"name": "grasmash/expander",
"version": "1.0.0",
@@ -8228,16 +8222,16 @@
},
{
"name": "symfony/browser-kit",
- "version": "v4.1.6",
+ "version": "v4.1.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/browser-kit.git",
- "reference": "c55fe9257003b2d95c0211b3f6941e8dfd26dffd"
+ "reference": "1c4e2f368a09cd33bf4b6e4a4a32b361a16ef1db"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/browser-kit/zipball/c55fe9257003b2d95c0211b3f6941e8dfd26dffd",
- "reference": "c55fe9257003b2d95c0211b3f6941e8dfd26dffd",
+ "url": "https://api.github.com/repos/symfony/browser-kit/zipball/1c4e2f368a09cd33bf4b6e4a4a32b361a16ef1db",
+ "reference": "1c4e2f368a09cd33bf4b6e4a4a32b361a16ef1db",
"shasum": ""
},
"require": {
@@ -8281,20 +8275,20 @@
],
"description": "Symfony BrowserKit Component",
"homepage": "https://symfony.com",
- "time": "2018-07-26T09:10:45+00:00"
+ "time": "2018-11-26T10:26:29+00:00"
},
{
"name": "symfony/config",
- "version": "v4.1.6",
+ "version": "v4.1.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
- "reference": "b3d4d7b567d7a49e6dfafb6d4760abc921177c96"
+ "reference": "7e415fa42def2c89be6cfbd8286c616e86664b81"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/config/zipball/b3d4d7b567d7a49e6dfafb6d4760abc921177c96",
- "reference": "b3d4d7b567d7a49e6dfafb6d4760abc921177c96",
+ "url": "https://api.github.com/repos/symfony/config/zipball/7e415fa42def2c89be6cfbd8286c616e86664b81",
+ "reference": "7e415fa42def2c89be6cfbd8286c616e86664b81",
"shasum": ""
},
"require": {
@@ -8344,20 +8338,20 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
- "time": "2018-09-08T13:24:10+00:00"
+ "time": "2018-11-26T10:26:29+00:00"
},
{
"name": "symfony/css-selector",
- "version": "v4.1.6",
+ "version": "v4.1.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "d67de79a70a27d93c92c47f37ece958bf8de4d8a"
+ "reference": "9e4dc57949853315561f0cd5eb84d0707465502a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/d67de79a70a27d93c92c47f37ece958bf8de4d8a",
- "reference": "d67de79a70a27d93c92c47f37ece958bf8de4d8a",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/9e4dc57949853315561f0cd5eb84d0707465502a",
+ "reference": "9e4dc57949853315561f0cd5eb84d0707465502a",
"shasum": ""
},
"require": {
@@ -8397,20 +8391,20 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
- "time": "2018-10-02T16:36:10+00:00"
+ "time": "2018-11-11T19:51:29+00:00"
},
{
"name": "symfony/dependency-injection",
- "version": "v4.1.6",
+ "version": "v4.1.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "f6b9d893ad28aefd8942dc0469c8397e2216fe30"
+ "reference": "9508a26af7e2546babf67a1494683ffabcd5a0a3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/f6b9d893ad28aefd8942dc0469c8397e2216fe30",
- "reference": "f6b9d893ad28aefd8942dc0469c8397e2216fe30",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/9508a26af7e2546babf67a1494683ffabcd5a0a3",
+ "reference": "9508a26af7e2546babf67a1494683ffabcd5a0a3",
"shasum": ""
},
"require": {
@@ -8468,20 +8462,20 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
- "time": "2018-10-02T12:40:59+00:00"
+ "time": "2018-11-20T16:14:00+00:00"
},
{
"name": "symfony/dom-crawler",
- "version": "v4.1.6",
+ "version": "v4.1.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
- "reference": "80e60271bb288de2a2259662cff125cff4f93f95"
+ "reference": "a9f533524dcc3970a2c06ee1ec0bba35d3f5910e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/80e60271bb288de2a2259662cff125cff4f93f95",
- "reference": "80e60271bb288de2a2259662cff125cff4f93f95",
+ "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/a9f533524dcc3970a2c06ee1ec0bba35d3f5910e",
+ "reference": "a9f533524dcc3970a2c06ee1ec0bba35d3f5910e",
"shasum": ""
},
"require": {
@@ -8525,20 +8519,20 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
- "time": "2018-10-02T12:40:59+00:00"
+ "time": "2018-11-26T10:26:29+00:00"
},
{
"name": "symfony/http-foundation",
- "version": "v4.1.6",
+ "version": "v4.1.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "d528136617ff24f530e70df9605acc1b788b08d4"
+ "reference": "26062b9527b6797fc6239ed698c9c0a3c5e891e0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/d528136617ff24f530e70df9605acc1b788b08d4",
- "reference": "d528136617ff24f530e70df9605acc1b788b08d4",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/26062b9527b6797fc6239ed698c9c0a3c5e891e0",
+ "reference": "26062b9527b6797fc6239ed698c9c0a3c5e891e0",
"shasum": ""
},
"require": {
@@ -8579,20 +8573,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
- "time": "2018-10-03T08:48:45+00:00"
+ "time": "2018-11-26T10:26:29+00:00"
},
{
"name": "symfony/options-resolver",
- "version": "v4.1.6",
+ "version": "v4.1.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
- "reference": "40f0e40d37c1c8a762334618dea597d64bbb75ff"
+ "reference": "31e5523373cb06163079ef46d0a2d507d70fe064"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/options-resolver/zipball/40f0e40d37c1c8a762334618dea597d64bbb75ff",
- "reference": "40f0e40d37c1c8a762334618dea597d64bbb75ff",
+ "url": "https://api.github.com/repos/symfony/options-resolver/zipball/31e5523373cb06163079ef46d0a2d507d70fe064",
+ "reference": "31e5523373cb06163079ef46d0a2d507d70fe064",
"shasum": ""
},
"require": {
@@ -8633,20 +8627,20 @@
"configuration",
"options"
],
- "time": "2018-09-18T12:45:12+00:00"
+ "time": "2018-11-11T19:51:29+00:00"
},
{
"name": "symfony/polyfill-php70",
- "version": "v1.9.0",
+ "version": "v1.10.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php70.git",
- "reference": "1e24b0c4a56d55aaf368763a06c6d1c7d3194934"
+ "reference": "6b88000cdd431cd2e940caa2cb569201f3f84224"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/1e24b0c4a56d55aaf368763a06c6d1c7d3194934",
- "reference": "1e24b0c4a56d55aaf368763a06c6d1c7d3194934",
+ "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/6b88000cdd431cd2e940caa2cb569201f3f84224",
+ "reference": "6b88000cdd431cd2e940caa2cb569201f3f84224",
"shasum": ""
},
"require": {
@@ -8692,20 +8686,20 @@
"portable",
"shim"
],
- "time": "2018-08-06T14:22:27+00:00"
+ "time": "2018-09-21T06:26:08+00:00"
},
{
"name": "symfony/polyfill-php72",
- "version": "v1.9.0",
+ "version": "v1.10.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "95c50420b0baed23852452a7f0c7b527303ed5ae"
+ "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/95c50420b0baed23852452a7f0c7b527303ed5ae",
- "reference": "95c50420b0baed23852452a7f0c7b527303ed5ae",
+ "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
+ "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
"shasum": ""
},
"require": {
@@ -8747,20 +8741,20 @@
"portable",
"shim"
],
- "time": "2018-08-06T14:22:27+00:00"
+ "time": "2018-09-21T13:07:52+00:00"
},
{
"name": "symfony/stopwatch",
- "version": "v4.1.6",
+ "version": "v4.1.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
- "reference": "5bfc064125b73ff81229e19381ce1c34d3416f4b"
+ "reference": "87a801786adb053576dc025892e01fedde9b4fc7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/stopwatch/zipball/5bfc064125b73ff81229e19381ce1c34d3416f4b",
- "reference": "5bfc064125b73ff81229e19381ce1c34d3416f4b",
+ "url": "https://api.github.com/repos/symfony/stopwatch/zipball/87a801786adb053576dc025892e01fedde9b4fc7",
+ "reference": "87a801786adb053576dc025892e01fedde9b4fc7",
"shasum": ""
},
"require": {
@@ -8796,20 +8790,20 @@
],
"description": "Symfony Stopwatch Component",
"homepage": "https://symfony.com",
- "time": "2018-10-02T12:40:59+00:00"
+ "time": "2018-11-11T19:51:29+00:00"
},
{
"name": "symfony/yaml",
- "version": "v3.4.17",
+ "version": "v3.4.19",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "640b6c27fed4066d64b64d5903a86043f4a4de7f"
+ "reference": "291e13d808bec481eab83f301f7bff3e699ef603"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/640b6c27fed4066d64b64d5903a86043f4a4de7f",
- "reference": "640b6c27fed4066d64b64d5903a86043f4a4de7f",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/291e13d808bec481eab83f301f7bff3e699ef603",
+ "reference": "291e13d808bec481eab83f301f7bff3e699ef603",
"shasum": ""
},
"require": {
@@ -8855,7 +8849,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2018-10-02T16:33:53+00:00"
+ "time": "2018-11-11T19:48:54+00:00"
},
{
"name": "theseer/fdomdocument",
diff --git a/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/CartItemRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/CartItemRepositoryTest.php
new file mode 100644
index 0000000000000..602493481449f
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/CartItemRepositoryTest.php
@@ -0,0 +1,68 @@
+objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+ * @magentoApiDataFixture Magento/GroupedProduct/_files/product_grouped_with_simple_out_of_stock.php
+ */
+ public function testAddGroupedProductToCartThatHasAnOutOfStockItemInTheGroup()
+ {
+ $this->_markTestAsRestOnly();
+
+ /** @var \Magento\Catalog\Model\Product $product */
+ $product = $this->objectManager->create(\Magento\Catalog\Model\Product::class)->load('100000003');
+ $productSku = $product->getSku();
+ /** @var Quote $quote */
+ $quote = $this->objectManager->create(Quote::class);
+ $quote->load('test_order_1', 'reserved_order_id');
+ $cartId = $quote->getId();
+ $serviceInfo = [
+ 'rest' => [
+ 'resourcePath' => self::RESOURCE_PATH . $cartId . '/items',
+ 'httpMethod' => Request::HTTP_METHOD_POST,
+ ],
+ 'soap' => [
+ 'service' => self::SERVICE_NAME,
+ 'serviceVersion' => self::SERVICE_VERSION,
+ 'operation' => self::SERVICE_NAME . 'Save',
+ ],
+ ];
+
+ $requestData = [
+ 'cartItem' => [
+ 'sku' => $productSku,
+ 'qty' => 1,
+ 'quote_id' => $cartId,
+ ],
+ ];
+ $this->_webApiCall($serviceInfo, $requestData);
+ $this->assertTrue($quote->hasProductId('100000001'));
+ $this->assertFalse($quote->hasProductId('100000002'));
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php
index 0770de7f7d7a6..f79cf8d7eb7fa 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php
@@ -117,7 +117,6 @@ private function processLogin()
if ($this->checkoutMethod === 'login') {
if ($this->checkoutOnepage->getAuthenticationPopupBlock()->isVisible()) {
$this->checkoutOnepage->getAuthenticationPopupBlock()->loginCustomer($this->customer);
- sleep(5);
$this->clickProceedToCheckoutStep->run();
} else {
$this->checkoutOnepage->getLoginBlock()->loginCustomer($this->customer);
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php
index 83d86669aa8e5..f456635882ed9 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php
@@ -65,6 +65,7 @@ class CustomerForm extends FormTabs
* @param FixtureInterface $customer
* @param FixtureInterface|FixtureInterface[]|null $address
* @return $this
+ * @throws \Exception
*/
public function fillCustomer(FixtureInterface $customer, $address = null)
{
@@ -76,12 +77,29 @@ public function fillCustomer(FixtureInterface $customer, $address = null)
}
if (null !== $address) {
$this->openTab('addresses');
- $this->getTab('addresses')->fillAddresses($address);
+ $this->fillCustomerAddress($address);
}
return $this;
}
+ /**
+ * Fill customer address by provided in parameter data
+ *
+ * @param FixtureInterface|FixtureInterface[] $address
+ * @return $this
+ * @throws \Exception
+ */
+ public function fillCustomerAddress($address)
+ {
+ $addressesTab = $this->getTab('addresses');
+ $this->openTab('addresses');
+ $addressesTab->waitForAddressesGrid();
+ $addressesTab->fillAddresses($address);
+
+ return $this;
+ }
+
/**
* Update Customer forms on tabs by customer, addresses data.
*
@@ -98,13 +116,16 @@ public function updateCustomer(FixtureInterface $customer, $address = null, Addr
if ($isHasData) {
parent::fill($customer);
}
+ $addressesTab = $this->getTab('addresses');
if ($addressToDelete !== null) {
$this->openTab('addresses');
- $this->getTab('addresses')->deleteCustomerAddress($addressToDelete);
+ $addressesTab->waitForAddressesGrid();
+ $addressesTab->deleteCustomerAddress($addressToDelete);
}
if ($address !== null) {
$this->openTab('addresses');
- $this->getTab('addresses')->updateAddresses($address);
+ $addressesTab->waitForAddressesGrid();
+ $addressesTab->updateAddresses($address);
}
return $this;
@@ -124,6 +145,9 @@ public function getDataCustomer(FixtureInterface $customer, $address = null)
$data = ['customer' => $customer->hasData() ? parent::getData($customer) : parent::getData()];
if (null !== $address) {
$this->openTab('addresses');
+ $this->waitForElementNotVisible($this->tabReadiness);
+ $this->waitForm();
+ $this->getTab('addresses')->waitForAddressesGrid();
$data['addresses'] = $this->getTab('addresses')->getDataAddresses($address);
}
@@ -148,8 +172,10 @@ protected function waitForm()
*/
public function openTab($tabName)
{
+ $this->waitForElementNotVisible($this->tabReadiness);
parent::openTab($tabName);
$this->waitForElementNotVisible($this->tabReadiness);
+ $this->waitForm();
return $this;
}
@@ -161,13 +187,10 @@ public function openTab($tabName)
*/
public function getJsErrors()
{
- $tabs = ['account_information', 'addresses'];
$jsErrors = [];
- foreach ($tabs as $tabName) {
- $tab = $this->getTab($tabName);
- $this->openTab($tabName);
- $jsErrors = array_merge($jsErrors, $tab->getJsErrors());
- }
+ $tab = $this->getTab('account_information');
+ $this->openTab('account_information');
+ $jsErrors = array_merge($jsErrors, $tab->getJsErrors());
return $jsErrors;
}
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php
index 86df3ea912104..99a79a8a4a85c 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php
@@ -29,7 +29,7 @@ class Addresses extends Tab
*
* @var string
*/
- protected $addNewAddress = '.address-list-actions .add';
+ protected $addNewAddress = '.add-new-address-button';
/**
* Selector for address block.
@@ -48,25 +48,32 @@ class Addresses extends Tab
protected $deleteAddress = '.action-delete';
/**
- * Accept button selector.
+ * Open customer address.
*
* @var string
*/
- private $confirmModal = '.confirm._show[data-role=modal]';
+ protected $customerAddress = '//*[contains(@class, "address-list-item")][%d]';
/**
- * Open customer address.
+ * Magento loader.
*
* @var string
*/
- protected $customerAddress = '//*[contains(@class, "address-list-item")][%d]';
+ protected $loader = '//ancestor::body/div[@data-role="loader"]';
/**
- * Magento loader.
+ * Customer address modal window.
*
* @var string
*/
- protected $loader = '//ancestor::body/div[@data-role="loader"]';
+ private $customerAddressModalForm = '.customer_form_areas_address_address_customer_address_update_modal';
+
+ /**
+ * Customer addresses list grid.
+ *
+ * @var string
+ */
+ private $customerAddressesGrid = '.customer_form_areas_address_address_customer_address_listing';
/**
* Object Manager.
@@ -107,9 +114,11 @@ public function __construct(
public function fillAddresses($address)
{
$addresses = is_array($address) ? $address : [$address];
+ $customerAddressForm = $this->getCustomerAddressModalForm();
foreach ($addresses as $address) {
$this->addNewAddress();
- $this->setFieldsData($address->getData(), $this->_rootElement);
+ $customerAddressForm->fillAddressData($address);
+ $customerAddressForm->saveAddress();
}
return $this;
@@ -136,8 +145,9 @@ public function updateAddresses($address)
if (!$this->isVisibleCustomerAddress($addressNumber)) {
$this->addNewAddress();
+ } else {
+ $this->openCustomerAddress($addressNumber);
}
- $this->openCustomerAddress($addressNumber);
$defaultAddress = ['default_billing' => 'No', 'default_shipping' => 'No'];
$addressData = $address->getData();
@@ -146,9 +156,10 @@ public function updateAddresses($address)
$defaultAddress[$key] = $value;
}
}
- $this->_fill($this->dataMapping($defaultAddress));
-
- $this->setFieldsData(array_diff($addressData, $defaultAddress), $this->_rootElement);
+ $customerAddressForm = $this->getCustomerAddressModalForm();
+ $customerAddressForm->setFieldsData($this->dataMapping($defaultAddress));
+ $customerAddressForm->setFieldsData(array_diff($addressData, $defaultAddress));
+ $customerAddressForm->saveAddress();
}
return $this;
@@ -168,6 +179,10 @@ public function getDataAddresses($address = null)
foreach ($addresses as $addressNumber => $address) {
$hasData = (null !== $address) && $address->hasData();
+ $customerAddressesGrid = $this->getCustomerAddressesGrid();
+ if ($hasData) {
+ $customerAddressesGrid->search($address->getData());
+ }
$isVisibleCustomerAddress = $this->isVisibleCustomerAddress($addressNumber);
if ($hasData && !$isVisibleCustomerAddress) {
@@ -177,14 +192,36 @@ public function getDataAddresses($address = null)
if (!$hasData && !$isVisibleCustomerAddress) {
$data[$addressNumber] = [];
} else {
- $this->openCustomerAddress($addressNumber);
- $data[$addressNumber] = $this->getData($address, $this->_rootElement);
+ $customerAddressesGrid->openFirstRow();
+ $data[$addressNumber] = $this->getCustomerAddressModalForm()
+ ->getData($address, $this->browser->find($this->customerAddressModalForm));
+ $this->getCustomerAddressModalForm()->clickCancelButton();
}
}
return $data;
}
+ /**
+ * Get data from Customer addresses.
+ *
+ * @param FixtureInterface|FixtureInterface[]|null $address
+ * @return array|null
+ * @throws \Exception
+ */
+ public function getAddressFromFirstRow($address = null)
+ {
+ $customerAddressesGrid = $this->getCustomerAddressesGrid();
+ $customerAddressesGrid->resetFilter();
+ $customerAddressesGrid->openFirstRow();
+ if ($this->getCustomerAddressModalForm()->isVisible()) {
+ $address = $this->getCustomerAddressModalForm()
+ ->getData($address, $this->browser->find($this->customerAddressModalForm));
+ }
+
+ return $address;
+ }
+
/**
* Get data to fields on tab.
*
@@ -206,6 +243,7 @@ public function getFieldsData($fields = null, SimpleElement $element = null)
protected function addNewAddress()
{
$this->_rootElement->find($this->addNewAddress)->click();
+ $this->waitForElementVisible($this->customerAddressModalForm);
}
/**
@@ -216,31 +254,24 @@ protected function addNewAddress()
*/
protected function openCustomerAddress($addressNumber)
{
- $addressTab = $this->_rootElement->find(
- sprintf($this->customerAddress, $addressNumber),
- Locator::SELECTOR_XPATH
- );
-
- if (!$addressTab->isVisible()) {
+ $customerAddressesGrid = $this->getCustomerAddressesGrid();
+ if (!$customerAddressesGrid->getFirstRow()->isVisible()) {
throw new \Exception("Can't open customer address #{$addressNumber}");
}
- $addressTab->click();
+ $customerAddressesGrid->openFirstRow();
}
/**
* Check is visible customer address.
*
- * @param int $addressNumber
* @return bool
*/
- protected function isVisibleCustomerAddress($addressNumber)
+ protected function isVisibleCustomerAddress()
{
- $addressTab = $this->_rootElement->find(
- sprintf($this->customerAddress, $addressNumber),
- Locator::SELECTOR_XPATH
- );
+ $customerAddressesGrid = $this->getCustomerAddressesGrid();
+ $customerAddressesGrid->isFirstRowVisible();
- return $addressTab->isVisible();
+ return $customerAddressesGrid->isFirstRowVisible();
}
/**
@@ -279,24 +310,43 @@ public function getCountriesList($addressNumber)
*/
public function deleteCustomerAddress(Address $addressToDelete)
{
- $addressRenderer = $this->objectManager->create(
- \Magento\Customer\Test\Block\Address\Renderer::class,
- ['address' => $addressToDelete, 'type' => 'html']
- );
- $addressToDelete = $addressRenderer->render();
+ $customerAddressesGrid = $this->getCustomerAddressesGrid();
+ $customerAddressesGrid->deleteCustomerAddress($addressToDelete->getData());
- $dataList = explode("\n", $addressToDelete);
- $dataList = implode("') and contains(.,'", $dataList);
+ return $this;
+ }
- $this->_rootElement
- ->find(sprintf($this->addressSelector, $dataList), Locator::SELECTOR_XPATH)
- ->find($this->deleteAddress)->click();
+ /**
+ * Get new/update customer address modal form.
+ *
+ * @return \Magento\Customer\Test\Block\Adminhtml\Edit\Tab\Addresses\AddressForm
+ */
+ public function getCustomerAddressModalForm()
+ {
+ return $this->blockFactory->create(
+ \Magento\Customer\Test\Block\Adminhtml\Edit\Tab\Addresses\AddressForm::class,
+ ['element' => $this->browser->find($this->customerAddressModalForm)]
+ );
+ }
- $element = $this->browser->find($this->confirmModal);
- /** @var \Magento\Ui\Test\Block\Adminhtml\Modal $modal */
- $modal = $this->blockFactory->create(\Magento\Ui\Test\Block\Adminhtml\Modal::class, ['element' => $element]);
- $modal->acceptAlert();
+ /**
+ * Get customer addresses grid.
+ *
+ * @return \Magento\Customer\Test\Block\Adminhtml\Edit\Tab\Addresses\AddressesGrid
+ */
+ public function getCustomerAddressesGrid()
+ {
+ return $this->blockFactory->create(
+ \Magento\Customer\Test\Block\Adminhtml\Edit\Tab\Addresses\AddressesGrid::class,
+ ['element' => $this->browser->find($this->customerAddressesGrid)]
+ );
+ }
- return $this;
+ /**
+ * Wait for addresses grid rendering
+ */
+ public function waitForAddressesGrid()
+ {
+ $this->waitForElementVisible($this->customerAddressesGrid);
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.xml
deleted file mode 100644
index 8e16226adcc3f..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-
-
- .address-item-edit:not([style="display: none;"]) [name$="[prefix]"]
- css selector
-
-
- .address-item-edit:not([style="display: none;"]) [name$="[firstname]"]
- css selector
-
-
- .address-item-edit:not([style="display: none;"]) [name$="[middlename]"]
- css selector
-
-
- .address-item-edit:not([style="display: none;"]) [name$="[lastname]"]
- css selector
-
-
- .address-item-edit:not([style="display: none;"]) [name$="[suffix]"]
- css selector
-
-
- .address-item-edit:not([style="display: none;"]) [name$="[company]"]
- css selector
-
-
- .address-item-edit:not([style="display: none;"]) [name$="[street][0]"]
- css selector
-
-
- .address-item-edit:not([style="display: none;"]) [name$="[city]"]
- css selector
-
-
- select
- .address-item-edit:not([style="display: none;"]) [name$="[country_id]"]
- css selector
-
-
- select
- .address-item-edit:not([style="display: none;"]) [name$="[region_id]"]
- css selector
-
-
- .address-item-edit:not([style="display: none;"]) [name$="[region]"]
- css selector
-
-
- .address-item-edit:not([style="display: none;"]) [name$="[postcode]"]
- css selector
-
-
- .address-item-edit:not([style="display: none;"]) [name$="[telephone]"]
- css selector
-
-
- .address-item-edit:not([style="display: none;"]) [name$="[fax]"]
- css selector
-
-
- .address-item-edit:not([style="display: none;"]) [name$="[vat_id]"]
- css selector
-
-
- .ui-state-active [name$="[default_billing]"]
- checkbox
-
-
- .ui-state-active [name$="[default_shipping]"]
- checkbox
-
-
-
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressForm.php
new file mode 100644
index 0000000000000..029836d21433c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressForm.php
@@ -0,0 +1,126 @@
+waitForElementNotVisible($this->loader);
+ $this->setFieldsData($address->getData(), $this->_rootElement);
+ }
+
+ /**
+ * Fill data into fields in the container.
+ *
+ * @param array $fields
+ * @param \Magento\Mtf\Client\Element\SimpleElement|null $contextElement
+ * @return void
+ * @throws \Exception
+ */
+ public function setFieldsData(array $fields, \Magento\Mtf\Client\Element\SimpleElement $contextElement = null): void
+ {
+ $data = $this->dataMapping($fields);
+ $this->_fill($data, $contextElement);
+ }
+
+ /**
+ * Save customer address
+ *
+ * @return void
+ */
+ public function saveAddress(): void
+ {
+ $this->_rootElement->find($this->saveAddressButton)->click();
+ $this->waitForElementNotVisible($this->loader);
+ }
+
+ /**
+ * Close create/update address modal
+ *
+ * @return void
+ */
+ public function clickCancelButton(): void
+ {
+ $this->_rootElement->find($this->cancelButton)->click();
+ }
+
+ /**
+ * Get array of label => js error text.
+ *
+ * @return array
+ */
+ public function getJsErrors(): array
+ {
+ $data = [];
+ $elements = $this->_rootElement->getElements($this->mageErrorField, Locator::SELECTOR_XPATH);
+ foreach ($elements as $element) {
+ $error = $element->find($this->mageErrorText, Locator::SELECTOR_XPATH);
+ if ($error->isVisible()) {
+ $label = $element->find($this->mageErrorLabel, Locator::SELECTOR_XPATH)->getText();
+ $data[$label] = $error->getText();
+ }
+ }
+ return $data;
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressForm.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressForm.xml
new file mode 100644
index 0000000000000..c56c6479dcb38
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressForm.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+ .admin__fieldset:not([style="display: none;"]) [name="prefix"]
+ css selector
+
+
+ .admin__fieldset:not([style="display: none;"]) [name="firstname"]
+ css selector
+
+
+ .admin__fieldset:not([style="display: none;"]) [name="middlename"]
+ css selector
+
+
+ .admin__fieldset:not([style="display: none;"]) [name="lastname"]
+ css selector
+
+
+ .admin__fieldset:not([style="display: none;"]) [name="suffix"]
+ css selector
+
+
+ .admin__fieldset:not([style="display: none;"]) [name="company"]
+ css selector
+
+
+ .admin__fieldset:not([style="display: none;"]) [name="street[0]"]
+ css selector
+
+
+ .admin__fieldset:not([style="display: none;"]) [name="city"]
+ css selector
+
+
+ select
+ .admin__fieldset:not([style="display: none;"]) [name="country_id"]
+ css selector
+
+
+ select
+ .admin__fieldset:not([style="display: none;"]) [name="region_id"]
+ css selector
+
+
+ .admin__fieldset:not([style="display: none;"]) [name="region"]
+ css selector
+
+
+ .admin__fieldset:not([style="display: none;"]) [name="postcode"]
+ css selector
+
+
+ .admin__fieldset:not([style="display: none;"]) [name="telephone"]
+ css selector
+
+
+ .admin__fieldset:not([style="display: none;"]) [name="fax"]
+ css selector
+
+
+ .admin__fieldset:not([style="display: none;"]) [name="vat_id"]
+ css selector
+
+
+ .admin__fieldset:not([style="display: none;"]) input[name='default_billing']
+ switcher
+
+
+ .admin__fieldset:not([style="display: none;"]) input[name='default_shipping']
+ switcher
+
+
+
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressesGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressesGrid.php
new file mode 100644
index 0000000000000..ef1fb09c8f839
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressesGrid.php
@@ -0,0 +1,174 @@
+ [
+ 'selector' => '.admin__data-grid-filters input[name*=firstname]',
+ ],
+ 'lastname' => [
+ 'selector' => '.admin__data-grid-filters input[name*=lastname]',
+ ],
+ 'street' => [
+ 'selector' => '.admin__data-grid-filters input[name*=street]',
+ ],
+ 'city' => [
+ 'selector' => '.admin__data-grid-filters input[name*=city]',
+ ],
+ 'region_id' => [
+ 'selector' => '.admin__data-grid-filters input[name*=region]',
+ ],
+ 'postcode' => [
+ 'selector' => '.admin__data-grid-filters input[name*=postcode]',
+ ],
+ 'telephone' => [
+ 'selector' => '.admin__data-grid-filters input[name*=telephone]',
+ ],
+ 'country_id' => [
+ 'selector' => '.admin__data-grid-filters select[name*=country]',
+ 'input' => 'select',
+ ],
+
+ ];
+
+ /**
+ * Select action toggle.
+ *
+ * @var string
+ */
+ private $selectAction = '.action-select';
+
+ /**
+ * Delete action toggle.
+ *
+ * @var string
+ */
+ private $deleteAddress = '[data-action="item-delete"]';
+
+ /**
+ * Locator value for "Edit" link inside action column.
+ *
+ * @var string
+ */
+ private $editAddress = '[data-action="item-edit"]';
+
+ /**
+ * Customer address modal window.
+ *
+ * @var string
+ */
+ private $customerAddressModalForm = '.customer_form_areas_address_address_customer_address_update_modal';
+
+ /**
+ * Search customer address by filter.
+ *
+ * @param array $filter
+ * @return void
+ */
+ public function search(array $filter): void
+ {
+ parent::search(array_intersect_key($filter, $this->filters));
+ }
+
+ /**
+ * Delete customer address by filter
+ *
+ * @param array $filter
+ * @return void
+ * @throws \Exception
+ */
+ public function deleteCustomerAddress(array $filter): void
+ {
+ $this->search($filter);
+ $rowItem = $this->getRow([$filter['firstname']]);
+ if ($rowItem->isVisible()) {
+ $this->deleteRowItemAddress($rowItem);
+ } else {
+ throw new \Exception("Searched item was not found by filter\n" . print_r($filter, true));
+ }
+ }
+
+ /**
+ * @param \Magento\Mtf\Client\Element\SimpleElement $rowItem
+ * @return void
+ */
+ public function deleteRowItemAddress(\Magento\Mtf\Client\Element\SimpleElement $rowItem): void
+ {
+ $rowItem->find($this->selectAction)->click();
+ $rowItem->find($this->deleteAddress)->click();
+ $modalElement = $this->browser->find($this->confirmModal);
+ /** @var \Magento\Ui\Test\Block\Adminhtml\Modal $modal */
+ $modal = $this->blockFactory->create(
+ \Magento\Ui\Test\Block\Adminhtml\Modal::class,
+ ['element' => $modalElement]
+ );
+ $modal->acceptAlert();
+ $this->waitLoader();
+ }
+
+ /**
+ * Open first row from the addresses grid
+ *
+ * @return void
+ */
+ public function openFirstRow(): void
+ {
+ $firstRow = $this->getFirstRow();
+ if ($firstRow->isVisible()) {
+ $firstRow->find($this->selectAction)->click();
+ $firstRow->find($this->editAddress)->click();
+ $this->waitForElementVisible($this->customerAddressModalForm);
+ $this->waitLoader();
+ }
+ }
+
+ /**
+ * Get first row from the grid
+ *
+ * @return \Magento\Mtf\Client\Element\SimpleElement
+ */
+ public function getFirstRow(): \Magento\Mtf\Client\Element\SimpleElement
+ {
+ return $this->_rootElement->find($this->firstRowSelector, \Magento\Mtf\Client\Locator::SELECTOR_XPATH);
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerAddressBackendRequiredFields.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerAddressBackendRequiredFields.php
new file mode 100644
index 0000000000000..46bb8ce72abb1
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerAddressBackendRequiredFields.php
@@ -0,0 +1,56 @@
+getCustomerForm()->getTab('addresses')
+ ->getCustomerAddressModalForm()->getJsErrors();
+ foreach ($expectedRequiredFields as $field) {
+ \PHPUnit\Framework\Assert::assertTrue(
+ isset($actualRequiredFields[$field]),
+ "Field '$field' is not highlighted with an JS error."
+ );
+ \PHPUnit\Framework\Assert::assertEquals(
+ self::REQUIRE_MESSAGE,
+ $actualRequiredFields[$field],
+ "Field '$field' is not highlighted as required."
+ );
+ }
+ }
+
+ /**
+ * Return string representation of object.
+ *
+ * @return string
+ */
+ public function toString(): string
+ {
+ return 'All required fields on customer form are highlighted.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php
index f1a8b17ae2855..ccc6da81038f8 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php
@@ -112,15 +112,15 @@ public function __inject(
* Create customer on backend.
*
* @param Customer $customer
- * @param string $customerAction
- * @param Address $address
+ * @param null $customerAction
+ * @param Address|null $address
* @param array $steps
* @param array $beforeActionCallback
- * @return void
+ * @throws \Exception
*/
public function test(
Customer $customer,
- $customerAction,
+ $customerAction = null,
Address $address = null,
array $steps = [],
array $beforeActionCallback = []
@@ -135,7 +135,12 @@ public function test(
$this->pageCustomerIndex->open();
$this->pageCustomerIndex->getPageActionsBlock()->addNew();
- $this->pageCustomerIndexNew->getCustomerForm()->fillCustomer($customer, $address);
+ $this->pageCustomerIndexNew->getCustomerForm()->fillCustomer($customer);
+ if (null !== $address) {
+ $this->pageCustomerIndexNew->getPageActionsBlock()->saveAndContinue();
+ $this->pageCustomerIndexNew->getMessagesBlock()->waitSuccessMessage();
+ $this->pageCustomerIndexNew->getCustomerForm()->fillCustomerAddress($address);
+ }
$this->address = $address;
$this->customer = $customer;
@@ -144,8 +149,9 @@ public function test(
call_user_func([$this, $methodName]);
}
}
-
- $this->pageCustomerIndexNew->getPageActionsBlock()->$customerAction();
+ if (null !== $customerAction) {
+ $this->pageCustomerIndexNew->getPageActionsBlock()->$customerAction();
+ }
}
/**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml
index 502ac2495357a..5bb96dc13c739 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml
@@ -115,8 +115,7 @@
- save
+
Main Website
General
John%isolation%
@@ -131,7 +130,7 @@
- Zip/Postal Code
- Phone Number
-
to_maintain:yes
diff --git a/dev/tests/functional/tests/app/Magento/CustomerImportExport/Test/Constraint/AssertImportCustomerAddresses.php b/dev/tests/functional/tests/app/Magento/CustomerImportExport/Test/Constraint/AssertImportCustomerAddresses.php
index 18b2d44a22ff1..f73609b3ba2cf 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerImportExport/Test/Constraint/AssertImportCustomerAddresses.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerImportExport/Test/Constraint/AssertImportCustomerAddresses.php
@@ -116,8 +116,7 @@ private function getPrepareAddresses()
foreach ($customers as $customer) {
$this->customerIndexEdit->open(['id' => $customer->getId()]);
$customerForm->openTab('addresses');
- $addresses = $customerForm->getTab('addresses')->getDataAddresses($addressTemplate);
- $address = array_shift($addresses);
+ $address = $customerForm->getTab('addresses')->getAddressFromFirstRow($addressTemplate);
if (!empty($address)) {
$resultAddressesArray[] = $address;
}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
index 5b9ae99a2e868..14bc04cfed70c 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
@@ -105,7 +105,7 @@ class Create extends Block
*
* @var string
*/
- protected $orderMethodsSelector = '#order-methods';
+ protected $orderMethodsSelector = '#shipping-methods';
/**
* Page header.
@@ -323,7 +323,6 @@ public function fillShippingAddress(FixtureInterface $shippingAddress)
*/
public function selectShippingMethod(array $shippingMethod)
{
- $this->_rootElement->find($this->orderMethodsSelector)->click();
$this->getShippingMethodBlock()->selectShippingMethod($shippingMethod);
$this->getTemplateBlock()->waitLoader();
}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Method.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Method.php
index dee1336c14e4c..e5c414c4807d6 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Method.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Method.php
@@ -22,6 +22,13 @@ class Method extends Block
*/
private $paymentMethod = '#p_method_%s';
+ /**
+ * Get available payment methods link.
+ *
+ * @var string
+ */
+ private $billingMethodsLink = '#order-billing_method_summary a';
+
/**
* Purchase order number selector.
*
@@ -59,6 +66,13 @@ class Method extends Block
*/
public function selectPaymentMethod(array $payment, CreditCard $creditCard = null)
{
+ $this->waitForElementNotVisible($this->loader);
+ $billingMethodsLink = $this->_rootElement->find($this->billingMethodsLink);
+ if ($billingMethodsLink->isPresent()) {
+ $billingMethodsLink->click();
+ $this->waitForElementNotVisible($this->loader);
+ }
+
$paymentMethod = $payment['method'];
$paymentInput = $this->_rootElement->find(sprintf($this->paymentMethod, $paymentMethod));
if ($paymentInput->isVisible()) {
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php
index daa58a3447c02..61c48d62630f4 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php
@@ -73,6 +73,7 @@ function () use ($element, $selector) {
return $addProductsButton->isVisible() ? true : null;
}
);
+ $this->getTemplateBlock()->waitLoader();
$this->_rootElement->find($this->addProducts, Locator::SELECTOR_XPATH)->click();
$this->getTemplateBlock()->waitLoader();
}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php
index a0520e1c7ef8f..b5acaf01f5483 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php
@@ -44,13 +44,12 @@ class Method extends Block
public function selectShippingMethod(array $shippingMethod)
{
$this->waitFormLoading();
- $this->_rootElement->waitUntil(
- function () {
- return $this->_rootElement->find($this->shippingMethodsLink)->isVisible() ? true : null;
- }
- );
+ $shippingMethodsLink = $this->_rootElement->find($this->shippingMethodsLink);
+ if ($shippingMethodsLink->isPresent()) {
+ $shippingMethodsLink->click();
+ $this->waitFormLoading();
+ }
- $this->_rootElement->find($this->shippingMethodsLink)->click();
$selector = sprintf(
$this->shippingMethod,
$shippingMethod['shipping_service'],
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Handler/OrderInjectable/Webapi.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Handler/OrderInjectable/Webapi.php
index 073fb0967144c..972dc0f510b36 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Handler/OrderInjectable/Webapi.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Handler/OrderInjectable/Webapi.php
@@ -200,7 +200,7 @@ protected function setBillingAddress(OrderInjectable $order)
$this->webapiTransport->close();
if (!is_numeric($response)) {
$this->eventManager->dispatchEvent(['webapi_failed'], [$response]);
- throw new \Exception("Could not set billing addresss to quote!");
+ throw new \Exception("Could not set billing address to quote!");
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Controller/Paypal/PlaceOrderTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Paypal/PlaceOrderTest.php
new file mode 100644
index 0000000000000..4f2b0fd67840d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Paypal/PlaceOrderTest.php
@@ -0,0 +1,173 @@
+session = $this->getMockBuilder(Session::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getQuote', 'setLastOrderStatus', 'unsLastBillingAgreementReferenceId'])
+ ->getMock();
+
+ $adapterFactory = $this->getMockBuilder(BraintreeAdapterFactory::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->adapter = $this->getMockBuilder(BraintreeAdapter::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $adapterFactory->method('create')
+ ->willReturn($this->adapter);
+
+ $this->_objectManager->addSharedInstance($this->session, Session::class);
+ $this->_objectManager->addSharedInstance($adapterFactory, BraintreeAdapterFactory::class);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ protected function tearDown()
+ {
+ $this->_objectManager->removeSharedInstance(Session::class);
+ $this->_objectManager->removeSharedInstance(BraintreeAdapterFactory::class);
+ parent::tearDown();
+ }
+
+ /**
+ * Tests a negative scenario for a place order flow when exception throws after placing an order.
+ *
+ * @magentoDataFixture Magento/Braintree/Fixtures/paypal_quote.php
+ */
+ public function testExecuteWithFailedOrder()
+ {
+ $reservedOrderId = 'test01';
+ $quote = $this->getQuote($reservedOrderId);
+
+ $this->session->method('getQuote')
+ ->willReturn($quote);
+
+ $this->adapter->method('sale')
+ ->willReturn($this->getTransactionStub('authorized'));
+ $this->adapter->method('void')
+ ->willReturn($this->getTransactionStub('voided'));
+
+ // emulates an error after placing the order
+ $this->session->method('setLastOrderStatus')
+ ->willThrowException(new \Exception('Test Exception'));
+
+ $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+ $this->dispatch('braintree/paypal/placeOrder');
+
+ self::assertRedirect(self::stringContains('checkout/cart'));
+ self::assertSessionMessages(
+ self::equalTo(['The order #' . $reservedOrderId . ' cannot be processed.']),
+ MessageInterface::TYPE_ERROR
+ );
+
+ $order = $this->getOrder($reservedOrderId);
+ self::assertEquals('canceled', $order->getState());
+ }
+
+ /**
+ * Gets quote by reserved order ID.
+ *
+ * @param string $reservedOrderId
+ * @return CartInterface
+ */
+ private function getQuote(string $reservedOrderId): CartInterface
+ {
+ $searchCriteria = $this->_objectManager->get(SearchCriteriaBuilder::class)
+ ->addFilter('reserved_order_id', $reservedOrderId)
+ ->create();
+
+ /** @var CartRepositoryInterface $quoteRepository */
+ $quoteRepository = $this->_objectManager->get(CartRepositoryInterface::class);
+ $items = $quoteRepository->getList($searchCriteria)
+ ->getItems();
+
+ return array_pop($items);
+ }
+
+ /**
+ * Gets order by increment ID.
+ *
+ * @param string $incrementId
+ * @return OrderInterface
+ */
+ private function getOrder(string $incrementId): OrderInterface
+ {
+ $searchCriteria = $this->_objectManager->get(SearchCriteriaBuilder::class)
+ ->addFilter('increment_id', $incrementId)
+ ->create();
+
+ /** @var OrderRepositoryInterface $repository */
+ $repository = $this->_objectManager->get(OrderRepositoryInterface::class);
+ $items = $repository->getList($searchCriteria)
+ ->getItems();
+
+ return array_pop($items);
+ }
+
+ /**
+ * Creates stub for Braintree Transaction.
+ *
+ * @param string $status
+ * @return Successful
+ */
+ private function getTransactionStub(string $status): Successful
+ {
+ $transaction = $this->getMockBuilder(Transaction::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $transaction->status = $status;
+ $transaction->paypal = [
+ 'paymentId' => 'pay-001',
+ 'payerEmail' => 'test@test.com'
+ ];
+ $response = new Successful();
+ $response->success = true;
+ $response->transaction = $transaction;
+
+ return $response;
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/paypal_quote.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/paypal_quote.php
new file mode 100644
index 0000000000000..e4c64d0e33d8b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/paypal_quote.php
@@ -0,0 +1,31 @@
+getShippingAddress()
+ ->setShippingMethod('flatrate_flatrate')
+ ->setCollectShippingRates(true);
+$quote->getPayment()
+ ->setMethod(ConfigProvider::PAYPAL_VAULT_CODE)
+ ->setAdditionalInformation(
+ [
+ 'customer_id' => $quote->getCustomerId(),
+ 'public_hash' => $paymentToken->getPublicHash()
+ ]
+ );
+
+$quote->collectTotals();
+
+/** @var CartRepositoryInterface $quoteRepository */
+$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
+$quoteRepository->save($quote);
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/paypal_quote_rollback.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/paypal_quote_rollback.php
new file mode 100644
index 0000000000000..5d0fa8cca85d9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/paypal_quote_rollback.php
@@ -0,0 +1,9 @@
+customerRepository = Bootstrap::getObjectManager()->get(
+ \Magento\Customer\Api\CustomerRepositoryInterface::class
+ );
+ $this->accountManagement = Bootstrap::getObjectManager()->get(
+ \Magento\Customer\Api\AccountManagementInterface::class
+ );
+ $this->objectManager = Bootstrap::getObjectManager();
+ $this->customerAddress = $this->objectManager->get(\Magento\Customer\Controller\Adminhtml\Address\Save::class);
+ }
+
+ /**
+ * @inheritDoc
+ */
+ protected function tearDown()
+ {
+ /**
+ * Unset customer data
+ */
+ Bootstrap::getObjectManager()->get(\Magento\Backend\Model\Session::class)->setCustomerData(null);
+
+ /**
+ * Unset messages
+ */
+ Bootstrap::getObjectManager()->get(\Magento\Backend\Model\Session::class)->getMessages(true);
+ }
+
+ /**
+ * @magentoDataFixture Magento/Customer/_files/customer_no_address.php
+ *
+ * Check that customer id set and addresses saved
+ */
+ public function testSaveActionWithValidAddressData()
+ {
+ $customer = $this->customerRepository->get('customer5@example.com');
+ $customerId = $customer->getId();
+ $post = [
+ 'parent_id' => $customerId,
+ 'firstname' => 'test firstname',
+ 'lastname' => 'test lastname',
+ 'street' => ['test street'],
+ 'city' => 'test city',
+ 'region_id' => 10,
+ 'country_id' => 'US',
+ 'postcode' => '01001',
+ 'telephone' => '+7000000001',
+ ];
+ $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
+
+ $this->objectManager->get(\Magento\Backend\Model\Session::class)->setCustomerFormData($post);
+
+ $this->customerAddress->execute();
+
+ $this->assertSessionMessages($this->isEmpty(), \Magento\Framework\Message\MessageInterface::TYPE_ERROR);
+
+ /** Check that customer data were cleaned after it was saved successfully*/
+ $this->assertEmpty($this->objectManager->get(\Magento\Backend\Model\Session::class)->getCustomerData());
+
+ $customer = $this->customerRepository->getById($customerId);
+
+ $this->assertEquals('Firstname', $customer->getFirstname());
+ $addresses = $customer->getAddresses();
+ $this->assertCount(1, $addresses);
+ $this->assertNull($this->accountManagement->getDefaultBillingAddress($customerId));
+ $this->assertNull($this->accountManagement->getDefaultShippingAddress($customerId));
+ }
+
+ /**
+ * @magentoDataFixture Magento/Customer/_files/customer_no_address.php
+ *
+ * Check that customer id set and addresses saved
+ */
+ public function testSaveActionWithDefaultShippingAndBilling()
+ {
+ $customer = $this->customerRepository->get('customer5@example.com');
+ $customerId = $customer->getId();
+ $post = [
+ 'parent_id' => $customerId,
+ 'firstname' => 'test firstname',
+ 'lastname' => 'test lastname',
+ 'street' => ['test street'],
+ 'city' => 'test city',
+ 'region_id' => 10,
+ 'country_id' => 'US',
+ 'postcode' => '01001',
+ 'telephone' => '+7000000001',
+ 'default_billing' => true,
+ 'default_shipping' => true
+ ];
+ $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
+
+ $this->objectManager->get(\Magento\Backend\Model\Session::class)->setCustomerFormData($post);
+
+ $this->customerAddress->execute();
+ /**
+ * Check that errors was generated and set to session
+ */
+ $this->assertSessionMessages($this->isEmpty(), \Magento\Framework\Message\MessageInterface::TYPE_ERROR);
+
+ /**
+ * Check that customer data were cleaned after it was saved successfully
+ */
+ $this->assertEmpty($this->objectManager->get(\Magento\Backend\Model\Session::class)->getCustomerData());
+
+ /**
+ * Remove stored customer from registry
+ */
+ $this->objectManager->get(\Magento\Customer\Model\CustomerRegistry::class)->remove($customerId);
+ $customer = $this->customerRepository->get('customer5@example.com');
+ $this->assertEquals('Firstname', $customer->getFirstname());
+ $addresses = $customer->getAddresses();
+ $this->assertCount(1, $addresses);
+
+ $this->assertNotNull($this->accountManagement->getDefaultBillingAddress($customerId));
+ $this->assertNotNull($this->accountManagement->getDefaultShippingAddress($customerId));
+ }
+
+ /**
+ * @magentoDataFixture Magento/Customer/_files/customer_sample.php
+ *
+ * Check that customer id set and addresses saved
+ */
+ public function testSaveActionWithExistingAdresses()
+ {
+ $customer = $this->customerRepository->get('customer@example.com');
+ $customerId = $customer->getId();
+ $post = [
+ 'parent_id' => $customerId,
+ 'firstname' => 'test firstname',
+ 'lastname' => 'test lastname',
+ 'street' => ['test street'],
+ 'city' => 'test city',
+ 'region_id' => 10,
+ 'country_id' => 'US',
+ 'postcode' => '01001',
+ 'telephone' => '+7000000001',
+ ];
+ $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
+
+ $this->objectManager->get(\Magento\Backend\Model\Session::class)->setCustomerFormData($post);
+
+ $this->customerAddress->execute();
+ /**
+ * Check that errors was generated and set to session
+ */
+ $this->assertSessionMessages($this->isEmpty(), \Magento\Framework\Message\MessageInterface::TYPE_ERROR);
+
+ /**
+ * Check that customer data were cleaned after it was saved successfully
+ */
+ $this->assertEmpty($this->objectManager->get(\Magento\Backend\Model\Session::class)->getCustomerData());
+
+ $customer = $this->customerRepository->getById($customerId);
+
+ $this->assertEquals('test firstname', $customer->getFirstname());
+ $addresses = $customer->getAddresses();
+ $this->assertCount(4, $addresses);
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php
index 2fe49efd74a6d..292d61c392d06 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php
@@ -122,226 +122,6 @@ public function testSaveActionWithInvalidFormData()
$this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'new'));
}
- /**
- * @magentoDbIsolation enabled
- */
- public function testSaveActionWithInvalidCustomerAddressData()
- {
- $post = [
- 'customer' => [
- 'middlename' => 'test middlename',
- 'group_id' => 1,
- 'website_id' => 0,
- 'firstname' => 'test firstname',
- 'lastname' => 'test lastname',
- 'email' => 'example@domain.com',
- 'default_billing' => '_item1',
- ],
- 'address' => ['_item1' => []],
- ];
- $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
- $this->dispatch('backend/customer/index/save');
- /**
- * Check that errors was generated and set to session
- */
- $this->assertSessionMessages(
- $this->logicalNot($this->isEmpty()),
- \Magento\Framework\Message\MessageInterface::TYPE_ERROR
- );
- /**
- * Check that customer data were set to session
- */
- $this->assertArraySubset(
- $post,
- $this->objectManager->get(\Magento\Backend\Model\Session::class)->getCustomerFormData()
- );
- $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'new'));
- }
-
- /**
- * @magentoDbIsolation enabled
- */
- public function testSaveActionWithValidCustomerDataAndValidAddressData()
- {
- $post = [
- 'customer' => [
- 'middlename' => 'test middlename',
- 'group_id' => 1,
- 'website_id' => 0,
- 'firstname' => 'test firstname',
- 'lastname' => 'test lastname',
- 'email' => 'example@domain.com',
- 'default_billing' => '_item1',
- 'password' => 'password',
- ],
- 'address' => [
- '_item1' => [
- 'firstname' => 'test firstname',
- 'lastname' => 'test lastname',
- 'street' => ['test street'],
- 'city' => 'test city',
- 'region_id' => 10,
- 'country_id' => 'US',
- 'postcode' => '01001',
- 'telephone' => '+7000000001',
- 'default_billing' => 'true',
- ],
- ],
- ];
- $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
- $this->getRequest()->setParam('back', '1');
-
- // Emulate setting customer data to session in editAction
- $this->objectManager->get(\Magento\Backend\Model\Session::class)->setCustomerFormData($post);
-
- $this->dispatch('backend/customer/index/save');
- /**
- * Check that errors was generated and set to session
- */
- $this->assertSessionMessages($this->isEmpty(), \Magento\Framework\Message\MessageInterface::TYPE_ERROR);
-
- /**
- * Check that customer data were cleaned after it was saved successfully
- */
- $this->assertEmpty($this->objectManager->get(\Magento\Backend\Model\Session::class)->getCustomerData());
-
- /**
- * Check that success message is set
- */
- $this->assertSessionMessages(
- $this->logicalNot($this->isEmpty()),
- \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
- );
-
- /**
- * Check that customer id set and addresses saved
- */
- $registry = $this->objectManager->get(\Magento\Framework\Registry::class);
- $customerId = $registry->registry(RegistryConstants::CURRENT_CUSTOMER_ID);
- $customer = $this->customerRepository->getById($customerId);
- $this->assertEquals('test firstname', $customer->getFirstname());
- $addresses = $customer->getAddresses();
- $this->assertEquals(1, count($addresses));
- $this->assertNotEquals(0, $this->accountManagement->getDefaultBillingAddress($customerId));
- $this->assertNull($this->accountManagement->getDefaultShippingAddress($customerId));
-
- $urlPatternParts = [
- $this->_baseControllerUrl . 'edit',
- 'id/' . $customerId,
- 'back/1',
- ];
- $urlPattern = '/^' . str_replace('/', '\/', implode('(/.*/)|/', $urlPatternParts)) . '/';
-
- $this->assertRedirect(
- $this->matchesRegularExpression($urlPattern)
- );
-
- /** @var \Magento\Newsletter\Model\Subscriber $subscriber */
- $subscriber = $this->objectManager->get(\Magento\Newsletter\Model\SubscriberFactory::class)->create();
- $this->assertEmpty($subscriber->getId());
- $subscriber->loadByCustomerId($customerId);
- $this->assertEmpty($subscriber->getId());
- }
-
- /**
- * @magentoDataFixture Magento/Customer/_files/customer_sample.php
- */
- public function testSaveActionExistingCustomerAndExistingAddressData()
- {
- $post = [
- 'customer' => [
- 'entity_id' => '1',
- 'middlename' => 'test middlename',
- 'group_id' => 1,
- 'website_id' => 1,
- 'firstname' => 'test firstname',
- 'lastname' => 'test lastname',
- 'email' => 'customer@example.com',
- 'new_password' => 'auto',
- 'sendemail_store_id' => '1',
- 'sendemail' => '1',
- 'created_at' => '2000-01-01 00:00:00',
- 'default_shipping' => '_item1',
- 'default_billing' => 1,
- ],
- 'address' => [
- '1' => [
- 'firstname' => 'update firstname',
- 'lastname' => 'update lastname',
- 'street' => ['update street'],
- 'city' => 'update city',
- 'region_id' => 10,
- 'country_id' => 'US',
- 'postcode' => '01001',
- 'telephone' => '+7000000001',
- 'default_billing' => 'true',
- ],
- '_item1' => [
- 'firstname' => 'new firstname',
- 'lastname' => 'new lastname',
- 'street' => ['new street'],
- 'city' => 'new city',
- 'region_id' => 10,
- 'country_id' => 'US',
- 'postcode' => '01001',
- 'telephone' => '+7000000001',
- 'default_shipping' => 'true',
- ],
- '_template_' => [
- 'firstname' => '',
- 'lastname' => '',
- 'street' => [],
- 'city' => '',
- 'region_id' => 10,
- 'country_id' => 'US',
- 'postcode' => '',
- 'telephone' => '',
- ],
- ],
- 'subscription' => '',
- ];
- $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
- $this->getRequest()->setParam('id', 1);
- $this->dispatch('backend/customer/index/save');
-
- /** Check that success message is set */
- $this->assertSessionMessages(
- $this->equalTo(['You saved the customer.']),
- \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
- );
-
- /** Check that customer id set and addresses saved */
- $registry = $this->objectManager->get(\Magento\Framework\Registry::class);
- $customerId = $registry->registry(RegistryConstants::CURRENT_CUSTOMER_ID);
- $customer = $this->customerRepository->getById($customerId);
- $this->assertEquals('test firstname', $customer->getFirstname());
-
- /**
- * Addresses should be removed by
- * \Magento\Customer\Model\ResourceModel\Customer::_saveAddresses during _afterSave
- * addressOne - updated
- * addressTwo - removed
- * addressThree - removed
- * _item1 - new address
- */
- $addresses = $customer->getAddresses();
- $this->assertEquals(2, count($addresses));
- $updatedAddress = $this->addressRepository->getById(1);
- $this->assertEquals('update firstname', $updatedAddress->getFirstname());
- $this->assertTrue($updatedAddress->isDefaultBilling());
- $this->assertEquals($updatedAddress->getId(), $customer->getDefaultBilling());
- $newAddress = $this->accountManagement->getDefaultShippingAddress($customerId);
- $this->assertEquals('new firstname', $newAddress->getFirstname());
-
- /** @var \Magento\Newsletter\Model\Subscriber $subscriber */
- $subscriber = $this->objectManager->get(\Magento\Newsletter\Model\SubscriberFactory::class)->create();
- $this->assertEmpty($subscriber->getId());
- $subscriber->loadByCustomerId($customerId);
- $this->assertNotEmpty($subscriber->getId());
- $this->assertEquals(1, $subscriber->getStatus());
- $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'index/key/'));
- }
-
/**
* @magentoDataFixture Magento/Newsletter/_files/subscribers.php
*/
@@ -544,7 +324,7 @@ public function testNewAction()
/**
* Test the editing of a new customer that has not been saved but the page has been reloaded
*/
- public function testNewActionWithCustomerData()
+ public function te1stNewActionWithCustomerData()
{
$customerData = [
'customer_id' => 0,
@@ -679,59 +459,6 @@ public function testValidateCustomerWithAddressSuccess()
$this->assertEquals('{"error":0}', $body);
}
- /**
- * @magentoDataFixture Magento/Customer/_files/customer.php
- * @magentoDataFixture Magento/Customer/_files/customer_address.php
- */
- public function testValidateCustomerWithAddressFailure()
- {
- $customerData = [
- 'customer' => [
- 'entity_id' => '1',
- 'middlename' => 'new middlename',
- 'group_id' => 1,
- 'website_id' => 1,
- 'firstname' => '',
- 'lastname' => '',
- 'email' => '*',
- 'default_shipping' => '_item1',
- 'new_password' => 'auto',
- 'sendemail_store_id' => '1',
- 'sendemail' => '1',
- ],
- 'address' => [
- '1' => [
- 'firstname' => '',
- 'lastname' => '',
- 'street' => ['update street'],
- 'city' => 'update city',
- 'postcode' => '01001',
- 'telephone' => '',
- ],
- '_template_' => [
- 'lastname' => '',
- 'street' => [],
- 'city' => '',
- 'country_id' => 'US',
- 'postcode' => '',
- 'telephone' => '',
- ],
- ],
- ];
- /**
- * set customer data
- */
- $this->getRequest()->setPostValue($customerData)->setMethod(HttpRequest::METHOD_POST);
- $this->dispatch('backend/customer/index/validate');
- $body = $this->getResponse()->getBody();
-
- $this->assertContains('{"error":true,"messages":', $body);
- $this->assertContains('\"First Name\" is a required value', $body);
- $this->assertContains('\"Last Name\" is a required value.', $body);
- $this->assertContains('\"Country\" is a required value.', $body);
- $this->assertContains('\"Phone Number\" is a required value.', $body);
- }
-
/**
* @magentoDbIsolation enabled
*/
diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple_out_of_stock.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple_out_of_stock.php
new file mode 100644
index 0000000000000..6ef9b5cd5b0a8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple_out_of_stock.php
@@ -0,0 +1,75 @@
+get(ProductRepositoryInterface::class);
+
+$productLinkFactory = Bootstrap::getObjectManager()
+ ->get(\Magento\Catalog\Api\Data\ProductLinkInterfaceFactory::class);
+$productConfigs = [
+ [
+ 'id' => '100000001',
+ 'stock_config' => ['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1]
+ ],
+ [
+ 'id' => '100000002',
+ 'stock_config' => ['use_config_manage_stock' => 1, 'qty' => 0, 'is_qty_decimal' => 0, 'is_in_stock' => 0]
+ ]
+];
+
+foreach ($productConfigs as $productConfig) {
+ /** @var $product Product */
+ $product = Bootstrap::getObjectManager()->create(Product::class);
+ $product->setTypeId(Type::TYPE_SIMPLE)
+ ->setId($productConfig['id'])
+ ->setWebsiteIds([1])
+ ->setAttributeSetId(4)
+ ->setName('Simple ' . $productConfig['id'])
+ ->setSku('simple_' . $productConfig['id'])
+ ->setPrice(100)
+ ->setVisibility(Visibility::VISIBILITY_BOTH)
+ ->setStatus(Status::STATUS_ENABLED)
+ ->setStockData($productConfig['stock_config']);
+
+ $linkedProducts[] = $productRepository->save($product);
+}
+
+/** @var $product Product */
+$product = Bootstrap::getObjectManager()->create(Product::class);
+
+$product->setTypeId(Grouped::TYPE_CODE)
+ ->setId('100000003')
+ ->setWebsiteIds([1])
+ ->setAttributeSetId(4)
+ ->setName('Grouped Product')
+ ->setSku('grouped')
+ ->setVisibility(Visibility::VISIBILITY_BOTH)
+ ->setStatus(Status::STATUS_ENABLED)
+ ->setStockData(['use_config_manage_stock' => 1, 'is_in_stock' => 1]);
+
+foreach ($linkedProducts as $linkedProduct) {
+ /** @var \Magento\Catalog\Api\Data\ProductLinkInterface $productLink */
+ $productLink = $productLinkFactory->create();
+ $productLink->setSku($product->getSku())
+ ->setLinkType('associated')
+ ->setLinkedProductSku($linkedProduct->getSku())
+ ->setLinkedProductType($linkedProduct->getTypeId())
+ ->getExtensionAttributes()
+ ->setQty(1);
+ $newLinks[] = $productLink;
+}
+
+$product->setProductLinks($newLinks);
+
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple_out_of_stock_rollback.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple_out_of_stock_rollback.php
new file mode 100644
index 0000000000000..b81c008cf1ab6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple_out_of_stock_rollback.php
@@ -0,0 +1,34 @@
+get(\Magento\Framework\Registry::class);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+ ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$skuList = ['simple_100000001', 'simple_100000002', 'grouped'];
+foreach ($skuList as $sku) {
+ try {
+ $product = $productRepository->get($sku, false, null, true);
+
+ $stockStatus = $objectManager->create(\Magento\CatalogInventory\Model\Stock\Status::class);
+ $stockStatus->load($product->getData('entity_id'), 'product_id');
+ $stockStatus->delete();
+
+ $productRepository->delete($product);
+ } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+ //Product already removed
+ }
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/shipping.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/shipping.test.js
index ff420c4830476..9b9b1ce5b1614 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/shipping.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/shipping.test.js
@@ -12,7 +12,7 @@ require.config({
}
});
-define(['squire', 'ko', 'jquery', 'jquery/validate'], function (Squire, ko, $) {
+define(['squire', 'ko', 'jquery', 'uiRegistry', 'jquery/validate'], function (Squire, ko, $, registry) {
'use strict';
var injector = new Squire(),
@@ -28,7 +28,17 @@ define(['squire', 'ko', 'jquery', 'jquery/validate'], function (Squire, ko, $) {
'Magento_Checkout/js/model/address-converter': jasmine.createSpy(),
'Magento_Checkout/js/model/quote': {
isVirtual: jasmine.createSpy(),
- shippingMethod: ko.observable()
+ shippingMethod: ko.observable(),
+
+ /**
+ * Stub
+ */
+ shippingAddress: function () {
+
+ return {
+ 'countryId': 'AD'
+ };
+ }
},
'Magento_Checkout/js/action/create-shipping-address': jasmine.createSpy().and.returnValue(
jasmine.createSpyObj('newShippingAddress', ['getKey'])
@@ -52,7 +62,7 @@ define(['squire', 'ko', 'jquery', 'jquery/validate'], function (Squire, ko, $) {
'checkoutData',
['setSelectedShippingAddress', 'setNewCustomerShippingAddress', 'setSelectedShippingRate']
),
- 'uiRegistry': jasmine.createSpy(),
+ 'Magento_Ui/js/lib/registry/registry': registry,
'Magento_Checkout/js/model/shipping-rate-service': jasmine.createSpy()
},
obj;
@@ -63,6 +73,7 @@ define(['squire', 'ko', 'jquery', 'jquery/validate'], function (Squire, ko, $) {
obj = new Constr({
provider: 'provName',
name: '',
+ parentName: 'test',
index: '',
popUpForm: {
options: {
@@ -156,12 +167,26 @@ define(['squire', 'ko', 'jquery', 'jquery/validate'], function (Squire, ko, $) {
describe('"setShippingInformation" method', function () {
it('Check method call.', function () {
+ spyOn(obj, 'validateShippingInformation').and.returnValue(false);
expect(obj.setShippingInformation()).toBeUndefined();
});
});
describe('"validateShippingInformation" method', function () {
it('Check method call on negative cases.', function () {
+ var country = {
+ 'indexedOptions': {
+ 'AD':
+ {
+ label: 'Andorra',
+ labeltitle: 'Andorra',
+ value: 'AD'
+ }
+ }
+ };
+
+ registry.set('test.shippingAddress.shipping-address-fieldset.country_id', country);
+ registry.set('checkout.errors', {});
obj.source = {
get: jasmine.createSpy().and.returnValue(true),
set: jasmine.createSpy(),
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Customer/adminhtml/js/view/form/components/form.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Customer/adminhtml/js/view/form/components/form.test.js
new file mode 100644
index 0000000000000..2ef8736b4f0b8
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Customer/adminhtml/js/view/form/components/form.test.js
@@ -0,0 +1,71 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'underscore',
+ 'uiRegistry',
+ 'Magento_Customer/js/form/components/form',
+ 'jquery'
+], function (_, registry, Constr, $) {
+ 'use strict';
+
+ describe('Magento_Customer/js/form/components/form', function () {
+
+ var obj,
+ originaljQueryAjax;
+
+ beforeEach(function () {
+ originaljQueryAjax = $.ajax;
+ obj = new Constr({
+ provider: 'provName',
+ name: '',
+ index: ''
+ });
+ });
+
+ afterEach(function () {
+ $.ajax = originaljQueryAjax;
+ });
+
+ registry.set('provName', {
+ /** Stub */
+ on: function () {},
+
+ /** Stub */
+ get: function () {},
+
+ /** Stub */
+ set: function () {}
+ });
+
+ describe('"deleteAddress" method', function () {
+ it('Check for defined ', function () {
+ expect(obj.hasOwnProperty('deleteAddress')).toBeDefined();
+ });
+ it('Check method type', function () {
+ var type = typeof obj.deleteAddress;
+
+ expect(type).toEqual('function');
+ });
+ it('Check returned value if method called without arguments', function () {
+ expect(obj.deleteAddress()).toBeUndefined();
+ });
+ it('Check returned value type if method called without arguments', function () {
+ var type = typeof obj.deleteAddress();
+
+ expect(type).toEqual('undefined');
+ });
+ it('Should call not call ajax if arguments are empty', function () {
+ $.ajax = jasmine.createSpy();
+
+ spyOn(obj, 'deleteAddress');
+
+ expect(obj.deleteAddress()).toBeUndefined();
+
+ expect($.ajax).not.toHaveBeenCalled();
+ });
+ });
+ });
+});
diff --git a/dev/tests/static/testsuite/Magento/Test/Less/_files/blacklist/old.txt b/dev/tests/static/testsuite/Magento/Test/Less/_files/blacklist/old.txt
index db5c1cab06655..4c00371faede0 100644
--- a/dev/tests/static/testsuite/Magento/Test/Less/_files/blacklist/old.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Less/_files/blacklist/old.txt
@@ -4,6 +4,7 @@ app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/
app/design/adminhtml/Magento/backend/Magento_Developer/web/css/source/_module-old.less
app/design/adminhtml/Magento/backend/Magento_Enterprise/web/css/source/_module-old.less
app/design/adminhtml/Magento/backend/Magento_Msrp/web/css/source/_module-old.less
+app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
app/design/adminhtml/Magento/backend/Magento_Tax/web/css/source/_module-old.less
app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/_module-old.less
app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/_module-old.less
@@ -22,4 +23,4 @@ app/design/adminhtml/Magento/backend/web/mui/clearless/_settings.less
app/design/adminhtml/Magento/backend/web/mui/clearless/_sprites.less
app/design/adminhtml/Magento/backend/web/mui/styles/_abstract.less
app/design/adminhtml/Magento/backend/web/mui/styles/_table.less
-app/design/adminhtml/Magento/backend/web/mui/styles/_vars.less
+app/design/adminhtml/Magento/backend/web/mui/styles/_vars.less
\ No newline at end of file
diff --git a/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Fs.php b/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Fs.php
index 14531deda45bb..4820b83ceb7a8 100644
--- a/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Fs.php
+++ b/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Fs.php
@@ -75,7 +75,7 @@ public function run()
/**
* we need these fake initializations because all magento's files in filesystem will be deleted and autoloader
- * wont be able to load classes that we need for unpacking
+ * won't be able to load classes that we need for unpacking
*/
new Tar();
new Gz();
@@ -94,6 +94,8 @@ public function run()
}
/**
+ * Get file system helper instance
+ *
* @return Helper
* @deprecated 100.2.0
*/
diff --git a/lib/internal/Magento/Framework/View/Element/ComponentVisibilityInterface.php b/lib/internal/Magento/Framework/View/Element/ComponentVisibilityInterface.php
new file mode 100644
index 0000000000000..29d14553481d7
--- /dev/null
+++ b/lib/internal/Magento/Framework/View/Element/ComponentVisibilityInterface.php
@@ -0,0 +1,20 @@
+
false
admin_customer_address_entity_id
- "address":\{"\d+":{"entity_id":"(\d+)".+?"parent_id":"${admin_customer_entity_id}"
+ _address":\{"entity_id":"(\d+)".+?"parent_id":"${admin_customer_entity_id}"
$1$
1
@@ -33518,7 +33518,7 @@ vars.put("admin_user", adminUser);
false
admin_customer_address_created_at
- "address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"created_at":"([^"]+)"
+ _address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"created_at":"([^"]+)"
$1$
1
@@ -33527,7 +33527,7 @@ vars.put("admin_user", adminUser);
false
admin_customer_address_updated_at
- "address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"updated_at":"([^"]+)"
+ _address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"updated_at":"([^"]+)"
$1$
1
@@ -33536,7 +33536,7 @@ vars.put("admin_user", adminUser);
false
admin_customer_address_is_active
- "address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"is_active":"(\d+)"
+ _address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"is_active":"(\d+)"
$1$
1
@@ -33545,7 +33545,7 @@ vars.put("admin_user", adminUser);
false
admin_customer_address_city
- "address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"city":"([^"]+)"
+ _address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"city":"([^"]+)"
$1$
1
@@ -33554,7 +33554,7 @@ vars.put("admin_user", adminUser);
false
admin_customer_address_country_id
- "address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"country_id":"([^"]+)"
+ _address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"country_id":"([^"]+)"
$1$
1
@@ -33563,7 +33563,7 @@ vars.put("admin_user", adminUser);
false
admin_customer_address_firstname
- "address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"firstname":"([^"]+)"
+ _address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"firstname":"([^"]+)"
$1$
1
@@ -33572,7 +33572,7 @@ vars.put("admin_user", adminUser);
false
admin_customer_address_lastname
- "address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"lastname":"([^"]+)"
+ _address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"lastname":"([^"]+)"
$1$
1
@@ -33581,7 +33581,7 @@ vars.put("admin_user", adminUser);
false
admin_customer_address_postcode
- "address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"postcode":"([^"]+)"
+ _address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"postcode":"([^"]+)"
$1$
1
@@ -33590,7 +33590,7 @@ vars.put("admin_user", adminUser);
false
admin_customer_address_region
- "address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"region":"([^"]+)"
+ _address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"region":"([^"]+)"
$1$
1
@@ -33599,7 +33599,7 @@ vars.put("admin_user", adminUser);
false
admin_customer_address_region_id
- "address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"region_id":"([^"]+)"
+ _address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"region_id":"([^"]+)"
$1$
1
@@ -33608,7 +33608,7 @@ vars.put("admin_user", adminUser);
false
admin_customer_address_street
- "address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"street":\["([^"]+)"\]
+ _address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"street":\["([^"]+)"\]
$1$
1
@@ -33617,7 +33617,7 @@ vars.put("admin_user", adminUser);
false
admin_customer_address_telephone
- "address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"telephone":"([^"]+)"
+ _address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"telephone":"([^"]+)"
$1$
1
@@ -33626,7 +33626,7 @@ vars.put("admin_user", adminUser);
false
admin_customer_address_customer_id
- "address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"customer_id":"([^"]+)"
+ _address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"customer_id":"([^"]+)"
$1$
1
+ getChildHtml('shipping_method') ?>
-
-
+
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
index 9e0394f6430bd..65d3a612e5133 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
@@ -100,12 +100,8 @@ require(['prototype'], function(){
diff --git a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
index 259ca2165e647..c508a5ecdfa58 100644
--- a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
+++ b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
@@ -4,14 +4,17 @@
*/
define([
- "jquery",
+ 'jquery',
'Magento_Ui/js/modal/confirm',
'Magento_Ui/js/modal/alert',
- "mage/translate",
- "prototype",
- "Magento_Catalog/catalog/product/composite/configure",
+ 'mage/template',
+ 'text!Magento_Sales/templates/order/create/shipping/reload.html',
+ 'text!Magento_Sales/templates/order/create/payment/reload.html',
+ 'mage/translate',
+ 'prototype',
+ 'Magento_Catalog/catalog/product/composite/configure',
'Magento_Ui/js/lib/view/utils/async'
-], function(jQuery, confirm, alert){
+], function (jQuery, confirm, alert, template, shippingTemplate, paymentTemplate) {
window.AdminOrder = new Class.create();
@@ -29,7 +32,7 @@ define([
this.gridProducts = $H({});
this.gridProductsGift = $H({});
this.billingAddressContainer = '';
- this.shippingAddressContainer= '';
+ this.shippingAddressContainer = '';
this.isShippingMethodReseted = data.shipping_method_reseted ? data.shipping_method_reseted : false;
this.overlayData = $H({});
this.giftMessageDataChanged = false;
@@ -39,7 +42,19 @@ define([
this.isOnlyVirtualProduct = false;
this.excludedPaymentMethods = [];
this.summarizePrice = true;
- this.timerId = null;
+ this.shippingTemplate = template(shippingTemplate, {
+ data: {
+ title: jQuery.mage.__('Shipping Method'),
+ linkText: jQuery.mage.__('Get shipping methods and rates')
+ }
+ });
+ this.paymentTemplate = template(paymentTemplate, {
+ data: {
+ title: jQuery.mage.__('Payment Method'),
+ linkText: jQuery.mage.__('Get available payment methods')
+ }
+ });
+
jQuery.async('#order-items', (function(){
this.dataArea = new OrderFormArea('data', $(this.getAreaId('data')), this);
this.itemsArea = Object.extend(new OrderFormArea('items', $(this.getAreaId('items')), this), {
@@ -168,43 +183,51 @@ define([
var data = this.serializeData(container);
data[el.name] = id;
- if(this.isShippingField(container) && !this.isShippingMethodReseted){
+
+ this.resetPaymentMethod();
+ if (this.isShippingField(container) && !this.isShippingMethodReseted) {
this.resetShippingMethod(data);
- }
- else{
+ } else{
this.saveData(data);
}
},
- isShippingField : function(fieldId){
- if(this.shippingAsBilling){
+ /**
+ * Checks if the field belongs to the shipping address.
+ *
+ * @param {String} fieldId
+ * @return {Boolean}
+ */
+ isShippingField: function (fieldId) {
+ if (this.shippingAsBilling) {
return fieldId.include('billing');
}
+
return fieldId.include('shipping');
},
- isBillingField : function(fieldId){
+ /**
+ * Checks if the field belongs to the billing address.
+ *
+ * @param {String} fieldId
+ * @return {Boolean}
+ */
+ isBillingField: function (fieldId) {
return fieldId.include('billing');
},
- bindAddressFields : function(container) {
- var fields = $(container).select('input', 'select', 'textarea');
- for(var i=0;i
+ <%- data.title %>
+
+
diff --git a/app/code/Magento/Sales/view/adminhtml/web/templates/order/create/shipping/reload.html b/app/code/Magento/Sales/view/adminhtml/web/templates/order/create/shipping/reload.html
new file mode 100644
index 0000000000000..6b191ee81a45a
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/web/templates/order/create/shipping/reload.html
@@ -0,0 +1,19 @@
+
+
+
+ <%- data.title %>
+
+
+
+ <%- data.linkText %>
+
+
+
diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
index be2588dc48711..27047ae46bf1f 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
@@ -184,11 +184,11 @@ public function setActiveFlag($code = 'active')
/**
* Return code of carrier
*
- * @return string
+ * @return string|null
*/
public function getCarrierCode()
{
- return isset($this->_code) ? $this->_code : null;
+ return $this->_code ?? null;
}
/**
@@ -216,6 +216,7 @@ public function getTrackingInfo($tracking)
/**
* Check if carrier has shipping tracking option available
+ *
* All \Magento\Usa carriers have shipping tracking option available
*
* @return boolean
@@ -399,8 +400,8 @@ protected function _getQuotesCacheKey($requestParams)
/**
* Checks whether some request to rates have already been done, so we have cache for it
- * Used to reduce number of same requests done to carrier service during one session
*
+ * Used to reduce number of same requests done to carrier service during one session
* Returns cached response or null
*
* @param string|array $requestParams
@@ -410,7 +411,7 @@ protected function _getCachedQuotes($requestParams)
{
$key = $this->_getQuotesCacheKey($requestParams);
- return isset(self::$_quotesCache[$key]) ? self::$_quotesCache[$key] : null;
+ return self::$_quotesCache[$key] ?? null;
}
/**
@@ -443,8 +444,7 @@ protected function _prepareServiceName($name)
}
/**
- * Prepare shipment request.
- * Validate and correct request information
+ * Prepare shipment request. Validate and correct request information
*
* @param \Magento\Framework\DataObject $request
* @return void
@@ -558,8 +558,7 @@ public function returnOfShipment($request)
}
/**
- * For multi package shipments. Delete requested shipments if the current shipment
- * request is failed
+ * For multi package shipments. Delete requested shipments if the current shipment. Request is failed
*
* @param array $data
* @return bool
@@ -625,6 +624,8 @@ public function isGirthAllowed($countyDest = null, $carrierMethodCode = null)
}
/**
+ * Set Raw Request
+ *
* @param \Magento\Framework\DataObject|null $request
* @return $this
* @api
@@ -680,6 +681,7 @@ public function parseXml($xmlContent, $customSimplexml = 'SimpleXMLElement')
/**
* Checks if shipping method can collect rates
+ *
* @return bool
*/
public function canCollectRates()
@@ -689,6 +691,7 @@ public function canCollectRates()
/**
* Debug errors if showmethod is unset
+ *
* @param Error $errors
*
* @return void
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/AddressBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/AddressBuilder.php
index f95968d4a1bf7..482f243f6f05d 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/AddressBuilder.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/AddressBuilder.php
@@ -41,6 +41,6 @@ private function getStreetLine($number, $street)
{
$lines = is_array($street) ? $street : [];
- return isset($lines[$number - 1]) ? $lines[$number - 1] : '';
+ return $lines[$number - 1] ?? '';
}
}
diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
index c92d62cd0bbe3..29a1f4a9c666e 100644
--- a/app/code/Magento/Store/Model/Store.php
+++ b/app/code/Magento/Store/Model/Store.php
@@ -464,6 +464,7 @@ protected function _getSession()
* Validation rules for store
*
* @return \Zend_Validate_Interface|null
+ * @throws \Zend_Validate_Exception
*/
protected function _getValidationRulesBeforeSave()
{
@@ -489,9 +490,11 @@ protected function _getValidationRulesBeforeSave()
/**
* Loading store data
*
- * @param mixed $key
- * @param string $field
- * @return $this
+ * @param mixed $key
+ * @param string $field
+ *
+ * @return $this
+ * @throws \Magento\Framework\Exception\LocalizedException
*/
public function load($key, $field = null)
{
@@ -566,6 +569,7 @@ public function setWebsite(Website $website)
* Retrieve store website
*
* @return Website|bool
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function getWebsite()
{
@@ -578,9 +582,11 @@ public function getWebsite()
/**
* Retrieve url using store configuration specific
*
- * @param string $route
- * @param array $params
- * @return string
+ * @param string $route
+ * @param array $params
+ *
+ * @return string
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function getUrl($route = '', $params = [])
{
@@ -880,8 +886,10 @@ public function getDefaultCurrency()
/**
* Set current store currency code
*
- * @param string $code
- * @return string
+ * @param string $code
+ *
+ * @return string
+ * @throws \Magento\Framework\Exception\LocalizedException
*/
public function setCurrentCurrencyCode($code)
{
@@ -966,6 +974,7 @@ public function getAllowedCurrencies()
* Retrieve store current currency
*
* @return Currency
+ * @throws \Magento\Framework\Exception\LocalizedException
*/
public function getCurrentCurrency()
{
@@ -988,6 +997,7 @@ public function getCurrentCurrency()
* Retrieve current currency rate
*
* @return float
+ * @throws \Magento\Framework\Exception\LocalizedException
*/
public function getCurrentCurrencyRate()
{
@@ -998,6 +1008,7 @@ public function getCurrentCurrencyRate()
* Retrieve root category identifier
*
* @return int
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function getRootCategoryId()
{
@@ -1023,6 +1034,7 @@ public function setGroup(Group $group)
* Retrieve group model
*
* @return Group|bool
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function getGroup()
{
@@ -1130,6 +1142,7 @@ public function getDefaultGroupId()
* Check if store can be deleted
*
* @return boolean
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function isCanDelete()
{
@@ -1145,6 +1158,7 @@ public function isCanDelete()
*
* @return boolean
* @since 100.1.0
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function isDefault()
{
@@ -1158,9 +1172,11 @@ public function isDefault()
* Retrieve current url for store
*
* @param bool $fromStore
+ *
* @return string
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function getCurrentUrl($fromStore = true)
{
@@ -1236,6 +1252,7 @@ public function isActive()
* Protect delete from non admin area
*
* @return $this
+ * @throws \Magento\Framework\Exception\LocalizedException
*/
public function beforeDelete()
{
@@ -1247,6 +1264,7 @@ public function beforeDelete()
* Rewrite in order to clear configuration cache
*
* @return $this
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function afterDelete()
{
@@ -1306,6 +1324,7 @@ public function isReadOnly($value = null)
* Retrieve store group name
*
* @return string
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function getFrontendName()
{
@@ -1338,14 +1357,14 @@ public function getIdentities()
}
/**
- * Get store path
+ * Return Store Path
*
* @return string
*/
public function getStorePath()
{
$parsedUrl = parse_url($this->getBaseUrl());
- return isset($parsedUrl['path']) ? $parsedUrl['path'] : '/';
+ return $parsedUrl['path'] ?? '/';
}
/**
diff --git a/app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js b/app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js
index a7ac45176316c..f795f99e8112d 100644
--- a/app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js
+++ b/app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js
@@ -432,7 +432,7 @@ define([
swatchProductAttributes.bindAttributeInputType();
- // @todo: refactor collapsable component
+ // @todo: refactor collapsible component
$('.attribute-popup .collapse, [data-role="advanced_fieldset-content"]')
.collapsable()
.collapse('hide');
diff --git a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminCustomerTaxClassActionGroup.xml b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminCustomerTaxClassActionGroup.xml
new file mode 100644
index 0000000000000..04d497b4b5246
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminCustomerTaxClassActionGroup.xml
@@ -0,0 +1,42 @@
+
+
+
+