- CRM-11026 notice fixes and cleanups

civicrm · Nov 28, 2012 · 82f9f9b · 82f9f9b
1 parent 20b2853
commit 82f9f9b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 23 deletions.
diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
@@ -357,7 +357,7 @@ static function &create(&$params, &$ids, $skipRedirect = FALSE, $activityType =
       if ( CRM_Utils_Array::value('to_financial_account_id', $params ) ){
 
         $now = date( 'YmdHis' );
-        $contribution->init_amount = $params['init_amount'];
+        $contribution->init_amount = CRM_Utils_Array::value( 'init_amount', $params );
         if( !empty( $contribution->id ) ){
           if(!empty($params['init_amount'])){
             $total_amount = 0;
@@ -368,17 +368,17 @@ static function &create(&$params, &$ids, $skipRedirect = FALSE, $activityType =
             }
           }
           $trxnParams = array(
-                              'contribution_id'         => $contribution->id,
-                              'to_financial_account_id' => $params['to_financial_account_id'],
-                              'trxn_date'               => $now,
-                              'total_amount'            => !empty($params['init_amount'])?$total_amount:$params['total_amount'],
-                              'fee_amount'              => CRM_Utils_Array::value( 'fee_amount',  $params),
-                              'net_amount'              => CRM_Utils_Array::value( 'net_amount', $params ),
-                              'currency'                => $params['currency'],                                    
-                              'trxn_id'                 => $params['trxn_id'],
-                              'status_id'               => $contribution->contribution_status_id,
-                              'trxn_result_code'        => ( !empty( $contribution->trxn_result_code ) ? $contribution->trxn_result_code : false ),
-                              );
+            'contribution_id' => $contribution->id,
+            'to_financial_account_id' => $params['to_financial_account_id'],
+            'trxn_date' => $now,
+            'total_amount' => !empty($params['init_amount'])? $total_amount: $params['total_amount'],
+            'fee_amount' => CRM_Utils_Array::value('fee_amount', $params),
+            'net_amount' => CRM_Utils_Array::value('net_amount', $params),
+            'currency' => $config->defaultCurrency,                                    
+            'trxn_id' => $params['trxn_id'],
+            'status_id' => $contribution->contribution_status_id,
+            'trxn_result_code' => (!empty( $contribution->trxn_result_code) ? $contribution->trxn_result_code : false),
+          );
 
 
           require_once 'CRM/Core/BAO/FinancialTrxn.php';
@@ -404,11 +404,13 @@ static function &create(&$params, &$ids, $skipRedirect = FALSE, $activityType =
           }
         }
       }
-      if ( CRM_Utils_Array::value('processPriceSet', $params) &&
+      if (CRM_Utils_Array::value('processPriceSet', $params) &&
            !empty($params['lineItems']) ) {
-        foreach($params['lineItems'] as $key=>$lineItem) {
-          foreach($lineItem as $id=> $value) {
-            $params['lineItems'][$key][$id]['init_amount'] = $params['init_amount']['txt-price_'.$value['price_field_id']][$id];
+        if (CRM_Utils_Array::value('init_amount', $params)) {
+          foreach($params['lineItems'] as $key=>$lineItem) {
+            foreach($lineItem as $id=> $value) {
+              $params['lineItems'][$key][$id]['init_amount'] = $params['init_amount']['txt-price_'.$value['price_field_id']][$id];
+            }
           }
         }
         CRM_Price_BAO_LineItem::processPriceSet( $contribution->id, $params['lineItems'], $contribution );   
@@ -2270,7 +2272,7 @@ static function &buildMembershipTypeValues(&$form, $membershipTypeID = NULL) {
     $membershipTypeValues = array();
     $membershipTypeFields = array(
       'id', 'minimum_fee', 'name', 'is_active',
-      'description', 'contribution_type_id', 'auto_renew','member_of_contact_id',
+      'description', 'financial_type_id', 'auto_renew','member_of_contact_id',
       'relationship_type_id', 'relationship_direction', 'max_related',
     );
 

diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php
@@ -1549,14 +1549,17 @@ public function postProcess() {
           ) {
             $membershipTypeValues[$memType]['relate_contribution_id'] = $relateContribution;
           }
+
           $membershipParams = array_merge($params, $membershipTypeValues[$memType]);
-          $init_amount = array();
-          foreach($formValues as $key => $value){
-            if ( strstr($key,'txt-price')){
-              $init_amount[$key] = $value;
-            } 
+          if (CRM_Utils_Array::value('int_amount', $formValues)) {
+            $init_amount = array();
+            foreach($formValues as $key => $value){
+              if (strstr($key,'txt-price')){
+                $init_amount[$key] = $value;
+              } 
+            }
+            $membershipParams['init_amount'] = $init_amount;
           }
-          $membershipParams['init_amount'] = $init_amount;
           $membership = CRM_Member_BAO_Membership::create($membershipParams, $ids);
 
           $this->_membershipIDs[] = $membership->id;