MAGETWO-54200: Wrong "gift_message_available" parameter exported

Author: duhon

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

@@ -12,8 +12,6 @@
 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.
@@ -96,11 +94,11 @@ public function getConfig()
         $configuration['giftMessage'] = [];
         $orderLevelGiftMessageConfiguration = (bool)$this->scopeConfiguration->getValue(
             GiftMessageHelper::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ORDER,
-            ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         $itemLevelGiftMessageConfiguration = (bool)$this->scopeConfiguration->getValue(
             GiftMessageHelper::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS,
-            ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         if ($orderLevelGiftMessageConfiguration) {
             $orderMessages = $this->getOrderLevelGiftMessages();
@@ -180,13 +178,8 @@ protected function getItemLevelGiftMessages()
             $itemId = $item->getId();
             $itemLevelConfig[$itemId] = [];
             $isMessageAvailable = $item->getProduct()->getGiftMessageAvailable();
-
-            if ($isMessageAvailable == Boolean::VALUE_USE_CONFIG) {
-                $itemLevelConfig[$itemId]['is_available'] = (bool)$this->scopeConfiguration->getValue(
-                    GiftMessageHelper::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS,
-                    ScopeInterface::SCOPE_STORE
-                );
-            } else {
+            // use gift message product setting if it is available
+            if ($isMessageAvailable !== null) {
                 $itemLevelConfig[$itemId]['is_available'] = (bool)$isMessageAvailable;
             }
             $message = $this->itemRepository->get($quote->getId(), $itemId);

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

@@ -13,7 +13,6 @@
 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
@@ -58,14 +57,15 @@ public function __construct(
     public function modifyData(array $data)
     {
         $modelId = $this->locator->getProduct()->getId();
-        $value = Boolean::VALUE_USE_CONFIG;
+        $value = '';
 
         if (isset($data[$modelId][static::DATA_SOURCE_DEFAULT][static::FIELD_MESSAGE_AVAILABLE])) {
             $value = $data[$modelId][static::DATA_SOURCE_DEFAULT][static::FIELD_MESSAGE_AVAILABLE];
         }
 
-        if ($value == Boolean::VALUE_USE_CONFIG) {
-            $data[$modelId][static::DATA_SOURCE_DEFAULT][static::FIELD_MESSAGE_AVAILABLE] = $this->getValueFromConfig();
+        if ('' === $value) {
+            $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,8 +129,14 @@ protected function customizeAllowGiftMessageField(array $meta)
                             'data' => [
                                 'config' => [
                                     'dataScope' => static::FIELD_MESSAGE_AVAILABLE,
-                                    'component' => 'Magento_Ui/js/form/element/single-checkbox-use-config',
+                                    'imports' => [
+                                        'disabled' =>
+                                            '${$.parentName}.use_config_'
+                                            . static::FIELD_MESSAGE_AVAILABLE
+                                            . ':checked',
+                                    ],
                                     'additionalClasses' => 'admin__field-x-small',
+                                    'formElement' => Checkbox::NAME,
                                     'componentType' => Field::NAME,
                                     'prefer' => 'toggle',
                                     'valueMap' => [
@@ -154,12 +160,6 @@ 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',
-                                    ],
                                 ],
                             ],
                         ],