UNZER-497 Add customerType to every transaction regardless of payment…

…Type
OXID-eSales · Oct 15, 2024 · c594260 · c594260
1 parent 8331bad
commit c594260
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/src/Controller/Admin/AdminOrderController.php b/src/Controller/Admin/AdminOrderController.php
@@ -308,7 +308,7 @@ protected function addAuthorizationViewData(Authorization $authorization): void
     protected function getCustomerTypeAndCurrencyFromTransaction(): array
     {
         $transactionService = $this->getServiceFromContainer(TransactionService::class);
-        return $transactionService->getCustomerTypeAndCurrencyByOrderId($this->getEditObjectId());
+        return $transactionService->getCustomerTypeAndCurrencyFromTransactionByOrderId($this->getEditObjectId());
     }
 
     /**

diff --git a/src/PaymentExtensions/UnzerPayment.php b/src/PaymentExtensions/UnzerPayment.php
@@ -129,10 +129,8 @@ public function execute(
             $companyType
         );
 
-        // first try to fetch customer, secondly create anew if not found in unzer
         try {
             $customer = $this->unzerSDK->fetchCustomer($customer);
-            // for comparison and update, the original object must be recreated
             $originalCustomer = $this->unzerService->getUnzerCustomer(
                 $userModel,
                 null,

diff --git a/src/Service/Payment.php b/src/Service/Payment.php
@@ -100,7 +100,7 @@ public function executeUnzerPayment(PaymentModel $paymentModel): bool
     {
         $paymentExtension = null;
         /** @var string $customerType */
-        $customerType = Registry::getRequest()->getRequestParameter('unzer_customer_type', '');
+        $customerType = Registry::getRequest()->getRequestParameter('unzer_customer_type', 'B2C');
         $user = $this->session->getUser();
         $basket = $this->session->getBasket();
         $currency = $basket->getBasketCurrency()->name;
@@ -121,14 +121,6 @@ public function executeUnzerPayment(PaymentModel $paymentModel): bool
                 $basket
             );
 
-//     MAYBE WE DONT NEED IT HERE       /** @var string $sess_challenge */
-//            $sess_challenge = $this->session->getVariable('sess_challenge');
-//            $this->transactionService->writeTransactionToDB(
-//                $sess_challenge,
-//                $this->session->getUser()->getId(),
-//                $this->getSessionUnzerPayment(true)
-//            );
-
             $paymentStatus = $this->getUnzerPaymentStatus() !== self::STATUS_ERROR;
 
             if ($this->redirectUrl) {
@@ -496,7 +488,8 @@ public function sendShipmentNotification($oOrder, $sPaymentId = null)
         }
 
         $sPaymentId = $sPaymentId ?? $this->transactionService->getPaymentIdByOrderId($oOrder->getId());
-        $transactionDetails = $this->transactionService->getCustomerTypeAndCurrencyByOrderId($oOrder->getId());
+        $transactionDetails = $this->transactionService
+            ->getCustomerTypeAndCurrencyFromTransactionByOrderId($oOrder->getId());
 
         $blSuccess = false;