From 13bb29e437eff42e9d19b87989a9e4e41b063bb1 Mon Sep 17 00:00:00 2001
From: Pratiksha Dubey <pratiksha.dubey@webaccessglobal.com>
Date: Wed, 6 Aug 2014 20:27:21 +0530
Subject: [PATCH] VAT-578-source remove extra spaces and code indentation

---
 CRM/Event/Form/Participant.php          | 4 ++--
 CRM/Event/Form/Registration/Confirm.php | 2 +-
 CRM/Member/BAO/Membership.php           | 6 ++----
 CRM/Member/Form/Membership.php          | 6 ++----
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php
index 624d429d3d..fec6a25b1c 100644
--- a/CRM/Event/Form/Participant.php
+++ b/CRM/Event/Form/Participant.php
@@ -1339,10 +1339,10 @@ class CRM_Event_Form_Participant extends CRM_Contact_Form_Task {
         //build contribution params
         if (!$this->_onlinePendingContributionId) {
           if (empty($params['source'])) { 
-            $contributionParams['source'] = "{$eventTitle}: Offline registration (by {$userName})";
+            $contributionParams['source'] = ts('%1 : Offline registration (by %2)', array(1 => $eventTitle, 2 => $userName));
           }                                                           
           else {                                                     
-              $contributionParams['source'] = $params['source'];                                                             
+            $contributionParams['source'] = $params['source'];                                                             
           }                                                          
         } 
 
diff --git a/CRM/Event/Form/Registration/Confirm.php b/CRM/Event/Form/Registration/Confirm.php
index fd65d6f727..7ea5098195 100644
--- a/CRM/Event/Form/Registration/Confirm.php
+++ b/CRM/Event/Form/Registration/Confirm.php
@@ -877,7 +877,7 @@ class CRM_Event_Form_Registration_Confirm extends CRM_Event_Form_Registration {
       'amount_level' => $params['amount_level'],
       'invoice_id' => $params['invoiceID'],
       'currency' => $params['currencyID'],
-      'source' => !empty($params['participant_source']) ? CRM_Utils_Array::value('participant_source', $params) : CRM_Utils_Array::value('description', $params),
+      'source' => !empty($params['participant_source']) ? $params['participant_source'] : $params['description'],
       'is_pay_later' => CRM_Utils_Array::value('is_pay_later', $params, 0),
       'campaign_id' => CRM_Utils_Array::value('campaign_id', $params),
     );
diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
index 8b83718c8e..8acad9eb49 100644
--- a/CRM/Member/BAO/Membership.php
+++ b/CRM/Member/BAO/Membership.php
@@ -1270,10 +1270,8 @@ AND civicrm_membership.is_test = %2";
         $contributionTypeId = CRM_Utils_Array::value('financial_type_id' ,$membershipParams);
       }
     }
-    
-    if (CRM_Utils_Array::value('membership_source', $form->_params)) {
-      $membershipParams['contribution_source'] = $form->_params['membership_source'];
-    }
+        
+    $membershipParams['contribution_source'] = $form->_params['membership_source'];
  
     //amount must be greater than zero for
     //adding contribution record  to contribution table.
diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php
index c21251630f..3166210acf 100644
--- a/CRM/Member/Form/Membership.php
+++ b/CRM/Member/Form/Membership.php
@@ -1299,12 +1299,10 @@ WHERE   id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
 
       if (!$this->_onlinePendingContributionId) {
         if (empty($formValues['source'])) {
-          $params['contribution_source'] = ts('%1 Membership: Offline signup (by %2)',
-                                                  array(1 => $membershipType, 2 => $userName)
-                                                  );
+          $params['contribution_source'] = ts('%1 Membership: Offline signup (by %2)', array(1 => $membershipType, 2 => $userName));
         }
         else {
-            $params['contribution_source'] = $formValues['source'];	
+          $params['contribution_source'] = $formValues['source'];	
         }
       }	
 
-- 
2.25.1