From 9fa00ed176043c6cbed0e4875eb6a0407ed54ca4 Mon Sep 17 00:00:00 2001
From: moremanish <manish.more@webaccess.co.in>
Date: Wed, 3 Dec 2014 12:32:32 +0530
Subject: [PATCH] QA fixes

---
 CRM/Batch/BAO/Batch.php                       |  6 +-
 CRM/Batch/Form/Batch.php                      |  3 -
 CRM/Pledge/BAO/PledgePayment.php              |  3 +-
 CRM/Pledge/Page/AJAX.php                      | 23 +-----
 .../Incremental/sql/4.6.alpha1.mysql.tpl      |  5 +-
 templates/CRM/Batch/Form/Entry.js             | 71 ----------------
 templates/CRM/Batch/Form/Entry.tpl            | 80 ++++++++++++++-----
 7 files changed, 71 insertions(+), 120 deletions(-)
 mode change 100644 => 100755 CRM/Batch/BAO/Batch.php
 mode change 100644 => 100755 CRM/Batch/Form/Batch.php
 mode change 100644 => 100755 CRM/Pledge/Page/AJAX.php
 mode change 100644 => 100755 CRM/Upgrade/Incremental/sql/4.6.alpha1.mysql.tpl
 mode change 100644 => 100755 templates/CRM/Batch/Form/Entry.js
 mode change 100644 => 100755 templates/CRM/Batch/Form/Entry.tpl

diff --git a/CRM/Batch/BAO/Batch.php b/CRM/Batch/BAO/Batch.php
old mode 100644
new mode 100755
index a84b889026..59a0ed3beb
--- a/CRM/Batch/BAO/Batch.php
+++ b/CRM/Batch/BAO/Batch.php
@@ -106,7 +106,8 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch {
     //retrieve the profile specific to batch type
     switch ($batchTypeId) {
       case 1:
-        //batch profile used for contribution
+      case 3:
+        //batch profile used for pledges
         $profileName = "contribution_batch_entry";
         break;
 
@@ -114,9 +115,6 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch {
         //batch profile used for memberships
         $profileName = "membership_batch_entry";
         break;
-      default:
-        //batch profile used for pledges
-        $profileName = "contribution_batch_entry";
     }
 
     // get and return the profile id
diff --git a/CRM/Batch/Form/Batch.php b/CRM/Batch/Form/Batch.php
old mode 100644
new mode 100755
index 035c472f66..1ba9b10bcb
--- a/CRM/Batch/Form/Batch.php
+++ b/CRM/Batch/Form/Batch.php
@@ -65,9 +65,6 @@ class CRM_Batch_Form_Batch extends CRM_Admin_Form {
 
     $batchTypes = CRM_Batch_BAO_Batch::buildOptions('type_id');
 
-    // unset non-related types
-    //unset($batchTypes[3]);
-    //unset($batchTypes[4]);
     $type = $this->add('select', 'type_id', ts('Type'), $batchTypes);
 
     if ($this->_action & CRM_Core_Action::UPDATE) {
diff --git a/CRM/Pledge/BAO/PledgePayment.php b/CRM/Pledge/BAO/PledgePayment.php
index 53a8064313..77a9c88294 100644
--- a/CRM/Pledge/BAO/PledgePayment.php
+++ b/CRM/Pledge/BAO/PledgePayment.php
@@ -694,7 +694,7 @@ WHERE  civicrm_pledge_payment.id = {$paymentId}
     $statusClause = " IN (" . implode(',', $status) . ")";
 
     $query = "
-SELECT civicrm_pledge_payment.id id, civicrm_pledge_payment.scheduled_amount amount, civicrm_pledge_payment.currency
+SELECT civicrm_pledge_payment.id id, civicrm_pledge_payment.scheduled_amount amount, civicrm_pledge_payment.currency, civicrm_pledge_payment.scheduled_date
 FROM civicrm_pledge, civicrm_pledge_payment
 WHERE civicrm_pledge.id = civicrm_pledge_payment.pledge_id
   AND civicrm_pledge_payment.status_id {$statusClause}
@@ -713,6 +713,7 @@ LIMIT 0, %2
         'id' => $payment->id,
         'amount' => $payment->amount,
         'currency' => $payment->currency,
+        'schedule_date' => $payment->scheduled_date,
         'count' => $count,
       );
       $count++;
diff --git a/CRM/Pledge/Page/AJAX.php b/CRM/Pledge/Page/AJAX.php
old mode 100644
new mode 100755
index cb8ae8906e..59de5ef66c
--- a/CRM/Pledge/Page/AJAX.php
+++ b/CRM/Pledge/Page/AJAX.php
@@ -90,26 +90,9 @@ WHERE {$whereClause}
     * Function to setDefaults according to Pledge Id
     * for batch entry pledges
     */
-  function getPledgeDefaults($config) {
-    if (!$_POST['mtype']) {
-      $details['scheduled_amount'] = '';
-      echo json_encode($details);
-      CRM_Utils_System::civiExit();
-    }
-    $memType = CRM_Utils_Type::escape($_POST['mtype'], 'Integer');
-    $query = "SELECT min(id),scheduled_amount
-  FROM civicrm_pledge_payment
-  WHERE pledge_id = %1 and status_id != 1";
-    $dao = CRM_Core_DAO::executeQuery($query, array(1 => array($memType, 'Positive')));
-    $properties = array( 'scheduled_amount');
-    while ($dao->fetch()) {
-      foreach ($properties as $property) {
-        $details[$property] = $dao->$property;
-      }
-    }
-    $details['total_amount_numeric'] = $details['total_amount'];
-    // fix the display of the monetary value, CRM-4038
-    $details['scheduled_amount'] = CRM_Utils_Money::format($details['scheduled_amount'], NULL, '%a');
+  function getPledgeDefaults() {
+    $pledgeID = CRM_Utils_Type::escape($_POST['pid'], 'Integer');
+    $details = CRM_Pledge_BAO_PledgePayment::getOldestPledgePayment($pledgeID);
     echo json_encode($details);
     CRM_Utils_System::civiExit();
   }
diff --git a/CRM/Upgrade/Incremental/sql/4.6.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.alpha1.mysql.tpl
old mode 100644
new mode 100755
index f474c5af2f..61c3a09cfe
--- a/CRM/Upgrade/Incremental/sql/4.6.alpha1.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.6.alpha1.mysql.tpl
@@ -74,5 +74,6 @@ SELECT @option_group_id := id FROM civicrm_option_group WHERE name = 'batch_type
 
 SELECT @max_option_value:= max(value) FROM civicrm_option_value WHERE option_group_id = @option_group_id;
 
-INSERT INTO civicrm_option_value(option_group_id, {localize field='label'}`label`{/localize}, value, name)
-VALUES (@option_group_id, {localize}'{ts escape="sql"}Pledge{/ts}'{/localize}, @max_option_value+1, 'Pledge');
\ No newline at end of file
+INSERT INTO civicrm_option_value(option_group_id, {localize field='label'}`label`{/localize}, value, name,weight)
+VALUES (@option_group_id, {localize}'{ts escape="sql"}Pledge{/ts}'{/localize}, @max_option_value+1, 'Pledge','3');
+
diff --git a/templates/CRM/Batch/Form/Entry.js b/templates/CRM/Batch/Form/Entry.js
old mode 100644
new mode 100755
index 149b448e5e..f75467c97e
--- a/templates/CRM/Batch/Form/Entry.js
+++ b/templates/CRM/Batch/Form/Entry.js
@@ -57,7 +57,6 @@ CRM.$(function($) {
   $('select[id*="_membership_type_0"]').change(function () {
     setPaymentBlock($(this), null);
   });
-
   $('select[id*="_membership_type_1"]').change(function () {
     setPaymentBlock($(this), $(this).val());
   });
@@ -74,76 +73,6 @@ CRM.$(function($) {
 });
 
 
-function updateContactInfo(blockNo, prefix) {
-  var contactHiddenElement = 'input[name="' + prefix + 'contact_select_id[' + blockNo + ']"]';
-  var contactId = cj(contactHiddenElement).val();
-
-  var profileFields = CRM.contact.fieldmap;
-
-  CRM.api('Contact', 'get', {
-      'sequential': '1',
-      'contact_id': contactId,
-      'return': CRM.contact.return },
-    { success: function (data) {
-      cj.each(data.values[0], function (key, value) {
-        // set the values
-        var actualFldName = profileFields[key];
-        if (key == 'country' || key == 'state_province') {
-          idFldName = key + '_id';
-          value = data.values[0][idFldName];
-        }
-        setFieldValue(actualFldName, value, blockNo)
-      });
-
-      // for membership batch entry based on contact we need to enable / disable
-      // add membership select
-      if(CRM.batch.type_id == 2) {
-      CRM.api('Membership', 'get', {
-          'sequential': '1',
-          'contact_id': contactId
-        },
-        { success: function (data) {
-          if (data.count > 0) {
-            //get the information on membership type
-            var membershipTypeId = data.values[0].membership_type_id;
-            var membershipJoinDate = data.values[0].join_date;
-            CRM.api('MembershipType', 'get', {
-                'sequential': '1',
-                'id': membershipTypeId
-              },
-              { success: function (data) {
-                var memTypeContactId = data.values[0].member_of_contact_id;
-                cj('select[id="member_option_' + blockNo + '"]').prop('disabled', false).val(2);
-                cj('select[id="field_' + blockNo + '_membership_type_0"]').val(memTypeContactId).change();
-                cj('select[id="field_' + blockNo + '_membership_type_1"]').val(membershipTypeId).change();
-                setDateFieldValue('join_date', membershipJoinDate, blockNo)
-              }
-              });
-          }
-        }
-        });
-      }
-      if (CRM.batch.type_id == 3) {
-	 CRM.api('Pledge', 'get', {
-	  'q': 'civicrm/ajax/rest',
-	  'sequential': 1,
-	 'contact_id': contactId
-	 },
-	{success: function(data) {
-	 cj.each(data['values'], function(key, value) {
-	  if (value['pledge_status']!='Completed'){
-	    cj('#open_pledges_'+ blockNo).append(cj('<option>', {
-		value: value['pledge_id'],
-		text: value['pledge_next_pay_date']+" "+value['pledge_next_pay_amount']
-		}));
-	     }
-	   });
-	 }
-        });
-       }
-      }
-      });
-     }
 
 function setPaymentBlock(form, memType) {
   var rowID = form.closest('div.crm-grid-row').attr('entity_id');
diff --git a/templates/CRM/Batch/Form/Entry.tpl b/templates/CRM/Batch/Form/Entry.tpl
old mode 100644
new mode 100755
index 8caa65512a..48ba1a568f
--- a/templates/CRM/Batch/Form/Entry.tpl
+++ b/templates/CRM/Batch/Form/Entry.tpl
@@ -52,10 +52,10 @@
     <div class="crm-grid-header">
       <div class="crm-grid-cell">&nbsp;</div>
       <div class="crm-grid-cell">{ts}Contact{/ts}</div>
-      {if $batchType eq 2 }
+      {if $batchType eq 2}
         <div class="crm-grid-cell">&nbsp;</div>
       {/if}
-      {if $batchType eq $batchoptionvalue }
+      {if $batchType eq 3}
         <div class="crm-grid-cell">{$form.open_pledges.1.label}</div>
       {/if}
       {foreach from=$fields item=field key=fieldName}
@@ -79,10 +79,10 @@
           {$form.primary_contact_id.$rowNumber.html|crmAddClass:big}
         </div>
 
-        {if $batchType eq 2 }
+        {if $batchType eq 2}
           {$form.member_option.$rowNumber.html}
         {/if}
-        {if $batchType eq $batchoptionvalue }
+        {if $batchType eq 3}
           {$form.open_pledges.$rowNumber.html}
         {/if}
         {foreach from=$fields item=field key=fieldName}
@@ -102,7 +102,7 @@
           {elseif in_array( $fields.$n.html_type, array('Radio', 'CheckBox'))}
             <div class="compressed crm-grid-cell">&nbsp;{$form.field.$rowNumber.$n.html}</div>
           {elseif $n eq 'total_amount'}
-             {if $batchType eq $batchoptionvalue }
+             {if $batchType eq 3 }
 	      <div class="compressed crm-grid-cell">{$form.field.$rowNumber.$n.html}
 		{ts}<span id={$rowNumber} class="pledge-adjust-option"><a href='#'>adjust payment amount</a></span>{/ts}
              <span id="adjust-select-{$rowNumber}" class="adjust-selectbox">{$form.option_type.$rowNumber.html}</span></div>
@@ -123,10 +123,17 @@ CRM.$(function($) {
   $('.selector-rows').change(function () {
     var options = {
       'url': {/literal}"{crmURL p='civicrm/ajax/batch' h=0}"{literal}
-    };
-
+    }; 
     $($form).ajaxSubmit(options);
   });
+ 
+ cj('input[id*="primary_contact_"]').change(function() {
+ var temp = this.id.split('_');
+   var ROWID = temp[3];
+   if (cj(this).val()) {
+     updateContactInfo(ROWID,'primary_');
+   }
+ });
 
  cj('select[id^="option_type_"]').each(function () {
     if (cj(this).val() == 1) {
@@ -159,7 +166,7 @@ CRM.$(function($) {
     showHideReceipt($(this));
   });
 
-  {/literal}{else}{literal}
+  {/literal}{elseif $batchType eq 2}{literal}
   $('select[id^="member_option_"]').each(function () {
     if ($(this).val() == 1) {
       $(this).prop('disabled', true);
@@ -306,7 +313,7 @@ function formatMoney(amount) {
 }
 
 function updateContactInfo(blockNo, prefix) {
-  var contactHiddenElement = 'input[name="' + prefix + 'contact_select_id[' + blockNo + ']"]';
+  var contactHiddenElement = 'input[id="' + prefix + 'contact_id_' + blockNo + '"]';
   var contactId = cj(contactHiddenElement).val();
 
   var returnProperties = '';
@@ -369,6 +376,28 @@ function updateContactInfo(blockNo, prefix) {
           }
         }
         });
+      {/literal}{elseif $batchType eq 3}{literal}
+      cj('#open_pledges_'+blockNo).empty();
+         cj('#open_pledges_'+blockNo).append(cj('<option>', {
+			    value: '',
+			    text: '-select-'
+			}));
+	 CRM.api('Pledge', 'get', {
+	  'sequential': 1,
+	 'contact_id': contactId || 0
+	 },
+	{success: function(data) {
+	 cj.each(data['values'], function(key, value) {
+	  if (value['pledge_status'] != 'Completed') {
+	  var date = cj.datepicker.parseDate('yy-mm-dd', value['pledge_next_pay_date']);
+	    cj('#open_pledges_'+ blockNo).append(cj('<option>', {
+		value: value['pledge_id'],
+		text: cj.datepicker.formatDate('yy-mm-dd', date) + ", " + value['pledge_next_pay_amount'] + ' ' + value['pledge_currency']
+		}));
+	     }
+	   });
+	 }
+        });
       {/literal}{/if}{literal}
     }
     });
@@ -481,23 +510,36 @@ function setDateFieldValue(fname, fieldValue, blockNo) {
     cj('#field_' + blockNo + '_' + fname + '_time').val(dateValues[1].substr(0, 5));
   }
 }
- if (CRM.batch.type_id == {/literal}{$batchoptionvalue}{literal}){
-	cj('select[id*="open_pledges_"]').change(function () {
-	    setPledgeAmount(cj(this), cj(this).val());
-	});
-    }
- function setPledgeAmount(form, memType) {
+
+if (CRM.batch.type_id == 3){
+  cj('select[id*="open_pledges_"]').change(function () {
+    setPledgeAmount(cj(this), cj(this).val());
+  });
+  cj('.pledge-adjust-option').click(function(){
+    var blockNo = cj(this).attr('id');
+    cj('select[id="option_type_' + blockNo + '"]').show();
+    cj('select[id="option_type_' + blockNo + '"]').removeAttr('disabled');
+    cj('#field_' + blockNo + '_total_amount').removeAttr('readonly');
+  });
+}
+
+function setPledgeAmount(form, pledgeID) {
   var rowID = form.closest('div.crm-grid-row').attr('entity_id');
   var dataUrl = CRM.url('civicrm/ajax/pledgeAmount');
-  cj.post(dataUrl, {mtype: memType}, function (data) {
-    cj('#field_' + rowID + '_total_amount').val(data.scheduled_amount).change();
+  if (pledgeID) { 
+    cj.post(dataUrl, {pid: pledgeID}, function (data) {
+    cj('#field_' + rowID + '_total_amount').val(data.amount).change();
     cj('#field_' + rowID + '_total_amount').attr('readonly', true);
-  }, 'json');
+    }, 'json');
+  }
+  else {
+    cj('#field_' + rowID + '_total_amount').val('').change();
+    cj('#field_' + rowID + '_total_amount').removeAttr('readonly');
+  }
 }
 
 //end for pledge amount
 </script>
 {/literal}
-
 {*include batch copy js js file*}
 {include file="CRM/common/batchCopy.tpl"}
-- 
2.25.1