Merge pull request #1414 from buckaroo-it/BP-4999-Display-bank-transfer-payment-details-on-success-page

BP-4999-Display-bank-transfer-payment-details-on-success-page

Author: AlbinaBaraliu

Block/Checkout/Success.php

@@ -25,6 +25,8 @@
 use Magento\Framework\App\Http\Context as HttpContext;
 use Magento\Framework\View\Element\Template\Context as TemplateContext;
 use Magento\Sales\Model\Order\Config;
+use Magento\Framework\Pricing\Helper\Data as PriceHelper;
+use Magento\Sales\Api\Data\OrderInterface;
 
 class Success extends \Magento\Checkout\Block\Onepage\Success
 {
@@ -33,6 +35,16 @@ class Success extends \Magento\Checkout\Block\Onepage\Success
      */
     protected $currentCustomer;
 
+    /**
+     * @var PriceHelper
+     */
+    protected $priceHelper;
+
+    /**
+     * @var Session
+     */
+    protected $checkoutSession;
+
     /**
      * @param TemplateContext $context
      * @param Session         $checkoutSession
@@ -47,6 +59,7 @@ public function __construct(
         Config $orderConfig,
         HttpContext $httpContext,
         CurrentCustomer $currentCustomer,
+        PriceHelper $priceHelper,
         array $data = []
     ) {
         parent::__construct(
@@ -56,6 +69,70 @@ public function __construct(
             $httpContext,
             $data
         );
+        $this->checkoutSession = $checkoutSession;
         $this->currentCustomer = $currentCustomer;
+        $this->priceHelper = $priceHelper;
+    }
+
+    /**
+     * Check whether last order was placed with Buckaroo Transfer.
+     */
+    public function isTransferPayment(): bool
+    {
+        $order = $this->getOrder();
+        if (!$order) {
+            return false;
+        }
+        $payment = $order->getPayment();
+        if (!$payment) {
+            return false;
+        }
+
+        return $payment->getMethod() === 'buckaroo_magento2_transfer';
+    }
+
+    /**
+     * Return transfer details from payment additional information if available.
+     *
+     * @return array
+     */
+    public function getTransferDetails(): array
+    {
+        $order = $this->getOrder();
+        if (!$order) {
+            return [];
+        }
+
+        $payment = $order->getPayment();
+        if (!$payment) {
+            return [];
+        }
+
+        $details = $payment->getAdditionalInformation('transfer_details');
+        if (!is_array($details)) {
+            return [];
+        }
+
+        return $details;
+    }
+
+    /**
+     * Format price in order currency.
+     */
+    public function formatPrice(float $amount): string
+    {
+        return $this->priceHelper->currency($amount, true, false);
+    }
+
+    /**
+     * Get last real order from checkout session.
+     */
+    public function getOrder(): ?OrderInterface
+    {
+        $order = $this->checkoutSession->getLastRealOrder();
+        if ($order && $order->getId()) {
+            return $order;
+        }
+        return null;
     }
 }

Gateway/Response/TransferDetailsHandler.php

@@ -37,7 +37,7 @@ public function handle(array $handlingSubject, array $response)
         /** @var OrderPaymentInterface $payment */
         $payment = $paymentDO->getPayment();
 
-        /** @var SDKTransactionResponse $transaction */
+        /** @var SDKTransactionResponse $transactionResponse */
         $transactionResponse = SubjectReader::readTransactionResponse($response);
 
         $transferDetails = $this->getTransferDetails($transactionResponse);
@@ -51,14 +51,16 @@ public function handle(array $handlingSubject, array $response)
      */
     protected function getTransferDetails($transactionResponse): array
     {
-        $serviceParameters = $transactionResponse->getServiceParameters();
+        $serviceParameters = ($i = array_search('transfer', array_column($transactionResponse->data('Services') ?? [], 'Name'))) !== false
+            ? array_column($transactionResponse->data('Services')[$i]['Parameters'], 'Value', 'Name')
+            : [];
 
         return [
             'transfer_amount'            => $transactionResponse->getAmount(),
-            'transfer_paymentreference'  => $serviceParameters['paymentreference'] ?? '',
-            'transfer_accountholdername' => $serviceParameters['accountholdername'] ?? '',
-            'transfer_iban'              => $serviceParameters['iban'] ?? '',
-            'transfer_bic'               => $serviceParameters['bic'] ?? '',
+            'transfer_paymentreference'  => $serviceParameters['PaymentReference'] ?? '',
+            'transfer_accountholdername' => $serviceParameters['AccountHolderName'] ?? '',
+            'transfer_iban'              => $serviceParameters['IBAN'] ?? '',
+            'transfer_bic'               => $serviceParameters['BIC'] ?? '',
         ];
     }
 }

i18n/be_FR.csv

@@ -24,3 +24,12 @@
 "Enter your Buckaroo Hosted Fields Client ID, obtainable from the Buckaroo Plaza at → Settings → <a href="https://plaza.buckaroo.nl/Configuration/TokenApi/Applications" target="_blank">Token registration</a>.","Entrez votre Buckaroo Hosted Fields Client ID, disponible depuis le Buckaroo Plaza dans → Paramètres → <a href="https://plaza.buckaroo.nl/Configuration/TokenApi/Applications" target="_blank">Enregistrement du jeton</a>."
 "Enter your Buckaroo Hosted Fields Client Secret, obtainable from the Buckaroo Plaza at → Settings → <a href="https://plaza.buckaroo.nl/Configuration/TokenApi/Applications" target="_blank">Token registration</a>.","Entrez votre Buckaroo Hosted Fields Client Secret, disponible depuis le Buckaroo Plaza dans → Paramètres → <a href="https://plaza.buckaroo.nl/Configuration/TokenApi/Applications" target="_blank">Enregistrement du jeton</a>."
 "Order reactivated: Payment completed after cancellation (Push notification received). Transaction ID: ""%1""","Commande réactivée: Paiement complété après annulation (Notification push reçue). ID de transaction: ""%1"""
+"Transfer","Virement"
+"Thank you for your order. You have chosen to pay by transfer. To complete your order, please transfer the outstanding amount, %1, using the details below.","Merci pour votre commande. Vous avez choisi de régler par virement. Pour finaliser votre commande, veuillez transférer le montant restant, %1, en utilisant les détails ci-dessous."
+"Amount","Montant"
+"Payment reference","Référence de paiement"
+"Accountholder","Titulaire de compte"
+"IBAN","IBAN"
+"BIC","BIC"
+"NB","NB"
+"To ensure that your payment can be processed smoothly, you must quote the payment reference %1 in the description of your transfer. This will enable faster processing of the payment.","Pour garantir le bon déroulement de votre paiement, vous devez indiquer la référence de paiement %1 dans la description de votre transfert. Cela permettra un traitement plus rapide du paiement."

i18n/de_AT.csv

@@ -503,3 +503,12 @@
 "Expiry Date:","Ablaufdatum:"
 "CVC:","CVC:"
 "Order reactivated: Payment completed after cancellation (Push notification received). Transaction ID: ""%1""","Bestellung reaktiviert: Zahlung nach Stornierung abgeschlossen (Push-Benachrichtigung erhalten). Transaktions-ID: ""%1"""
+"Transfer","Überweisung"
+"Thank you for your order. You have chosen to pay by transfer. To complete your order, please transfer the outstanding amount, %1, using the details below.","Vielen Dank für Ihre Bestellung. Sie haben sich für die Zahlung per Überweisung entschieden. Um Ihre Bestellung abzuschließen, überweisen Sie bitte den ausstehenden Betrag %1 unter Verwendung der nachstehenden Angaben."
+"Amount","Betrag"
+"Payment reference","Zahlungsreferenz"
+"Accountholder","Kontoinhaber"
+"IBAN","IBAN"
+"BIC","BIC"
+"NB","NB"
+"To ensure that your payment can be processed smoothly, you must quote the payment reference %1 in the description of your transfer. This will enable faster processing of the payment.","Damit Ihre Zahlung reibungslos verarbeitet werden kann, müssen Sie die Zahlungsreferenz %1 in der Beschreibung Ihrer Überweisung. Dies ermöglicht eine schnellere Abwicklung der Zahlung."

i18n/de_CH.csv

@@ -503,3 +503,12 @@
 "Expiry Date:","Ablaufdatum:"
 "CVC:","CVC:"
 "Order reactivated: Payment completed after cancellation (Push notification received). Transaction ID: ""%1""","Bestellung reaktiviert: Zahlung nach Stornierung abgeschlossen (Push-Benachrichtigung erhalten). Transaktions-ID: ""%1"""
+"Transfer","Überweisung"
+"Thank you for your order. You have chosen to pay by transfer. To complete your order, please transfer the outstanding amount, %1, using the details below.","Vielen Dank für Ihre Bestellung. Sie haben sich für die Zahlung per Überweisung entschieden. Um Ihre Bestellung abzuschließen, überweisen Sie bitte den ausstehenden Betrag %1 unter Verwendung der nachstehenden Angaben."
+"Amount","Betrag"
+"Payment reference","Zahlungsreferenz"
+"Accountholder","Kontoinhaber"
+"IBAN","IBAN"
+"BIC","BIC"
+"NB","NB"
+"To ensure that your payment can be processed smoothly, you must quote the payment reference %1 in the description of your transfer. This will enable faster processing of the payment.","Damit Ihre Zahlung reibungslos verarbeitet werden kann, müssen Sie die Zahlungsreferenz %1 in der Beschreibung Ihrer Überweisung. Dies ermöglicht eine schnellere Abwicklung der Zahlung."

i18n/de_DE.csv

@@ -508,3 +508,12 @@
 "Redirect (Buckaroo Hosted Payment Page)","Redirect (Buckaroo Hosted Payment Page)"
 "Select Inline to embed Apple Pay directly within the Magento checkout. Select Redirect to send customers to Buckaroo's secure Hosted Payment Page. Note: When using the Redirect option, Apple Pay can only be offered in the checkout (not in other areas like the mini-cart or product page).","Wählen Sie Inline, um Apple Pay direkt im Magento-Checkout einzubetten. Wählen Sie Redirect, um Kunden zur sicheren Hosted Payment Page von Buckaroo weiterzuleiten. Hinweis: Bei Verwendung der Redirect-Option kann Apple Pay nur im regulären Checkout angeboten werden (nicht z. B. im Mini-Warenkorb oder auf der Produktseite)."
 "Order reactivated: Payment completed after cancellation (Push notification received). Transaction ID: ""%1""","Bestellung reaktiviert: Zahlung nach Stornierung abgeschlossen (Push-Benachrichtigung erhalten). Transaktions-ID: ""%1"""
+"Transfer","Überweisung"
+"Thank you for your order. You have chosen to pay by transfer. To complete your order, please transfer the outstanding amount, %1, using the details below.","Vielen Dank für Ihre Bestellung. Sie haben sich für die Zahlung per Überweisung entschieden. Um Ihre Bestellung abzuschließen, überweisen Sie bitte den ausstehenden Betrag %1 unter Verwendung der nachstehenden Angaben."
+"Amount","Betrag"
+"Payment reference","Zahlungsreferenz"
+"Accountholder","Kontoinhaber"
+"IBAN","IBAN"
+"BIC","BIC"
+"NB","NB"
+"To ensure that your payment can be processed smoothly, you must quote the payment reference %1 in the description of your transfer. This will enable faster processing of the payment.","Damit Ihre Zahlung reibungslos verarbeitet werden kann, müssen Sie die Zahlungsreferenz %1 in der Beschreibung Ihrer Überweisung. Dies ermöglicht eine schnellere Abwicklung der Zahlung."

i18n/en_US.csv

@@ -39,3 +39,12 @@
 "Redirect (Buckaroo Hosted Payment Page)","Redirect (Buckaroo Hosted Payment Page)"
 "Select Inline to embed Apple Pay directly within the Magento checkout. Select Redirect to send customers to Buckaroo's secure Hosted Payment Page. Note: When using the Redirect option, Apple Pay can only be offered in the checkout (not in other areas like the mini-cart or product page).","Select Inline to embed Apple Pay directly within the Magento checkout. Select Redirect to send customers to Buckaroo's secure Hosted Payment Page. Note: When using the Redirect option, Apple Pay can only be offered in the checkout (not in other areas like the mini-cart or product page)."
 "Order reactivated: Payment completed after cancellation (Push notification received). Transaction ID: ""%1""","Order reactivated: Payment completed after cancellation (Push notification received). Transaction ID: ""%1"""
+"Transfer","Transfer"
+"Thank you for your order. You have chosen to pay by transfer. To complete your order, please transfer the outstanding amount, %1, using the details below.","Thank you for your order. You have chosen to pay by transfer. To complete your order, please transfer the outstanding amount, %1, using the details below."
+"Amount","Amount"
+"Payment reference","Payment reference"
+"Accountholder","Accountholder"
+"IBAN","IBAN"
+"BIC","BIC"
+"NB","NB"
+"To ensure that your payment can be processed smoothly, you must quote the payment reference %1 in the description of your transfer.","To ensure that your payment can be processed smoothly, you must quote the payment reference %1 in the description of your transfer."

i18n/es_ES.csv

@@ -490,3 +490,12 @@
 "Redirect (Buckaroo Hosted Payment Page)","Redirección (Página de pago alojada por Buckaroo)"
 "Select Inline to embed Apple Pay directly within the Magento checkout. Select Redirect to send customers to Buckaroo's secure Hosted Payment Page. Note: When using the Redirect option, Apple Pay can only be offered in the checkout (not in other areas like the mini-cart or product page).","Selecciona Integrado para mostrar Apple Pay directamente en el checkout de Magento. Selecciona Redirección para enviar a los clientes a la página de pago segura alojada por Buckaroo. Nota: Cuando se utiliza la opción Redirección, Apple Pay solo estará disponible en el checkout (no en otras áreas como el mini carrito o la página del producto)."
 "Order reactivated: Payment completed after cancellation (Push notification received). Transaction ID: ""%1""","Pedido reactivado: Pago completado después de la cancelación (Notificación push recibida). ID de transacción: ""%1"""
+"Transfer","Transferencia"
+"Thank you for your order. You have chosen to pay by transfer. To complete your order, please transfer the outstanding amount, %1, using the details below.","Gracias por su pedido. Ha elegido pagar por transferencia. Para completar su pedido, transfiera el importe pendiente, %1, utilizando los datos que figuran a continuación."
+"Amount","Importe"
+"Payment reference","Referencia de pago"
+"Accountholder","Titular de cuenta"
+"IBAN","IBAN"
+"BIC","BIC"
+"NB","NB"
+"To ensure that your payment can be processed smoothly, you must quote the payment reference %1 in the description of your transfer. This will enable faster processing of the payment.","Para garantizar que su pago pueda procesarse sin problemas, debe citar la referencia de pago %1 en la descripción de su transferencia. Esto permitirá un procesamiento más rápido del pago."

i18n/fr_BE.csv

@@ -503,3 +503,12 @@
 "Expiry Date:","Date d'expiration:"
 "CVC:","CVC:"
 "Order reactivated: Payment completed after cancellation (Push notification received). Transaction ID: ""%1""","Commande réactivée: Paiement complété après annulation (Notification push reçue). ID de transaction: ""%1"""
+"Transfer","Virement"
+"Thank you for your order. You have chosen to pay by transfer. To complete your order, please transfer the outstanding amount, %1, using the details below.","Merci pour votre commande. Vous avez choisi de régler par virement. Pour finaliser votre commande, veuillez transférer le montant restant, %1, en utilisant les détails ci-dessous."
+"Amount","Montant"
+"Payment reference","Référence de paiement"
+"Accountholder","Titulaire de compte"
+"IBAN","IBAN"
+"BIC","BIC"
+"NB","NB"
+"To ensure that your payment can be processed smoothly, you must quote the payment reference %1 in the description of your transfer. This will enable faster processing of the payment.","Pour garantir le bon déroulement de votre paiement, vous devez indiquer la référence de paiement %1 dans la description de votre transfert. Cela permettra un traitement plus rapide du paiement."

i18n/fr_FR.csv

@@ -508,3 +508,12 @@
 "Redirect (Buckaroo Hosted Payment Page)","Redirection (Page de paiement hébergée par Buckaroo)"
 "Select Inline to embed Apple Pay directly within the Magento checkout. Select Redirect to send customers to Buckaroo's secure Hosted Payment Page. Note: When using the Redirect option, Apple Pay can only be offered in the checkout (not in other areas like the mini-cart or product page).","Sélectionnez Intégré pour intégrer Apple Pay directement dans le passage en caisse de Magento. Sélectionnez Redirection pour rediriger les clients vers la page de paiement sécurisée hébergée par Buckaroo. Remarque: Lorsque l'option Redirection est utilisée, Apple Pay ne peut être proposé que dans le passage en caisse (et non dans d'autres zones comme le mini-panier ou la page produit)."
 "Order reactivated: Payment completed after cancellation (Push notification received). Transaction ID: ""%1""","Commande réactivée: Paiement complété après annulation (Notification push reçue). ID de transaction: ""%1"""
+"Transfer","Virement"
+"Thank you for your order. You have chosen to pay by transfer. To complete your order, please transfer the outstanding amount, %1, using the details below.","Merci pour votre commande. Vous avez choisi de régler par virement. Pour finaliser votre commande, veuillez transférer le montant restant, %1, en utilisant les détails ci-dessous."
+"Amount","Montant"
+"Payment reference","Référence de paiement"
+"Accountholder","Titulaire de compte"
+"IBAN","IBAN"
+"BIC","BIC"
+"NB","NB"
+"To ensure that your payment can be processed smoothly, you must quote the payment reference %1 in the description of your transfer. This will enable faster processing of the payment.","Pour garantir le bon déroulement de votre paiement, vous devez indiquer la référence de paiement %1 dans la description de votre transfert. Cela permettra un traitement plus rapide du paiement."