Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-2927' into Tier4-Kings-PR-05-17-2024

Author: glanujnehra

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

@@ -20,6 +20,7 @@
 use Magento\Catalog\Model\Product\Initialization\Helper\ProductLinks;
 use Magento\Catalog\Model\Product\Link\Resolver as LinkResolver;
 use Magento\Catalog\Model\Product\LinkTypeProvider;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\CustomOptions;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Locale\FormatInterface;
@@ -401,6 +402,9 @@ private function overwriteValue($optionId, $option, $overwriteOptions)
                         $option['is_delete_store_title'] = 1;
                     }
                 }
+                if (CustomOptions::FIELD_TITLE_NAME === $fieldName) {
+                    $option[CustomOptions::FIELD_IS_USE_DEFAULT] = $overwrite;
+                }
             }
         }
 

app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php

@@ -14,7 +14,6 @@
 /**
  * Catalog product custom option resource model
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
@@ -25,15 +24,11 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
     protected $metadataPool;
 
     /**
-     * Store manager
-     *
      * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
-     * Currency factory
-     *
      * @var \Magento\Directory\Model\CurrencyFactory
      */
     protected $_currencyFactory;
@@ -259,12 +254,13 @@ protected function _saveValueTitles(AbstractModel $object)
                     }
                 } else {
                     // we should insert record into not default store only of if it does not exist in default store
-                    if (($storeId == Store::DEFAULT_STORE_ID && !$existInDefaultStore) ||
+                    if (((int)$storeId === Store::DEFAULT_STORE_ID && !$existInDefaultStore) ||
                         (
-                            $storeId != Store::DEFAULT_STORE_ID &&
-                            !$existInCurrentStore &&
-                            !$isDeleteStoreTitle
-                        )
+                            (int)$storeId !== Store::DEFAULT_STORE_ID &&
+                            !$isDeleteStoreTitle &&
+                            ($object->getDefaultTitle() !== null && $object->getTitle() !== $object->getDefaultTitle())
+                        ) ||
+                        ($object->getIsUseDefault() !== null && !(int)$object->getIsUseDefault())
                     ) {
                         $data = $this->_prepareDataForTable(
                             new \Magento\Framework\DataObject(

app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php

@@ -27,15 +27,11 @@
 class Value extends AbstractDb
 {
     /**
-     * Store manager
-     *
      * @var StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
-     * Currency factory
-     *
      * @var CurrencyFactory
      */
     protected $_currencyFactory;
@@ -288,8 +284,12 @@ protected function _saveValueTitles(AbstractModel $object)
                         Store::DEFAULT_STORE_ID
                     );
                     // we should insert record into not default store only of if it does not exist in default store
-                    if (($storeId == Store::DEFAULT_STORE_ID && !$existInDefaultStore)
-                        || ($storeId != Store::DEFAULT_STORE_ID && !$existInCurrentStore)
+                    if (((int)$storeId === Store::DEFAULT_STORE_ID && !$existInDefaultStore) ||
+                        (
+                            (int)$storeId !== Store::DEFAULT_STORE_ID &&
+                            ($object->getDefaultTitle() !== null && $object->getTitle() !== $object->getDefaultTitle())
+                        ) ||
+                        ($object->getIsUseDefault() !== null && !(int)$object->getIsUseDefault())
                     ) {
                         $bind = [
                             'option_type_id' => (int)$object->getId(),
@@ -456,6 +456,7 @@ public function duplicate(OptionValue $object, $oldOptionId, $newOptionId)
      *
      * @return FormatInterface
      * @deprecated 101.0.8
+     * @see Avoid direct use of ObjectManager
      */
     private function getLocaleFormatter()
     {

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

@@ -660,6 +660,7 @@ public static function mergeProductOptionsDataProvider()
                                 'default_key2' => 'val22',
                             ],
                         ],
+                        'is_use_default' => 1,
                     ],
                 ],
             ],
@@ -702,6 +703,7 @@ public static function mergeProductOptionsDataProvider()
                                 'default_key1' => 'val11',
                                 'default_title' => 'val22',
                                 'is_delete_store_title' => 1,
+                                'is_use_default' => 1,
                             ],
                         ],
                     ],