From 522f1da7635323135484a09d490ad33b8c7df946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vinicius=20Bordinh=C3=A3o?= Date: Mon, 4 Jan 2021 17:12:33 -0300 Subject: [PATCH 1/5] ISSUE-23181: Including new entries for including the weight when creating simple products through configurable. --- .../Edit/Tab/Variations/Config/Matrix.php | 12 ++ ...nfigurableProductWithWeightActionGroup.xml | 80 +++++++++++++ ...reateProductConfigurationsPanelSection.xml | 2 + ...onfigurableProductWithWeightCreateTest.xml | 81 +++++++++++++ .../product/edit/attribute/steps/bulk.phtml | 108 ++++++++++++++++++ .../catalog/product/edit/super/wizard.phtml | 2 + .../adminhtml/web/js/variations/steps/bulk.js | 11 +- .../web/js/variations/steps/summary.js | 20 +++- .../adminhtml/web/js/variations/variations.js | 9 ++ 9 files changed, 321 insertions(+), 4 deletions(-) create mode 100644 app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/CreateConfigurableProductWithWeightActionGroup.xml create mode 100644 app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest/AdminConfigurableProductWithWeightCreateTest.xml diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php index e64a92a8bd6f4..a393a0670a43e 100644 --- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php +++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php @@ -9,6 +9,7 @@ use Magento\Catalog\Model\Locator\LocatorInterface; use Magento\Catalog\Model\Product; use Magento\Framework\Exception\NoSuchEntityException; +use Magento\Directory\Helper\Data as DirectoryHelper; /** * Product variations matrix block @@ -75,6 +76,7 @@ class Matrix extends \Magento\Backend\Block\Template * @param \Magento\Catalog\Helper\Image $image * @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency * @param LocatorInterface $locator + * @param DirectoryHelper $directoryHelper * @param array $data */ public function __construct( @@ -86,6 +88,7 @@ public function __construct( \Magento\Catalog\Helper\Image $image, \Magento\Framework\Locale\CurrencyInterface $localeCurrency, LocatorInterface $locator, + DirectoryHelper $directoryHelper, array $data = [] ) { parent::__construct($context, $data); @@ -96,6 +99,7 @@ public function __construct( $this->localeCurrency = $localeCurrency; $this->image = $image; $this->locator = $locator; + $this->directoryHelper = $directoryHelper; } /** @@ -443,4 +447,12 @@ private function prepareAttributes( return [$attributes, $variationOptions]; } + + /** + * @return string + */ + public function getWeightUnit() + { + return $this->directoryHelper->getWeightUnit(); + } } diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/CreateConfigurableProductWithWeightActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/CreateConfigurableProductWithWeightActionGroup.xml new file mode 100644 index 0000000000000..cd713b34ce59e --- /dev/null +++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/CreateConfigurableProductWithWeightActionGroup.xml @@ -0,0 +1,80 @@ + + + + + + + Goes to the Admin Product grid page. Creates a Configurable Product with weight using the default Product Options. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml index 92e2450ef4f3d..38830226856fc 100644 --- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml +++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml @@ -60,5 +60,7 @@ + + diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest/AdminConfigurableProductWithWeightCreateTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest/AdminConfigurableProductWithWeightCreateTest.xml new file mode 100644 index 0000000000000..b48d3337d8707 --- /dev/null +++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest/AdminConfigurableProductWithWeightCreateTest.xml @@ -0,0 +1,81 @@ + + + + + + + + + <description value="admin should be able to create a configurable product with attributes"/> + <severity value="BLOCKER"/> + <testCaseId value="MC-84"/> + <group value="ConfigurableProduct"/> + </annotations> + + <before> + <createData entity="ApiCategory" stepKey="createCategory"/> + <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/> + </before> + + <after> + <deleteData createDataKey="createCategory" stepKey="deleteCategory"/> + <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/> + </after> + + <!-- Create a configurable product via the UI --> + <actionGroup ref="CreateConfigurableProductWithWeightActionGroup" stepKey="createProduct"> + <argument name="product" value="_defaultProduct"/> + <argument name="category" value="$$createCategory$$"/> + </actionGroup> + + <!-- assert color configurations on the admin create product page --> + <dontSee selector="{{AdminProductFormConfigurationsSection.variationLabel}}" stepKey="seeLabelNotVisible"/> + <seeNumberOfElements selector="{{AdminProductFormConfigurationsSection.currentVariationsRows}}" userInput="3" stepKey="seeNumberOfRows"/> + <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{colorProductAttribute1.name}}" stepKey="seeAttributeName1InField"/> + <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeAttributeName2InField"/> + <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{colorProductAttribute3.name}}" stepKey="seeAttributeName3InField"/> + <see selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" userInput="{{colorProductAttribute1.name}}" stepKey="seeAttributeSku1InField"/> + <see selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeAttributeSku2InField"/> + <see selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" userInput="{{colorProductAttribute3.name}}" stepKey="seeAttributeSku3InField"/> + <see selector="{{AdminProductFormConfigurationsSection.currentVariationsPriceCells}}" userInput="{{colorProductAttribute1.price}}" stepKey="seeUniquePrice1InField"/> + <see selector="{{AdminProductFormConfigurationsSection.currentVariationsPriceCells}}" userInput="{{colorProductAttribute2.price}}" stepKey="seeUniquePrice2InField"/> + <see selector="{{AdminProductFormConfigurationsSection.currentVariationsPriceCells}}" userInput="{{colorProductAttribute3.price}}" stepKey="seeUniquePrice3InField"/> + <see selector="{{AdminProductFormConfigurationsSection.currentVariationsQuantityCells}}" userInput="{{colorProductAttribute.attribute_quantity}}" stepKey="seeQuantityInField"/> + + <!-- assert storefront category list page --> + <amOnPage url="/" stepKey="amOnStorefront"/> + <waitForPageLoad stepKey="waitForPageLoad3"/> + <click userInput="$$createCategory.name$$" stepKey="clickOnCategoryName"/> + <waitForPageLoad stepKey="waitForPageLoad4"/> + <see userInput="{{_defaultProduct.name}}" stepKey="assertProductPresent"/> + <see userInput="{{colorProductAttribute1.price}}" stepKey="assertProductPricePresent"/> + + <!-- assert storefront product details page --> + <click userInput="{{_defaultProduct.name}}" stepKey="clickOnProductName"/> + <waitForPageLoad stepKey="waitForPageLoad5"/> + <seeInTitle userInput="{{_defaultProduct.name}}" stepKey="assertProductNameTitle"/> + <see userInput="{{_defaultProduct.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/> + <see userInput="{{colorProductAttribute1.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertProductPrice"/> + <see userInput="{{_defaultProduct.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/> + <see selector="{{StorefrontProductInfoMainSection.productAttributeTitle1}}" userInput="{{colorProductAttribute.default_label}}" stepKey="seeColorAttributeName1"/> + <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute1.name}}" stepKey="seeInDropDown1"/> + <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeInDropDown2"/> + <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute3.name}}" stepKey="seeInDropDown3"/> + + <!-- Add configurable product to the cart with selected first option --> + <selectOption userInput="{{colorProductAttribute1.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOptionForAddingToCart"/> + <click selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="clickAddToCart"/> + <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" stepKey="waitForSuccessMessage"/> + + <!-- assert storefront product checkout page --> + <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="clickOnMiniCartCheckoutButton"/> + + <waitForElement selector="{{CheckoutShippingSection.shippingTab}}" time="30" stepKey="waitForShippingSectionLoaded"/> + </test> +</tests> diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml index 6cd930978c85f..1913b4cd35e67 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml @@ -753,6 +753,114 @@ $jsonHelper = $block->getData('jsonHelper'); </div> </div> </div> + + <div data-bind="with: sections().weight" class="steps-wizard-section"> + <div data-role="section"> + <div class="steps-wizard-section-title"> + <span><?= $block->escapeHtml(__('Weight')) ?></span> + </div> + <ul class="steps-wizard-section-list"> + <li> + <div class="admin__field admin__field-option"> + <input type="radio" + id="apply-single-weight-radio" + class="admin__control-radio" + value="single" + data-bind="checked: type" /> + <label for="apply-single-weight-radio" class="admin__field-label"> + <span><?= $block->escapeHtml(__('Apply single weight to each SKUs')) ?></span> + </label> + </div> + </li> + <li> + <div class="admin__field admin__field-option"> + <input type="radio" + id="apply-unique-weight-radio" + class="admin__control-radio" + value="each" + data-bind="checked: type" /> + <label for="apply-unique-weight-radio" class="admin__field-label"> + <span><?= $block->escapeHtml(__('Apply unique weight by attribute to each SKU')) ?></span> + </label> + </div> + </li> + <li> + <div class="admin__field admin__field-option"> + <input type="radio" + id="skip-weight-radio" + class="admin__control-radio" + value="none" + checked + data-bind="checked: type" /> + <label for="skip-weight-radio" class="admin__field-label"> + <span><?= $block->escapeHtml(__('Skip weight at this time')) ?></span> + </label> + </div> + </li> + </ul> + + <form data-role="attributes-values-form"> + <fieldset class="admin__fieldset bulk-attribute-values" data-bind="visible: type() == 'single'"> + <div class="admin__field _required"> + <label for="apply-single-weight-input" class="admin__field-label"> + <span><?= $block->escapeHtml(__('Weight')) ?></span> + </label> + <div class="admin__field-control"> + <div class="admin__control-addon"> + <input type="text" + id="apply-single-weight-input" + class="admin__control-text required-entry validate-zero-or-greater" + data-bind="value: value, uniqueName: true" /> + <label for="apply-single-weight-input" class="admin__addon-suffix"> + <span data-bind="text: unit"></span> + </label> + </div> + </div> + </div> + </fieldset> + </form> + + <div data-bind="visible: type() == 'each'"> + <fieldset class="admin__fieldset bulk-attribute-values"> + <div class="admin__field _required"> + <label for="apply-single-weight-input-qty" class="admin__field-label"> + <span><?= $block->escapeHtml(__('Select attribute')) ?></span> + </label> + <div class="admin__field-control"> + <select id="apply-single-weight-input-qty" class="admin__control-select" data-bind=" + options: $parent.attributes, + optionsText: 'label', + value: attribute, + optionsCaption: 'Select'"></select> + </div> + </div> + </fieldset> + <form data-role="attributes-values-form"> + <fieldset class="admin__fieldset bulk-attribute-values" data-bind="if:attribute"> + <!-- ko foreach: attribute().chosen --> + <div class="admin__field _required"> + <label data-bind="attr: {for: 'apply-weight-input-' + $index()}" class="admin__field-label"> + <span data-bind="text:label"></span> + </label> + <div class="admin__field-control"> + <div class="admin__control-addon"> + <input id="apply-single-weight-input-value" + class="admin__control-text required-entry validate-zero-or-greater" type="text" + data-bind="value:sections()[$parent.label], uniqueName: true, + attr: {id: 'apply-weight-input-' + $index()}"/> + <label data-bind="attr: {for: 'apply-weight-input-' + $index()}" + class="admin__addon-suffix"> + <span data-bind="text: $parent.unit"></span> + </label> + </div> + </div> + </div> + <!-- /ko --> + </fieldset> + </form> + </div> + </div> + </div> </form> </div> diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml index 2cd5a32ce5449..d1151772c35df 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml @@ -13,6 +13,7 @@ $jsonHelper = $block->getData('jsonHelper'); $productMatrix = $block->getProductMatrix(); $attributes = $block->getProductAttributes(); $currencySymbol = $block->getCurrencySymbol(); +$weightUnit = $block->getWeightUnit(); ?> <div class="<?= /* @noEscape */ $block->getData('config/dataScope') ?>" data-role="step-wizard-dialog" @@ -62,6 +63,7 @@ $currencySymbol = $block->getCurrencySymbol(); "productUrl": "<?= /* @noEscape */ $block->getUrl('catalog/product/edit', ['id' => '%id%']) ?>", "variations": <?= /* @noEscape */ $jsonHelper->jsonEncode($productMatrix) ?>, "currencySymbol": "<?= /* @noEscape */ $currencySymbol ?>", + "weightUnit": "<?= /* @noEscape */ $weightUnit ?>", "attributeSetCreationUrl": "<?= /* @noEscape */ $block->getUrl('*/product_set/save') ?>" } } diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/bulk.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/bulk.js index eed887037bc96..d73384c490f43 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/bulk.js +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/bulk.js @@ -67,11 +67,19 @@ define([ type: ko.observable('none'), value: ko.observable(), attribute: ko.observable() + }, + weight: { + label: 'weight', + type: ko.observable('none'), + value: ko.observable(), + attribute: ko.observable(), + unit: '' } }); this.variationsComponent(function (variationsComponent) { this.sections().price.currencySymbol = variationsComponent.getCurrencySymbol(); + this.sections().weight.unit = variationsComponent.getWeightUnit(); }.bind(this)); /** @@ -81,7 +89,8 @@ define([ return { images: new this.makeImages(null), price: this.price, - quantity: this.quantity + quantity: this.quantity, + weight: this.weight }; }.bind(this); diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/summary.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/summary.js index ac952ca531a34..711f57b69d92a 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/summary.js +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/summary.js @@ -51,7 +51,13 @@ define([ } }), attributes: [], - attributesName: [$.mage.__('Images'), $.mage.__('SKU'), $.mage.__('Quantity'), $.mage.__('Price')], + attributesName: [ + $.mage.__('Images'), + $.mage.__('SKU'), + $.mage.__('Quantity'), + $.mage.__('Weight'), + $.mage.__('Price') + ], sections: [], gridTemplate: 'Magento_ConfigurableProduct/variations/steps/summary-grid', quantityFieldName: 'quantity' @@ -100,7 +106,7 @@ define([ this.variations = []; _.each(variations, function (options) { - var product, images, sku, name, quantity, price, variation, + var product, images, sku, name, quantity, price, variation, weight, productId = this.variationsComponent().getProductIdByOptions(options); if (productId) { @@ -129,6 +135,13 @@ define([ if (productId && !images.file) { images = product.images; } + + weight = getSectionValue('weight', options); + + if(!weight && productWeight.length > 0) { + weight = productWeight; + } + variation = { options: options, images: images, @@ -136,7 +149,7 @@ define([ name: name, price: price, productId: productId, - weight: productWeight, + weight: weight, editable: true }; variation[this.quantityFieldName] = quantity; @@ -199,6 +212,7 @@ define([ _.each(variation.options, function (option) { row.push(option.label); }); + row.push(variation.weight); row.push(this.variationsComponent().getCurrencySymbol() + ' ' + variation.price); return row; diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js index 6e82fd42692fc..b1deede387f5c 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js @@ -220,6 +220,7 @@ define([ productId: variation.productId || null, name: variation.name || variation.sku, priceCurrency: this.currencySymbol, + unitWeight: this.unitWeight, weight: variation.weight, attribute: JSON.stringify(attributes), variationKey: this.getVariationKey(variation.options), @@ -379,6 +380,14 @@ define([ return this.currencySymbol; }, + /** + * Get unit weight + * @returns {String} + */ + getWeightUnit: function () { + return this.weightUnit; + }, + /** * Chose action for the form save button */ From 417d3aee53dfeeae5c6116c4cbef0bcc8fc40a87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vinicius=20Bordinh=C3=A3o?= <vinicius.bordinhao@blueacornici.com> Date: Mon, 4 Jan 2021 20:13:49 -0300 Subject: [PATCH 2/5] ISSUE-23181: Removing duplicates stories between the new acceptance test and the standard one. --- .../AdminConfigurableProductWithWeightCreateTest.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest/AdminConfigurableProductWithWeightCreateTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest/AdminConfigurableProductWithWeightCreateTest.xml index b48d3337d8707..418eca98aa963 100644 --- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest/AdminConfigurableProductWithWeightCreateTest.xml +++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest/AdminConfigurableProductWithWeightCreateTest.xml @@ -11,10 +11,10 @@ <annotations> <features value="ConfigurableProduct"/> <stories value="Create, Read, Update, Delete"/> - <title value="admin should be able to create a configurable product with attributes"/> - <description value="admin should be able to create a configurable product with attributes"/> - <severity value="BLOCKER"/> - <testCaseId value="MC-84"/> + <title value="admin should be able to create a configurable product assigning weight to child products with attributes"/> + <description value="admin should be able to create a configurable product assigning weight to child products with attributes"/> + <severity value="AVERAGE"/> + <testCaseId value="MC-17466"/> <group value="ConfigurableProduct"/> </annotations> From 0d09786c6953b8012381204fe47de4ef0d439f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vinicius=20Bordinh=C3=A3o?= <vinicius.bordinhao@blueacornici.com> Date: Mon, 4 Jan 2021 20:54:32 -0300 Subject: [PATCH 3/5] ISSUE-23181: Adding property that was missing and breaking static tests. --- .../Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php index a393a0670a43e..631b4fd9434fa 100644 --- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php +++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php @@ -67,6 +67,11 @@ class Matrix extends \Magento\Backend\Block\Template */ protected $locator; + /** + * @var DirectoryHelper + */ + protected $directoryHelper; + /** * @param \Magento\Backend\Block\Template\Context $context * @param \Magento\ConfigurableProduct\Model\Product\Type\Configurable $configurableType From 02c41491c05b71e9b0826a02e9fa0c6f1966a3fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vinicius=20Bordinh=C3=A3o?= <vinicius.bordinhao@blueacornici.com> Date: Tue, 5 Jan 2021 00:58:11 -0300 Subject: [PATCH 4/5] ISSUE-23181: Adjusting 'Magento\Configurable' module dependency --- app/code/Magento/ConfigurableProduct/composer.json | 3 ++- app/code/Magento/ConfigurableProduct/etc/module.xml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json index 7b1b1a18416f5..acfc627863d86 100644 --- a/app/code/Magento/ConfigurableProduct/composer.json +++ b/app/code/Magento/ConfigurableProduct/composer.json @@ -16,7 +16,8 @@ "magento/module-media-storage": "*", "magento/module-quote": "*", "magento/module-store": "*", - "magento/module-ui": "*" + "magento/module-ui": "*", + "magento/module-directory": "*" }, "suggest": { "magento/module-msrp": "*", diff --git a/app/code/Magento/ConfigurableProduct/etc/module.xml b/app/code/Magento/ConfigurableProduct/etc/module.xml index e81553191f867..49a5f0ee27d19 100644 --- a/app/code/Magento/ConfigurableProduct/etc/module.xml +++ b/app/code/Magento/ConfigurableProduct/etc/module.xml @@ -14,6 +14,7 @@ <module name="Magento_Sales"/> <module name="Magento_Quote"/> <module name="Magento_Checkout"/> + <module name="Magento_Directory"/> </sequence> </module> </config> From d48bf69cd236927116996c35ea4a4e1b67062e40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vinicius=20Bordinh=C3=A3o?= <vinicius.bordinhao@blueacornici.com> Date: Tue, 5 Jan 2021 09:55:44 -0300 Subject: [PATCH 5/5] ISSUE-23181: Refactoring Code style for Javascript files. --- .../view/adminhtml/web/js/variations/steps/summary.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/summary.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/summary.js index 711f57b69d92a..4c3e37682ee97 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/summary.js +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/summary.js @@ -138,7 +138,7 @@ define([ weight = getSectionValue('weight', options); - if(!weight && productWeight.length > 0) { + if (!weight && productWeight.length > 0) { weight = productWeight; }