MAGETWO-62627: [Backport] - Gift message appearing at product level when gift message is disable - for 2.0

DianaRusin · DianaRusin · commit e1407c302f9f · 2017-07-17T16:56:05.000+03:00
diff --git a/app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php b/app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php
@@ -120,6 +120,7 @@ public function getConfig()
         $configuration['baseUrl'] = $store->isFrontUrlSecure()
                 ? $store->getBaseUrl(UrlInterface::URL_TYPE_LINK, true)
                 : $store->getBaseUrl(UrlInterface::URL_TYPE_LINK, false);
+
         return $configuration;
     }
 
@@ -161,6 +162,7 @@ protected function isQuoteVirtual()
     protected function getOrderLevelGiftMessages()
     {
         $cartId = $this->checkoutSession->getQuoteId();
+        
         return $this->cartRepository->get($cartId);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,7 @@ public function getConfig()`
`120`	`120`	`$configuration['baseUrl'] = $store->isFrontUrlSecure()`
`121`	`121`	`? $store->getBaseUrl(UrlInterface::URL_TYPE_LINK, true)`
`122`	`122`	`: $store->getBaseUrl(UrlInterface::URL_TYPE_LINK, false);`
	`123`	`+`
`123`	`124`	`return $configuration;`
`124`	`125`	`}`
`125`	`126`
`@@ -161,6 +162,7 @@ protected function isQuoteVirtual()`
`161`	`162`	`protected function getOrderLevelGiftMessages()`
`162`	`163`	`{`
`163`	`164`	`$cartId = $this->checkoutSession->getQuoteId();`
	`165`	`+`
`164`	`166`	`return $this->cartRepository->get($cartId);`
`165`	`167`	`}`
`166`	`168`