BP-2977 GraphQL issue with virtual products in cart resulting in an e…

…rror
buckaroo-it · Oct 3, 2023 · 69db1e0 · 69db1e0
1 parent c7c128b
commit 69db1e0
Showing 1 changed file with 20 additions and 12 deletions.
diff --git a/Model/Service/Plugin/PaypalSellersProtection/Order.php b/Model/Service/Plugin/PaypalSellersProtection/Order.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * NOTICE OF LICENSE
  *
@@ -70,16 +71,24 @@ public function afterGetOrderTransactionBuilder(
          * @var \Magento\Sales\Model\Order $order
          */
         $order = $payment->getOrder();
-        $shippingAddress = $order->getShippingAddress();
+        $address = $order->getShippingAddress();
 
         $services = $result->getServices();
 
         if (!empty($services['Action']) && ($services['Action'] == 'PayRemainder')) {
             return $result;
         }
 
+        if ($address === null) {
+            $address = $order->getBillingAddress();
+        }
+
+        if ($address === null) {
+            return $result;
+        }
+
         // Build ExtraInfo Request Parameter
-        $extraInfoRequestParameter = $this->getRequestParameter($shippingAddress);
+        $extraInfoRequestParameter = $this->getRequestParameter($address);
 
         // Build ExtraInfo Service
         $services = [
@@ -97,28 +106,27 @@ public function afterGetOrderTransactionBuilder(
         return $result;
     }
 
-    private function getRequestParameter($shippingAddress)
+    private function getRequestParameter($address)
     {
-
         $extraInfoRequestParameter = [
             [
-                '_' => mb_substr($shippingAddress->getName(), 0, 32),
+                '_' => mb_substr($address->getName(), 0, 32),
                 'Name' => 'Name',
             ],
             [
-                '_' => mb_substr($shippingAddress->getStreetLine(1), 0, 100),
+                '_' => mb_substr($address->getStreetLine(1), 0, 100),
                 'Name' => 'Street1',
             ],
             [
-                '_' => mb_substr($shippingAddress->getCity(), 0, 40),
+                '_' => mb_substr($address->getCity(), 0, 40),
                 'Name' => 'CityName',
             ],
             [
-                '_' => mb_substr($shippingAddress->getPostcode(), 0, 20),
+                '_' => mb_substr($address->getPostcode(), 0, 20),
                 'Name' => 'PostalCode',
             ],
             [
-                '_' => $shippingAddress->getCountryId(),
+                '_' => $address->getCountryId(),
                 'Name' => 'Country',
             ],
             [
@@ -127,12 +135,12 @@ private function getRequestParameter($shippingAddress)
             ],
         ];
 
-        $shippingRegion = $shippingAddress->getRegion();
+        $shippingRegion = $address->getRegion();
         if (isset($shippingRegion) && !empty($shippingRegion)) {
 
             $twoCharacterShippingRegion = $this->paypalStateCodes->getCodeFromValue(
-                $shippingAddress->getCountryId(),
-                $shippingAddress->getRegion()
+                $address->getCountryId(),
+                $address->getRegion()
             );
 
             if ($twoCharacterShippingRegion) {