🔃 [Magento Community Engineering] Community Contributions - 2.3-develop latest changes

Accepted Community Pull Requests:
 - #25597: Resolve No margin between checkbox and icon when choose category in condition in Cart/Catalog Rule issue25596 (by @edenduong)
 - #25600: Log InvalidRequestException from FrontController validation failure to debug log (by @marcusirgens)
 - #25606: Fix JS error on cart configure page for configurable products (by @ihor-sviziev)
 - #25080: Fixed: Undefined index store_view_code. (by @maheshWebkul721)
 - #25585: M2C-21765 Output N/A if attribute has no value in Compare List (by @ptylek)


Fixed GitHub Issues:
 - #25596: No margin between checkbox and icon when choose category in condition in Cart/Catalog Rule (reported by @edenduong) has been fixed in #25597 by @edenduong in 2.3-develop branch
   Related commits:
     1. 9f5fece

 - #25601: [Configurable] JS error on product page (reported by @ihor-sviziev) has been fixed in #25606 by @ihor-sviziev in 2.3-develop branch
   Related commits:
     1. d26f8da

 - #25069: Not clear code in product custom options import (reported by @pusachev) has been fixed in #25080 by @maheshWebkul721 in 2.3-develop branch
   Related commits:
     1. 0f796cc
     2. 2138e68
     3. 6ea86bb
     4. 3e513d0
     5. a7f7d0a
     6. bf8b1e4

 - #25008: Issue in compare page (reported by @deepaktiwariwebkul) has been fixed in #25585 by @ptylek in 2.3-develop branch
   Related commits:
     1. 9ea1d3f
     2. 1f010f1

Author: magento-engcom-team

app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml

@@ -130,6 +130,8 @@
                                             default :?>
                                                 <?php if (is_string($block->getProductAttributeValue($item, $attribute))) :?>
                                                     <?= /* @noEscape */ $helper->productAttribute($item, $block->getProductAttributeValue($item, $attribute), $attribute->getAttributeCode()) ?>
+                                                <?php else : ?>
+                                                    <?=  $block->escapeHtml($helper->productAttribute($item, $block->getProductAttributeValue($item, $attribute), $attribute->getAttributeCode())) ?>
                                                 <?php endif; ?>
                                                 <?php break;
                                         } ?>

app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php

@@ -2086,7 +2086,9 @@ protected function _parseCustomOptions($rowData)
                     }
                 }
             }
-            $options[$name][$k]['_custom_option_store'] = $rowData[Product::COL_STORE_VIEW_CODE];
+            if (isset($rowData[Product::COL_STORE_VIEW_CODE])) {
+                $options[$name][$k][self::COLUMN_STORE] = $rowData[Product::COL_STORE_VIEW_CODE];
+            }
             $k++;
         }
         $rowData['custom_options'] = $options;

app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/OptionTest.php

@@ -776,6 +776,77 @@ public function testValidateAmbiguousData(
         $this->assertEquals($errors, $resultErrors);
     }
 
+    /**
+     * Test for row without store view code field
+     * @param array $rowData
+     * @param array $responseData
+     *
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::_parseCustomOptions
+     * @dataProvider validateRowStoreViewCodeFieldDataProvider
+     */
+    public function testValidateRowDataForStoreViewCodeField($rowData, $responseData)
+    {
+        $reflection = new \ReflectionClass(\Magento\CatalogImportExport\Model\Import\Product\Option::class);
+        $reflectionMethod = $reflection->getMethod('_parseCustomOptions');
+        $reflectionMethod->setAccessible(true);
+        $result = $reflectionMethod->invoke($this->model, $rowData);
+        $this->assertEquals($responseData, $result);
+    }
+
+    /**
+     * Data provider for test of method _parseCustomOptions
+     *
+     * @return array
+     */
+    public function validateRowStoreViewCodeFieldDataProvider()
+    {
+        return [
+            'with_store_view_code' => [
+                '$rowData' => [
+                    'store_view_code' => '',
+                    'custom_options' =>
+                        'name=Test Field Title,type=field,required=1;sku=1-text,price=0,price_type=fixed'
+                ],
+                '$responseData' => [
+                    'store_view_code' => '',
+                    'custom_options' => [
+                        'Test Field Title' => [
+                            [
+                                'name' => 'Test Field Title',
+                                'type' => 'field',
+                                'required' => '1',
+                                'sku' => '1-text',
+                                'price' => '0',
+                                'price_type' => 'fixed',
+                                '_custom_option_store' => ''
+                            ]
+                        ]
+                    ]
+                ],
+            ],
+            'without_store_view_code' => [
+                '$rowData' => [
+                    'custom_options' =>
+                        'name=Test Field Title,type=field,required=1;sku=1-text,price=0,price_type=fixed'
+                ],
+                '$responseData' => [
+                    'custom_options' => [
+                        'Test Field Title' => [
+                            [
+                                'name' => 'Test Field Title',
+                                'type' => 'field',
+                                'required' => '1',
+                                'sku' => '1-text',
+                                'price' => '0',
+                                'price_type' => 'fixed'
+                            ]
+                        ]
+                    ]
+                ],
+            ]
+        ];
+    }
+
     /**
      * Data provider of row data and errors
      *

app/code/Magento/Msrp/view/base/web/js/msrp.js

@@ -352,8 +352,11 @@ define([
             $(this.options.mapInfoLinks).show();
 
             if (useDefaultPrice || !this.wasOpened) {
-                this.$popup.find(this.options.msrpLabelId).html(options.msrpPrice);
-                this.$popup.find(this.options.priceLabelId).html(options.realPrice);
+                if (this.$popup) {
+                    this.$popup.find(this.options.msrpLabelId).html(options.msrpPrice);
+                    this.$popup.find(this.options.priceLabelId).html(options.realPrice);
+                }
+
                 $(this.options.displayPriceElement).html(msrpPrice);
                 this.wasOpened = true;
             }

app/design/adminhtml/Magento/backend/web/css/styles-old.less

@@ -1827,6 +1827,10 @@
         background-image: url(../images/fam_application_form_delete.png);
     }
 
+    .x-tree-node .x-tree-node-el input[type=checkbox] {
+        margin-left: 3px;
+    }
+
     //
     //  Styles for "js" tooltip with positionings
     //  --------------------------------------
@@ -3958,15 +3962,15 @@
         .grid tr.headings th > span {
             white-space: normal;
         }
-        
+
         .field {
             &.field-subscription {
                .admin__field-label {
                     margin-left: 10px;
                     float: none;
                     cursor: pointer;
-               } 
-                
+               }
+
                .admin__field-control {
                     float: left;
                     width: auto;

lib/internal/Magento/Framework/App/FrontController.php

@@ -1,7 +1,5 @@
 <?php
 /**
- * Front controller responsible for dispatching application requests
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -17,6 +15,8 @@
 use Magento\Framework\App\Request\Http as HttpRequest;
 
 /**
+ * Front controller responsible for dispatching application requests
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class FrontController implements FrontControllerInterface
@@ -116,6 +116,8 @@ public function dispatch(RequestInterface $request)
     }
 
     /**
+     * Process (validate and dispatch) the incoming request
+     *
      * @param HttpRequest $request
      * @param ActionInterface $actionInstance
      * @throws NotFoundException
@@ -141,7 +143,8 @@ private function processRequest(
                 //Validation failed - processing validation results.
                 $this->logger->debug(
                     'Request validation failed for action "'
-                    .get_class($actionInstance) .'"'
+                    . get_class($actionInstance) . '"',
+                    ["exception" => $exception]
                 );
                 $result = $exception->getReplaceResult();
                 if ($messages = $exception->getMessages()) {