--draft-- fix paypal saving issue

OXID-eSales · Oct 16, 2024 · 72129de · 72129de
1 parent 818ba86
commit 72129de
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/Controller/AccountSavedPaymentController.php b/src/Controller/AccountSavedPaymentController.php
@@ -74,7 +74,9 @@ protected function setPaymentListsToView(): void
                     $paymentTypes[$paymentType->getBrand()][$transactionOxId] = $paymentType->expose();
                 }
                 if (strpos($paymentTypeId, 'ppl')) {
-                    $paymentTypes['paypal'][$transactionOxId] = $paymentType->expose();
+                    if (!empty($paymentType->getEmail())) {
+                        $paymentTypes['paypal'][$transactionOxId] = $paymentType->expose();
+                    }
                 }
                 if (strpos($paymentTypeId, 'sdd')) {
                     $paymentTypes['sepa'][$transactionOxId] = $paymentType->expose();

diff --git a/src/PaymentExtensions/UnzerPayment.php b/src/PaymentExtensions/UnzerPayment.php
@@ -142,7 +142,7 @@ public function execute(
         } catch (UnzerApiException $apiException) {
             $customer = $this->unzerSDK->createCustomer($customer);
         }
-//first_transaction
+        //first_transaction
         $transaction = $this->doTransactions($basketModel, $customer, $userModel, $paymentType);
         $this->unzerService->setSessionVars($transaction);
 

diff --git a/src/Service/Transaction.php b/src/Service/Transaction.php
@@ -630,7 +630,7 @@ public function getSavedPaymentsForUser(?User $user, array $ids, bool $cache): a
         foreach ($ids as $typeData) {
             $paymentTypes = null;
             $paymentTypeId = $typeData['paymenttypeid'] ?: '';
-            if ($paymentTypeId) {
+            if (!empty($paymentTypeId)) {
                 $paymentTypes = $this->setPaymentTypes(
                     $user,
                     $typeData['paymenttypeid'] ?: '',
@@ -690,7 +690,13 @@ private function setPaymentTypes(
 
         foreach ($this->transPaymentTypeIds as $unzerId => $oxVar) {
             if (strpos($paymentTypeId, $unzerId)) {
-                $result[$oxVar][$paymentTypeId] = $paymentType->expose();
+                if ($unzerId === 'ppl') {
+                    if (!empty($paymentType->getEmail())) {
+                        $result[$oxVar][$paymentTypeId] = $paymentType->expose();
+                    }
+                } else {
+                    $result[$oxVar][$paymentTypeId] = $paymentType->expose();
+                }
             }
         }
         return $result;