Merge branch 'feature/Redmine-16525-Cosmetic_Changes' of http://202.166.220.79:3000/IME-LONDON/WEB_CORE into Ime-london-webcore

# Conflicts:
#	Swift.API/Common/Enum/Notification.cs
#	Swift.DAL/Agentpanel/Send/SendTranIRHDao.cs
#	Swift.DAL/Remittance/CustomerDeposits/CustomerDepositDao.cs
#	Swift.DAL/Remittance/Transaction/ApproveTransactionDao.cs
#	Swift.DAL/Remittance/Transaction/ModifyTransactionDao.cs
#	Swift.DAL/Remittance/Transaction/TranReportDao.cs
#	Swift.DAL/SwiftDAL/DbResult.cs
#	Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx
#	Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx.cs
#	Swift.web/AgentNew/AgentSend/SendV2.aspx.cs
#	Swift.web/AgentNew/SendTxn/Confirm.aspx.cs
#	Swift.web/AgentNew/SendTxn/SendIntlReceipt.aspx
#	Swift.web/AgentNew/SendTxn/SendV2.aspx
#	Swift.web/AgentNew/SendTxn/SendV2.aspx.cs
#	Swift.web/AgentNew/js/SendTxn/sendTxnInfo.js
#	Swift.web/AgentPanel/ResetPassword/ResetPassword.aspx.cs
#	Swift.web/DashboardV2/Dashboard2.aspx
#	Swift.web/DashboardV2/Dashboard2.aspx.cs
#	Swift.web/DashboardV2/assets/css/style.css
#	Swift.web/DashboardV2/assets/js/dashboardv2.js
#	Swift.web/Library/GetStatic.cs
#	Swift.web/Library/WebUtils.cs
#	Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx
#	Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx.cs
#	Swift.web/MobileRemit/Admin/Operation/VerifyMobileCustomer.aspx.cs
#	Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx
#	Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx.cs
#	Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx.cs
#	Swift.web/Payment/trans_payment_success.aspx.cs
#	Swift.web/Remit/Administration/CustomerRegistration/UpdateKYC.aspx.cs
#	Swift.web/Remit/Administration/CustomerSetup/List.aspx.cs
#	Swift.web/Remit/Compliance/ApproveOFACandComplaince/List.aspx.cs
#	Swift.web/Remit/Transaction/ApproveTxn/holdTxnListMobile.aspx.cs
#	Swift.web/Remit/Transaction/Modify/ModifyTran.aspx
#	Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx.cs
#	Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx
#	Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs
#	Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.designer.cs
#	Swift.web/Remit/Transaction/VerifyMobileTransaction/VerifyMobileTransaction.aspx
#	Swift.web/Remit/UserControl/UcTransaction.ascx.cs
#	Swift.web/RemittanceSystem/RemittanceReports/RejectTransactionReport/Mange.aspx

Swift.API/Common/Enum/Notification.cs

@@ -36,10 +36,11 @@ namespace Swift.API.Common.Enum
 
         [Description("Email to customer for OTP")]
         OTP_EMAIL = 8,
-        
+
         [Description("Customer Password and Txn Pin")]
         PIN_PASSWORD_EMAIL = 20,
-        FORCE_PASSWORD_CHANGE=9,
+
+        FORCE_PASSWORD_CHANGE =9,
 
         TRANSACTION_APPROVED = 10,
 

Swift.API/Swift.API.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Swift.API</RootNamespace>
     <AssemblyName>Swift.API</AssemblyName>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>

Swift.API/ThirdPartyApiServices/SyncStateCityTownService.cs

@@ -30,45 +30,45 @@ namespace Swift.API.ThirdPartyApiServices
 					string resultData = resp.Content.ReadAsStringAsync().Result;
 					if (resp.IsSuccessStatusCode)
 					{
-						jsonResponse = JsonConvert.DeserializeObject<JsonResponse>(resultData);
-						dynamic a ;
-						if (model.MethodType.ToLower() == "state")
-						{
-							a = (jsonResponse.Data != null ? JsonConvert.DeserializeObject<List<StateResponse>>(jsonResponse.Data.ToString()) : null);
+                        jsonResponse = JsonConvert.DeserializeObject<JsonResponse>(resultData);
+                        dynamic a;
+                        if (model.MethodType.ToLower() == "state")
+                        {
+                            a = (jsonResponse.Data != null ? JsonConvert.DeserializeObject<List<StateResponse>>(jsonResponse.Data.ToString()) : null);
                         }
                         else if (model.MethodType.ToLower() == "city")
-						{
-							a = (jsonResponse.Data != null ? JsonConvert.DeserializeObject<List<CityResponse>>(jsonResponse.Data.ToString()) : null);
+                        {
+                            a = (jsonResponse.Data != null ? JsonConvert.DeserializeObject<List<CityResponse>>(jsonResponse.Data.ToString()) : null);
 						}
                         else if (model.MethodType.ToLower() == "loqate")
 						{
                             a = (jsonResponse.Data != null ? JsonConvert.DeserializeObject<AddressDTO>(jsonResponse.Data.ToString()) : null);
-						}
+                        }
                         else if (model.MethodType.ToLower() == "loqate")
                         {
                             a = (jsonResponse.Data != null ? JsonConvert.DeserializeObject<AddressDTO>(jsonResponse.Data.ToString()) : null);
                         }
-						else
-						{
-							a = (jsonResponse.Data != null ? JsonConvert.DeserializeObject<List<TownResponse>>(jsonResponse.Data.ToString()) : null);
-						}
-						
-						jsonResponse.Data = a;
-						return jsonResponse;
-					}
+                        else
+                        {
+                            a = (jsonResponse.Data != null ? JsonConvert.DeserializeObject<List<TownResponse>>(jsonResponse.Data.ToString()) : null);
+                        }
+
+                        jsonResponse.Data = a;
+                        return jsonResponse;
+                    }
 					else
 					{
 						var errorJson = JsonConvert.DeserializeObject<ErrorJosn>(resultData);
 						var jsonResponseData = JsonConvert.DeserializeObject<JsonResponse>(errorJson.Message);
 						var data = JsonConvert.DeserializeObject<List<Data>>(jsonResponseData.Data.ToString());
-						jsonResponse.Id = jsonResponseData.Id;
-						jsonResponse.ResponseCode = jsonResponseData.ResponseCode;
-						jsonResponse.Msg = jsonResponseData.Msg;
-						jsonResponse.Data = data;
-						jsonResponse.Extra = jsonResponseData.Extra;
-						jsonResponse.Extra1 = jsonResponseData.Extra1;
-						return jsonResponse;
-					}
+                        jsonResponse.Id = jsonResponseData.Id;
+                        jsonResponse.ResponseCode = jsonResponseData.ResponseCode;
+                        jsonResponse.Msg = jsonResponseData.Msg;
+                        jsonResponse.Data = data;
+                        jsonResponse.Extra = jsonResponseData.Extra;
+                        jsonResponse.Extra1 = jsonResponseData.Extra1;
+                        return jsonResponse;
+                    }
 				}
 				catch (Exception ex)
 				{

Swift.DAL/Agentpanel/Send/SendTranIRHDao.cs

@@ -74,6 +74,14 @@ namespace Swift.DAL.BL.AgentPanel.Send
             return ExecuteDataTable(sql);
         }
 
+        public DataTable GetPaymentOption(string pCountryId)
+        {
+            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);
@@ -426,7 +434,7 @@ namespace Swift.DAL.BL.AgentPanel.Send
             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)
@@ -495,6 +503,7 @@ namespace Swift.DAL.BL.AgentPanel.Send
             sql += ", @manualSc = " + FilterString(sc);
             sql += ", @rewardAmt = " + FilterString(rewardAmt);
             sql += ", @introducer = " + FilterString(introducer);
+            
             //sql += ", @calcBy = " + FilterString(calcBy);
 
             var ds = ExecuteDataset(sql);
@@ -1110,6 +1119,12 @@ 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'";
@@ -1441,7 +1456,7 @@ 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);

Swift.DAL/Remittance/System/GeneralSettings/StaticDataDao.cs

@@ -59,6 +59,49 @@ namespace Swift.DAL.BL.System.GeneralSettings
             sql += ", @user = " + FilterString(user);
             sql += ", @valueId = " + FilterString(valueId);
 
+            return ParseDbResult(ExecuteDataset(sql).Tables[0]);
+        }
+        public DataRow GetDetailById(string user, string promotiontype)
+        {
+            string sql = "EXEC proc_InsertRewardPoints";
+            sql += " @flag = 'editById'";
+            sql += ", @user = " + FilterString(user);
+            sql += ", @promotiontype = " + FilterString(promotiontype);
+
+            DataSet ds = ExecuteDataset(sql);
+            if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+                return null;
+            return ds.Tables[0].Rows[0];
+        }
+
+        public DbResult UpdateByType(string user, string promotionType, string points)
+        {
+            string sql = "EXEC proc_InsertRewardPoints";
+            sql += " @flag = 'UPDATE-POINT'";
+            sql += ", @user = " + FilterString(user);
+            sql += ", @promotionType = " + FilterString(promotionType);
+            sql += ", @newPoints = " + FilterString(points);
+            return ParseDbResult(ExecuteDataset(sql).Tables[0]);
+        }
+
+        public DbResult UpdateById(string user, string id, string newPts, string oldPts)
+        {
+            string sql = "EXEC proc_InsertRewardPoints";
+            sql += " @flag = 'UPDATE-MASTER'";
+            sql += ", @user = " + FilterString(user);
+            sql += ", @newPoints = " + FilterString(newPts);
+            sql += ", @oldPoints = " + FilterString(oldPts);
+            sql += ", @rowId = " + FilterString(id);
+            return ParseDbResult(ExecuteDataset(sql).Tables[0]);
+        }
+
+        public DbResult DeleteByType(string user, string promotionType)
+        {
+            string sql = "EXEC proc_InsertRewardPoints";
+            sql += " @flag = 'DELETE'";
+            sql += ", @user = " + FilterString(user);
+            sql += ", @promotionType = " + FilterString(promotionType);
+
             return ParseDbResult(ExecuteDataset(sql).Tables[0]);
         }
     }

Swift.DAL/Remittance/Transaction/ApproveTransactionDao.cs

@@ -856,6 +856,7 @@ namespace Swift.DAL.BL.Remit.Transaction
 
             return ExecuteDataTable(sql);
         }
+
         public DbResult UpdateSyncTxnById(string user, string id)
         {
             var sql = "EXEC PROC_TP_TXN_PUSH @flag =  'INSTANT-PAID_V2'";

Swift.DAL/Remittance/Transaction/ModifyTransactionDao.cs

@@ -207,6 +207,16 @@ namespace Swift.DAL.BL.Remit.Transaction
             return GetSingleResult(sql);
         }
 
+        public string SelectBankName(string user, string tranId)
+        {
+            string sql = "EXEC [proc_modifyTXN]";
+            sql += "  @flag = 'branchId'";
+            sql += ", @user = " + FilterString(user);
+            sql += ", @tranId = " + FilterString(tranId);
+
+            return GetSingleResult(sql);
+        }
+
         public string SelectBankName(string user, string tranId)
         {
             string sql = "EXEC [proc_modifyTXN]";

Swift.DAL/Remittance/Transaction/TranReportDao.cs

@@ -2553,7 +2553,6 @@ namespace Swift.DAL.BL.Remit.Transaction
             sql += ",@endDate = " + FilterString(endDate);
             sql += ",@verificationType = " + FilterString(verificationType);
           
-
             return ParseReportResult(sql);
         }
         public ReportResult NoWorkPermitReport(string user, string startDate, string endDate, string sAgentId, string payoutPartnerName, string payoutPartnerId)

Swift.DAL/Swift.DAL.csproj

@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Swift.DAL</RootNamespace>
     <AssemblyName>Swift.DAL</AssemblyName>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>

Swift.DAL/SwiftDAL/DbResult.cs

@@ -57,7 +57,8 @@
             get { return _data; }
         }
         //public string Extra2 { get; set; }
-		public string TpErrorCode
+        //public string Extra3 { get; set; }
+        public string TpErrorCode
 		{
 			get { return _tpErrorCode; }
 			set { _tpErrorCode = value; }

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

@@ -164,9 +164,9 @@
 
             $('#modalClose').on('click', function () {
                
-
                 $("#apiDataPopup").modal("hide");
             })
+            })
             //$("#ContentPlaceHolder1_occupation").prop("disabled", true);
            <%-- $("#<%=verificationTypeNo.ClientID%>").on("change", function () {
                 var idtype = $("#<%=idType.ClientID%>").val();
@@ -794,7 +794,7 @@
                                                 ControlToValidate="emailConfirm"></asp:RegularExpressionValidator>
                                         </div>
                                     </div>
-                                     <div id="apiDataPopup" class="modal" role="dialog">
+                                    <div id="apiDataPopup" class="modal" role="dialog">
                                         <div class="modal-dialog">
                                             <div class="modal-content">
                                                 <div class="modal-header">
@@ -1087,7 +1087,7 @@
                                             </div>
                                         </div>--%>
                                     </div>
-                                   <%-- <div id="apiDataPopup" class="modal fade" role="dialog">
+                                    <%-- <div id="apiDataPopup" class="modal fade" role="dialog">
                                         <div class="modal-dialog">
                                             <div class="modal-content">
                                                 <div class="modal-header">

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 = Utility.ReadWebConfig("methodType", "");
+            string methodType = "loqate"; //Utility.ReadWebConfig("methodType", "");
             string countryName = "United Kingdom";
 
             AddressRequest requestObj = new AddressRequest()
@@ -363,12 +363,17 @@ namespace Swift.web.AgentNew.Administration.CustomerSetup.CustomerRegistration
                 }
             }
             GetStatic.SetMessage(dbResult.ErrorCode, dbResult.Msg);
+
             if (dbResult.ErrorCode == "0")
             {
                 saveCustomerDocument(dbResult);
                 var customerDetails = _cd.GetRequiredCustomerDetails(dbResult.Id, GetStatic.GetUser());
                 string membershipId = Convert.ToString(customerDetails["membershipId"]);
                 string registrationDate = Convert.ToString(customerDetails["createdDate"]);
+                string totalPts = Convert.ToString(customerDetails["totalPoints"]);
+                string regPts = Convert.ToString(customerDetails["regPoints"]);
+                string tranPts = Convert.ToString(customerDetails["tranPoints"]);
+
                 List<Mapping> bodyMappings = new List<Mapping>();
                 bodyMappings.Add(new Mapping() { SValue = "CustomerName", SText = customerModel.firstName });
                 bodyMappings.Add(new Mapping() { SValue = "CustomerId", SText = dbResult.Id });
@@ -380,6 +385,9 @@ namespace Swift.web.AgentNew.Administration.CustomerSetup.CustomerRegistration
                 bodyMappings.Add(new Mapping() { SValue = "Address", SText = customerModel.address });
                 bodyMappings.Add(new Mapping() { SValue = "EMAIL_ID", SText = customerModel.email });
                 bodyMappings.Add(new Mapping() { SValue = "RegisteredDate", SText = registrationDate });
+                bodyMappings.Add(new Mapping() { SValue = "rewardPoint", SText = totalPts }); 
+                bodyMappings.Add(new Mapping() { SValue = "RegReward", SText = regPts });
+                bodyMappings.Add(new Mapping() { SValue = "TranReward", SText = tranPts });
                 //bodyMappings.Add(new Mapping() { SValue = "Password", SText = customerModel.password });
 
                 SendNotificationRequestMobile request = new SendNotificationRequestMobile()
@@ -422,7 +430,7 @@ namespace Swift.web.AgentNew.Administration.CustomerSetup.CustomerRegistration
             Page_Load(sender, e);
             return;
         }
-
+         
         private void saveCustomerDocument(DbResult dbresult)
         {
             var result = dbresult.Extra.Split('|');
@@ -530,7 +538,7 @@ namespace Swift.web.AgentNew.Administration.CustomerSetup.CustomerRegistration
             string customerId = Request.Form["customerId"];
             string action = Request.Form["action"];
             var dr = _cd.GetAddressByZipCodeNew(zipCode, GetStatic.GetUser(), rowID, customerId, action);
-            
+
             var json = GetStatic.DataTableToJson(dr);
 
             GetStatic.JsonResponse(json, this);

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

@@ -980,6 +980,7 @@ namespace Swift.web.AgentNew.AgentSend
             var sc = Request.Form["sc"];
             var rewardAmt = Request.Form["rewardAmt"];
 
+
             dt = st.GetExRate(GetStatic.GetUser()
                      , GetStatic.GetCountryId()
                      , GetStatic.GetSuperAgent()

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

@@ -98,7 +98,7 @@ 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 _pLocation = GetStatic.ReadQueryString("pLocation", "");
         private readonly string _pLocationText = GetStatic.ReadQueryString("pLocationText", "");
@@ -620,7 +620,6 @@ namespace Swift.web.AgentNew.SendTxn
             trn.goodsOrigin = _goodsOrigin;
             trn.portOfShipment = _portOfShipment;
 
-
             DataSet ds = new DataSet();
 
             if (_isExrateFromPartner == "true")
@@ -938,14 +937,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
                 {

Swift.web/AgentNew/SendTxn/SendIntlReceipt.aspx

@@ -458,7 +458,7 @@
                                 <label style="text-align: center;">Signature or Stamp</label>
                             </td>
                         </tr>
-                       
+
                     </table>
                 </td>
             </tr>
@@ -771,14 +771,14 @@
                 <td colspan="2">
                     <table width="100%;" style="border: 1px solid #ccc; padding: 5px; min-height: 100px;">
                         <tr valign="top" style="height: 90px; display: none;">
-                            
+
                             <td>This is the digital copy generated from the IME London Remittance System hence no signature is required. Please do contact IME London for further information.
                             </td>
                         </tr>
                         <tr class="bottom-box" style="min-height: 100px;">
                             <td colspan="2" style="padding: 5px; width: 50%; text-align: center;" class="print-gray">
                                 <span style="font-size: 25px;">Company Stamp</span>
-                                 <img src="../../Images/ime-london-logo-receipt.png" style="padding-bottom: 5px; padding-right: 5px; height: 115px; width: 125px;" />
+                                <img src="../../Images/ime-london-logo-receipt.png" style="padding-bottom: 5px; padding-right: 5px; height: 115px; width: 125px;" />
                             </td>
                             <td style="vertical-align: bottom; padding-bottom: 5px;">
                                 <label>Operator:(<asp:Label ID="operator2" runat="server"></asp:Label>)</label>
@@ -786,8 +786,8 @@
                             <td style="vertical-align: bottom; padding-bottom: 10px;">..................................................
                             </td>
                         </tr>
-                        
-                       
+
+
                     </table>
                 </td>
             </tr>

Swift.web/AgentNew/SendTxn/SendV2.aspx

@@ -14,6 +14,7 @@
         }
 
         .error {
+            color: red;
             color: red;
             border-color: red;
         }
@@ -95,16 +96,17 @@
         table.tbl-border-black > tbody > tr > td {
             border: 1px solid black;
         }
-		
-		#customerDocDetails	{
-		 border-spacing:0;
-		}
-		
+
+        #customerDocDetails {
+            border-spacing: 0;
+        }
+
         @media (min-width: 768px) {
             .container {
                 width: 100% !important;
             }
         }
+
         #modalAdditionalDocumentRequired {
             top: 15%;
             right: 50%;
@@ -154,10 +156,11 @@
                 data: dataToSend,
                 async: true,
                 success: function (response) {
-                   //alert('a');
+                    //alert('a');
                 },
             });
         }
+
     </script>
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
@@ -829,7 +832,7 @@
                                                      <span class="ErrMsg" id="pCountry_err">*</span>
                                                     </td>
                                                     <td>
-                                                        <asp:DropDownList ID="pCountry" runat="server" CssClass="required form-control"></asp:DropDownList>
+                                                        <asp:DropDownList ID="pCountry" runat="server" AutoPostBack="true" CssClass="required form-control"></asp:DropDownList>
                                                     </td>
                                                 </tr>
                                                 <tr class="locationRow">
@@ -898,9 +901,9 @@
                                                     </td>
                                                     <td>
                                                         <asp:HiddenField ID="HiddenField1" runat="server" />
-                                                        <asp:TextBox ID="txtRewardAmt" runat="server" class="form-control" Width="20%" Style="display: inherit !important;" ></asp:TextBox>
-<%--                                                        <asp:Label ID="lblAgentQuota" runat="server" Text="" style="background-color: yellow; font-weight: 600;"></asp:Label>--%>
-                                                        <asp:Label ID="lblRemainingQuota" runat="server" Text="" style="background-color: yellow; font-weight: 600;"></asp:Label>
+                                                        <asp:TextBox ID="txtRewardAmt" runat="server" class="form-control" Width="20%" Style="display: inherit !important;"></asp:TextBox>
+                                                        <%--                                                        <asp:Label ID="lblAgentQuota" runat="server" Text="" style="background-color: yellow; font-weight: 600;"></asp:Label>--%>
+                                                        <asp:Label ID="lblRemainingQuota" runat="server" Text="" Style="background-color: yellow; font-weight: 600;"></asp:Label>
                                                     </td>
                                                 </tr>
                                                 <tr>
@@ -941,12 +944,13 @@
                                                         <asp:Label ID="lblLoyaltyFreeSc" runat="server" Text="GBP" class="amountLabel">Free service charge for 5th transaction.</asp:Label>&nbsp;
                                                     </td>
                                                 </tr>
+
                                                 <tr runat="server" id="customerRateFields">
                                                     <td>Customer Rate:</td>
                                                     <td>
                                                         <asp:Label ID="lblExRate" runat="server" Text="0.00" class="amountLabel"></asp:Label>
                                                         <asp:Label ID="lblExCurr" runat="server" Text="" class="amountLabel"></asp:Label>
-                                                       <%-- <asp:Label ID="lblAgentQuota" runat="server" Text="" style="background-color: yellow; font-weight: 600;"></asp:Label>
+                                                        <%-- <asp:Label ID="lblAgentQuota" runat="server" Text="" style="background-color: yellow; font-weight: 600;"></asp:Label>
                                                         <asp:Label ID="lblRemainingQuota" runat="server" Text="" style="background-color: yellow; font-weight: 600;"></asp:Label>--%>
                                                     </td>
                                                 </tr>
@@ -1021,6 +1025,7 @@
                                                         <select id="pCurrDdl" runat="server" class="required form-control" onchange="CalculateTxn();"></select>
                                                     </td>
                                                 </tr>
+
                                                 <tr>
                                                     <td>Payout Amount: <span class="ErrMsg" id='txtPayAmt_err'>*</span></td>
                                                     <td>
@@ -1042,7 +1047,16 @@
                                                     <asp:DropDownList ID="ddlPaymentOption" runat="server" CssClass="required form-control" onchange="CalculateTxn(this);"></asp:DropDownList>
                                                 </td>
 
-                                            </tr>
+                                                <tr id="paymentOptionRow" runat="server">
+                                                    <td>
+                                                        <asp:Label runat="server" ID="paymentOption" Text="Payment Option: "></asp:Label>
+                                                        <span class="ErrMsg" id='paymentOption_err'>*</span>
+                                                    </td>
+                                                    <td>
+                                                        <asp:DropDownList ID="ddlPaymentOption" runat="server" CssClass="required form-control" onchange="CalculateTxn(this);"></asp:DropDownList>
+                                                    </td>
+
+                                                </tr>
                                                 <tr>
                                                     <td id="tdScheme" style="display: none;" valign="top">Scheme/Offer:</td>
                                                     <td id="tdSchemeVal" style="display: none;">
@@ -1777,6 +1791,7 @@
             });
             return true;
         }
+
         function ParseResponseForReceiverData(response) {
             ClearTxnData();
             $('.readonlyOnReceiverSelect').attr("disabled", "disabled");
@@ -1810,11 +1825,14 @@
                 }
                 if ($.isNumeric(data[0].relationship)) {
                     SetDDLValueSelected("<%=relationship.ClientID %>", data[0].relationship);
+
                 } else {
                     SetDDLTextSelected("<%=relationship.ClientID %>", data[0].relationship);
+
                 }
                 //****Transaction Detail****
                 SetDDLValueSelected("<%=pCountry.ClientID%>", data[0].COUNTRYID);
+
                 PcountryOnChange('c', data[0].paymentMethod.toUpperCase(), data[0].bankId);
                 //select bank branch
                 //if (data[0].paymentMethod.toUpperCase() == 'BANK DEPOSIT') {
@@ -1826,10 +1844,15 @@
                 PAgentChange();
                 $('#<%=txtRecDepAcNo.ClientID%>').val(data[0].receiverAccountNo);
                 ManageHiddenFields(data[0].paymentMethod.toUpperCase());
+
                 $(".readonlyOnCustomerSelect").attr("disabled", "disabled");
                 $("#txtpBranch_aValue").val('');
                 $("#txtpBranch_aText").val('');
                 $('#<%=lblRemainingQuota.ClientID%>').text('Reward Amount: ' + data[0].rewardPoints);
+
+                var countryId = data[0].COUNTRYID;
+                LoadPaymentOptionsDynamically(countryId);
+
                 <%--if ($("#<%=pCountry.ClientID%> option:selected ").val() != "") {
                     PcountryOnChange('c', "");
                     SetPayCurrency($("#<%=pCountry.ClientID%>").val());
@@ -1837,6 +1860,35 @@
                 ManageLocationData();
             }
         }
+
+        function LoadPaymentOptionsDynamically(countryId) {
+            $.ajax({
+                type: "POST",
+                url: '<%= ResolveUrl("SendV2.aspx/loadPaymentOption") %>',
+                data: JSON.stringify({ countryId: countryId }),
+                contentType: "application/json; charset=utf-8",
+                dataType: "json",
+                success: function (data) {
+                    debugger
+                    BindPaymentOptions(data);
+                },
+                error: function (error) {
+                    console.log(error);
+                }
+            });
+        }
+
+        function BindPaymentOptions(options) {
+            $("#<%= ddlPaymentOption.ClientID %>").empty();
+
+            $.each(options.d, function (index, option) {
+                $("#<%= ddlPaymentOption.ClientID %>").append($('<option>', {
+                    value: option.valueId,
+                    text: option.detailTitle
+                }));
+            });
+        }
+
         $(document).ready(function () {
             $("#" + mId + "lblLoyaltyFreeSc").hide();
             $("#" + mId + "lblAgentQuota").hide();
@@ -1907,6 +1959,7 @@
                 debugger
                 var enteredAmount = parseFloat($(this).val());
                 var availablePoints = parseFloat($('#<%=lblRemainingQuota.ClientID %>').text().replace('Reward Amount: ', ''));
+
                 if (enteredAmount > availablePoints) {
                     alert('Entered amount exceeds available points!');
                     $(this).val('');
@@ -2221,6 +2274,28 @@
             }--%>
 
             $("#form2").validate();
+
+            $(document).on('change', '#<%= pAgent.ClientID %>', function () {
+                var bankId = $("#<%= pAgent.ClientID %> option:selected").val();
+                if (bankId === "" || bankId === null) {
+                    return;
+                }
+                var pmode = $("#<%=pMode.ClientID%>").val();
+                var partnerId = $("#<%=hddPayoutPartner.ClientID%>").val();
+                $('#divBankBranch').hide();
+                $('#<%=branch.ClientID%>').removeClass('required');
+                $('.displayPayerInfo').hide();
+                PopulateBankDetails(bankId, pmode);
+                if (partnerId === apiPartnerIds[0] || pmode === "2") {
+                    if ((partnerId === apiPartnerIds[0]) && pmode === "2") {
+                        $('#agentBranchRequired').hide();
+                    }
+                    $('#divBankBranch').show();
+                    if ((partnerId === apiPartnerIds[0]) && pmode === "2" && (bankId != "0" && bankId != null && bankId != "")) {
+                        LoadPayerData();
+                    }
+                }
+            });
         })
 
 

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

@@ -15,6 +15,7 @@ using System.Text;
 using System.Threading;
 using System.Web;
 using System.Web.Script.Serialization;
+using System.Web.Services;
 using System.Web.UI.WebControls;
 
 namespace Swift.web.AgentNew.SendTxn
@@ -103,8 +104,8 @@ namespace Swift.web.AgentNew.SendTxn
                         break;
 
                     case "getExRateList":
-                       //   GetExRateList();
-                       GetExRateListNew();
+                        //   GetExRateList();
+                        GetExRateListNew();
                         break;
 
                     case "getSubLocation":
@@ -215,9 +216,10 @@ namespace Swift.web.AgentNew.SendTxn
                     case "insertAddDocLog":
                         InsertAdditionalDocumentLog();
                         break;
-                    //case "checkAgentQuota":
-                    //    CheckAgentQuota("customerId");
-                    //    break;
+
+                        //case "checkAgentQuota":
+                        //    CheckAgentQuota("customerId");
+                        //    break;
                 }
 
                 #endregion Ajax methods
@@ -299,7 +301,7 @@ namespace Swift.web.AgentNew.SendTxn
 
             foreach (DataRow item in dt.Rows)
             {
-                if ( item["ISREALTIME"].ToString().ToLower() == "true")
+                if (item["ISREALTIME"].ToString().ToLower() == "true")
                 {
                     exRate.UserName = GetStatic.GetUser();
                     exRate.isExRateCalcByPartner = true;
@@ -332,7 +334,7 @@ namespace Swift.web.AgentNew.SendTxn
 
                 }
             }
-            
+
             if (dt == null)
             {
                 Response.Write("");
@@ -509,6 +511,7 @@ namespace Swift.web.AgentNew.SendTxn
 
             //var dt = st.LoadCustomerData(searchType, searchValue, "s", GetStatic.GetCountryId(), GetStatic.GetSettlingAgent());
             var dt = st.LoadReceiverData(GetStatic.GetUser(), customerId, partnerId);
+            //LoadPaymentOption(dt.Rows[0]["COUNTRYID"].ToString());
             if (dt == null)
             {
                 Response.Write("");
@@ -521,6 +524,37 @@ namespace Swift.web.AgentNew.SendTxn
             Response.End();
         }
 
+        [WebMethod]
+        public static object LoadPaymentOption(string countryId)
+        {
+            SendV2 sendV2Instance = new SendV2();
+            DataTable dt = sendV2Instance.st.GetPaymentOption(countryId);
+
+            if (dt == null)
+            {
+                return new { error = "Failed to retrieve payment options" };
+            }
+
+            var paymentOptions = ConvertDataTableToList(dt);
+            return paymentOptions;
+        }
+
+        private static List<object> ConvertDataTableToList(DataTable dataTable)
+        {
+            List<object> list = new List<object>();
+
+            foreach (DataRow row in dataTable.Rows)
+            {
+                list.Add(new
+                {
+                    detailTitle = row["detailTitle"].ToString(),
+                    valueId = Convert.ToDecimal(row["valueId"])
+                });
+            }
+
+            return list;
+        }
+
         private void PopulateReceiverDDL()
         {
             string customerId = Request.Form["customerId"];
@@ -890,7 +924,7 @@ namespace Swift.web.AgentNew.SendTxn
         //        string checkedOrNot = item["ISDEFAULT"].ToString() == "1" ? "checked=\"checked\"" : "";
         //        sb.AppendLine("<input " + checkedOrNot + " type=\"checkbox\" id=\"" + item["COLLMODE"] + "\" name=\"chkCollMode\" value=\"" + item["detailTitle"] + "\" class=\"collMode-chk\">&nbsp;<label for=\"" + item["COLLMODE"] + "\">" + item["detailDesc"] + "</label>&nbsp;&nbsp;");
         //    }
-            
+
         //    sb.AppendLine("<span style='background-color: yellow; font-weight: 600;padding: 4px; display:none;' id='availableBalSpan'> Available Bal: <label id=\"availableBal\" style=\"font-size: 14px;font-weight: 800;\"></label>&nbsp;GBP</span>");
         //    collModeTd.InnerHtml = sb.ToString();
         //}
@@ -1036,7 +1070,7 @@ namespace Swift.web.AgentNew.SendTxn
             _sdd.SetDDL(ref ddlSendCustomerType, "EXEC proc_online_dropDownList @flag='dropdownList',@parentId=4700", "valueId", "detailTitle", "", "SELECT CUSTOMER TYPE");
             _sdd.SetDDL(ref ddlIdIssuedCountry, "EXEC proc_sendPageLoadData @flag='idIssuedCountry'", "countryId", "countryName", "", "SELECT COUNTRY");
             _sdd.SetDDL(ref ddlEmpBusinessType, "EXEC proc_online_dropDownList @flag='dropdownList',@parentId=7002", "valueId", "detailTitle", "11007", "");
-           // _sdd.SetDDL(ref custLocationDDL, "EXEC proc_online_dropDownList @flag='state',@countryId='233'", "stateId", "stateName", "", "SELECT");
+            // _sdd.SetDDL(ref custLocationDDL, "EXEC proc_online_dropDownList @flag='state',@countryId='233'", "stateId", "stateName", "", "SELECT");
             //_sdd.SetDDL(ref sendingAgentOnBehalfDDL, "EXEC proc_sendPageLoadData @flag='S-AGENT-BEHALF',@user='" + GetStatic.GetUser() + "',@sAgent='" + GetStatic.GetAgent() + "'", "agentId", "agentName", "", "Select Branch/Agent");
             _sdd.SetDDL(ref ddlRecIdType, "EXEC proc_online_dropDownList @flag='idType',@user='" + GetStatic.GetUser() + "'", "valueId", "detailTitle", "", "Select..");
             _sdd.SetDDL(ref sourceOfFund, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=3900", "valueId", "detailTitle", "", "Select..");
@@ -1051,7 +1085,7 @@ namespace Swift.web.AgentNew.SendTxn
             _sdd.SetDDL(ref ddlVisaStatus, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=7005", "valueId", "detailTitle", "", "Select..");
             _sdd.SetDDL(ref ddlOccupation, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=2000", "valueId", "detailTitle", "", "Select..");
             //_sdd.SetDDL(ref ddlPayoutPartner, "EXEC proc_sendPageLoadData @flag='choose-partner',@user='" + GetStatic.GetUser() + "'", "AGENTID", "AGENTNAME", "", "Select Partner");
-            _sdd.SetDDL(ref ddlPaymentOption, "EXEC proc_online_dropDownList @flag='paymentMode',@user='" + GetStatic.GetUser() + "'", "detailDesc", "detailTitle", "", "Select");
+            //_sdd.SetDDL(ref ddlPaymentOption, "EXEC proc_online_dropDownList @flag='paymentMode',@user='" + GetStatic.GetUser() + "'", "detailDesc", "detailTitle", "", "Select");
         }
 
         private void LoadSenderCountry(ref DropDownList ddl, string defaultValue, string label)
@@ -1186,23 +1220,8 @@ namespace Swift.web.AgentNew.SendTxn
             exRate.Introducer = Request.Form["introducerTxt"];
             exRate.TpExRate = Request.Form["tpExRate"];
             exRate.RewardAmt = Request.Form["rewardAmt"];
-            //{
-            //    DataTable errTbl = new DataTable();
-            //    DataColumn dCol1 = new DataColumn("ErrCode", typeof(System.String));
-            //    DataColumn dCol2 = new DataColumn("Msg", typeof(System.String));
-            //    errTbl.Columns.Add(dCol1);
             //    errTbl.Columns.Add(dCol2);
 
-            //    //DataRow row = errTbl.NewRow();
-            //    //row[dCol1] = "1";
-            //    //row[dCol2] = "Introducer value can not be empty";
-            //    //errTbl.Rows.Add(row);
-
-            //    Response.ContentType = "text/plain";
-            //    var jsonRes = DataTableToJson(errTbl);
-            //    Response.Write(jsonRes);
-            //    Response.End();
-            //}
             if (exRate.isExRateCalcByPartner)
             {
                 exRate.CalcBy = Request.Form["calcBy"] == "cAmt" ? "C" : "P";
@@ -1245,6 +1264,7 @@ namespace Swift.web.AgentNew.SendTxn
                          , exRate.Introducer
                          , exRate.RewardAmt
                          , exRate.ProviderId
+
                         );
             }
             else
@@ -1274,6 +1294,7 @@ namespace Swift.web.AgentNew.SendTxn
                          , exRate.ManualSc
                          , exRate.CalcBy
                          , exRate.ProviderId
+
                         );
             }
 
@@ -1628,10 +1649,10 @@ namespace Swift.web.AgentNew.SendTxn
         {
             var customerId = Request.Form["customerId"];
             var isAdditionalDocRequired = Request.Form["isAdditionalDocRequired"];
-           
-             DbResult _res = new DbResult();
+
+            DbResult _res = new DbResult();
             _res = _ald.InsertAdditionalDocumentLog(GetStatic.GetUser(), customerId, isAdditionalDocRequired);
-           
+
             Response.ContentType = "text/plain";
             Response.Write(JsonConvert.SerializeObject(_res));
             Response.End();

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

@@ -198,12 +198,17 @@ function CalculateTxn(amt, obj, isManualSc) {
     //alert($('#ContentPlaceHolder1_branch').val());
     var collAmt = $("#" + mId + "txtCollAmt").val();
     var payAmt = $("#" + mId + "txtPayAmt").val();
+
     if (collAmt === "" && payAmt === "") {
         alert("Please enter Amount to calculate. ");
         GetElement(mId + "txtCollAmt").focus();
         return false;
     }
     //if (payAmt === "" || payAmt === null) {
+    //    alert("Please enter Payout Amount");
+    //    GetElement(mId + "txtPayAmt").focus();
+    //    return false;
+    //}
     if ($("#" + mId + "txtCollAmt").val())
         if (isManualSc === undefined) {
             if ($("#" + mId + "editServiceCharge").is(':checked')) {
@@ -233,7 +238,7 @@ function CalculateTxn(amt, obj, isManualSc) {
     //    $("#" + mId + "editServiceCharge").attr('readonly');
     //}
     //else if (partnerId == '394130') {
-    //    $("#" + mId + "allowEditSC").val("N");
+    //if ($("#" + mId + "allowEditSC").val() === 'N') {
     //    $("#" + mId + "editServiceCharge").attr('disabled');
     //    $("#" + mId + "editServiceCharge").attr('readonly');
     //}
@@ -324,7 +329,13 @@ function CalculateTxn(amt, obj, isManualSc) {
         GetElement(mId + "pMode").focus();
         return false;
     }
+
     //if (tpExRate === "" || tpExRate === null || tpExRate === undefined) {
+    //    alert("Please choose payment option");
+    //    GetElement(mId + "pMode").focus();
+    //    return false;
+    //}
+
     //var sAgent = $("#" + mId + "sendingAgentOnBehalfDDL option:selected").val();
     //if (sAgent === "" || sAgent === null || sAgent === undefined) {
     //    alert("Please choose Sending AgentBbranch");
@@ -407,7 +418,12 @@ function CalculateTxn(amt, obj, isManualSc) {
     //    ClearAmountFields();
     //    return false;
     //}
+    //var tpExRate = $("#" + mId + "ddlPaymentOption").val();
     //if (tpExRate == '' || tpExRate == null || tpExRate == undefined) {
+    //    alert("Payment Option must be selected.");
+    //    ClearAmountFields();
+    //    return false;
+    //}
     $("#" + mId + "hddCalcBy").val(obj);
     var dataToSend = {
         MethodName: 'CalculateTxn', pCountry: pCountry, pCountrytxt: pCountrytxt, pMode: pMode, pAgent: pAgent
@@ -444,6 +460,39 @@ function checkPaymentOption() {
     }
 }
 //function CheckAgentQuota(agentUser) {
+//    var dataToSend = {
+//        MethodName: 'checkAgentQuota', user: agentUser
+//    };
+//    var options =
+//    {
+//        url: 'SendV2.aspx?x=' + new Date().getTime(),
+//        data: dataToSend,
+//        dataType: 'JSON',
+//        type: 'POST',
+//        async: false,
+//        success: function (response) {
+//             var data = response;
+//          //  var data = jQuery.parseJSON(response);
+//          //  alert(data[0].ErrorCode);
+//            $("#" + mId + "lblRemainingQuota").text('Remaining Quota : ' + data[0].ErrorCode);
+//            if (data[0].ErrorCode < 1) {
+//            /*if (data[0].agentQuota == data[0].freeScCounter) {*/
+//                $("#" + mId + "lblAgentQuota").show();
+//                $("#" + mId + "allowEditSC").val("N");
+//                $("#" + mId + "editServiceCharge").removeAttr('checked');
+//                $("#" + mId + "editServiceCharge").attr("disabled", true);
+//                $("#" + mId + "lblServiceChargeAmt").attr("readonly", true);
+//                $("#" + mId + "hdnQuota").val('Y');
+//            }
+//            else{
+//                $("#" + mId + "hdnQuota").val('N');
+//                $("#" + mId + "lblAgentQuota").hide();
+//            }
+//        }
+//    };
+//    $.ajax(options);
+//}
+
 function CheckAgentQuota() {
     debugger
     var customerId = $('#finalSenderId').text();
@@ -949,6 +998,7 @@ function SendTransactionMethod() {
     var calcOriginalSc = $("#" + mId + "hdnCalcOriginalSc").val();
     var paymentOption = $("#" + mId + "ddlPaymentOption option:selected").text().replace("Select", "");
     var rewardAmt = $("#" + mId + "txtRewardAmt").val();
+
     var url = "Confirm.aspx?senderId=" + senderId +
         "&sfName=" + sfName +
         "&smName=" + smName +
@@ -1114,6 +1164,7 @@ function SendTransactionMethod() {
                 }
             }
             else {
+
                 window.location.replace("/AgentNew/SendTxn/SendIntlReceipt.aspx?controlNo=" + res[2] + "&invoicePrint=" + res[3]);
             }
         }

Swift.web/AgentPanel/ResetPassword/ResetPassword.aspx.cs

@@ -112,7 +112,7 @@ namespace Swift.web.AgentPanel.ResetPassword
             {
                 PasswordReset pwdReset = new PasswordReset();
                 Random generator = new Random();
-
+                var randomPassword = generator.Next(0, 1000000).ToString("D6");
                 var randomPassword = generator.Next(0, 1000000).ToString("D6");
                 pwdReset.RandomPassword = randomPassword;
                 JsonResponse _resp = _cd.ResetPasswordMobile(new PasswordReset()

Swift.web/DashboardV2/Dashboard2.aspx

@@ -63,7 +63,8 @@
             z-index: 9999;
             background: url("../Images/loading_icon.gif") center no-repeat #fff;
         }
-        .footer-text{
+
+        .footer-text {
             color: white;
         }
         .auto-style1 {
@@ -231,7 +232,7 @@
                                 </div>
                             </div>
 
-                              <div class="col-lg-2 col-md-6">
+                            <div class="col-lg-2 col-md-6">
                                 <div class="card">
                                     <div class="card-body">
                                         <div class="d-flex">
@@ -261,7 +262,7 @@
                                             <a href="#" class="dropdown-toggle arrow-none text-muted" data-bs-toggle="dropdown" aria-expanded="false">
                                                 <i class="uil uil-ellipsis-v"></i>
                                             </a>
-                                            <div class="dropdown-menu dropdown-menu-end" >
+                                            <div class="dropdown-menu dropdown-menu-end">
                                                 <!-- item-->
                                                 <a href="javascript:void(0);" class="dropdown-item">Today
                                                 </a>
@@ -479,6 +480,7 @@
                                     </div>
                                 </div>
                             </div>
+
                             <div class="col-xl-6" id="customerKycStatusList" runat="server">
                                 <div class="card">
                                     <div class="card-body p-0" style="min-height: 267px !important;">
@@ -488,6 +490,7 @@
                                                     <i class="uil uil-ellipsis-v"></i>
                                                 </a>
                                                 <div class="dropdown-menu dropdown-menu-end">
+                                                    <!-- item-->
                                                     <a href="javascript:void(0);" class="dropdown-item">
                                                         <i class="uil uil-refresh me-2"></i>Refresh
                                                     </a>
@@ -495,6 +498,7 @@
                                             </div>
                                             <h5 class="card-title header-title mb-0">Customer KYC Status</h5>
                                         </div>
+                                        <!-- stat 1 -->
                                         <div class="form-content p-0">
                                             <div class="list-group drop-reveal-list">
                                                 <a href="../MobileRemit/Admin/Operation/VerifyMobileCustomer.aspx?kycStatus=PROCESSING" target="_blank" class="list-group-item list-group-item-action border-top-0">
@@ -511,6 +515,7 @@
                                                             <i class="las la-money-bill-wave-alt"></i>
                                                         </span>
                                                     </div>
+                                                    <!-- end msg-body -->
                                                 </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">
@@ -526,6 +531,45 @@
                                                             <i class='uil uil-refresh'></i>
                                                         </span>
                                                     </div>
+                                                    <!-- end msg-body -->
+                                                </a>--%>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-xl-6" id="customerKycStatusList" runat="server">
+                                <div class="card">
+                                    <div class="card-body p-0" style="min-height: 267px !important;">
+                                        <div class="p-3">
+                                            <div class="dropdown float-end">
+                                                <a href="#" class="dropdown-toggle arrow-none text-muted" data-bs-toggle="dropdown" aria-expanded="false">
+                                                    <i class="uil uil-ellipsis-v"></i>
+                                                </a>
+                                                <div class="dropdown-menu dropdown-menu-end">
+                                                    <a href="javascript:void(0);" class="dropdown-item">
+                                                        <i class="uil uil-refresh me-2"></i>Refresh
+                                                    </a>
+                                                </div>
+                                            </div>
+                                            <h5 class="card-title header-title mb-0">Customer KYC Status</h5>
+                                        </div>
+                                        <div class="form-content p-0">
+                                            <div class="list-group drop-reveal-list">
+                                                <a href="../MobileRemit/Admin/Operation/VerifyMobileCustomer.aspx?kycStatus=PROCESSING" target="_blank" class="list-group-item list-group-item-action border-top-0">
+                                                    <div class="msg-body d-flex align-items-center">
+                                                        <div class="icon-element bg-8 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 Processing</h3>
+                                                            <p class="msg-text" style="color: red;" id="kycProcessingCust">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 Topup Request" style="display: none;">
+                                                            <i class="las la-money-bill-wave-alt"></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">
@@ -541,6 +585,21 @@
                                                             <i class='uil uil-refresh'></i>
                                                         </span>
                                                     </div>
+                                                    <!-- end msg-body -->
+                                                </a>
+                                                    <div class="msg-body d-flex align-items-center">
+                                                        <div class="icon-element bg-10 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 Completed</h3>
+                                                            <p class="msg-text" style="color: red;" id="kycCompletedCust">0</p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <%--<div class="col-xl-6" id="userwiseDailyTxnRoleDiv" runat="server">
+                                                    </div>
                                                 </a>
                                             </div>
                                         </div>
@@ -573,7 +632,6 @@
                                     </div>
                                 </div>
                             </div>--%>
-
                         </div>
                         <!-- end row -->
                     </div>
@@ -586,9 +644,9 @@
                     <div class="container-fluid">
                         <div class="row">
                             <div class="col-md-12 text-center">
-                               <a class="footer-text" href="">IME London is a trading name of Subhida UK Ltd, Pentax House, South Hill Avenue, South Harrow, London, HA2 0DU, Company Registration No: 06432399<br />
-                Subhida UK Ltd is authorized and regulated by the Financial Conduct Authority (FCA) under the Payment Service Regulations 2017, FCA Registration No: 576127, HMRC Registration No: XYML000000119350<br />
-                &copy; IME London, 2023</a>
+                                <a class="footer-text" href="">IME London is a trading name of Subhida UK Ltd, Pentax House, South Hill Avenue, South Harrow, London, HA2 0DU, Company Registration No: 06432399<br />
+                                    Subhida UK Ltd is authorized and regulated by the Financial Conduct Authority (FCA) under the Payment Service Regulations 2017, FCA Registration No: 576127, HMRC Registration No: XYML000000119350<br />
+                                    &copy; IME London, 2023</a>
                             </div>
                         </div>
                     </div>

Swift.web/DashboardV2/Dashboard2.aspx.cs

@@ -70,8 +70,8 @@ namespace Swift.web.DashboardV2
             //    complianceOfacRoleDiv.Attributes.Add("style", "display:none;");
             ////if (!sl.HasRight(AgentwiseNumberRole))
             ////    agentWiseTxnRoleDiv.Attributes.Add("style", "display:none;");
-            ////if (!sl.HasRight(UserwiseNumberRole))
-            ////    userwiseDailyTxnRoleDiv.Attributes.Add("style", "display:none;");
+            //if (!sl.HasRight(UserwiseNumberRole))
+            //    userwiseDailyTxnRoleDiv.Attributes.Add("style", "display:none;");
             //if (!sl.HasRight(customerKycStatus))
             //    customerKycStatusList.Attributes.Add("style", "display:none;");
             //if (!sl.HasRight(LawsonSummaryRole))

Swift.web/DashboardV2/assets/css/style.css

@@ -650,12 +650,15 @@ body {
 .bg-8 {
     background-color: deepskyblue !important;
 }
+
 .bg-9 {
     background-color: #d00303 !important;
 }
+
 .bg-10 {
     background-color: #26a808 !important;
 }
+
 .bg-rgb {
     background-color: rgba(140, 67, 255, 0.1) !important;
 }

Swift.web/DashboardV2/assets/js/dashboardv2.js

@@ -114,12 +114,10 @@ function LoadChartData() {
 
     if (loadDate) {
         //Compliance/OFAC Hold Transactions
-
         if (Response.ComplianceData != null) {
-            $('#complianceHoldCount').text(Response.ComplianceData.OFACComplianceTxns);
-            $('#complianceHoldCountMobileKycLater').text(Response.ComplianceData.OFACComplianceMobileTxnsKycLater);
+        $('#complianceHoldCount').text(Response.ComplianceData.OFACComplianceTxns);
+        $('#complianceHoldCountMobileKycLater').text(Response.ComplianceData.OFACComplianceMobileTxnsKycLater);
         }
-        
        // $('#complianceHoldCountMobileKycNow').text(Response.ComplianceData.OFACComplianceMobileTxnsKycNow);
 
         //Customer Count data
@@ -127,9 +125,11 @@ function LoadChartData() {
         $('#mobileCustomerCount').text(Response.CustomerData.MobileCustomers);
         $('#mobileCustomerCount').text(Response.CustomerData.MobileCustomers);
 
+        //KYC Status
         $('#kycProcessingCust').text(Response.KycStatus.KycProcessing);
         $('#kycNotCompletedCust').text(Response.KycStatus.KycNotCompleted);
         $('#kycCompletedCust').text(Response.KycStatus.KycCompleted);
+
         //Agent wise transaction show
         //let html = '';
         //if (AgentWiseTxn.length > 0) {

Swift.web/Library/GetStatic.cs

@@ -1079,7 +1079,6 @@ namespace Swift.web.Library
                 DateTime d;
                 DateTime.TryParse(data, out d);
                 return d.Day.ToString("00") + "/" + d.Month.ToString("00") + "/" + d.Year;
-                //return d.Year + "/" + d.Month.ToString("00") + "/" + d.Day.ToString("00");
             }
 
             if (dataType == "DT")
@@ -1843,6 +1842,7 @@ namespace Swift.web.Library
             else
                 return strVal;
         }
+
         public static String ShowDecimal(String strVal)
         {
             if (strVal != "")
@@ -2277,7 +2277,7 @@ namespace Swift.web.Library
             {
                 jsonString = DataTableToJson(dt);
             }
-
+            
             page.Response.ContentType = "application/json";
             page.Response.Write(jsonString);
             page.Response.End();
@@ -2657,9 +2657,7 @@ namespace Swift.web.Library
         }
         public static string GetMIMEExtension(this string contentType)
         {
-            return MimeTypes.MimeTypeMap.GetExtension(contentType);
+            return  MimeTypes.MimeTypeMap.GetExtension(contentType);
         }
-
-
     }
 }

Swift.web/Library/WebUtils.cs

@@ -70,10 +70,10 @@ namespace Swift.web.Library
                 }
             }
         }
-
         public static string EncryptString(string plainText)
         {
             var key = GetStatic.ReadWebConfig("encryptKey");
+
             byte[] iv = new byte[16];
             byte[] array;
 

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

@@ -55,7 +55,6 @@
             height: 300px;
             width: 400px
         }
-
         .lowercase {
             text-transform: none !important;
         }
@@ -86,8 +85,8 @@
             $("#editSelfie").click(function () {
                 $("#uploadcustomerSelfieDiv2").show();
             })
-
-
+         
+            
             /*   $("#" + mId + "occupation").change(function () {*/
             $("#occupation").change(function () {
                 $("#divOccupation").hide();
@@ -330,7 +329,7 @@
                 ParseCustomerData(response);
                 PopulateImage();
                 PopulateSignature();
-
+               
                 //DisableFields();
                 ChangeOrganisationType();
             }).fail(function () {
@@ -408,7 +407,7 @@
                     $('#<%=hdnreg_additional_id2CdId.ClientID%>').val(url4.FileName + '|' + url4.CdId);
                 }
                 else
-                    $("#divAdditional_id2").hide();
+                   $("#divAdditional_id2").hide();
 
                 debugger;
                 const filtered = data.filter(item => item.isEkyc === true);
@@ -416,10 +415,10 @@
                 if (filtered != null) {
 
                     var selfie = filtered.filter(item => item.DocumentName === "Customer Selfie")[0];
-
+                  
                     if (selfie) {
-
-                        /*   $("#customerSelfieDiv").show();*/
+                        
+                     /*   $("#customerSelfieDiv").show();*/
                         $("#imgselfieId").attr("src", selfie.ImageUrl);
                         editSelfieCrop.setAttribute('onclick', 'documentCrop( " ' + selfie.FileName + ' ", " ' + selfie.CdId + ' " , " ' + filtered.FileType + ' " , this.id )');
 
@@ -433,9 +432,9 @@
                     }
                     else
                         /*$("#customerSelfieDiv").hide();*/
+                   
 
-
-                        var facePicture = filtered.filter(item => item.DocumentName === "Face Picture")[0];
+                    var facePicture = filtered.filter(item => item.DocumentName === "Face Picture")[0];
                     if (facePicture) {
                         $("#FacePictureDiv").show();
 
@@ -482,7 +481,7 @@
                     }
                 }
                 else {
-                    // $("#customerSelfieDiv").hide();
+                   // $("#customerSelfieDiv").hide();
                     //$("#FacePictureDiv").hide();
                     $("#AdditionalIDFront2Div").hide();
                     $("#IDFrontFeatureDiv").hide();
@@ -751,7 +750,7 @@
             return true;
         }
         function CheckFormValidation() {
-            debugger;
+             debugger;
             var reqField = "";
             var val = $("#<% =hdnCustomerId.ClientID%>").val();
             var customerType = $("#<% =ddlCustomerType.ClientID%>").val();
@@ -1211,7 +1210,7 @@
                                             <div class="col-md-4 col-sm-4">
                                                 <div class="form-group">
                                                     <label>City:<span class="errormsg">*</span></label>
-                                                    <asp:TextBox ID="city" runat="server" placeholder="City" CssClass="form-control required" />
+                                                    <asp:TextBox ID="city" runat="server"  placeholder="City" CssClass="form-control required" />
                                                 </div>
                                             </div>
                                             <%--<div class="col-md-4 col-sm-4">
@@ -1230,14 +1229,14 @@
                                                 <div class="form-group">
                                                     <label>Address 1:<span class="errormsg">*</span> </label>
                                                     <input style="display: none" type="text" name="txtAdditionalAddress1" />
-                                                    <asp:TextBox name="address1" ID="address1" runat="server" placeholder="Address 1" CssClass="form-control required" />
+                                                    <asp:TextBox  name="address1" ID="address1" runat="server" placeholder="Address 1" CssClass="form-control required" />
                                                 </div>
                                             </div>
                                             <div class="col-md-4 col-sm-4">
                                                 <div class="form-group">
                                                     <label>Address 2:</label>
                                                     <input style="display: none" type="text" name="txtAdditionalAddress2" />
-                                                    <asp:TextBox name="txtAdditionalAddress" ID="txtAdditionalAddress" runat="server" placeholder="Address 2" CssClass="form-control" />
+                                                    <asp:TextBox  name="txtAdditionalAddress" ID="txtAdditionalAddress" runat="server" placeholder="Address 2" CssClass="form-control" />
                                                 </div>
                                             </div>
 
@@ -1278,7 +1277,7 @@
                                                         ControlToValidate="email"></asp:RegularExpressionValidator>
                                                 </div>
                                             </div>
-
+                                            
                                             <div class="col-md-4 col-sm-4">
                                                 <div class="form-group">
                                                     <label>Telephone No.:</label>
@@ -1480,7 +1479,7 @@
                                                         </div>
                                                     </div>
                                                 </div>
-
+                                        
                                                 <div class="row" id="signatureDiv" runat="server" style="display: none">
                                                     <div class="col-md-6">
                                                         <label class="control-label">Customer Signature:</label>
@@ -1510,7 +1509,7 @@
                                                 <div class="panel panel-default clearfix m-b-20">
                                                     <div class="panel-heading">Document Information</div>
                                                     <div class="panel-body">
-                                                        <div class="col-md-6" id="divreg_front_id">
+                                                        <div class="col-md-6"  id="divreg_front_id" >
                                                             <div class="form-group">
                                                                 <label id="lblreg_front_id">
                                                                     <asp:Localize runat="server" meta:resourcekey="Register_040" Text="ID Front"></asp:Localize></label>
@@ -1646,7 +1645,7 @@
                                                                 </div>
                                                             </div>
                                                         </div>
-
+                                                           
                                                         <div class="col-md-6" id="customerSelfieDiv">
                                                             <div class="form-group">
                                                                 <label>Customer Selfie</label>
@@ -1660,7 +1659,7 @@
                                                                     </div>
                                                                 </div>
                                                             </div>
-                                                            <div class="form-group" id="uploadcustomerSelfieDiv2">
+                                                              <div class="form-group" id="uploadcustomerSelfieDiv2">
                                                                 <div class="file-upload" id="facePictureId">
                                                                     <asp:FileUpload ID="reg_customerSelfie" type="file" runat="server" class="uploadbutton" accept="image/*" meta:resourcekey="reg_back_idResource1" />
                                                                     <%--<input type="file" name="reg-back-id" id="reg-back-id" required="required" class="uploadbutton" accept="image/*" />--%>
@@ -1675,7 +1674,7 @@
                                                         <div class="col-md-6" style="display: none;" id="FacePictureDiv">
                                                             <div class="form-group">
                                                                 <label>Customer Face Picture</label>
-                                                                <input type="button" id="editFacePicture" style="display: none;" class="btn btn-info" value="Edit Face Picture" />
+                                                                <input type="button" id="editFacePicture"  style="display: none;" class="btn btn-info" value="Edit Face Picture" />
                                                                 <input type="button" id="editFacePictureCrop" class="btn btn-warning" value="Crop" />
                                                                 <input type="button" id="undoFacePicture" style="display: none;" class="btn btn-primary" value="Undo" />
                                                                 <div>
@@ -1685,10 +1684,10 @@
                                                                     </div>
                                                                 </div>
                                                             </div>
-
+                                                           
                                                         </div>
 
-
+                                                     
                                                     </div>
                                                 </div>
                                                 <div class="panel panel-default clearfix m-b-20">

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

@@ -71,7 +71,7 @@ namespace Swift.web.MobileRemit.Admin.Operation
                 {
                     GetSignature();
                 }
-                
+
                 if (MethodName == "undoCrop")
                 {
                     UndoCrop();
@@ -481,14 +481,16 @@ namespace Swift.web.MobileRemit.Admin.Operation
             var verifyRemarks = Request.Form["verifyRemarks"];
             var ofacRemarks = Request.Form["remarksOFAC"];
             DataSet ds = new DataSet();
-            if ((GetRequestFrom() == "agent") && (membershipId.StartsWith("CR") || membershipId.StartsWith("ONL")))
+            if ((GetRequestFrom() == "agent") && (membershipId.StartsWith("CR") || membershipId.StartsWith("ONL") || membershipId.StartsWith("ADM")))
             {
                 ds = _cd.ApprovePending(GetCustomerId(), GetStatic.GetUser(), ofacRemarks);
             }
             else
             {
                 ds = _cd.ApprovePendingFromMobile(GetCustomerId(), GetStatic.GetUser(), createdFrom, verifyType, isValidatedCustomer, verifyRemarks, ofacRemarks);
+
                 DbResult res = _cd.ParseDbResult(ds.Tables[0]);
+
                 if (res.ErrorCode == "0")
                 {
                     SendNotificationRequestMobile request = new SendNotificationRequestMobile()
@@ -506,12 +508,14 @@ namespace Swift.web.MobileRemit.Admin.Operation
                                             NotificationContent =  new NotificationDTO() {
                                             Body = "Your KYC has been successfully completed. We are thankful that you selected IME London. Get rewards from us by referring your friend to the IME London App.",
                                             Title = "KYC Completion",
+                                                //Title will be set by mapping json
                                             },
                                             Address= res.Extra,
                                             DeviceType = res.Extra2
                                     }
                            }
                     };
+
                     JsonResponse dbResult1 = NotifierV2.SendNotification(request, NOTIFICATION_TYPE.PUSH_NOTIFICATION);
                 }
             }
@@ -551,7 +555,7 @@ namespace Swift.web.MobileRemit.Admin.Operation
                 {
                     Response.Redirect("/Remit/Administration/OnlineCustomer/ApprovedList.aspx");
                 }
-                
+
             }
         }
 

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

@@ -107,15 +107,6 @@ namespace Swift.web.MobileRemit.Admin.Operation
             var customLinkText = new StringBuilder();
             var kycStatus = Request.QueryString["kycStatus"];
 
-            //if (swiftLibrary.HasRight(ApproveFunctionId))
-            //{
-            //    //   var customLinkText = "&nbsp;<a class=\"btn btn-xs btn-success\" title=\"Verify\" href=\"/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx?customerId=@customerId&requestFrom=mobile&m=ap&type=verify\"><i class=\"fa fa-check\"></i></a>";
-            //    //link += "&nbsp;<a class=\"btn btn-xs btn-danger\" href=\"javascript:void(0)\" title=\"Delete\" href=\"/AgentNew/Transaction/ApproveCustomerFromMobile/EditCustomerFromMobile.aspx?customerId=@customerId&requestFrom=mobile&m=ap\"><i class=\"fa fa-check\"></i></a>";
-            //    // _grid.CustomLinkText = link;
-
-            //    //customLinkText.Append("&nbsp;<a class=\"btn btn-xs btn-primary\" title=\"Edit\" href=\"/Remit/Administration/CustomerRegistration/Manage.aspx?customerId=@customerId&MethodName=GetCustomerDetailsForEdit\"><i class=\"fa fa-pencil\"></i></a>");
-            //    customLinkText.Append("&nbsp;<a class=\"btn btn-xs btn-primary\" title=\"Edit\" href=\"/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx?customerId=@customerId&requestFrom=mobile&m=ap&type=approve\"><i class=\"fa fa-pencil\"></i></a>");
-            //}
             if (kycStatus == "NOT_COMPLETED" || kycStatus == "PROCESSING")
             {
                 customLinkText.Append("&nbsp;<a class=\"btn btn-xs btn-primary\" title=\"Edit\" href=\"/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx?customerId=@customerId&requestFrom=agent&m=ap&type=approve\"><i class=\"fa fa-pencil\"></i></a>");

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

@@ -29,27 +29,26 @@
     <script type="text/javascript">
         function CheckFormValidation() {
             debugger;
+           
             var rowId = "<%=GetRowId()%>";
-
             var customerType = $("#ddlCustomerType").val();
             alert(customerType);
             if (customerType == "All") {
                 return true;
             }
             else {
-            if (customerType != "nativeCountry") {
-
-                var customerId = $('#txtSearchData_aValue').val();
-                if (customerId == null || customerId == "") {
-                    alert('No customer selected. Please choose a customer to send broadcast message.');
-                    var reqField = "DDLBroadCastType,TXTBody,";
-                    if (ValidRequiredField(reqField) == false) {
-                        return false;
+                if (customerType != "nativeCountry") {
+                    var customerId = $('#txtSearchData_aValue').val();
+                    if (customerId == null || customerId == "") {
+                        alert('No customer selected. Please choose a customer to send broadcast message.');
+                        var reqField = "DDLBroadCastType,TXTBody,";
+                        if (ValidRequiredField(reqField) == false) {
+                            return false;
+                        }
                     }
                 }
             }
         }
-        }
 
         function GetCustomerSearchType() {
             return $("#ddlCustomerType").val();
@@ -57,7 +56,6 @@
 
         $(document).ready(function () {
             ddlNativeCountry.style.display = 'none';
-
             $('#<%=ddlCustomerType.ClientID%>').change(function () {
                 var customerType = $("#ddlCustomerType").val();
                 if (customerType === "nativeCountry") {
@@ -153,7 +151,7 @@
                                             </asp:DropDownList>
                                         </div>
                                     </div>
-                                     <div class="col-md-8">
+                                    <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">

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

@@ -35,8 +35,8 @@ namespace Swift.web.MobileRemit.Admin.PushNotification
                 //    PopulateData();
             }
         }
-
-
+      
+    
         private void PopulateData()
         {
             DataRow dr = _mobileDao.GetBroadCastData(GetStatic.GetUser(), GetRowId());
@@ -45,7 +45,7 @@ namespace Swift.web.MobileRemit.Admin.PushNotification
             {
                 return;
             }
-            //  TXTTitle.Text = dr["Title"].ToString();
+          //  TXTTitle.Text = dr["Title"].ToString();
             TXTBody.Text = HttpUtility.HtmlDecode(dr["Body"].ToString());
             msgType.Value = dr["messageType"].ToString();
         }
@@ -60,7 +60,6 @@ namespace Swift.web.MobileRemit.Admin.PushNotification
         {
             _sdd.SetDDL(ref ddlCustomerType, "exec proc_sendPageLoadData @flag='search-cust-by-for-broadcast'", "VALUE", "TEXT", "", "");
             _sl.SetDDL(ref ddlNativeCountry, "EXEC proc_online_dropDownList @flag='groupForCountry',@user='" + GetStatic.GetUser() + "'", "countryId", "countryName", "", "Select..");
-           // _sl.SetDDL(ref ddlNativeCountry, "EXEC proc_online_dropDownList @flag='groupForCountry',@user='" + GetStatic.GetUser() + "'", "rowId", "grouoName", "", "Select..");
         }
 
         protected void btnSave_Click(object sender, EventArgs e)
@@ -80,7 +79,7 @@ namespace Swift.web.MobileRemit.Admin.PushNotification
             var category = msgType.Value;
             var customerType = ddlCustomerType.SelectedValue;
             var nativeCountry = ddlNativeCountry.SelectedValue;
-
+         
 
             if (string.IsNullOrEmpty(customerId) && customerType != "nativeCountry" && customerType.ToLower() != "all")
             {
@@ -94,8 +93,6 @@ namespace Swift.web.MobileRemit.Admin.PushNotification
             }
             if (customerType == "All")
                 nativeCountry = "ALL";
-
-
             //if (string.IsNullOrEmpty(TXTTitle.Text))
             //{
             //    GetStatic.AlertMessage(this, "BroadCast Title can not be empty!");

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

@@ -164,9 +164,9 @@
                                                     <asp:Button ID="btnReset" runat="server" CssClass="btn btn-primary m-t-25" Text="Reset KYC" OnClick="reset_Click" />
                                                     <asp:Button ID="btnActivate" runat="server" CssClass="btn btn-primary m-t-25" Text="Activate" OnClick="activate_Click" />
                                                 </div>
+                                    </div>
                                             </div>
                                         </div>
-                                    </div>
                                 </div>
                             </div>
 

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

@@ -55,6 +55,7 @@ namespace Swift.web.MobileRemit.Admin.Reports
             string[] customer = txtSearchData.Value.Split('|');
             var customerId = customer[0];
             var customerSource = customer[1];
+            //var membershipId = txtSearchData.Value["membershipId"].ToString();
 
             //var source = txtSearchData.
             DataSet ds = _cd.GetCustomerRegistrationStatusReport(GetStatic.GetUser(), customerId, customerSource);
@@ -107,7 +108,7 @@ namespace Swift.web.MobileRemit.Admin.Reports
 
             if ((customerDetails.Rows[0]["createdFrom"].ToString() == "C") || (customerDetails.Rows[0]["createdFrom"].ToString() == "O"))
             {
-                if(customerDetails.Rows[0]["mobileApprovedDate"].ToString() == "")
+                if (customerDetails.Rows[0]["mobileApprovedDate"].ToString() == "")
                 {
                     btnActivate.Enabled = true;
                 }
@@ -116,6 +117,7 @@ namespace Swift.web.MobileRemit.Admin.Reports
             {
                 btnActivate.Enabled = false;
             }
+
             if (customerDetails.Rows[0]["approvedBy"].ToString() != "")
             {
                 //btnUpdate.Enabled = false;
@@ -210,13 +212,14 @@ namespace Swift.web.MobileRemit.Admin.Reports
                 GetStatic.AlertMessage(this.Page, "Customer KYC has been successfully cleared.");
             }
         }
+
         protected void activate_Click(object sender, EventArgs e)
         {
             string customerId = txtSearchData.Value.Split('|')[0];
             var custompass = PasswordGenerator.GenerateRandomPassword();
             var membershipId = Request.Form["membershipId"];
             var dbRes = _cd.ActivateMobileLogin(GetStatic.GetUser(), customerId, custompass, membershipId);
-            
+
             if (dbRes.ErrorCode == "0")
             {
                 DataRow result = _cd.GetDetailsWithPinNo(customerId, GetStatic.GetUser());
@@ -264,6 +267,6 @@ namespace Swift.web.MobileRemit.Admin.Reports
             {
                 GetStatic.AlertMessage(this, dbRes.Msg);
             }
-        }                        
+        }
     }
 }

Swift.web/MobileRemit/Agent/ApproveCustomer/EditCustomerFromMobile.aspx.cs

@@ -114,6 +114,7 @@ namespace Swift.web.MobileRemit.Agent.ApproveCustomer
         {
             return (GetStatic.GetUserType() == "HO") ? functionIdAdmin : functionIdAgent;
         }
+
         private void GetAddressDetailsByZipCode()
         {
             string zipCode = Request.Form["zipCode"];

Swift.web/Payment/trans_payment_success.aspx.cs

@@ -22,9 +22,9 @@ namespace Swift.web.Payment
                 " @orderreference = " + sl.FilterString(lblorderreference.Text) + ", @requestreference = " + sl.FilterString(requestreference)+ ", @transactionreference = " + sl.FilterString(transactionreference) + "";
 
                 DataSet ds = _remit.ExecuteDataset(sql);
+              
 
                 Utility.LogRequest(transactionreference, "TRUSTPAY", "trust_payment_success", requestreference, sql, lblorderreference.Text);
-                //Utility.LogRequest(lblorderreference.Text, "TRUSTPAY", "trust_payment_success", requestreference, sql, transactionreference);
 
                 if (ds.Tables == null || ds.Tables.Count <= 0)
                 {

Swift.web/Remit/Administration/CountrySetup/CollectionMode/List.aspx.cs

@@ -65,6 +65,7 @@ namespace Swift.web.Remit.Administration.CountrySetup.CollectionMode
                                    new TabField("Allowed Currency", "../CountryCurrency.aspx" + queryStrings),
                                    new TabField("Mobile Format", "../MobileFormat.aspx" + queryStrings),
                                    new TabField("Valid ID Setup", "../CountryIdSetup.aspx" + queryStrings),
+                                   new TabField("Promotional Rate Setup", "../PromotionalRateSetup/List.aspx" + queryStrings),
                                };
             switch (opType)
             {

Swift.web/Remit/Administration/CountrySetup/CountryCurrency.aspx.cs

@@ -87,6 +87,7 @@ namespace Swift.web.Remit.Administration.CountrySetup
                                    new TabField("Allowed Currency", "", true),
                                    new TabField("Mobile Format", "MobileFormat.aspx" + queryStrings),
                                    new TabField("Valid ID Setup", "CountryIdSetup.aspx" + queryStrings),
+                                   new TabField("Promotional Rate Setup", "PromotionalRateSetup/List.aspx" + queryStrings),
                                };
             switch (opType)
             {

Swift.web/Remit/Administration/CountrySetup/CountryIdSetup.aspx.cs

@@ -93,6 +93,7 @@ namespace Swift.web.Remit.Administration.CountrySetup
                                    new TabField("Allowed Currency", "CountryCurrency.aspx" + queryStrings),
                                    new TabField("Mobile Format", "MobileFormat.aspx" + queryStrings),
                                    new TabField("Valid ID Setup", "", true),
+                                   new TabField("Promotional Rate Setup", "PromotionalRateSetup/List.aspx" + queryStrings),
                                };
             switch (opType)
             {

Swift.web/Remit/Administration/CountrySetup/EventSetup/List.aspx.cs

@@ -64,6 +64,7 @@ namespace Swift.web.Remit.Administration.CountrySetup.EventSetup
                                    new TabField("Allowed Currency", "../CountryCurrency.aspx" + queryStrings),
                                    new TabField("Mobile Format", "../MobileFormat.aspx" + queryStrings),
                                    new TabField("Valid ID Setup", "../CountryIdSetup.aspx" + queryStrings),
+                                   new TabField("Promotional Rate Setup", "../PromotionalRateSetup/List.aspx" + queryStrings),
                                };
             switch (opType)
             {

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

@@ -73,6 +73,7 @@ namespace Swift.web.Remit.Administration.CountrySetup.EventSetup
                                    new TabField("Allowed Currency", "../CountryCurrency.aspx" + queryStrings),
                                    new TabField("Mobile Format", "../MobileFormat.aspx" + queryStrings),
                                    new TabField("Valid ID Setup", "../CountryIdSetup.aspx" + queryStrings),
+                                   new TabField("Promotional Rate Setup", "../PromotionalRateSetup/List.aspx" + queryStrings),
                                };
             switch (opType)
             {

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

@@ -95,6 +95,7 @@ namespace Swift.web.Remit.Administration.CountrySetup
                                    new TabField("Allowed Currency", "CountryCurrency.aspx" + queryStrings),
                                    new TabField("Mobile Format", "MobileFormat.aspx" + queryStrings),
                                    new TabField("Valid ID Setup", "CountryIdSetup.aspx" + queryStrings),
+                                   new TabField("Promotional Rate Setup", "PromotionalRateSetup/List.aspx" + queryStrings),
                                };
             switch (opType)
             {

Swift.web/Remit/Administration/CountrySetup/MobileFormat.aspx.cs

@@ -92,6 +92,7 @@ namespace Swift.web.Remit.Administration.CountrySetup
                                    new TabField("Allowed Currency", "CountryCurrency.aspx" + queryStrings),
                                    new TabField("Mobile Format", "", true),
                                    new TabField("Valid ID Setup", "CountryIdSetup.aspx" + queryStrings),
+                                   new TabField("Promotional Rate Setup", "PromotionalRateSetup/List.aspx" + queryStrings),
                                };
             switch (opType)
             {

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

@@ -0,0 +1,86 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="List.aspx.cs" Inherits="Swift.web.Remit.Administration.CountrySetup.PromotionalRateSetup.List" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+    <script src="../../../../js/swift_grid.js" type="text/javascript"> </script>
+    <script src="../../../../js/functions.js" type="text/javascript"> </script>
+
+    <!-- Bootstrap -->
+    <link href="../../../../ui/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
+    <!--        <link rel="stylesheet" href="css/nanoscroller.css">-->
+    <link href="../../../../ui/css/menu.css" type="text/css" rel="stylesheet" />
+    <link href="../../../../ui/css/style.css" type="text/css" rel="stylesheet" />
+    <link href="../../../../ui/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+        <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+</head>
+
+<body>
+    <form id="form1" runat="server">
+        <div class="page-wrapper">
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="page-title">
+                        <h1></h1>
+                        <ol class="breadcrumb">
+                            <li><a href="../../../../Front.aspx" target="mainFrame"><i class="fa fa-home"></i></a></li>
+                            <li><a href="#" onclick="return LoadModule('adminstration')">Administration </a></li>
+                            <li><a href="#" onclick="return LoadModule('sub_administration')">Sub_Administration</a></li>
+                            <li class="active"><a href="List.aspx">State Setup</a></li>
+                        </ol>
+                    </div>
+                </div>
+            </div>
+            <!-- end .page title-->
+
+            <!-- Nav tabs -->
+            <div class="listtabs">
+                <ul class="nav nav-tabs" role="tablist">
+                    <li role="presentation" class="deactive"><a href="List.aspx">Country List </a></li>
+                    <li role="presentation" class="active"><a href="#list" aria-controls="home" role="tab" data-toggle="tab">Manage Country</a></li>
+                </ul>
+            </div>
+            <div>
+                <label><span id="spnCname" runat="server"><%=GetCountryName()%></span></label>
+            </div>
+            <div id="divTab" runat="server">
+            </div>
+            <!-- Tab panes -->
+            <div class="tab-content">
+                <div role="tabpanel" class="tab-pane active" id="list">
+                    <div class="row">
+                        <div class="col-md-12">
+                            <div class="panel panel-default ">
+                                <!-- Start .panel -->
+                                <div class="panel-heading">
+                                    <h4 class="panel-title">Promotional Rate Setup</h4>
+                                    <div class="panel-actions">
+                                        <a href="#" class="panel-action panel-action-toggle" data-panel-toggle></a><%--<a href="#"
+                                            class="panel-action panel-action-dismiss" data-panel-dismiss></a>--%>
+                                    </div>
+                                </div>
+                                <div class="panel-body">
+                                    <div id="rpt_grid" runat="server" class="gridDiv">
+                                    </div>
+                                </div>
+                            </div>
+                            <!-- End .panel -->
+                        </div>
+                        <!--end .col-->
+                    </div>
+                    <!--end .row-->
+                </div>
+            </div>
+        </div>
+    </form>
+    <script type="text/javascript" src="../../../../ui/js/jquery.min.js"></script>
+    <script type="text/javascript" src="../../../../ui/bootstrap/js/bootstrap.min.js"></script>
+    <script type="text/javascript" src="../../../../ui/js/metisMenu.min.js"></script>
+</body>
+</html>

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

@@ -0,0 +1,154 @@
+using Swift.DAL.BL.Remit.Administration;
+using Swift.DAL.SwiftDAL;
+using Swift.web.Component.Grid;
+using Swift.web.Component.Grid.gridHelper;
+using Swift.web.Component.Tab;
+using Swift.web.Library;
+using System;
+using System.Collections.Generic;
+
+namespace Swift.web.Remit.Administration.CountrySetup.PromotionalRateSetup
+{
+    public partial class List : System.Web.UI.Page
+    {
+        private const string ViewFunctionId = "20101200";
+        private const string AddEditFunctionId = "20101210";
+        private const string DeleteFunctionId = "20101220";
+        private readonly RemittanceLibrary swiftLibrary = new RemittanceLibrary();
+        private readonly PromotionalRateDao obj = new PromotionalRateDao();
+        private readonly SwiftGrid grid = new SwiftGrid();
+        private readonly SwiftTab _tab = new SwiftTab();
+        private StaticDataDdl _sl = new StaticDataDdl();
+        private const string GridName = "grid_rate";
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Authenticate();
+                LoadTab();
+            }
+            DeleteRow();
+            LoadGrid();
+        }
+
+        protected string GetCountryName()
+        {
+            return "Country :  " + swiftLibrary.GetCountryName(GetCountryId().ToString());
+        }
+
+        protected long GetCountryId()
+        {
+            return GetStatic.ReadNumericDataFromQueryString("countryId");
+        }
+
+        private string GetOperationType()
+        {
+            return GetStatic.ReadQueryString("opType", "");
+        }
+
+        #region method
+
+        private void LoadTab()
+        {
+            var countryId = GetCountryId().ToString();
+            var opType = GetOperationType();
+
+            var queryStrings = "?countryId=" + countryId + "&opType=" + opType;
+            _tab.NoOfTabPerRow = 8;
+
+            _tab.TabList = new List<TabField>
+                               {
+                                   new TabField("Country Info", "../Manage.aspx" + queryStrings),
+                                   new TabField("State Setup", "../StateSetup/List.aspx" + queryStrings),
+                                   new TabField("Allowed Currency", "../CountryCurrency.aspx" + queryStrings),
+                                   new TabField("Mobile Format", "../MobileFormat.aspx" + queryStrings),
+                                   new TabField("Valid ID Setup", "../CountryIdSetup.aspx" + queryStrings),
+                                   new TabField("Promotional Rate Setup", "PromotionalRateSetup/List.aspx" + queryStrings, true),
+                               };
+            switch (opType)
+            {
+                case "B":
+                    _tab.TabList.Add(new TabField("Collection Mode", "../CollectionMode/List.aspx" + queryStrings));
+                    _tab.TabList.Add(new TabField("Receiving Mode", "../ReceivingMode/List.aspx" + queryStrings));
+                    break;
+
+                case "S":
+                    _tab.TabList.Add(new TabField("Collection Mode", "../CollectionMode/List.aspx" + queryStrings));
+                    break;
+
+                case "R":
+                    _tab.TabList.Add(new TabField("Receiving Mode", "../ReceivingMode/List.aspx" + queryStrings));
+                    break;
+            }
+            _tab.TabList.Add(new TabField("Event", "../EventSetup/List.aspx" + queryStrings));
+            divTab.InnerHtml = _tab.CreateTab();
+        }
+
+        private void LoadGrid()
+        {
+            grid.FilterList = new List<GridFilter>
+                                  {
+                                      new GridFilter("depositType", "Deposit Type", "T"),
+                                      //new GridFilter("stateName", "State Name:", "T")
+                                  };
+
+            grid.ColumnList = new List<GridColumn>
+                                  {
+                                      new GridColumn("depositType", "Deposit Type", "", "T"),
+                                      new GridColumn("margin", "Rate", "", "T"),
+                                      new GridColumn("purchaseRate", "Promotional Rate", "", "T")
+                                  };
+
+            bool allowAddEdit = swiftLibrary.HasRight(AddEditFunctionId);
+
+            grid.GridType = 1;
+            grid.GridDataSource = SwiftGrid.GridDS.RemittanceDB;
+            grid.GridName = GridName;
+            grid.ShowAddButton = true;
+            grid.ShowFilterForm = true;
+            grid.ShowPagingBar = true;
+
+            grid.RowIdField = "depositType";
+
+            grid.AllowEdit = swiftLibrary.HasRight(AddEditFunctionId);
+            grid.AllowDelete = swiftLibrary.HasRight(DeleteFunctionId);
+
+            grid.AddPage = "Manage.aspx?countryId=" + GetCountryId() + "&opType=" + GetOperationType();
+
+            string sql = "[proc_countryRateMaster] @flag = 'get-list', @countryId = " + GetCountryId();
+            grid.SetComma();
+
+            rpt_grid.InnerHtml = grid.CreateGrid(sql);
+        }
+
+        private void DeleteRow()
+        {
+            string id = grid.GetCurrentRowId(GridName);
+            if (string.IsNullOrEmpty(id))
+                return;
+            DbResult dbResult = obj.Delete(GetStatic.GetUser(), GetCountryId().ToString(), id);
+            ManageMessage(dbResult);
+        }
+
+        private void ManageMessage(DbResult dbResult)
+        {
+            GetStatic.SetMessage(dbResult);
+            if (dbResult.ErrorCode != "0")
+            {
+                GetStatic.PrintMessage(Page);
+            }
+            else
+            {
+                Response.Redirect("List.aspx?countryId=" + GetCountryId() + "&opType=" + GetOperationType());
+            }
+        }
+
+        private void Authenticate()
+        {
+            swiftLibrary.CheckAuthentication(ViewFunctionId);
+        }
+
+        #endregion method
+    }
+}

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

@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Swift.web.Remit.Administration.CountrySetup.PromotionalRateSetup
+{
+
+
+    public partial class List
+    {
+
+        /// <summary>
+        /// Head1 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.HtmlHead Head1;
+
+        /// <summary>
+        /// form1 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.HtmlForm form1;
+
+        /// <summary>
+        /// spnCname 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 spnCname;
+
+        /// <summary>
+        /// divTab 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 divTab;
+
+        /// <summary>
+        /// rpt_grid 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 rpt_grid;
+    }
+}

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

@@ -0,0 +1,149 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Manage.aspx.cs" Inherits="Swift.web.Remit.Administration.CountrySetup.PromotionalRateSetup.Manage" %>
+
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+    <script src="/js/swift_grid.js" type="text/javascript"> </script>
+    <script src="/js/functions.js" type="text/javascript"> </script>
+    <link href="/js/jQuery/jquery-ui.css" rel="stylesheet" type="text/css" />
+    <link href="/ui/css/menu.css" type="text/css" rel="stylesheet" />
+    <link href="/ui/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
+    <script src="../../../../js/jQuery/jquery.min.js"></script>
+    <link href="/ui/css/waves.min.css" type="text/css" rel="stylesheet" />
+    <link href="/ui/css/style.css" type="text/css" rel="stylesheet" />
+    <link href="/ui/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $("#chkPromRate").click(function () {
+                if ($(this).is(":checked")) {
+                    $("#divPromRate").show();
+                } else {
+                    $("#divPromRate").hide();
+                }
+            });
+        });
+    </script>
+
+</head>
+<body>
+    <form id="form1" runat="server">
+        <asp:ScriptManager ID="ScriptManger1" runat="server"></asp:ScriptManager>
+        <div class="page-wrapper">
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="page-title">
+                        <ol class="breadcrumb">
+                            <li><a href="../../../../Front.aspx" target="mainFrame"><i class="fa fa-home"></i></a></li>
+                            <li><a href="#" onclick="return LoadModule('adminstration')">Administration </a></li>
+                            <li><a href="#" onclick="return LoadModule('sub_administration')">Sub_Administration</a></li>
+                            <li class="active"><a href="manage.aspx">Country Setup</a></li>
+                        </ol>
+                    </div>
+                </div>
+            </div>
+            <div class="listtabs">
+                <ul class="nav nav-tabs" role="tablist">
+                    <li role="presentation" class="deactive"><a href="List.aspx">Country List </a></li>
+                    <li role="presentation" class="active"><a href="#list" aria-controls="home" role="tab" data-toggle="tab">Manage Country</a></li>
+                </ul>
+            </div>
+            <div>
+                <label><span id="spnCname" runat="server"><%=GetCountryName()%></span></label>
+            </div>
+            <div id="divTab" runat="server">
+            </div>
+            <div class="tab-content">
+                <div role="tabpanel" class="tab-pane active" id="list">
+                    <div class="row">
+                        <div class="col-md-6">
+                            <div class="panel panel-default ">
+                                <div class="panel-heading">
+                                    <h4 class="panel-title">Promotional Rate Setup
+                                    </h4>
+                                    <div class="panel-actions">
+                                        <a href="#" class="panel-action panel-action-toggle" data-panel-toggle></a>
+                                    </div>
+                                </div>
+                                <div class="panel-body">
+                                    <div class="form-group">
+                                        <label class="control-label" for="">
+                                            <span class="ErrMsg">*</span> Fileds are mendotory</label>
+                                    </div>
+                                    <div class="form-group">
+                                        <asp:Label ID="lblMsg" Font-Bold="true" ForeColor="Red" runat="server" Text=""></asp:Label>
+                                    </div>
+                                    <div class="form-group">
+                                        <label class="col-lg-3 col-md-4 control-label" for="">
+                                            Deposit Type:
+                                            <span class="errormsg">*</span>
+                                        </label>
+                                        <div class="col-lg-9 col-md-8">
+                                            <asp:DropDownList ID="depositType" runat="server" CssClass="form-control">
+                                                <asp:ListItem Value="ONLINE" Selected="true">ONLINE</asp:ListItem>
+                                                <asp:ListItem Value="DEBIT_CARD">DEBIT CARD</asp:ListItem>
+                                                <asp:ListItem Value="EBANKING">EBANKING</asp:ListItem>
+                                            </asp:DropDownList>
+                                            <asp:RequiredFieldValidator ID="RequiredFieldValidator2" runat="server" ControlToValidate="depositType" 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="">
+                                            Rate:<span class="errormsg">*</span>
+                                        </label>
+                                        <div class="col-lg-9 col-md-8">
+                                            <asp:TextBox ID="actualRate" runat="server" TextMode="SingleLine" CssClass="form-control"></asp:TextBox>
+                                            <asp:RequiredFieldValidator ID="RequiredFieldValidator1"
+                                                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:            
+                                        </label>
+                                        <div class="col-lg-9 col-md-8">
+                                            <asp:DropDownList ID="ddlStatus" CssClass="form-control" runat="server" Width="100%">
+                                                <asp:ListItem Value="Y">Yes</asp:ListItem>
+                                                <asp:ListItem Value="N">No</asp:ListItem>
+                                            </asp:DropDownList>
+                                        </div>
+                                    </div>
+                                    <div class="form-group">
+                                        <label class="col-lg-3 col-md-4 control-label">
+                                            <input type="checkbox" runat="server" id="chkPromRate" value="PromotionalRate"/>Promotional Rate</label>
+                                    </div>
+                                    <div class="form-group" id="divPromRate" runat="server" style="display: none">
+                                        <label class="col-lg-3 col-md-4 control-label" for="">
+                                            Promotional Rate: 
+                                        </label>
+                                        <div class="col-lg-9 col-md-8">
+                                            <asp:TextBox ID="promRate" CssClass="form-control" runat="server" TextMode="SingleLine"></asp:TextBox>
+                                        </div>
+                                    </div>
+                                    <div class="form-group">
+                                        <div class="col-md-8 col-md-offset-3">
+                                            <asp:Button ID="btnSumit" runat="server" Text="Submit" ValidationGroup="static" OnClick="btnSubmit_Click" class="btn btn-primary m-t-25" />
+                                            <cc1:ConfirmButtonExtender ID="btnSumitcc" runat="server"
+                                                ConfirmText="Confirm To Save ?" Enabled="True" TargetControlID="btnSumit">
+                                            </cc1:ConfirmButtonExtender>
+                                            &nbsp;
+                            <asp:Button ID="btnDelete" runat="server" Text="Delete" class="btn btn-primary m-t-25" OnClick="btnDelete_Click" />
+                                            <cc1:ConfirmButtonExtender ID="ConfirmButtonExtender1" runat="server"
+                                                ConfirmText="Are you sure to delete record ?" Enabled="True" TargetControlID="btnDelete">
+                                            </cc1:ConfirmButtonExtender>
+                                            <input type="button" id="btnBack" value=" Back " class="btn btn-primary m-t-25" onclick="Javascript: history.back(); " />
+                                        </div>
+                                    </div>
+
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+</body>
+</html>

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

@@ -0,0 +1,170 @@
+using Swift.DAL.BL.Remit.Administration;
+using Swift.DAL.SwiftDAL;
+using Swift.web.Component.Tab;
+using Swift.web.Library;
+using System;
+using System.Collections.Generic;
+using System.Data;
+
+namespace Swift.web.Remit.Administration.CountrySetup.PromotionalRateSetup
+{
+    public partial class Manage : System.Web.UI.Page
+    {
+        private const string ViewFunctionId = "20101200";
+        private const string AddEditFunctionId = "20101210";
+        private const string DeleteFunctionId = "20101220"; 
+        private readonly RemittanceLibrary _sl1 = new RemittanceLibrary();
+        private readonly PromotionalRateDao obj = new PromotionalRateDao();
+        private readonly SwiftTab _tab = new SwiftTab();
+        private StaticDataDdl _sl = new StaticDataDdl();
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Authenticate();
+                if (GetType() != "")
+                {
+                    PopulateDataById();
+                }
+                else
+                {
+                    PopulateDdl(null);
+                }
+                LoadTab();
+            }
+        }
+
+        #region QueryString
+
+        protected string GetCountryName()
+        {
+            return "Country : " + _sl1.GetCountryName(GetCountryId().ToString());
+        }
+
+        private string GetType()
+        {
+            return GetStatic.ReadQueryString("depositType", "");
+        }
+
+        protected long GetCountryId()
+        {
+            return GetStatic.ReadNumericDataFromQueryString("countryId");
+        }
+
+        private string GetOperationType()
+        {
+            return GetStatic.ReadQueryString("opType", "");
+        }
+
+        #endregion QueryString
+
+        #region Method
+
+        private void Authenticate()
+        {
+            _sl1.CheckAuthentication(ViewFunctionId + "," + AddEditFunctionId + "," + DeleteFunctionId);
+            btnDelete.Visible = _sl1.HasRight(DeleteFunctionId);
+            btnSumit.Visible = _sl1.HasRight(AddEditFunctionId);
+        }
+
+        private void LoadTab()
+        {
+            var countryId = GetCountryId().ToString();
+            var opType = GetOperationType();
+
+            var queryStrings = "?countryId=" + countryId + "&opType=" + opType;
+            _tab.NoOfTabPerRow = 8;
+
+            _tab.TabList = new List<TabField>
+                               {
+                                   new TabField("Country Info", "../Manage.aspx" + queryStrings),
+                                   new TabField("State Setup", "List.aspx" + queryStrings),
+                                   new TabField("Allowed Currency", "../CountryCurrency.aspx" + queryStrings),
+                                   new TabField("Mobile Format", "../MobileFormat.aspx" + queryStrings),
+                                   new TabField("Valid ID Setup", "../CountryIdSetup.aspx" + queryStrings),
+                                   //new TabField("Promotional Rate Setup", "PromotionalRateSetup/List.aspx" + queryStrings, true),
+                               };
+            switch (opType)
+            {
+                case "B":
+                    _tab.TabList.Add(new TabField("Collection Mode", "../CollectionMode/List.aspx" + queryStrings));
+                    _tab.TabList.Add(new TabField("Receiving Mode", "../ReceivingMode/List.aspx" + queryStrings));
+                    break;
+
+                case "S":
+                    _tab.TabList.Add(new TabField("Collection Mode", "../CollectionMode/List.aspx" + queryStrings));
+                    break;
+
+                case "R":
+                    _tab.TabList.Add(new TabField("Receiving Mode", "../ReceivingMode/List.aspx" + queryStrings));
+                    break;
+            }
+            _tab.TabList.Add(new TabField("Event", "../EventSetup/List.aspx" + queryStrings));
+            _tab.TabList.Add(new TabField("Manage", "", true));
+            divTab.InnerHtml = _tab.CreateTab();
+        }
+
+        private void PopulateDdl(DataRow dr)
+        {
+        }
+
+        private void PopulateDataById()
+        {
+            DataRow dr = obj.SelectById(GetStatic.GetUser(), GetCountryId().ToString(), GetType().ToString());
+            if (dr == null)
+                return;
+
+            depositType.Text = dr["depositType"].ToString();
+            actualRate.Text = dr["margin"].ToString();
+            
+            if(dr["purchaseRate"].ToString() != "")
+            {
+                promRate.Text = dr["purchaseRate"].ToString();
+                //chkPromRate.Checked = true;
+                divPromRate.Style["display"] = "block";
+            }
+            ddlStatus.Text = dr["isActive"].ToString();
+        }
+
+        private void Update()
+        {
+            var dbResult = obj.Update(GetStatic.GetUser(), GetCountryId().ToString(), depositType.Text, actualRate.Text, promRate.Text, ddlStatus.SelectedValue);
+            ManageMessage(dbResult);
+        }
+
+        private void DeleteRow()
+        {
+            var dbResult = obj.Delete(GetStatic.GetUser(), GetCountryId().ToString(), depositType.Text);
+            ManageMessage(dbResult);
+        }
+
+        private void ManageMessage(DbResult dbResult)
+        {
+            GetStatic.SetMessage(dbResult);
+            if (dbResult.ErrorCode == "0")
+            {
+                Response.Redirect("List.aspx?countryId=" + GetCountryId() + "&opType=" + GetOperationType());
+            }
+            else
+            {
+                GetStatic.PrintMessage(Page);
+            }
+        }
+
+        #endregion Method
+
+        #region Element Method
+
+        protected void btnSubmit_Click(object sender, EventArgs e)
+        {
+            Update();
+        }
+
+        protected void btnDelete_Click(object sender, EventArgs e)
+        {
+            DeleteRow();
+        }
+
+        #endregion Element Method
+    }
+}

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

@@ -0,0 +1,170 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Swift.web.Remit.Administration.CountrySetup.PromotionalRateSetup
+{
+
+
+    public partial class Manage
+    {
+
+        /// <summary>
+        /// Head1 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.HtmlHead Head1;
+
+        /// <summary>
+        /// form1 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.HtmlForm form1;
+
+        /// <summary>
+        /// ScriptManger1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.ScriptManager ScriptManger1;
+
+        /// <summary>
+        /// spnCname 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 spnCname;
+
+        /// <summary>
+        /// divTab 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 divTab;
+
+        /// <summary>
+        /// lblMsg 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.Label lblMsg;
+
+        /// <summary>
+        /// depositType 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 depositType;
+
+        /// <summary>
+        /// RequiredFieldValidator2 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 RequiredFieldValidator2;
+
+        /// <summary>
+        /// actualRate 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 actualRate;
+
+        /// <summary>
+        /// RequiredFieldValidator1 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 RequiredFieldValidator1;
+
+        /// <summary>
+        /// ddlStatus 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 ddlStatus;
+
+        /// <summary>
+        /// divPromRate 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 divPromRate;
+
+        /// <summary>
+        /// promRate 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 promRate;
+
+        /// <summary>
+        /// btnSumit 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.Button btnSumit;
+
+        /// <summary>
+        /// btnSumitcc control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::AjaxControlToolkit.ConfirmButtonExtender btnSumitcc;
+
+        /// <summary>
+        /// btnDelete 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.Button btnDelete;
+
+        /// <summary>
+        /// ConfirmButtonExtender1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::AjaxControlToolkit.ConfirmButtonExtender ConfirmButtonExtender1;
+    }
+}

Swift.web/Remit/Administration/CountrySetup/ReceivingMode/List.aspx.cs

@@ -67,6 +67,7 @@ namespace Swift.web.Remit.Administration.CountrySetup.ReceivingMode
                                    new TabField("Allowed Currency", "../CountryCurrency.aspx" + queryStrings),
                                    new TabField("Mobile Format", "../MobileFormat.aspx" + queryStrings),
                                    new TabField("Valid ID Setup", "../CountryIdSetup.aspx" + queryStrings),
+                                   new TabField("Promotional Rate Setup", "../PromotionalRateSetup/List.aspx" + queryStrings),
                                };
             switch (opType)
             {

Swift.web/Remit/Administration/CountrySetup/StateSetup/List.aspx.cs

@@ -69,6 +69,7 @@ namespace Swift.web.Remit.Administration.CountrySetup.StateSetup
                                    new TabField("Allowed Currency", "../CountryCurrency.aspx" + queryStrings),
                                    new TabField("Mobile Format", "../MobileFormat.aspx" + queryStrings),
                                    new TabField("Valid ID Setup", "../CountryIdSetup.aspx" + queryStrings),
+                                   new TabField("Promotional Rate Setup", "../PromotionalRateSetup/List.aspx" + queryStrings),
                                };
             switch (opType)
             {

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

@@ -84,6 +84,7 @@ namespace Swift.web.Remit.Administration.CountrySetup.StateSetup
                                    new TabField("Allowed Currency", "../CountryCurrency.aspx" + queryStrings),
                                    new TabField("Mobile Format", "../MobileFormat.aspx" + queryStrings),
                                    new TabField("Valid ID Setup", "../CountryIdSetup.aspx" + queryStrings),
+                                   new TabField("Promotional Rate Setup", "../PromotionalRateSetup/List.aspx" + queryStrings),
                                };
             switch (opType)
             {

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

@@ -52,6 +52,11 @@ 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)
@@ -222,6 +227,7 @@ namespace Swift.web.Remit.Administration.CustomerRegistration
                 }
                 membershipDiv.Visible = true;
             }
+
         }
 
         private void PopulateDdl()
@@ -549,6 +555,7 @@ namespace Swift.web.Remit.Administration.CustomerRegistration
             Response.Write(json);
             Response.End();
         }
+
         public static string DataTableToJson(DataTable table)
         {
             if (table == null)

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

@@ -155,20 +155,19 @@ namespace Swift.web.Remit.Administration.CustomerRegistration
                     }
                     };
 
-                     NotifierV2.SendNotification(request, NOTIFICATION_TYPE.EMAIL);
+                    NotifierV2.SendNotification(request, NOTIFICATION_TYPE.EMAIL);
                 }
                 catch (Exception ex)
                 {
                     GetStatic.LogError(ex);
                 
-                
-                trackingNo.Text = "";
-                GetStatic.AlertMessage(this, jsonRes.Msg);
-                string custInfo = selecteduserId + "," + GetCustomerName(selecteduserId);
-                GetStatic.CallBackJs1(Page, "customerDoc", "PopulateAutoComplete('" + custInfo + "')");
-                LoadGrid();
-                //HttpContext.Current.Session["message"] = _dbRes;
-                //Response.Redirect(Request.RawUrl);
+                    trackingNo.Text = "";
+                    GetStatic.AlertMessage(this, jsonRes.Msg);
+                    string custInfo = selecteduserId + "," + GetCustomerName(selecteduserId);
+                    GetStatic.CallBackJs1(Page, "customerDoc", "PopulateAutoComplete('" + custInfo + "')");
+                    LoadGrid();
+                    //HttpContext.Current.Session["message"] = _dbRes;
+                    //Response.Redirect(Request.RawUrl);
                 }
                 ddlMethod.ClearSelection();
                 ddlStatus.ClearSelection();
@@ -307,5 +306,6 @@ namespace Swift.web.Remit.Administration.CustomerRegistration
                 GetStatic.AlertMessage(this, dbResult.Msg);
             }
         }
+
     }
 }

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

@@ -72,9 +72,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("KYC_Status","KYC Status","","T"),
+                                      new GridColumn("RegistrationType", "Reg. Type", "", "T"),
                                       new GridColumn("createdDate","Regd. Date","","D"),
-                                      new GridColumn("Introducer","Introducer","","T"),
+                                      new GridColumn("KYC_Status","KYC Status","","T"),
                                       //new GridColumn("bankName","Bank Name","","T")  ,
                                       //new GridColumn("bankAccountNo","Account Number","","T")
                                   };
@@ -101,7 +101,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

@@ -0,0 +1,47 @@
+using Swift.DAL.SwiftDAL;
+using System.Data;
+
+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)
+        {
+            string sql = "EXEC proc_countryRateMaster";
+            sql += " @flag = 'i-rate'";
+            sql += ", @user = " + FilterString(user);
+            sql += ", @countryId = " + FilterString(countryId);
+            sql += ", @depositType = " + FilterString(depositType);
+            sql += ", @actualRate = " + FilterString(actualRate);
+            sql += ", @promRate = " + FilterString(promRate);
+            sql += ", @activeStatus = " + FilterString(activeStatus);
+            return ParseDbResult(ExecuteDataset(sql).Tables[0]);
+        }
+
+        public DbResult Delete(string user, string countryId, string depositType)
+        {
+            string sql = "EXEC proc_countryRateMaster";
+            sql += " @flag = 'delete'";
+            sql += ", @user = " + FilterString(user);
+            sql += ", @countryId = " + FilterString(countryId);
+            sql += ", @depositType = " + FilterString(depositType);
+
+            return ParseDbResult(ExecuteDataset(sql).Tables[0]);
+        }
+
+        public DataRow SelectById(string user, string countryId, string depositType)
+        {
+            string sql = "EXEC proc_countryRateMaster";
+            sql += " @flag = 'getById'";
+            sql += ", @user = " + FilterString(user);
+            sql += ", @countryId = " + FilterString(countryId);
+            sql += ", @depositType = " + FilterString(depositType);
+
+            DataSet ds = ExecuteDataset(sql);
+            if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+                return null;
+            return ds.Tables[0].Rows[0];
+        }
+
+    }
+}

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

@@ -0,0 +1,115 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Manage.aspx.cs" Inherits="Swift.web.Remit.Administration.ReferralSetup.Manage" %>
+
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+    <script src="/js/swift_grid.js" type="text/javascript"> </script>
+    <script src="/js/functions.js" type="text/javascript"> </script>
+    <link href="/js/jQuery/jquery-ui.css" rel="stylesheet" type="text/css" />
+    <link href="/ui/css/menu.css" type="text/css" rel="stylesheet" />
+    <link href="/ui/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
+    <link href="/ui/css/waves.min.css" type="text/css" rel="stylesheet" />
+    <link href="/ui/css/style.css" type="text/css" rel="stylesheet" />
+    <link href="/ui/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
+</head>
+<body>
+    <form id="form1" runat="server">
+        <asp:ScriptManager ID="sm" runat="server"></asp:ScriptManager>
+        <div class="page-wrapper">
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="page-title">
+                        <ol class="breadcrumb">
+                            <li><a href="../../../Front.aspx" target="mainFrame"><i class="fa fa-home"></i></a></li>
+                            <li><a href="#" onclick="return LoadModule('adminstration')">Mobile </a></li>
+                            <li><a href="#" onclick="return LoadModule('applicationsetting')">Mobile Setup </a></li>
+                            <li class="active"><a href="Manage.aspx">Refer Point Setup</a></li>
+                        </ol>
+                    </div>
+                </div>
+            </div>
+            <div class="listtabs">
+                <ul class="nav nav-tabs" role="tablist">
+                    <li role="presentation"><a href="ReferPointSetup.aspx" class="selected" aria-controls="home" role="tab" data-toggle="tab">Refer Point Setup List </a></li>
+                    <li role="presentation"><a href="ReferPointMasterSetup.aspx" class="selected" aria-controls="home" role="tab" data-toggle="tab">Refer Point Master Setup </a></li>
+                    <li role="presentation" class="active"><a href="#" class="selected" aria-controls="home" role="tab" data-toggle="tab">Manage Refer Point </a></li>
+                </ul>
+            </div>
+            <div class="tab-content">
+                <div role="tabpanel" class="tab-pane active" id="list">
+                    <div class="row">
+                        <div class="col-md-6">
+                            <div class="panel panel-default ">
+                                <div class="panel-heading">
+                                    <h4 class="panel-title"></h4>
+                                    <div class="panel-actions">
+                                        <a href="#" class="panel-action panel-action-toggle" data-panel-toggle></a>
+                                    </div>
+                                </div>
+                                <div class="panel-body">
+                                    <div class="form-group">
+                                        <label class="control-label" for="">
+                                            <span class="ErrMsg">*</span> Fileds are mendotory and use the own idea to input this for</label>
+                                    </div>
+                                    <div class="form-group">
+                                        <asp:Label ID="lblMsg" Font-Bold="true" ForeColor="Red" runat="server" Text=""></asp:Label>
+                                    </div>
+                                   
+                                    <div class="form-group">
+                                        <label class="col-lg-3 col-md-4 control-label" for="">
+                                            Reward Title:<span class="errormsg">*</span>
+                                        </label>
+                                        <div class="col-lg-9 col-md-8">
+                                            <asp:TextBox ID="promotionType" CssClass="form-control" runat="server" TextMode="MultiLine"></asp:TextBox>
+                                            <asp:RequiredFieldValidator ID="RequiredFieldValidator2"
+                                                runat="server" ControlToValidate="point" 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="">
+                                            Reward Point: <span class="errormsg">*</span>
+                                        </label>
+                                        <div class="col-lg-9 col-md-8">
+                                            <asp:TextBox ID="point" CssClass="form-control" runat="server" TextMode="MultiLine"></asp:TextBox>
+                                            <asp:RequiredFieldValidator ID="RequiredFieldValidator3"
+                                                runat="server" ControlToValidate="point" 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:            
+                                        </label>
+                                        <div class="col-lg-9 col-md-8">
+                                            <asp:DropDownList ID="ddlStatus" CssClass="form-control" runat="server" Width="100%">
+                                                <asp:ListItem Value="Y">Yes</asp:ListItem>
+                                                <asp:ListItem Value="N">No</asp:ListItem>
+                                            </asp:DropDownList>
+                                        </div>
+                                    </div>
+                                    <div class="form-group">
+                                        <div class="col-md-8 col-md-offset-3">
+                                            <asp:Button ID="btnSumit" runat="server" Text="Submit" ValidationGroup="static" OnClick="btnSumit_Click" class="btn btn-primary m-t-25" />
+                                            <cc1:ConfirmButtonExtender ID="btnSumitcc" runat="server"
+                                                ConfirmText="Confirm To Save ?" Enabled="True" TargetControlID="btnSumit">
+                                            </cc1:ConfirmButtonExtender>
+                                            &nbsp;
+                            <asp:Button ID="btnDelete" runat="server" Text="Delete" class="btn btn-primary m-t-25" OnClick="btnDelete_Click" />
+                                            <cc1:ConfirmButtonExtender ID="ConfirmButtonExtender1" runat="server"
+                                                ConfirmText="Are you sure to delete record ?" Enabled="True" TargetControlID="btnDelete">
+                                            </cc1:ConfirmButtonExtender>
+                                            <input type="button" id="btnBack" value=" Back " class="btn btn-primary m-t-25" onclick="Javascript: history.back(); " />
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+</body>
+</html>

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

@@ -0,0 +1,76 @@
+using Swift.DAL.BL.System.GeneralSettings;
+using Swift.DAL.SwiftDAL;
+using Swift.web.Library;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+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 readonly StaticDataDao _obj = new StaticDataDao();
+        private readonly StaticDataDdl _sl = new StaticDataDdl();
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            //Authenticate();
+            if (!IsPostBack)
+            {
+                GetStatic.SetActiveMenu(ViewFunctionId);
+
+                PopulateDataById();
+
+            }
+        }
+
+        private void PopulateDataById()
+        {
+            string rewardType = GetStatic.ReadQueryString("Promotiontype", "");
+            DataRow dr = _obj.GetDetailById(GetStatic.GetUser(), rewardType);
+            if (dr == null)
+                return;
+
+            promotionType.Text = dr["PromotionType"].ToString();
+            point.Text = dr["Points"].ToString();
+            ddlStatus.Text = dr["isActive"].ToString();
+            //PopulateDdl(dr);
+        }
+
+        protected void btnSumit_Click(object sender, EventArgs e)
+        {
+            Update();
+        } 
+
+        private void Update()
+        {
+            DbResult dbResult = _obj.UpdateByType(GetStatic.GetUser(), promotionType.Text, point.Text);
+            ManageMessage(dbResult);
+        }
+
+        private void ManageMessage(DbResult dbResult)
+        {
+            GetStatic.SetMessage(dbResult);
+            if (dbResult.ErrorCode == "0")
+            {
+                Response.Redirect("ReferPointSetup.aspx");
+            }
+            else
+            {
+                GetStatic.PrintMessage(Page);
+            }
+        }
+
+        protected void btnDelete_Click(object sender, EventArgs e)
+        {
+            _obj.DeleteByType(GetStatic.GetUser(), promotionType.Text);
+        }
+    }
+}

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

@@ -0,0 +1,134 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Swift.web.Remit.Administration.ReferralSetup
+{
+
+
+    public partial class Manage
+    {
+
+        /// <summary>
+        /// Head1 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.HtmlHead Head1;
+
+        /// <summary>
+        /// form1 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.HtmlForm form1;
+
+        /// <summary>
+        /// sm control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.ScriptManager sm;
+
+        /// <summary>
+        /// lblMsg 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.Label lblMsg;
+
+        /// <summary>
+        /// promotionType 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 promotionType;
+
+        /// <summary>
+        /// RequiredFieldValidator2 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 RequiredFieldValidator2;
+
+        /// <summary>
+        /// point 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 point;
+
+        /// <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>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.DropDownList ddlStatus;
+
+        /// <summary>
+        /// btnSumit 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.Button btnSumit;
+
+        /// <summary>
+        /// btnSumitcc control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::AjaxControlToolkit.ConfirmButtonExtender btnSumitcc;
+
+        /// <summary>
+        /// btnDelete 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.Button btnDelete;
+
+        /// <summary>
+        /// ConfirmButtonExtender1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::AjaxControlToolkit.ConfirmButtonExtender ConfirmButtonExtender1;
+    }
+}

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

@@ -0,0 +1,149 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ReferPointMasterSetup.aspx.cs" Inherits="Swift.web.Remit.Administration.ReferralSetup.ReferPointMasterSetup" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title></title>
+      <link href="../../../ui/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
+    <link href="../../../ui/css/style.css" rel="stylesheet" />
+    
+    <link href="../../../ui/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
+    <link href="../../../js/jQuery/jquery-ui.css" rel="stylesheet" />
+    <script src="../../../ui/js/jquery.min.js"></script>
+    <script src="../../../ui/js/jquery-ui.min.js"></script>
+    <script src="../../../ui/bootstrap/js/bootstrap.min.js"></script>
+    <script src="../../../js/swift_grid.js" type="text/javascript"></script>
+    <script src="../../../js/functions.js" type="text/javascript"></script>
+    <script>
+        function editAmount(pointsId) {
+            debugger
+            var params = pointsId.split(',');
+            var points = params[0];
+            var rowId = params[1];
+
+            $("#amountPopup").modal("show");
+            $("#oldAmount").val(points);
+            $('#oldAmount').attr('readonly', true);
+
+            $('#hdnRowId').val(rowId);
+        }
+
+        function ConfirmSave() {
+            debugger;
+            var newRewardAmount = $("#newAmount").val();
+            var oldRewardAmount = $("#oldAmount").val();
+            var RowId = $('#hdnRowId').val();
+            alert(RowId);
+            if (newRewardAmount == null || newRewardAmount == '') {
+                alert("Please enter the reward amount to update!!");
+                return false;
+            }
+            dataToSend = { MethodName: 'ConfirmSave', rewardAmount: newRewardAmount, oldRewardAmt: oldRewardAmount, rowId: RowId };
+            if (confirm('Do you want to update reward amount?')) {
+                $.post("", dataToSend, function (response) {
+                    var data = jQuery.parseJSON(response);
+                    if (data.ErrorCode == 0) {
+                        $("#amountPopup").modal("hide");
+                        $("#loadGrid").click();
+                        window.location.reload();
+                    }
+                    else {
+                        alert(data.Msg);
+                    }
+                });
+            }
+            return false;
+        }
+
+    </script>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div class="hidden">
+            <asp:HiddenField ID="hdnRowId" runat="server" />
+        </div>
+        <div class="page-wrapper">
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="page-title">
+                        <ol class="breadcrumb">
+                            <li><a href="../../../Front.aspx" target="mainFrame"><i class="fa fa-home"></i></a></li>
+                            <li><a href="#">Mobile</a></li>
+                            <li><a href="#">Mobile Setup</a></li>
+                            <li class="active"><a href="#">Refer Point Master Setup</a></li>
+                        </ol>
+                    </div>
+                </div>
+            </div>
+          <div class="listtabs">
+                <ul class="nav nav-tabs">
+                    <li><a href="ReferPointSetup.aspx">Refer Point Setup List</a></li>
+                    <li class="active"><a href="ReferPointMasterSetup.aspx">Refer Point Master Setup</a></li>
+                </ul>
+            </div>
+            <div class="tab-content">
+                <div role="tabpanel" class="tab-pane active" id="list">
+                    <div class="row">
+                        <div class="col-md-12">
+                            <div class="panel panel-default ">
+                                <div class="panel-heading">
+                                    <h4 class="panel-title">Refer Point Master Setup List</h4>
+                                    <div class="panel-actions">
+                                        <a href="#" class="panel-action panel-action-toggle"></a>
+                                    </div>
+                                </div>
+                                <div class="panel-body">
+                                    <div class="form-group">
+                                        <div id="rpt_grid" runat="server" enableviewstate="false"></div>
+                                    </div>
+                                </div>
+                                <div class="container-fluid">
+                            <div class="row">
+                                <div class="col-md-12">
+                                    <div class="modal fade" id="amountPopup" tabindex="-1" style="margin-top: 100px; overflow: hidden;" aria-hidden="true" data-backdrop="static" data-keyboard="false">
+                                        <div class="modal-dialog">
+                                            <div class="modal-content">
+                                                <div class="modal-header">
+                                                    <button class="close" data-dismiss="modal">&times;</button>
+                                                    <center>
+                                                        <h2 class="modal-title">Edit Reward Amount</h2>
+                                                    </center>
+                                                </div>
+                                                <div class="modal-body">
+                                                    <div class="form-inline">
+                                                        <div class="col-md-6">
+                                                            <div class="input-group input-append date">
+                                                                <h4 class="modal-title">Old Reward Amount</h4>
+                                                                <asp:TextBox ID="oldAmount" Width="250" runat="server" CssClass="form-control"></asp:TextBox>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-md-6">
+                                                            <div class="input-group input-append date">
+                                                                <h4 class="modal-title">New Reward Amount</h4>
+                                                                <asp:TextBox ID="newAmount" Width="250" runat="server" CssClass="form-control"></asp:TextBox>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <br />
+                                                <br />
+                                                <div class="modal-footer">
+                                                    <button class="btn btn-primary" onclick="return ConfirmSave()">Save</button>
+                                                    <button class="btn btn-danger" data-dismiss="modal" onclick="return Cancel()">Close</button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+</body>
+</html>

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

@@ -0,0 +1,113 @@
+using Newtonsoft.Json;
+using Swift.DAL.BL.System.GeneralSettings;
+using Swift.DAL.SwiftDAL;
+using Swift.web.Component.Grid;
+using Swift.web.Component.Grid.gridHelper;
+using Swift.web.Library;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+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 GridName = "grd_bldom";
+        private readonly SwiftGrid grid = new SwiftGrid();
+        private readonly RemittanceLibrary swiftLibrary = new RemittanceLibrary();
+        private readonly StaticDataDao _obj = new StaticDataDao();
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            //Authenticate();
+            var methodName = Request.Form["MethodName"];
+            if (!IsPostBack)
+            {
+                if (methodName == "ConfirmSave")
+                {
+                    UpdateRewardAmount();
+                }
+                GetStatic.PrintMessage(Page);
+            }
+            LoadGrid();
+        }
+        private void LoadGrid()
+        {
+            grid.FilterList = new List<GridFilter>
+                                  {
+                                    new GridFilter("Points", "Reward Points", "LT"),
+                                   // new GridFilter("is_Active","Active","T")
+                                  };
+
+            grid.ColumnList = new List<GridColumn>
+                                  {
+                                     new GridColumn("RowId", "Id", "", "T"),
+                                       new GridColumn("Points", "Reward Value", "", "T"),
+                                       new GridColumn("isActive", "Is Active", "", "T")
+                                  };
+
+            grid.GridDataSource = SwiftGrid.GridDS.RemittanceDB;
+            grid.GridName = GridName;
+            grid.GridType = 1;
+
+            grid.ShowAddButton = true;
+            grid.ShowFilterForm = true;
+            grid.ShowPagingBar = true;
+            grid.AllowEdit = false;
+            grid.SortOrder = "ASC";
+            grid.CustomLinkColumnHeader = "Action";
+            grid.AddButtonTitleText = "Add New";
+            grid.RowIdField = "RowId";
+            grid.ThisPage = "ReferPointMasterSetup.aspx";
+            grid.InputPerRow = 5;
+            grid.AllowCustomLink = true;
+            grid.AlwaysShowFilterForm = true;
+            grid.AllowEdit = false;
+            grid.AllowDelete = false;
+
+            //grid.EditText = "<a href='Manage.aspx?RowId=@detailTitle'>" + "<img src='/images/edit.gif' border='0' alt='Edit' /></a>";
+
+            //grid.AddPage = "manage.aspx?Id=" + (GetId() == 0 ? Id() : GetId()) + "";
+            var link = "&nbsp;<a class=\"btn btn-xs btn-primary\" title=\"Edit\" onclick=\"return editAmount('@Points,@RowId')\">Edit</a>";
+            grid.CustomLinkText = link;
+            grid.CustomLinkVariables = "Points,RowId";
+
+            string sql = "EXEC proc_InsertRewardPoints @flag = 'GET-MASTER'";
+            DataTable gridData = new DataTable();
+
+            grid.SetComma();
+
+            rpt_grid.InnerHtml = grid.CreateGrid(sql);
+        }
+        private void Authenticate()
+        {
+            swiftLibrary.CheckAuthentication(ViewFunctionId);
+        }
+
+        protected void UpdateRewardAmount()
+        {
+            var newPts = Request.Form["rewardAmount"];
+            var oldPts = Request.Form["oldRewardAmt"];
+            var id = Request.Form["rowId"];
+            DbResult _res = new DbResult();
+            if (!string.IsNullOrEmpty(newPts))
+            {
+                _res = _obj.UpdateById(GetStatic.GetUser(), id, newPts, oldPts);
+            }
+            else
+            {
+                GetStatic.AlertMessage(this, "Please enter email address to update!!");
+            }
+            Response.ContentType = "text/plain";
+            Response.Write(JsonConvert.SerializeObject(_res));
+            Response.End();
+
+        }
+    }
+}

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

@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Swift.web.Remit.Administration.ReferralSetup
+{
+
+
+    public partial class ReferPointMasterSetup
+    {
+
+        /// <summary>
+        /// form1 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.HtmlForm form1;
+
+        /// <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>
+        /// rpt_grid 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 rpt_grid;
+
+        /// <summary>
+        /// oldAmount 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 oldAmount;
+
+        /// <summary>
+        /// newAmount 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 newAmount;
+    }
+}

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

@@ -0,0 +1,57 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ReferPointSetup.aspx.cs" Inherits="Swift.web.Remit.Administration.ReferralSetup.ReferPointSetup" %>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title></title>
+      <link href="../../../ui/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
+    <link href="../../../ui/css/style.css" rel="stylesheet" />
+    <link href="../../../ui/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
+    <script src="../../../js/swift_grid.js" type="text/javascript"></script>
+    <script src="../../../js/functions.js" type="text/javascript"></script>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div class="page-wrapper">
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="page-title">
+                        <ol class="breadcrumb">
+                            <li><a href="../../../Front.aspx" target="mainFrame"><i class="fa fa-home"></i></a></li>
+                            <li><a href="#">Mobile</a></li>
+                            <li><a href="#">Mobile Setup</a></li>
+                            <li class="active"><a href="#">Refer Point Setup</a></li>
+                        </ol>
+                    </div>
+                </div>
+            </div>
+          <div class="listtabs">
+                <ul class="nav nav-tabs">
+                    <li class="active"><a href="ReferPointSetup.aspx">Refer Point Setup List</a></li>
+                    <li><a href="ReferPointMasterSetup.aspx">Refer Point Master Setup</a></li>
+                </ul>
+            </div>
+            <div class="tab-content">
+                <div role="tabpanel" class="tab-pane active" id="list">
+                    <div class="row">
+                        <div class="col-md-12">
+                            <div class="panel panel-default ">
+                                <div class="panel-heading">
+                                    <h4 class="panel-title">Refer Point Setup List</h4>
+                                    <div class="panel-actions">
+                                        <a href="#" class="panel-action panel-action-toggle"></a>
+                                    </div>
+                                </div>
+                                <div class="panel-body">
+                                    <div class="form-group">
+                                        <div id="rpt_grid" runat="server" enableviewstate="false"></div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+</body>
+</html>

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

@@ -0,0 +1,80 @@
+using Swift.web.Component.Grid;
+using Swift.web.Component.Grid.gridHelper;
+using Swift.web.Library;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+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 GridName = "grd_bldom";
+        private readonly SwiftGrid grid = new SwiftGrid();
+        private readonly RemittanceLibrary swiftLibrary = new RemittanceLibrary();
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            //Authenticate();
+            if (!IsPostBack)
+            {
+                GetStatic.PrintMessage(Page);
+            }
+            LoadGrid();
+        }
+        private void LoadGrid()
+        {
+            grid.FilterList = new List<GridFilter>
+                                  {
+                                    new GridFilter("PromotionType", "Reward Type", "LT"),
+                                   // new GridFilter("is_Active","Active","T")
+                                  };
+
+            grid.ColumnList = new List<GridColumn>
+                                  {
+                                     new GridColumn("RowId", "Id", "", "T"),
+                                       new GridColumn("PromotionType", "Reward Type", "", "T"),
+                                       new GridColumn("Points", "Reward Value", "", "T"),
+                                       new GridColumn("IsActive", "Is Active", "", "T")
+                                  };
+
+            bool allowAddEdit = swiftLibrary.HasRight(AddEditFunctionId);
+            grid.GridDataSource = SwiftGrid.GridDS.RemittanceDB;
+            grid.GridName = GridName;
+            grid.GridType = 1;
+
+            grid.ShowAddButton = true;
+            grid.ShowFilterForm = true;
+            grid.ShowPagingBar = true;
+            grid.AddButtonTitleText = "Add New";
+            grid.RowIdField = "PromotionType";
+            grid.AddPage = "Manage.aspx";
+            grid.InputPerRow = 5;
+            grid.AlwaysShowFilterForm = true;
+            grid.AllowEdit = true;
+            grid.AllowEdit = allowAddEdit;
+            grid.AllowDelete = false;
+            grid.CustomLinkVariables = "PromotionType";
+            //grid.EditText = "<a href='Manage.aspx?promotiontype=@detailTitle'>" + "<img src='/images/edit.gif' border='0' alt='Edit' /></a>";
+            grid.CustomLinkText = "<a href='Manage.aspx?Promotiontype=@PromotionType'>" + "<img src='/images/edit.gif' border='0' alt='Edit' /></a>";
+
+            //grid.AddPage = "manage.aspx?Id=" + (GetId() == 0 ? Id() : GetId()) + "";
+            string sql = "EXEC proc_InsertRewardPoints @flag = 'GET'";
+            //string sql = "EXEC proc_staticDataValue @flag = 's', @typeId = '8106'";
+            DataTable gridData = new DataTable();
+
+            grid.SetComma();
+
+            rpt_grid.InnerHtml = grid.CreateGrid(sql);
+        }
+        private void Authenticate()
+        {
+            swiftLibrary.CheckAuthentication(ViewFunctionId);
+        }
+    }
+}

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

@@ -0,0 +1,35 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Swift.web.Remit.Administration.ReferralSetup
+{
+
+
+    public partial class ReferPointSetup
+    {
+
+        /// <summary>
+        /// form1 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.HtmlForm form1;
+
+        /// <summary>
+        /// rpt_grid 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 rpt_grid;
+    }
+}

Swift.web/Remit/Compliance/ApproveOFACandComplaince/Dashboard.aspx.cs

@@ -54,6 +54,7 @@ namespace Swift.web.Remit.Compliance.ApproveOFACandComplaince
                 }
                 sbHead.Append("</table>");
                 txnSummary.InnerHtml = sbHead.ToString();
+               
             }
         }
 

Swift.web/Remit/Compliance/ApproveOFACandComplaince/List.aspx.cs

@@ -40,7 +40,7 @@ namespace Swift.web.Remit.Compliance.ApproveOFACandComplaince
 
             grid.ColumnList = new List<GridColumn>
                                   {
-                                       new GridColumn("tranId",  "Tran Id", "", "T"),
+                                      new GridColumn("tranId",  "Tran Id", "", "T"),
                                       new GridColumn("controlNo", "Control No", "", "T"),
                                       new GridColumn("branchName", "Sending Branch", "", "T"),
                                       new GridColumn("type", "Type", "", "T"),
@@ -72,6 +72,7 @@ namespace Swift.web.Remit.Compliance.ApproveOFACandComplaince
             grid.AllowCustomLink = false;
 
             string sql = "[proc_approveOFACCompliance] @flag = 's', @tranType=" + swiftLibrary.FilterString(GetStatic.ReadQueryString("tranType", "")) + ", @kycstatus=" + swiftLibrary.FilterString(GetStatic.ReadQueryString("kycstatus", ""));
+
             grid.SetComma();
 
             rpt_grid.InnerHtml = grid.CreateGrid(sql);

Swift.web/Remit/OFACManagement/Import.aspx.cs

@@ -316,13 +316,6 @@ namespace Swift.web.Remit.OFACManagement
 
         protected void btnFileUpload_Click(object sender, EventArgs e)
         {
-            //string xmlContent = GetUNSCRData("sample");
-            //var dbResult = obj.UpdateAQList(GetStatic.GetUser(), xmlContent, "sample.xml", "UNSCR");
-            //ManageMessage(dbResult);
-            //DivMessage.InnerHtml = dbResult.Msg;
-
-            //LoadAQLogGrid();
-
             try
             {
                 

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

@@ -91,6 +91,7 @@ namespace Swift.web.Remit.Transaction.ApproveTxn
                 {
                     GetStatic.AlertMessage(Page, _dbRes.ErrorCode + " " + _dbRes.Msg);
                     GetStatic.CallJSFunction(Page, "window.returnValue = true; window.close();");
+                    
                     LoadTransaction();
                     return;
                 }

Swift.web/Remit/Transaction/ApproveTxn/holdTxnListMobile.aspx.cs

@@ -178,6 +178,7 @@ namespace Swift.web.Remit.Transaction.ApproveTxn
                             //sb.Append("&nbsp;<input type = 'button' class='btn btn-primary m-t-25' onclick = \"ViewDetails(" + dr["id"].ToString() + ");\" value = 'Approve' id = 'btn_" + dr["id"].ToString() + "' showDocPanel = 'N'  />");
                             sb.Append("&nbsp;<input type='button' class='btn btn-primary m-t-25' onclick=\"window.location.href='Manage.aspx?id=" + dr["id"].ToString() + "&showDocPanel=N';\" value='Approve' id='btn_" + dr["id"].ToString() + "' showDocPanel='N' />");
 
+                        //if (allowReject)
                         sb.Append("&nbsp;<input type = 'button' class='btn btn-primary m-t-25' onclick = \"Reject(" + dr["id"].ToString() + ");\" value = 'Reject' id = 'btn_r_" + dr["id"].ToString() + "' />");
 
                         sb.Append("</td>");

Swift.web/Remit/Transaction/Modify/ModifyTran.aspx

@@ -159,13 +159,16 @@
             GetElement("<%=btnReloadDetail.ClientID %>").click();
         }
         return false;
-    }
+    } 
+
     function EditPaymentMode(label, fieldName, oldValue, tranId, pCountry) {
         var url = "ModifyField.aspx?label=" + label +
             "&fieldName=" + fieldName +
             "&oldValue=" + oldValue +
             "&tranId=" + tranId +
             "&pCountry=" + pCountry;
+
+
         var id = PopUpWindow(url, "");
         if (id == "undefined" || id == null || id == "") {
         }

Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx.cs

@@ -80,7 +80,7 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
         private void PopulateDll()
         {
             sdd.SetDDL3(ref payoutPartner, "EXEC proc_dropDownLists @flag='partner-list'", "agentId", "agentName", "", "All");
-            sl.SetDDL(ref depositType, "EXEC proc_online_dropDownList @flag='paymentMode',@user='" + GetStatic.GetUser() + "'", "detailDesc", "detailTitle", "", "All");
+            sl.SetDDL(ref depositType, "EXEC proc_online_dropDownList @flag='paymentMode',@user='" + GetStatic.GetUser() + "'", "detailTitle", "detailTitle", "", "All");
             sl.SetDDL(ref ddlPCountry, "EXEC proc_dropDownLists @flag='pCountry'", "countryId", "countryName", "", "All");
             sl.SetDDL(ref paymentType, "EXEC proc_online_dropDownList @flag='paymentType'", "detailDesc", "detailTitle", "", "All");
             sl.SetDDL(ref transactionFrom, "EXEC proc_online_dropDownList @flag='transactionFrom'", "detailDesc", "detailTitle", "", "All");

Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx

@@ -1,6 +1,7 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TranReport.aspx.cs" Inherits="Swift.web.Remit.Transaction.Reports.TransactionNew.TranReport" %>
 
 <%@ Import Namespace="Swift.web.Library" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -19,8 +20,8 @@
     <style>
         table.table-bordered,
         table.table-bordered th,
-        table.table-bordered td{
-            border: 2px solid #000 !important; 
+        table.table-bordered td {
+            border: 2px solid #000 !important;
         }
 
         .paystatus-Paid {
@@ -35,14 +36,17 @@
         .paystatus-Cancel {
             background-color: red;
         }
+
         .paystatus-ofac {
             color: white;
             background-color: darkred;
         }
+
         .paystatus-compliance {
             color: white;
             background-color: darkred;
         }
+
         .exportImg {
             padding-left: 26px;
             padding-top: 10px;
@@ -52,6 +56,7 @@
         if (GetStatic.ReadQueryString("mode", "") == "")
         {
     %>
+
     <% }%>
 </head>
 <body>

Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs

@@ -222,8 +222,6 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
                     return "paystatus-Cancel";
                 case "ofac hold":
                     return "paystatus-ofac";
-                case "compliance":
-                    return "paystatus-compliance";
                 case "compliance hold":
                     return "paystatus-compliance";
                 case "ofac/compliance hold":

Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.designer.cs

@@ -24,7 +24,15 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
 
         /// <summary>
+        /// exportDiv 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 exportDiv;
+
+        /// <summary>
         /// rpt_grid control.
         /// </summary>
         /// <remarks>

Swift.web/Remit/Transaction/VerifyMobileTransaction/VerifyMobileTransaction.aspx

@@ -22,9 +22,9 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.mask/1.14.15/jquery.mask.min.js" type="text/javascript"></script>
 
     <style>
-        .select2-container--default .select2-results > .select2-results__options {
-            max-height: 70px !important;
-        }
+    .select2-container--default .select2-results>.select2-results__options{
+    max-height: 70px !important;
+}
     </style>
     <script language="javascript" type="text/javascript">
 
@@ -194,7 +194,7 @@
                     if (data.ErrorCode == 0) {
                         alert(data.Msg);
                         $("#myModal2").modal('hide');
-                        //  CheckAvailableBalance($("input[name='chkCollMode']:checked").val());
+                      //  CheckAvailableBalance($("input[name='chkCollMode']:checked").val());
                         $("#loadGrid").click();
                     } else {
                         alert(data.Msg);
@@ -231,7 +231,7 @@
             return false;
         }
         function Verify(id, cAmt, cAmtByUser, controlNo, depositType) {
-
+            
             //if (collMode == "Cash Collect") {
             //    if (cAmt != cAmtByUser) {
             //        alert("Collected amount by user and actual amount is not equal!!!");

Swift.web/Remit/UserControl/UcTransaction.ascx.cs

@@ -865,6 +865,7 @@ namespace Swift.web.Remit.UserControl
         public string GetPaymentMode(string label, string fieldName, DataRow dr)
         {
             string fieldValue = dr[fieldName].ToString().Trim();
+
             var str = "<a href=# title='Edit Record'><div class = \"link\" onclick = \"EditPaymentMode('" + label + "', '" + fieldName + "', '" + fieldValue + "','" + hddTranId.Value + "','" + dr["rCountryName"] + "')\">" +
               fieldValue + "<img border=0 src=\"/Images/edit.gif\"/></a></div>";
             return str;
@@ -2121,7 +2122,7 @@ namespace Swift.web.Remit.UserControl
                                     {
                                             NotificationContent =  new NotificationDTO() {
                                             Body = comments,
-                                            Title = "IME LONDON",
+                                            Title = "JME",
                                              MessageType = "INFO",
                                               ClickActivity = "OPEN_ACTIVITY_NOTIFICATION"
                                             },

Swift.web/RemittanceSystem/RemittanceReports/RejectTransactionReport/Mange.aspx

@@ -62,6 +62,7 @@
             } else {
                 isOnlineTxn = "";
             }
+
             var url = "../../../RemittanceSystem/RemittanceReports/Reports.aspx?reportName=rejectedReport" +
                 "&from=" + fromDate +
                 "&to=" + toDate +

Swift.web/Swift.web.csproj

@@ -13,7 +13,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Swift.web</RootNamespace>
     <AssemblyName>Swift.web</AssemblyName>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
@@ -455,6 +455,8 @@
     <Content Include="BillVoucher\VoucherEntryWithTax\VoucherEntry.aspx" />
     <Content Include="BillVoucher\VoucherEntry\VoucherEntry.aspx" />
     <Content Include="BillVoucher\VoucherUpload\Upload.aspx" />
+    <Content Include="bin\UAParser.dll" />
+    <Content Include="bin\UAParser.xml" />
     <Content Include="Common\JPPost.css" />
     <Content Include="Common\JPPostKYCInquiry.aspx" />
     <Content Include="content\images\Jcrop.gif" />
@@ -463,6 +465,7 @@
     <Content Include="content\jquery.Jcrop.min.css" />
     <Content Include="css\Crop\jquery.Jcrop.css" />
     <Content Include="css\Crop\jquery.Jcrop.min.css" />
+    <Content Include="css\currency-flags.min.css" />
     <Content Include="css\images\watermarkNew.png" />
     <Content Include="css\receipt.css" />
     <Content Include="css\receiver.css" />
@@ -1109,6 +1112,8 @@
     <Content Include="Images\countryflag\USD.png" />
     <Content Include="Images\countryflag\VN.png" />
     <Content Include="Images\countryflag\VND.png" />
+    <Content Include="Images\ime-london-logo-receipt.png" />
+    <Content Include="Images\ime-london-logo.png" />
     <Content Include="Images\jme.png" />
     <Content Include="Images\luckydraw\btn.jpg" />
     <Content Include="Images\luckydraw\btn_new.jpg" />
@@ -1366,6 +1371,8 @@
     <Content Include="RemittanceSystem\RemittanceReports\WeekRegulatoryReport\TestReport.aspx" />
     <Content Include="RemittanceSystem\RemittanceReports\WeekRegulatoryReport\UntransactedListv1.aspx" />
     <Content Include="RemittanceSystem\RemittanceReports\WeekRegulatoryReport\WeekRegulatoryReport.aspx" />
+    <Content Include="Remit\Administration\CountrySetup\PromotionalRateSetup\List.aspx" />
+    <Content Include="Remit\Administration\CountrySetup\PromotionalRateSetup\Manage.aspx" />
     <Content Include="Remit\Administration\CustomerRegistration\DocumentCrop.aspx" />
     <Content Include="Remit\Administration\CustomerRegistration\Manage.aspx" />
     <Content Include="Remit\Administration\DeleteCustomer\DeleteCustomer.aspx" />
@@ -1374,6 +1381,9 @@
     <Content Include="Remit\Administration\LawsonCardDeposit\List.aspx" />
     <Content Include="Remit\Administration\LawsonCardDeposit\Manage.aspx" />
     <Content Include="Remit\Administration\LawsonCardDeposit\MapLawsonDeposits.aspx" />
+    <Content Include="Remit\Administration\ReferralSetup\Manage.aspx" />
+    <Content Include="Remit\Administration\ReferralSetup\ReferPointMasterSetup.aspx" />
+    <Content Include="Remit\Administration\ReferralSetup\ReferPointSetup.aspx" />
     <Content Include="Remit\AgeingReport\AgeingReportNew\ReceivablesAgeingNew.aspx" />
     <Content Include="Remit\AgeingReport\AgeingReportNew\SearchReceivableAgeingNew.aspx" />
     <Content Include="Remit\AgeingReport\OutstandingReport.aspx" />
@@ -1391,6 +1401,7 @@
     <Content Include="Remit\Transaction\TroubleTicket\UnResolvedList.aspx" />
     <Content Include="Remit\Transaction\VerifyMobileTransaction\VerifyMobileTransaction.aspx" />
     <Content Include="SwiftSystem\ReceivePageFieldSetup\FieldSetup.aspx" />
+    <Content Include="ui\index\images\ime-london.ico" />
     <Content Include="ui\js\select\css\select2.css" />
     <Content Include="ui\js\select\css\select2.min.css" />
     <Content Include="ui\js\select\js\select2.full.js" />
@@ -5614,6 +5625,20 @@
     <Compile Include="Remit\Administration\ChangeReferral\Manage.aspx.designer.cs">
       <DependentUpon>Manage.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Remit\Administration\CountrySetup\PromotionalRateSetup\List.aspx.cs">
+      <DependentUpon>List.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Remit\Administration\CountrySetup\PromotionalRateSetup\List.aspx.designer.cs">
+      <DependentUpon>List.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Remit\Administration\CountrySetup\PromotionalRateSetup\Manage.aspx.cs">
+      <DependentUpon>Manage.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Remit\Administration\CountrySetup\PromotionalRateSetup\Manage.aspx.designer.cs">
+      <DependentUpon>Manage.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Remit\Administration\CustomerDepositMapping\MapCustomerDeposits.aspx.cs">
       <DependentUpon>MapCustomerDeposits.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -6889,6 +6914,27 @@
       <DependentUpon>ViewDetail.aspx</DependentUpon>
     </Compile>
     <Compile Include="Remit\Administration\PaymentModeDao.cs" />
+    <Compile Include="Remit\Administration\ReferralSetup\Manage.aspx.cs">
+      <DependentUpon>Manage.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Remit\Administration\ReferralSetup\Manage.aspx.designer.cs">
+      <DependentUpon>Manage.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Remit\Administration\ReferralSetup\ReferPointMasterSetup.aspx.cs">
+      <DependentUpon>ReferPointMasterSetup.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Remit\Administration\ReferralSetup\ReferPointMasterSetup.aspx.designer.cs">
+      <DependentUpon>ReferPointMasterSetup.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Remit\Administration\ReferralSetup\ReferPointSetup.aspx.cs">
+      <DependentUpon>ReferPointSetup.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Remit\Administration\ReferralSetup\ReferPointSetup.aspx.designer.cs">
+      <DependentUpon>ReferPointSetup.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Remit\Administration\ServiceTypeDao.cs" />
     <Compile Include="Remit\Administration\ServiceTypeSetup\List.aspx.cs">
       <DependentUpon>List.aspx</DependentUpon>
@@ -6904,6 +6950,7 @@
     <Compile Include="Remit\Administration\ServiceTypeSetup\Manage.aspx.designer.cs">
       <DependentUpon>Manage.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Remit\Administration\PromotionalRateDao.cs" />
     <Compile Include="Remit\Administration\StateDao.cs" />
     <Compile Include="Remit\Administration\UserDao.cs" />
     <Compile Include="Remit\Administration\VisaCardDetail\VisaCardDao.cs" />

Swift.web/doc/tmp/UK_Sanctions_List_Sample.xml

@@ -0,0 +1,254 @@
+<?xml version="1.0"?>
+<Designations xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <DateGenerated>10/08/2023</DateGenerated>
+  <Designation>
+    <LastUpdated>18/12/2021</LastUpdated>
+    <DateDesignated>23/02/2001</DateDesignated>
+    <UniqueID>AFG0009</UniqueID>
+    <OFSIGroupID>7022</OFSIGroupID>
+    <UNReferenceNumber>TAi.005</UNReferenceNumber>
+    <Names>
+      <Name>
+        <Name1>Muhammad</Name1>
+        <Name2>Taher</Name2>
+        <Name6>Anwari</Name6>
+        <NameType>Primary Name</NameType>
+      </Name>
+      <Name>
+        <Name1>Mohammad</Name1>
+        <Name2>Taher</Name2>
+        <Name6>Anwari</Name6>
+        <NameType>Alias</NameType>
+        <AliasStrength>Good quality a.k.a</AliasStrength>
+      </Name>
+      <Name>
+        <Name1>Mohammad</Name1>
+        <Name2>Tahre</Name2>
+        <Name6>Anwari</Name6>
+        <NameType>Alias</NameType>
+        <AliasStrength>Good quality a.k.a</AliasStrength>
+      </Name>
+      <Name>
+        <Name1>Muhammad</Name1>
+        <Name2>Tahir</Name2>
+        <Name6>Anwari</Name6>
+        <NameType>Alias</NameType>
+        <AliasStrength>Good quality a.k.a</AliasStrength>
+      </Name>
+      <Name>
+        <Name6>Mudir</Name6>
+        <NameType>Alias</NameType>
+        <AliasStrength>Low quality a.k.a</AliasStrength>
+      </Name>
+    </Names>
+    <NonLatinNames>
+      <NonLatinName>
+        <NameNonLatinScript>محمد طاهر أنوري</NameNonLatinScript>
+      </NonLatinName>
+    </NonLatinNames>
+    <Titles>
+      <Title>Mullah</Title>
+      <Title>Haji</Title>
+    </Titles>
+    <RegimeName>The Afghanistan (Sanctions) (EU Exit) Regulations 2020</RegimeName>
+    <IndividualEntityShip>Individual</IndividualEntityShip>
+    <DesignationSource>UN</DesignationSource>
+    <SanctionsImposed>Asset freeze|Travel Ban</SanctionsImposed>
+    <SanctionsImposedIndicators>
+      <AssetFreeze>true</AssetFreeze>
+      <ArmsEmbargo>false</ArmsEmbargo>
+      <TargetedArmsEmbargo>false</TargetedArmsEmbargo>
+      <CharteringOfShips>false</CharteringOfShips>
+      <ClosureOfRepresentativeOffices>false</ClosureOfRepresentativeOffices>
+      <CrewServicingOfShipsAndAircraft>false</CrewServicingOfShipsAndAircraft>
+      <Deflag>false</Deflag>
+      <PreventionOfBusinessArrangements>false</PreventionOfBusinessArrangements>
+      <ProhibitionOfPortEntry>false</ProhibitionOfPortEntry>
+      <TravelBan>true</TravelBan>
+      <PreventionOfCharteringOfShips>false</PreventionOfCharteringOfShips>
+      <PreventionOfCharteringOfShipsAndAircraft>false</PreventionOfCharteringOfShipsAndAircraft>
+      <TechnicalAssistanceRelatedToAircraft>false</TechnicalAssistanceRelatedToAircraft>
+      <TrustServicesSanctions>false</TrustServicesSanctions>
+    </SanctionsImposedIndicators>
+    <OtherInformation>Belongs to Andar tribe. Review pursuant to Security Council resolution 1822 (2008) was concluded on 23 Jul. 2010. INTERPOL-UN Security Council Special Notice web link: https://www.interpol.int/en/How-we-work/Notices/View-UNNotices-Individuals click here</OtherInformation>
+    <UKStatementofReasons>
+</UKStatementofReasons>
+    <IndividualDetails>
+      <Individual>
+        <DOBs>
+          <DOB>dd/mm/1961</DOB>
+        </DOBs>
+        <Nationalities>
+          <Nationality>Afghanistan</Nationality>
+        </Nationalities>
+        <Positions>
+          <Position>Director of Administrative Affairs under the Taliban regime</Position>
+          <Position>Minister of Finance under the Taliban regime</Position>
+        </Positions>
+        <BirthDetails>
+          <Location>
+            <TownOfBirth>Zurmat District, Paktia Province</TownOfBirth>
+            <CountryOfBirth>Afghanistan</CountryOfBirth>
+          </Location>
+        </BirthDetails>
+      </Individual>
+    </IndividualDetails>
+  </Designation>
+  <Designation>
+    <LastUpdated>18/12/2021</LastUpdated>
+    <DateDesignated>31/01/2001</DateDesignated>
+    <UniqueID>AFG0010</UniqueID>
+    <OFSIGroupID>7167</OFSIGroupID>
+    <UNReferenceNumber>TAi.006</UNReferenceNumber>
+    <Names>
+      <Name>
+        <Name1>SAYYED MOHAMMED</Name1>
+        <Name6>HAQQANI</Name6>
+        <NameType>Primary Name</NameType>
+      </Name>
+      <Name>
+        <Name1>Sayyed</Name1>
+        <Name2>Mohammad</Name2>
+        <Name6>HAQQANI</Name6>
+        <NameType>Alias</NameType>
+        <AliasStrength>Good quality a.k.a</AliasStrength>
+      </Name>
+    </Names>
+    <NonLatinNames>
+      <NonLatinName>
+        <NameNonLatinScript>سيد محمد حقانی</NameNonLatinScript>
+      </NonLatinName>
+    </NonLatinNames>
+    <Titles>
+      <Title>Mullah</Title>
+    </Titles>
+    <RegimeName>The Afghanistan (Sanctions) (EU Exit) Regulations 2020</RegimeName>
+    <IndividualEntityShip>Individual</IndividualEntityShip>
+    <DesignationSource>UN</DesignationSource>
+    <SanctionsImposed>Asset freeze|Travel Ban</SanctionsImposed>
+    <SanctionsImposedIndicators>
+      <AssetFreeze>true</AssetFreeze>
+      <ArmsEmbargo>false</ArmsEmbargo>
+      <TargetedArmsEmbargo>false</TargetedArmsEmbargo>
+      <CharteringOfShips>false</CharteringOfShips>
+      <ClosureOfRepresentativeOffices>false</ClosureOfRepresentativeOffices>
+      <CrewServicingOfShipsAndAircraft>false</CrewServicingOfShipsAndAircraft>
+      <Deflag>false</Deflag>
+      <PreventionOfBusinessArrangements>false</PreventionOfBusinessArrangements>
+      <ProhibitionOfPortEntry>false</ProhibitionOfPortEntry>
+      <TravelBan>true</TravelBan>
+      <PreventionOfCharteringOfShips>false</PreventionOfCharteringOfShips>
+      <PreventionOfCharteringOfShipsAndAircraft>false</PreventionOfCharteringOfShipsAndAircraft>
+      <TechnicalAssistanceRelatedToAircraft>false</TechnicalAssistanceRelatedToAircraft>
+      <TrustServicesSanctions>false</TrustServicesSanctions>
+    </SanctionsImposedIndicators>
+    <OtherInformation>Graduate of the Haqqaniya madrasa in Akora Khattak, Pakistan. Believed to have had close relations with Taliban Leader Mullah Mohammed Omar (TAi.004). Believed to be in Afghanistan/Pakistan border area. Member of Taliban Supreme Council as at June 2010. Belongs to Barakzai tribe. Review pursuant to Security Council resolution 1822 (2008) was concluded on 27 Jul. 2010. Photo available for inclusion in the INTERPOL-UN Security Council Special Notice. Reportedly deceased as of January 2016. INTERPOL-UN Security Council Special Notice web link: https://www.interpol.int/en/How-we-work/Notices/View-UN-Notices-Individuals click here</OtherInformation>
+    <UKStatementofReasons>
+</UKStatementofReasons>
+    <IndividualDetails>
+      <Individual>
+        <DOBs>
+          <DOB>dd/mm/1965</DOB>
+        </DOBs>
+        <Nationalities>
+          <Nationality>Afghanistan</Nationality>
+        </Nationalities>
+        <Positions>
+          <Position>Director of Administrative Affairs under the Taliban regime</Position>
+          <Position>Head of Information and Culture in Kandahar Province under the Taliban regime</Position>
+        </Positions>
+        <BirthDetails>
+          <Location>
+            <TownOfBirth>Chaharbagh village, Arghandab District, Kandahar Province</TownOfBirth>
+            <CountryOfBirth>Afghanistan</CountryOfBirth>
+          </Location>
+        </BirthDetails>
+      </Individual>
+    </IndividualDetails>
+  </Designation>
+  <Designation>
+    <LastUpdated>18/12/2021</LastUpdated>
+    <DateDesignated>31/01/2001</DateDesignated>
+    <UniqueID>AFG0011</UniqueID>
+    <OFSIGroupID>7270</OFSIGroupID>
+    <UNReferenceNumber>TAi.007</UNReferenceNumber>
+    <Names>
+      <Name>
+        <Name1>ABDUL</Name1>
+        <Name2>LATIF</Name2>
+        <Name6>MANSUR</Name6>
+        <NameType>Primary Name</NameType>
+      </Name>
+      <Name>
+        <Name1>Abdul</Name1>
+        <Name2>Latif</Name2>
+        <Name6>MANSOOR</Name6>
+        <NameType>Alias</NameType>
+        <AliasStrength>Good quality a.k.a</AliasStrength>
+      </Name>
+      <Name>
+        <Name1>Wali</Name1>
+        <Name6>MOHAMMAD</Name6>
+        <NameType>Alias</NameType>
+        <AliasStrength>Good quality a.k.a</AliasStrength>
+      </Name>
+    </Names>
+    <NonLatinNames>
+      <NonLatinName>
+        <NameNonLatinScript>عبد اللطيف منصور</NameNonLatinScript>
+      </NonLatinName>
+    </NonLatinNames>
+    <Titles>
+      <Title>Maulavi</Title>
+    </Titles>
+    <RegimeName>The Afghanistan (Sanctions) (EU Exit) Regulations 2020</RegimeName>
+    <IndividualEntityShip>Individual</IndividualEntityShip>
+    <DesignationSource>UN</DesignationSource>
+    <SanctionsImposed>Asset freeze|Travel Ban</SanctionsImposed>
+    <SanctionsImposedIndicators>
+      <AssetFreeze>true</AssetFreeze>
+      <ArmsEmbargo>false</ArmsEmbargo>
+      <TargetedArmsEmbargo>false</TargetedArmsEmbargo>
+      <CharteringOfShips>false</CharteringOfShips>
+      <ClosureOfRepresentativeOffices>false</ClosureOfRepresentativeOffices>
+      <CrewServicingOfShipsAndAircraft>false</CrewServicingOfShipsAndAircraft>
+      <Deflag>false</Deflag>
+      <PreventionOfBusinessArrangements>false</PreventionOfBusinessArrangements>
+      <ProhibitionOfPortEntry>false</ProhibitionOfPortEntry>
+      <TravelBan>true</TravelBan>
+      <PreventionOfCharteringOfShips>false</PreventionOfCharteringOfShips>
+      <PreventionOfCharteringOfShipsAndAircraft>false</PreventionOfCharteringOfShipsAndAircraft>
+      <TechnicalAssistanceRelatedToAircraft>false</TechnicalAssistanceRelatedToAircraft>
+      <TrustServicesSanctions>false</TrustServicesSanctions>
+    </SanctionsImposedIndicators>
+    <OtherInformation>Taliban Shadow Governor for Logar Province as of late 2012. Believed to be in Afghanistan/Pakistan border area. Belongs to Sahak tribe (Ghilzai). Review pursuant to Security Council resolution 1822 (2008) was concluded on 27 Jul. 2010. INTERPOL-UN Security Council Special Notice web link: https://www.interpol.int/en/How-we-work/Notices/View-UN-Notices-Individuals click here</OtherInformation>
+    <UKStatementofReasons>
+</UKStatementofReasons>
+    <IndividualDetails>
+      <Individual>
+        <DOBs>
+          <DOB>dd/mm/1968</DOB>
+        </DOBs>
+        <Nationalities>
+          <Nationality>Afghanistan</Nationality>
+        </Nationalities>
+        <Positions>
+          <Position>Minister of Agriculture under the Taliban regime</Position>
+        </Positions>
+        <BirthDetails>
+          <Location>
+            <TownOfBirth>Zurmat District, Paktia Province</TownOfBirth>
+            <CountryOfBirth>Afghanistan</CountryOfBirth>
+          </Location>
+          <Location>
+            <TownOfBirth>Garda Saray District, Paktia Province</TownOfBirth>
+            <CountryOfBirth>Afghanistan</CountryOfBirth>
+          </Location>
+          <Location>
+            <CountryOfBirth>Afghanistan</CountryOfBirth>
+          </Location>
+        </BirthDetails>
+      </Individual>
+    </IndividualDetails>
+  </Designation>
+</Designations>