From 735eadd716568825af0fff0a3eece3708a4dffc0 Mon Sep 17 00:00:00 2001
From: "B. Endres" <endres@systopia.de>
Date: Tue, 21 Jul 2020 07:23:42 -0500
Subject: [PATCH] [#31] fixed workflow bug

---
 api/v3/TwingleDonation/Submit.php | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/api/v3/TwingleDonation/Submit.php b/api/v3/TwingleDonation/Submit.php
index 5537683..61e5f19 100644
--- a/api/v3/TwingleDonation/Submit.php
+++ b/api/v3/TwingleDonation/Submit.php
@@ -699,17 +699,26 @@ function civicrm_api3_twingle_donation_Submit($params) {
       $result_values['contribution'] = $contribution['values'];
     }
 
-    // Create membership if a membership type is configured within the profile.
-    if ($params['donation_rhythm'] != 'one_time') {
-      $membership_type_id = $profile->getAttribute('membership_type_id_recur');
-    }
-    elseif (empty($params['parent_trx_id'])) {
-      // only create memberships, if this isn't an installment (e.g. parent_trx_id is set)
+    // MEMBERSHIP CREATION
+
+    // CHECK whether a membership should be created (based on profile settings and data provided)
+    if ($params['donation_rhythm'] == 'one_time') {
+      // membership creation based on one-off contributions
       $membership_type_id = $profile->getAttribute('membership_type_id');
+
+    } else {
+      // membership creation based on recurring contributions
+      if (empty($params['parent_trx_id'])) {
+        // this is the initial payment
+        $membership_type_id = $profile->getAttribute('membership_type_id_recur');
+      } else {
+        // this is a follow-up recurring payment
+        $membership_type_id = false;
+      }
     }
 
+    // CREATE the membership if required
     if (!empty($membership_type_id)) {
-      // create the membership
       $membership_data = [
         'contact_id'         => $contact_id,
         'membership_type_id' => $membership_type_id,