From: atif-shaikh <shaikh388@gmail.com>
Date: Wed, 24 Sep 2014 14:00:32 +0000 (+0530)
Subject: CRM-15366 QA changes
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=87d0f8813d22eb0621c4c7d8a198b6ed8c6472b8;p=civicrm-core.git

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 d3fea7053d..0a7896d7ea 100644
--- 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 defcaf9011..b2554d8424 100644
--- 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>