Merge pull request #3219 from magento-tsg-csl3/2.2-develop-pr3

viktym · web-flow · commit 4557bfe2529e · 2018-09-27T11:50:56.000+03:00
[TSG-CSL3] Backporting 2.2 (pr3)
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php
@@ -289,6 +289,7 @@ protected function customizeCategoriesField(array $meta)
                                     'source' => 'product_details',
                                     'displayArea' => 'insideGroup',
                                     'sortOrder' => 20,
+                                    'dataScope' => $fieldCode,
                                 ],
                             ],
                         ]
diff --git a/app/design/frontend/Magento/luma/Magento_Rma/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Rma/web/css/source/_module.less
@@ -40,6 +40,14 @@
         &:extend(.abs-status all);
     }
 
+    .table-wrapper.table-returns {
+        .returns-details {
+            &.hidden {
+                display: none;
+            }
+        }
+    }
+
     .block-returns-comments {
         .returns-comments {
             dt,

Original file line number	Diff line number	Diff line change
`@@ -289,6 +289,7 @@ protected function customizeCategoriesField(array $meta)`
`289`	`289`	`'source' => 'product_details',`
`290`	`290`	`'displayArea' => 'insideGroup',`
`291`	`291`	`'sortOrder' => 20,`
	`292`	`+ 'dataScope' => $fieldCode,`
`292`	`293`	`],`
`293`	`294`	`],`
`294`	`295`	`]`