merged changes

diff --git a/trustcommerceIPN.php b/trustcommerceIPN.php
index a7c7be3a87ece113773eec9dcbd4e569123b651b..28ce87bca51a0f882918c88dce6e1e7798d66aaa 100644 (file)
--- a/trustcommerceIPN.php
+++ b/trustcommerceIPN.php
@@ -173,7 +173,7 @@ EOF;
 
   protected function checkDuplicate($input, $ids) {
 //    $sql='select id from civicrm_contribution where receive_date like \''.$input['date'].'%\' and total_amount='.$input['amount'].' and contact_id='.$ids['contact'].' and contribution_status_id =  1 limit 1';
-    $sql="select id from civicrm_contribution where trxn_id = '".$ids['trxn_id']."'";
+    $sql="select id from civicrm_contribution where trxn_id = '".$ids['trxn_id']."' and contribution_status_id != 2";
 
 
     $result = CRM_Core_DAO::executeQuery($sql);
@@ -282,6 +282,9 @@ EOF;
       echo $msg;
       CRM_Core_Error::debug_log_message($msg);
 
+      /* Disable cancelling transactions */
+      $input['skipComponentSync'] = 1;
+
       /* Action for repeated failures */
       if(MAX_FAILURES <= $this->getLastFailures($ids['contributionRecur'])) {
        //$this->disableAutoRenew(($ids['contributionRecur']));
@@ -323,7 +326,7 @@ EOF;
 
     if (!$ids['contributionRecur']) {
       CRM_Core_Error::debug_log_message("Could not find billingid: ".$billingid);
-      echo "Failure: Could not find contributionRecur<p>\n";
+      echo "Failure: Could not find contributionRecur: $billingid <p>\n";
       exit();
     }