Merge remote-tracking branch 'origin/develop-8' into develop-8

Adyen · Dec 28, 2023 · ea3b60c · ea3b60c
2 parents 066ceb7 + d085467
commit ea3b60c
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 24 deletions.
diff --git a/Gateway/Http/Client/TransactionPosCloudSync.php b/Gateway/Http/Client/TransactionPosCloudSync.php
@@ -22,6 +22,7 @@
 use Magento\Payment\Gateway\Http\ClientInterface;
 use Magento\Checkout\Model\Session;
 use Magento\Payment\Gateway\Http\TransferInterface;
+use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Quote\Api\Data\CartInterface;
 use Adyen\Payment\Model\Ui\AdyenPosCloudConfigProvider;
@@ -106,16 +107,18 @@ public function placeRequest(TransferInterface $transferObject): array
         $newServiceID = date("dHis");
         $statusDate = date("U");
         $terminalId = $request['terminalID'];
+        $order = $request['order'];
 
         if (array_key_exists('chainCalls', $request)) {
-            $quote = $this->initiatePosPayment(
+            $order = $this->initiatePosPayment(
+                $order,
                 $terminalId,
                 $request['fundingSource'],
                 $request['numberOfInstallments']
             );
-            $quoteInfoInstance = $quote->getPayment()->getMethodInstance()->getInfoInstance();
-            $timeDiff = (int)$statusDate - (int)$quoteInfoInstance->getAdditionalInformation('initiateDate');
-            $serviceId = $quoteInfoInstance->getAdditionalInformation('serviceID');
+            $payment = $order->getPayment();
+            $timeDiff = (int)$statusDate - (int)$payment->getAdditionalInformation('initiateDate');
+            $serviceId = $payment->getAdditionalInformation('serviceID');
         } else {
             $timeDiff = (int)$statusDate - (int)$request['initiateDate'];
             $serviceId = $request['serviceID'];
@@ -182,19 +185,20 @@ public function placeRequest(TransferInterface $transferObject): array
     /**
      * Initiate a POS payment by sending a /sync call to Adyen
      *
+     * @param OrderInterface $order
      * @param string $terminalId
      * @param string $fundingSource
      * @param string|null $numberOfInstallments
-     * @return CartInterface
+     * @return OrderInterface
      * @throws AdyenException
      * @throws LocalizedException
-     * @throws NoSuchEntityException
      */
     public function initiatePosPayment(
+        OrderInterface $order,
         string $terminalId,
         string $fundingSource,
         ?string $numberOfInstallments
-    ): CartInterface {
+    ): OrderInterface {
         // Validate JSON that has just been parsed if it was in a valid format
         if (json_last_error() !== JSON_ERROR_NONE) {
             throw new LocalizedException(
@@ -203,13 +207,10 @@ public function initiatePosPayment(
         }
 
         $poiId = $terminalId;
-
-        /** @var CartInterface $quote */
-        $quote = $this->session->getQuote();
-        $payment = $quote->getPayment();
-        $adyenAmountCurrency = $this->chargedCurrency->getQuoteAmountCurrency($quote);
+        $payment = $order->getPayment();
+        $adyenAmountCurrency = $this->chargedCurrency->getOrderAmountCurrency($order);
         $payment->setMethod(AdyenPosCloudConfigProvider::CODE);
-        $reference = $quote->reserveOrderId()->getReservedOrderId();
+        $reference = $order->getIncrementId();
 
         $service = $this->adyenHelper->createAdyenPosPaymentService($this->client);
         $transactionType = \Adyen\TransactionType::NORMAL;
@@ -285,15 +286,14 @@ public function initiatePosPayment(
             ];
         }
 
-        $request = $this->pointOfSale->addSaleToAcquirerData($request, $quote);
-        $paymentInfoInstance = $quote->getPayment()->getMethodInstance()->getInfoInstance();
+        $request = $this->pointOfSale->addSaleToAcquirerData($request, null, $order);
 
-        $paymentInfoInstance->setAdditionalInformation(
+        $payment->setAdditionalInformation(
             'serviceID',
             $serviceID
         );
 
-        $paymentInfoInstance->setAdditionalInformation(
+        $payment->setAdditionalInformation(
             'initiateDate',
             $initiateDate
         );
@@ -306,21 +306,22 @@ public function initiatePosPayment(
             $this->adyenLogger->addAdyenDebug($response['error'] = $e->getMessage());
         } catch (\Exception $e) {
             //Probably timeout
-            $paymentInfoInstance->setAdditionalInformation(
+            $payment->setAdditionalInformation(
                 'terminalResponse',
                 null
             );
-            $quote->save();
+
             $response['error'] = $e->getMessage();
             throw $e;
         }
         $this->adyenHelper->logResponse($response);
-        $paymentInfoInstance->setAdditionalInformation(
+        $payment->setAdditionalInformation(
             'terminalResponse',
             $response
         );
 
-        $quote->save();
-        return $quote;
+        $order->save();
+
+        return $order;
     }
 }
diff --git a/Gateway/Request/PosCloudBuilder.php b/Gateway/Request/PosCloudBuilder.php
@@ -12,6 +12,7 @@
 
 namespace Adyen\Payment\Gateway\Request;
 
+use Adyen\Payment\Helper\PaymentMethods;
 use Magento\Payment\Gateway\Helper\SubjectReader;
 use Magento\Payment\Gateway\Request\BuilderInterface;
 
@@ -36,7 +37,8 @@ public function build(array $buildSubject)
                 'terminalID' => $payment->getAdditionalInformation('terminal_id'),
                 'numberOfInstallments' => $payment->getAdditionalInformation('number_of_installments'),
                 'chainCalls' => $payment->getAdditionalInformation('chain_calls'),
-                'fundingSource' => $payment->getAdditionalInformation('funding_source')
+                'fundingSource' => $payment->getAdditionalInformation('funding_source') ?? PaymentMethods::FUNDING_SOURCE_CREDIT,
+                'order' => $payment->getOrder()
             ];
         } else {
             $body = [

diff --git a/Gateway/Response/PaymentPosCloudHandler.php b/Gateway/Response/PaymentPosCloudHandler.php
@@ -69,6 +69,10 @@ public function handle(array $handlingSubject, array $paymentResponse)
         // do not send order confirmation mail
         $payment->getOrder()->setCanSendNewEmailFlag(false);
 
+        if (!empty($paymentResponse) && isset($paymentResponse['Response']['Result'])) {
+            $payment->setAdditionalInformation('resultCode', $paymentResponse['Response']['Result']);
+        }
+
         if (!empty($paymentResponse['Response']['AdditionalResponse'])
         ) {
             $pairs = \explode('&', $paymentResponse['Response']['AdditionalResponse']);

diff --git a/Helper/PaymentResponseHandler.php b/Helper/PaymentResponseHandler.php
@@ -38,6 +38,7 @@ class PaymentResponseHandler
     const CANCELLED = 'Cancelled';
     const ADYEN_TOKENIZATION = 'Adyen Tokenization';
     const VAULT = 'Magento Vault';
+    const POS_SUCCESS = 'Success';
 
     /**
      * @var AdyenLogger
@@ -118,6 +119,7 @@ public function formatPaymentResponse($resultCode, $action = null, $additionalDa
             case self::AUTHORISED:
             case self::REFUSED:
             case self::ERROR:
+            case self::POS_SUCCESS:
                 return [
                     "isFinal" => true,
                     "resultCode" => $resultCode,

diff --git a/etc/schema.graphqls b/etc/schema.graphqls
@@ -148,8 +148,10 @@ input AdyenAdditionalDataOneclick {
 }
 
 input AdyenAdditionalDataPosCloud {
+    terminal_id: String! @doc(description: "Terminal ID of selected terminal.")
     number_of_installments: Int @doc(description: "Number of installments for the payment.")
-    terminal_id: String @doc(description: "Terminal ID of selected terminal.")
+    chain_calls: Boolean @doc(description: "Indicates the chained call.")
+    funding_source: String @doc(description: "Funding source to be used for combo cards.")
 }
 
 type StoreConfig @doc(description: "The type contains information about a store config") {