Merge branch 'bugfix/paymentlink-payments-api' into release

mollie · Oct 23, 2023 · fe5b265 · fe5b265
2 parents 07659b7 + 9d41e29
commit fe5b265
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/Model/Client/Payments.php b/Model/Client/Payments.php
@@ -314,10 +314,14 @@ public function processResponse(OrderInterface $order, $payment)
             );
         }
 
-        $status = $this->mollieHelper->getPendingPaymentStatus($order);
+        $message = __('Customer redirected to Mollie');
+        if ($order->getPayment()->getMethodInstance()->getCode() == 'mollie_methods_paymentlink') {
+            $message = __('Created Mollie Checkout Url');
+        }
 
+        $status = $this->mollieHelper->getPendingPaymentStatus($order);
+        $order->addStatusToHistory($status, $message, false);
         $order->setState(Order::STATE_PENDING_PAYMENT);
-        $order->addStatusToHistory($status, __('Customer redirected to Mollie'), false);
         $this->linkTransactionToOrder->execute($payment->id, $order);
         $this->orderRepository->save($order);
     }

diff --git a/view/frontend/templates/info/mollie_paymentlink.phtml b/view/frontend/templates/info/mollie_paymentlink.phtml
@@ -17,10 +17,12 @@ $title = $block->escapeHtml($block->getMethod()->getTitle());
         <?= /* @noEscape */
         $title; ?>
     </dt>
-    <?php if (($block->getPaymentStatus() == 'created') && ($paymentUrl = $block->getPaymentLink($block->getMethod()->getStore()))): ?>
+    <?php
+    if (in_array($block->getPaymentStatus(), ['created', 'open']) &&
+        $paymentUrl = $block->getPaymentLink($block->getMethod()->getStore())
+    ): ?>
         <dt>
-            <?= /* @noEscape */
-            $paymentUrl; ?>
+            <?= /* @noEscape */ $paymentUrl; ?>
         </dt>
     <?php endif; ?>
     <?php if ($specificInfo): ?>