Merge pull request #196 from bold-commerce/Q1-688

Q1-688: Empty payment forms during Checkout.
bold-commerce · Dec 18, 2023 · c2a462e · c2a462e
2 parents e0fcebb + da36e91
commit c2a462e
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/Model/Payment/Gateway/Config/TitleValueHandler.php b/Model/Payment/Gateway/Config/TitleValueHandler.php
@@ -5,6 +5,7 @@
 
 use Bold\Checkout\Model\ConfigInterface;
 use Magento\Payment\Gateway\Config\ValueHandlerInterface;
+use Magento\Payment\Gateway\Data\PaymentDataObject;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -37,16 +38,30 @@ public function __construct(ConfigInterface $config, StoreManagerInterface $stor
      */
     public function handle(array $subject, $storeId = null)
     {
+        /** @var PaymentDataObject $paymentObject */
         $paymentObject = $subject['payment'] ?? null;
         $websiteId = (int)$this->storeManager->getWebsite()->getId();
         if (!$paymentObject || !$paymentObject->getPayment()) {
+            if (!$websiteId) {
+                $store = $this->storeManager->getDefaultStoreView();
+                $websiteId = (int)$store->getWebsiteId();
+            }
+
             return $this->config->getPaymentTitle($websiteId);
         }
         $ccLast4 = $paymentObject->getPayment()->getCcLast4();
         $ccType = $paymentObject->getPayment()->getCcType();
         if (!$ccLast4 || !$ccType) {
+            if (!$websiteId) {
+                $orderAdapter = $paymentObject->getOrder();
+                $storeId = $orderAdapter->getStoreId();
+                $store = $this->storeManager->getStore($storeId);
+                $websiteId = (int)$store->getWebsiteId();
+            }
+
             return $this->config->getPaymentTitle($websiteId);
         }
+
         return strlen($ccLast4) === 4
             ? $ccType . ': ending in ' . $ccLast4
             : $ccType . ': ' . $ccLast4;