CRM-13973 : client side behavior improvement

diff --git a/CRM/Event/Form/ParticipantFeeSelection.php b/CRM/Event/Form/ParticipantFeeSelection.php
index 467bcdd3d47981edb8c08374c72d9cdacf9b7f4b..4928b7e6f73becd3234f454e10475558e4ffcdfc 100644 (file)
--- a/CRM/Event/Form/ParticipantFeeSelection.php
+++ b/CRM/Event/Form/ParticipantFeeSelection.php
@@ -60,6 +60,8 @@ class CRM_Event_Form_ParticipantFeeSelection extends CRM_Core_Form {
 
   public $_participantId = NULL;
 
+  protected $_participantStatus = NULL;
+
   public function preProcess() {
     $this->_participantId = CRM_Utils_Request::retrieve('id', 'Positive', $this, TRUE);
     $this->_contactId = CRM_Utils_Request::retrieve('cid', 'Positive', $this, TRUE);
@@ -76,6 +78,7 @@ class CRM_Event_Form_ParticipantFeeSelection extends CRM_Core_Form {
     $this->assign('displayName', $this->_contributorDisplayName);
     $this->assign('email', $this->_contributorEmail);
 
+    $this->_participantStatus = CRM_Core_DAO::getFieldValue('CRM_Event_BAO_Participant', $this->_participantId, 'status_id');
     //set the payment mode - _mode property is defined in parent class
     $this->_mode = CRM_Utils_Request::retrieve('mode', 'String', $this);
 
@@ -121,6 +124,7 @@ class CRM_Event_Form_ParticipantFeeSelection extends CRM_Core_Form {
     CRM_Core_Resources::singleton()->addSetting(array(
         'partiallyPaid' => array_search('Partially paid', $statuses),
         'pendingRefund' => array_search('Pending refund', $statuses),
+        'participantStatus' => $this->_participantStatus
       ));
 
     $config = CRM_Core_Config::singleton();

diff --git a/templates/CRM/Event/Form/ParticipantFeeSelection.tpl b/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
index 8e13facf3d9e4bc7693f1fbf6b53ea879fa8d7ae..97ca631c9aa8d27367e72c7cb3d420569540d703 100644 (file)
--- a/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
+++ b/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
@@ -32,25 +32,49 @@ function display(totalfee) {
   totalfee = Math.round(totalfee*100)/100;
   // note : some variables used used here are global variables defined inside Calculate.tpl
   var totalEventFee  = formatMoney( totalfee, 2, seperator, thousandMarker);
-  document.getElementById('pricevalue').innerHTML = "<b>"+symbol+"</b> "+totalEventFee;
+  cj('#pricevalue').html("<b>"+symbol+"</b> "+totalEventFee);
   scriptfee   = totalfee;
   scriptarray = price;
-  cj('#total_amount').val( totalfee );
+  cj('#total_amount').val(totalfee);
   ( totalfee < 0 ) ? cj('table#pricelabel').addClass('disabled') : cj('table#pricelabel').removeClass('disabled');
 
   // populate the balance amount div
-  populatebalanceFee();
+  // change the status selections according to updated selections
+  populatebalanceFee(totalEventFee);
 }
 
-function populatebalanceFee() {
+function populatebalanceFee(updatedAmt) {
   // calculate the balance amount using total paid and updated amount
-  var updatedFeeUnFormatted = cj('#pricevalue').text();
-  var updatedAmt = parseFloat(updatedFeeUnFormatted.replace(/[^0-9-.]/g, ''));
   var balanceAmt = updatedAmt - CRM.feePaid;
+  // change the status selections according to updated selections
+  if (balanceAmt > 0) {
+    cj('#status_id').val(CRM.partiallyPaid);
+  }
+  else if(balanceAmt < 0) {
+    cj('#status_id').val(CRM.pendingRefund);
+  }
+  else if(balanceAmt == 0) {
+    cj('#status_id').val(CRM.participantStatus);
+  }
+
   balanceAmt = formatMoney(balanceAmt, 2, seperator, thousandMarker);
   cj('#balance-fee').text(symbol+" "+balanceAmt);
 }
 
+cj(function(){
+  var updatedFeeUnFormatted = cj('#pricevalue').text();
+  var updatedAmt = parseFloat(updatedFeeUnFormatted.replace(/[^0-9-.]/g, ''));
+  var balanceAmt = updatedAmt - CRM.feePaid;
+
+  // change the status selections according to updated selections
+  if (balanceAmt > 0) {
+    cj('#status_id').val(CRM.partiallyPaid);
+  } 
+  else if(balanceAmt < 0) {
+    cj('#status_id').val(CRM.pendingRefund);
+  } 
+});
+
 {/literal}
 </script>
 <h3>Change Registration Selections</h3>
@@ -157,26 +181,26 @@ function populatebalanceFee() {
 <script type='text/javascript'>
 cj(function($){
   cj('.total_amount-section').remove(); 
-
-cj('#ParticipantFeeSelection').submit(function(e) {
-  var statusId = cj('#status_id').val();
-  var statusLabel = cj('#status_id option:selected').text(); 
-  var balanceFee = cj('#balance-fee').text();
-  balanceFee = parseFloat(balanceFee.replace(/[^0-9-.]/g, ''));
   
-  if (balanceFee > 0 && statusId != CRM.partiallyPaid) {
-    var result = confirm('Balance is owing for the updated selections. Expected participant status is \'Partially paid\'. Are you sure you want to set the participant status to ' + statusLabel + ' ? Click OK to continue, Cancel to change your entries.');
-    if (result == false) {
-      e.preventDefault();
+  cj('#ParticipantFeeSelection').submit(function(e) {
+    var statusId = cj('#status_id').val();
+    var statusLabel = cj('#status_id option:selected').text(); 
+    var balanceFee = cj('#balance-fee').text();
+    balanceFee = parseFloat(balanceFee.replace(/[^0-9-.]/g, ''));
+  
+    if (balanceFee > 0 && statusId != CRM.partiallyPaid) {
+      var result = confirm('Balance is owing for the updated selections. Expected participant status is \'Partially paid\'. Are you sure you want to set the participant status to ' + statusLabel + ' ? Click OK to continue, Cancel to change your entries.');
+      if (result == false) {
+        e.preventDefault();
+      }
     }
-  }
-  else if (balanceFee < 0 && statusId != CRM.pendingRefund) {
-    var result = confirm('Balance is overpaid for the updated selections. Expected participant status is \'Pending refund\'. Are you sure you want to set the participant status to ' + statusLabel + ' ? Click OK to continue, Cancel to change your entries');
-    if (result == false) {
-      e.preventDefault();
+    else if (balanceFee < 0 && statusId != CRM.pendingRefund) {
+      var result = confirm('Balance is overpaid for the updated selections. Expected participant status is \'Pending refund\'. Are you sure you want to set the participant status to ' + statusLabel + ' ? Click OK to continue, Cancel to change your entries');
+      if (result == false) {
+        e.preventDefault();
+      }
     }
-  }
-});
+  });
 });
 </script>
 {/literal}
\ No newline at end of file