Merge branch 'main' into ECP-9498

Adyen · Oct 23, 2024 · b9250a1 · b9250a1
2 parents 4e7ce99 + 3ee5a3e
commit b9250a1
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/Gateway/Response/PaymentAuthorisationDetailsHandler.php b/Gateway/Response/PaymentAuthorisationDetailsHandler.php
@@ -11,17 +11,19 @@
 
 namespace Adyen\Payment\Gateway\Response;
 
+use Magento\Payment\Gateway\Helper\SubjectReader;
 use Magento\Payment\Gateway\Response\HandlerInterface;
+use Magento\Sales\Api\Data\OrderPaymentInterface;
 
 class PaymentAuthorisationDetailsHandler implements HandlerInterface
 {
     /**
      * @param array $handlingSubject
-     * @param array $response
+     * @param array $responseCollection
      */
-    public function handle(array $handlingSubject, array $response)
+    public function handle(array $handlingSubject, array $responseCollection): void
     {
-        $payment = \Magento\Payment\Gateway\Helper\SubjectReader::readPayment($handlingSubject);
+        $payment = SubjectReader::readPayment($handlingSubject);
 
         /** @var OrderPaymentInterface $payment */
         $payment = $payment->getPayment();
@@ -32,12 +34,17 @@ public function handle(array $handlingSubject, array $response)
         // no not send order confirmation mail
         $payment->getOrder()->setCanSendNewEmailFlag(false);
 
-        // set pspReference as transactionId
-        $payment->setCcTransId($response['pspReference']);
-        $payment->setLastTransId($response['pspReference']);
-
-        // set transaction
-        $payment->setTransactionId($response['pspReference']);
+        // for partial payments, non-giftcard payments will always be the last element in the collection
+        // for non-partial, there is only one response in the collection
+        $response = end($responseCollection);
+        if (!empty($response['pspReference'])) {
+            // set pspReference as transactionId
+            $payment->setCcTransId($response['pspReference']);
+            $payment->setLastTransId($response['pspReference']);
+
+            // set transaction
+            $payment->setTransactionId($response['pspReference']);
+        }
 
         // do not close transaction so you can do a cancel() and void
         $payment->setIsTransactionClosed(false);

diff --git a/etc/csp_whitelist.xml b/etc/csp_whitelist.xml
@@ -4,26 +4,31 @@
         <policy id="script-src">
             <values>
                 <value id="adyen" type="host">*.adyen.com</value>
+                <value id="googlepay" type="host">pay.google.com</value>
             </values>
         </policy>
         <policy id="frame-src">
             <values>
                 <value id="adyen" type="host">*.adyen.com</value>
+                <value id="googlepay" type="host">pay.google.com</value>
             </values>
         </policy>
         <policy id="img-src">
             <values>
                 <value id="adyen" type="host">*.adyen.com</value>
+                <value id="googlepay" type="host">pay.google.com</value>
             </values>
         </policy>
         <policy id="connect-src">
             <values>
                 <value id="adyen" type="host">*.adyen.com</value>
+                <value id="googlepay" type="host">pay.google.com</value>
             </values>
         </policy>
         <policy id="form-action">
             <values>
                 <value id="adyen" type="host">*.adyen.com</value>
+                <value id="googlepay" type="host">pay.google.com</value>
             </values>
         </policy>
     </policies>