Merge pull request civicrm#10716 from jitendrapurohit/CRM-20933

CRM-20933 - Updating Pay later event registration from backend produc…
MegaphoneJon · Aug 12, 2017 · 45c3cac · 45c3cac
2 parents 5143b9a + 610d2da
commit 45c3cac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CRM/Event/Form/EventFees.php b/CRM/Event/Form/EventFees.php
@@ -226,6 +226,7 @@ public static function setDefaultValues(&$form) {
 
     // CRM-4395
     if ($contriId = $form->get('onlinePendingContributionId')) {
+      $defaults[$form->_pId]['record_contribution'] = 1;
       $contribution = new CRM_Contribute_DAO_Contribution();
       $contribution->id = $contriId;
       $contribution->find(TRUE);

diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php
@@ -815,7 +815,9 @@ public static function formRule($values, $files, $self) {
       if (empty($values['payment_instrument_id'])) {
         $errorMsg['payment_instrument_id'] = ts('Payment Method is a required field.');
       }
-      CRM_Price_BAO_PriceField::priceSetValidation($values['priceSetId'], $values, $errorMsg);
+      if (!empty($values['priceSetId'])) {
+        CRM_Price_BAO_PriceField::priceSetValidation($values['priceSetId'], $values, $errorMsg);
+      }
     }
 
     // validate contribution status for 'Failed'.