update

-see #4266
OpenMage · Nov 12, 2024 · c53f177 · c53f177
1 parent ca8908a
commit c53f177
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 17 deletions.
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php
@@ -77,7 +77,7 @@ protected function _getGiftmessageSaveModel()
 
     public function canDisplayGiftmessage(): bool
     {
-        if (!Mage::helper('core')->isModuleOutputEnabled('Mage_GiftMessage')) {
+        if (!$this->isModuleOutputEnabled('Mage_GiftMessage')) {
             return false;
         }
         /** @var Mage_GiftMessage_Helper_Message $helper */

diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php
@@ -128,7 +128,7 @@ public function getItemOrigPrice($item)
      */
     public function isGiftMessagesAvailable($item = null)
     {
-        if (!Mage::helper('core')->isModuleOutputEnabled('Mage_GiftMessage')) {
+        if (!$this->isModuleOutputEnabled('Mage_GiftMessage')) {
             return false;
         }
         /** @var Mage_GiftMessage_Helper_Message $helper */
@@ -149,7 +149,7 @@ public function isGiftMessagesAvailable($item = null)
      */
     public function isAllowedForGiftMessage($item)
     {
-        if (!Mage::helper('core')->isModuleOutputEnabled('Mage_GiftMessage')) {
+        if (!$this->isModuleOutputEnabled('Mage_GiftMessage')) {
             return false;
         }
         return Mage::getSingleton('adminhtml/giftmessage_save')->getIsAllowedQuoteItem($item);

diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php
@@ -279,7 +279,7 @@ public function getHtmlId()
      */
     public function canDisplayGiftmessage()
     {
-        if (!Mage::helper('core')->isModuleOutputEnabled('Mage_GiftMessage')) {
+        if (!$this->isModuleOutputEnabled('Mage_GiftMessage')) {
             return false;
         }
         /** @var Mage_GiftMessage_Helper_Message $helper */

diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php
@@ -204,7 +204,7 @@ public function getHtmlId()
      */
     public function canDisplayGiftmessage()
     {
-        if (!Mage::helper('core')->isModuleOutputEnabled('Mage_GiftMessage')) {
+        if (!$this->isModuleOutputEnabled('Mage_GiftMessage')) {
             return false;
         }
         /** @var Mage_GiftMessage_Helper_Message $helper */

diff --git a/app/code/core/Mage/Rss/Block/Order/Details.php b/app/code/core/Mage/Rss/Block/Order/Details.php
@@ -27,7 +27,7 @@ public function __construct()
 
     public function getGiftMessageItem(Mage_Sales_Model_Order_Item $item): ?Mage_GiftMessage_Model_Message
     {
-        if (!Mage::helper('core')->isModuleOutputEnabled('Mage_GiftMessage')) {
+        if (!$this->isModuleOutputEnabled('Mage_GiftMessage')) {
             return null;
         }
         /** @var Mage_GiftMessage_Helper_Message $helper */
@@ -40,7 +40,7 @@ public function getGiftMessageItem(Mage_Sales_Model_Order_Item $item): ?Mage_Gif
     public function getGiftMessageOrder(): ?Mage_GiftMessage_Model_Message
     {
         $order = $this->getOrder();
-        if (!Mage::helper('core')->isModuleOutputEnabled('Mage_GiftMessage')) {
+        if (!$this->isModuleOutputEnabled('Mage_GiftMessage')) {
             return null;
         }
         /** @var Mage_GiftMessage_Helper_Message $helper */

diff --git a/app/code/core/Mage/Sales/Block/Order/Creditmemo.php b/app/code/core/Mage/Sales/Block/Order/Creditmemo.php
@@ -139,7 +139,7 @@ public function getPrintAllCreditmemosUrl($order)
 
     public function canDisplayGiftmessage(): bool
     {
-        if (!Mage::helper('core')->isModuleOutputEnabled('Mage_GiftMessage')) {
+        if (!$this->isModuleOutputEnabled('Mage_GiftMessage')) {
             return false;
         }
         /** @var Mage_GiftMessage_Helper_Message $helper */

diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Items.php b/app/code/core/Mage/Sales/Block/Order/Email/Items.php
@@ -24,7 +24,7 @@ class Mage_Sales_Block_Order_Email_Items extends Mage_Sales_Block_Items_Abstract
 {
     public function getGiftMessageOrder(): ?Mage_GiftMessage_Model_Message
     {
-        if (!Mage::helper('core')->isModuleOutputEnabled('Mage_GiftMessage')) {
+        if (!$this->isModuleOutputEnabled('Mage_GiftMessage')) {
             return null;
         }
         /** @var Mage_GiftMessage_Helper_Message $helper */

diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php b/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php
@@ -93,7 +93,7 @@ public function getProductAdditionalInformationBlock()
 
     public function getGiftMessage(): ?Mage_GiftMessage_Model_Message
     {
-        if (!Mage::helper('core')->isModuleOutputEnabled('Mage_GiftMessage')) {
+        if (!$this->isModuleOutputEnabled('Mage_GiftMessage')) {
             return null;
         }
         /** @var Mage_GiftMessage_Helper_Message $helper */

diff --git a/app/code/core/Mage/Sales/Block/Order/Invoice.php b/app/code/core/Mage/Sales/Block/Order/Invoice.php
@@ -139,7 +139,7 @@ public function getPrintAllInvoicesUrl($order)
 
     public function canDisplayGiftmessage(): bool
     {
-        if (!Mage::helper('core')->isModuleOutputEnabled('Mage_GiftMessage')) {
+        if (!$this->isModuleOutputEnabled('Mage_GiftMessage')) {
             return false;
         }
         /** @var Mage_GiftMessage_Helper_Message $helper */

diff --git a/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Default.php b/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Default.php
@@ -177,7 +177,7 @@ public function getProductAdditionalInformationBlock()
     }
     public function canDisplayGiftmessage(): bool
     {
-        if (!Mage::helper('core')->isModuleOutputEnabled('Mage_GiftMessage')) {
+        if (!$this->isModuleOutputEnabled('Mage_GiftMessage')) {
             return false;
         }
         /** @var Mage_GiftMessage_Helper_Message $helper */
@@ -187,7 +187,7 @@ public function canDisplayGiftmessage(): bool
 
     public function getGiftMessage(): ?Mage_GiftMessage_Model_Message
     {
-        if (!Mage::helper('core')->isModuleOutputEnabled('Mage_GiftMessage')) {
+        if (!$this->isModuleOutputEnabled('Mage_GiftMessage')) {
             return null;
         }
         /** @var Mage_GiftMessage_Helper_Message $helper */

diff --git a/app/code/core/Mage/Sales/Block/Order/Items.php b/app/code/core/Mage/Sales/Block/Order/Items.php
@@ -33,7 +33,7 @@ public function getOrder()
 
     public function canDisplayGiftmessage(Mage_Sales_Model_Order_Item $item): bool
     {
-        if (!Mage::helper('core')->isModuleOutputEnabled('Mage_GiftMessage')) {
+        if (!$this->isModuleOutputEnabled('Mage_GiftMessage')) {
             return false;
         }
         /** @var Mage_GiftMessage_Helper_Message $helper */

diff --git a/app/code/core/Mage/Sales/Block/Order/Shipment.php b/app/code/core/Mage/Sales/Block/Order/Shipment.php
@@ -139,7 +139,7 @@ public function getPrintAllShipmentsUrl($order)
 
     public function canDisplayGiftmessage(): bool
     {
-        if (!Mage::helper('core')->isModuleOutputEnabled('Mage_GiftMessage')) {
+        if (!$this->isModuleOutputEnabled('Mage_GiftMessage')) {
             return false;
         }
         /** @var Mage_GiftMessage_Helper_Message $helper */

diff --git a/app/code/core/Mage/Sales/Block/Order/View.php b/app/code/core/Mage/Sales/Block/Order/View.php
@@ -121,7 +121,7 @@ public function getCreditmemoUrl($order)
 
     public function canDisplayGiftmessageItems(): bool
     {
-        if (!Mage::helper('core')->isModuleOutputEnabled('Mage_GiftMessage')) {
+        if (!$this->isModuleOutputEnabled('Mage_GiftMessage')) {
             return false;
         }
         /** @var Mage_GiftMessage_Helper_Message $helper */
@@ -131,7 +131,7 @@ public function canDisplayGiftmessageItems(): bool
 
     public function canDisplayGiftmessageOrder(): bool
     {
-        if (!Mage::helper('core')->isModuleOutputEnabled('Mage_GiftMessage')) {
+        if (!$this->isModuleOutputEnabled('Mage_GiftMessage')) {
             return false;
         }
         /** @var Mage_GiftMessage_Helper_Message $helper */