From 10f6ca4e897a89002edb493cc2083765b568a555 Mon Sep 17 00:00:00 2001
From: Marc Michalsky <michalsky@forumzfd.de>
Date: Fri, 26 Apr 2024 18:19:16 +0200
Subject: [PATCH 1/5] add profile settings for note mapping

---
 CRM/Twingle/Form/Profile.php           | 25 +++++++++++++++
 CRM/Twingle/Profile.php                |  4 +++
 templates/CRM/Twingle/Form/Profile.hlp | 12 ++++++-
 templates/CRM/Twingle/Form/Profile.tpl | 44 ++++++++++++++++++++++++++
 4 files changed, 84 insertions(+), 1 deletion(-)

diff --git a/CRM/Twingle/Form/Profile.php b/CRM/Twingle/Form/Profile.php
index af1832a..d0a1beb 100644
--- a/CRM/Twingle/Form/Profile.php
+++ b/CRM/Twingle/Form/Profile.php
@@ -498,6 +498,31 @@ class CRM_Twingle_Form_Profile extends CRM_Core_Form {
       []
     );
 
+    $this->add(
+      'select',
+      'map_as_contribution_notes',
+      E::ts('Create contribution notes for'),
+      [
+        'purpose' => E::ts('Purpose'),
+        'remarks' => E::ts('Remarks'),
+      ],
+      // is not required
+      FALSE,
+      ['class' => 'crm-select2 huge', 'multiple' => 'multiple']
+    );
+
+    $this->add(
+      'select',
+      'map_as_contact_notes',
+      E::ts('Create contact notes for'),
+      [
+        'user_extrafield' => E::ts('User Extra Field'),
+      ],
+      // is not required
+      FALSE,
+      ['class' => 'crm-select2 huge', 'multiple' => 'multiple']
+    );
+
     $this->addButtons([
       [
         'type' => 'submit',
diff --git a/CRM/Twingle/Profile.php b/CRM/Twingle/Profile.php
index 1a150af..0580eeb 100644
--- a/CRM/Twingle/Profile.php
+++ b/CRM/Twingle/Profile.php
@@ -527,6 +527,8 @@ class CRM_Twingle_Profile {
         'membership_postprocess_call' => ['required' => FALSE],
         'newsletter_double_opt_in' => ['required' => FALSE],
         'required_address_components' => ['required' => FALSE],
+        'map_as_contribution_notes' => ['required' => FALSE],
+        'map_as_contact_notes' => ['required' => FALSE],
       ],
       // Add payment methods.
       array_combine(
@@ -643,6 +645,8 @@ class CRM_Twingle_Profile {
         'city',
         'country',
       ],
+      'map_as_contribution_notes' => [],
+      'map_as_contact_notes' => [],
     ]
     // Add contribution status for all payment methods.
     // phpcs:ignore Drupal.Formatting.SpaceUnaryOperator.PlusMinus
diff --git a/templates/CRM/Twingle/Form/Profile.hlp b/templates/CRM/Twingle/Form/Profile.hlp
index e3841d7..b8d67a4 100644
--- a/templates/CRM/Twingle/Form/Profile.hlp
+++ b/templates/CRM/Twingle/Form/Profile.hlp
@@ -75,4 +75,14 @@
       <li><strong>ContributionRecur</strong> &ndash; Will be set on the recurring contribution and deriving single contributions</li>
     </ul>{/ts}
 {/htxt}
-{/crmScope}
\ No newline at end of file
+
+{htxt id='id-map_as_contribution_notes'}
+    {ts domain="de.systopia.twingle"}<p>Create a contribution note for each field specified in this selection.</p>
+    <p><i>Tip: You can enable or disable this fields in the TwingleMANAGER.</i></p>{/ts}
+{/htxt}
+
+{htxt id='id-map_as_contact_notes'}
+    {ts domain="de.systopia.twingle"}<p>Create a contact note for each field specified in this selection.</p>
+    <p><i>Tip: You can enable or disable this fields in the TwingleMANAGER.</i></p>{/ts}
+{/htxt}
+{/crmScope}
diff --git a/templates/CRM/Twingle/Form/Profile.tpl b/templates/CRM/Twingle/Form/Profile.tpl
index df54418..83accec 100644
--- a/templates/CRM/Twingle/Form/Profile.tpl
+++ b/templates/CRM/Twingle/Form/Profile.tpl
@@ -313,6 +313,50 @@
           <td class="content">{$form.contribution_source.html}</td>
         </tr>
 
+        <tr class="crm-section">
+          <td class="label">
+            {$form.map_as_contribution_notes.label}
+            <a
+              onclick='
+                CRM.help(
+                "{ts domain="de.systopia.twingle"}Create contribution note for{/ts}",
+              {literal}{
+                "id": "id-map_as_contribution_notes",
+                "file": "CRM\/Twingle\/Form\/Profile"
+              }{/literal}
+                );
+                return false;
+                '
+              href="#"
+              title="{ts domain="de.systopia.twingle"}Help{/ts}"
+              class="helpicon"
+            ></a>
+          </td>
+          <td class="content">{$form.map_as_contribution_notes.html}</td>
+        </tr>
+
+        <tr class="crm-section">
+          <td class="label">
+            {$form.map_as_contact_notes.label}
+            <a
+              onclick='
+                CRM.help(
+                "{ts domain="de.systopia.twingle"}Create contact note for{/ts}",
+              {literal}{
+                "id": "id-map_as_contact_notes",
+                "file": "CRM\/Twingle\/Form\/Profile"
+              }{/literal}
+                );
+                return false;
+                '
+              href="#"
+              title="{ts domain="de.systopia.twingle"}Help{/ts}"
+              class="helpicon"
+            ></a>
+          </td>
+          <td class="content">{$form.map_as_contact_notes.html}</td>
+        </tr>
+
         <tr class="crm-section">
           <td class="label">
             {$form.custom_field_mapping.label}

From df51d59ceaad75e8bbb6d435496e1b7a2fd96303 Mon Sep 17 00:00:00 2001
From: Marc Michalsky <michalsky@forumzfd.de>
Date: Fri, 26 Apr 2024 18:19:54 +0200
Subject: [PATCH 2/5] add logic to create selected contact and contribution
 notes

---
 api/v3/TwingleDonation/Submit.php | 48 ++++++++++++++++++++++++-------
 1 file changed, 37 insertions(+), 11 deletions(-)

diff --git a/api/v3/TwingleDonation/Submit.php b/api/v3/TwingleDonation/Submit.php
index ecaeac8..2466575 100644
--- a/api/v3/TwingleDonation/Submit.php
+++ b/api/v3/TwingleDonation/Submit.php
@@ -255,6 +255,13 @@ function _civicrm_api3_twingle_donation_Submit_spec(&$params) {
     'api.required' => 0,
     'description' => E::ts('Additional information for either the contact or the (recurring) contribution.'),
   ];
+  $params['remarks'] = [
+    'name' => 'remarks',
+    'title' => E::ts('Remarks'),
+    'type' => CRM_Utils_Type::T_STRING,
+    'api.required' => 0,
+    'description' => E::ts('Additional remarks for the donation.'),
+  ];
 }
 
 /**
@@ -477,13 +484,20 @@ function civicrm_api3_twingle_donation_Submit($params) {
         );
       }
 
-      // Save user_extrafield as contact note.
-      if (isset($params['user_extrafield']) && '' != $params['user_extrafield']) {
-        civicrm_api3('Note', 'create', [
-          'entity_table' => 'civicrm_contact',
-          'entity_id' => $contact_id,
-          'note' => $params['user_extrafield'],
-        ]);
+      // Create contact notes.
+      $contact_note_mappings = $profile->getAttribute('map_as_contact_notes', []);
+      foreach (['user_extrafield'] as $target) {
+        if (
+          isset($params[$target])
+          && '' != $params[$target]
+          && in_array($target, $contact_note_mappings)
+        ) {
+          civicrm_api3('Note', 'create', [
+            'entity_table' => 'civicrm_contact',
+            'entity_id' => $contact_id,
+            'note' => $params[$target],
+          ]);
+        }
       }
 
       // Share organisation address with individual contact, using configured
@@ -620,10 +634,6 @@ function civicrm_api3_twingle_donation_Submit($params) {
       $contribution_data += $custom_fields['Contribution'];
     }
 
-    if (isset($params['purpose'])) {
-      $contribution_data['note'] = $params['purpose'];
-    }
-
     // set campaign, subject to configuration
     CRM_Twingle_Submission::setCampaign($contribution_data, 'contribution', $params, $profile);
 
@@ -794,6 +804,22 @@ function civicrm_api3_twingle_donation_Submit($params) {
       $result_values['contribution'] = $contribution['values'];
     }
 
+    // Add notes to the contribution.
+    $contribution_note_mappings = $profile->getAttribute("map_as_contribution_notes");
+    foreach (['purpose', 'remarks'] as $target) {
+      if (
+        in_array($target, $contribution_note_mappings)
+        && isset($params[$target])
+        && '' != $params[$target]
+      ) {
+        civicrm_api3('Note', 'create', [
+          'entity_table' => 'civicrm_contribution',
+          'entity_id' => CRM_Utils_Array::first($result_values['contribution'])['id'],
+          'note' => $params[$target],
+        ]);
+      }
+    }
+
     // MEMBERSHIP CREATION
 
     // CHECK whether a membership should be created (based on profile settings and data provided)

From b3f82fbfba2d650128722300ebc0be22221d402f Mon Sep 17 00:00:00 2001
From: Marc Michalsky <michalsky@forumzfd.de>
Date: Tue, 30 Apr 2024 16:51:39 +0200
Subject: [PATCH 3/5] add Upgrader to maintain profile behaviour

---
 CRM/Twingle/Upgrader.php | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/CRM/Twingle/Upgrader.php b/CRM/Twingle/Upgrader.php
index 2af4667..4d00514 100644
--- a/CRM/Twingle/Upgrader.php
+++ b/CRM/Twingle/Upgrader.php
@@ -102,4 +102,40 @@ class CRM_Twingle_Upgrader extends CRM_Extension_Upgrader_Base {
     return TRUE;
   }
 
+  /**
+   * Upgrade to 1.5.0
+   *
+   * - Activate mapping of `purpose` and `user_extra_field` to notes in each existing profile to
+   *   maintain default behavior after making the fields optional.
+   *
+   * @return bool
+   * @throws \Civi\Core\Exception\DBQueryException
+   * @throws \Civi\Twingle\Exceptions\ProfileException
+   */
+  public function upgrade_5150(): bool {
+    $this->ctx->log->info('Activate mapping of `purpose` and `user_extra_field` to notes in each existing profile.');
+
+    $profiles = CRM_Twingle_Profile::getProfiles();
+    if ($profiles) {
+      foreach ($profiles as $profile) {
+        $profile_changed = FALSE;
+        $contribution_notes = $profile->getAttribute('map_as_contribution_notes', []);
+        $contact_notes = $profile->getAttribute('map_as_contact_notes', []);
+        if (!in_array('purpose', $contribution_notes)) {
+          $profile->setAttribute('map_as_contribution_notes', array_merge($contribution_notes, ['purpose']));
+          $profile_changed = TRUE;
+        }
+        if (!in_array('user_extrafield', $contact_notes)) {
+          $profile->setAttribute('map_as_contact_notes', array_merge($contact_notes, ['user_extrafield']));
+          $profile_changed = TRUE;
+        }
+        if ($profile_changed) {
+          $profile->saveProfile();
+        }
+      }
+    }
+
+    return TRUE;
+  }
+
 }

From 63b7e4d3eed502569bef8c437168210e347f051c Mon Sep 17 00:00:00 2001
From: Marc Michalsky <michalsky@forumzfd.de>
Date: Tue, 30 Apr 2024 15:43:44 +0200
Subject: [PATCH 4/5] add German translations

---
 l10n/de_DE/LC_MESSAGES/twingle.mo | Bin 6167 -> 7350 bytes
 l10n/de_DE/LC_MESSAGES/twingle.po |  36 ++++++++++++++++++++++++++++++
 l10n/pot/twingle.pot              |  36 ++++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+)

diff --git a/l10n/de_DE/LC_MESSAGES/twingle.mo b/l10n/de_DE/LC_MESSAGES/twingle.mo
index eff6c7e6ef72276b0d8a65e60300db9c0c5cd6fc..9fd805479ba6759289b95892b87803fec1e57720 100644
GIT binary patch
delta 2813
zcmcK4TWl0n9LMofD4@{N+F}7gI4F3*mP<h{rBn*GsFhoxDg-st-P3kxJ6mRUsbX*v
z6B1q^5+H_z7jHqMK1dBhKqZ012Oo&?>?J%9qlprufd@2xf3sVqMI#CEq-Q^8W@pa)
z=l}n2Uz>M)Y5Yw^@gc)l$DGPMIKr52EE&ZI<HTrVj^Igr9iJLw%vijNx8um$j9G%E
zxB#266n7$jW)B~C;C|HpZ(;?W!8&7NbAiR(oEXn;4`4M~Y{QAT11I4=)CNaU*Pp|2
zcoEC+CoI7~kXX$)qP!0)PysB(Vr;>gxE{-RzR9r|&xzeQ7Z2iWJckPCXM7MR@w9SW
ziJUSUQ4e|!wXwtbxD9pxk%FJ20{I22aWYZrg_^OH=bPtQEXH1(g>T~o`~sDM?~r@V
zRlEy}$!{x8M+Fk1Qojoo(1*ARPoOe$4Y}2n@Rs-BWF+aP9%F6X#6lZwK+0;iqHahR
zj<=)Q;YCyiVywhhQE&bhYQuL69>aS%K7}gPw>S-d$2)N<QR)6#<zE{%bK(j<jg-%<
z<K(g;V>aVSjt^15(>hP*D9{q_)^!tc5zat0;WMcH_M-xN16BL?P^J6?6~HBIz-yJ{
zU$t3AzUN^(T0DSiwvSMee~HuaGS0wqc2VYPu?ibdUEPLya2MW>+mUCP!>GVNK=slI
zWGizqW<hz(6>Py#?6v?mpqgnn*5b#gruhN2(MTFYr5cYaO%*<ZQ&BInwcuW?=J-?8
zK0l&fXd0WTH{#_iR<Kxuig+LLXO0&<kLrc*Q8)gEtvF$FJ_DWD#BqdbzLU5X&!9?C
zM#m~s7FB|3RN!s-^RaoBg)-oy-lQKD*{=KrW^dv9!$|PvC@Q6&p?cr~D&=3J_PK<!
z@mEv{r%%Z@VLcMN*@8-agq8aJ?_p6!vmHTg_&#@W_}5Un^|R5<bD1iW9<Yu%IMf?@
zTlK&bg_Ar#$qW@sGN-aW%2Y#Y%wjI%`N?SJQyr;VDeA#d&w|!SN}#kYWj@YSsfafj
zO6%ZIs+SZF7NKgctf|RYGWBy*nJn{RX8af*N}Gn#QpcopriQ8UBy)AL%GXu@Sk%GF
z)ZkdmLce!4;E2M>Ik=q3Pd*v?)o7?xYnW<oMr;=Hsed9Gs_V>TMTcW!Vf_%QH`Li0
z>W>v#437G~hE<{Svd(%ol?k$5Dr<ubhaH*FIxp2_JABuZwo#u;`7G1c4{Wx}k766S
z9+%4cnP5)++`fjfmcefIe#0ieug-4H<ZQ|dtP8yM9%tDt?MKN{cjtGF@|!uksoxJe
zd)%7FwT-KrTG`KU(4J;^bfMp#(-R3XzKIzB&k)BHVmvnbm7*@?Z+P}hA+Oh;=e;xG
z^<P}~LizXk*DsS>2VNfYQt_1axv(!2In(M=nJ{f<&9`2}L9Z8fA1E$4U)~nE&^Eo0
z4L#ee;thONQa2)AIHz{36513-S=U2JoF6#bqMCPSYu0A6{!ZI*_H<~sxwMOHGdEV-
zw3pN<?K|z+n2Y+ot{&?JovzchyTJNU_8+QG`8WE`cAq^S1YDHd9Va`oiQhY{+?MD2
zJA4;%X(r7TY4`V;A-ym(^ewr57o>ARXLK{s$F~;#tw!HCP*L_yQ9LBuu26{}$-5a+
z3UV>*>l<G8Kfb?lhn8^QRQak=Gq&`*RJWmRT-f175f^$rk!cKiUD!=JU2veZ>T=~u
W7v!=#U09QJQjPjy;9Av`qCWwjum7q5

delta 1624
zcmYk+Ur3Wt7{~E5o0>YE|E;O@W@&1soBwi|x=c+d3<lLj6pXYIBuOv4u?BT#LWF6S
zbrBI}1QjD82!g1K=)#NsP#^_aAVlV!{ipBmbwLN8ecpF-=RD^*&%0^=MQ`|Bx^vVp
z+K4=2cZ@M19CY%c5ob&yI4}WSSclnIg?lg=&)`Ztk7;-rHQ#Ma$7i?|XE7gh;*BXb
zCTwcBuz2GTCSe%ecotnafqci@#3H<dTHrM*$9dd<Ur^smCyNv;zzXzXDTc5Zhp`0j
zV=C*L_grX)i>QTuq9%@EyFQFZP2i8(iAv-gmf<w6!Z}nWe&H5OWYR)x#!NhhId~Ga
z(NXlUzPZLl5Fa9c#?7ZHtp}A*2kyYVs2yHHRb~nca2m<kyhZ-Z2VOMK0_y+1V=TsT
zlZr0Pz<dmAr#>z;L2c9~T+e+w>a2Qj4Gv)zPN61vgiH7W*|d4i_Uj$Syh0_AMz(rC
z4{Naq)jJ1KiHy0azZRb44V~#-EXK#Eg+5~=I{0suJb+$2iWZKecKiUd@hPg=W>NEg
z#f|t4m9WJkN~{`7uqloD>ukDtLuYpici}MV2;QI%UCdgEji|FeftqLt={qxuD)Cip
z!t3b8xu}_}UdDYZR$?EjqBp`^uu1a-1Nah^aTZx=p@yjYkSd#A)E5Uah!dy^EMP1C
zK=n+3@^#=&Wb<YW^?#G73P(_hhi9W7d_+}X5tY!N=zR)xRoCVrxtVIznYN=!97KKZ
z0G47m>bbvw>YaP2jm#jqnR#^6BfpV(!X}wdxwo?dyF9X)PzkjgJ<r>S|A!XQSV!pT
z(5N6*5ZbYa&`?$W4Lz3pzL`yglGXb5XjsPHxh|ElcCDc@`3VxXcMf)Q$|_<zp<gyN
zR5_tW)e+_r0YX1c^@RFEN1$V@AzFwGt=~py=uy<DBi0hNx`__@&>ng$)ktc}YC=u8
znow!g7aErRx_m6U+)U^wG}N301bt~gSuUNSMj;Vdia+g$d`cK_CI!0=_x5#Kg+41Z
yGLSM8+3)tpIKAb*#7I)cEk~p(t0mUWhh2R~LjC<+$E{FL|H!y!F>)o><M<0m1c_z<

diff --git a/l10n/de_DE/LC_MESSAGES/twingle.po b/l10n/de_DE/LC_MESSAGES/twingle.po
index 1bc928f..7aa0b4e 100644
--- a/l10n/de_DE/LC_MESSAGES/twingle.po
+++ b/l10n/de_DE/LC_MESSAGES/twingle.po
@@ -96,6 +96,26 @@ msgstr ""
 "Nur alphanumerische Zeichen und der Unterstrich (_) sind für Profilnamen "
 "erlaubt."
 
+#: CRM/Twingle/Form/Profile.php
+msgid "Create contribution notes for"
+msgstr "Zuwendungs-Notizen erstellen für"
+
+#: CRM/Twingle/Form/Profile.php ./api/v3/TwingleDonation/Submit.php
+msgid "Purpose"
+msgstr "Zweck"
+
+#: CRM/Twingle/Form/Profile.php ./api/v3/TwingleDonation/Submit.php
+msgid "Remarks"
+msgstr "Anmerkungen"
+
+#: CRM/Twingle/Form/Profile.php
+msgid "Create contact notes for"
+msgstr "Kontakt-Notizen erstellen für"
+
+#: CRM/Twingle/Form/Profile.php
+msgid "User Extra Field"
+msgstr "Benutzer-Extra-Feld"
+
 #: CRM/Twingle/Form/Profile.php
 msgid "CiviSEPA"
 msgstr "CiviSEPA"
@@ -231,6 +251,22 @@ msgstr "Zahlungsmethoden"
 msgid "Groups"
 msgstr "Gruppen"
 
+#: templates/CRM/Twingle/Form/Profile.tpl
+msgid "Create contribution note for"
+msgstr "Zuwendungs-Notiz erstellen für"
+
+#: templates/CRM/Twingle/Form/Profile.tpl
+msgid "Create contact note for"
+msgstr "Kontakt-Notiz erstellen für"
+
+#: templates/CRM/Twingle/Form/Profile.hlp
+msgid "<p>Create a contribution note for each field specified in this selection.</p>\n    <p><i>Tip: You can enable or disable this fields in the TwingleMANAGER.</i></p>"
+msgstr "<p>Erstelle eine Zuwendungs-Notiz für jedes Feld, das in dieser Auswahl angegeben ist.</p>\n    <p><i>Tipp: Sie können diese Felder im TwingleMANAGER aktivieren oder deaktivieren.</i></p>"
+
+#: templates/CRM/Twingle/Form/Profile.hlp
+msgid "<p>Create a contact note for each field specified in this selection.</p>\n    <p><i>Tip: You can enable or disable this fields in the TwingleMANAGER.</i></p>"
+msgstr "<p>Erstelle eine Kontakt-Notiz für jedes Feld, das in dieser Auswahl angegeben ist.</p>\n    <p><i>Tipp: Sie können diese Felder im TwingleMANAGER aktivieren oder deaktivieren.</i></p>"
+
 #: templates/CRM/Twingle/Form/Profile.tpl
 msgid "Are you sure you want to reset the default profile?"
 msgstr "Möchten Sie wirklich das Standard-Profil zurücksetzen?"
diff --git a/l10n/pot/twingle.pot b/l10n/pot/twingle.pot
index 868ab0a..7de3f72 100644
--- a/l10n/pot/twingle.pot
+++ b/l10n/pot/twingle.pot
@@ -74,6 +74,26 @@ msgstr ""
 msgid "Only alphanumeric characters and the underscore (_) are allowed for profile names."
 msgstr ""
 
+#: ./CRM/Twingle/Form/Profile.php
+msgid "Create contribution notes for"
+msgstr ""
+
+#: ./CRM/Twingle/Form/Profile.php ./api/v3/TwingleDonation/Submit.php
+msgid "Purpose"
+msgstr ""
+
+#: ./CRM/Twingle/Form/Profile.php ./api/v3/TwingleDonation/Submit.php
+msgid "Remarks"
+msgstr ""
+
+#: ./CRM/Twingle/Form/Profile.php
+msgid "Create contact notes for"
+msgstr ""
+
+#: ./CRM/Twingle/Form/Profile.php
+msgid "User Extra Field"
+msgstr ""
+
 #: ./CRM/Twingle/Form/Profile.php
 msgid "CiviSEPA"
 msgstr ""
@@ -206,6 +226,22 @@ msgstr ""
 msgid "Groups"
 msgstr ""
 
+#: ./templates/CRM/Twingle/Form/Profile.tpl
+msgid "Create contribution note for"
+msgstr ""
+
+#: ./templates/CRM/Twingle/Form/Profile.tpl
+msgid "Create contact note for"
+msgstr ""
+
+#: ./templates/CRM/Twingle/Form/Profile.hlp
+msgid "<p>Create a contribution note for each field specified in this selection.</p>\n    <p><i>Tip: You can enable or disable this fields in the TwingleMANAGER.</i></p>"
+msgstr ""
+
+#: ./templates/CRM/Twingle/Form/Profile.hlp
+msgid "<p>Create a contact note for each field specified in this selection.</p>\n    <p><i>Tip: You can enable or disable this fields in the TwingleMANAGER.</i></p>"
+msgstr ""
+
 #: ./templates/CRM/Twingle/Form/Profile.tpl
 msgid "Are you sure you want to reset the default profile?"
 msgstr ""

From f5723a4e7d030617062d54deece8bbc286f5001d Mon Sep 17 00:00:00 2001
From: Marc Michalsky <michalsky@forumzfd.de>
Date: Thu, 6 Jun 2024 11:57:32 +0200
Subject: [PATCH 5/5] fix obsolete use of CRM_Utils_Array::first()

---
 api/v3/TwingleDonation/Submit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/v3/TwingleDonation/Submit.php b/api/v3/TwingleDonation/Submit.php
index 2466575..2ffbdd2 100644
--- a/api/v3/TwingleDonation/Submit.php
+++ b/api/v3/TwingleDonation/Submit.php
@@ -814,7 +814,7 @@ function civicrm_api3_twingle_donation_Submit($params) {
       ) {
         civicrm_api3('Note', 'create', [
           'entity_table' => 'civicrm_contribution',
-          'entity_id' => CRM_Utils_Array::first($result_values['contribution'])['id'],
+          'entity_id' => $result_values['contribution']['id'],
           'note' => $params[$target],
         ]);
       }