change from master

Swift.API/Common/Enum/Notification_BACKUP_1404.cs

@@ -1,70 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Swift.API.Common.Enum
-{
-    [DefaultValue(NONE)]
-    public enum NotifyTemplate
-    {
-        NONE,
-
-
-        [Description("Email to customer txn is created for bank transfer")]
-        BANK_TRANSFER_TXN_PENDING = 1,
-
-        [Description("Email to customer after txn payment is cleared by IME London")]
-        BANK_TRANSFER_TXN_CLEARED = 2,
-
-        [Description("Email to customer after txn is accepted by Pay-out partner")]
-        BANK_TXN_POST = 3,
-
-        [Description("Email to customer after txn has been accepted by Pay-out partner (Cash Collection)")]
-        CASH_TXN_POST = 4,
-
-        [Description("Email to customer for reset password. JsonRX")]
-        RESET_PASSWORD_EMAIL = 5,
-
-        [Description("Email to customer after Basic Registration has been completed")]
-        BASIC_REGISTRATION_EMAIL = 6,
-
-        [Description("Email to customer after KYC completion")]
-        KYC_VERIFICATION_EMAIL = 7,
-
-        [Description("Email to customer for OTP")]
-        OTP_EMAIL = 8,
-<<<<<<< HEAD
-        
-        [Description("Customer Password and Txn Pin")]
-        PIN_PASSWORD_EMAIL = 20,
-        FORCE_PASSWORD_CHANGE=9,
-=======
-
-        [Description("Customer Password and Txn Pin")]
-        PIN_PASSWORD_EMAIL = 20,
-
-        FORCE_PASSWORD_CHANGE =9,
->>>>>>> 5b31b325d13826c742cc26f037a36f94f71d5634
-
-        TRANSACTION_APPROVED = 10,
-
-        TRANSACTION_MODIFY = 11,
-
-        JP_POST_APPROVED = 12,
-
-        TRANSACTION_CANCELLED = 13,
-
-        TRANSACTION_PAID = 14,
-
-        TRANSACTION_SUCCESS = 15,
-
-        TF_NO_BALANCE = 16,
-
-        CUSTOMER_MOBILE_NOT_REGISTER = 17,
-        CUSTOMER_LAWSON_REGISTER = 18,
-        CUSTOMER_REFERRAL_500 = 19
-    }
-}

Swift.API/Common/Enum/Notification_BASE_1404.cs

@@ -1,60 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Swift.API.Common.Enum
-{
-    [DefaultValue(NONE)]
-    public enum NotifyTemplate
-    {
-        NONE,
-
-
-        [Description("Email to customer txn is created for bank transfer")]
-        BANK_TRANSFER_TXN_PENDING = 1,
-
-        [Description("Email to customer after txn payment is cleared by IME London")]
-        BANK_TRANSFER_TXN_CLEARED = 2,
-
-        [Description("Email to customer after txn is accepted by Pay-out partner")]
-        BANK_TXN_POST = 3,
-
-        [Description("Email to customer after txn has been accepted by Pay-out partner (Cash Collection)")]
-        CASH_TXN_POST = 4,
-
-        [Description("Email to customer for reset password. JsonRX")]
-        RESET_PASSWORD_EMAIL = 5,
-
-        [Description("Email to customer after Basic Registration has been completed")]
-        BASIC_REGISTRATION_EMAIL = 6,
-
-        [Description("Email to customer after KYC completion")]
-        KYC_VERIFICATION_EMAIL = 7,
-
-        [Description("Email to customer for OTP")]
-        OTP_EMAIL = 8,
-        
-        FORCE_PASSWORD_CHANGE=9,
-
-        TRANSACTION_APPROVED = 10,
-
-        TRANSACTION_MODIFY = 11,
-
-        JP_POST_APPROVED = 12,
-
-        TRANSACTION_CANCELLED = 13,
-
-        TRANSACTION_PAID = 14,
-
-        TRANSACTION_SUCCESS = 15,
-
-        TF_NO_BALANCE = 16,
-
-        CUSTOMER_MOBILE_NOT_REGISTER = 17,
-        CUSTOMER_LAWSON_REGISTER = 18,
-        CUSTOMER_REFERRAL_500 = 19
-    }
-}

Swift.API/Common/Enum/Notification_LOCAL_1404.cs

@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Swift.API.Common.Enum
-{
-    [DefaultValue(NONE)]
-    public enum NotifyTemplate
-    {
-        NONE,
-
-
-        [Description("Email to customer txn is created for bank transfer")]
-        BANK_TRANSFER_TXN_PENDING = 1,
-
-        [Description("Email to customer after txn payment is cleared by IME London")]
-        BANK_TRANSFER_TXN_CLEARED = 2,
-
-        [Description("Email to customer after txn is accepted by Pay-out partner")]
-        BANK_TXN_POST = 3,
-
-        [Description("Email to customer after txn has been accepted by Pay-out partner (Cash Collection)")]
-        CASH_TXN_POST = 4,
-
-        [Description("Email to customer for reset password. JsonRX")]
-        RESET_PASSWORD_EMAIL = 5,
-
-        [Description("Email to customer after Basic Registration has been completed")]
-        BASIC_REGISTRATION_EMAIL = 6,
-
-        [Description("Email to customer after KYC completion")]
-        KYC_VERIFICATION_EMAIL = 7,
-
-        [Description("Email to customer for OTP")]
-        OTP_EMAIL = 8,
-        
-        [Description("Customer Password and Txn Pin")]
-        PIN_PASSWORD_EMAIL = 20,
-        FORCE_PASSWORD_CHANGE=9,
-
-        TRANSACTION_APPROVED = 10,
-
-        TRANSACTION_MODIFY = 11,
-
-        JP_POST_APPROVED = 12,
-
-        TRANSACTION_CANCELLED = 13,
-
-        TRANSACTION_PAID = 14,
-
-        TRANSACTION_SUCCESS = 15,
-
-        TF_NO_BALANCE = 16,
-
-        CUSTOMER_MOBILE_NOT_REGISTER = 17,
-        CUSTOMER_LAWSON_REGISTER = 18,
-        CUSTOMER_REFERRAL_500 = 19
-    }
-}

Swift.API/Common/Enum/Notification_REMOTE_1404.cs

@@ -1,63 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Swift.API.Common.Enum
-{
-    [DefaultValue(NONE)]
-    public enum NotifyTemplate
-    {
-        NONE,
-
-
-        [Description("Email to customer txn is created for bank transfer")]
-        BANK_TRANSFER_TXN_PENDING = 1,
-
-        [Description("Email to customer after txn payment is cleared by IME London")]
-        BANK_TRANSFER_TXN_CLEARED = 2,
-
-        [Description("Email to customer after txn is accepted by Pay-out partner")]
-        BANK_TXN_POST = 3,
-
-        [Description("Email to customer after txn has been accepted by Pay-out partner (Cash Collection)")]
-        CASH_TXN_POST = 4,
-
-        [Description("Email to customer for reset password. JsonRX")]
-        RESET_PASSWORD_EMAIL = 5,
-
-        [Description("Email to customer after Basic Registration has been completed")]
-        BASIC_REGISTRATION_EMAIL = 6,
-
-        [Description("Email to customer after KYC completion")]
-        KYC_VERIFICATION_EMAIL = 7,
-
-        [Description("Email to customer for OTP")]
-        OTP_EMAIL = 8,
-
-        [Description("Customer Password and Txn Pin")]
-        PIN_PASSWORD_EMAIL = 20,
-
-        FORCE_PASSWORD_CHANGE =9,
-
-        TRANSACTION_APPROVED = 10,
-
-        TRANSACTION_MODIFY = 11,
-
-        JP_POST_APPROVED = 12,
-
-        TRANSACTION_CANCELLED = 13,
-
-        TRANSACTION_PAID = 14,
-
-        TRANSACTION_SUCCESS = 15,
-
-        TF_NO_BALANCE = 16,
-
-        CUSTOMER_MOBILE_NOT_REGISTER = 17,
-        CUSTOMER_LAWSON_REGISTER = 18,
-        CUSTOMER_REFERRAL_500 = 19
-    }
-}

Swift.DAL/Agentpanel/Domain/IRHTranDetail.cs

@@ -158,6 +158,8 @@
         public string rewardAmt { get; set; }
         public string paymentOption { get; set; }
         public string siteReference { get; set; }
+        public string isPromoCode { get; set; }
+        public string rowId { get; set; }
     }
 
     public class IRHTranDetailNew

Swift.DAL/Agentpanel/Send/SendTranIRHDao.cs

@@ -78,10 +78,8 @@ namespace Swift.DAL.BL.AgentPanel.Send
         {
             var sql = "EXEC proc_countryRateMaster @flag='payment-method'";
             sql += ", @countryId = " + FilterString(pCountryId);
-
             return ExecuteDataTable(sql);
         }
-
         public DataTable LoadCustomerData(string searchType, string searchValue, string flag, string sCountryId, string settlementAgent)
         {
             var sql = "EXEC proc_searchCustomerIRH @flag =" + FilterString(flag);
@@ -407,7 +405,7 @@ namespace Swift.DAL.BL.AgentPanel.Send
 
         public DataTable GetExRate(string user, string sCountryId, string sSuperAgent, string sAgent, string sBranch, string collCurr,
                                         string pCountryId, string pAgent, string pCurr, string deliveryMethod, string cAmt, string pAmt,
-                                        string schemeCode, string senderId, string introducer, string sessionId, string couponId, string tpExRate, string rewardAmt, string isManualSc = "", 
+                                        string schemeCode, string senderId, string introducer, string sessionId, string couponId, string tpExRate, string rewardAmt, string customerId, string isManualSc = "", 
                                         string sc = "", string calcBy = "", string payoutPartner = "")
         {
             var sql = "EXEC proc_sendIRH @flag = 'exRate'";
@@ -429,12 +427,13 @@ namespace Swift.DAL.BL.AgentPanel.Send
             sql += ", @couponTranNo = " + FilterString(couponId);
             sql += ", @tpExRate = " + FilterString(tpExRate);
             sql += ", @rewardAmt = " + FilterString(rewardAmt);
+            sql += ", @customerId = " + FilterString(customerId);
             sql += ", @isManualSc = " + FilterString(isManualSc);
             sql += ", @partnerId = " + FilterString(payoutPartner);
             sql += ", @manualSc = " + FilterString(sc);
             sql += ", @calcBy = " + FilterString(calcBy);
             sql += ", @introducer = " + FilterString(introducer);
-            
+
             var ds = ExecuteDataset(sql);
 
             if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
@@ -477,7 +476,7 @@ namespace Swift.DAL.BL.AgentPanel.Send
                                         string pCountryId, string pAgent, string pCurr, string deliveryMethod, string cAmt, string pAmt,
                                         string schemeCode, string senderId, string sessionId, string couponId
                                         , string isManualSc, string sc
-                                        , string exRateTp, string pCurrTp, string calcBy, string introducer, string rewardAmt, string payoutPartner = "")
+                                        , string exRateTp, string pCurrTp, string calcBy, string introducer, string rewardAmt, string customerId, string payoutPartner = "")
         {
             var sql = "EXEC proc_sendIRHTP @flag = 'exRate'";
             sql += ", @user = " + FilterString(user);
@@ -502,8 +501,8 @@ namespace Swift.DAL.BL.AgentPanel.Send
             sql += ", @partnerId = " + FilterString(payoutPartner);
             sql += ", @manualSc = " + FilterString(sc);
             sql += ", @rewardAmt = " + FilterString(rewardAmt);
+            sql += ", @customerId = " + FilterString(customerId);
             sql += ", @introducer = " + FilterString(introducer);
-            
             //sql += ", @calcBy = " + FilterString(calcBy);
 
             var ds = ExecuteDataset(sql);
@@ -785,6 +784,8 @@ namespace Swift.DAL.BL.AgentPanel.Send
             sql += ", @portOfShipment = " + FilterString(trn.portOfShipment);
             sql += ", @calculatedOriginalSc = " + FilterString(trn.calcOriginalSc);
             sql += ", @rewardAmt = " + FilterString(trn.rewardAmt);
+            sql += ", @isPromoCode = " + FilterString(trn.isPromoCode);
+            sql += ", @promoRowId = " + FilterString(trn.rowId);
 
             var ds = ExecuteDataset(sql);
             if (ds == null || ds.Tables.Count == 0)
@@ -1006,6 +1007,7 @@ namespace Swift.DAL.BL.AgentPanel.Send
             sql += ", @tpExRate = " + FilterString(trn.tpExRate);
             sql += ", @calculatedOriginalSc = " + FilterString(trn.calcOriginalSc);
             sql += ", @rewardAmt = " + FilterString(trn.rewardAmt);
+            sql += ", @isPromoCode = " + FilterString(trn.isPromoCode);
             var ds = ExecuteDataset(sql);
             if (ds == null || ds.Tables.Count == 0)
                 return null;
@@ -1119,12 +1121,6 @@ namespace Swift.DAL.BL.AgentPanel.Send
             return ParseDbResult(sql);
         }
 
-        //public DataTable GetAgentQuota(string user)
-        //{
-        //    var sql = "EXEC ProcIntroducerCommissionSetup @flag = 'checkAgentQuota'";
-        //    sql += ", @user = " + FilterString(user);
-        //    return ExecuteDataTable(sql);
-        //}
         public DataTable GetAgentQuota(string customerId)
         {
             var sql = "EXEC ProcIntroducerCommissionSetup @flag = 'getRewardAmount'";
@@ -1307,6 +1303,9 @@ namespace Swift.DAL.BL.AgentPanel.Send
             sql += ", @trackBy = " + FilterString(trn.trackBy);
             sql += ", @nameAsPerBank = " + FilterString(trn.nameAsPerBank);
             sql += ", @calculatedOriginalSc = " + FilterString(trn.calcOriginalSc);
+            sql += ", @calculatedOriginalSc = " + FilterString(trn.calcOriginalSc);
+            sql += ", @isPromoCode = " + FilterString(trn.isPromoCode);
+            sql += ", @promoRowId = " + FilterString(trn.rowId);
 
             return ParseDbResultV2(sql);
         }
@@ -1456,10 +1455,12 @@ namespace Swift.DAL.BL.AgentPanel.Send
             sql += ", @portOfShipment = " + FilterString(trn.portOfShipment);
             sql += ", @trackBy = " + FilterString(trn.trackBy);
             sql += ", @nameAsPerBank = " + FilterString(trn.nameAsPerBank);
-            sql += ", @calculatedOriginalSc = " + FilterString(trn.calcOriginalSc);
+            sql += ", @calculatedOriginalSc = " + FilterString(trn.calcOriginalSc); 
             sql += ", @paymentOption = " + FilterString(trn.paymentOption);
             sql += ", @siteReference = " + FilterString(trn.siteReference);
             sql += ", @rewardAmt = " + FilterString(trn.rewardAmt);
+            sql += ", @isPromoCode = " + FilterString(trn.isPromoCode);
+            sql += ", @promoRowId = " + FilterString(trn.rowId);
 
             return ParseDbResult(sql);
         }

Swift.DAL/MobileDao/MobileConfigDao.cs

@@ -78,7 +78,7 @@ namespace Swift.DAL.MobileDao
             return ParseDbResult(sql);
         }
 
-        public DbResult SaveBroadCastCustomer(string user, string rowId, string customerId, string msgType, string body, string customerType , string nativeCountry)
+        public DbResult SaveBroadCastCustomer(string user, string rowId, string customerId, string msgType, string body, string customerType , string nativeCountry, string postCode)
         {
             var sql = "EXEC ProcMobileConfig @flag = '" + (string.IsNullOrEmpty(rowId) ? "IN-BROADCAST" : "UN-BROADCAST") + "'";
             sql += ", @User = " + FilterString(user);
@@ -88,6 +88,7 @@ namespace Swift.DAL.MobileDao
             sql += ", @msgType = " + FilterString(msgType);
             sql += ", @customerType = " + FilterString(customerType);
             sql += ", @nativeCountry = " + FilterString(nativeCountry);
+            sql += ", @postCode = " + FilterString(postCode);
 
             return ParseDbResult(sql);
         }

Swift.DAL/Remittance/APIPartner/APIPartnerDao.cs

@@ -72,7 +72,7 @@ namespace Swift.DAL.Remittance.APIPartner
 
         public DbResult InsertUpdatePromotion(string user, string flag, string rowId, string promotionCode, string promotionMsg
                             , string promotionType, string country, string paymentMethod, string isActive, string startDt
-                            , string endDt, string promotionAmount)
+                            , string endDt, string promotionAmount, string minAmt)
         {
             var sql = "EXEC PROC_PROMOTIONAL_CAMPAIGN @flag = '" + flag + "'";
             sql += ", @user = " + FilterString(user);
@@ -86,6 +86,7 @@ namespace Swift.DAL.Remittance.APIPartner
             sql += ", @IS_ACTIVE = " + FilterString(isActive);
             sql += ", @START_DT = " + FilterString(startDt);
             sql += ", @END_DT = " + FilterString(endDt);
+            sql += ", @MIN_AMT = " + FilterString(minAmt);
 
             return ParseDbResult(sql);
         }

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/Administration/CustomerSetup/CustomerRegistration/Manage.aspx

@@ -166,7 +166,6 @@
                
                 $("#apiDataPopup").modal("hide");
             })
-            })
             //$("#ContentPlaceHolder1_occupation").prop("disabled", true);
            <%-- $("#<%=verificationTypeNo.ClientID%>").on("change", function () {
                 var idtype = $("#<%=idType.ClientID%>").val();

Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx.cs

@@ -220,7 +220,7 @@ namespace Swift.web.AgentNew.Administration.CustomerSetup.CustomerRegistration
         {
             var postCode = zipCode.ToUpper();
             string ProcessId = Guid.NewGuid().ToString().Replace("-", "") + ":" + postCode;
-            string methodType = "loqate"; //Utility.ReadWebConfig("methodType", "");
+            string methodType = Utility.ReadWebConfig("methodType", "");
             string countryName = "United Kingdom";
 
             AddressRequest requestObj = new AddressRequest()

Swift.web/AgentNew/AgentSend/SendV2.aspx.cs

@@ -998,6 +998,7 @@ namespace Swift.web.AgentNew.AgentSend
                      , GetStatic.GetSessionId()
                      , couponId
                      , rewardAmt
+                     ,""
                      , isManualSc
                      , sc);
 

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/AgentNew/SendOnBehalf/SendV2.aspx.cs

@@ -937,7 +937,8 @@ namespace Swift.web.AgentNew.SendOnBehalf
                      , couponId
                      , isManualSc
                      , sc
-                     , rewardAmt);
+                     , rewardAmt
+                     , "");
 
             Response.ContentType = "text/plain";
             var json = DataTableToJson(dt);

Swift.web/AgentNew/SendTxn/Confirm.aspx

@@ -691,6 +691,8 @@
                             <asp:HiddenField ID="hddImgURL" runat="server" />
                             <asp:HiddenField ID="isDisplaySignature" runat="server" />
                             <asp:HiddenField ID="hddXMLCDDI" runat="server" />
+                            <asp:HiddenField ID="hdnIsPromoCode" runat="server" />
+                            <asp:HiddenField ID="hdnRowId" runat="server" />
                         </div>
                     </div>
                 </div>

Swift.web/AgentNew/SendTxn/Confirm.aspx.cs

@@ -98,7 +98,9 @@ namespace Swift.web.AgentNew.SendTxn
         private readonly string scDiscount = GetStatic.ReadQueryString("scDiscount", "");
         private readonly string exRateOffer = GetStatic.ReadQueryString("exRateOffer", "");
         private readonly string _couponId = GetStatic.ReadQueryString("couponId", "");
-        private readonly string _rewardAmt = GetStatic.ReadQueryString("rewardAmt","");
+        private readonly string _rewardAmt = GetStatic.ReadQueryString("rewardAmt", "");
+        private readonly string _isPromoCode = GetStatic.ReadQueryString("isPromoCode", "");
+        private readonly string _rowId = GetStatic.ReadQueryString("rowId", "");
 
         private readonly string _pLocation = GetStatic.ReadQueryString("pLocation", "");
         private readonly string _pLocationText = GetStatic.ReadQueryString("pLocationText", "");
@@ -327,6 +329,8 @@ namespace Swift.web.AgentNew.SendTxn
             total.Text = GetStatic.ShowDecimal(_cAmt.ToString());
 
             rewardAmt.Text = _rewardAmt;
+            hdnIsPromoCode.Value = _isPromoCode;
+            hdnRowId.Value = _rowId;
             exchangeRate.Text = _customerRate.ToString();
             payoutAmt.Text = GetStatic.ShowDecimal(_pAmt.ToString());
             payoutAmtInWords.Text = NumberToWordsConverter.NumberToWord(Convert.ToDouble(_pAmt.ToString()));
@@ -578,6 +582,10 @@ namespace Swift.web.AgentNew.SendTxn
             trn.ECustomer = _eCust;
             trn.MemberCode = _memberCode;
             trn.rewardAmt = _rewardAmt;
+            hdnIsPromoCode.Value = _isPromoCode;
+            trn.isPromoCode = _isPromoCode;
+            hdnRowId.Value = _rowId;
+            trn.rowId = _rowId;
 
             trn.SBranch = GetStatic.GetBranch();
             trn.SBranchName = GetStatic.GetBranchName();
@@ -620,6 +628,7 @@ namespace Swift.web.AgentNew.SendTxn
             trn.goodsOrigin = _goodsOrigin;
             trn.portOfShipment = _portOfShipment;
 
+
             DataSet ds = new DataSet();
 
             if (_isExrateFromPartner == "true")
@@ -937,14 +946,14 @@ namespace Swift.web.AgentNew.SendTxn
 
             if (dbResult.ErrorCode == "0" || dbResult.ErrorCode == "100" || dbResult.ErrorCode == "101")
             {
-                if(dbResult.Extra2 == "DEBIT_CARD")
+                if (dbResult.Extra2 == "DEBIT_CARD")
                 {
                     var url = GetStatic.ReadWebConfig("trustpaymentCallback", "");
                     var id = HttpUtility.UrlEncode(WebUtils.EncryptString(dbResult.Extra));
                     var cn = HttpUtility.UrlEncode(WebUtils.EncryptString(dbResult.Id));
                     string reference = dbResult.Extra3;
                     url = $"{url}?ref={reference}&id={id}&cn={cn}";
-                    Response.Redirect(url,false);
+                    Response.Redirect(url, false);
                 }
                 else
                 {
@@ -1071,6 +1080,10 @@ namespace Swift.web.AgentNew.SendTxn
             trn.ECustomer = _eCust;
             trn.MemberCode = _memberCode;
             trn.rewardAmt = _rewardAmt;
+            hdnIsPromoCode.Value = _isPromoCode;
+            trn.isPromoCode = _isPromoCode;
+            hdnRowId.Value = _rowId;
+            trn.rowId = _rowId;
 
             trn.CancelRequestId = _cancelrequestId;
             trn.Salary = _salary;

Swift.web/AgentNew/SendTxn/Confirm.aspx.designer.cs

@@ -1003,5 +1003,7 @@ namespace Swift.web.AgentNew.SendTxn
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hddXMLCDDI;
+        protected global::System.Web.UI.WebControls.HiddenField hdnIsPromoCode;
+        protected global::System.Web.UI.WebControls.HiddenField hdnRowId;
     }
 }

Swift.web/AgentNew/SendTxn/SendV2.aspx

@@ -304,6 +304,9 @@
                         <asp:HiddenField ID="visaStatusNotFound" runat="server" />
                         <asp:HiddenField ID="hdnIsAdditionalDocumentRequired" runat="server" />
                         <asp:HiddenField ID="additionalAddressNotFound" runat="server" />
+                        <asp:HiddenField ID="hdnRewardAmt" runat="server" />
+                        <asp:HiddenField ID="hdnIsPromoCode" runat="server" />
+                        <asp:HiddenField ID="hdnRowId" runat="server" />
 
                         <div class="panel panel-default">
                             <div class="panel-heading">
@@ -1038,7 +1041,6 @@
                                                         </div>
                                                     </td>
                                                 </tr>
-                                       
 
                                                 <tr id="paymentOptionRow" runat="server">
                                                     <td>
@@ -1846,6 +1848,36 @@
                 var countryId = data[0].COUNTRYID;
                 LoadPaymentOptionsDynamically(countryId);
 
+                <%--if (data[0].branchDetails) {
+                    debugger;
+                    if (data[0].manualType === 'Y') {
+                        $('#branch_manual').val(data[0].branchDetails);
+                    }
+                    else {
+                        var branchId = data[0].branchDetails.split('|')[0];
+                        var text = data[0].branchDetails.split('|')[1];
+                        SetDDLValueSelected("<%=branch.ClientID %>", text);
+                        GetBranch(branchId, text);
+                        $('#ContentPlaceHolder1_branch').val(text);
+                    }
+                }--%>
+                if (data[0].branchDetails) {
+                    if (data[0].manualType === 'Y') {
+                        $("#" + mId + "branch_manual").val(data[0].branchDetails);
+                    }
+                    else {
+                        var dataSelectDDL = {
+                            id: data[0].branchDetails.split('|')[0],
+                            text: data[0].branchDetails.split('|')[1]
+                        };
+                        if (dataSelectDDL.id !== 'N/A') {
+                            var newOption = new Option(dataSelectDDL.text, dataSelectDDL.id, false, false);
+                            $('.js-example-basic-single').append(newOption).trigger('change');
+                            $('.js-example-basic-single').val(dataSelectDDL.id); // Select the option with a value of '1'
+                            $('.js-example-basic-single').trigger('change');
+                        }
+                    }
+                }
                 <%--if ($("#<%=pCountry.ClientID%> option:selected ").val() != "") {
                     PcountryOnChange('c', "");
                     SetPayCurrency($("#<%=pCountry.ClientID%>").val());
@@ -1854,6 +1886,44 @@
             }
         }
 
+        function GetBranch(branchId, text) {
+            var dataToSend = {
+                MethodName: 'PopulateBranch',
+                payoutPartner: $('#ContentPlaceHolder1_hddPayoutPartner').val(),
+                Bank: $('#ContentPlaceHolder1_pAgent').val(),
+                Country: $('#ContentPlaceHolder1_pCountry').val(),
+                PayMode: $('#ContentPlaceHolder1_pMode').val(),
+                //  searchText: params.term, // search term
+                // page: params.page
+            };
+            $.post('SendV2.aspx?x=' + new Date().getTime(), dataToSend, function (response) {
+                debugger
+                var results = [];
+                if (response !== null) {
+                    $.each(response, function (index, item) {
+                        results.push({
+                            id: item.agentId,
+                            text: item.agentName
+                        });
+                    });
+
+                    var count = results.length;
+                    for (var i = 0; i < count; i++) {
+                        if (results[i].id === branchId) {
+                            var newOption = new Option(text, branchId, false, false);
+                            $('.js-example-basic-single').append(newOption).trigger('change');
+                            $('.js-example-basic-single').val(branchId);
+                            $('.js-example-basic-single').trigger('change');
+
+                            $("#branchDetail").text(text);
+                            return;
+                        }
+                    }
+                    $('#branch_manual').val('');
+                }
+            })
+        }
+
         function LoadPaymentOptionsDynamically(countryId) {
             $.ajax({
                 type: "POST",
@@ -1862,7 +1932,6 @@
                 contentType: "application/json; charset=utf-8",
                 dataType: "json",
                 success: function (data) {
-                    debugger
                     BindPaymentOptions(data);
                 },
                 error: function (error) {
@@ -2228,7 +2297,6 @@
 
             var paymentOption = $('#ContentPlaceHolder1_ddlPaymentOption option:selected').text();
             $(window).focus(function () {
-                debugger
                 if ($('#confirmHidden').val() != '') {
                     var id = $('#confirmHidden').val();
                     $('#confirmHidden').val('');

Swift.web/AgentNew/SendTxn/SendV2.aspx.cs

@@ -993,7 +993,7 @@ namespace Swift.web.AgentNew.SendTxn
             var pCountryFv = GetStatic.ReadFormData("pCountry", "");
             var pBankType = GetStatic.ReadFormData("pBankType", "");
             var dt = st.GetAgentSetting(GetStatic.GetUser(), pCountryFv, pAgentFv, pModeFv, pBankType);
-            Response.ContentType = "text/plain";
+            Response.ContentType = "text/plain"; 
             var json = DataTableToJson(dt);
             Response.Write(json);
             Response.End();
@@ -1220,7 +1220,7 @@ namespace Swift.web.AgentNew.SendTxn
             exRate.Introducer = Request.Form["introducerTxt"];
             exRate.TpExRate = Request.Form["tpExRate"];
             exRate.RewardAmt = Request.Form["rewardAmt"];
-            //    errTbl.Columns.Add(dCol2);
+            exRate.CustomerId = Request.Form["customerId"];
 
             if (exRate.isExRateCalcByPartner)
             {
@@ -1263,8 +1263,9 @@ namespace Swift.web.AgentNew.SendTxn
                          , exRate.CalcBy
                          , exRate.Introducer
                          , exRate.RewardAmt
+                         , exRate.CustomerId
                          , exRate.ProviderId
-
+                         
                         );
             }
             else
@@ -1290,6 +1291,7 @@ namespace Swift.web.AgentNew.SendTxn
                          , exRate.ForexSessionId
                          , exRate.TpExRate
                          , exRate.RewardAmt
+                         , exRate.CustomerId
                          , Request.Form["isManualSc"]
                          , exRate.ManualSc
                          , exRate.CalcBy

Swift.web/AgentNew/SendTxn/SendV2.aspx.designer.cs

@@ -194,6 +194,33 @@ namespace Swift.web.AgentNew.SendTxn
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField additionalAddressNotFound;
 
+        /// <summary>
+        /// hdnRewardAmt 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.HiddenField hdnRewardAmt;
+
+        /// <summary>
+        /// hdnIsPromoCode 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.HiddenField hdnIsPromoCode;
+
+        /// <summary>
+        /// hdnRowId 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.HiddenField hdnRowId;
+
         /// <summary>
         /// txtSendFirstName control.
         /// </summary>

Swift.web/AgentNew/js/SendTxn/agentAndLocation.js

@@ -526,7 +526,7 @@ function ApplyAgentSetting(response, pModeTxt) {
     }
 
     if (data[0].ROW_ID !== '') {
-        $('#lblCampaign').text(data[0].PROMOTIONAL_MSG + ': (' + data[0].PROMOTION_TYPE + ') ' + data[0].PROMOTION_VALUE + ' JPY');
+        $('#lblCampaign').text(data[0].PROMOTIONAL_MSG + ': (' + data[0].PROMOTION_TYPE + ') ' + data[0].PROMOTION_VALUE + ' GBP');
         $('#hddPromotionCode').val(data[0].ROW_ID);
         $('#hddPromotionAmt').val(data[0].PROMOTION_VALUE);
         $("#" + mId + "editServiceCharge").attr("disabled", true);

Swift.web/AgentNew/js/SendTxn/sendTxnInfo.js

@@ -191,7 +191,7 @@ function ClearTxnData() {
 }
 
 function CalculateTxn(amt, obj, isManualSc) {
-    debugger
+    //debugger
     var agentUser = $("#" + mId + "hddTxnRequestFromAgent").val();
     //  CheckAgentQuota(agentUser);
     checkPaymentOption();
@@ -210,14 +210,14 @@ function CalculateTxn(amt, obj, isManualSc) {
     //    return false;
     //}
     if ($("#" + mId + "txtCollAmt").val())
-        if (isManualSc === undefined) {
-            if ($("#" + mId + "editServiceCharge").is(':checked')) {
-                isManualSc = 'Y';
-            }
-            else {
-                isManualSc = 'N';
-            }
+    if (isManualSc === undefined) {
+        if ($("#" + mId + "editServiceCharge").is(':checked')) {
+            isManualSc = 'Y';
+        }
+        else {
+            isManualSc = 'N';
         }
+    }
 
     //if (isManualSc === undefined) {
     //    $("#" + mId + "editServiceCharge").prop("checked", false);
@@ -239,25 +239,10 @@ function CalculateTxn(amt, obj, isManualSc) {
     //}
     //else if (partnerId == '394130') {
     //if ($("#" + mId + "allowEditSC").val() === 'N') {
-    //    $("#" + mId + "editServiceCharge").attr('disabled');
-    //    $("#" + mId + "editServiceCharge").attr('readonly');
-    //}
-    //else {
-    //    $("#" + mId + "allowEditSC").val("Y");
-    //    $("#" + mId + "editServiceCharge").removeAttr('disabled');
-    //    $("#" + mId + "editServiceCharge").removeAttr('readonly');
-    //}
-
-    //if ($("#" + mId + "allowEditSC").val() === 'N') {
-    //    $("#" + mId + "editServiceCharge").prop("checked", false);
-    //}
-    //else {
-    //    $("#" + mId + "editServiceCharge").prop("checked", true);
-    //}
+        $("#" + mId + "allowEditSC").val("N");
+        $("#" + mId + "editServiceCharge").attr('disabled');
+        $("#" + mId + "editServiceCharge").attr('readonly');
 
-    $("#" + mId + "allowEditSC").val("N");
-    $("#" + mId + "editServiceCharge").attr('disabled');
-    $("#" + mId + "editServiceCharge").attr('readonly');
     // var ischecked = $(this).is(':checked');
     //var ischecked = $("#" + mId + "editServiceCharge").is(':checked');
     //if (ischecked) {
@@ -430,7 +415,7 @@ function CalculateTxn(amt, obj, isManualSc) {
         , pAgentBranch: pAgentBranch, collAmt: collAmt, payAmt: payAmt, payCurr: payCurr, collCurr: collCurr
         , pModetxt: pModetxt, senderId: senderId, schemeCode: schemeCode, couponId: couponId, isManualSc: isManualSc
         , sc: sc, payoutPartner: payoutPartner, IsExrateFromPartner: IsExrateFromPartner, PCountryCode: PCountryCode, calcBy: obj
-        , payerName: payerName, tpExRate: tpExRate, rewardAmt: rewardAmt
+        , payerName: payerName, tpExRate: tpExRate, rewardAmt: rewardAmt, customerId: customerId
     };
 
     var options =
@@ -494,7 +479,7 @@ function checkPaymentOption() {
 //}
 
 function CheckAgentQuota() {
-    debugger
+    //debugger
     var customerId = $('#finalSenderId').text();
     var dataToSend = {
         MethodName: 'checkAgentQuota', customerId: customerId
@@ -507,7 +492,6 @@ function CheckAgentQuota() {
         type: 'POST',
         async: false,
         success: function (response) {
-            debugger
             var data = response;
             //  var data = jQuery.parseJSON(response);
             //  alert(data[0].ErrorCode);
@@ -644,6 +628,7 @@ $(document).on('click', '#btnSendTxnCDDI', function () {
 });
 
 function SendTransactionMethod() {
+    debugger
     ReCalculate();
     //if ($("#" + mId + "visaStatusNotFound").val() === 'true') {
     //    var visaStatusId = $("#ContentPlaceHolder1_visaStatusDdl").val();
@@ -997,8 +982,11 @@ function SendTransactionMethod() {
     var portOfShipment = $("#" + mId + "portOfShipment").val();
     var calcOriginalSc = $("#" + mId + "hdnCalcOriginalSc").val();
     var paymentOption = $("#" + mId + "ddlPaymentOption option:selected").text().replace("Select", "");
-    var rewardAmt = $("#" + mId + "txtRewardAmt").val();
+    var rewardAmt = $("#" + mId + "hdnRewardAmt").val();
+    var isPromoCode = $("#" + mId + "hdnIsPromoCode").val();
+    var rowId = $("#" + mId + "hdnRowId").val();
 
+    
     var url = "Confirm.aspx?senderId=" + senderId +
         "&sfName=" + sfName +
         "&smName=" + smName +
@@ -1111,7 +1099,9 @@ function SendTransactionMethod() {
         "&nameAsPerBank=" + nameAsPerBank +
         "&calcOriginalSc=" + calcOriginalSc +
         "&paymentOption=" + paymentOption +
-        "&rewardAmt=" + rewardAmt;
+        "&rewardAmt=" + rewardAmt +
+        "&isPromoCode=" + isPromoCode +
+        "&rowId=" + rowId;
 
 
     var param = "dialogHeight:900px;dialogWidth:900px;dialogLeft:200;dialogTop:100;center:yes";

Swift.web/AgentNew/js/SendTxn/usableunctions.js

@@ -175,6 +175,9 @@ function ParseCalculateData(response, amtType) {
         $("#" + mId + "lblServiceChargeAmt").attr("readonly", true);
     }
     $("#" + mId + "hddExRateConfirmID").val(data[0].exRateConfirmId);
+    $("#" + mId + "hdnRewardAmt").val(data[0].rewardAmt);
+    $("#" + mId + "hdnIsPromoCode").val(data[0].isPromoCode);
+    $("#" + mId + "hdnRowId").val(data[0].rowId);
 }
 
 function CheckSession1(data) {

Swift.web/AgentPanel/International/SendMoney/Send.aspx.cs

@@ -737,6 +737,7 @@ namespace Swift.web.AgentPanel.International.SendMoney
                 , GetStatic.GetSessionId()
                 , couponId
                 , rewardAmt
+                , ""
                 , "");
 
             Response.ContentType = "text/plain";

Swift.web/AgentPanel/International/SendMoney/SendV2.aspx.cs

@@ -744,6 +744,7 @@ namespace Swift.web.AgentPanel.International.SendMoney
                 , GetStatic.GetSessionId()
                 , couponId
                 , rewardAmt
+                , ""
                 , "");
 
             Response.ContentType = "text/plain";

Swift.web/AgentPanel/International/SendMoneyv2/SendV2.aspx.cs

@@ -937,6 +937,7 @@ namespace Swift.web.AgentPanel.International.SendMoneyv2
                      , GetStatic.GetSessionId()
                      , couponId
                      , rewardAmt
+                     ,""
                      , isManualSc
                      , sc);
 

Swift.web/AgentPanel/International/SendOnBehalf/SendV2.aspx.cs

@@ -936,6 +936,7 @@ namespace Swift.web.AgentPanel.International.SendOnBehalf
                      , GetStatic.GetSessionId()
                      , couponId
                      , rewardAmt
+                     , ""
                      , isManualSc
                      , sc);
 

Swift.web/AgentPanel/Send/SendTransaction/Send.aspx.cs

@@ -743,6 +743,7 @@ namespace Swift.web.AgentPanel.Send.SendTransactionIRH
                 , GetStatic.GetSessionId()
                 , couponId
                 , rewardAmt
+                , ""
                 , "");
 
             Response.ContentType = "text/plain";

Swift.web/DashboardV2/Dashboard2.aspx

@@ -515,6 +515,21 @@
                                                         </span>
                                                     </div>
                                                 </a>
+                                                <a href="../MobileRemit/Admin/Operation/VerifyMobileCustomer.aspx?kycStatus=NOT_COMPLETED" target="_blank" class="list-group-item list-group-item-action">
+                                                    <div class="msg-body d-flex align-items-center">
+                                                        <div class="icon-element bg-9 flex-shrink-0 mr-3 ml-0">
+                                                            <i class='uil uil-bell'></i>
+                                                        </div>
+                                                        <div class="msg-content w-100" style="margin-left: 10px;">
+                                                            <h3 class="title pb-1" style="font-size: 14px !important;">KYC Not Completed</h3>
+                                                            <p class="msg-text" style="color: red;" id="kycNotCompletedCust">0</p>
+                                                        </div>
+                                                        <span class="icon-element mark-as-read-btn flex-shrink-0 ml-auto mr-0"
+                                                            data-toggle="tooltip" data-placement="left" title="View Reschedule Request" style="display: none;">
+                                                            <i class='uil uil-refresh'></i>
+                                                        </span>
+                                                    </div>
+                                                </a>
                                                 <a href="../MobileRemit/Admin/Operation/VerifyMobileCustomer.aspx?kycStatus=COMPLETED" target="_blank" class="list-group-item list-group-item-action">
                                                     <div class="msg-body d-flex align-items-center">
                                                         <div class="icon-element bg-10 flex-shrink-0 mr-3 ml-0">

Swift.web/Download.aspx.cs

@@ -34,7 +34,10 @@ namespace Swift.web
             {
                 data = GenerateCsvForReport();
             }
-
+            else if (mode.ToLower() == "download")
+            {
+                data = GenerateCsv();
+            }
             Response.Clear();
             Response.ClearContent();
             Response.ClearHeaders();
@@ -160,5 +163,81 @@ namespace Swift.web
 
             return html.ToString();
         }
+
+        private string GenerateCsv()
+        {
+            var sql = GetStatic.ReadSession("exportSource", "");
+            sql = sql.Split(',')[0].Split('=')[0] + "='download'";
+
+            if (string.IsNullOrEmpty(sql))
+                return "";
+
+            var type = GetStatic.ReadQueryString("type", "").ToLower();
+
+            var ds = new DataSet();
+
+            if (type == "remit")
+            {
+                ds = remit.ExecuteDataset(sql);
+            }
+
+            else
+            {
+                ds = dao.ExecuteDataset(sql);
+            }
+
+            var columnList = (List<GridColumn>)Session["grid_column"];
+            if (ds == null || columnList == null)
+                return "";
+            var dt = ds.Tables[0];
+            //var html = new StringBuilder("<table width=\"700\" border=\"0\" cellpadding=\"0\" cellspacing=\"1\" >");
+            var html = new StringBuilder("<table width=\"100%\" border=\"1\" cellpadding=\"0\" cellspacing=\"0\" style=\"border-collapse: collapse;\">");
+
+            html.Append("<tr>");
+
+            foreach (var column in columnList)
+            {
+                if (column.Description != "")
+                    //html.Append("<th Class=\"HeaderStyle\" align=\"left\" nowrap " + ">" + column.Description + "</th>");
+                    html.Append("<th style=\"border: 1px solid black;\">" + column.Description + "</th>"); // Added border style
+
+            }
+            html.Append("</tr>");
+
+            foreach (DataRow dr in dt.Rows)
+            {
+                html.Append("<tr>");
+
+                foreach (var column in columnList)
+                {
+                    switch (column.Type.ToUpper())
+                    {
+                        case "M":
+                            html.Append("<td align=\"right\" style=\"border: 1px solid black;\">" + SwiftGrid.FormatData(dr[column.Key].ToString(), "M") + "</td>"); // Added border style
+                            break;
+                        case "D":
+                            html.Append("<td align=\"center\" style=\"border: 1px solid black;\">" + SwiftGrid.FormatData(dr[column.Key].ToString(), "D") + "</td>"); // Added border style
+                            break;
+                        case "DT":
+                            html.Append("<td align=\"center\" style=\"border: 1px solid black;\">" + SwiftGrid.FormatData(dr[column.Key].ToString(), "DT") + "</td>"); // Added border style
+                            break;
+                        case "NOSORT":
+                            if (column.Description.Trim() != "")
+                                html.Append("<td align=\"left\" nowrap style=\"border: 1px solid black;\">" + dr[column.Key] + "</td>"); // Added border style
+                            break;
+                        case "CHECKBOX":
+                            break;
+                        default:
+                            html.Append("<td align=\"left\" style=\"border: 1px solid black;\">" + dr[column.Key] + "</td>"); // Added border style
+                            break;
+                    }
+                }
+
+                html.Append("</tr>");
+            }
+            html.Append("</table>");
+
+            return html.ToString();
+        }
     }
 }

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/PushNotification/ManageBroadCast.aspx

@@ -29,15 +29,15 @@
     <script type="text/javascript">
         function CheckFormValidation() {
             debugger;
-           
+
             var rowId = "<%=GetRowId()%>";
             var customerType = $("#ddlCustomerType").val();
-            alert(customerType);
+           // alert(customerType);
             if (customerType == "All") {
                 return true;
             }
             else {
-                if (customerType != "nativeCountry") {
+                if ((customerType != "nativeCountry") && (customerType != "postCode")) {
                     var customerId = $('#txtSearchData_aValue').val();
                     if (customerId == null || customerId == "") {
                         alert('No customer selected. Please choose a customer to send broadcast message.');
@@ -71,6 +71,19 @@
             });
         });
 
+        $(document).ready(function () {
+            $('#<%=ddlCustomerType.ClientID%>').change(function () {
+                var customerType = $(this).val();
+                if (customerType === "postCode") {
+                    $('#lblPostCode').show();
+                    $('#<%=txtPostCode.ClientID%>').show();
+                } else {
+                    $('#lblPostCode').hide();
+                    $('#<%=txtPostCode.ClientID%>').hide();
+                }
+            });
+        });
+
 
 
         //function CustomerTypeChanged() {
@@ -127,7 +140,7 @@
                     <li><a href="BroadcastList.aspx">PushNotification  List</a></li>
                 </ul>
             </div>
-            <div class="tab-content">
+            <div class="col-md-12">
                 <div class="panel panel-default recent-activites">
                     <!-- Start .panel -->
                     <div class="panel-heading">
@@ -139,57 +152,89 @@
                     </div>
                     <div class="panel-body">
                         <div class="row">
-                            <div class="col-md-6" id="individualCustomerGroup" runat="server">
-                                <label>
-                                    Select Customer : <span class="errormsg">*</span>
-                                </label>
+                            <%--<div class="col-md-6" id="individualCustomerGroup" runat="server">
                                 <div class="form-group">
-
-                                    <div class="col-md-4">
-                                        <div class="form-group">
-                                            <asp:DropDownList ID="ddlCustomerType" runat="server" CssClass="form-control" Style="margin-bottom: 5px;">
-                                            </asp:DropDownList>
-                                        </div>
-                                    </div>
+                                    <label class="col-md-4 control-label">
+                                        Select Customer : <span class="errormsg">*</span>
+                                    </label>
                                     <div class="col-md-8">
-                                        <uc1:SwiftTextBox runat="server" ID="txtSearchData" Category="remit-searchCustomerForPushNotif" CssClass="form-control required" Param1="@GetCustomerSearchType()" Title="Blank for All" />
-                                    </div>
-                                    <div class="col-md-4">
-                                        <div class="form-group">
-                                            <asp:DropDownList ID="ddlNativeCountry" runat="server" CssClass="form-control" Style="margin-bottom: 5px;">
-                                            </asp:DropDownList>
+                                        <div class="row">
+                                            <div class="col-md-6">
+                                                <div class="form-group">
+                                                    <asp:DropDownList ID="ddlCustomerType" runat="server" CssClass="form-control" Style="margin-bottom: 5px;"></asp:DropDownList>
+                                                </div>
+                                            </div>
+                                            <div class="col-md-6">
+                                                <uc1:SwiftTextBox runat="server" ID="txtSearchData" Category="remit-searchCustomerForPushNotif" CssClass="form-control required" Param1="@GetCustomerSearchType()" Title="Blank for All" />
+                                            </div>
+                                            <div class="col-md-6">
+                                                <div class="form-group">
+                                                    <asp:DropDownList ID="ddlNativeCountry" runat="server" CssClass="form-control" Style="margin-bottom: 5px;"></asp:DropDownList>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
+                            </div>--%>
+                            <div class="col-md-3 form-group">
+                                <label>Select Customer : <span class="errormsg">*</span></label>
+                            </div>
+                            <div class="col-md-2 form-group">
+                                <asp:DropDownList ID="ddlCustomerType" runat="server" CssClass="form-control" Style="margin-bottom: 5px;"></asp:DropDownList>
+                            </div>
+                            <div class="col-md-4 form-group">
+                                <uc1:SwiftTextBox runat="server" ID="txtSearchData" Category="remit-searchCustomerForPushNotif" CssClass="form-control required" Param1="@GetCustomerSearchType()" Title="Blank for All" />
+                            </div>
+                            <div class="col-md-6">
                                 <div class="form-group">
-                                    <div class="col-md-4">
-                                        <label>Notification Category : <span class="errormsg">*</span></label>
-                                        <select id="msgType" name="msgType" runat="server" class="form-control">
-                                            <option value="INFO" selected="selected">INFORMATION</option>
-                                            <option value="SUCCESS">SUCCESS</option>
-                                            <option value="ERROR">ERROR</option>
-                                        </select>
-                                    </div>
+                                    <asp:DropDownList ID="ddlNativeCountry" runat="server" CssClass="form-control" Style="margin-bottom: 5px;"></asp:DropDownList>
                                 </div>
                             </div>
+                            <%--<div class="col-md-4">
+                                <div class="form-group">
+                                <asp:TextBox ID="txtPostCode" AutoComplete="off" runat="server" CssClass="form-control"></asp:TextBox>
+                            </div>
+                            </div>--%>
                         </div>
+
+                        <div class="row" id="divPostCode" runat="server">
+                            <div class="col-md-3 form-group">
+                                <label id="lblPostCode" style="display: none;">Post Code :</label>
+                            </div>
+                            <div class="col-md-2 form-group">
+                                <asp:TextBox ID="txtPostCode" AutoComplete="off" runat="server" CssClass="form-control" Style="display: none;"></asp:TextBox>
+                            </div>
+                        </div>
+
                         <div class="row">
-                            <div class="col-md-6" id="Div1" runat="server">
-                                <div class="form-group" style="max-height: 400px;">
-                                    <label>
-                                        Notification Message : <span class="errormsg">*</span>
-                                    </label>
-                                </div>
+                            <div class="col-md-3 form-group">
+                                <label>Notification Category : <span class="errormsg">*</span></label>
+                            </div>
+                            <div class="col-md-2 form-group">
+                                <select id="msgType" name="msgType" runat="server" class="form-control">
+                                    <option value="INFO" selected="selected">INFORMATION</option>
+                                    <option value="SUCCESS">SUCCESS</option>
+                                    <option value="ERROR">ERROR</option>
+                                </select>
                             </div>
                         </div>
+
+
+
                         <div class="row">
+                            <div class="col-md-3" id="Div1" runat="server">
+                                <label>
+                                    Notification Message : <span class="errormsg">*</span>
+                                </label>
+                            </div>
                             <div class="col-md-6" id="Div2" runat="server">
                                 <div class="form-group">
-                                    <%--   <textarea name="TXTBody" rows="2" cols="20" id="TXTBody" runat="server"></textarea>--%>
                                     <asp:TextBox runat="server" ID="TXTBody" TextMode="MultiLine" Rows="4" Columns="55"></asp:TextBox>
                                 </div>
                             </div>
                         </div>
+                        <div class="row">
+                        </div>
                         <div class="row">
                             <div class="col-md-12">
                                 <div class="form-group">

Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx.cs

@@ -79,9 +79,10 @@ namespace Swift.web.MobileRemit.Admin.PushNotification
             var category = msgType.Value;
             var customerType = ddlCustomerType.SelectedValue;
             var nativeCountry = ddlNativeCountry.SelectedValue;
+            var postCode = txtPostCode.Text;
          
 
-            if (string.IsNullOrEmpty(customerId) && customerType != "nativeCountry" && customerType.ToLower() != "all")
+            if (string.IsNullOrEmpty(customerId) && customerType != "nativeCountry" && customerType.ToLower() != "all" && customerType.ToLower() != "postcode")
             {
                 GetStatic.AlertMessage(this, "Customer can not be empty!");
                 return null;
@@ -108,7 +109,7 @@ namespace Swift.web.MobileRemit.Admin.PushNotification
             matchString = Regex.Replace(text, @"<[^>]*>", String.Empty).Replace(@"&nbsp;", String.Empty).Replace(@"<\/?[^>] + (>|$)", String.Empty);
             matchString = matchString.Replace("<\\S*?>", "");
 
-            DbResult _dbRes = _mobileDao.SaveBroadCastCustomer(GetStatic.GetUser(), GetRowId(), customerId, category, matchString, customerType, nativeCountry);
+            DbResult _dbRes = _mobileDao.SaveBroadCastCustomer(GetStatic.GetUser(), GetRowId(), customerId, category, matchString, customerType, nativeCountry, postCode);
 
 
             return _dbRes;

Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx.designer.cs

@@ -33,40 +33,49 @@ namespace Swift.web.MobileRemit.Admin.PushNotification
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
 
         /// <summary>
-        /// individualCustomerGroup control.
+        /// ddlCustomerType control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl individualCustomerGroup;
+        protected global::System.Web.UI.WebControls.DropDownList ddlCustomerType;
 
         /// <summary>
-        /// ddlCustomerType control.
+        /// txtSearchData 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 ddlCustomerType;
+        protected global::Swift.web.Component.AutoComplete.SwiftTextBox txtSearchData;
 
         /// <summary>
-        /// txtSearchData control.
+        /// ddlNativeCountry control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::Swift.web.Component.AutoComplete.SwiftTextBox txtSearchData;
+        protected global::System.Web.UI.WebControls.DropDownList ddlNativeCountry;
 
         /// <summary>
-        /// ddlNativeCountry control.
+        /// divPostCode 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 ddlNativeCountry;
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divPostCode;
+
+        /// <summary>
+        /// txtPostCode 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 txtPostCode;
 
         /// <summary>
         /// msgType control.

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

@@ -216,7 +216,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/Administration/CountrySetup/PromotionalRateSetup/List.aspx.cs

@@ -47,6 +47,7 @@ namespace Swift.web.Remit.Administration.CountrySetup.PromotionalRateSetup
             return GetStatic.ReadQueryString("opType", "");
         }
 
+
         #region method
 
         private void LoadTab()
@@ -97,7 +98,8 @@ namespace Swift.web.Remit.Administration.CountrySetup.PromotionalRateSetup
                                   {
                                       new GridColumn("depositType", "Deposit Type", "", "T"),
                                       new GridColumn("margin", "Rate", "", "T"),
-                                      new GridColumn("purchaseRate", "Promotional Rate", "", "T")
+                                      new GridColumn("purchaseRate", "Promotional Rate", "", "T"),
+                                      new GridColumn("maxAmt", "Maximum Amount", "", "T")
                                   };
 
             bool allowAddEdit = swiftLibrary.HasRight(AddEditFunctionId);
@@ -149,6 +151,7 @@ namespace Swift.web.Remit.Administration.CountrySetup.PromotionalRateSetup
             swiftLibrary.CheckAuthentication(ViewFunctionId);
         }
 
+
         #endregion method
     }
 }

Swift.web/Remit/Administration/CountrySetup/PromotionalRateSetup/Manage.aspx

@@ -99,6 +99,17 @@
                                             </asp:RequiredFieldValidator>
                                         </div>
                                     </div>
+                                    <div class="form-group">
+                                        <label class="col-lg-3 col-md-4 control-label" for="">
+                                            Maximum Amount:<span class="errormsg">*</span>
+                                        </label>
+                                        <div class="col-lg-9 col-md-8">
+                                            <asp:TextBox ID="maxAmount" runat="server" TextMode="SingleLine" CssClass="form-control"></asp:TextBox>
+                                            <asp:RequiredFieldValidator ID="RequiredFieldValidator3"
+                                                runat="server" ControlToValidate="actualRate" ValidationGroup="static" ErrorMessage="Required!" Display="Dynamic" ForeColor="Red">
+                                            </asp:RequiredFieldValidator>
+                                        </div>
+                                    </div>
                                     <div class="form-group">
                                         <label class="col-lg-3 col-md-4 control-label" for="">
                                             Is Active:            

Swift.web/Remit/Administration/CountrySetup/PromotionalRateSetup/Manage.aspx.cs

@@ -124,11 +124,12 @@ namespace Swift.web.Remit.Administration.CountrySetup.PromotionalRateSetup
                 divPromRate.Style["display"] = "block";
             }
             ddlStatus.Text = dr["isActive"].ToString();
+            maxAmount.Text = dr["maxAmt"].ToString();
         }
 
         private void Update()
         {
-            var dbResult = obj.Update(GetStatic.GetUser(), GetCountryId().ToString(), depositType.Text, actualRate.Text, promRate.Text, ddlStatus.SelectedValue);
+            var dbResult = obj.Update(GetStatic.GetUser(), GetCountryId().ToString(), depositType.Text, actualRate.Text, promRate.Text, ddlStatus.SelectedValue, maxAmount.Text);
             ManageMessage(dbResult);
         }
 

Swift.web/Remit/Administration/CountrySetup/PromotionalRateSetup/Manage.aspx.designer.cs

@@ -104,6 +104,24 @@ namespace Swift.web.Remit.Administration.CountrySetup.PromotionalRateSetup
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator1;
 
+        /// <summary>
+        /// maxAmount 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 maxAmount;
+
+        /// <summary>
+        /// RequiredFieldValidator3 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 RequiredFieldValidator3;
+
         /// <summary>
         /// ddlStatus control.
         /// </summary>
@@ -113,6 +131,15 @@ namespace Swift.web.Remit.Administration.CountrySetup.PromotionalRateSetup
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList ddlStatus;
 
+        /// <summary>
+        /// chkPromRate control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputCheckBox chkPromRate;
+
         /// <summary>
         /// divPromRate control.
         /// </summary>

Swift.web/Remit/Administration/CustomerRegistration/Manage.aspx.cs

@@ -52,11 +52,6 @@ namespace Swift.web.Remit.Administration.CustomerRegistration
             {
                 linkDiv.Visible = false;
             }
-            //string eId = GetStatic.ReadQueryString("customerId", "");
-            //if(eId != "")
-            //{
-            //    PopulateForm(eId);
-            //}
 
             var MethodName = Request.Form["MethodName"];
             if (!IsPostBack)
@@ -227,7 +222,6 @@ namespace Swift.web.Remit.Administration.CustomerRegistration
                 }
                 membershipDiv.Visible = true;
             }
-
         }
 
         private void PopulateDdl()
@@ -393,17 +387,29 @@ namespace Swift.web.Remit.Administration.CustomerRegistration
                 {
                     if (CheckAddOrEdit())
                     {
-                        Response.Redirect("Manage.aspx?edit=true&hdnId=" + memberId + "");
+                        PrintMessage(dbResult.Msg);
+                        txtSearchData.Text = "";
+                        //Response.Redirect("Manage.aspx?edit=true&hdnId=" + memberId + "");
                     }
                     else
                     {
-                        Response.Redirect("Manage.aspx?hdnId=" + memberId + "");
+                        PrintMessage(dbResult.Msg);
+                        txtSearchData.Text = "";
+                        //Response.Redirect("Manage.aspx?hdnId=" + memberId + "");
                     }
                 }
             }
+            else
+            {
+                GetStatic.AlertMessage(this, dbResult.Msg);
+            }
             Page_Load(sender, e);
             return;
         }
+        private void PrintMessage(string msg)
+        {
+            GetStatic.CallBackJs1(Page, "Msg", "alert('" + msg + "');");
+        }
 
         private void saveCustomerDocument(DbResult dbresult)
         {
@@ -555,7 +561,6 @@ namespace Swift.web.Remit.Administration.CustomerRegistration
             Response.Write(json);
             Response.End();
         }
-
         public static string DataTableToJson(DataTable table)
         {
             if (table == null)

Swift.web/Remit/Administration/CustomerSetup/List.aspx.cs

@@ -56,6 +56,7 @@ namespace Swift.web.Remit.Administration.customerSetup
                                   {
                                      new GridFilter("searchCriteria", "Search By", "1:" + "EXEC [proc_online_approve_Customer] @flag = 'searchCriteria'"),
                                      new GridFilter("searchValue", "Search Value", "T"),
+                                     new GridFilter("kycStatus", "KYC Status", "T"),
                                      new GridFilter("fromDate", "Registered From","d"),
                                      new GridFilter("toDate", "Registered To", "d"),
                                   };
@@ -72,9 +73,9 @@ namespace Swift.web.Remit.Administration.customerSetup
                                       new GridColumn("countryName", "Native Country", "", "T"),
                                       new GridColumn("idtype", "ID Type", "", "T"),
                                       new GridColumn("idNumber", "ID No", "", "T"),
-                                      new GridColumn("RegistrationType", "Reg. Type", "", "T"),
-                                      new GridColumn("createdDate","Regd. Date","","D"),
                                       new GridColumn("KYC_Status","KYC Status","","T"),
+                                      new GridColumn("createdDate","Regd. Date","","D"),
+                                      new GridColumn("Introducer","Introducer","","T"),
                                       //new GridColumn("bankName","Bank Name","","T")  ,
                                       //new GridColumn("bankAccountNo","Account Number","","T")
                                   };
@@ -94,6 +95,7 @@ namespace Swift.web.Remit.Administration.customerSetup
             _grid.GridMinWidth = 700;
             _grid.GridWidth = 100;
             _grid.IsGridWidthInPercent = true;
+            _grid.DownloadAll = true;
             _grid.AddPage = "/Remit/Administration/CustomerRegistration/Manage.aspx?isCallFromList=true";
             _grid.AllowCustomLink = true;
 
@@ -101,7 +103,7 @@ namespace Swift.web.Remit.Administration.customerSetup
             var docLink = swiftLibrary.HasRight(GetFunctionIdByUserType(ViewDocFunctionIdAgent, ViewDocFunctionId)) ? "&nbsp;<span class=\"action-icon\"><btn class=\"btn btn-xs btn-default\" data-toggle=\"tooltip\" data-placement=\"top\" title = \"Document Upload\"><a href=\"CustomerDocument.aspx?customerId=@customerId\"><i class=\"fa fa-file\"></i></a></btn></span>" : "";
             var benificiaryLink = swiftLibrary.HasRight(GetFunctionIdByUserType(ViewBenificiaryFunctionIdAgent, ViewBenificiaryFunctionId)) ? "&nbsp;<span class=\"action-icon\"><btn class=\"btn btn-xs btn-default\" data-toggle=\"tooltip\" data-placement=\"top\" title = \"Beneficiary List\"><a href=\"Benificiar\\List.aspx?customerId=@customerId\"><i class=\"fa fa-subway\"></i>" : "";
 
-            _grid.CustomLinkText = kycLink + docLink + benificiaryLink;
+           // _grid.CustomLinkText = kycLink + docLink + benificiaryLink;
             _grid.CustomLinkVariables = "customerId";
             string sql = "EXEC [proc_online_core_customerSetup] @flag = 's' ";
             _grid.SetComma();

Swift.web/Remit/Administration/PromotionalRateDao.cs

@@ -5,7 +5,7 @@ namespace Swift.DAL.BL.Remit.Administration
 {
     public class PromotionalRateDao : RemittanceDao
     {
-        public DbResult Update(string user, string countryId, string depositType, string actualRate, string promRate, string activeStatus)
+        public DbResult Update(string user, string countryId, string depositType, string actualRate, string promRate, string activeStatus, string maxAmount)
         {
             string sql = "EXEC proc_countryRateMaster";
             sql += " @flag = 'i-rate'";
@@ -15,6 +15,7 @@ namespace Swift.DAL.BL.Remit.Administration
             sql += ", @actualRate = " + FilterString(actualRate);
             sql += ", @promRate = " + FilterString(promRate);
             sql += ", @activeStatus = " + FilterString(activeStatus);
+            sql += ", @maxAmt = " + FilterString(maxAmount);
             return ParseDbResult(ExecuteDataset(sql).Tables[0]);
         }
 

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

@@ -13,9 +13,8 @@ namespace Swift.web.Remit.Administration.ReferralSetup
 {
     public partial class Manage : System.Web.UI.Page
     {
-        private const string ViewFunctionId = "10111000";
-        private const string AddEditFunctionId = "10111010";
-        private const string DeleteFunctionId = "10111020";
+        private const string ViewFunctionId = "90400000";
+      
         private readonly StaticDataDao _obj = new StaticDataDao();
         private readonly StaticDataDdl _sl = new StaticDataDdl();
 

Swift.web/Remit/Administration/ReferralSetup/ReferPointMasterSetup.aspx.cs

@@ -16,8 +16,8 @@ namespace Swift.web.Remit.Administration.ReferralSetup
 {
     public partial class ReferPointMasterSetup : System.Web.UI.Page
     {
-        private const string ViewFunctionId = "52480000";
-        private const string AddEditFunctionId = "52480010";
+        private const string ViewFunctionId = "90400000";
+      
         private const string GridName = "grd_bldom";
         private readonly SwiftGrid grid = new SwiftGrid();
         private readonly RemittanceLibrary swiftLibrary = new RemittanceLibrary();

Swift.web/Remit/Administration/ReferralSetup/ReferPointSetup.aspx.cs

@@ -13,8 +13,8 @@ namespace Swift.web.Remit.Administration.ReferralSetup
 {
     public partial class ReferPointSetup : System.Web.UI.Page
     {
-        private const string ViewFunctionId = "52480000";
-        private const string AddEditFunctionId = "52480010";
+        private const string ViewFunctionId = "90400000";
+
         private const string GridName = "grd_bldom";
         private readonly SwiftGrid grid = new SwiftGrid();
         private readonly RemittanceLibrary swiftLibrary = new RemittanceLibrary();
@@ -43,7 +43,7 @@ namespace Swift.web.Remit.Administration.ReferralSetup
                                        new GridColumn("IsActive", "Is Active", "", "T")
                                   };
 
-            bool allowAddEdit = swiftLibrary.HasRight(AddEditFunctionId);
+            bool allowAddEdit = true;
             grid.GridDataSource = SwiftGrid.GridDS.RemittanceDB;
             grid.GridName = GridName;
             grid.GridType = 1;

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/AddBankMapping.aspx

@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="AddBankMapping.aspx.cs" Inherits="Swift.web.Remit.TPSetup.BankAndBranchSetup.WebForm1" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="AddBankMapping.aspx.cs" Inherits="Swift.web.Remit.TPSetup.BankAndBranchSetup.AddBankMapping" %>
 
 <!DOCTYPE html>
 

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

@@ -13,7 +13,7 @@ using System.Web.UI.WebControls;
 
 namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
 {
-    public partial class WebForm1 : System.Web.UI.Page
+    public partial class AddBankMapping : System.Web.UI.Page
     {
 
         private const string ViewFunctionId = "20317000";

Swift.web/Remit/TPSetup/BankAndBranchSetup/AddBankMapping.aspx.designer.cs

@@ -11,7 +11,7 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
 {
 
 
-    public partial class WebForm1
+    public partial class AddBankMapping
     {
 
         /// <summary>

Swift.web/Remit/Transaction/PromotionalCampaign/List.aspx.cs

@@ -50,6 +50,7 @@ namespace Swift.web.Remit.Transaction.PromotionalCampaign
                                       new GridColumn("PROMOTIONAL_CODE", "PROMOTIONAL CODE", "", "T"),
                                       new GridColumn("PROMOTIONAL_MSG", "PROMOTIONAL MSG", "", "T"),
                                       new GridColumn("PROMOTION_VALUE", "PROMOTION VALUE", "", "M"),
+                                      new GridColumn("MIN_SENDING_AMT", "MIN SENDING AMT", "", "M"),
                                       new GridColumn("START_DT", "START DATE", "", "D"),
                                       new GridColumn("END_DT", "END DATE", "", "D"),
                                       new GridColumn("IS_ACTIVE", "Is Active", "", "T"),

Swift.web/Remit/Transaction/PromotionalCampaign/Manage.aspx

@@ -11,11 +11,12 @@
     <link href="/ui/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
     <script src="/js/swift_grid.js" type="text/javascript"> </script>
     <script src="/js/functions.js" type="text/javascript"> </script>
+    <script src="../../../js/jQuery/jquery.min.js"></script>
     <script src="/js/swift_calendar.js" type="text/javascript"></script>
     <link href="/js/jQuery/jquery-ui.css" rel="stylesheet" type="text/css" />
-    <script src="/js/jQuery/jquery.min.js" type="text/javascript"></script>
+<%--    <script src="/js/jQuery/jquery.min.js" type="text/javascript"></script>--%>
     <script src="/js/jQuery/jquery-ui.min.js" type="text/javascript"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.mask/1.14.15/jquery.mask.min.js" type="text/javascript"></script>
+<%--    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.mask/1.14.15/jquery.mask.min.js" type="text/javascript"></script>--%>
 
     <script type="text/javascript">
         $(document).ready(function () {
@@ -26,6 +27,16 @@
 			$('#endDate').mask('0000-00-00');
         });
 
+        //$(document).ready(function () {
+        //    $("#chkUse").click(function () {
+        //        if ($(this).is(":checked")) {
+        //            $("#useDiv").show();
+        //        } else {
+        //            $("#useDiv").hide();
+        //        }
+        //    });
+        //});
+
         function CheckFormValidation() {
             var reqField = "countryDDL,ddlPromotionType,promotionCode,promotionMsg,startDate,endDate,promotionAmount,";
             if (ValidRequiredField(reqField) == false) {
@@ -176,6 +187,31 @@
                                         </div>
                                     </div>
                                 </div>
+                                 <div class="col-md-6">
+                                    <div class="form-group">
+                                        <label class="col-lg-4 col-md-8 control-label" for="">
+                                            <label>
+                                                Minimum Sending Amount:</label>
+                                        </label>
+                                        <div class="col-lg-8 col-md-4">
+                                            <asp:TextBox runat="server" ID="minAmt" class="form-control"></asp:TextBox>
+                                        </div>
+                                    </div>
+                                </div>
+                                <%--<div class="col-md-6">
+                                    <div class="form-group">
+                                        <label class="col-lg-3 col-md-4 control-label">
+                                            <input type="checkbox" runat="server" id="chkUse" value="multipleUse"/> Can use multiple times?</label>
+                                    </div>
+                                    <div class="form-group" id="useDiv" runat="server" style="display: none">
+                                        <label class="col-lg-3 col-md-4 control-label" for="">
+                                            Can use multiple times: 
+                                        </label>
+                                        <div class="col-lg-9 col-md-8">
+                                            <asp:TextBox ID="useTimes" CssClass="form-control" runat="server" TextMode="SingleLine"></asp:TextBox>
+                                        </div>
+                                    </div>
+                                </div>--%>
                             </div>
                         </ContentTemplate>
                     </asp:UpdatePanel>

Swift.web/Remit/Transaction/PromotionalCampaign/Manage.aspx.cs

@@ -71,7 +71,7 @@ namespace Swift.web.Remit.Transaction.PromotionalCampaign
 
             DbResult _dbRes = _apiDao.InsertUpdatePromotion(GetStatic.GetUser(), flag, GetId(), promotionCode.Text, promotionMsg.Text,
                                 ddlPromotionType.SelectedValue, countryDDL.SelectedValue, payoutMethodDDL.SelectedValue, isActiveDDL.SelectedValue,
-                                startDate.Text, endDate.Text, promotionAmount.Text);
+                                startDate.Text, endDate.Text, promotionAmount.Text, minAmt.Text);
 
             if (_dbRes.ErrorCode != "0")
             {

Swift.web/Remit/Transaction/PromotionalCampaign/Manage.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Swift.web.Remit.Transaction.PromotionalCampaign {
-    
-    
-    public partial class Manage {
-        
+namespace Swift.web.Remit.Transaction.PromotionalCampaign
+{
+
+
+    public partial class Manage
+    {
+
         /// <summary>
         /// Base1 control.
         /// </summary>
@@ -20,7 +22,7 @@ namespace Swift.web.Remit.Transaction.PromotionalCampaign {
         /// 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.Transaction.PromotionalCampaign {
         /// 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.Transaction.PromotionalCampaign {
         /// 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,7 +49,7 @@ namespace Swift.web.Remit.Transaction.PromotionalCampaign {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.UpdatePanel UpdatePanel1;
-        
+
         /// <summary>
         /// countryDDL control.
         /// </summary>
@@ -56,7 +58,7 @@ namespace Swift.web.Remit.Transaction.PromotionalCampaign {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList countryDDL;
-        
+
         /// <summary>
         /// payoutMethodDDL control.
         /// </summary>
@@ -65,7 +67,7 @@ namespace Swift.web.Remit.Transaction.PromotionalCampaign {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList payoutMethodDDL;
-        
+
         /// <summary>
         /// ddlPromotionType control.
         /// </summary>
@@ -74,7 +76,7 @@ namespace Swift.web.Remit.Transaction.PromotionalCampaign {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList ddlPromotionType;
-        
+
         /// <summary>
         /// promotionCode control.
         /// </summary>
@@ -83,7 +85,7 @@ namespace Swift.web.Remit.Transaction.PromotionalCampaign {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox promotionCode;
-        
+
         /// <summary>
         /// promotionMsg control.
         /// </summary>
@@ -92,7 +94,7 @@ namespace Swift.web.Remit.Transaction.PromotionalCampaign {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox promotionMsg;
-        
+
         /// <summary>
         /// promotionAmount control.
         /// </summary>
@@ -101,7 +103,7 @@ namespace Swift.web.Remit.Transaction.PromotionalCampaign {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox promotionAmount;
-        
+
         /// <summary>
         /// startDate control.
         /// </summary>
@@ -110,7 +112,7 @@ namespace Swift.web.Remit.Transaction.PromotionalCampaign {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox startDate;
-        
+
         /// <summary>
         /// endDate control.
         /// </summary>
@@ -119,7 +121,7 @@ namespace Swift.web.Remit.Transaction.PromotionalCampaign {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox endDate;
-        
+
         /// <summary>
         /// isActiveDDL control.
         /// </summary>
@@ -128,7 +130,16 @@ namespace Swift.web.Remit.Transaction.PromotionalCampaign {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList isActiveDDL;
-        
+
+        /// <summary>
+        /// minAmt 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 minAmt;
+
         /// <summary>
         /// btnSave control.
         /// </summary>

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/Remit/UserControl/UcTransaction.ascx.cs

@@ -2124,7 +2124,7 @@ namespace Swift.web.Remit.UserControl
                                     {
                                             NotificationContent =  new NotificationDTO() {
                                             Body = comments,
-                                            Title = "JME",
+                                            Title = "IME LONDON",
                                              MessageType = "INFO",
                                               ClickActivity = "OPEN_ACTIVITY_NOTIFICATION"
                                             },

Swift.web/RemittanceSystem/RemittanceReports/DynamicReport/DynamicReportView.aspx

@@ -79,7 +79,7 @@
                                 <hr id="h3" runat="server" />
                                 <div runat="server" id="exportDiv" class="noprint">
                                     <img alt="Print" title="Print" style="cursor: pointer;" onclick=" javascript:ReportPrint(); " src="../../../Images/printer.png" border="0" />&nbsp;&nbsp;&nbsp;
-                                    <img alt="Export to Excel" title="Export to Excel" style="cursor: pointer" onclick="test();" src="../../../Images/excel.gif" border="0" />
+                                    <img alt="Export to Excel" title="Export to Excel" style="cursor: pointer" onclick=" javascript:downloadInNewWindow('<% =Request.Url.AbsoluteUri + "&mode=download"%>');" src="../../../Images/excel.gif" border="0" />
                                 </div>
                             </div>
                             <div class="form-group" style="overflow: auto;">

Swift.web/RemittanceSystem/RemittanceReports/DynamicReport/DynamicReportView.aspx.cs

@@ -107,6 +107,8 @@ namespace Swift.web.RemittanceSystem.RemittanceReports.DynamicReport
                 reportResult = PrepareAccountingSummary();
             else if (reportName.Equals("customerregistration"))
                 reportResult = PrepareCustomerRegistrationReport();
+            else if (reportName.Equals("lowtxnreport"))
+                reportResult = PrepareLowTxnReport();
 
             return reportResult;
         }
@@ -157,6 +159,14 @@ namespace Swift.web.RemittanceSystem.RemittanceReports.DynamicReport
             mergeColumnHead = true;
             return (new TranAgentReportDao().GetNewRegistrationReport(GetStatic.GetUser(), "customer", fromDate, toDate, sAgent, sBranch, withAgent));
         }
+        private ReportResult PrepareLowTxnReport()
+        {
+            string fromDate = GetStatic.ReadQueryString("from", "");
+            string postCode = GetStatic.ReadQueryString("postCode", "");
+            string txnCountType = GetStatic.ReadQueryString("txnCountType", "");
+            string txnCount = GetStatic.ReadQueryString("txnCount", "");
+            return (new TranAgentReportDao().GetLowTxnReport(GetStatic.GetUser(), "txn-report", fromDate, postCode, txnCountType, txnCount));
+        }
         private void PrintHead()
         {
             Page.Title = reportResult.ReportHead;

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/Responsive/Send/SendV2.aspx.cs

@@ -866,6 +866,7 @@ namespace Swift.web.Responsive.Send.SendMoneyv2
             , GetStatic.GetSessionId()
             , couponId
             , rewardAmt
+            , ""
             , isManualSc
             , sc);
 

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.

Swift.web/js/swift_grid.js

@@ -361,4 +361,12 @@ function FindPos(obj) {
     return [curleft, curtop];
 }
 
+function DownloadExcelRemit(path) {
+    url = path + "/Download.aspx?mode=download&type=remit";
+    window.open(url, "", "width=825,height=500,resizable=1,status=1,toolbar=0,scrollbars=1,center=1");
+}
+function DownloadExcel(path) {
+    url = path + "/Download.aspx?mode=download";
+    window.open(url, "", "width=825,height=500,resizable=1,status=1,toolbar=0,scrollbars=1,center=1");
+}
 //GRID FILTER ENDS