Merge remote-tracking branch 'tango-ce/MAGETWO-52172' into MAGETWO-52578

Author: magicbunneh

app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php

@@ -163,6 +163,7 @@ public function initializeFromData(\Magento\Catalog\Model\Product $product, arra
         } else {
             $productOptions = [];
         }
+
         $product->addData($productData);
 
         if ($wasLockedMedia) {
@@ -307,20 +308,28 @@ protected function normalize(array $productData)
     public function mergeProductOptions($productOptions, $overwriteOptions)
     {
         if (!is_array($productOptions)) {
-            $productOptions = [];
+            return [];
         }
-        if (is_array($overwriteOptions)) {
-            $options = array_replace_recursive($productOptions, $overwriteOptions);
-            array_walk_recursive($options, function (&$item) {
-                if ($item === "") {
-                    $item = null;
+
+        if (!is_array($overwriteOptions)) {
+            return $productOptions;
+        }
+        
+        foreach ($productOptions as $index => $option) {
+            $optionId = $option['option_id'];
+
+            if (!isset($overwriteOptions[$optionId])) {
+                continue;
+            }
+
+            foreach ($overwriteOptions[$optionId] as $fieldName => $overwrite) {
+                if ($overwrite && isset($option[$fieldName]) && isset($option['default_' . $fieldName])) {
+                    $productOptions[$index][$fieldName] = $option['default_' . $fieldName];
                 }
-            });
-        } else {
-            $options = $productOptions;
+            }
         }
 
-        return $options;
+        return $productOptions;
     }
 
     /**

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php

@@ -326,25 +326,72 @@ public function testInitialize()
     public function mergeProductOptionsDataProvider()
     {
         return [
-            [
+            'options are not array, empty array is returned' => [
                 null,
                 [],
                 [],
             ],
-            [
-                ['key' => 'val'],
+            'replacement is not array, original options are returned' => [
+                ['val'],
                 null,
-                ['key' => 'val'],
+                ['val'],
             ],
-            [
-                ['key' => ['key' => 'val']],
-                ['key' => ['key' => 'val2', 'key2' => 'val2']],
-                ['key' => ['key' => 'val2', 'key2' => 'val2']],
+            'ids do not match, no replacement occurs' => [
+                [
+                    [
+                        'option_id' => '3',
+                        'key1' => 'val1',
+                        'default_key1' => 'val2'
+                    ]
+                ],
+                [4 => ['key1' => '1']],
+                [
+                    [
+                        'option_id' => '3',
+                        'key1' => 'val1',
+                        'default_key1' => 'val2'
+                    ]
+                ]
             ],
-            [
-                ['key' => ['key' => 'val', 'another_key' => 'another_value']],
-                ['key' => ['key' => 'val2', 'key2' => 'val2']],
-                ['key' => ['key' => 'val2', 'another_key' => 'another_value', 'key2' => 'val2',]],
+            'key2 is replaced, key1 is not (checkbox is not checked)' => [
+                [
+                    [
+                        'option_id' => '5',
+                        'key1' => 'val1',
+                        'key2' => 'val2',
+                        'default_key1' => 'val3',
+                        'default_key2' => 'val4'
+                    ]
+                ],
+                [5 => ['key1' => '0', 'key2' => '1']],
+                [
+                    [
+                        'option_id' => '5',
+                        'key1' => 'val1',
+                        'key2' => 'val4',
+                        'default_key1' => 'val3',
+                        'default_key2' => 'val4'
+                    ]
+                ]
+            ],
+            'key1 is replaced, key2 has no default value' => [
+                [
+                    [
+                        'option_id' => '7',
+                        'key1' => 'val1',
+                        'key2' => 'val2',
+                        'default_key1' => 'val3'
+                    ]
+                ],
+                [7 => ['key1' => '1', 'key2' => '1']],
+                [
+                    [
+                        'option_id' => '7',
+                        'key1' => 'val3',
+                        'key2' => 'val2',
+                        'default_key1' => 'val3'
+                    ]
+                ],
             ],
         ];
     }

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php

@@ -497,7 +497,7 @@ protected function getImportOptionsModalConfig()
      */
     protected function getCommonContainerConfig($sortOrder)
     {
-        return [
+        $commonContainer = [
             'arguments' => [
                 'data' => [
                     'config' => [
@@ -522,6 +522,9 @@ protected function getCommonContainerConfig($sortOrder)
                                     'label' => __('Option Title'),
                                     'component' => 'Magento_Catalog/component/static-type-input',
                                     'valueUpdate' => 'input',
+                                    'imports' => [
+                                        'optionId' => '${ $.provider }:${ $.parentScope }.option_id'
+                                    ]
                                 ],
                             ],
                         ],
@@ -531,6 +534,19 @@ protected function getCommonContainerConfig($sortOrder)
                 static::FIELD_IS_REQUIRE_NAME => $this->getIsRequireFieldConfig(40)
             ]
         ];
+
+        if ($this->locator->getProduct()->getStoreId()) {
+            $useDefaultConfig = [
+                'service' => [
+                    'template' => 'Magento_Catalog/form/element/helper/custom-option-service',
+                ]
+            ];
+            $titlePath = $this->arrayManager->findPath(static::FIELD_TITLE_NAME, $commonContainer, null)
+                . static::META_CONFIG_PATH;
+            $commonContainer = $this->arrayManager->merge($titlePath, $commonContainer, $useDefaultConfig);
+        }
+
+        return $commonContainer;
     }
 
     /**

app/code/Magento/Catalog/view/adminhtml/web/template/form/element/helper/custom-option-service.html

@@ -0,0 +1,17 @@
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="admin__field-service">
+    <input type="checkbox"
+           class="admin__control-checkbox"
+           attr="
+                id: $data.uid + '_default',
+                name: 'options_use_default[' + $data.optionId + '][' + $data.index + ']',
+                'data-form-part': $data.ns
+           "
+           ko-checked="isUseDefault">
+    <label translate="'Use Default Value'" attr="for: $data.uid + '_default'" class="admin__field-label"></label>
+</div>