CRM-15366 QA changes

----------------------------------------
* CRM-15366: Gift Membership Bug Fixes
  https://issues.civicrm.org/jira/browse/CRM-15366

diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php
index d3fea7053db4bd7c6963d404151582a7e6113791..0a7896d7ea21eaeb5a1d1d3efd068d7ea3638fe9 100644 (file)
--- a/CRM/Member/Form/Membership.php
+++ b/CRM/Member/Form/Membership.php
@@ -1525,7 +1525,7 @@ WHERE   id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
         }
 
         $membershipParams = array_merge($membershipTypeValues[$memType], $params);
-        //CRM-15320
+        //CRM-15366
         if (!empty($softParams) && empty($paymentParams['is_recur'])) {
           $membershipParams['soft_credit'] = $softParams;
         }

diff --git a/templates/CRM/Member/Form/Membership.tpl b/templates/CRM/Member/Form/Membership.tpl
index defcaf90110e3ae3c4a3870c434a20b0d920001b..b2554d84241ee5dcb7b27ce48ab03a1cfba91cf6 100644 (file)
--- a/templates/CRM/Member/Form/Membership.tpl
+++ b/templates/CRM/Member/Form/Membership.tpl
@@ -180,6 +180,7 @@
             <td>
               <table class="compressed">
                 <tr class="crm-membership-form-block-soft-credit-type">
+                {*CRM-15366*}
                   <td class="label">{$form.soft_credit_type_id.label}</td>
                   <td>{$form.soft_credit_type_id.html}</td>
                 </tr>