S12523781 # Client - Incoming Issues (raised by Client) #Select Plan gives error

Also an issue with first payment plan not getting selected

cmsWebApp/src/performa/form/SaveCompanyFP.java

@@ -97,7 +97,7 @@ public class SaveCompanyFP  extends SaveFP
             
             double  discountPercentage  =   0d;
             
-            if(subscription.getDiscount() != null && subscription.getDiscount().getCoupon() != null && subscription.getDiscount().getCoupon().getPercentOff() != null)
+            if(subscription != null && subscription.getDiscount() != null && subscription.getDiscount().getCoupon() != null && subscription.getDiscount().getCoupon().getPercentOff() != null)
             {
                 discountPercentage  = 1 - (subscription.getDiscount().getCoupon().getPercentOff().doubleValue() * 0.01 );
             }

cmsWebApp/webroot/extensions/adminportal/manage_plan.jsp

@@ -269,6 +269,8 @@
                                                                     %>
                                                                 </div>
                                                                 <div class="select-button">
+                                                                    <oneit:button   skin="link" value=" "     name="saveCompany"      cssClass="btn select-btn" style="display:none;"
+                                                                                            requestAttribs="<%= CollectionUtils.EMPTY_MAP%>" />
                                                                     <%
                                                                         if(isSelectedPlan)
                                                                         {