MAGETWO-54200: Wrong "gift_message_available" parameter exported

Author: duhon

app/code/Magento/CatalogImportExport/Model/Export/Product.php

@@ -84,8 +84,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      * @var string[]
      */
     protected $_indexValueAttributes = [
-        'status',
-        'gift_message_available',
+        'status'
     ];
 
     /**

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

@@ -196,7 +196,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
     protected $_indexValueAttributes = [
         'status',
         'tax_class_id',
-        'gift_message_available',
     ];
 
     /**

app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php

@@ -12,6 +12,8 @@
 use Magento\Framework\UrlInterface;
 use Magento\Framework\Locale\FormatInterface as LocaleFormat;
 use Magento\Framework\Data\Form\FormKey;
+use Magento\Catalog\Model\Product\Attribute\Source\Boolean;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Configuration provider for GiftMessage rendering on "Checkout cart" page.
@@ -94,11 +96,11 @@ public function getConfig()
         $configuration['giftMessage'] = [];
         $orderLevelGiftMessageConfiguration = (bool)$this->scopeConfiguration->getValue(
             GiftMessageHelper::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ORDER,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         );
         $itemLevelGiftMessageConfiguration = (bool)$this->scopeConfiguration->getValue(
             GiftMessageHelper::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         );
         if ($orderLevelGiftMessageConfiguration) {
             $orderMessages = $this->getOrderLevelGiftMessages();
@@ -178,9 +180,12 @@ protected function getItemLevelGiftMessages()
             $itemId = $item->getId();
             $itemLevelConfig[$itemId] = [];
             $isMessageAvailable = $item->getProduct()->getGiftMessageAvailable();
-            // use gift message product setting if it is available
-            if ($isMessageAvailable !== null) {
-                $itemLevelConfig[$itemId]['is_available'] = (bool)$isMessageAvailable;
+
+            if ($isMessageAvailable == Boolean::VALUE_USE_CONFIG || in_array($isMessageAvailable, [null, ''], true)) {
+                $itemLevelConfig[$itemId]['is_available'] = (bool)$this->scopeConfiguration->getValue(
+                    GiftMessageHelper::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS,
+                    ScopeInterface::SCOPE_STORE
+                );
             }
             $message = $this->itemRepository->get($quote->getId(), $itemId);
             if ($message) {

app/code/Magento/GiftMessage/Setup/UpgradeData.php

@@ -35,19 +35,20 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
     {
         $setup->startSetup();
 
+        /** @var \Magento\Catalog\Setup\CategorySetup $categorySetup */
+        $categorySetup = $this->categorySetupFactory->create(['setup' => $setup]);
+        $entityTypeId = $categorySetup->getEntityTypeId(Product::ENTITY);
+        $attributeSetId = $categorySetup->getAttributeSetId($entityTypeId, 'Default');
+        $attribute = $categorySetup->getAttribute($entityTypeId, 'gift_message_available');
+
         if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            /** @var \Magento\Catalog\Setup\CategorySetup $categorySetup */
-            $categorySetup = $this->categorySetupFactory->create(['setup' => $setup]);
+
             $groupName = 'Gift Options';
 
             if (!$categorySetup->getAttributeGroup(Product::ENTITY, 'Default', $groupName)) {
                 $categorySetup->addAttributeGroup(Product::ENTITY, 'Default', $groupName, 60);
             }
 
-            $entityTypeId = $categorySetup->getEntityTypeId(Product::ENTITY);
-            $attributeSetId = $categorySetup->getAttributeSetId($entityTypeId, 'Default');
-            $attribute = $categorySetup->getAttribute($entityTypeId, 'gift_message_available');
-
             $categorySetup->addAttributeToGroup(
                 $entityTypeId,
                 $attributeSetId,
@@ -57,6 +58,16 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
             );
         }
 
+        if (version_compare($context->getVersion(), '2.1.0', '<')) {
+
+            $categorySetup->updateAttribute(
+                $entityTypeId,
+                $attribute['attribute_id'],
+                'source_model',
+                'Magento\Catalog\Model\Product\Attribute\Source\Boolean'
+            );
+        }
+
         $setup->endSetup();
     }
 }

app/code/Magento/GiftMessage/Ui/DataProvider/Product/Modifier/GiftMessage.php

@@ -13,6 +13,7 @@
 use Magento\Store\Model\ScopeInterface;
 use Magento\Ui\Component\Form\Element\Checkbox;
 use Magento\Ui\Component\Form\Field;
+use Magento\Catalog\Model\Product\Attribute\Source\Boolean;
 
 /**
  * Class GiftMessageDataProvider
@@ -63,9 +64,8 @@ public function modifyData(array $data)
             $value = $data[$modelId][static::DATA_SOURCE_DEFAULT][static::FIELD_MESSAGE_AVAILABLE];
         }
 
-        if ('' === $value) {
-            $data[$modelId][static::DATA_SOURCE_DEFAULT][static::FIELD_MESSAGE_AVAILABLE] =
-                $this->getValueFromConfig();
+        if ($value == Boolean::VALUE_USE_CONFIG || $value === '' || $value === null) {
+            $data[$modelId][static::DATA_SOURCE_DEFAULT][static::FIELD_MESSAGE_AVAILABLE] = $this->getValueFromConfig();
             $data[$modelId][static::DATA_SOURCE_DEFAULT]['use_config_' . static::FIELD_MESSAGE_AVAILABLE] = '1';
         }
 
@@ -129,14 +129,8 @@ protected function customizeAllowGiftMessageField(array $meta)
                             'data' => [
                                 'config' => [
                                     'dataScope' => static::FIELD_MESSAGE_AVAILABLE,
-                                    'imports' => [
-                                        'disabled' =>
-                                            '${$.parentName}.use_config_'
-                                            . static::FIELD_MESSAGE_AVAILABLE
-                                            . ':checked',
-                                    ],
+                                    'component' => 'Magento_Ui/js/form/element/single-checkbox-use-config',
                                     'additionalClasses' => 'admin__field-x-small',
-                                    'formElement' => Checkbox::NAME,
                                     'componentType' => Field::NAME,
                                     'prefer' => 'toggle',
                                     'valueMap' => [
@@ -160,6 +154,12 @@ protected function customizeAllowGiftMessageField(array $meta)
                                         'false' => '0',
                                         'true' => '1',
                                     ],
+                                    'exports' => [
+                                        'checked' => '${$.parentName}.' . static::FIELD_MESSAGE_AVAILABLE . ':isUseConfig',
+                                    ],
+                                    'imports' => [
+                                        'disabled' => '${$.parentName}.' . static::FIELD_MESSAGE_AVAILABLE . ':isUseDefault',
+                                    ],
                                 ],
                             ],
                         ],