Merge pull request #15500 from eileenmcnaughton/part_cleanup

Switch creation of ParticipantPayment to use API
civicrm · Oct 14, 2019 · 3bb78d8 · 3bb78d8
2 parents 62ef7a8 + f55a8ac
commit 3bb78d8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/CRM/Event/Cart/Form/Checkout/Payment.php b/CRM/Event/Cart/Form/Checkout/Payment.php
@@ -82,11 +82,11 @@ public function registerParticipant($params, &$participant, $event) {
     $participant->save();
 
     if (!empty($params['contributionID'])) {
-      $payment_params = [
+      $participantPaymentParams = [
         'participant_id' => $participant->id,
         'contribution_id' => $params['contributionID'],
       ];
-      CRM_Event_BAO_ParticipantPayment::create($payment_params);
+      civicrm_api3('ParticipantPayment', 'create', $participantPaymentParams);
     }
 
     $transaction->commit();

diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php
@@ -1316,13 +1316,14 @@ public function submit($params) {
         $participants[0]->id,
         'Participant'
       );
-      //add participant payment
-      $paymentParticipant = [
+
+      // Add participant payment
+      $participantPaymentParams = [
         'participant_id' => $participants[0]->id,
         'contribution_id' => $contribution->id,
       ];
+      civicrm_api3('ParticipantPayment', 'create', $participantPaymentParams);
 
-      CRM_Event_BAO_ParticipantPayment::create($paymentParticipant);
       $this->_contactIds[] = $this->_contactId;
     }
     else {
@@ -1472,13 +1473,14 @@ public function submit($params) {
           }
         }
 
-        //insert payment record for this participation
+        // Insert payment record for this participant
         if (empty($ids['contribution'])) {
           foreach ($this->_contactIds as $num => $contactID) {
-            $ppDAO = new CRM_Event_DAO_ParticipantPayment();
-            $ppDAO->participant_id = $participants[$num]->id;
-            $ppDAO->contribution_id = $contributions[$num]->id;
-            $ppDAO->save();
+            $participantPaymentParams = [
+              'participant_id' => $participants[$num]->id,
+              'contribution_id' => $contributions[$num]->id,
+            ];
+            civicrm_api3('ParticipantPayment', 'create', $participantPaymentParams);
           }
         }
 

diff --git a/CRM/Event/Form/Registration.php b/CRM/Event/Form/Registration.php
@@ -695,6 +695,8 @@ public static function initEventFee(&$form, $eventID) {
    *
    * @param int $contactID
    * @param \CRM_Contribute_BAO_Contribution $contribution
+   *
+   * @throws \CiviCRM_API3_Exception
    */
   public function confirmPostProcess($contactID = NULL, $contribution = NULL) {
     // add/update contact information
@@ -742,11 +744,11 @@ public function confirmPostProcess($contactID = NULL, $contribution = NULL) {
     }
 
     if ($createPayment && $this->_values['event']['is_monetary'] && !empty($this->_params['contributionID'])) {
-      $paymentParams = array(
+      $paymentParams = [
         'participant_id' => $participant->id,
         'contribution_id' => $contribution->id,
-      );
-      $paymentPartcipant = CRM_Event_BAO_ParticipantPayment::create($paymentParams);
+      ];
+      civicrm_api3('ParticipantPayment', 'create', $paymentParams);
     }
 
     $this->assign('action', $this->_action);
@@ -790,6 +792,7 @@ public function confirmPostProcess($contactID = NULL, $contribution = NULL) {
    * @param int $contactID
    *
    * @return \CRM_Event_BAO_Participant
+   * @throws \CiviCRM_API3_Exception
    */
   public static function addParticipant(&$form, $contactID) {
     if (empty($form->_params)) {