MC-18194: Saved Credit Card Feature with Vault is not displaying proper information of card in order information page

serhii-balko · serhii-balko · commit 871a812bc1af · 2019-08-22T14:06:17.000+03:00
diff --git a/app/code/Magento/Vault/Model/Method/Vault.php b/app/code/Magento/Vault/Model/Method/Vault.php
@@ -544,8 +544,10 @@ private function attachCreditCardInfo(OrderPaymentInterface $payment): void
     {
         $paymentToken = $payment->getExtensionAttributes()
             ->getVaultPaymentToken();
-        $tokenDetails = $this->jsonSerializer->unserialize($paymentToken->getTokenDetails());
-        $payment->addData($tokenDetails);
+        if ($paymentToken) {
+            $tokenDetails = $this->jsonSerializer->unserialize($paymentToken->getTokenDetails());
+            $payment->addData($tokenDetails);
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -544,8 +544,10 @@ private function attachCreditCardInfo(OrderPaymentInterface $payment): void`
`544`	`544`	`{`
`545`	`545`	`$paymentToken = $payment->getExtensionAttributes()`
`546`	`546`	`->getVaultPaymentToken();`
`547`		`- $tokenDetails = $this->jsonSerializer->unserialize($paymentToken->getTokenDetails());`
`548`		`- $payment->addData($tokenDetails);`
	`547`	`+ if ($paymentToken) {`
	`548`	`+ $tokenDetails = $this->jsonSerializer->unserialize($paymentToken->getTokenDetails());`
	`549`	`+ $payment->addData($tokenDetails);`
	`550`	`+ }`
`549`	`551`	`}`
`550`	`552`
`551`	`553`	`/**`