From da9ba28646adb913f59871e3684455c3646830c1 Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Wed, 3 May 2023 11:46:35 +0200
Subject: [PATCH 1/3] Converted msrp_rwd.js to vanilla javascript (part 2)
 (#3230)

Co-authored-by: Mohamed ELIDRISSI <67818913+elidrissidev@users.noreply.github.com>
---
 skin/frontend/rwd/default/js/msrp_rwd.js | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/skin/frontend/rwd/default/js/msrp_rwd.js b/skin/frontend/rwd/default/js/msrp_rwd.js
index eaabb64c495..301054a6804 100644
--- a/skin/frontend/rwd/default/js/msrp_rwd.js
+++ b/skin/frontend/rwd/default/js/msrp_rwd.js
@@ -14,19 +14,15 @@
 Catalog.Map.showHelp = Catalog.Map.showHelp.wrap(function (parent, event) {
     var helpBox = document.getElementById('map-popup');
     var bodyNode = document.getElementsByTagName('body')[0];
-
-    // Resolve calculation bug in parent so we can actually use these classes...
+    parent(event);
+    
     if (helpBox && this != Catalog.Map && Catalog.Map.active != this.link) {
-        parent(event);
-
-        helpBox.removeClassName('map-popup-right');
-        helpBox.removeClassName('map-popup-left');
+        helpBox.classList.remove('map-popup-right');
+        helpBox.classList.remove('map-popup-left');
         if (Element.getWidth(bodyNode) < event.pageX + (Element.getWidth(helpBox) / 2)) {
-            helpBox.addClassName('map-popup-left');
+            helpBox.classList.add('map-popup-left');
         } else if (event.pageX - (Element.getWidth(helpBox) / 2) < 0) {
-            helpBox.addClassName('map-popup-right');
+            helpBox.classList.add('map-popup-right');
         }
-    } else {
-        parent(event);
     }
 });

From b3ab6dde9fe1e673fea8c07a2f0a10dc19b30233 Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Wed, 3 May 2023 15:36:38 +0200
Subject: [PATCH 2/3] Added type hint docblock for Google Analytics 4 template
 (#3232)

---
 .../frontend/base/default/template/googleanalytics/ga.phtml      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/design/frontend/base/default/template/googleanalytics/ga.phtml b/app/design/frontend/base/default/template/googleanalytics/ga.phtml
index 117d5d9363f..08762b3195b 100644
--- a/app/design/frontend/base/default/template/googleanalytics/ga.phtml
+++ b/app/design/frontend/base/default/template/googleanalytics/ga.phtml
@@ -14,6 +14,7 @@
  */
 ?>
 <?php
+/** @var Mage_GoogleAnalytics_Block_Ga $this */
 $_helper = $this->helper('googleanalytics');
 $_accountId = $_helper->getAccountId();
 ?>

From 6b683d7e5ca813c5d7ac706fb6297ffdf617a238 Mon Sep 17 00:00:00 2001
From: Mohamed ELIDRISSI <67818913+elidrissidev@users.noreply.github.com>
Date: Thu, 4 May 2023 10:11:10 +0100
Subject: [PATCH 3/3] Added cache to "order status" labels in
 Mage_Sales_Model_Order_Config (#3223)

Co-authored-by: Fabrizio Balliano <fabrizio.balliano@gmail.com>
---
 app/code/core/Mage/Sales/Model/Order/Config.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/code/core/Mage/Sales/Model/Order/Config.php b/app/code/core/Mage/Sales/Model/Order/Config.php
index dac1902a3ad..7c3123b9455 100644
--- a/app/code/core/Mage/Sales/Model/Order/Config.php
+++ b/app/code/core/Mage/Sales/Model/Order/Config.php
@@ -28,6 +28,13 @@ class Mage_Sales_Model_Order_Config extends Mage_Core_Model_Config_Base
      */
     protected $_stateStatuses;
 
+    /**
+     * Statuses array
+     *
+     * @var array
+     */
+    protected $_statuses;
+
     /**
      * States array
      *
@@ -84,9 +91,12 @@ public function getStateDefaultStatus($state)
      */
     public function getStatusLabel($code)
     {
-        $status = Mage::getModel('sales/order_status')
-            ->load($code);
-        return $status->getStoreLabel();
+        $key = $code . '/' . Mage::app()->getStore()->getStoreId();
+        if (!isset($this->_statuses[$key])) {
+            $status = Mage::getModel('sales/order_status')->load($code);
+            $this->_statuses[$key] = $status->getStoreLabel();
+        }
+        return $this->_statuses[$key];
     }
 
     /**