Related issues

Feature #28122: Super Referal Module Actions
Feature #29004: Add Agent Changes Actions
Task #28689: Update JME to IME in JMECODE in master & mapping

Swift.DAL/Remittance/ReferralSetup/ReferralSetupDao.cs

@@ -12,7 +12,7 @@ namespace Swift.DAL.Remittance.ReferralSetup
                                     string referralAddress, string referralEmail,
                                     string isActive, string referralMobile, string branchId,
                                      string rowId, string referralTypecode, string referralType,
-                                     string ruleType, string cashHoldLimitAmount)
+                                     string cashHoldLimitAmount, string refCode, string regRule)
         {
             var sql = "EXEC PROC_REFERALSETUP @flag = '" + flag + "'";
             sql += ", @user = " + FilterString(user);
@@ -25,8 +25,10 @@ namespace Swift.DAL.Remittance.ReferralSetup
             sql += ", @rowId = " + FilterString(rowId);
             sql += ", @referralTypecode = " + FilterString(referralTypecode);
             sql += ", @referralType = " + FilterString(referralType);
-            sql += ", @ruleType = " + FilterString(ruleType);
+            //sql += ", @ruleType = " + FilterString(ruleType);
             sql += ", @cashHoldLimitAmount = " + FilterString(cashHoldLimitAmount);
+            sql += ", @referralCode = " + FilterString(refCode);
+            sql += ", @ruleType = " + FilterString(regRule);
             //sql += ", @DEDUCT_TAX_ON_SC = " + FilterString(deductTaxOnSC);
 
             return ParseDbResult(sql);
@@ -120,17 +122,17 @@ namespace Swift.DAL.Remittance.ReferralSetup
             sql += ", @user = " + FilterString(user);
             sql += ", @referralId = " + FilterString(cm.ReferralId.ToString());
             sql += ", @ROW_ID = " + FilterString(cm.ROW_ID.ToString());
-            sql += ", @partnerId = " + FilterString(cm.PartnerId.ToString());
+            //sql += ", @partnerId = " + FilterString(cm.PartnerId.ToString());
             sql += ", @commissionPercent = " + FilterString(cm.CommissionPercent.ToString());
-            sql += ", @forexPercent = " + FilterString(cm.ForexPercent.ToString());
-            sql += ", @applyFxPercentOn = " + FilterString(cm.ApplyFxPercentOn.ToString());
+            //sql += ", @forexPercent = " + FilterString(cm.ForexPercent.ToString());
+            //sql += ", @applyFxPercentOn = " + FilterString(cm.ApplyFxPercentOn.ToString());
             sql += ", @flatTxnWise = " + FilterString(cm.FlatTxnWise.ToString());
-            sql += ", @NewCustomer = " + FilterString(cm.NewCustomer.ToString());
+           // sql += ", @NewCustomer = " + FilterString(cm.NewCustomer.ToString());
             sql += ", @effectiveFrom = " + FilterString(cm.EffectiveFrom.ToString());
             sql += ", @isActive = " + FilterString(cm.isActive);
             sql += ", @referralCode = " + FilterString(cm.ReferralCode);
-            sql += ", @DEDUCT_TAX_ON_SC = " + FilterString(cm.deductTaxOnSC);
-            sql += ", @DEDUCT_P_COMM_ON_SC = " + FilterString(cm.deductPCommOnSC);
+            //sql += ", @DEDUCT_TAX_ON_SC = " + FilterString(cm.deductTaxOnSC);
+            //sql += ", @DEDUCT_P_COMM_ON_SC = " + FilterString(cm.deductPCommOnSC);
             return ParseDbResult(sql);
         }
     }

Swift.DAL/Remittance/TPSetup/PartnerDao.cs

@@ -42,7 +42,7 @@ namespace Swift.DAL.Remittance.Partner
 
             return ExecuteDataset(sql);
         }
-        public DataSet CashStatusReportReferralNew(string user, string fromDate, string toDate, string referralAcctNum, string flag, string agentId = "")
+        public DataSet CashStatusReportReferralNew(string user, string fromDate, string toDate, string referralAcctNum, string flag, string agentId)
         {
             string sql = "EXEC  PROC_CASH_STATUS_REPORT_REFERRAL @FLAG = " + FilterString(flag);
             sql += ",@user=" + FilterString(user);

Swift.web/AgentNew/Reports/ReferralReport/ReferralReportNew.aspx

@@ -50,12 +50,13 @@
                                             <table class="table table-bordered">
                                                 <thead>
                                                     <tr>
-                                                        <th>S. No.</th>
-                                                        <th>Agent Name</th>
-                                                        <th>Opening Balance</th>
-                                                        <th>In Amount</th>
-                                                        <th>Out Amount</th>
-                                                        <th>Closing Balance</th>
+                                                        <th rowspan="2">S. No.</th>
+                                                        <th rowspan="2" style="text-align: center;">Agent Name</th>
+                                                        <th rowspan="2" style="text-align: center;">Customer Name</th>
+                                                        <th rowspan="2" style="text-align: center;">Date</th>
+                                                        <th rowspan="2" style="text-align: center;">Transaction Points</th>
+                                                        <th rowspan="2" style="text-align: center;">Registration Points</th>
+                                                        <th rowspan="2" style="text-align: center;">Referral Type</th>
                                                     </tr>
                                                 </thead>
                                                 <tbody id="cashCollectedList" runat="server">

Swift.web/AgentNew/Reports/ReferralReport/ReferralReportNew.aspx.cs

@@ -44,32 +44,43 @@ namespace Swift.web.AgentNew.Reports.ReferralReport
             string referralAcctNum = GetStatic.ReadQueryString("referralAcctNum", "");
             string flag = GetStatic.ReadQueryString("flag", "");
             string user = GetStatic.GetUser();
+            string refId = GetStatic.GetMapCodeDom();
 
-            DataSet ds = _dao.CashStatusReportReferralNew(user, fromDate, toDate, referralAcctNum, flag, GetStatic.GetSettlingAgent());
+            DataSet ds = _dao.CashStatusReportReferralNew(user, fromDate, toDate, referralAcctNum, flag, refId);
 
             StringBuilder sb = new StringBuilder("");
-            int sNo = 0;
-            double totalOpeningAmt = 0;
-            double totalInAmt = 0;
-            double totalOutAmt = 0;
-            double totalClosingAmt = 0;
+            int sNo = 1;
+            double tranPtsTotal = 0, regPtsTotal = 0, total = 0;
             string agentId = "";
 
             foreach (DataRow item in ds.Tables[0].Rows)
             {
-                agentId = item["AGENTID"].ToString();
-                DataRow[] rows = ds.Tables[1].Select("BRANCH_ID = ('" + agentId + "')");
+                string REFERRAL_NAME = item["REFERRAL_NAME"].ToString();
+                string DATE = item["DATE"].ToString();
+                string tranPts = item["FX_PCNT"].ToString();
+                string regPts = item["COMMISSION_PCNT"].ToString();
+                total = 0;
 
                 sb.AppendLine("<tr>");
-                sb.AppendLine("<td></td>");
-                sb.AppendLine(GetRows(item["AGENTNAME"].ToString(), rows, ref sNo, ref totalOpeningAmt, ref totalInAmt, ref totalOutAmt, ref totalClosingAmt));
+                sb.AppendLine("<td style='text-align:center;'> " + sNo + "</td>");
+                sb.AppendLine("<td style='text-align:center;'>" + REFERRAL_NAME + "</td>");
+                sb.AppendLine("<td style='text-align:center;'>" + item["SENDERNAME"] + "</td>");
+                sb.AppendLine("<td style='text-align:center;'>" + DATE + "</td>");
+                sb.AppendLine("<td style='text-align:center;'>" + GetStatic.ShowDecimal(tranPts) + "</td>");
+                sb.AppendLine("<td style='text-align:center;'>" + GetStatic.ShowDecimal(regPts) + "</td>");
+                sb.AppendLine("<td style='text-align:center;'>" + item["REFERRAL_TYPE"] + "</td>");
+                tranPtsTotal += Convert.ToDouble(tranPts);
+                regPtsTotal += Convert.ToDouble(regPts);
+                sNo++;
+                sb.AppendLine("</tr>");
             }
-            sb.AppendLine("<tr><td colspan='2' align='right'><b>Grand Total:</b></td><td align='right'><b>" + GetStatic.ShowDecimal(totalOpeningAmt.ToString()) + "</b></td>");
-            sb.AppendLine("<td align='right'><b>" + GetStatic.ShowDecimal(totalInAmt.ToString()) + "</td>");
-            sb.AppendLine("<td align='right'><b>" + GetStatic.ShowDecimal(totalOutAmt.ToString()) + "</td>");
-            sb.AppendLine("<td align='right'><b>" + GetStatic.ShowDecimal(totalClosingAmt.ToString()) + "</t<td>");
+            sb.Append("<tr>");
+            sb.AppendLine("<td colspan='3' style='font-weight: bold;text-align: right;'>Total<td>");
+            sb.AppendLine("<td style='font-weight: bold; text-align:center;'>" + tranPtsTotal + "</td>");
+            sb.AppendLine("<td style='font-weight: bold; text-align:center;'>" + regPtsTotal + "</td>");
             sb.AppendLine("</tr>");
             cashCollectedList.InnerHtml = sb.ToString();
+            
         }
 
         private string GetRows(string agentName, DataRow[] rows, ref int sNo, ref double totalOpeningAmt, ref double totalInAmt, ref double totalOutAmt, ref double totalClosingAmt)

Swift.web/AgentNew/Reports/ReferralReport/SearchNew.aspx

@@ -57,7 +57,7 @@
                                 <!-- End .row -->
                             </div>
                         </div>
-                        <div class="form-group">
+                        <div class="form-group" style="display:none;">
                             <label class="col-lg-4 col-md-4 control-label" for="">
                                 <label>
                                     Referral Name:</label>
@@ -70,8 +70,8 @@
                             <label class="col-lg-4 col-md-4 control-label" for="">
                             </label>
                             <div class="col-lg-8 col-md-8">
-                                <input type="button" value="Detail Report" class="btn btn-primary m-t-25" onclick="return GetReferralReport('d');" />
-                                <input type="button" value="Summary Report" class="btn btn-primary m-t-25" onclick="return GetReferralReport('s');" />
+                                <input type="button" value="View Report" class="btn btn-primary m-t-25" onclick="return GetReferralReport('s');" />
+                               <%-- <input type="button" value="Summary Report" class="btn btn-primary m-t-25" onclick="return GetReferralReport('s');" />--%>
                             </div>
                         </div>
                         <!-- End .form-group  -->
@@ -107,7 +107,7 @@
             if (type == 'd') {
                 url = "../../../AccountReport/AccountStatement/StatementDetails.aspx?endDate=" + endDate + "&type=a&startDate=" + startDate + "&acNum="+referralAcctNum+"&acName="+referralAcctName+"";
             } else if (type == 's') {
-                url = "ReferralReportNew.aspx?flag=cash-rpt-new&fromDate=" + startDate + "&toDate=" + endDate + "&referralAcctNum=" + referralAcctNum +"&acName="+referralAcctName+"";
+                url = "ReferralReportNew.aspx?flag=summary&fromDate=" + startDate + "&toDate=" + endDate + "&referralAcctNum=" + referralAcctNum +"&acName="+referralAcctName+"";
             }
             OpenInNewWindow(url);
         }

Swift.web/AgentNew/Reports/ReferralReport/SearchNew.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Swift.web.AgentNew.Reports.ReferralReport {
-    
-    
-    public partial class SearchNew {
-        
+namespace Swift.web.AgentNew.Reports.ReferralReport
+{
+
+
+    public partial class SearchNew
+    {
+
         /// <summary>
         /// startDate control.
         /// </summary>
@@ -20,7 +22,7 @@ namespace Swift.web.AgentNew.Reports.ReferralReport {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox startDate;
-        
+
         /// <summary>
         /// toDate control.
         /// </summary>
@@ -29,7 +31,7 @@ namespace Swift.web.AgentNew.Reports.ReferralReport {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox toDate;
-        
+
         /// <summary>
         /// ddlReferralName control.
         /// </summary>

Swift.web/Library/PasswordGenerator.cs

@@ -75,7 +75,17 @@ namespace Swift.web.Library
             return new string(chars.ToArray());
         }
 
+        public static string GenerateRandomNumericPassword(int length = 8)
+        {
+            Random rand = new Random();
+            string password = "";
       
+            for (int i = 0; i < length; i++)
+            {
+                password += rand.Next(0, 10);
+            }
+            return password;
+        }
     }
 }
 

Swift.web/MobileRemit/Admin/Operation/EditCustomerForActivation.aspx

@@ -5,7 +5,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
     <title></title>
-     <base id="Base1" target="_self" runat="server" />
+    <base id="Base1" target="_self" runat="server" />
+    <link href="/ui/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
+    <link href="/ui/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
     <link href="/ui/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
     <link href="/ui/css/style.css" rel="stylesheet" />
     <link href="/ui/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
@@ -31,7 +33,7 @@
                 $("#divOccupation").hide();
                 if ($("#occupation").val() === "11383") {
                     $("#divOccupation").show();
-                  //  $("#CVotherOccupation").show();
+                    //  $("#CVotherOccupation").show();
                 }
             });
 
@@ -117,6 +119,79 @@
             var param = "width=825,height=500,resizable=1,status=1,toolbar=0,scrollbars=1,center=1";
             PopUpWindow(url, param);
         };
+
+        $(document).ready(function () {
+
+            $('#btnSearch').click(function () {
+                clearPopupData();
+
+                var zipCode = $('#zipCode').val();
+                if (zipCode == "" || zipCode == null) {
+                    alert("Post Code cannot be empty");
+                    return;
+                }
+                debugger;
+                $.ajax({
+                    type: 'POST',
+                    contentType: 'application/json; charset=utf-8',
+                    url: 'EditCustomerForActivation.aspx/GetAddressByPostCode',
+                    data: JSON.stringify({ zipCode: zipCode }),
+                    dataType: 'json',
+                    success: function (response) {
+                        var data = JSON.parse(response.d);
+                        $('#apiDataPopup').modal({ backdrop: 'static', keyboard: false }, 'show');
+                        $('#apiDataBody tbody').empty();
+                        if (data && data.Data && data.Data.Addresses) {
+                            var addresses = data.Data.Addresses;
+
+                            addresses.forEach(function (item, index) {
+                                var row = $('<tr>');
+                                row.append($('<td>').text(index + 1));
+                                row.append($('<td>').text(item.Address1));
+                                row.append($('<td>').text(item.Address2));
+
+                                //var selectButton = $('<button>')
+                                //    .addClass('btn btn-primary')
+                                //    .text('Select')
+                                //    .click(function () {
+                                //        var selectedAddress1 = item.Address1;
+                                //        var selectedAddress2 = item.Address2;
+
+                                //        $('#txtAdditionalAddress').val(item.Address1);
+                                //        $('#city').val(item.Address2);
+                                //        $('#apiDataPopup').modal('hide');
+                                //    });
+
+                                var selectButton = $('<button>')
+                                    .addClass('btn btn-primary')
+                                    .text('Select')
+                                    .click(function (e) {
+                                        var additionalAddress = item.Address1;
+                                        var city = item.Address2;
+
+                                        $('#hdnAdditionalAddress').val(additionalAddress);
+                                        $('#cityHidden').val(city);
+
+                                        $('#address1').val(additionalAddress);
+                                        $('#city').val(city);
+                                        $('#apiDataPopup').modal('hide');
+                                        e.preventDefault();
+                                    });
+                                row.append($('<td>').append(selectButton));
+                                $('#apiDataBody').append(row);
+                            });
+
+                            $('#apiDataPopup').modal('show');
+                        } else {
+                            console.error("Invalid response.");
+                        }
+                    },
+                    error: function (error) {
+                        console.error(error);
+                    }
+                });
+            });
+        });
         function IdTypeValidity() {
             var senIdType = $("#<%=idType.ClientID%>").val();
             if (senIdType == "") {
@@ -183,7 +258,7 @@
                 $('#<%=txtCompanyName.ClientID%>').val(dr[0].firstName);
                 $('#<%=genderList.ClientID%>').val(dr[0].gender);
                 $('#<%=countryList.ClientID%>').val(dr[0].country);
-                $('#<%=addressLine1.ClientID%>').val(dr[0].address);
+                $('#<%=address1.ClientID%>').val(dr[0].address);
                 $('#<%=zipCode.ClientID%>').val(dr[0].zipCode);
                 $('#<%=city.ClientID%>').val(dr[0].city);
                 $('#<%=email.ClientID%>').val(dr[0].email);
@@ -221,8 +296,8 @@
                 $('#<%=txtNameofAuthoPerson.ClientID%>').val(dr[0].nameOfAuthorizedPerson);
                <%-- $('#<%=txtStreet.ClientID%>').val(dr[0].street);--%>
                 $('#<%=txtAdditionalAddress.ClientID%>').val(dr[0].additionalAddress);
-                $('#<%=txtsenderCityjapan.ClientID%>').val(dr[0].cityUnicode);
-                $('#<%=txtstreetJapanese.ClientID%>').val(dr[0].streetUnicode);
+               <%-- $('#<%=txtsenderCityjapan.ClientID%>').val(dr[0].cityUnicode);
+                $('#<%=txtstreetJapanese.ClientID%>').val(dr[0].streetUnicode);--%>
                 $('#<%=txtNameofEmployeer.ClientID%>').val(dr[0].nameOfEmployeer);
 
                 $('#<%=rbRemitanceAllowed.ClientID%> input[value=' + (dr[0].remittanceAllowed == true ? "Enabled" : "Disabled") + ']').attr('checked', 'checked');
@@ -235,8 +310,8 @@
                 $('#<%=ddlnatureOfCompany.ClientID%>').val(dr[0].natureOfCompany);
                 $('#<%=ddlOrganizationType.ClientID%>').val(dr[0].organizationType);
                 $('#<%=ddlPosition.ClientID%>').val(dr[0].position);
-                $('#<%=ddlVisaStatus.ClientID%>').val(dr[0].visaStatus);
-                $('#<%=ddlState.ClientID%>').val(dr[0].state);
+                <%--$('#<%=ddlVisaStatus.ClientID%>').val(dr[0].visaStatus);--%>
+                <%--$('#<%=ddlState.ClientID%>').val(dr[0].state);--%>
                 $('#<%=ddlStateHidden.ClientID%>').val(dr[0].state);
                 $('#<%=cityHidden.ClientID%>').val(dr[0].city);
 
@@ -264,15 +339,15 @@
                 }
             }
         }
-       
-            function ValidateForm() {
-                var reqField = "occupationtxt";
-                if (ValidRequiredField(reqField) == false) {
-                    return false;
-                }
-                return true;
+
+        function ValidateForm() {
+            var reqField = "occupationtxt";
+            if (ValidRequiredField(reqField) == false) {
+                return false;
             }
-        
+            return true;
+        }
+
         function CheckFormValidation() {
             var reqField = "";
             var val = $("#<% =hdnCustomerId.ClientID%>").val();
@@ -375,10 +450,10 @@
         function GetAddressByZipCode() {
             var zipCodeValue = $("#<%=zipCode.ClientID%>").val();
             $("#txtState").val('');
-            $("#<%=txtStreet.ClientID%>").val('');
+            <%--$("#<%=txtStreet.ClientID%>").val('');--%>
             $("#<%=city.ClientID%>").val('');
-            $("#<%=txtsenderCityjapan.ClientID%>").val('');
-            $("#<%=txtstreetJapanese.ClientID%>").val('');
+            <%--$("#<%=txtsenderCityjapan.ClientID%>").val('');
+            $("#<%=txtstreetJapanese.ClientID%>").val('');--%>
             var zipCodePattern = /^\d{7}?$/;
             test = zipCodePattern.test(zipCodeValue);
             if (!test) {
@@ -393,8 +468,8 @@
                 if (erd !== null) {
                     var dr = jQuery.parseJSON(erd);
                     if (erd == false) {
-                        $("#<%=ddlState.ClientID%>").val('');
-                        $("#<%=txtStreet.ClientID%>").val('');
+                        <%--$("#<%=ddlState.ClientID%>").val('');--%>
+                       <%-- $("#<%=txtStreet.ClientID%>").val('');--%>
                         $("#<%=city.ClientID%>").val('');
                         $("#<%=zipCode.ClientID%>").focus();
                         $("#<%=zipCode.ClientID%>").attr("style", "display:block; background:#FFCCD2");
@@ -403,7 +478,7 @@
 
                     //$("#tempAddress").html(erd);
                     if (dr[0].errorCode == '0') {
-                        $("#<%=ddlState.ClientID%>").val(dr[0].STATE_ID);
+                        <%--$("#<%=ddlState.ClientID%>").val(dr[0].STATE_ID);--%>
                         $("#<%=ddlStateHidden.ClientID%>").val(dr[0].STATE_ID);
                         $("#<%=cityHidden.ClientID%>").val(dr[0].CITY_NAME);
                         $("#<%=txtstreetJapanese.ClientID%>").val(dr[0].STREET_NAME);
@@ -411,8 +486,8 @@
                         PopulateAreaDDL(dr);
                     }
                     else {
-                        $("#<%=ddlState.ClientID%>").val('');
-                        $("#<%=txtStreet.ClientID%>").val('');
+                        <%--$("#<%=ddlState.ClientID%>").val('');--%>
+                       <%-- $("#<%=txtStreet.ClientID%>").val('');--%>
                         $("#<%=city.ClientID%>").val('');
                         $("#<%=txtstreetJapanese.ClientID%>").val('');
                         $("#<%=zipCode.ClientID%>").focus();
@@ -441,8 +516,8 @@
                 if (erd !== null) {
                     var dr = jQuery.parseJSON(erd);
                     if (erd == false) {
-                        $("#<%=ddlState.ClientID%>").val('');
-                        $("#<%=txtStreet.ClientID%>").val('');
+                       <%-- $("#<%=ddlState.ClientID%>").val('');--%>
+                       <%-- $("#<%=txtStreet.ClientID%>").val('');--%>
                         $("#<%=city.ClientID%>").val('');
                         $("#<%=txtstreetJapanese.ClientID%>").val('');
                         $("#<%=zipCode.ClientID%>").focus();
@@ -452,17 +527,17 @@
 
                     //$("#tempAddress").html(erd);
                     if (dr[0].errorCode == '0') {
-                        $("#<%=ddlState.ClientID%>").val(dr[0].STATE_ID);
+                       <%-- $("#<%=ddlState.ClientID%>").val(dr[0].STATE_ID);--%>
                         $("#<%=ddlStateHidden.ClientID%>").val(dr[0].STATE_ID);
-                        $("#<%=cityHidden.ClientID%>").val(dr[0].CITY_NAME);                      
+                        $("#<%=cityHidden.ClientID%>").val(dr[0].CITY_NAME);
                         $("#<%=txtstreetJapanese.ClientID%>").val(dr[0].STREET_NAME);
-                        //$("#<%=txtStreet.ClientID%>").val(dr[0].STREET_NAME);
+                        <%--$("#<%=txtStreet.ClientID%>").val(dr[0].STREET_NAME);--%>
                         $("#<%=city.ClientID%>").val(dr[0].CITY_NAME);
                         PopulateAreaDDL(dr, rowId);
                     }
                     else {
-                        $("#<%=ddlState.ClientID%>").val('');
-                        $("#<%=txtStreet.ClientID%>").val('');
+                        <%--$("#<%=ddlState.ClientID%>").val('');--%>
+                        <%--$("#<%=txtStreet.ClientID%>").val('');--%>
                         $("#<%=city.ClientID%>").val('');
                         $("#<%=zipCode.ClientID%>").focus();
                         $("#<%=zipCode.ClientID%>").attr("style", "display:block; background:#FFCCD2");
@@ -567,7 +642,7 @@
                     <div class="panel panel-default clearfix m-b-20">
                         <div class="panel-heading">Customer Information</div>
                         <div class="panel-body">
-                            <asp:ValidationSummary ID="ValidationSummary1" runat="server" ForeColor="Red" ValidationGroup="ActivateVG" ShowSummary="true"/>  
+                            <asp:ValidationSummary ID="ValidationSummary1" runat="server" ForeColor="Red" ValidationGroup="ActivateVG" ShowSummary="true" />
                             <div class="col-sm-12" id="msgDiv" runat="server" visible="false" style="background-color: red;">
                                 <asp:Label ID="msgLabel" runat="server" ForeColor="White"></asp:Label>
                             </div>
@@ -596,7 +671,7 @@
                                     <label>Membership No:</label>
                                     <asp:TextBox ID="txtMembershipId" runat="server" CssClass="form-control" />
                                 </div>
-                                  
+
                             </div>
                             <div class="col-md-4 col-sm-4" hidden>
                                 <div class="form-group">
@@ -709,17 +784,13 @@
                                 </div>
                                 <div class="col-md-4 col-sm-4">
                                     <div class="form-group">
-                                        <label>Zip Code:<span class="errormsg">*</span> </label>
-                                        <asp:TextBox ID="zipCode" autocomplete="stopdoingthat" runat="server" placeholder="XXXXXXX" MaxLength="7" CssClass="form-control required" onchange="return GetAddressByZipCode();" />
-                                        <asp:RequiredFieldValidator ID="reqzipCode" ControlToValidate="zipCode" ValidationGroup="ActivateVG" ErrorMessage="Zip Code is Required!" runat="server" SetFocusOnError="true" CssClass="ErrMsg"></asp:RequiredFieldValidator>
-                                    </div>
-                                </div>
-                                <div class="col-md-4 col-sm-4">
-                                    <div class="form-group">
-                                        <label>State:<span class="errormsg">*</span></label>
-                                        <asp:DropDownList runat="server" ID="ddlState" disabled="disabled" CssClass="form-control required">
-                                        </asp:DropDownList>
-                                       <%-- <asp:RequiredFieldValidator ID="reqddlState" ControlToValidate="ddlState" ValidationGroup="ActivateVG" ErrorMessage=" State is Required!" runat="server" SetFocusOnError="true" CssClass="ErrMsg"></asp:RequiredFieldValidator>--%>
+                                        <label>Post Code:<span class="errormsg">*</span> </label>
+                                        <div class="input-group">
+                                            <asp:TextBox ID="zipCode" runat="server" placeholder="XXXXXXX" MaxLength="8" CssClass="form-control required" />
+                                            <span class="input-group-btn">
+                                                <button id="btnSearch" class="btn btn-primary m-t-25" type="button">Search</button>
+                                            </span>
+                                        </div>
                                     </div>
                                 </div>
 
@@ -731,31 +802,30 @@
                                 </div>
                                 <div class="col-md-4 col-sm-4">
                                     <div class="form-group">
-                                        <label>City/Ward:<span class="errormsg">*</span></label>
-                                        <asp:TextBox ID="city" ReadOnly="true" autocomplete="stopdoingthat" runat="server" disabled="disabled" placeholder="City" CssClass="form-control required" />
+                                        <label>City:<span class="errormsg">*</span></label>
+                                        <asp:TextBox ID="city" runat="server" placeholder="City" CssClass="form-control" />
                                     </div>
                                 </div>
                                 <div class="col-md-4 col-sm-4">
                                     <div class="form-group">
-                                        <label>Area:<span class="errormsg">*</span> </label>
-                                        <asp:DropDownList ID="txtStreet" runat="server" placeholder="Street" CssClass="form-control required" />
-                                        <%--<asp:RequiredFieldValidator ID="reqtxtStreet" ControlToValidate="txtStreet" ValidationGroup="ActivateVG" ErrorMessage="Area is Required!" runat="server" SetFocusOnError="true" CssClass="ErrMsg"></asp:RequiredFieldValidator>--%>
-                                        <%--<asp:TextBox ID="txtStreet" runat="server" placeholder="Street" CssClass="form-control required" />--%>
+                                        <label>Address 1:<span class="errormsg">*</span> </label>
+                                        <asp:TextBox ID="address1" runat="server" placeholder="Address 1" CssClass="form-control required" />
                                     </div>
                                 </div>
-                                <div class="col-md-4 col-sm-4" style="display: none;">
+
+                                <div class="col-md-4 col-sm-4">
                                     <div class="form-group">
-                                        <label>Sender City-Japan:</label>
-                                        <asp:TextBox ID="txtsenderCityjapan" runat="server" placeholder="Sender City Japan" CssClass="form-control" />
+                                        <label>Address 2:</label>
+                                        <asp:TextBox ID="txtAdditionalAddress" runat="server" placeholder="Address 2" CssClass="form-control" />
                                     </div>
                                 </div>
-                                <div class="col-md-4 col-sm-4">
+                                <%--<div class="col-md-4 col-sm-4" style="display: none;">
                                     <div class="form-group">
                                         <label>Additional Address:<span class="errormsg">*</span> </label>
                                         <asp:TextBox autocomplete="stopdoingthat" ID="txtAdditionalAddress" runat="server" placeholder="Additional address" CssClass="form-control required" />
                                         <asp:RequiredFieldValidator ID="ReqtxtAdditionalAddress" ControlToValidate="txtAdditionalAddress" ValidationGroup="ActivateVG" ErrorMessage="Additional Address is Required!" runat="server" SetFocusOnError="true" CssClass="ErrMsg"></asp:RequiredFieldValidator>
                                     </div>
-                                </div>
+                                </div>--%>
 
                                 <div class="col-md-4 col-sm-4 hideForOrganisation">
                                     <div class="form-group">
@@ -817,14 +887,14 @@
                                     </div>
                                 </div>
 
-                                <div class="col-md-4 col-sm-4 hideForOrganisation">
+                                <%--<div class="col-md-4 col-sm-4 hideForOrganisation">
                                     <div class="form-group">
                                         <label>Visa Status<span class="errormsg">*</span></label>
                                         <asp:DropDownList runat="server" ID="ddlVisaStatus" name="ddlVisaStatus" CssClass="form-control clearOnOrganisation required">
                                         </asp:DropDownList>
                                     </div>
                                     <asp:RequiredFieldValidator ID="reqddlVisaStatus" ControlToValidate="ddlVisaStatus" ValidationGroup="ActivateVG" ErrorMessage="Visa Status is Required!" runat="server" SetFocusOnError="true" CssClass="ErrMsg"></asp:RequiredFieldValidator>
-                                </div>
+                                </div>--%>
                                 <div class="col-md-4 col-sm-4 hideForOrganisation">
                                     <div class="form-group">
                                         <label>Employment Business Type:</label>
@@ -849,7 +919,7 @@
                                     <div class="form-group">
                                         <label>Occupation (If Other only):<span class="errormsg">*</span></label>
                                         <asp:TextBox runat="server" ID="occupationText" CssClass="form-control clearOnOrganisation"></asp:TextBox>
-                                        
+
                                     </div>
                                 </div>
                                 <div class="col-md-4 col-sm-4" style="display: none;">

Swift.web/MobileRemit/Admin/Operation/EditCustomerForActivation.aspx.cs

@@ -11,6 +11,15 @@ using System.Web;
 using System.Web.Script.Serialization;
 using System.Web.UI;
 using Swift.API.Common.Helper;
+using Swift.API.Common;
+using Swift.API.Common.Enum;
+using Newtonsoft.Json;
+using Swift.API.TPAPIs;
+using Swift.DAL.BL.System.Utility;
+using Swift.API.ThirdPartyApiServices;
+using System.Web.Services;
+using Swift.API.Common.SyncModel;
+
 namespace Swift.web.MobileRemit.Admin.Operation
 {
     public partial class EditCustomerForActivation : System.Web.UI.Page
@@ -187,9 +196,9 @@ namespace Swift.web.MobileRemit.Admin.Operation
             _sl.SetDDL(ref ddlOrganizationType, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=7002", "valueId", "detailTitle", "", "Select..");
             _sl.SetDDL(ref ddlnatureOfCompany, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=7003", "valueId", "detailTitle", "", "Select..");
             _sl.SetDDL(ref ddlEmployeeBusType, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=7004", "valueId", "detailTitle", "", "");
-            _sl.SetDDL(ref ddlVisaStatus, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=7005", "valueId", "detailTitle", "", "Select..");
+            //_sl.SetDDL(ref ddlVisaStatus, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=7005", "valueId", "detailTitle", "", "Select..");
             _sl.SetDDL(ref ddlPosition, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=7006", "valueId", "detailTitle", "", "Select..");
-            _sl.SetDDL(ref ddlState, "EXEC proc_online_dropDownList @flag='state',@countryId='" + countryList.SelectedValue + "'", "stateId", "stateName", "", "Select..");
+            //_sl.SetDDL(ref ddlState, "EXEC proc_online_dropDownList @flag='state',@countryId='" + countryList.SelectedValue + "'", "stateId", "stateName", "", "Select..");
             //   _sdd.SetDDL(ref ddlSearchBy, "exec proc_sendPageLoadData @flag='search-cust-by'", "VALUE", "TEXT", "", "");
             _sdd.SetStaticDdl(ref ddlDocType, "7009", "", "Select");
         }
@@ -242,12 +251,12 @@ namespace Swift.web.MobileRemit.Admin.Operation
                     AdditionalAddress = txtAdditionalAddress.Text,
                     city = cityHidden.Value,
                     state = ddlStateHidden.Value,
-                    senderCityjapan = txtsenderCityjapan.Text,
+                    //senderCityjapan = txtsenderCityjapan.Text,
                     email = email.Text,
                     streetJapanese = txtstreetJapanese.Text,
                     homePhone = phoneNumber.Text,
                     mobile = mobile.Text,
-                    visaStatus = ddlVisaStatus.SelectedValue,
+                    //visaStatus = ddlVisaStatus.SelectedValue,
                     employeeBusinessType = ddlEmployeeBusType.SelectedValue,
                     nativeCountry = nativeCountry.SelectedValue,
                     dob = dob.Text,
@@ -294,7 +303,7 @@ namespace Swift.web.MobileRemit.Admin.Operation
                 if (dbResult.ErrorCode == "0")
                 {
                     // saveCustomerDocument(dbResult);
-                    var custompass = PasswordGenerator.GenerateRandomPassword();
+                    var custompass = PasswordGenerator.GenerateRandomNumericPassword();
                     var dbRes = _cd.ActivateMobileLogin(GetStatic.GetUser(), GetCustomerId(), custompass, Request.Form["membershipId"]);
                     GetStatic.AlertMessage(this, dbRes.Msg);
                     if (dbRes.ErrorCode == "0")
@@ -409,5 +418,24 @@ namespace Swift.web.MobileRemit.Admin.Operation
         {
 
         }
+        [WebMethod]
+        public static string GetAddressByPostCode(string zipCode)
+        {
+            var postCode = zipCode.ToUpper();
+            string ProcessId = Guid.NewGuid().ToString().Replace("-", "") + ":" + postCode;
+            string methodType = Utility.ReadWebConfig("methodType", "");
+            string countryName = "United Kingdom";
+            AddressRequest requestObj = new AddressRequest()
+            {
+                CountryIsoCode = countryName,
+                ProviderId = ProcessId,
+                MethodType = methodType,
+                TownName = postCode,
+            };
+            SyncStateCityTownService serviceObj = new SyncStateCityTownService();
+            var response = serviceObj.GetAddressList(requestObj);
+            string jsonResponse = JsonConvert.SerializeObject(response);
+            return jsonResponse;
+        }
     }
 }

Swift.web/MobileRemit/Admin/Operation/EditCustomerForActivation.aspx.designer.cs

@@ -302,24 +302,6 @@ namespace Swift.web.MobileRemit.Admin.Operation
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox zipCode;
 
-        /// <summary>
-        /// reqzipCode control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.RequiredFieldValidator reqzipCode;
-
-        /// <summary>
-        /// ddlState control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.DropDownList ddlState;
-
         /// <summary>
         /// txtstreetJapanese control.
         /// </summary>
@@ -339,22 +321,13 @@ namespace Swift.web.MobileRemit.Admin.Operation
         protected global::System.Web.UI.WebControls.TextBox city;
 
         /// <summary>
-        /// txtStreet control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.DropDownList txtStreet;
-
-        /// <summary>
-        /// txtsenderCityjapan control.
+        /// address1 control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox txtsenderCityjapan;
+        protected global::System.Web.UI.WebControls.TextBox address1;
 
         /// <summary>
         /// txtAdditionalAddress control.
@@ -365,15 +338,6 @@ namespace Swift.web.MobileRemit.Admin.Operation
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox txtAdditionalAddress;
 
-        /// <summary>
-        /// ReqtxtAdditionalAddress control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.RequiredFieldValidator ReqtxtAdditionalAddress;
-
         /// <summary>
         /// genderList control.
         /// </summary>
@@ -491,24 +455,6 @@ namespace Swift.web.MobileRemit.Admin.Operation
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox mobile;
 
-        /// <summary>
-        /// ddlVisaStatus control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.DropDownList ddlVisaStatus;
-
-        /// <summary>
-        /// reqddlVisaStatus control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.RequiredFieldValidator reqddlVisaStatus;
-
         /// <summary>
         /// ddlEmployeeBusType control.
         /// </summary>

Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx.cs

@@ -213,7 +213,7 @@ namespace Swift.web.MobileRemit.Admin.Reports
         protected void activate_Click(object sender, EventArgs e)
         {
             string customerId = txtSearchData.Value.Split('|')[0];
-            var custompass = PasswordGenerator.GenerateRandomPassword();
+            var custompass = PasswordGenerator.GenerateRandomNumericPassword(); 
             var membershipId = Request.Form["membershipId"];
             var dbRes = _cd.ActivateMobileLogin(GetStatic.GetUser(), customerId, custompass, membershipId);
             

Swift.web/Remit/ReferralSetup/CommisionRuleSetup.aspx

@@ -125,19 +125,19 @@
                             <h4>Referral Commision Setup</h4>
                         </div>
                         <div class="panel-body">
-                            <div class="form-group">
+                            <%--<div class="form-group">
                                 <label class="control-label col-md-4">Partner :</label>
                                 <div class="col-md-8">
                                     <asp:DropDownList ID="partnerDDL" runat="server" CssClass="form-control"></asp:DropDownList>
                                 </div>
-                            </div>
+                            </div>--%>
                             <div class="form-group">
-                                <label class="control-label col-md-4">Commision Percent (Service Charge):</label>
+                                <label class="control-label col-md-4">Registration Point:</label>
                                 <div class="col-md-8">
-                                    <asp:TextBox ID="commPercent" placeholder="0 % - 100 %" runat="server" CssClass="form-control"></asp:TextBox>
+                                    <asp:TextBox ID="commPercent" runat="server" CssClass="form-control"></asp:TextBox>
                                 </div>
                             </div>
-                            <div class="form-group">
+                            <%--<div class="form-group">
                                 <label class="control-label col-md-4">Apply Fx Percent On:</label>
                                 <div class="col-md-8">
                                     <asp:DropDownList runat="server" ID="applyFxPercentOn" CssClass="form-control">
@@ -152,19 +152,19 @@
                                 <div class="col-md-8">
                                     <asp:TextBox ID="fxPercent" runat="server" CssClass="form-control"></asp:TextBox>
                                 </div>
-                            </div>
+                            </div>--%>
                             <div class="form-group">
-                                <label class="control-label col-md-4">Flat Transaction Wise :</label>
+                                <label class="control-label col-md-4">Transaction Point :</label>
                                 <div class="col-md-8">
                                     <asp:TextBox ID="flatTxnWise" runat="server" CssClass="form-control"></asp:TextBox>
                                 </div>
                             </div>
-                            <div class="form-group">
+                            <%--<div class="form-group">
                                 <label class="control-label col-md-4">New Customer :</label>
                                 <div class="col-md-8">
                                     <asp:TextBox ID="newCustomer" runat="server" CssClass="form-control"></asp:TextBox>
                                 </div>
-                            </div>
+                            </div>--%>
                             <div class="form-group">
                                 <label class="control-label col-md-4">Effecive From :</label>
                                 <div class="col-md-8">
@@ -180,7 +180,7 @@
                                     </asp:DropDownList>
                                 </div>
                             </div>
-                            <div class="form-group">
+                            <%--<div class="form-group">
                                 <label class="control-label col-md-4">Deduct Tax On Service Charge:</label>
                                 <div class="col-md-8">
                                     <asp:DropDownList ID="deductTaxOnSc" runat="server" CssClass="form-control">
@@ -197,7 +197,7 @@
                                         <asp:ListItem Value="0">No</asp:ListItem>
                                     </asp:DropDownList>
                                 </div>
-                            </div>
+                            </div>--%>
                             <div class="form-group">
                                 <label class="control-label col-md-4"></label>
                                 <div class="col-md-8">

Swift.web/Remit/ReferralSetup/CommisionRuleSetup.aspx.cs

@@ -25,14 +25,14 @@ namespace Swift.web.Remit.ReferralSetup
             {
                 effectiveFrom.Text = DateTime.Now.ToString("yyyy-MM-dd");
                 Misc.MakeNumericTextbox(ref commPercent);
-                Misc.MakeNumericTextbox(ref fxPercent);
+                //Misc.MakeNumericTextbox(ref fxPercent);
                 Misc.MakeNumericTextbox(ref flatTxnWise);
-                Misc.MakeNumericTextbox(ref newCustomer);
-                PopulateDdl();
-                if(EditOrNot() == "true")
-                {
-                    partnerDDL.Enabled = false;
-                }
+                //Misc.MakeNumericTextbox(ref newCustomer);
+                //PopulateDdl();
+                //if(EditOrNot() == "true")
+                //{
+                //    partnerDDL.Enabled = false;
+                //}
                 if(GetRefId() != "")
                 {
                     PopulateData();
@@ -45,16 +45,16 @@ namespace Swift.web.Remit.ReferralSetup
             try
             {
                 DataRow res = _refDao.GetCommissionData(GetStatic.GetUser(), GetRefId(),GetPartnerId(), GetRowId());
-                partnerDDL.SelectedValue = res["PARTNER_ID"].ToString();
+                //partnerDDL.SelectedValue = res["PARTNER_ID"].ToString();
                 commPercent.Text = res["COMM_PCNT"].ToString();
-                fxPercent.Text = res["FX_PCNT"].ToString();
-                applyFxPercentOn.Text = res["APPLY_FX_PERCENT_ON"].ToString();
+                //fxPercent.Text = res["FX_PCNT"].ToString();
+                //applyFxPercentOn.Text = res["APPLY_FX_PERCENT_ON"].ToString();
                 flatTxnWise.Text = res["FLAT_TXN_WISE"].ToString();
-                newCustomer.Text = res["NEW_CUSTOMER"].ToString();
+                //newCustomer.Text = res["NEW_CUSTOMER"].ToString();
                 effectiveFrom.Text = res["EFFECTIVE_FROM"].ToString();
                 isActive.SelectedValue = (bool.Parse(res["IS_ACTIVE"].ToString()) == false) ? "0" : "1";
-                deductPCommOnSc.SelectedValue = (bool.Parse(res["DEDUCT_P_COMM_ON_SC"].ToString()) == false) ? "0" : "1";
-                deductTaxOnSc.SelectedValue = (bool.Parse(res["DEDUCT_TAX_ON_SC"].ToString()) == false) ? "0" : "1";
+                //deductPCommOnSc.SelectedValue = (bool.Parse(res["DEDUCT_P_COMM_ON_SC"].ToString()) == false) ? "0" : "1";
+                //deductTaxOnSc.SelectedValue = (bool.Parse(res["DEDUCT_TAX_ON_SC"].ToString()) == false) ? "0" : "1";
             }
             catch (Exception ex)
             {
@@ -67,11 +67,11 @@ namespace Swift.web.Remit.ReferralSetup
         {
             sl.CheckAuthentication(ViewFunctionId);
         }
-        private void PopulateDdl()
-        {
-            rl.SetDDL(ref partnerDDL, "EXEC PROC_API_ROUTE_PARTNERS @flag='partner'", "agentId", "agentName", "", "Select Partner");
-            //sl.SetDDL(ref partner,"Exec ")
-        }
+        //private void PopulateDdl()
+        //{
+        //    rl.SetDDL(ref partnerDDL, "EXEC PROC_API_ROUTE_PARTNERS @flag='partner'", "agentId", "agentName", "", "Select Partner");
+        //    //sl.SetDDL(ref partner,"Exec ")
+        //}
         private string GetRefId()
         {
             return GetStatic.ReadQueryString("referral_id", "");
@@ -94,31 +94,31 @@ namespace Swift.web.Remit.ReferralSetup
         {
             try
             {
-                string partner = partnerDDL.SelectedValue;
+                //string partner = partnerDDL.SelectedValue;
                 string commissionPercent = commPercent.Text;
-                string forexPercent = fxPercent.Text;
-                string applyFxPercentOnValue = applyFxPercentOn.SelectedValue;
+                //string forexPercent = fxPercent.Text;
+                //string applyFxPercentOnValue = applyFxPercentOn.SelectedValue;
                 string flatTransactionWise = flatTxnWise.Text;
-                string nCustomer = newCustomer.Text;
+                //string nCustomer = newCustomer.Text;
                 string efrom = effectiveFrom.Text;
                 string active = isActive.SelectedValue;
-                string deductTaxOnSC = deductTaxOnSc.SelectedValue;
-                string deductPCommOnSC = deductPCommOnSc.SelectedValue;
+                //string deductTaxOnSC = deductTaxOnSc.SelectedValue;
+                //string deductPCommOnSC = deductPCommOnSc.SelectedValue;
                 //int a = GetRefId().ToString().ToInt();
                 CommissionModel cm = new CommissionModel() {
-                    PartnerId = partnerDDL.SelectedValue.ToInt(),
+                    //PartnerId = partnerDDL.SelectedValue.ToInt(),
                     CommissionPercent = commPercent.Text.ToDecimal(),
-                    ForexPercent = fxPercent.Text.ToDecimal(),
-                    ApplyFxPercentOn = applyFxPercentOnValue,
+                    //ForexPercent = fxPercent.Text.ToDecimal(),
+                    //ApplyFxPercentOn = applyFxPercentOnValue,
                     FlatTxnWise = flatTxnWise.Text.ToDecimal(),
-                    NewCustomer = newCustomer.Text.ToDecimal(),
+                    //NewCustomer = newCustomer.Text.ToDecimal(),
                     EffectiveFrom = DateTime.Parse(effectiveFrom.Text),
                     isActive = isActive.SelectedValue,
                     ReferralId = GetRefId(),
                     ReferralCode = GetRefCode(),
                     ROW_ID = GetRowId(),
-                    deductTaxOnSC = deductTaxOnSC,
-                    deductPCommOnSC = deductPCommOnSC
+                    //deductTaxOnSC = deductTaxOnSC,
+                    //deductPCommOnSC = deductPCommOnSC
                 };
                 var res = _refDao.SaveCommissionData(GetStatic.GetUser(), cm,EditOrNot());
                 GetStatic.SetMessage(res);

Swift.web/Remit/ReferralSetup/CommisionRuleSetup.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Swift.web.Remit.ReferralSetup {
-    
-    
-    public partial class CommisionRuleSetup {
-        
+namespace Swift.web.Remit.ReferralSetup
+{
+
+
+    public partial class CommisionRuleSetup
+    {
+
         /// <summary>
         /// form1 control.
         /// </summary>
@@ -20,7 +22,7 @@ namespace Swift.web.Remit.ReferralSetup {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// hdnReferralCode control.
         /// </summary>
@@ -29,16 +31,7 @@ namespace Swift.web.Remit.ReferralSetup {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hdnReferralCode;
-        
-        /// <summary>
-        /// partnerDDL control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.DropDownList partnerDDL;
-        
+
         /// <summary>
         /// commPercent control.
         /// </summary>
@@ -47,25 +40,7 @@ namespace Swift.web.Remit.ReferralSetup {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox commPercent;
-        
-        /// <summary>
-        /// applyFxPercentOn control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.DropDownList applyFxPercentOn;
-        
-        /// <summary>
-        /// fxPercent control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox fxPercent;
-        
+
         /// <summary>
         /// flatTxnWise control.
         /// </summary>
@@ -74,16 +49,7 @@ namespace Swift.web.Remit.ReferralSetup {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox flatTxnWise;
-        
-        /// <summary>
-        /// newCustomer control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox newCustomer;
-        
+
         /// <summary>
         /// effectiveFrom control.
         /// </summary>
@@ -92,7 +58,7 @@ namespace Swift.web.Remit.ReferralSetup {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox effectiveFrom;
-        
+
         /// <summary>
         /// isActive control.
         /// </summary>
@@ -101,25 +67,7 @@ namespace Swift.web.Remit.ReferralSetup {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList isActive;
-        
-        /// <summary>
-        /// deductTaxOnSc control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.DropDownList deductTaxOnSc;
-        
-        /// <summary>
-        /// deductPCommOnSc control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.DropDownList deductPCommOnSc;
-        
+
         /// <summary>
         /// save control.
         /// </summary>

Swift.web/Remit/ReferralSetup/CommissionRuleList.aspx

@@ -106,7 +106,7 @@
                                     </div>
                                 </div>--%>
                                 <div class="panel-body">
-                                    <div class="row">
+                                    <%--<div class="row">
                                         <div class="col-md-4">
                                             <div class="form-group">
                                                 <label class="col-md-6 control-label" for="isFirstTranFree">
@@ -142,7 +142,7 @@
                                                 <input type="button" value="Save Data" onclick="SaveFinalData()" id="btnSaveData" class="btn btn-primary" />
                                             </div>
                                         </div>
-                                    </div>
+                                    </div>--%>
                                     <div class="row">
                                         <div class="col-md-12">
                                             <div class="form-group">

Swift.web/Remit/ReferralSetup/CommissionRuleList.aspx.cs

@@ -80,13 +80,13 @@ namespace Swift.web.Remit.ReferralSetup
                                   {
                                       new GridColumn("REFERRAL_NAME", "Referral Name", "100", "T"),
                                       new GridColumn("agentName", "Branch Name", "100", "T"),
-                                      new GridColumn("COMM_PCNT", "Commission Percent", "100", "M"),
-                                      new GridColumn("FX_PCNT", "Forex Income/Loss Percent", "", "M"),
-                                      new GridColumn("APPLY_FX_PERCENT_ON", "Apply FX % on", "", "T"),
-                                      new GridColumn("FLAT_TXN_WISE", "Flat transaction Wise", "", "M"),
-                                      new GridColumn("NEW_CUSTOMER", "New Customer", "", "M"),
-                                      new GridColumn("DEDUCT_P_COMM_ON_SC", "Deduct PComm On SC", "", "T"),
-                                      new GridColumn("DEDUCT_TAX_ON_SC", "Deduct Tax On SC", "", "T"),
+                                      new GridColumn("COMM_PCNT", "Registration Point", "100", "M"),
+                                      //ew GridColumn("FX_PCNT", "Forex Income/Loss Percent", "", "M"),
+                                      //new GridColumn("APPLY_FX_PERCENT_ON", "Apply FX % on", "", "T"),
+                                      new GridColumn("FLAT_TXN_WISE", "Transaction Point", "", "M"),
+                                      //new GridColumn("NEW_CUSTOMER", "New Customer", "", "M"),
+                                     // new GridColumn("DEDUCT_P_COMM_ON_SC", "Deduct PComm On SC", "", "T"),
+                                     // new GridColumn("DEDUCT_TAX_ON_SC", "Deduct Tax On SC", "", "T"),
                                       new GridColumn("EFFECTIVE_FROM", "Effective From", "", "D"),
                                       new GridColumn("IS_ACTIVE", "Is Active", "", "T"),
                                   };

Swift.web/Remit/ReferralSetup/List.aspx.cs

@@ -40,7 +40,7 @@ namespace Swift.web.Remit.ReferralSetup
             _grid.FilterList = new List<GridFilter>
                                   {
                                      new GridFilter("branchId", "Branch", "1: EXEC PROC_REFERALSETUP @flag = 'branchNameForFilter'"),
-                                     new GridFilter("referralTypeCode", "Referral Type", "1: EXEC PROC_REFERALSETUP @flag = 'referalType'"),
+                                     //new GridFilter("referralTypeCode", "Referral Type", "1: EXEC PROC_REFERALSETUP @flag = 'referalType'"),
                                      new GridFilter("referralName", "Referral Name", "T"),
                                      new GridFilter("referralCode", "Referral code", "T")
                                   };
@@ -52,8 +52,8 @@ namespace Swift.web.Remit.ReferralSetup
                                       new GridColumn("BranchName", "Branch Name", "100", "T"),
                                       new GridColumn("REFERRAL_MOBILE", "Mobile No.", "100", "T"),
                                       new GridColumn("REFERRAL_ADDRESS", "Address ", "100", "T"),
-                                      new GridColumn("RULE_TYPE", "Rule Type", "", "T"),
-                                      new GridColumn("REFERRAL_LIMIT", "Cash Hold Limit", "", "T"),
+                                      new GridColumn("RULE_TYPE", "Basic Registration Rules", "", "T"),
+                                     // new GridColumn("REFERRAL_LIMIT", "Cash Hold Limit", "", "T"),
                                       new GridColumn("IS_ACTIVE", "Is Active", "", "T"),
                                   };
 

Swift.web/Remit/ReferralSetup/Manage.aspx

@@ -69,10 +69,10 @@
                                     <div class="form-group">
                                         <label class="col-lg-4 col-md-8 control-label" for="">
                                             <label>
-                                                Referral Name : <span class="errormsg">*</span></label>
+                                                Branch Id <span class="errormsg">*</span></label>
                                         </label>
                                         <div class="col-lg-8 col-md-4">
-                                            <asp:TextBox runat="server" ID="referralName" class="form-control"></asp:TextBox>
+                                            <asp:DropDownList runat="server" ID="ddlBranchList" class="form-control"></asp:DropDownList>
                                         </div>
                                     </div>
                                 </div>
@@ -80,20 +80,21 @@
                                     <div class="form-group">
                                         <label class="col-lg-4 col-md-8 control-label" for="">
                                             <label>
-                                                Referral Mobile :</label>
+                                                Agent Name : <span class="errormsg">*</span></label>
                                         </label>
                                         <div class="col-lg-8 col-md-4">
-                                            <asp:TextBox runat="server" ID="referralMobile" class="form-control"></asp:TextBox>
+                                            <asp:TextBox runat="server" ID="referralName" class="form-control"></asp:TextBox>
                                         </div>
                                     </div>
                                 </div>
+
                             </div>
                             <div class="row">
                                 <div class="col-md-6">
                                     <div class="form-group">
                                         <label class="col-lg-4 col-md-8 control-label" for="">
                                             <label>
-                                                Referral Address</label>
+                                                Agent Address: <span class="errormsg">*</span></label>
                                         </label>
                                         <div class="col-lg-8 col-md-4">
                                             <asp:TextBox runat="server" ID="referralAddress" class="form-control"></asp:TextBox>
@@ -104,7 +105,32 @@
                                     <div class="form-group">
                                         <label class="col-lg-4 col-md-8 control-label" for="">
                                             <label>
-                                                Is Active:</label>
+                                                Agent Email : <span class="errormsg">*</span></label>
+                                        </label>
+                                        <div class="col-lg-8 col-md-4">
+                                            <asp:TextBox runat="server" ID="referralEmail" class="form-control"></asp:TextBox>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            </div>
+                            <div class="row">
+                                <div class="col-md-6">
+                                    <div class="form-group">
+                                        <label class="col-lg-4 col-md-8 control-label" for="">
+                                            <label>
+                                                Agent Telephone Number : <span class="errormsg">*</span></label>
+                                        </label>
+                                        <div class="col-lg-8 col-md-4">
+                                            <asp:TextBox runat="server" ID="referralMobile" class="form-control"></asp:TextBox>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-md-6">
+                                    <div class="form-group">
+                                        <label class="col-lg-4 col-md-8 control-label" for="">
+                                            <label>
+                                                Is Active: <span class="errormsg">*</span></label>
                                         </label>
                                         <div class="col-lg-8 col-md-4">
                                             <asp:DropDownList ID="isActiveDDL" runat="server" CssClass="form-control">
@@ -116,15 +142,14 @@
                                 </div>
                             </div>
                             <div class="row">
-
                                 <div class="col-md-6">
                                     <div class="form-group">
                                         <label class="col-lg-4 col-md-8 control-label" for="">
                                             <label>
-                                                Referral Email</label>
+                                                Referral Code: <span class="errormsg">*</span></label>
                                         </label>
                                         <div class="col-lg-8 col-md-4">
-                                            <asp:TextBox runat="server" ID="referralEmail" class="form-control"></asp:TextBox>
+                                            <asp:TextBox runat="server" ID="referralCode" class="form-control"></asp:TextBox>
                                         </div>
                                     </div>
                                 </div>
@@ -132,16 +157,19 @@
                                     <div class="form-group">
                                         <label class="col-lg-4 col-md-8 control-label" for="">
                                             <label>
-                                                Branch Id <span class="errormsg">*</span></label>
+                                                Complete Basic Registration: <span class="errormsg">*</span></label>
                                         </label>
                                         <div class="col-lg-8 col-md-4">
-                                            <asp:DropDownList runat="server" ID="ddlBranchList" class="form-control"></asp:DropDownList>
+                                            <asp:DropDownList ID="ddlRegRules" runat="server" CssClass="form-control">
+                                                <asp:ListItem Text="Yes" Value="1"></asp:ListItem>
+                                                <asp:ListItem Text="No" Value="0"></asp:ListItem>
+                                            </asp:DropDownList>
                                         </div>
                                     </div>
                                 </div>
                             </div>
-                            <div class="row">
-                                <div class="col-md-6">
+                            <%--<div class="row">
+                                <div class="col-md-6" style="display: none;">
                                     <div class="form-group">
                                         <label class="col-lg-4 col-md-8 control-label" for="">
                                             <label>
@@ -154,10 +182,10 @@
                                                 <asp:ListItem Text="Referral'S with no comm" Value="RC"></asp:ListItem>
                                                 <asp:ListItem Text="Regular Referral Agent's" Value="RR"></asp:ListItem>
                                             </asp:DropDownList>
-                                        </div>
-                                    </div>
+                                        </div>                             
+                                    </div>aw
                                 </div>
-                                <div class="col-md-6">
+                                <div class="col-md-6" style="display: none;">
                                     <div class="form-group">
                                         <label class="col-lg-4 col-md-8 control-label" for="">
                                             <label>
@@ -170,7 +198,7 @@
                                 </div>
                             </div>
                             <div class="row">
-                                <div class="col-md-6">
+                                <div class="col-md-6" style="display: none;">
                                     <div class="form-group">
                                         <label class="col-lg-4 col-md-8 control-label" for="">
                                             <label>
@@ -184,7 +212,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="col-md-6" style="display:none;">
+                                <div class="col-md-6" style="display: none;">
                                     <div class="form-group">
                                         <label class="col-lg-4 col-md-8 control-label" for="">
                                             <label>
@@ -198,8 +226,7 @@
                                         </div>
                                     </div>
                                 </div>
-                            </div>
-
+                            </div>--%>
                         </ContentTemplate>
                     </asp:UpdatePanel>
                     <div class="row">

Swift.web/Remit/ReferralSetup/Manage.aspx.cs

@@ -17,9 +17,10 @@ namespace Swift.web.Remit.ReferralSetup
         {
             Authenticate();
             if (!IsPostBack)
+            if (!IsPostBack)
             {
                 Misc.MakeNumericTextbox(ref referralMobile);
-                Misc.MakeNumericTextbox(ref cashHoldLimit);
+                //Misc.MakeNumericTextbox(ref cashHoldLimit);
                 PopulateDDL();
                 if (GetId() != "")
                 {
@@ -55,14 +56,16 @@ namespace Swift.web.Remit.ReferralSetup
             var a = dr["IS_ACTIVE"].ToString();
             isActiveDDL.SelectedValue = dr["IS_ACTIVE"].ToString() == "False" ? "0" : "1";
             //ddlAgentId.SelectedValue = dr["AGENT_ID"].ToString();
-            referralName.Text = dr["REFERRAL_NAME"].ToString();
+            referralName.Text = dr["REFERRAL_NAME"].ToString(); 
             referralAddress.Text = dr["REFERRAL_ADDRESS"].ToString();
             referralEmail.Text = dr["REFERRAL_EMAIL"].ToString();
             referralMobile.Text = dr["REFERRAL_MOBILE"].ToString();
             ddlBranchList.SelectedValue = dr["BRANCH_ID"].ToString();
-            ddlReferraltype.SelectedValue = dr["REFERRAL_TYPE_CODE"].ToString();
-            ddlruleType.SelectedValue = dr["RULE_TYPE"].ToString();
-            cashHoldLimit.Text = GetStatic.ShowDecimal(dr["REFERRAL_LIMIT"].ToString());
+            referralCode.Text = dr["REFERRAL_CODE"].ToString();
+            ddlRegRules.SelectedValue = dr["RULE_TYPE"].ToString();
+            //ddlReferraltype.SelectedValue = dr["REFERRAL_TYPE_CODE"].ToString();
+            //ddlruleType.SelectedValue = dr["RULE_TYPE"].ToString();
+            //cashHoldLimit.Text = GetStatic.ShowDecimal(dr["REFERRAL_LIMIT"].ToString());
             //deductTaxOnSc.SelectedValue = (bool.Parse(dr["DEDUCT_TAX_ON_SC"].ToString()) == false) ? "0" : "1";
 
         }
@@ -76,10 +79,12 @@ namespace Swift.web.Remit.ReferralSetup
             var rMobile = Request.Form["referralMobile"].ToString();
             var isActive = Request.Form["isActiveDDL"].ToString();
             var branchId = Request.Form["ddlBranchList"].ToString();
-            var referralTypeCode = Request.Form["ddlReferraltype"].ToString();
-            var referralType = ddlReferraltype.SelectedItem.ToString();
-            var ruleType = ddlruleType.SelectedItem.ToString();
-            var cashHoldLimitAmount = Request.Form["cashHoldLimit"].ToString();
+            var referralTypeCode = "";//Request.Form["ddlReferraltype"].ToString();
+            var referralType = "";//ddlReferraltype.SelectedItem.ToString();
+            var ruleType = "";//ddlruleType.SelectedItem.ToString();
+            var cashHoldLimitAmount = "";//Request.Form["cashHoldLimit"].ToString();
+            var refCode = Request.Form["referralCode"].ToString();
+            var regRule = Request.Form["ddlRegRules"].ToString();
             //var deductTaxOnServiceCharge = Request.Form["deductTaxOnSc"].ToString();
 
             DbResult _dbRes = _refDao.InsertReferral(flag, GetStatic.GetUser()
@@ -87,7 +92,7 @@ namespace Swift.web.Remit.ReferralSetup
                                 , rEmailAddress
                                 , isActive
                                 , rMobile, branchId, GetId(), referralTypeCode, referralType
-                                , ruleType, cashHoldLimitAmount);
+                                , cashHoldLimitAmount, refCode, regRule);
 
             if (_dbRes.ErrorCode != "0")
             {

Swift.web/Remit/ReferralSetup/Manage.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Swift.web.Remit.ReferralSetup {
-    
-    
-    public partial class Manage {
-        
+namespace Swift.web.Remit.ReferralSetup
+{
+
+
+    public partial class Manage
+    {
+
         /// <summary>
         /// Base1 control.
         /// </summary>
@@ -20,7 +22,7 @@ namespace Swift.web.Remit.ReferralSetup {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl Base1;
-        
+
         /// <summary>
         /// form1 control.
         /// </summary>
@@ -29,7 +31,7 @@ namespace Swift.web.Remit.ReferralSetup {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// ScriptManager1 control.
         /// </summary>
@@ -38,7 +40,7 @@ namespace Swift.web.Remit.ReferralSetup {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.ScriptManager ScriptManager1;
-        
+
         /// <summary>
         /// UpdatePanel1 control.
         /// </summary>
@@ -47,25 +49,25 @@ namespace Swift.web.Remit.ReferralSetup {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.UpdatePanel UpdatePanel1;
-        
+
         /// <summary>
-        /// referralName control.
+        /// ddlBranchList control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox referralName;
-        
+        protected global::System.Web.UI.WebControls.DropDownList ddlBranchList;
+
         /// <summary>
-        /// referralMobile control.
+        /// referralName control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox referralMobile;
-        
+        protected global::System.Web.UI.WebControls.TextBox referralName;
+
         /// <summary>
         /// referralAddress control.
         /// </summary>
@@ -74,16 +76,7 @@ namespace Swift.web.Remit.ReferralSetup {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox referralAddress;
-        
-        /// <summary>
-        /// isActiveDDL control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.DropDownList isActiveDDL;
-        
+
         /// <summary>
         /// referralEmail control.
         /// </summary>
@@ -92,52 +85,43 @@ namespace Swift.web.Remit.ReferralSetup {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox referralEmail;
-        
-        /// <summary>
-        /// ddlBranchList control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.DropDownList ddlBranchList;
-        
+
         /// <summary>
-        /// ddlReferraltype control.
+        /// referralMobile control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.DropDownList ddlReferraltype;
-        
+        protected global::System.Web.UI.WebControls.TextBox referralMobile;
+
         /// <summary>
-        /// cashHoldLimit control.
+        /// isActiveDDL control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox cashHoldLimit;
-        
+        protected global::System.Web.UI.WebControls.DropDownList isActiveDDL;
+
         /// <summary>
-        /// ddlruleType control.
+        /// referralCode control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.DropDownList ddlruleType;
-        
+        protected global::System.Web.UI.WebControls.TextBox referralCode;
+
         /// <summary>
-        /// deductTaxOnSc control.
+        /// ddlRegRules control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.DropDownList deductTaxOnSc;
-        
+        protected global::System.Web.UI.WebControls.DropDownList ddlRegRules;
+
         /// <summary>
         /// btnSave control.
         /// </summary>

Swift.web/Remit/TPSetup/BankAndBranchSetup/BankList.aspx.cs

@@ -52,6 +52,7 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
                                   {
                                       new GridColumn("API_PARTNER", "API PARTNER", "", "T"),
                                       new GridColumn("BANK_NAME", "BANK NAME", "100", "T"),
+                                      new GridColumn("JME_BANK_CODE", "IME BANK CODE", "", "T"),
                                       new GridColumn("BANK_CODE1", "BANK CODE1", "", "T"),
                                       new GridColumn("BANK_CODE2", "BANK CODE2", "", "T"),
 

Swift.web/Remit/TPSetup/BankAndBranchSetup/NewBankList.aspx.cs

@@ -51,6 +51,7 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
                                       new GridColumn("BANK_COUNTRY", "COUNTRY", "", "T"),
                                       new GridColumn("BANK_NAME", "BANK NAME", "100", "T"),
                                       new GridColumn("SUPPORT_CURRENCY", "SUPPORT CURRENCY", "", "T"),
+                                      new GridColumn("JME_BANK_CODE", "IME BANK CODE", "", "T"),
                                       new GridColumn("PAYMENT_TYPE", "PAYMENT TYPE", "", "T"),
                                       new GridColumn("IS_ACTIVE", "IS ACTIVE", "", "T"),
                                       

Swift.web/Remit/Transaction/Reports/ReferralReport/ReferralReportComm.aspx

@@ -71,37 +71,19 @@
                                         <tr>
                                             <th rowspan="2">S. No.</th>
                                             <th rowspan="2" style="text-align: center;">Referral Name</th>
-                                            <th rowspan="2" style="text-align: center;">Sender Name</th>
-                                            <th rowspan="2" style="text-align: center;">JME No</th>
-                                            <th rowspan="2" style="text-align: center;">Sc Charge</th>
-                                            <th rowspan="2" style="text-align: center;">Coll Amount</th>
+                                            <th rowspan="2" style="text-align: center;">Customer Name</th>
                                             <th rowspan="2" style="text-align: center;">Date</th>
-                                            <th colspan="4" style="text-align: center;">Nepal Commission</th>
-                                            <th colspan="4" style="text-align: center;">TF Commission</th>
-                                            <th colspan="2" style="text-align: center;">Flat Commission</th>
-                                            <th colspan="2" style="text-align: center;">New Customer Registration</th>
-                                            <th rowspan="2" style="text-align: center;">Tax Deduction</th>
-                                            <%--<th rowspan="2" style="text-align: center;">Total Txn</th>--%>
-                                            <th rowspan="2" style="text-align: center;">Total Incentive Payable</th>
-                                        </tr>
-                                        <tr>
-                                            <th>FX Rate</th>
-                                            <th>FX Amount</th>
-                                            <th>Comm Rate</th>
-                                            <th>Comm Amount</th>
-                                            <th>FX Rate</th>
-                                            <th>FX Amount</th>
-                                            <th>Comm Rate</th>
-                                            <th>Comm Amount</th>
-                                            <th>Rate</th>
-                                            <th>Amount</th>
-                                            <th>Rate</th>
-                                            <th>Amount</th>
+                                            <th rowspan="2" style="text-align: center;">IME No</th>
+                                            <th rowspan="2" style="text-align: center;">Coll Amount</th>
+                                            <th rowspan="2" style="text-align: center;">Sc Charge</th>
+                                            <th rowspan="2" style="text-align: center;">Transaction Points</th>
+                                            <th rowspan="2" style="text-align: center;">Registration Points</th>
+                                            <th rowspan="2" style="text-align: center;">Referral Type</th>
                                         </tr>
                                     </thead>
                                     <tbody id="referralCommTbl" runat="server">
                                         <tr>
-                                            <td colspan="17" align="center"><b>No record found</b></td>
+                                            <td colspan="10" align="center"><b>No record found</b></td>
                                         </tr>
                                     </tbody>
                                 </table>

Swift.web/Remit/Transaction/Reports/ReferralReport/ReferralReportComm.aspx.cs

@@ -48,7 +48,7 @@ namespace Swift.web.Remit.Transaction.Reports.ReferralReport
             StringBuilder sb = new StringBuilder();
             double total = 0;
             int sNo = 1;
-            double npFx = 0, npComm = 0, tfFX = 0, tfComm = 0, flat = 0, newCust = 0, mainTotal = 0, taxTotal = 0, scTotal = 0, collAmt = 0;
+            double mainTotal = 0, scTotal = 0, collAmt = 0, tranPtsTotal = 0, regPtsTotal = 0;
 
             foreach (DataRow item in dt.Rows)
             {
@@ -59,91 +59,53 @@ namespace Swift.web.Remit.Transaction.Reports.ReferralReport
                 string CONTROLNO = item["CONTROLNO"].ToString();
                 string serviceCharge = item["serviceCharge"].ToString();
                 string collAmount = item["CAMT"].ToString();
+                string tranPts = item["FX_PCNT"].ToString();
+                string regPts = item["COMMISSION_PCNT"].ToString();
                 total = 0;
 
                 sb.AppendLine("<tr>");
-                sb.AppendLine("<td> " + sNo + "</td>");
+                sb.AppendLine("<td style='text-align:center;'> " + sNo + "</td>");
                 if (isNepal)
                 {
-                    sb.AppendLine("<td>" + REFERRAL_NAME + "</td>");
-                    sb.AppendLine("<td>" + item["SENDERNAME"] + "</td>");
-                    sb.AppendLine("<td>" + CONTROLNO + "</td>");
-                    sb.AppendLine("<td>" + GetStatic.ShowDecimal(serviceCharge) + "</td>");
-                    sb.AppendLine("<td>" + GetStatic.ShowDecimal(collAmount) + "</td>");
-                    sb.AppendLine("<td>" + DATE + "</td>");
-                    sb.AppendLine("<td>" + item["FX_PCNT"] + "</td>");
-                    sb.AppendLine("<td>" + item["PAID_FX"] + "</td>");
-                    sb.AppendLine("<td>" + item["COMMISSION_PCNT"] + "</td>");
-                    sb.AppendLine("<td>" + item["PAID_COMMISSION"] + "</td>");
-                    sb.AppendLine("<td>0</td>");
-                    sb.AppendLine("<td>0</td>");
-                    sb.AppendLine("<td>0</td>");
-                    sb.AppendLine("<td>0</td>");
-
-                    npFx += Convert.ToDouble(item["PAID_FX"]);
-                    npComm += Convert.ToDouble(item["PAID_COMMISSION"]);
+                    sb.AppendLine("<td style='text-align:center;'>" + REFERRAL_NAME + "</td>");
+                    sb.AppendLine("<td style='text-align:center;'>" + item["SENDERNAME"] + "</td>");
+                    sb.AppendLine("<td style='text-align:center;'>" + DATE + "</td>");
+                    sb.AppendLine("<td style='text-align:center;'>" + CONTROLNO + "</td>");
+                    sb.AppendLine("<td style='text-align:center;'>" + GetStatic.ShowDecimal(collAmount) + "</td>");
+                    sb.AppendLine("<td style='text-align:center;'>" + GetStatic.ShowDecimal(serviceCharge) + "</td>");
+                    sb.AppendLine("<td style='text-align:center;'>" + GetStatic.ShowDecimal(tranPts) + "</td>");
+                    sb.AppendLine("<td style='text-align:center;'>" + GetStatic.ShowDecimal(regPts) + "</td>");
+                    sb.AppendLine("<td style='text-align:center;'>" + item["REFERRAL_TYPE"] + "</td>");
                 }
                 else
                 {
-                    sb.AppendLine("<td>" + REFERRAL_NAME + "</td>");
-                    sb.AppendLine("<td>" + item["SENDERNAME"] + "</td>");
-                    sb.AppendLine("<td>" + CONTROLNO + "</td>");
-                    sb.AppendLine("<td>" + GetStatic.ShowDecimal(serviceCharge) + "</td>");
-                    sb.AppendLine("<td>" + GetStatic.ShowDecimal(collAmount) + "</td>");
-                    sb.AppendLine("<td>" + DATE + "</td>");
-                    sb.AppendLine("<td>0</td>");
-                    sb.AppendLine("<td>0</td>");
-                    sb.AppendLine("<td>0</td>");
-                    sb.AppendLine("<td>0</td>");
-                    sb.AppendLine("<td>" + item["FX_PCNT"] + "</td>");
-                    sb.AppendLine("<td>" + item["PAID_FX"] + "</td>");
-                    sb.AppendLine("<td>" + item["COMMISSION_PCNT"] + "</td>");
-                    sb.AppendLine("<td>" + item["PAID_COMMISSION"] + "</td>");
-
-                    tfFX += Convert.ToDouble(item["PAID_FX"]);
-                    tfComm += Convert.ToDouble(item["PAID_COMMISSION"]);
+                    sb.AppendLine("<td style='text-align:center;'>" + REFERRAL_NAME + "</td>");
+                    sb.AppendLine("<td style='text-align:center;'>" + item["SENDERNAME"] + "</td>");
+                    sb.AppendLine("<td style='text-align:center;'>" + DATE + "</td>");
+                    sb.AppendLine("<td style='text-align:center;'>" + CONTROLNO + "</td>");
+                    sb.AppendLine("<td style='text-align:center;'>" + GetStatic.ShowDecimal(collAmount) + "</td>");
+                    sb.AppendLine("<td style='text-align:center;'>" + GetStatic.ShowDecimal(serviceCharge) + "</td>");
+                    sb.AppendLine("<td style='text-align:center;'>" + GetStatic.ShowDecimal(tranPts) + "</td>");
+                    sb.AppendLine("<td style='text-align:center;'>" + GetStatic.ShowDecimal(regPts) + "</td>");                    
+                    sb.AppendLine("<td style='text-align:center;'>" + item["REFERRAL_TYPE"] + "</td>");
                 }
-                sb.AppendLine("<td>" + item["FLAT_RATE"] + "</td>");
-                sb.AppendLine("<td>" + item["PAID_FLAT"] + "</td>");
-                sb.AppendLine("<td>" + GetStatic.ShowDecimal(item["PAID_NEW_CUSTOMER_RATE"].ToString()) + "</td>");
-                sb.AppendLine("<td>" + GetStatic.ShowDecimal(item["PAID_NEW_CUSTOMER"].ToString()) + "</td>");
-                sb.AppendLine("<td>" + Convert.ToDecimal(item["TAX_AMOUNT"]) + "</td>");
-
-                total = Convert.ToDouble(item["PAID_FX"]) + Convert.ToDouble(item["PAID_COMMISSION"]);
-                total += Convert.ToDouble(item["PAID_FLAT"]) + Convert.ToDouble(item["PAID_NEW_CUSTOMER"]);
-
-
-                flat += Convert.ToDouble(item["PAID_FLAT"]);
-                newCust += Convert.ToDouble(item["PAID_NEW_CUSTOMER"]);
-                taxTotal += Convert.ToDouble(item["TAX_AMOUNT"]);
-                scTotal += Convert.ToDouble(serviceCharge);
                 collAmt += Convert.ToDouble(collAmount);
-                mainTotal += total;
+                scTotal += Convert.ToDouble(serviceCharge);
+                tranPtsTotal += Convert.ToDouble(tranPts);
+                regPtsTotal += Convert.ToDouble(regPts);
+                //mainTotal += total;
                 sNo++;
 
-                //sb.AppendLine("<td>" + incentive + "</td>");
-                sb.AppendLine("<td>" + total + "</td>");
+                //sb.AppendLine("<td>" + total + "</td>");
                 sb.AppendLine("</tr>");
             }
             sb.Append("<tr>");
-            sb.AppendLine("<td colspan='3' style='font-weight: bold;text-align: right;'>Total<td>");
-            sb.AppendLine("<td style='font-weight: bold;'>" + scTotal + "</td>");
-            sb.AppendLine("<td style='font-weight: bold;'>" + collAmt + "</td>");
-            sb.AppendLine("<td></td>");
-            sb.AppendLine("<td></td>");
-            sb.AppendLine("<td style='font-weight: bold;'>" + npFx + "</td>");
-            sb.AppendLine("<td></td>");
-            sb.AppendLine("<td style='font-weight: bold;'>" + npComm + "</td>");
-            sb.AppendLine("<td></td>");
-            sb.AppendLine("<td style='font-weight: bold;'>" + tfFX + "</td>");
-            sb.AppendLine("<td></td>");
-            sb.AppendLine("<td style='font-weight: bold;'>" + tfComm + "</td>");
-            sb.AppendLine("<td></td>");
-            sb.AppendLine("<td style='font-weight: bold;'>" + flat + "</td>");
-            sb.AppendLine("<td></td>");
-            sb.AppendLine("<td style='font-weight: bold;'>" + newCust + "</td>");
-            sb.AppendLine("<td style='font-weight: bold;'>" + taxTotal + "</td>");
-            sb.AppendLine("<td style='font-weight: bold;'>" + mainTotal + "</td>");
+            sb.AppendLine("<td colspan='4' style='font-weight: bold;text-align: right;'>Total<td>");
+            sb.AppendLine("<td style='font-weight: bold; text-align:center;'>" + collAmt + "</td>");
+            sb.AppendLine("<td style='font-weight: bold; text-align:center;'>" + scTotal + "</td>");
+            sb.AppendLine("<td style='font-weight: bold; text-align:center;'>" + tranPtsTotal + "</td>");
+            sb.AppendLine("<td style='font-weight: bold; text-align:center;'>" + regPtsTotal + "</td>");
+            //sb.AppendLine("<td style='font-weight: bold;'>" + mainTotal + "</td>");
             sb.Append("</tr>");
             referralCommTbl.InnerHtml = sb.ToString();
         }

Swift.web/Remit/Transaction/Reports/ReferralReport/SearchReferralReport.aspx

@@ -120,8 +120,8 @@
                                 <label class="col-lg-4 col-md-4 control-label" for="">
                                 </label>
                                 <div class="col-lg-8 col-md-8">
-                                    <input type="button" value="Detail Report" class="btn btn-primary m-t-25" onclick="return GetReferralReport('d');" />
-                                    <input type="button" value="Summary Report" class="btn btn-primary m-t-25" onclick="return GetReferralReport('s');" />
+                                    <input type="button" value="View Report" class="btn btn-primary m-t-25" onclick="return GetReferralReport('d');" />
+                                    <%--<input type="button" value="Summary Report" class="btn btn-primary m-t-25" onclick="return GetReferralReport('s');" />--%>
                                 </div>
                             </div>
                             <!-- End .form-group  -->

Swift.web/RemittanceSystem/RemittanceReports/Reports.aspx.cs

@@ -1046,9 +1046,9 @@ namespace Swift.web.RemittanceSystem.RemittanceReports
             fieldFormat = "|||||||||||||N||N|N|N||||";
             fieldAlignment = "|||||||||||||R||R|R|R|||||";
             totalText = "Total";
-            totalFields = "12|14|15|16|19";
+            totalFields = "13|15|16|17|20";
             subTotalBy = 4;
-            subTotalFields = "12|14|15|16|19";
+            subTotalFields = "13|15|16|17|20";
             subTotalText = "<b>Sub Total</b>";
 
             return (new TranReportDao().DailySendingReport(user, fromDate, toDate, verificationType));

Swift.web/SendMoney/Default.aspx.cs

@@ -566,10 +566,10 @@ namespace Swift.web.SendMoney
 
             //GetStatic.WriteSession("mapCodeInt", ud.MapCodeInt);
             //GetStatic.WriteSession("parentMapCodeInt", ud.ParentMapCodeInt);
-            //GetStatic.WriteSession("mapCodeDom", ud.MapCodeDom);
+            GetStatic.WriteSession("mapCodeDom", ud.MapCodeDom);
             GetStatic.WriteSession("mapCodeInt", ddlBranch.SelectedValue);
             GetStatic.WriteSession("parentMapCodeInt", ddlBranch.SelectedValue);
-            GetStatic.WriteSession("mapCodeDom", ddlBranch.SelectedValue);
+            //GetStatic.WriteSession("mapCodeDom", ddlBranch.SelectedValue);
 
             GetStatic.WriteSession("agentType", ud.AgentType);
             GetStatic.WriteSession("isActAsBranch", ud.IsActAsBranch);

Swift.web/SwiftSystem/UserManagement/AgentSetup/Manage.aspx

@@ -121,11 +121,8 @@
 										</div>
 										<div class="col-lg-3 col-md-3 form-group">
 											<label class="control-label" for="">
-												Business License:<span style="color: red;">*</span>
+												Business License:
 											</label>
-											<asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="businessLicense"
-												Display="Dynamic" ErrorMessage="Required!" ValidationGroup="agent" ForeColor="Red"
-												SetFocusOnError="True"></asp:RequiredFieldValidator>
 											<asp:TextBox ID="businessLicense" runat="server" CssClass="form-control"></asp:TextBox>
 										</div>
 										<div class="col-lg-3 col-md-3 form-group">

Swift.web/SwiftSystem/UserManagement/AgentSetup/Manage.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Swift.web.SwiftSystem.UserManagement.AgentSetup {
+namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
+{
     
     
-    public partial class Manage {
+    public partial class Manage
+    {
         
         /// <summary>
         /// Head1 control.
@@ -127,7 +129,6 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup {
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator1;
         
         /// <summary>
         /// businessLicense control.