Merge pull request #9540 from magento-gl/spartans_pr_30012025

Spartans pr 30012025

Author: pawan-adobe-security

app/code/Magento/Paypal/view/frontend/web/js/view/paylater.js

@@ -47,9 +47,16 @@ define([
          * @returns {*}
          */
         initialize: function () {
-            let buyerCountry = customerData.get('paypal-buyer-country');
+            let customer = customerData.get('customer'),
+                buyerCountry = customerData.get('paypal-buyer-country');
 
             this.buyerCountry = buyerCountry().code;
+
+            if (customer().firstname && !this.buyerCountry) {
+                customerData.reload(['paypal-buyer-country'], false);
+                this.buyerCountry = customerData.get('paypal-buyer-country')().code;
+            }
+
             this._super()
                 .observe(['amount']);
 

app/code/Magento/Sales/Model/ResourceModel/SalesOrderStatusChangeHistory.php

@@ -9,7 +9,6 @@
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Sales\Model\Order;
-use Magento\Sales\Model\OrderRepository;
 
 /**
  * Sales order status change history resource model.
@@ -28,11 +27,9 @@ class SalesOrderStatusChangeHistory
 
     /**
      * @param ResourceConnection $resourceConnection
-     * @param OrderRepository $orderRepository
      */
     public function __construct(
         private readonly ResourceConnection $resourceConnection,
-        private readonly OrderRepository $orderRepository,
     ) {
     }
 
@@ -47,7 +44,7 @@ public function getLatestStatus(int $orderId): ?array
         $connection = $this->resourceConnection->getConnection();
         return $connection->fetchRow(
             $connection->select()->from(
-                $connection->getTableName(self::TABLE_NAME),
+                $this->resourceConnection->getTableName(self::TABLE_NAME),
                 ['status', 'created_at']
             )->where(
                 'order_id = ?',
@@ -70,7 +67,7 @@ public function insert(Order $order): void
 
         $connection = $this->resourceConnection->getConnection();
         $connection->insert(
-            $connection->getTableName(self::TABLE_NAME),
+            $this->resourceConnection->getTableName(self::TABLE_NAME),
             [
                 'order_id' => (int)$order->getId(),
                 'status' => $order->getStatus()
@@ -89,7 +86,7 @@ private function isOrderExists(int $orderId): bool
         $connection = $this->resourceConnection->getConnection();
         $entityId = $connection->fetchOne(
             $connection->select()->from(
-                $connection->getTableName(self::ORDER_TABLE_NAME),
+                $this->resourceConnection->getTableName(self::ORDER_TABLE_NAME),
                 ['entity_id']
             )->where(
                 'entity_id = ?',