Merge branch 'develop-v5' into v5

Author: janhenckens

CHANGELOG.md

@@ -4,7 +4,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## 5.2.0 - Unpublished
+## 5.2.1 - 2025-01-10
+### Fixed
+- Added missing form handle
+
+## 5.2.0 - 2025-01-04
 ### Added
 - Support for using a different API key per form
 ### Fixed

composer.json

@@ -3,7 +3,7 @@
     "minimum-stability": "alpha",
     "description": "Easily accept payments with Mollie Payments",
     "type": "craft-plugin",
-    "version": "5.2.0",
+    "version": "5.2.1",
     "keywords": [
         "craft",
         "cms",

src/controllers/PaymentController.php

@@ -262,7 +262,9 @@ public function actionCheckTransactionStatus($id, $redirect)
     {
         try {
             $transaction = MolliePayments::getInstance()->transaction->getTransactionbyId($id);
-            $molliePayment = MolliePayments::getInstance()->mollie->getStatus($id);
+            $element = Payment::findOne(['id' => $transaction->payment]);
+            $form = MolliePayments::getInstance()->forms->getFormByid($element->formId);
+            $molliePayment = MolliePayments::getInstance()->mollie->getStatus($id, $form->handle);
             if ($transaction->status !== $molliePayment->status) {
                 MolliePayments::getInstance()->transaction->updateTransaction($transaction, $molliePayment);
                 return $this->asSuccess("Transaction status updated", [], $redirect);

src/controllers/SubscriptionController.php

@@ -81,8 +81,6 @@ public function actionSubscribe()
         $subscription->customerId = $subscriber->customerId;
 
         if (!$subscription->validate()) {
-            // TODO Remove this before release
-            dd($subscription->getErrors());
             // Send the payment back to the template
             Craft::$app->getUrlManager()->setRouteParams([
                 'subscription' => $subscription,
@@ -160,10 +158,11 @@ public function actionRedirect()
 
         $redirect = $request->getQueryParam('redirect');
         $element = Subscription::findOne(['uid' => $uid]);
+        $form = MolliePayments::getInstance()->forms->getFormByid($element->formId);
         $transaction = MolliePayments::$plugin->transaction->getTransactionbyPayment($element->id);
 
         try {
-            $molliePayment = MolliePayments::$plugin->mollie->getStatus($transaction->id);
+            $molliePayment = MolliePayments::$plugin->mollie->getStatus($transaction->id, $form->handle);
             $this->redirect(UrlHelper::url($redirect, ['subscription' => $uid, 'status' => $molliePayment->status]));
         } catch (\Exception $e) {
             throw new NotFoundHttpException('Payments not found', '404');
@@ -178,7 +177,9 @@ public function actionWebhook(): void
     {
         $id = Craft::$app->getRequest()->getRequiredParam('id');
         $transaction = MolliePayments::getInstance()->transaction->getTransactionbyId($id);
-        $molliePayment = MolliePayments::getInstance()->mollie->getStatus($id);
+        $element = Subscription::findOne(['id' => $transaction->payment]);
+        $form = MolliePayments::getInstance()->forms->getFormByid($element->formId);
+        $molliePayment = MolliePayments::getInstance()->mollie->getStatus($id, $form->handle);
 
         // If we have a subscription id, the payment belongs to an active subscription
         // So we need to create a new transaction for it.
@@ -283,7 +284,7 @@ public function actionGetSubscribers()
         $page = $this->request->getQueryParam('page', 1);
         $baseUrl = 'mollie-payments/subscription/get-subscribers';
         $data = MolliePayments::getInstance()->subscriber->getAllSubscribers();
-        $subscribers = collect($data)->map(function($subscriber) {
+        $subscribers = collect($data)->map(function ($subscriber) {
             return [
                 'title' => $subscriber->email,
                 'id' => $subscriber->customerId,
@@ -335,8 +336,13 @@ public function actionGetSubscribers()
 
     public function actionDeleteSubscriber()
     {
-        MolliePayments::getInstance()->mollie->deleteCustomer($this->request->getRequiredBodyParam('id'));
-        MolliePayments::getInstance()->subscriber->deleteById($this->request->getRequiredBodyParam('id'));
-        return $this->asJson(['success' => true]);
+        try {
+            MolliePayments::getInstance()->mollie->deleteCustomer($this->request->getRequiredBodyParam('id'));
+            MolliePayments::getInstance()->subscriber->deleteById($this->request->getRequiredBodyParam('id'));
+            return $this->asJson(['success' => true]);
+        } catch(\Throwable $e) {
+            Craft::error($e->getMessage(), MolliePayments::class);
+            return $this->asJson(['success' => false]);
+        }
     }
 }

src/elements/Subscription.php

@@ -213,7 +213,8 @@ public function getCustomer(): Customer|null
         if (!$this->customerId) {
             return null;
         }
-        return MolliePayments::getInstance()->mollie->getCustomer($this->customerId);
+        $form = $this->getForm();
+        return MolliePayments::getInstance()->mollie->getCustomer($this->customerId, $form->handle);
     }
 
     // Public Methods