#32090 Add logdb.Application logger

# Conflicts:
#	Swift.DAL/Remittance/Transaction/TranAgentReportDao.cs
#	Swift.DAL/Remittance/Transaction/UpdateBranchDao.cs
#	Swift.DAL/app.config
#	Swift.web/AgentNew/SendTxn/Confirm.aspx.designer.cs
#	Swift.web/AgentNew/js/SendTxn/sendTxnInfo.js
#	Swift.web/Library/PasswordGenerator.cs
#	Swift.web/MobileRemit/Admin/Operation/EditCustomerForActivation.aspx.cs
#	Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx.cs
#	Swift.web/Remit/TPSetup/BankAndBranchSetup/BankList.aspx.cs
#	Swift.web/Remit/TPSetup/BankAndBranchSetup/ListBranch.aspx.cs
#	Swift.web/Remit/TPSetup/BankAndBranchSetup/NewBankList.aspx.cs
#	Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs
#	Swift.web/Swift.web.csproj
#	Swift.web/SwiftSystem/UserManagement/AgentSetup/Manage.aspx.designer.cs
#	Swift.web/Web.config

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

@@ -48,6 +48,9 @@
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="Select.HtmlToPdf, Version=20.2.0.0, Culture=neutral, PublicKeyToken=e0ae9f6e27a97018, processorArchitecture=MSIL">
+      <HintPath>..\packages\Select.HtmlToPdf.20.2.0\lib\net40\Select.HtmlToPdf.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />

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.API/packages.config

@@ -4,5 +4,6 @@
   <package id="log4net" version="2.0.13" targetFramework="net481" />
   <package id="MoreLinq.Portable" version="1.4.0" targetFramework="net481" />
   <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net481" />
+  <package id="Select.HtmlToPdf" version="20.2.0" targetFramework="net461" />
   <package id="System-Web-Helpers.dll" version="1.0.0" targetFramework="net481" />
 </packages>

Swift.DAL/Agentpanel/Send/SendTranIRHDao.cs

@@ -1444,7 +1444,7 @@ namespace Swift.DAL.BL.AgentPanel.Send
             sql += ", @customerPassword = " + FilterString(trn.CustomerPassword);
             sql += ", @isAdditionalCDDI = " + FilterString(trn.isAdditionalCDDI);
             sql += ", @promotionCode = " + FilterString(trn.promotionCode);
-            sql += ", @promotionAmount = " + FilterString(trn.promotionAmount);
+            sql += ", @promotionAmount = " + FilterString(trn.promotionAmount); 
             sql += ", @additionalCDDIXml = '" + trn.CDDIXml + "'";
             sql += ", @relationOther = " + FilterString(trn.relationOther);
             sql += ", @purposeOther = " + FilterString(trn.purposeOther);

Swift.DAL/Remittance/Transaction/ApiLogDao.cs

@@ -10,7 +10,11 @@ namespace Swift.DAL.Remittance.Transaction
             var sql = "EXEC proc_ApiLogs @flag='a',@rowId=" + FilterString(id);
             return ExecuteDataRow(sql);
         }
-
+        public DataRow GetInboundApiLogRecord(string id)
+        {
+            var sql = "EXEC proc_inboundApiLogs @flag='a',@rowId=" + FilterString(id);
+            return ExecuteDataRow(sql);
+        }
         public DataRow GetKFTCLogRecord(string id,string User)
         {
             var sql = "EXEC proc_KFTCApiLogs @flag='a',@rowId=" + FilterString(id);

Swift.DAL/Remittance/Transaction/ApproveInwardTransactionDao.cs

@@ -0,0 +1,92 @@
+using Swift.DAL.SwiftDAL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Swift.DAL.Remittance.Transaction
+{
+    public class ApproveInwardTransactionDao : RemittanceDao
+    {
+        public DataSet GetHoldedTXNListAdmin(string user, string branch, string id, string country, string sender, string receiver
+     , string amt, string branchId, string userType, string flag,
+       string txnDate, string txnUser, string controlNo, string controlNo1, string txnType, string sendCountry, string sendAgent, string sendBranch)
+        {
+            string sql = "EXEC proc_ApproveInwardHoldedTXN ";
+            sql += "  @flag = " + FilterString(flag);
+            sql += ", @user = " + FilterString(user);
+            sql += ", @id = " + FilterString(id);
+            sql += ", @branch = " + FilterString(branch);
+            sql += ", @country = " + FilterString(country);
+            sql += ", @sender = " + FilterString(sender);
+            sql += ", @receiver = " + FilterString(receiver);
+            sql += ", @amt = " + FilterString(amt);
+            sql += ", @branchId = " + FilterString(branchId);
+            sql += ", @userType = " + FilterString(userType);
+            sql += ", @txnDate = " + FilterString(txnDate);
+            sql += ", @txncreatedBy = " + FilterString(txnUser);
+            sql += ", @ControlNo = " + FilterString(controlNo);
+            sql += ", @tpControlNo2 = " + FilterString(controlNo1);
+            sql += ", @txnType = " + FilterString(txnType);
+            sql += ", @sendCountry = " + FilterString(sendCountry);
+            sql += ", @sendAgent = " + FilterString(sendAgent);
+            sql += ", @sendBranch = " + FilterString(sendBranch);
+            return ExecuteDataset(sql);
+        }
+
+
+        public DbResult ApproveAllHoldedTXN(string user, string idList)
+        {
+            var sb = new StringBuilder("<root>");
+            var list = idList.Split(',');
+            foreach (var itm in list)
+            {
+                sb.Append("<row id=\"" + itm.Trim() + "\" />");
+            }
+            sb.Append("</root>");
+
+            var sql = "EXEC proc_ApproveInwardHoldedTXN @flag = 'approve-all'";
+            sql += ", @user = " + FilterString(user);
+            sql += ", @idList = " + FilterString(sb.ToString());
+            return ParseDbResult(sql);
+        }
+        
+        public DataSet GetHoldAdminTransactionSummary(string user, string branchId, string userType)
+        {
+            string sql = "EXEC proc_ApproveInwardHoldedTXN ";
+            sql += "  @flag = 's_admin_txn_summary'";
+            sql += ", @user = " + FilterString(user);
+            sql += ", @branchId = " + FilterString(branchId);
+            sql += ", @userType = " + FilterString(userType);
+            return ExecuteDataset(sql);
+        }
+        public DbResult GetTxnApproveDataIMEPay(string user, string id)
+        {
+            var sql = "EXEC proc_ApproveInwardHoldedTXN @flag = 'get-info-imepay'";
+            sql += ", @user = " + FilterString(user);
+            sql += ", @id = " + FilterString(id);
+            var drDb = ParseDbResultNew(sql);
+            return drDb;
+        }
+        public DbResult ApproveHoldedTXN(string user, string id)
+        {
+            var sql = "EXEC proc_ApproveInwardHoldedTXN @flag = 'approve'";
+            sql += ", @user = " + FilterString(user);
+            sql += ", @id = " + FilterString(id);
+            var drDb = ParseDbResult(sql);
+            return drDb;
+        }
+        public DbResult RejectHoldedTXN(string user, string id, string controlNO = "", string remarks = "")
+        {
+            var sql = "EXEC proc_ApproveInwardHoldedTXN @flag = 'reject'";
+            sql += ", @user = " + FilterString(user);
+            sql += ", @id = " + FilterString(id);
+            sql += ", @remarks = " + FilterString(remarks);
+            sql += ", @ControlNo = " + FilterString(controlNO);
+
+            return ParseDbResult(sql);
+        }
+    }
+}

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

@@ -213,8 +213,11 @@ namespace Swift.DAL.BL.Remit.Transaction
             sql += "  @flag = 'branchId'";
             sql += ", @user = " + FilterString(user);
             sql += ", @tranId = " + FilterString(tranId);
+
             return GetSingleResult(sql);
         }
+
+       
         public DbResult TranViewLog(
                          string user
                         , string tranId
@@ -373,5 +376,7 @@ namespace Swift.DAL.BL.Remit.Transaction
 
             return GetSingleResult(sql);
         }   
+
+       
     }
 }

Swift.DAL/Remittance/Transaction/TranAgentReportDao.cs

@@ -366,8 +366,10 @@ namespace Swift.DAL.BL.Remit.Transaction
             sql += ",@agentId=" + FilterString(agentId);
             sql += ",@branchId=" + FilterString(branchId);
             sql += ",@withAgent=" + FilterString(withAgent);
+
             return ParseReportResult(sql);
         }
+
         public ReportResult GetCustomerRegistrationReport(string user, string flag, string fromDate, string toDate)
         {
             var sql = "PROC_REGISTRATION_REPORT ";
@@ -375,8 +377,10 @@ namespace Swift.DAL.BL.Remit.Transaction
             sql += ",@user=" + FilterString(user);
             sql += ",@FROM_DATE=" + FilterString(fromDate);
             sql += ",@TO_DATE=" + FilterString(toDate);
+
             return ParseReportResult(sql);
         }
+
         public ReportResult GetLowTxnReport(string user, string flag, string toDate, string postCode, string txnCountType, string txnCount)
         {
             var sql = "proc_low_txn_report ";
@@ -386,8 +390,29 @@ namespace Swift.DAL.BL.Remit.Transaction
             sql += ",@postCode=" + FilterString(postCode);
             sql += ",@txnCountType=" + FilterString(txnCountType);
             sql += ",@txnCount=" + FilterString(txnCount);
+
             return ParseReportResult(sql);
         }
+        //public ReportResult GetCustomerRegistrationReport(string user, string flag, string fromDate, string toDate)
+        //{
+        //    var sql = "PROC_REGISTRATION_REPORT ";
+        //    sql += "@flag =" + FilterString(flag); ;
+        //    sql += ",@user=" + FilterString(user);
+        //    sql += ",@FROM_DATE=" + FilterString(fromDate);
+        //    sql += ",@TO_DATE=" + FilterString(toDate);
+        //    return ParseReportResult(sql);
+        //}
+        //public ReportResult GetLowTxnReport(string user, string flag, string toDate, string postCode, string txnCountType, string txnCount)
+        //{
+        //    var sql = "proc_low_txn_report ";
+        //    sql += "@flag =" + FilterString(flag); ;
+        //    sql += ",@user=" + FilterString(user);
+        //    sql += ",@toDate=" + FilterString(toDate);
+        //    sql += ",@postCode=" + FilterString(postCode);
+        //    sql += ",@txnCountType=" + FilterString(txnCountType);
+        //    sql += ",@txnCount=" + FilterString(txnCount);
+        //    return ParseReportResult(sql);
+        //}
         public ReportResult GetDisabledCustomersReport(string user, string flag, string fromDate, string toDate)
         {
             var sql = "PROC_REGISTRATION_REPORT ";
@@ -542,13 +567,15 @@ namespace Swift.DAL.BL.Remit.Transaction
             return ParseReportResult(sql);
         }
 
-        public DataTable TxnReport(string user, string pCountry, string pAgent, string depositType, string orderBy, string status, string paymentType, string dateField, string from, string to, string transType, string displayTranNo, string searchBy, string searchByValue, string pageNumber, string pageSize, string rptType, string tFrom, string postCode, string promoCode)
+        public DataTable TxnReport(string user, string pCountry, string pAgent, string sCountry, string depositType,string remitTYpe, string orderBy, string status, string paymentType, string dateField, string from, string to, string transType, string displayTranNo, string searchBy, string searchByValue, string pageNumber, string pageSize, string rptType, string tFrom, string postCode, string promoCode)
         {
             string sql = "EXEC PROC_TRANSACTION_REPORT ";
             sql += " @user=" + FilterString(user);
             sql += ", @pCountry = " + FilterString(pCountry);
             sql += ", @pAgent = " + FilterString(pAgent);
+            sql += ", @sCountry = " + FilterString(sCountry);
             sql += ", @depositType = " + FilterString(depositType);
+            sql += ", @remitTYpe = " + FilterString(remitTYpe);
             sql += ", @orderBy = " + FilterString(orderBy);
             sql += ", @status = " + FilterString(status);
             sql += ", @paymentType = " + FilterString(paymentType);

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/Remittance/Transaction/UpdateBranchDao.cs

@@ -57,51 +57,47 @@ namespace Swift.DAL.Remittance.Transaction
             return ds.Tables[0];
 
         }
-
         public DataTable InsertOrUpdateBank(string user, string flag, string recordId, string countryId, string paymentMode, string bankName, string pCurrency, string bankState, string bankDistrict, string bankAddress, string bankPhone, string bankEmail, string isActive)
         {
             string sql;
                 sql = "EXEC Proc_UpdateBranchCode @flag = " + FilterString(flag);
                 sql += ", @bankId = " + FilterString(recordId);
-            sql += ", @pCountryName = " + FilterString(countryId);
-            sql += ", @pMode = " + FilterString(paymentMode);
-            sql += ", @bankName = " + FilterString(bankName);
-            sql += ", @sCurrency = " + FilterString(pCurrency);
-            sql += ", @bankState = " + FilterString(bankState);
-            sql += ", @bankAddress = " + FilterString(bankAddress);
-            sql += ", @bankDistrict = " + FilterString(bankDistrict);
-            sql += ", @bankPhone = " + FilterString(bankPhone);
-            sql += ", @bankEmail = " + FilterString(bankEmail);
+                sql += ", @pCountryName = " + FilterString(countryId);
+                sql += ", @pMode = " + FilterString(paymentMode);
+                sql += ", @bankName = " + FilterString(bankName);
+                sql += ", @sCurrency = " + FilterString(pCurrency);
+                sql += ", @bankState = " + FilterString(bankState);
+                sql += ", @bankAddress = " + FilterString(bankAddress);
+                sql += ", @bankDistrict = " + FilterString(bankDistrict);
+                sql += ", @bankPhone = " + FilterString(bankPhone);
+                sql += ", @bankEmail = " + FilterString(bankEmail);
                 sql += ", @is_Active = " + FilterString(isActive);
-            sql += ", @user = " + FilterString(user);
-
+                sql += ", @user = " + FilterString(user);
             var ds = ExecuteDataset(sql);
             if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                 return null;
             return ds.Tables[0];
-
         }
         public DataTable InsertOrUpdateBankMapping(string user, string flag, string recordId, string countryId, string parnerId, string bankId, string pMode, string bankCode1, string bankCode2, string pCurrency, string bAddress, string isActive)
         {
             string sql;
             sql = "EXEC Proc_UpdateBranchCode @flag = " + FilterString(flag);
             sql += ", @bankId = " + FilterString(recordId);
-            sql += ", @pCountryName = " + FilterString(countryId);
-            sql += ", @partnerId = " + FilterString(parnerId);
-            sql += ", @bankName = " + FilterString(bankId);
-            sql += ", @sCurrency = " + FilterString(pCurrency);
-            sql += ", @pMode = " + FilterString(pMode);
-            sql += ", @bankCode1 = " + FilterString(bankCode1);
-            sql += ", @bankCode2 = " + FilterString(bankCode2);
-            sql += ", @bankAddress = " + FilterString(bAddress);
+             sql += ", @pCountryName = " + FilterString(countryId);
+             sql += ", @partnerId = " + FilterString(parnerId);
+             sql += ", @bankName = " + FilterString(bankId);
+             sql += ", @sCurrency = " + FilterString(pCurrency);
+             sql += ", @pMode = " + FilterString(pMode);
+             sql += ", @bankCode1 = " + FilterString(bankCode1);
+             sql += ", @bankCode2 = " + FilterString(bankCode2);
+             sql += ", @bankAddress = " + FilterString(bAddress);
              sql += ", @is_Active = " + FilterString(isActive);
-            sql += ", @user = " + FilterString(user);
+             sql += ", @user = " + FilterString(user);
 
             var ds = ExecuteDataset(sql);
             if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                 return null;
             return ds.Tables[0];
-
         }
         public DataTable UpdateBankMapping(string user, string flag, string countryId, string parnerId, string bankId, string pMode, string bankCode1, string bankCode2, string pCurrency, string bAddress)
         {
@@ -171,6 +167,7 @@ namespace Swift.DAL.Remittance.Transaction
                 return null;
             return ds.Tables[0];
         }
+
         public DataTable LoadBank(string sCountryid, string pCountry, string collMode, string partnerId, string flag, string user)
         {
             //var sql = "EXEC proc_dropDownLists @flag = 'collModeByCountry'";
@@ -187,6 +184,7 @@ namespace Swift.DAL.Remittance.Transaction
                 return null;
             return ds.Tables[0];
         }
+      
         public DataTable LoadPartner(string sCountryid, string pCountry, string collMode, string flag, string user)
         {
             var sql = "EXEC Proc_UpdateBranchCode @flag =" + FilterString(flag);

Swift.DAL/Swift.DAL.csproj

@@ -151,6 +151,9 @@
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="Select.HtmlToPdf, Version=20.2.0.0, Culture=neutral, PublicKeyToken=e0ae9f6e27a97018, processorArchitecture=MSIL">
+      <HintPath>..\packages\Select.HtmlToPdf.20.2.0\lib\net40\Select.HtmlToPdf.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -383,6 +386,7 @@
     <Compile Include="Remittance\TPSetup\PartnerDao.cs" />
     <Compile Include="Remittance\TPSetup\TPSetupDao.cs" />
     <Compile Include="Remittance\Transaction\ApiLogDao.cs" />
+    <Compile Include="Remittance\Transaction\ApproveInwardTransactionDao.cs" />
     <Compile Include="Remittance\Transaction\ApproveTransactionDao.cs" />
     <Compile Include="Remittance\Transaction\CancelTransactionDao.cs" />
     <Compile Include="Remittance\Transaction\ExRateDao.cs" />

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.DAL/packages.config

@@ -2,4 +2,5 @@
 <packages>
   <package id="Microsoft.SqlServer.SqlManagementObjects" version="150.18178.0" targetFramework="net481" />
   <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net481" />
+  <package id="Select.HtmlToPdf" version="20.2.0" targetFramework="net461" />
 </packages>

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

@@ -164,7 +164,6 @@
 
             $('#modalClose').on('click', function () {
                
-
                 $("#apiDataPopup").modal("hide");
             })
             //$("#ContentPlaceHolder1_occupation").prop("disabled", true);
@@ -1087,7 +1086,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

@@ -363,6 +363,7 @@ namespace Swift.web.AgentNew.Administration.CustomerSetup.CustomerRegistration
                 }
             }
             GetStatic.SetMessage(dbResult.ErrorCode, dbResult.Msg);
+
             if (dbResult.ErrorCode == "0")
             {
                 saveCustomerDocument(dbResult);
@@ -372,6 +373,7 @@ namespace Swift.web.AgentNew.Administration.CustomerSetup.CustomerRegistration
                 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 });
@@ -428,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('|');
@@ -536,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.designer.cs

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

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

@@ -1856,9 +1856,12 @@
                     else {
                         var branchId = data[0].branchDetails.split('|')[0];
                         var text = data[0].branchDetails.split('|')[1];
+
                         SetDDLValueSelected("<%=branch.ClientID %>", text);
                         GetBranch(branchId, text);
+                       
                         $('#ContentPlaceHolder1_branch').val(text);
+
                     }
                 }--%>
                 if (data[0].branchDetails) {
@@ -1878,6 +1881,8 @@
                         }
                     }
                 }
+
+              
                 <%--if ($("#<%=pCountry.ClientID%> option:selected ").val() != "") {
                     PcountryOnChange('c', "");
                     SetPayCurrency($("#<%=pCountry.ClientID%>").val());

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

@@ -87,9 +87,11 @@ function ClearCollModeAndAvailableBal() {
 }
 
 function ParseCalculateData(response, amtType) {
+    
     var data = response;
     CheckSession1(data);
     if (data[0].ErrCode === '1') {
+        
         alert(data[0].Msg);
         ClearAmountFields();
         return;
@@ -220,6 +222,7 @@ function LoadPayMode(response, myDDL, recall, selectField, obj) {
 }
 
 function ParseLoadDDl(response, myDDL, recall, selectField) {
+    
     var data = response;
     CheckSession(data);
     var ddl2 = GetElement(mId + "pAgentDetail");

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

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

Swift.web/DashboardV2/Dashboard2.aspx

@@ -63,9 +63,11 @@
             z-index: 9999;
             background: url("../Images/loading_icon.gif") center no-repeat #fff;
         }
-        .footer-text{
+
+        .footer-text {
             color: white;
         }
+
         .auto-style1 {
             flex: 0 0 auto;
             width: 100%;
@@ -231,7 +233,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 +263,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>
@@ -458,7 +460,7 @@
                                                     </div>
                                                     <!-- end msg-body -->
                                                 </a>
-                                               <%-- <a href="../Remit/Compliance/ApproveOFACandComplaince/List.aspx?tranType=M&kycStatus=KYC_NOW" target="_blank" class="list-group-item list-group-item-action">
+                                                <%-- <a href="../Remit/Compliance/ApproveOFACandComplaince/List.aspx?tranType=M&kycStatus=KYC_NOW" target="_blank" class="list-group-item list-group-item-action">
                                                     <div class="msg-body d-flex align-items-center">
                                                         <div class="icon-element bg-3 flex-shrink-0 mr-3 ml-0">
                                                             <i class='uil uil-bell'></i>
@@ -479,6 +481,8 @@
                                     </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;">
@@ -541,6 +545,15 @@
                                                             <i class='uil uil-refresh'></i>
                                                         </span>
                                                     </div>
+                                                    <!-- end msg-body -->
+                                                </a>
+                                            </div>
+                                        </div>
+                                    </div>
+                                            </div>
+                                        </div>
+                                        <%--<div class="col-xl-6" id="userwiseDailyTxnRoleDiv" runat="server">
+                                                    </div>
                                                 </a>
                                             </div>
                                         </div>
@@ -573,102 +586,100 @@
                                     </div>
                                 </div>
                             </div>--%>
+                                    </div>
+                                    <!-- end row -->
+                                </div>
+                                <!-- container -->
+                            </div>
+                            <!-- content -->
 
+                            <!-- Footer Start -->
+                            <footer class="footer" style="left: 0 !important; background-color: #262262; color: #fff;">
+                                <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>
+                                        </div>
+                                    </div>
+                                </div>
+                            </footer>
+                            <!-- end Footer -->
                         </div>
-                        <!-- end row -->
+                        <!-- ============================================================== -->
+                        <!-- End Page content -->
+                        <!-- ============================================================== -->
                     </div>
-                    <!-- container -->
-                </div>
-                <!-- content -->
+                    <!-- END wrapper -->
 
-                <!-- Footer Start -->
-                <footer class="footer" style="left: 0 !important; background-color: #262262; color: #fff;">
-                    <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>
+                    <%--Modal for Agentwise txn--%>
+                    <div class="modal fade bd-example-modal-lg" id="gridAgentWiseModal" tabindex="-1" role="dialog" aria-labelledby="gridAgentWiseModalLabel" aria-hidden="true" style="max-height: 900px;">
+                        <div class="modal-dialog modal-lg" role="document">
+                            <div class="modal-content">
+                                <div class="modal-header">
+                                    <h5 class="modal-title" id="gridAgentWiseModalLabel">Agent wise number of transactions</h5>
+                                    <button type="button" class="close" data-dismiss="modal" aria-label="Close" onclick="ClosePopup()" style="border: 0px; background: transparent; font-size: 25px; font-weight: 800;">
+                                        <span aria-hidden="true">&times;</span>
+                                    </button>
+                                </div>
+                                <div class="modal-body" style="max-height: 500px;">
+                                    <table class="table table-responsive table-bordered" id="tableAgentWisePopup" style="max-height: 500px;">
+                                        <thead>
+                                            <tr>
+                                                <th>S. No.</th>
+                                                <th>Agent Name</th>
+                                                <th>Current Month</th>
+                                                <th>Previous Month</th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            <tr>
+                                                <td colspan="3" align="center">No data to display!</td>
+                                            </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
+                                <div class="modal-footer">
+                                    <button type="button" class="btn btn-secondary" data-dismiss="modal" onclick="ClosePopup()">Close</button>
+                                    <%--<button type="button" class="btn btn-primary">Save changes</button>--%>
+                                </div>
                             </div>
                         </div>
                     </div>
-                </footer>
-                <!-- end Footer -->
-            </div>
-            <!-- ============================================================== -->
-            <!-- End Page content -->
-            <!-- ============================================================== -->
-        </div>
-        <!-- END wrapper -->
-
-        <%--Modal for Agentwise txn--%>
-        <div class="modal fade bd-example-modal-lg" id="gridAgentWiseModal" tabindex="-1" role="dialog" aria-labelledby="gridAgentWiseModalLabel" aria-hidden="true" style="max-height: 900px;">
-            <div class="modal-dialog modal-lg" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="gridAgentWiseModalLabel">Agent wise number of transactions</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close" onclick="ClosePopup()" style="border: 0px; background: transparent; font-size: 25px; font-weight: 800;">
-                            <span aria-hidden="true">&times;</span>
-                        </button>
-                    </div>
-                    <div class="modal-body" style="max-height: 500px;">
-                        <table class="table table-responsive table-bordered" id="tableAgentWisePopup" style="max-height: 500px;">
-                            <thead>
-                                <tr>
-                                    <th>S. No.</th>
-                                    <th>Agent Name</th>
-                                    <th>Current Month</th>
-                                    <th>Previous Month</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr>
-                                    <td colspan="3" align="center">No data to display!</td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal" onclick="ClosePopup()">Close</button>
-                        <%--<button type="button" class="btn btn-primary">Save changes</button>--%>
-                    </div>
-                </div>
-            </div>
-        </div>
 
-        <div class="modal fade bd-example-modal-lg" id="gridUserWiseModal" tabindex="-1" role="dialog" aria-labelledby="gridAgentWiseModalLabel" aria-hidden="true" style="max-height: 900px;">
-            <div class="modal-dialog modal-lg" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="gridUserWiseModalLabel">Userwise Daily Transactions</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close" onclick="ClosePopup()" style="border: 0px; background: transparent; font-size: 25px; font-weight: 800;">
-                            <span aria-hidden="true">&times;</span>
-                        </button>
-                    </div>
-                    <div class="modal-body" style="max-height: 500px;">
-                        <table class="table table-responsive table-bordered" id="tableUserWisePopup" style="max-height: 500px;">
-                            <thead>
-                                <tr>
-                                    <th>S. No.</th>
-                                    <th>Teller Name</th>
-                                    <th>Transaction Count</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr>
-                                    <td colspan="3" align="center">No data to display!</td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal" onclick="ClosePopup()">Close</button>
-                        <%--<button type="button" class="btn btn-primary">Save changes</button>--%>
+                    <div class="modal fade bd-example-modal-lg" id="gridUserWiseModal" tabindex="-1" role="dialog" aria-labelledby="gridAgentWiseModalLabel" aria-hidden="true" style="max-height: 900px;">
+                        <div class="modal-dialog modal-lg" role="document">
+                            <div class="modal-content">
+                                <div class="modal-header">
+                                    <h5 class="modal-title" id="gridUserWiseModalLabel">Userwise Daily Transactions</h5>
+                                    <button type="button" class="close" data-dismiss="modal" aria-label="Close" onclick="ClosePopup()" style="border: 0px; background: transparent; font-size: 25px; font-weight: 800;">
+                                        <span aria-hidden="true">&times;</span>
+                                    </button>
+                                </div>
+                                <div class="modal-body" style="max-height: 500px;">
+                                    <table class="table table-responsive table-bordered" id="tableUserWisePopup" style="max-height: 500px;">
+                                        <thead>
+                                            <tr>
+                                                <th>S. No.</th>
+                                                <th>Teller Name</th>
+                                                <th>Transaction Count</th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            <tr>
+                                                <td colspan="3" align="center">No data to display!</td>
+                                            </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
+                                <div class="modal-footer">
+                                    <button type="button" class="btn btn-secondary" data-dismiss="modal" onclick="ClosePopup()">Close</button>
+                                    <%--<button type="button" class="btn btn-primary">Save changes</button>--%>
+                                </div>
+                            </div>
+                        </div>
                     </div>
-                </div>
-            </div>
-        </div>
-
     </form>
     <script src="assets/js/vendor.min.js"></script>
     <script src="assets/Vendor/moment/min/moment.min.js"></script>

Swift.web/DashboardV2/Dashboard2.aspx.cs

@@ -70,8 +70,6 @@ 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(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);
         }
-        
        // $('#complianceHoldCountMobileKycNow').text(Response.ComplianceData.OFACComplianceMobileTxnsKycNow);
 
         //Customer Count data

Swift.web/Download.aspx.cs

@@ -240,4 +240,4 @@ namespace Swift.web
             return html.ToString();
         }
     }
-}
+}

Swift.web/Library/GetStatic.cs

@@ -1080,7 +1080,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")
@@ -1844,6 +1843,7 @@ namespace Swift.web.Library
             else
                 return strVal;
         }
+
         public static String ShowDecimal(String strVal)
         {
             if (strVal != "")
@@ -2278,7 +2278,7 @@ namespace Swift.web.Library
             {
                 jsonString = DataTableToJson(dt);
             }
-
+            
             page.Response.ContentType = "application/json";
             page.Response.Write(jsonString);
             page.Response.End();
@@ -2658,7 +2658,7 @@ namespace Swift.web.Library
         }
         public static string GetMIMEExtension(this string contentType)
         {
-            return MimeTypes.MimeTypeMap.GetExtension(contentType);
+            return  MimeTypes.MimeTypeMap.GetExtension(contentType);
         }
 
         public static ApiSecretKeys GetKeys()
@@ -2677,7 +2677,5 @@ namespace Swift.web.Library
                 return (model);
             }
         }
-
-
     }
 }

Swift.web/Library/PasswordGenerator.cs

@@ -79,13 +79,14 @@ namespace Swift.web.Library
         {
             Random rand = new Random();
             string password = "";
-      
+
             for (int i = 0; i < length; i++)
             {
                 password += rand.Next(0, 10);
             }
             return password;
         }
+        
     }
 }
 

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/EditCustomerForActivation.aspx.cs

@@ -308,6 +308,42 @@ namespace Swift.web.MobileRemit.Admin.Operation
                     GetStatic.AlertMessage(this, dbRes.Msg);
                     if (dbRes.ErrorCode == "0")
                     {
+                    //    DataRow result = _cd.GetDetailsWithPinNo(GetCustomerId(), GetStatic.GetUser());
+                    //    //CustomerDetails cd = _cd.GetUserDetails(selecteduserId);
+
+                    //    List<Mapping> bodyMappings = new List<Mapping>();
+
+                    //    bodyMappings.Add(new Mapping() { SValue = "CustomerName", SText = result["FullName"].ToString()});
+                    //    bodyMappings.Add(new Mapping() { SValue = "CustomerId", SText = GetCustomerId() });
+                    //    bodyMappings.Add(new Mapping() { SValue = "Address", SText = result["Address1"].ToString()});
+                    //    bodyMappings.Add(new Mapping() { SValue = "EMAIL_ID", SText = result["userName"].ToString() });
+                    //    bodyMappings.Add(new Mapping() { SValue = "Password", SText = result["password"].ToString() });
+                    //    bodyMappings.Add(new Mapping() { SValue = "Pin_No", SText = result["pinNo"].ToString() });
+
+
+                    //    SendNotificationRequestMobile request = new SendNotificationRequestMobile()
+                    //    {
+                    //        IsBulkNotification = false,
+                    //        UserName = result["userName"].ToString(),
+                    //        ProcessId = "KYC_Verification_Completed",
+                    //        ProviderId = NotifyTemplate.CUST_PWD_PIN.ToString(),
+                    //        NotificationTypeId = NOTIFICATION_TYPE.EMAIL.ToString(),
+                    //        Template = NotifyTemplate.CUST_PWD_PIN,
+                    //        Recipients = new List<RecipientViewModel>()
+                    //{
+                    //    new RecipientViewModel()
+                    //    {
+                    //        NotificationContent =  new NotificationDTO() {
+                    //         Body = JsonConvert.SerializeObject(bodyMappings),
+                    //            //Title will be set by mapping json
+                    //        },
+                    //         Address= result["userName"].ToString()
+                    //    }
+                    //}
+                    //    };
+
+                    //    result = NotifierV2.SendNotification(request, NOTIFICATION_TYPE.EMAIL);
+
                         Response.Redirect("/MobileRemit/Admin/Operation/LetterForCustomerFromMobile.aspx?createdFrom=" + createdFrom + "&customerId=" + GetCustomerId() + "&membershipId=" + Request.Form["membershipId"] + "");
                     }
                     //  Approve(sender, e, createdFrom, "approve");
@@ -413,11 +449,12 @@ namespace Swift.web.MobileRemit.Admin.Operation
             else
                 args.IsValid = true;
         }
-
         protected void occupation_SelectedIndexChanged(object sender, EventArgs e)
         {
 
         }
+
+
         [WebMethod]
         public static string GetAddressByPostCode(string zipCode)
         {
@@ -425,6 +462,7 @@ namespace Swift.web.MobileRemit.Admin.Operation
             string ProcessId = Guid.NewGuid().ToString().Replace("-", "") + ":" + postCode;
             string methodType = Utility.ReadWebConfig("methodType", "");
             string countryName = "United Kingdom";
+
             AddressRequest requestObj = new AddressRequest()
             {
                 CountryIsoCode = countryName,
@@ -432,10 +470,13 @@ namespace Swift.web.MobileRemit.Admin.Operation
                 MethodType = methodType,
                 TownName = postCode,
             };
+
             SyncStateCityTownService serviceObj = new SyncStateCityTownService();
             var response = serviceObj.GetAddressList(requestObj);
             string jsonResponse = JsonConvert.SerializeObject(response);
             return jsonResponse;
+
         }
+       
     }
 }

Swift.web/MobileRemit/Admin/Operation/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,6 @@
                                                                 </div>
                                                             </div>
                                                         </div>
-
                                                         <div class="col-md-6" id="customerSelfieDiv">
                                                             <div class="form-group">
                                                                 <label>Customer Selfie</label>
@@ -1660,7 +1658,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 +1673,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 +1683,9 @@
                                                                     </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();
@@ -488,7 +488,9 @@ namespace Swift.web.MobileRemit.Admin.Operation
             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

@@ -32,7 +32,7 @@
 
             var rowId = "<%=GetRowId()%>";
             var customerType = $("#ddlCustomerType").val();
-           // alert(customerType);
+            // alert(customerType);
             if (customerType == "All") {
                 return true;
             }
@@ -162,19 +162,19 @@
                                             <div class="col-md-6">
                                                 <div class="form-group">
                                                     <asp:DropDownList ID="ddlCustomerType" runat="server" CssClass="form-control" Style="margin-bottom: 5px;"></asp:DropDownList>
-                                                </div>
                                             </div>
                                             <div class="col-md-6">
                                                 <uc1:SwiftTextBox runat="server" ID="txtSearchData" Category="remit-searchCustomerForPushNotif" CssClass="form-control required" Param1="@GetCustomerSearchType()" Title="Blank for All" />
                                             </div>
                                             <div class="col-md-6">
-                                                <div class="form-group">
-                                                    <asp:DropDownList ID="ddlNativeCountry" runat="server" CssClass="form-control" Style="margin-bottom: 5px;"></asp:DropDownList>
                                                 </div>
-                                            </div>
+                                    </div>
+                                    <div class="col-md-4">
+                                        <div class="form-group">
+                                            <asp:DropDownList ID="ddlNativeCountry" runat="server" CssClass="form-control" Style="margin-bottom: 5px;">
+                                            </asp:DropDownList>
                                         </div>
                                     </div>
-                                </div>
                             </div>--%>
                             <div class="col-md-3 form-group">
                                 <label>Select Customer : <span class="errormsg">*</span></label>
@@ -185,18 +185,12 @@
                             <div class="col-md-4 form-group">
                                 <uc1:SwiftTextBox runat="server" ID="txtSearchData" Category="remit-searchCustomerForPushNotif" CssClass="form-control required" Param1="@GetCustomerSearchType()" Title="Blank for All" />
                             </div>
-                            <div class="col-md-6">
+                            <div class="col-md-4">
                                 <div class="form-group">
                                     <asp:DropDownList ID="ddlNativeCountry" runat="server" CssClass="form-control" Style="margin-bottom: 5px;"></asp:DropDownList>
                                 </div>
                             </div>
-                            <%--<div class="col-md-4">
-                                <div class="form-group">
-                                <asp:TextBox ID="txtPostCode" AutoComplete="off" runat="server" CssClass="form-control"></asp:TextBox>
-                            </div>
-                            </div>--%>
                         </div>
-
                         <div class="row" id="divPostCode" runat="server">
                             <div class="col-md-3 form-group">
                                 <label id="lblPostCode" style="display: none;">Post Code :</label>
@@ -233,21 +227,25 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="row">
-                        </div>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="form-group">
-                                    <asp:Button ID="btnSave" runat="server" Text="Save" CssClass="btn btn-primary m-t-25" OnClientClick="return CheckFormValidation();" Visible="false" OnClick="btnSave_Click" />
-                                    <asp:Button ID="btnSaveAndSend" runat="server" Text="Save & Send" CssClass="btn btn-primary m-t-25" OnClientClick="return CheckFormValidation();" OnClick="btnSaveAndSend_Click" />
-                                    <asp:Button runat="server" class="btn btn-info m-t-25" ID="clear" OnClientClick="ClearClicked(); return false;" Text="Clear" />
-                                    <asp:HiddenField ID="HDNBody" runat="server" />
-                                </div>
-                            </div>
+                    </div>
+                </div>
+
+
+                <div class="row">
+                </div>
+                <div class="row">
+                    <div class="col-md-12">
+                        <div class="form-group">
+                            <asp:Button ID="btnSave" runat="server" Text="Save" CssClass="btn btn-primary m-t-25" OnClientClick="return CheckFormValidation();" Visible="false" OnClick="btnSave_Click" />
+                            <asp:Button ID="btnSaveAndSend" runat="server" Text="Save & Send" CssClass="btn btn-primary m-t-25" OnClientClick="return CheckFormValidation();" OnClick="btnSaveAndSend_Click" />
+                            <asp:Button runat="server" class="btn btn-info m-t-25" ID="clear" OnClientClick="ClearClicked(); return false;" Text="Clear" />
+                            <asp:HiddenField ID="HDNBody" runat="server" />
                         </div>
                     </div>
                 </div>
             </div>
+        </div>
+        </div>
     </form>
 </body>
 </html>

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

@@ -21,6 +21,26 @@
     <script src="/js/functions.js" type="text/javascript"></script>
     <script src="../../../../../js/swift_calendar.js"></script>
     <script src="../../../js/swift_autocomplete.js"></script>
+     <script src="/js/Swift_grid.js" type="text/javascript"></script>
+    <script src="/js/functions.js" type="text/javascript"></script>
+    <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/functions.js"></script>
+    <script src="/js/swift_calendar.js"></script>
+    <link href="/ui/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
+    <link href="/ui/css/datepicker-custom.css" rel="stylesheet" />
+    <link href="/js/jQuery/jquery-ui.css" rel="stylesheet" type="text/css" />
+    <link href="/ui/css/waves.min.css" type="text/css" rel="stylesheet" />
+    <!--        <link rel="stylesheet" href="css/nanoscroller.css">-->
+    <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" src="/ui/js/jquery.min.js"></script>
+    <script type="text/javascript" src="/ui/bootstrap/js/bootstrap.min.js"></script>
+    <script src="/js/swift_calendar.js"></script>
+    <script src="/ui/js/pickers-init.js"></script>
+    <script src="/ui/js/jquery-ui.min.js"></script>
+    <script src="/ui/js/metisMenu.min.js"></script>
 
     <style>
         .upperDiv {
@@ -164,9 +184,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>
 
@@ -236,6 +256,22 @@
                                     </div>
                                 </div>
                             </div>
+                            
+                    <div class="panel panel-default ">
+                        <div class="panel-heading">
+                            <h4 class="panel-title">Mobile API Log List </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">
+                                <div id="rpt_grid" runat="server" class="gridDiv" enableviewstate="False">
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+               
                         </div>
                     </div>
                 </div>

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

@@ -3,6 +3,8 @@ using Swift.API.Common;
 using Swift.API.Common.Enum;
 using Swift.API.TPAPIs;
 using Swift.DAL.OnlineAgent;
+using Swift.web.Component.Grid;
+using Swift.web.Component.Grid.gridHelper;
 using Swift.web.Library;
 using System;
 using System.Collections.Generic;
@@ -13,7 +15,11 @@ namespace Swift.web.MobileRemit.Admin.Reports
 {
     public partial class CustomerRegistrationStatus : System.Web.UI.Page
     {
-        private string ViewFunctionId = "41501000";
+        protected const string GridName = "apiLog";
+        private const string ViewFunctionId = "20172000";
+        private string sql;
+        private readonly SwiftGrid _grid = new SwiftGrid();
+        private string ViewFunctionId1 = "41501000";
         private readonly RemittanceLibrary _sl = new RemittanceLibrary();
         private readonly StaticDataDdl _sdd = new StaticDataDdl();
         private readonly OnlineCustomerDao _cd = new OnlineCustomerDao();
@@ -32,6 +38,7 @@ namespace Swift.web.MobileRemit.Admin.Reports
                 moreData.Visible = false;
                 kycData.Visible = false;
                 registrationTypeDiv.Visible = false;
+
             }
         }
 
@@ -55,6 +62,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);
@@ -66,6 +74,7 @@ namespace Swift.web.MobileRemit.Admin.Reports
                 if (customerDetails.Rows.Count > 0)
                 {
                     PopulateCustomerDetails(customerDetails);
+                    LoadGrid();
                 }
                 else
                 {
@@ -90,6 +99,7 @@ namespace Swift.web.MobileRemit.Admin.Reports
             }
         }
 
+
         private void PopulateDetails(DataTable customerDetails)
         {
             email.Text = customerDetails.Rows[0]["email"].ToString();
@@ -107,7 +117,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 +126,7 @@ namespace Swift.web.MobileRemit.Admin.Reports
             {
                 btnActivate.Enabled = false;
             }
+
             if (customerDetails.Rows[0]["approvedBy"].ToString() != "")
             {
                 //btnUpdate.Enabled = false;
@@ -210,13 +221,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.GenerateRandomNumericPassword(); 
             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 +276,42 @@ namespace Swift.web.MobileRemit.Admin.Reports
             {
                 GetStatic.AlertMessage(this, dbRes.Msg);
             }
-        }                        
+        }
+
+        private void LoadGrid()
+        {
+           
+            _grid.ColumnList = new List<GridColumn>
+                {
+                    new GridColumn("SN","SN","","T"),
+                    //new GridColumn("processId", "processid", "", "T"),
+                    new GridColumn("createdBy","RequestedBy","","T"),
+                    new GridColumn("methodName", "MethodName", "", "T"),
+                    new GridColumn("createdDate", "Date", "", "D"),
+                    new GridColumn("message", "RequestJson", "", "T"),
+                    //new GridColumn("ResponseJson", "ResponseJson", "", "T"),
+                   // new GridColumn("controlno","controlno","","T"),
+                };
+            _grid.GridDataSource = SwiftGrid.GridDS.RemittanceDB;
+            _grid.GridType = 1;
+            _grid.GridName = GridName;
+            _grid.RowIdField = "rowId";
+            _grid.InputPerRow = 5;
+
+            //_grid.AlwaysShowFilterForm = true;
+            _grid.LoadGridOnFilterOnly = false;
+
+           // _grid.AllowCustomLink = true;
+            //_grid.CustomLinkText = Misc.GetIcon("vd", "OpenInNewWindow('InboundLog.aspx?id=@rowId')");
+            _grid.CustomLinkVariables = "rowId";
+
+            _grid.ShowFilterForm = false;
+            _grid.ShowPagingBar = true;
+
+            _grid.ThisPage = "CustomerRegistrationStatus.aspx";
+            sql = "EXEC proc_MobileApiLogReports @flag = 's'";
+            _grid.SetComma();
+            rpt_grid.InnerHtml = _grid.CreateGrid(sql);
+        }
     }
 }

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

@@ -184,5 +184,14 @@ namespace Swift.web.MobileRemit.Admin.Reports
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl tblKycDetail;
+
+        /// <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/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/PromotionalRateSetup/Manage.aspx.cs

@@ -58,6 +58,7 @@ namespace Swift.web.Remit.Administration.CountrySetup.PromotionalRateSetup
 
         #endregion QueryString
 
+
         #region Method
 
         private void Authenticate()

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

@@ -406,6 +406,10 @@ namespace Swift.web.Remit.Administration.CustomerRegistration
             Page_Load(sender, e);
             return;
         }
+        //private void PrintMessage(string msg)
+        //{
+        //    GetStatic.CallBackJs1(Page, "Msg", "alert('" + msg + "');");
+        //}
         private void PrintMessage(string msg)
         {
             GetStatic.CallBackJs1(Page, "Msg", "alert('" + msg + "');");

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

@@ -75,6 +75,7 @@ namespace Swift.web.Remit.Administration.customerSetup
                                       new GridColumn("idNumber", "ID No", "", "T"),
                                       new GridColumn("KYC_Status","KYC Status","","T"),
                                       new GridColumn("createdDate","Regd. Date","","D"),
+                                      new GridColumn("idExpiryDate","ID Expiry Date","","D"),
                                       new GridColumn("Introducer","Introducer","","T"),
                                       //new GridColumn("bankName","Bank Name","","T")  ,
                                       //new GridColumn("bankAccountNo","Account Number","","T")
@@ -90,7 +91,7 @@ namespace Swift.web.Remit.Administration.customerSetup
             _grid.ShowFilterForm = true;
             _grid.SortOrder = "ASC";
             _grid.RowIdField = "customerId";
-            _grid.ThisPage = "List.aspx";
+            _grid.ThisPage = "List.aspx";   
             _grid.InputPerRow = 4;
             _grid.GridMinWidth = 700;
             _grid.GridWidth = 100;

Swift.web/Remit/Administration/PromotionalRateDao.cs

@@ -44,6 +44,5 @@ namespace Swift.DAL.BL.Remit.Administration
             return ds.Tables[0].Rows[0];
         }
 
-
     }
 }

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/TPSetup/BankAndBranchSetup/BankList.aspx.cs

@@ -110,6 +110,7 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
                 GetStatic.AlertMessage(this, dbResult.Msg);
             }
         }
+
         protected void btnUpdate_Click(object sender, EventArgs e)
         {
             BankBranchDao _dao = new BankBranchDao();

Swift.web/Remit/ThirdPartyTXN/InboundApiLog/InboundLog.aspx

@@ -0,0 +1,117 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InboundLog.aspx.cs" Inherits="Swift.web.Remit.ThirdPartyTXN.InboundApiLog.InboundLog" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title></title>
+    <link href="../../../ui/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
+    <link href="../../../ui/css/style.css" rel="stylesheet" />
+    <link href="../../../ui/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
+
+
+    <style>
+        .table .table {
+            background-color: #F5F5F5 !important;
+        }
+        .borderless td, .borderless th {
+    border: none !important;
+}
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div class="container-fluid">
+            <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('other_services')">Other Services</a></li>
+                            <li class="active"><a href="InboundLog.aspx">API Log</a></li>
+                        </ol>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-md-12">
+                    <div class="panel panel-default ">
+                        <div class="panel-heading">
+                            <h4 class="panel-title">API Transaction  Log Details </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">
+                                <table class="table table-responsive borderless">
+                                    <tr>
+                                        <td class="frmLable">Provider:</td>
+                                        <td>
+                                            <asp:Label runat="server" ID="provider" /></td>
+                                        <td class="frmLable">Method:</td>
+                                        <td>
+                                            <asp:Label runat="server" ID="Method" /></td>
+                                    </tr>
+                                    <tr>
+                                        <td class="frmLable">Control No:</td>
+                                        <td>
+                                            <asp:Label runat="server" ID="ControlNo" /></td>
+                                        <td class="frmLable">User:</td>
+                                        <td>
+                                            <asp:Label runat="server" ID="User" /></td>
+                                    </tr>
+                                    <tr>
+                                        <td class="frmLable">Request Date:</td>
+                                        <td>
+                                            <asp:Label runat="server" ID="RequestDate" /></td>
+                                        <td class="frmLable">Response Date:</td>
+                                        <td>
+                                            <asp:Label runat="server" ID="ResponseDate" /></td>
+                                    </tr>
+                                    <tr>
+                                        <td class="frmLable">Code:</td>
+                                        <td>
+                                            <asp:Label runat="server" ID="Code" /></td>
+                                        <td class="frmLable">Message:</td>
+                                        <td>
+                                            <asp:Label runat="server" ID="Message" /></td>
+                                    </tr>
+                                    <tr>
+                                        <td>&nbsp;</td>
+                                    </tr>
+                                </table>
+                            </div>
+                        <div class="form-group">
+                            <table class="table-responsive">
+                                <tr>
+                                    <td colspan="4"><span class="frmLable">Request xml:</span><br />
+                                        <asp:TextBox ID="reqXml" runat="server" TextMode="MultiLine" Rows="15" Columns="98" ReadOnly="true" CssClass="form-control"></asp:TextBox>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>&nbsp;</td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><span class="frmLable">Response xml:</span><br />
+                                        <asp:TextBox ID="resXml" runat="server" TextMode="MultiLine" Rows="15" Columns="98" ReadOnly="true" CssClass="form-control"></asp:TextBox>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>&nbsp;</td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4">
+                                        <input type="button" id="close" class="btn btn-primary m-t-25" value="Close" onclick="javascript: window.close();" />
+                                    </td>
+                                </tr>
+                            </table>
+                        </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+</body>
+</html>

Swift.web/Remit/ThirdPartyTXN/InboundApiLog/InboundLog.aspx.cs

@@ -0,0 +1,47 @@
+using Swift.DAL.Remittance.Transaction;
+using Swift.web.Library;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace Swift.web.Remit.ThirdPartyTXN.InboundApiLog
+{
+    public partial class InboundLog : System.Web.UI.Page
+    {
+        private readonly ApiLogDao _apiLog = new ApiLogDao();
+        private const string ViewFunctionId = "20172000";
+        private readonly RemittanceLibrary _sl = new RemittanceLibrary();
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            _sl.CheckSession();
+            Authenticate();
+            LoadMessage();
+        }
+        private void Authenticate()
+        {
+            _sl.CheckAuthentication(ViewFunctionId);
+        }
+        private void LoadMessage()
+        {
+            var id = GetStatic.ReadNumericDataFromQueryString("id").ToString();
+            var res = _apiLog.GetInboundApiLogRecord(id);
+            if (res != null)
+            {
+                provider.Text = res["providerName"].ToString();
+                Method.Text = res["methodName"].ToString();
+                ControlNo.Text = res["controlNo"].ToString();
+                User.Text = res["requestedBy"].ToString();
+                RequestDate.Text = res["requestedDate"].ToString();
+                ResponseDate.Text = res["responseDate"].ToString();
+                //Code.Text = res["errorCode"].ToString();
+                //Message.Text = res["errorMessage"].ToString();
+                reqXml.Text = res["requestXml"].ToString();
+                resXml.Text = res["responseXml"].ToString();
+            }
+        }
+    }
+}

Swift.web/Remit/ThirdPartyTXN/InboundApiLog/InboundLog.aspx.designer.cs

@@ -0,0 +1,116 @@
+//------------------------------------------------------------------------------
+// <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.ThirdPartyTXN.InboundApiLog
+{
+
+
+    public partial class InboundLog
+    {
+
+        /// <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>
+        /// provider 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 provider;
+
+        /// <summary>
+        /// Method 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 Method;
+
+        /// <summary>
+        /// ControlNo 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 ControlNo;
+
+        /// <summary>
+        /// User 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 User;
+
+        /// <summary>
+        /// RequestDate 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 RequestDate;
+
+        /// <summary>
+        /// ResponseDate 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 ResponseDate;
+
+        /// <summary>
+        /// Code 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 Code;
+
+        /// <summary>
+        /// Message 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 Message;
+
+        /// <summary>
+        /// reqXml 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 reqXml;
+
+        /// <summary>
+        /// resXml 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 resXml;
+    }
+}

Swift.web/Remit/ThirdPartyTXN/InboundApiLog/InboundLogList.aspx

@@ -0,0 +1,70 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InboundLogList.aspx.cs" Inherits="Swift.web.Remit.ThirdPartyTXN.InboundApiLog.InboundLogList" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title></title>
+    <link href="/ui/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
+    <link href="/ui/css/style.css" rel="stylesheet" />
+    <link href="/ui/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
+    <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>
+    <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/functions.js"></script>
+    <script src="/js/swift_calendar.js"></script>
+    <link href="/ui/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
+    <link href="/ui/css/datepicker-custom.css" rel="stylesheet" />
+    <link href="/js/jQuery/jquery-ui.css" rel="stylesheet" type="text/css" />
+    <link href="/ui/css/waves.min.css" type="text/css" rel="stylesheet" />
+    <!--        <link rel="stylesheet" href="css/nanoscroller.css">-->
+    <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" src="/ui/js/jquery.min.js"></script>
+    <script type="text/javascript" src="/ui/bootstrap/js/bootstrap.min.js"></script>
+    <script src="/js/swift_calendar.js"></script>
+    <script src="/ui/js/pickers-init.js"></script>
+    <script src="/ui/js/jquery-ui.min.js"></script>
+    <script src="/ui/js/metisMenu.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.mask/1.14.15/jquery.mask.min.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="#" onclick="return LoadModule('other_services')">System Security</a></li>
+                            <li class="active"><a href="InboundLogList.aspx">Inbound API Log</a></li>
+                        </ol>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-md-12">
+                    <div class="panel panel-default ">
+                        <div class="panel-heading">
+                            <h4 class="panel-title">Inbound API Transaction Log List </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">
+                                <div id="rpt_grid" runat="server" class="gridDiv" enableviewstate="False">
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+</body>
+</html>

Swift.web/Remit/ThirdPartyTXN/InboundApiLog/InboundLogList.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.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace Swift.web.Remit.ThirdPartyTXN.InboundApiLog
+{
+    public partial class InboundLogList : System.Web.UI.Page
+    {
+        protected const string GridName = "apiLog";
+        private const string ViewFunctionId = "20172000";
+        private string sql;
+        private readonly SwiftGrid _grid = new SwiftGrid();
+        private readonly RemittanceLibrary _sl = new RemittanceLibrary();
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+            LoadGrid();
+        }
+
+
+        private void Authenticate()
+        {
+            _sl.CheckAuthentication(ViewFunctionId);
+        }
+
+        private void LoadGrid()
+        {
+            //string ddlSql = "EXEC [PROC_API_ROUTE_PARTNERS] @flag = 'agent-list'";
+            string ddlSql1 = "EXEC [proc_inboundApiLogs] @flag = 'method'";
+
+            _grid.FilterList = new List<GridFilter>
+                {
+                    //new GridFilter("agentId", "Partner", "1:"+ddlSql, "0")
+                     new GridFilter("agentId", "Log Type", "1:"+ddlSql1, "0")
+                    ,new GridFilter("logby", "Log By(username)", "T")                   
+                    ,new GridFilter("date", "Log date", "D")
+
+                    ,new GridFilter("controlno", "Control Number", "T")
+                    ,new GridFilter("processid", "Process  Id", "T")
+                };
+            _grid.ColumnList = new List<GridColumn>
+                {
+                    new GridColumn("SN","SN","","T"),
+                    new GridColumn("ProcessIdentifier", "processid", "", "T"),
+                    new GridColumn("RequestedBy","RequestedBy","","T"),
+                    new GridColumn("MethodName", "MethodName", "", "T"),
+                    new GridColumn("RequestedDate", "Date", "", "D"),
+                    new GridColumn("RequestJson", "RequestJson", "", "T"),
+                    new GridColumn("ResponseJson", "ResponseJson", "", "T"),
+                    new GridColumn("controlno","controlno","","T"),
+                };
+            _grid.GridDataSource = SwiftGrid.GridDS.RemittanceDB;
+            _grid.GridType = 1;
+            _grid.GridName = GridName;
+            _grid.RowIdField = "rowId";
+            _grid.InputPerRow = 5;
+
+            _grid.AlwaysShowFilterForm = true;
+            _grid.LoadGridOnFilterOnly = true;
+
+            _grid.AllowCustomLink = true;
+            _grid.CustomLinkText = Misc.GetIcon("vd", "OpenInNewWindow('InboundLog.aspx?id=@rowId')");
+            _grid.CustomLinkVariables = "rowId";
+
+            _grid.ShowFilterForm = true;
+            _grid.ShowPagingBar = true;
+
+            _grid.ThisPage = "InboundLogList.aspx";
+            sql = "EXEC proc_inboundApiLogs @flag = 's'";
+            _grid.SetComma();
+            rpt_grid.InnerHtml = _grid.CreateGrid(sql);
+        }
+    }
+}

Swift.web/Remit/ThirdPartyTXN/InboundApiLog/InboundLogList.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.ThirdPartyTXN.InboundApiLog
+{
+
+
+    public partial class InboundLogList
+    {
+
+        /// <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/ThirdPartyTXN/MobileApiLog/MobileApiLogList.aspx

@@ -0,0 +1,71 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MobileApiLogList.aspx.cs" Inherits="Swift.web.Remit.ThirdPartyTXN.MobileApiLog.MobileApiLogList" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title></title>
+    <link href="/ui/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
+    <link href="/ui/css/style.css" rel="stylesheet" />
+    <link href="/ui/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
+    <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>
+    <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/functions.js"></script>
+    <script src="/js/swift_calendar.js"></script>
+    <link href="/ui/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
+    <link href="/ui/css/datepicker-custom.css" rel="stylesheet" />
+    <link href="/js/jQuery/jquery-ui.css" rel="stylesheet" type="text/css" />
+    <link href="/ui/css/waves.min.css" type="text/css" rel="stylesheet" />
+    <!--        <link rel="stylesheet" href="css/nanoscroller.css">-->
+    <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" src="/ui/js/jquery.min.js"></script>
+    <script type="text/javascript" src="/ui/bootstrap/js/bootstrap.min.js"></script>
+    <script src="/js/swift_calendar.js"></script>
+    <script src="/ui/js/pickers-init.js"></script>
+    <script src="/ui/js/jquery-ui.min.js"></script>
+    <script src="/ui/js/metisMenu.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.mask/1.14.15/jquery.mask.min.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="#" onclick="return LoadModule('other_services')">System Security</a></li>
+                            <li class="active"><a href="InboundLogList.aspx">Mobile API Log</a></li>
+                        </ol>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-md-12">
+                    <div class="panel panel-default ">
+                        <div class="panel-heading">
+                            <h4 class="panel-title">Mobile API Log List </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">
+                                <div id="rpt_grid" runat="server" class="gridDiv" enableviewstate="False">
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+</body>
+</html>
+

Swift.web/Remit/ThirdPartyTXN/MobileApiLog/MobileApiLogList.aspx.cs

@@ -0,0 +1,81 @@
+using Swift.web.Component.Grid;
+using Swift.web.Component.Grid.gridHelper;
+using Swift.web.Library;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace Swift.web.Remit.ThirdPartyTXN.MobileApiLog
+{
+    public partial class MobileApiLogList : System.Web.UI.Page
+    {
+        protected const string GridName = "apiLog";
+        private const string ViewFunctionId = "20172000";
+        private string sql;
+        private readonly SwiftGrid _grid = new SwiftGrid();
+        private readonly RemittanceLibrary _sl = new RemittanceLibrary();
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+            Authenticate();
+            LoadGrid();
+        }
+
+
+        private void Authenticate()
+        {
+            _sl.CheckAuthentication(ViewFunctionId);
+        }
+
+        private void LoadGrid()
+        {
+            //string ddlSql = "EXEC [PROC_API_ROUTE_PARTNERS] @flag = 'agent-list'";
+            string ddlSql1 = "EXEC [proc_MobileApiLogs] @flag = 'method'";
+
+            _grid.FilterList = new List<GridFilter>
+                {
+                    //new GridFilter("agentId", "Partner", "1:"+ddlSql, "0")
+                     new GridFilter("agentId", "Log Type", "1:"+ddlSql1, "0")
+                    ,new GridFilter("logby", "Log By(username)", "T")
+                    ,new GridFilter("date", "Log date", "D")
+
+                    ,new GridFilter("controlno", "Control Number", "T")
+                    ,new GridFilter("processid", "Process  Id", "T")
+                };
+            _grid.ColumnList = new List<GridColumn>
+                {
+                    new GridColumn("SN","SN","","T"),
+                    new GridColumn("processId", "processid", "", "T"),
+                    new GridColumn("createdBy","RequestedBy","","T"),
+                    new GridColumn("methodName", "MethodName", "", "T"),
+                    new GridColumn("createdDate", "Date", "", "D"),
+                    new GridColumn("message", "RequestJson", "", "T"),
+                    //new GridColumn("ResponseJson", "ResponseJson", "", "T"),
+                    new GridColumn("controlno","controlno","","T"),
+                };
+            _grid.GridDataSource = SwiftGrid.GridDS.RemittanceDB;
+            _grid.GridType = 1;
+            _grid.GridName = GridName;
+            _grid.RowIdField = "rowId";
+            _grid.InputPerRow = 5;
+
+            _grid.AlwaysShowFilterForm = true;
+            _grid.LoadGridOnFilterOnly = true;
+
+            _grid.AllowCustomLink = true;
+            //_grid.CustomLinkText = Misc.GetIcon("vd", "OpenInNewWindow('InboundLog.aspx?id=@rowId')");
+            _grid.CustomLinkVariables = "rowId";
+
+            _grid.ShowFilterForm = true;
+            _grid.ShowPagingBar = true;
+
+            _grid.ThisPage = "InboundLogList.aspx";
+            sql = "EXEC proc_MobileApiLogs @flag = 's'";
+            _grid.SetComma();
+            rpt_grid.InnerHtml = _grid.CreateGrid(sql);
+        }
+    }
+}

Swift.web/Remit/ThirdPartyTXN/MobileApiLog/MobileApiLogList.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.ThirdPartyTXN.MobileApiLog
+{
+
+
+    public partial class MobileApiLogList
+    {
+
+        /// <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/Transaction/ApproveTxn/ApproveInwardRemitance.aspx

@@ -0,0 +1,304 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ApproveInwardRemitance.aspx.cs" Inherits="Swift.web.Remit.Transaction.ApproveTxn.ApproveInwardRemitance" %>
+
+<%@ Register TagPrefix="uc1" TagName="SwiftTextBox" Src="~/Component/AutoComplete/SwiftTextBox.ascx" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head id="Head1" runat="server">
+    <base id="Base2" runat="server" target="_self" />
+    <script src="/ui/js/jquery.min.js"></script>
+    <link href="/ui/bootstrap/css/bootstrap.min.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 src="/js/functions.js" type="text/javascript"> </script>
+    <script src="/js/Swift_grid.js" type="text/javascript"> </script>
+    <link href="/js/jQuery/jquery-ui.css" rel="stylesheet" type="text/css" />
+    <script type="text/javascript" src="/ui/js/jquery.min.js"></script>
+    <script src="/ui/js/jquery-ui.min.js"></script>
+    <script src="/js/swift_calendar.js" type="text/javascript"></script>
+    <script src="/js/swift_autocomplete.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.mask/1.14.15/jquery.mask.min.js" type="text/javascript"></script>
+
+    <script language="javascript" type="text/javascript">
+        function LoadCalendars() {
+            ShowCalFromToUpToToday("#<% =txnDate.ClientID%>");
+            $('#txnDate').mask('0000-00-00');
+        }
+        LoadCalendars();
+
+        function ClearFields() {
+            $('#tblForm').find('input:text').val('');
+            $('#tblForm').find('input:hidden').val('');
+            $('#tblForm').find('select').val('');
+            GetElement("<% =btnSearch.ClientID %>").click();
+        }
+
+        function ViewDetails(id) {
+            var url = "Manage.aspx?id=" + id;
+            var ret = OpenDialog(url, 800, 900, 50, 50);
+            if (ret) {
+                GetElement("<% =btnSearch.ClientID %>").click();
+            }
+        }
+
+        function ViewMapping(id) {
+            var url = "MappingInfo.aspx?id=" + id;
+            var ret = OpenDialog(url, 800, 900, 50, 50);
+        }
+
+        function Modify(id) {
+            var url = "Modify.aspx?tranId=" + id;
+            var ret = OpenDialog(url, 800, 900, 50, 50);
+            if (ret) {
+                GetElement("<% =btnSearch.ClientID %>").click();
+            }
+        }
+
+        function CheckAmount(id, tAmt) {
+            var strAmt = $("#amt_" + id).val();
+            var amt = parseFloat(strAmt);
+
+            if (isNaN(amt) || isNaN(strAmt) || amt < 0) {
+                $("#amt_" + id).val("");
+            }
+            var boolDisabled = ((isNaN(amt) || isNaN(strAmt) || amt == 0 || tAmt != amt));
+            EnableDisableBtn("btn_" + id, boolDisabled);
+            EnableDisableBtn("btn_r_" + id, boolDisabled);
+        }
+
+        function Approve(id) {
+            var amt = parseFloat($("#amt_" + id).val());
+            if (amt <= 0) {
+                window.parent.SetMessageBox("Invalid Amount", "1");
+                return;
+            }
+
+            SetValueById("<% = hddTranNo.ClientID %>", id, false);
+            GetElement("<% =btnApprove.ClientID %>").click();
+        }
+
+        function Reject(id) {
+            var url = "Reject.aspx?id=" + id;
+            var ret = OpenDialog(url, 800, 900, 50, 50);
+            if (ret) {
+                GetElement("<% =btnSearch.ClientID %>").click();
+            }
+        }
+
+        function ToggleCheckboxes(id, isRadioMode) {
+            if (isRadioMode) {
+                SelectDeselect("rowId", false);
+            } else {
+                ToggleSelection("rowId");
+            }
+            CallBackGrid();
+        }
+
+        function CallBackGrid(me, isRadioMode) {
+            if (isRadioMode) {
+                SelectDeselect("rowId", false);
+                me.checked = true;
+            }
+
+            var boolDisabled = !CanApprove("rowId");
+            EnableDisableBtn("<% =btnApproveAll.ClientID %>", boolDisabled);
+            ManageToggleCB("rowId");
+            if (boolDisabled === true) {
+                $("#<% =btnApproveAll.ClientID %>").addClass("hidden");
+            } else {
+                $("#<% =btnApproveAll.ClientID %>").removeClass("hidden");
+            }
+        }
+
+        function ToggleSelection(name) {
+            var boolCheck = GetElement("tgcb").checked;
+            SelectDeselect(name, boolCheck);
+        }
+
+        function SelectDeselect(name, boolCheck) {
+            var elements = document.getElementsByName(name);
+            for (var i = 0; i < elements.length; i++) {
+                elements[i].checked = boolCheck;
+            }
+        }
+
+        function CanApprove(name) {
+            var elements = document.getElementsByName(name);
+            for (var i = 0; i < elements.length; i++) {
+                if (elements[i].checked) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        function ManageToggleCB(name) {
+            var elements = document.getElementsByName(name);
+            for (var i = 0; i < elements.length; i++) {
+                if (!elements[i].checked) {
+                    GetElement("tgcb").checked = false;
+                    return false;
+                }
+            }
+            GetElement("tgcb").checked = true;
+        }
+    </script>
+</head>
+<body>
+
+    <form id="form1" runat="server">
+
+        <asp:ScriptManager ID="ScriptManager1" runat="server">
+        </asp:ScriptManager>
+
+        <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('transaction')">Transaction </a></li>
+                            <li class="active"><a href="ApproveInwardRemitance.aspx">Approve Inward Transaction </a></li>
+                        </ol>
+                    </div>
+                </div>
+            </div>
+
+            <div class="tab-content">
+                <div role="tabpanel" class="tab-pane active" id="Manage">
+                    <div class="row">
+                        <div class="col-md-12">
+                            <div class="panel panel-default ">
+                                <!-- Start .panel -->
+                                <div class="panel-heading">
+                                    <h4 class="panel-title">
+                                        <label>Approve Inward Remittance</label>
+                                    </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 class="row">
+                                        <div class="form-group">
+                                            <label>&nbsp;&nbsp;&nbsp;Search Transaction Criteria</label>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="form-group">
+                                            <div class="col-md-3">
+                                                <label>Sending Country</label>
+                                                <asp:DropDownList ID="country" runat="server" AutoPostBack="true" CssClass="form-control"
+                                                    OnSelectedIndexChanged="country_SelectedIndexChanged">
+                                                </asp:DropDownList>
+                                            </div>
+                                            <div class="col-md-3">
+                                                <label>Sending Agent</label>
+                                                <asp:DropDownList CssClass="form-control" ID="agent" runat="server" AutoPostBack="true"
+                                                    OnSelectedIndexChanged="agent_SelectedIndexChanged">
+                                                </asp:DropDownList>
+                                            </div>
+                                            <div class="col-md-3">
+                                                <label>Sending Branch</label>
+                                                <asp:DropDownList CssClass="form-control" ID="branch" runat="server"></asp:DropDownList>
+                                            </div>
+                                            <div class="col-md-3">
+                                                <label>Tran No</label>
+                                                <asp:TextBox ID="tranNo" runat="server" CssClass="form-control"></asp:TextBox>
+                                            </div>
+                                            <div class="col-md-3">
+                                                <label>PIN No.</label>
+                                                <asp:TextBox ID="ControlNo" runat="server" CssClass="form-control"></asp:TextBox>
+                                            </div>
+                                              <div class="col-md-3">
+                                                <label>Partner Id</label>
+                                                <asp:TextBox ID="ControlNo1" runat="server" CssClass="form-control"></asp:TextBox>
+                                            </div>
+                                            <div class="col-md-3">
+                                                <label>Receiving Country</label>
+                                                <asp:DropDownList CssClass="form-control" ID="rCountry" runat="server"></asp:DropDownList>
+                                            </div>
+                                            <div class="col-md-3">
+                                                <label>Sender Name</label>
+                                                <asp:TextBox ID="sender" runat="server" CssClass="form-control"></asp:TextBox>
+                                            </div>
+                                            <div class="col-md-3">
+                                                <label>Receiver Name</label>
+                                                <asp:TextBox ID="receiver" runat="server" CssClass="form-control"></asp:TextBox>
+                                            </div>
+                                            <div class="col-md-3">
+                                                <label>Amount</label>
+                                                <asp:TextBox ID="amt" runat="server" CssClass="form-control"></asp:TextBox>
+                                            </div>
+                                            <div class="col-md-3">
+                                                <label>Txn Date</label><br />
+                                                <asp:TextBox ID="txnDate" onchange="return DateValidation('txnDate','t')" MaxLength="10" runat="server" CssClass="form-control"></asp:TextBox>
+                                            </div>
+                                            <div class="col-md-3" style="display: none;">
+                                                <label>User</label><br />
+                                                <uc1:SwiftTextBox ID="user" Category="remit-users" runat="server" />
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="form-group">
+                                            <div class="col-md-4">
+                                                <asp:Button ID="btnSearch" runat="server" Text="Search Approve" CssClass="btn btn-primary"
+                                                    OnClick="btnSearch_Click" ValidationGroup="rpt" />
+                                                <input type="button" value="Clear Field" id="btnSclearField" class="btn btn-primary" onclick=" ClearFields(); " />
+                                                <div id="antiForgery" runat="server"></div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div id="approveList" runat="server">
+                                        <div id="rptGrid" runat="server" enableviewstate="false"></div>
+                                        <br />
+                                        <asp:Button ID="btnApproveAll" runat="server" CssClass='btn btn-primary m-t-25 hidden' Text="Approve Selected" Enabled="false" OnClick="btnApproveAll_Click" />
+                                    </div>
+                                    <div id="selfTxn" runat="server" class="col-sm-12"></div>
+                                    <br />
+                                    <asp:Button ID="btnApprove" runat="server" Text="Approve" CssClass="btn btn-primary" Style="display: none" OnClick="btnApprove_Click" />
+                                    <asp:Button ID="btnReject" runat="server" CssClass='btn btn-primary m-t-25' OnClick="btnReject_Click" Style="display: none" />
+                                    <asp:HiddenField ID="hddTranNo" runat="server" />
+                                    <asp:HiddenField ID="hdntabType" runat="server" />
+
+                                    <div>
+                                        <div id="txnSummary" runat="server" class="col-sm-12" enableviewstate="false"></div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+</body>
+</html>
+
+<script type="text/javascript">
+
+    function SelectTab(obj) {
+        document.getElementById('hdntabType').value = obj;
+        if (obj == "a") {
+            document.getElementById('appCnt').style.display = "block";
+            document.getElementById('selfTxn').style.display = "none";
+            document.getElementById('rptGrid').style.display = "block";
+            document.getElementById("a").setAttribute("class", "selected");
+            document.getElementById("s").setAttribute("class", "");
+        }
+        if (obj == "s") {
+            document.getElementById('appCnt').style.display = "none";
+            document.getElementById('selfCnt').style.display = "block";
+            document.getElementById('rptGrid').style.display = "none";
+            document.getElementById('selfTxn').style.display = "block";
+            document.getElementById("s").setAttribute("class", "selected");
+            document.getElementById("a").setAttribute("class", "");
+        }
+
+    }
+</script>

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

@@ -0,0 +1,409 @@
+using Swift.API.Common;
+using Swift.DAL.Remittance.Transaction;
+using Swift.web.Library;
+using Swift.DAL.SwiftDAL;
+using Swift.API.ThirdPartyApiServices;
+using System;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Web.Helpers;
+
+namespace Swift.web.Remit.Transaction.ApproveTxn
+{
+    public partial class ApproveInwardRemitance : System.Web.UI.Page
+    {
+        private ApproveInwardTransactionDao at = new ApproveInwardTransactionDao();
+        private const string ViewFunctionId = "20122800";
+        private const string ModifyFunctionId = "20122810";
+        private const string ApproveSingleFunctionId = "20122820";
+        private const string ApproveMultipleFunctionId = "20122830";
+        private const string RejectFuntionId = "20122840";
+        private readonly StaticDataDdl _sdd = new StaticDataDdl();
+        private readonly RemittanceLibrary _sl = new RemittanceLibrary();
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            Authenticate();
+            GetStatic.AttachConfirmMsg(ref btnApprove, "Are you sure to APPROVE this transaction?");
+            GetStatic.AttachConfirmMsg(ref btnApproveAll, "Are you sure to APPROVE ALL this transaction?");
+
+            if (!IsPostBack)
+            {
+                antiForgery.InnerHtml = AntiForgery.GetHtml().ToString();
+                LoadDdl();
+                LoadSendingAgent();
+                LoadApproveGrid("");
+                MakeNumericTextBox();
+
+               // _sl.SetPayStatusDdl(ref status, "", "All");
+                if (!string.IsNullOrEmpty(GetCountry()))
+                    LoadApproveGrid(GetCountry());
+                LoadHoldSummary();
+              
+            }
+            GetStatic.ResizeFrame(Page);
+
+        }
+        private void MakeNumericTextBox()
+        {
+            Misc.MakeNumericTextbox(ref amt);
+        }
+        private void Authenticate()
+        {
+            _sdd.CheckAuthentication(ViewFunctionId);
+        }
+        private string GetCountry()
+        {
+            return GetStatic.ReadQueryString("country", "");
+        }
+
+        private void LoadDdl()
+        {
+            // _sdd.SetDDL3(ref country, "EXEC proc_dropDownListsInboundApi @flag = 'a-countrySend'", "countryId", "countryName", "", "All");
+
+            _sdd.SetDDL(ref country, "EXEC proc_dropDownListsInboundApi @flag='a-countrySend'", "countryId", "countryName", "", "All");
+
+            var sql = "EXEC proc_dropDownLists @flag = 'a-countryPay'";
+            _sdd.SetDDL(ref rCountry, sql, "countryName", "countryName", "", "Select");
+        }
+        protected void country_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            LoadSendingAgent();
+            // Your event handling code here
+        }
+
+  
+
+        protected void agent_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            // Your event handling code here
+            if (!string.IsNullOrEmpty(agent.Text))
+            {
+                var sql = "EXEC proc_dropDownListsInboundApi @flag = 'branch', @agentId=" + _sdd.FilterString(agent.Text) + " , @user=" + _sdd.FilterString(GetStatic.GetUser());
+                _sdd.SetDDL(ref branch, sql, "agentId", "agentName", "", "All");
+            }
+            else
+            {
+                branch.Items.Clear();
+            }
+        }
+        private void LoadSendingAgent()
+        {
+            if (!string.IsNullOrEmpty(country.Text))
+                _sdd.SetDDL(ref agent, "EXEC proc_dropDownListsInboundApi @flag = 'agentSend',@param=" + _sdd.FilterString(country.Text) + "", "agentId", "agentName", "", "All");
+        }
+
+        private void LoadApproveGrid(string sCountry)
+        {
+            bool allowApprove = _sdd.HasRight(ApproveSingleFunctionId);
+            bool allowMultiple = false/* _sdd.HasRight(ApproveMultipleFunctionId)*/;
+            bool allowReject = _sdd.HasRight(RejectFuntionId);
+            bool allowModify = _sdd.HasRight(ModifyFunctionId);
+
+            if (!string.IsNullOrEmpty(sCountry))
+            {
+                if (sCountry.ToLower() == "All")
+                {
+                    // Clear the selection and load data for all countries
+                    country.ClearSelection();
+                }
+                else
+                {
+                    // Set the selected country
+                    country.SelectedItem.Text = sCountry;
+                }
+                // LoadSendingAgent();
+            }
+
+            //if (country.SelectedItem.Text == "" || country.SelectedItem.Text == "Select")
+            //{
+            //    //country.SelectedItem.Text = country.SelectedItem.Text;
+            //    country.SelectedItem.Text = "All";
+            //}
+            var ds = at.GetHoldedTXNListAdmin(GetStatic.GetUser(), branch.Text, tranNo.Text, rCountry.Text, sender.Text, receiver.Text
+                , amt.Text, GetStatic.GetBranch(), GetStatic.GetUserType()
+                , "s-admin", txnDate.Text, user.Text, ControlNo.Text, ControlNo1.Text, "I", country.SelectedItem.Text, agent.Text, branch.Text);
+
+            var dt = ds.Tables[0];
+            var sb = new StringBuilder();
+            var sbHead = new StringBuilder();
+            var colspanCount = 0;
+            int cols = dt.Columns.Count;
+            int cnt = 0;
+            sbHead.Append("<table class = 'table table-responsive table-striped table-bordered' >");
+            if (dt.Rows.Count > 0)
+            {
+                sb.Append("<tr>");
+                if (allowMultiple)
+                {
+                    colspanCount++;
+                    sb.Append("<th>");
+                    if (dt.Rows.Count > 0)
+                        sb.Append("<input type = 'checkbox' id = 'tgcb' onclick = 'ToggleCheckboxes(this,false);' />");
+                    sb.Append("</th>");
+                }
+                sb.Append("<th>Tran Id</th>");
+                sb.Append("<th>PIN No.</th>");
+                sb.Append("<th>Partner  Id</th>");
+                sb.Append("<th>Sending Branch</th>");
+                //sb.Append("<th>Txn Channel</th>");
+                sb.Append("<th>Country</th>");
+                sb.Append("<th>Sender</th>");
+                sb.Append("<th>Receiver</th>");
+                sb.Append("<th>Payout Amt</th>");
+                sb.Append("<th>Coll Amt</th>");
+                sb.Append("<th>S Charge</th>");
+                sb.Append("<th>Payment Method</th>");
+                //sb.Append("<th>Payment Option</th>");
+                //sb.Append("<th>Voucher No</th>");
+                sb.Append("<th nowrap='nowrap'>Tran Date</th>");
+                sb.Append("<th>User</th>");
+
+                if (allowApprove)
+                {
+                    colspanCount++;
+                    sb.Append("<th></th>");
+                    sb.Append("<th></th>");
+                }
+                if (allowApprove)
+                {
+                    colspanCount++;
+                    sb.Append("<th></th>");
+                }
+                sb.Append("</tr>");
+
+                foreach (DataRow dr in dt.Rows)
+                {
+                    cnt = cnt + 1;
+                    sb.AppendLine(cnt % 2 == 1
+                                       ? "<tr class=\"oddbg\" onMouseOver=\"this.className='GridOddRowOver'\" onMouseOut=\"this.className='oddbg'\" >"
+                                       : "<tr class=\"evenbg\"  onMouseOver=\"this.className='GridEvenRowOver'\" onMouseOut=\"this.className='evenbg'\">");
+                    if (allowMultiple)
+                        sb.Append("<td><input onclick = 'CallBackGrid(this,false);'  type='checkbox' name='rowId' value=\"" + dr["id"].ToString() + "\"></td>");
+
+                    sb.Append("<td>" + dr["id"].ToString() + "</td>");
+                    sb.Append("<td>" + dr["controlNo"].ToString() + "</td>");
+                    sb.Append("<td>" + dr["controlNo2"].ToString() + "</td>");
+                    sb.Append("<td>" + dr["BranchName"].ToString() + "</td>");
+                    //sb.Append("<td>" + dr["tranType"].ToString() + "</td>");
+                    sb.Append("<td>" + dr["country"].ToString() + "</td>");
+                    sb.Append("<td>" + dr["sender"].ToString() + "</td>");
+                    sb.Append("<td>" + dr["receiver"].ToString() + "</td>");
+                    sb.Append("<td style=\"font-weight: bold; font-style: italic; text-align: right;\">");
+                    sb.Append(GetStatic.FormatData(dr["pAmt"].ToString(), "M"));
+                    sb.Append("<td style=\"font-weight: bold; font-style: italic; text-align: right;\">");
+                    sb.Append(GetStatic.FormatData(dr["amt"].ToString(), "M"));
+                    sb.Append("<td style=\"font-weight: bold; font-style: italic; text-align: right;\">");
+                    sb.Append(GetStatic.FormatData(dr["serviceCharge"].ToString(), "M"));
+                    //sb.Append(GetStatic.FormatData(dr["serviceCharge"].ToString(), "M"));
+
+                    sb.Append("<td>" + dr["collMode"].ToString() + "</td>");
+                    //sb.Append("<td>" + dr["depositType"].ToString() + "</td>");
+                    //sb.Append("<td>" + dr["voucherNo"].ToString() + "</td>");
+                    sb.Append("<td>" + GetStatic.FormatData(dr["txnDate"].ToString(), "D") + "</td>");
+                    sb.Append("<td>" + dr["txncreatedBy"].ToString() + "</td>");
+
+                    //if (allowApprove)
+                    //    sb.Append("<td><img style='cursor:pointer' title = 'View Details' alt = 'View Details' src = '" + GetStatic.GetUrlRoot() + "/images/view-detail-icon.png' onclick = 'ViewDetails(" + dr["id"].ToString() + ");' /></td>");
+
+                    //if (allowApprove && dr["collMode"].ToString() == "Bank Deposit")
+                    //    sb.Append("<td><img style='cursor:pointer' title = 'Approve Deposit Mapping' alt = 'View Mapping' src = '" + GetStatic.GetUrlRoot() + "/images/view-changes.jpg' onclick = 'ViewMapping(" + dr["id"].ToString() + ");' /></td>");
+                    //else
+                    //    sb.Append("<td>&nbsp;</td>");
+
+                    //if (allowModify)
+                    //    sb.Append("<td><img style='cursor:pointer' title = 'Modify Transaction' alt = 'Modify Transaction' src = '" + GetStatic.GetUrlRoot() + "/images/edit.gif' onclick = 'Modify(" + dr["id"].ToString() + ");' /></td>");
+                    if (allowApprove || allowReject)
+                    {
+                        sb.Append("<td nowrap = \"nowrap\">");
+                        //var tb = Misc.MakeNumericTextbox("amt_" + dr["id"].ToString(), "amt_" + dr["id"].ToString(), "", "style='width:60px ! important'", "CheckAmount(" + dr["id"].ToString() + ", " + dr["amt"].ToString() + ");");
+                        //sb.Append(tb);
+
+                        if (allowApprove)
+                            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() + "'  />");
+                        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>");
+                    }
+                    sb.Append("</tr>");
+                }
+
+                btnApproveAll.Visible = allowMultiple;
+            }
+            else
+            {
+                btnApproveAll.Visible = false;
+            }
+
+            sbHead.Append("<tr><td colspan='" + cols + "' id='appCnt' nowrap='nowrap'>");
+            sbHead.Append("<b>" + dt.Rows.Count.ToString() + "  Transaction(s) found : <b>Approve Transaction List</b> </b></td>");
+            sbHead.Append("</tr>");
+            sbHead.Append(sb.ToString());
+            sbHead.Append("</table>");
+            rptGrid.InnerHtml = sbHead.ToString();
+            approveList.Visible = true;
+
+            selfTxn.Visible = false;
+            if (dt.Rows.Count == 0)
+            {
+                _sl.ManageInvalidControlNoAttempt(Page, GetStatic.GetUser(), "N");
+                return;
+            }
+            GetStatic.ResizeFrame(Page);
+        }
+
+
+        protected void btnSearch_Click(object sender, EventArgs e)
+        {
+            LoadApproveGrid("");
+        }
+        protected void btnApproveAll_Click(object sender, EventArgs e)
+        {
+            var dr = ApproveAllTxn();
+            GetStatic.PrintMessage(Page, dr);
+            if (dr.ErrorCode.Equals("0"))
+            {
+                LoadApproveGrid("");
+                LoadHoldSummary();
+            }
+
+
+        }
+
+        private DbResult ApproveAllTxn()
+        {
+            var idList1 = GetStatic.ReadFormData("rowId", "");
+
+            if (string.IsNullOrWhiteSpace(idList1))
+            {
+                var dr = new DbResult();
+                dr.SetError("1", "Please select one or more transaction approve", "");
+                return dr;
+            }
+            return at.ApproveAllHoldedTXN(GetStatic.GetUser(), idList1);
+        }
+
+        private void LoadHoldSummary()
+        {
+            var ds = at.GetHoldAdminTransactionSummary(GetStatic.GetUser(), GetStatic.GetBranch(), GetStatic.GetUserType());
+            if (ds == null || ds.Tables.Count == 0)
+                return;
+            var dt = ds.Tables[0];
+            var sbHead = new StringBuilder();
+            int count = 0;
+            if (dt.Rows.Count > 0)
+            {
+                sbHead.Append("<table class = 'table table-responsive table-bordered table-striped'>");
+                sbHead.Append("<tr>");
+                sbHead.Append("<th colspan='3'>HOLD Transaction Summary</th>");
+                sbHead.Append("</tr>");
+
+                sbHead.Append("<tr>");
+                sbHead.Append("<th>S.N.</th>");
+                sbHead.Append("<th>Sending Country</th>");
+                sbHead.Append("<th>Count</th>");
+                sbHead.Append("</tr>");
+
+                foreach (DataRow dr in dt.Rows)
+                {
+                    sbHead.Append("<tr>");
+                    sbHead.Append("<td>" + dr["sn"] + "</td>");
+                    sbHead.Append("<td><a href='ApproveInwardRemitance.aspx?country=" + dr["country"] + "'>" + dr["country"] + "</a></td>");
+                    sbHead.Append("<td align=\"center\">" + dr["txnCount"] + "</td>");
+                    sbHead.Append("</tr>");
+                    count = count + int.Parse(dr["txnCount"].ToString());
+                }
+                sbHead.Append("<tr><td colspan='2'><b>Total</b></td>");
+                sbHead.Append("<td align=\"center\"><b>" + count.ToString() + "</b></td>");
+                sbHead.Append("</tr>");
+                sbHead.Append("</table>");
+                txnSummary.InnerHtml = sbHead.ToString();
+            }
+        }
+        protected void btnApprove_Click(object sender, EventArgs e)
+        {
+            ApproveTxn();
+        }
+        private void ApproveTxn()
+        {
+            AntiForgery.Validate();
+            //ApproveTxnMain();
+            DbResult _dbRes = at.GetTxnApproveDataIMEPay(GetStatic.GetUser(), hddTranNo.Value);
+            if (_dbRes.ErrorCode != "0")
+            {
+                GetStatic.PrintMessage(Page, _dbRes);
+                return;
+            }
+            //else if (_dbRes.Extra == "True")//is realtime
+            if (_dbRes.Extra2 == "True")//is realtime
+            {
+                SendTransactionServices _tpSend = new SendTransactionServices();
+                string ProcessId = Guid.NewGuid().ToString().Replace("-", "") + ":" + _dbRes.Extra1 + ":releaseTxn";
+                var result = _tpSend.ReleaseTransaction(new TFReleaseTxnRequest()
+                {
+                    TfPin = _dbRes.Id, 
+                    TxnId = _dbRes.Extra,
+                    RequestBy = GetStatic.GetUser(),
+                    ProviderId = _dbRes.Extra1,
+                    ProcessId = ProcessId.Substring(ProcessId.Length - 40, 40)
+                });
+                _dbRes.ErrorCode = result.ResponseCode;
+                _dbRes.Msg = result.Msg;
+                _dbRes.Id = "";
+
+                if (_dbRes.ErrorCode != "0")
+                {
+                    GetStatic.PrintMessage(Page, _dbRes);
+                    return;
+                }
+                else
+                {
+                    ApproveTxnMain();
+                }
+            }
+            else
+            {
+                ApproveTxnMain();
+            }
+        }
+
+        protected void ApproveTxnMain()
+        {
+            DbResult dbResult = at.ApproveHoldedTXN(GetStatic.GetUser(), hddTranNo.Value);
+            if (dbResult.ErrorCode == "0")
+            {
+                LoadApproveGrid("");
+                LoadHoldSummary();
+                GetStatic.PrintMessage(Page, dbResult);
+                return;
+            }
+            else if (dbResult.ErrorCode == "11")
+            {
+                string url = "../NewReceiptIRH.aspx?printType=&controlNo=" + dbResult.Id;
+                Response.Redirect(url);
+            }
+            else
+            {
+                GetStatic.PrintMessage(Page, dbResult);
+                return;
+            }
+        }
+
+        protected void btnReject_Click(object sender, EventArgs e)
+        {
+            RejectTxn();
+        }
+        private void RejectTxn()
+        {
+            var dr = at.RejectHoldedTXN(GetStatic.GetUser(), hddTranNo.Value);
+            GetStatic.PrintMessage(Page, dr);
+            if (dr.ErrorCode.Equals("0"))
+            {
+                LoadApproveGrid("");
+                LoadHoldSummary();
+            }
+        }
+
+    }
+}

Swift.web/Remit/Transaction/ApproveTxn/ApproveInwardRemitance.aspx.designer.cs

@@ -0,0 +1,260 @@
+//------------------------------------------------------------------------------
+// <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.Transaction.ApproveTxn
+{
+
+
+    public partial class ApproveInwardRemitance
+    {
+
+        /// <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>
+        /// Base2 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 Base2;
+
+        /// <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>
+        /// ScriptManager1 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 ScriptManager1;
+
+        /// <summary>
+        /// country 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 country;
+
+        /// <summary>
+        /// agent 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 agent;
+
+        /// <summary>
+        /// branch 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 branch;
+
+        /// <summary>
+        /// tranNo 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 tranNo;
+
+        /// <summary>
+        /// ControlNo 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 ControlNo;
+
+        /// <summary>
+        /// ControlNo1 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 ControlNo1;
+
+        /// <summary>
+        /// rCountry 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 rCountry;
+
+        /// <summary>
+        /// sender 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 sender;
+
+        /// <summary>
+        /// receiver 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 receiver;
+
+        /// <summary>
+        /// amt 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 amt;
+
+        /// <summary>
+        /// txnDate 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 txnDate;
+
+        /// <summary>
+        /// user control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::Swift.web.Component.AutoComplete.SwiftTextBox user;
+
+        /// <summary>
+        /// btnSearch 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 btnSearch;
+
+        /// <summary>
+        /// antiForgery 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 antiForgery;
+
+        /// <summary>
+        /// approveList 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 approveList;
+
+        /// <summary>
+        /// rptGrid 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 rptGrid;
+
+        /// <summary>
+        /// btnApproveAll 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 btnApproveAll;
+
+        /// <summary>
+        /// selfTxn 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 selfTxn;
+
+        /// <summary>
+        /// btnApprove 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 btnApprove;
+
+        /// <summary>
+        /// btnReject 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 btnReject;
+
+        /// <summary>
+        /// hddTranNo 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 hddTranNo;
+
+        /// <summary>
+        /// hdntabType 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 hdntabType;
+
+        /// <summary>
+        /// txnSummary 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 txnSummary;
+    }
+}

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/PromotionalCampaign/Manage.aspx

@@ -22,7 +22,7 @@
         $(document).ready(function () {
 			//CalTillToday("#grid_list_fromDate");
 			//CalTillToday("#grid_list_toDate");
-			ShowCalFromToUpToToday("#startDate", "#endDate");
+            ShowCalendar("#startDate", "#endDate");
 			$('#startDate').mask('0000-00-00');
 			$('#endDate').mask('0000-00-00');
         });

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

@@ -24,7 +24,7 @@
         function GetAgentId() {
             return GetValue("<%=pAgent.ClientID %>");
         }
-         
+
         function LoadCalendars() {
             $('#<% =frmDate.ClientID%>').mask('0000-00-00');
             $('#<% =toDate.ClientID%>').mask('0000-00-00');
@@ -40,8 +40,14 @@
                 country = GetElement("<% = ddlPCountry.ClientID%>").options[GetElement("<% = ddlPCountry.ClientID%>").selectedIndex].text;
             }
             var agent = GetValue("<% =payoutPartner.ClientID %>");
+            //var sCountry = GetValue("<% =ddlSCountry.ClientID %>");
+            var sCountry = "";
+            sCountry = GetValue("<% =ddlSCountry.ClientID %>");
+            if (sCountry != "") {
+                sCountry = GetElement("<% = ddlSCountry.ClientID%>").options[GetElement("<% = ddlSCountry.ClientID%>").selectedIndex].text;
+            }
             var depositType = GetValue("<% =depositType.ClientID %>");
-
+            var remitTYpe = GetValue("<% =remitTYpe.ClientID %>");
             var orderBy = GetValue("<% =orderBy.ClientID %>");
             var status = GetValue("<% =status.ClientID %>");
             var paymentType = GetValue("<% =paymentType.ClientID %>");
@@ -66,8 +72,9 @@
             //var url = "../../../../AgentNew/Reports/Reports.aspx?reportName=txnReport&pCountry=" + country +
                 //var url = "../Reports.aspx?reportName=40111600&pCountry=" + country +
                 "&pAgent=" + agent +
-                //"&sBranch=" + sBranch +
+                "&sCountry=" + sCountry +
                 "&depositType=" + depositType +
+                "&remitTYpe=" + remitTYpe +
                 "&searchBy=" + searchBy +
                 "&searchByValue=" + searchByValue +
                 "&orderBy=" + orderBy +
@@ -175,6 +182,23 @@
                                 <div class="col-md-9 form-group">
                                     <asp:DropDownList runat="server" ID="ddlPCountry" CssClass="form-control">
                                     </asp:DropDownList>
+                                </div>
+                                  <div class="col-md-3 form-group">
+                                    <label>Sending Country:</label>
+                                </div>
+                                <div class="col-md-9 form-group">
+                                    <asp:DropDownList runat="server" ID="ddlSCountry" CssClass="form-control">
+                                    </asp:DropDownList>
+                                </div>
+                                   <div class="col-md-3 form-group">
+                                    <label>Remittance Type:</label>
+                                </div>
+                                <div class="col-md-9 form-group">
+                                    <asp:DropDownList runat="server" ID="remitTYpe" CssClass="form-control">
+                                         <asp:ListItem Value="">All</asp:ListItem>
+                                        <asp:ListItem Value="0">Out ward</asp:ListItem>
+                                        <asp:ListItem Value="IN">In Ward</asp:ListItem>
+                                    </asp:DropDownList>
                                 </div>
                                 <div class="col-md-3 form-group">
                                     <label>Payout Partner:</label>

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

@@ -82,6 +82,7 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
             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() + "'", "detailTitle", "detailTitle", "", "All");
             sl.SetDDL(ref ddlPCountry, "EXEC proc_dropDownLists @flag='pCountry'", "countryId", "countryName", "", "All");
+            sl.SetDDL(ref ddlSCountry, "EXEC proc_dropDownLists @flag='sCountry'", "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");
             sl.SetDDL(ref ddlPromotionCode, "EXEC proc_online_dropDownList @flag='promoCode'", "detailTitle", "detailTitle", "", "All");

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

@@ -86,6 +86,24 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList ddlPCountry;
 
+        /// <summary>
+        /// ddlSCountry 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 ddlSCountry;
+
+        /// <summary>
+        /// remitTYpe 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 remitTYpe;
+
         /// <summary>
         /// payoutPartner control.
         /// </summary>

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,23 +36,44 @@
         .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;
         }
+
+        table {
+            border-collapse: collapse;
+            width: 100%;
+        }
+
+        #repTable #fixedTH th {
+            background-color: white;
+            color: black;
+            position: sticky;
+            z-index: 100;
+            top: 0;
+            border: 1px solid black;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+        }
     </style>
     <%
         if (GetStatic.ReadQueryString("mode", "") == "")
         {
     %>
+
     <% }%>
 </head>
 <body>

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

@@ -40,8 +40,9 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
             string pageNumber = GetStatic.ReadQueryString("pageNumber", "1");
             var country = GetStatic.ReadQueryString("pCountry", "");
             var pAgent = GetStatic.ReadQueryString("pAgent", "");
-            //var flag = GetStatic.ReadQueryString("flag", "");
+            var sCountry = GetStatic.ReadQueryString("sCountry", "");
             var depositType = GetStatic.ReadQueryString("depositType", "");
+            var remitTYpe = GetStatic.ReadQueryString("remitTYpe", "");
             var searchBy = GetStatic.ReadQueryString("searchBy", "");
             var searchByValue = GetStatic.ReadQueryString("searchByValue", "");
             var orderBy = GetStatic.ReadQueryString("orderBy", "");
@@ -57,7 +58,7 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
             var mode = GetStatic.ReadQueryString("mode", "");
             var postCode = GetStatic.ReadQueryString("postCode", "");
             var promoCode = GetStatic.ReadQueryString("promoCode", "");
-            var dt = _obj.TxnReport(GetStatic.GetUser(), country, pAgent, depositType, orderBy, status, paymentType, dateField, from, to, transType, displayTranNo, searchBy, searchByValue, pageNumber, GetStatic.GetReportPagesize(), rptType, tFrom, postCode, promoCode);
+            var dt = _obj.TxnReport(GetStatic.GetUser(), country, pAgent, sCountry, depositType, remitTYpe, orderBy, status, paymentType, dateField, from, to, transType, displayTranNo, searchBy, searchByValue, pageNumber, GetStatic.GetReportPagesize(), rptType, tFrom, postCode, promoCode);
 
             if (dt == null)
                 return;
@@ -113,8 +114,9 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
                 StringBuilder strTable = new StringBuilder();
 
                 strTable.Append("<h3><b>Payout Partner: " + payoutPartner + "</b></h3>");
-                strTable.Append("<table class='table table-responsive table-bordered'>");
+                strTable.Append("<table id='repTable' class='table table-responsive table-bordered'>");
 
+                strTable.Append("<thead id='fixedTH'>");
                 strTable.Append("<tr>");
                 strTable.Append("<th>SN</th>");
 
@@ -123,6 +125,7 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
                     strTable.Append("<th><div align=\"left\">" + col.ColumnName + "</div></th>");
                 }
                 strTable.Append("</tr>");
+                strTable.Append("</thead>");
 
                 int sn = 1;
 
@@ -178,15 +181,15 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
 
                 for (int i = 0; i < partnerTable.Columns.Count; i++)
                 {
-                    if (i == 14 || i == 16 || i == 17 || i == 18 || i == 23 || i == 24)
+                    if (i == 17 || i == 19 || i == 20|| i == 21 || i == 22 || i == 24 || i == 27)
                     {
                         decimal total = partnerTable.AsEnumerable()
                             .Sum(row => decimal.TryParse(row[i].ToString(), out decimal val) ? val : 0);
-                        if(i == 14)
+                        if(i == 17)
                         {
                             strTable.Append("<td align=\"left\"><b>" + total + "</b></td>");
                         }
-                        else if (i == 22)
+                        else if (i == 26)
                         {
                             strTable.Append("<td align=\"left\"><b>" + total + " USD</b></td>");
                         }

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/UpdateBranchCode/Manage.aspx.cs

@@ -136,6 +136,7 @@ namespace Swift.web.Remit.Transaction.UpdateBranchCode
             var branchCode = Request.Form["branchCode"];
             var isActive = Request.Form["isActive"];
 
+
             DataTable dt = null;
 
             dt = _rd.InsertBranch(GetStatic.GetUser(), "insertBranch", countryId, bankId, branchName, branchCode , isActive );

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

@@ -387,6 +387,23 @@
                                 </table>
                             </td>
 
+                            <td class="row">
+                                <table class="table table-bordered table-striped" id="tblVerifiedLog" runat="server" visible="false">
+                                    <tr>
+                                        <td>Verified By:</td>
+                                        <td>
+                                            <asp:Label ID="verifiedBy" runat="server"></asp:Label>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>Verified Date:</td>
+                                        <td>
+                                            <asp:Label ID="verifiedDate" runat="server"></asp:Label>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+
                             <td class="row">
                                 <table class="table table-bordered table-striped table-responsive" id="tblCreatedFrom" runat="server" visible="true">
                                     <tr>
@@ -867,6 +884,18 @@
                                     <asp:Label ID="branchName" runat="server"></asp:Label>
                                 </td>
                             </tr>
+                             <tr id="trPostdate" runat="server">
+                                <td>Posted Date: </td>
+                                <td class="text">
+                                    <asp:Label ID="postDate" runat="server"></asp:Label>
+                                </td>
+                            </tr>
+                             <tr id="trReleaseDate" runat="server">
+                                <td>Release Date: </td>
+                                <td class="text">
+                                    <asp:Label ID="releaseDate" runat="server"></asp:Label>
+                                </td>
+                            </tr>
                         </div>
                     </table>
                 </div>

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

@@ -348,6 +348,8 @@ namespace Swift.web.Remit.UserControl
                             accountNo.Text = tRow["accountNo"].ToString();
                             bankName.Text = tRow["BankName"].ToString();
                             branchName.Text = tRow["BranchName"].ToString();
+                            postDate.Text = tRow["postDate"].ToString();
+                            releaseDate.Text = tRow["releaseDate"].ToString();
                             pBranchName.Text = tRow["pBranchName"].ToString();
                         }
                     }
@@ -442,12 +444,15 @@ namespace Swift.web.Remit.UserControl
                     createdFrom.Text = tRow["createdFrom"].ToString();
                     hddPayTokenId.Value = tRow["payTokenId"].ToString();
                     introducer.Text = tRow["introducer"].ToString();
+                    verifiedBy.Text = tRow["verifiedBy"].ToString();
+                    verifiedDate.Text = tRow["verifiedDate"].ToString();
 
                     tblCreatedLog.Visible = createdBy.Text != "";
                     tblApprovedLog.Visible = approvedBy.Text != "";
                     tblPaidLog.Visible = paidBy.Text != "";
                     tblCancelRequestedLog.Visible = cancelRequestedBy.Text != "";
                     tblCancelApprovedLog.Visible = cancelApprovedBy.Text != "";
+                    tblVerifiedLog.Visible = verifiedBy.Text != "";
 
                     trNameAsPerBank.Visible = false;
                     if (!string.IsNullOrEmpty(tRow["receiverNameAlt"].ToString()))
@@ -865,6 +870,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;

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

@@ -221,6 +221,33 @@ namespace Swift.web.Remit.UserControl
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label cancelApprovedDate;
 
+        /// <summary>
+        /// tblVerifiedLog 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.HtmlTable tblVerifiedLog;
+
+        /// <summary>
+        /// verifiedBy 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 verifiedBy;
+
+        /// <summary>
+        /// verifiedDate 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 verifiedDate;
+
         /// <summary>
         /// tblCreatedFrom control.
         /// </summary>
@@ -896,6 +923,42 @@ namespace Swift.web.Remit.UserControl
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label branchName;
 
+        /// <summary>
+        /// trPostdate 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.HtmlTableRow trPostdate;
+
+        /// <summary>
+        /// postDate 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 postDate;
+
+        /// <summary>
+        /// trReleaseDate 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.HtmlTableRow trReleaseDate;
+
+        /// <summary>
+        /// releaseDate 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 releaseDate;
+
         /// <summary>
         /// voucherDetailDiv control.
         /// </summary>

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

@@ -150,7 +150,7 @@ namespace Swift.web.RemittanceSystem.RemittanceReports.DynamicReport
             return (new TranAgentReportDao().GetAccountingSummary(GetStatic.GetUser(), "RPT", fromDate, toDate));
         }
         private ReportResult PrepareCustomerRegistrationReport()
-        {
+         {
             string fromDate = GetStatic.ReadQueryString("from", "");
             string toDate = GetStatic.ReadQueryString("to", "");
             string sAgent = GetStatic.ReadQueryString("sAgent", "");
@@ -158,6 +158,7 @@ namespace Swift.web.RemittanceSystem.RemittanceReports.DynamicReport
             string withAgent = GetStatic.ReadQueryString("withAgent", "");
             mergeColumnHead = true;
             return (new TranAgentReportDao().GetNewRegistrationReport(GetStatic.GetUser(), "customer", fromDate, toDate, sAgent, sBranch, withAgent));
+
         }
         private ReportResult PrepareLowTxnReport()
         {
@@ -165,8 +166,10 @@ namespace Swift.web.RemittanceSystem.RemittanceReports.DynamicReport
             string postCode = GetStatic.ReadQueryString("postCode", "");
             string txnCountType = GetStatic.ReadQueryString("txnCountType", "");
             string txnCount = GetStatic.ReadQueryString("txnCount", "");
+
             return (new TranAgentReportDao().GetLowTxnReport(GetStatic.GetUser(), "txn-report", fromDate, postCode, txnCountType, txnCount));
         }
+        
         private void PrintHead()
         {
             Page.Title = reportResult.ReportHead;

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

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

Swift.web/RemittanceSystem/RemittanceReports/ReportDownload.cs

@@ -40,6 +40,9 @@ namespace Swift.web.RemittanceSystem.RemittanceReports
                 case "customerregistration":
                     path = PrepareCustomerRegistrationReport();
                     break;
+                //case "lowTxnReport":
+                //    path = PrepareLowTxnReport();
+                //    break;
             }
             return path;
 
@@ -61,6 +64,24 @@ namespace Swift.web.RemittanceSystem.RemittanceReports
             return DataSetToExcelNew(dataset, "CustomerRegistration");
 
         }
+
+        //public string PrepareLowTxnReport()
+        //{
+        //    this.UserDefinedHeader = false;
+        //    this.ShowTableFilter = false;
+        //    this.fieldFormatExcel = "T|T|T|T|T|T|T|D|D|T|T|T|D|T|T|D|T|T|T|T|T|T|T";
+
+        //    string fromDate = GetStatic.ReadQueryString("from", "");
+        //    //string toDate = GetStatic.ReadQueryString("to", "");
+        //    //string sAgent = GetStatic.ReadQueryString("sAgent", "");
+        //    //string sBranch = GetStatic.ReadQueryString("sBranch", "");
+        //    //string withAgent = GetStatic.ReadQueryString("withAgent", "");
+        //    DataSet dataset = (new TranAgentReportDao().GetLowTxnReport(GetStatic.GetUser(), "txn-report", fromDate)).Result;
+        //    this.TotalColumns = dataset.Tables[0].Columns.Count;
+        //    this.TotalRows = dataset.Tables[0].Rows.Count;
+        //    return DataSetToExcelNew(dataset, "CustomerRegistration");
+
+        //}
         public string PrepareCustomerAndTxnList()
         {
             this.UserDefinedHeader = false;

Swift.web/Swift.web.csproj

@@ -80,8 +80,8 @@
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="Select.HtmlToPdf, Version=20.2.0.0, Culture=neutral, PublicKeyToken=e0ae9f6e27a97018, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Select.HtmlToPdf.20.2.0\lib\net40\Select.HtmlToPdf.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -455,6 +455,7 @@
     <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="Common\JPPost.css" />
     <Content Include="Common\JPPostKYCInquiry.aspx" />
     <Content Include="content\images\Jcrop.gif" />
@@ -463,6 +464,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 +1111,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" />
@@ -1383,11 +1387,15 @@
     <Content Include="Remit\AgeingReport\AgeingReportNew\SearchReceivableAgeingNew.aspx" />
     <Content Include="Remit\AgeingReport\OutstandingReport.aspx" />
     <Content Include="Remit\AgeingReport\SearchOutstanding.aspx" />
+    <Content Include="Remit\ThirdPartyTXN\InboundApiLog\InboundLog.aspx" />
+    <Content Include="Remit\ThirdPartyTXN\InboundApiLog\InboundLogList.aspx" />
+    <Content Include="Remit\ThirdPartyTXN\MobileApiLog\MobileApiLogList.aspx" />
     <Content Include="Remit\TPSetup\BankAndBranchSetup\AddBank.aspx" />
     <Content Include="Remit\TPSetup\BankAndBranchSetup\AddBankMapping.aspx" />
     <Content Include="Remit\TPSetup\BankAndBranchSetup\AddBranch.aspx" />
-    <Content Include="Remit\TPSetup\BankAndBranchSetup\ListBranch.aspx" />
     <Content Include="Remit\TPSetup\BankAndBranchSetup\NewBankList.aspx" />
+    <Content Include="Remit\TPSetup\BankAndBranchSetup\ListBranch.aspx" />
+    <Content Include="Remit\Transaction\ApproveTxn\ApproveInwardRemitance.aspx" />
     <Content Include="Remit\Transaction\ApproveTxn\holdTxnListMobile.aspx" />
     <Content Include="Remit\Transaction\CancelPartnerTxn\CancelPartnerTxn.aspx" />
     <Content Include="Remit\Transaction\ModifyRequest\Search.aspx" />
@@ -1401,6 +1409,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" />
@@ -6913,7 +6922,6 @@
       <DependentUpon>ViewDetail.aspx</DependentUpon>
     </Compile>
     <Compile Include="Remit\Administration\PaymentModeDao.cs" />
-    <Compile Include="Remit\Administration\PromotionalRateDao.cs" />
     <Compile Include="Remit\Administration\ReferralSetup\Manage.aspx.cs">
       <DependentUpon>Manage.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -6950,6 +6958,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" />
@@ -8108,6 +8117,20 @@
     <Compile Include="Remit\ThirdPartyTXN\APILog\Manage.aspx.designer.cs">
       <DependentUpon>Manage.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Remit\ThirdPartyTXN\InboundApiLog\InboundLog.aspx.cs">
+      <DependentUpon>InboundLog.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Remit\ThirdPartyTXN\InboundApiLog\InboundLog.aspx.designer.cs">
+      <DependentUpon>InboundLog.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Remit\ThirdPartyTXN\InboundApiLog\InboundLogList.aspx.cs">
+      <DependentUpon>InboundLogList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Remit\ThirdPartyTXN\InboundApiLog\InboundLogList.aspx.designer.cs">
+      <DependentUpon>InboundLogList.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Remit\ThirdPartyTXN\KFTCLog\List.aspx.cs">
       <DependentUpon>List.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -8122,6 +8145,13 @@
     <Compile Include="Remit\ThirdPartyTXN\KFTCLog\Manage.aspx.designer.cs">
       <DependentUpon>Manage.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Remit\ThirdPartyTXN\MobileApiLog\MobileApiLogList.aspx.cs">
+      <DependentUpon>MobileApiLogList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Remit\ThirdPartyTXN\MobileApiLog\MobileApiLogList.aspx.designer.cs">
+      <DependentUpon>MobileApiLogList.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Remit\ThirdPartyTXN\Reconcile\Manage.aspx.cs">
       <DependentUpon>Manage.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -8150,6 +8180,13 @@
     <Compile Include="Remit\TPSetup\BankAndBranchSetup\AddBranch.aspx.designer.cs">
       <DependentUpon>AddBranch.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Remit\TPSetup\BankAndBranchSetup\AddBank.aspx.cs">
+      <DependentUpon>AddBank.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Remit\TPSetup\BankAndBranchSetup\AddBank.aspx.designer.cs">
+      <DependentUpon>AddBank.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Remit\TPSetup\BankAndBranchSetup\BankList.aspx.cs">
       <DependentUpon>BankList.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -8185,6 +8222,34 @@
     <Compile Include="Remit\TPSetup\BankAndBranchSetup\NewBankList.aspx.designer.cs">
       <DependentUpon>NewBankList.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Remit\TPSetup\BankAndBranchSetup\AddBankMapping.aspx.cs">
+      <DependentUpon>AddBankMapping.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Remit\TPSetup\BankAndBranchSetup\AddBankMapping.aspx.designer.cs">
+      <DependentUpon>AddBankMapping.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Remit\TPSetup\BankAndBranchSetup\AddBranch.aspx.cs">
+      <DependentUpon>AddBranch.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Remit\TPSetup\BankAndBranchSetup\AddBranch.aspx.designer.cs">
+      <DependentUpon>AddBranch.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Remit\TPSetup\BankAndBranchSetup\NewBankList.aspx.cs">
+      <DependentUpon>NewBankList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Remit\TPSetup\BankAndBranchSetup\NewBankList.aspx.designer.cs">
+      <DependentUpon>NewBankList.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Remit\TPSetup\BankAndBranchSetup\ListBranch.aspx.cs">
+      <DependentUpon>ListBranch.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Remit\TPSetup\BankAndBranchSetup\ListBranch.aspx.designer.cs">
+      <DependentUpon>ListBranch.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Remit\TPSetup\PartnerSetup\List.aspx.cs">
       <DependentUpon>List.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -8276,6 +8341,13 @@
     <Compile Include="Remit\Transaction\Agent\Send\Domestic\SendV2.aspx.designer.cs">
       <DependentUpon>SendV2.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Remit\Transaction\ApproveTxn\ApproveInwardRemitance.aspx.cs">
+      <DependentUpon>ApproveInwardRemitance.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Remit\Transaction\ApproveTxn\ApproveInwardRemitance.aspx.designer.cs">
+      <DependentUpon>ApproveInwardRemitance.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Remit\Transaction\ApproveTxn\holdOnlineTxnList.aspx.cs">
       <DependentUpon>holdOnlineTxnList.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

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

@@ -9,11 +9,11 @@
 
 namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
 {
-    
-    
+
+
     public partial class Manage
     {
-        
+
         /// <summary>
         /// Head1 control.
         /// </summary>
@@ -22,7 +22,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// 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>
@@ -31,7 +31,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// 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>
@@ -40,7 +40,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.ScriptManager ScriptManger1;
-        
+
         /// <summary>
         /// up control.
         /// </summary>
@@ -49,7 +49,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.UpdatePanel up;
-        
+
         /// <summary>
         /// pnl1 control.
         /// </summary>
@@ -58,7 +58,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Panel pnl1;
-        
+
         /// <summary>
         /// divTab control.
         /// </summary>
@@ -67,7 +67,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// 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>
@@ -76,7 +76,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblMsg;
-        
+
         /// <summary>
         /// branchCodeField control.
         /// </summary>
@@ -85,7 +85,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl branchCodeField;
-        
+
         /// <summary>
         /// branchCode control.
         /// </summary>
@@ -94,7 +94,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox branchCode;
-        
+
         /// <summary>
         /// RequiredFieldValidator2 control.
         /// </summary>
@@ -103,7 +103,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator2;
-        
+
         /// <summary>
         /// Rfd1 control.
         /// </summary>
@@ -112,7 +112,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator Rfd1;
-        
+
         /// <summary>
         /// agentName control.
         /// </summary>
@@ -121,15 +121,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox agentName;
-        
-        /// <summary>
-        /// RequiredFieldValidator1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        
+
         /// <summary>
         /// businessLicense control.
         /// </summary>
@@ -138,7 +130,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox businessLicense;
-        
+
         /// <summary>
         /// RequiredFieldValidator3 control.
         /// </summary>
@@ -147,7 +139,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator3;
-        
+
         /// <summary>
         /// businessOrgType control.
         /// </summary>
@@ -156,7 +148,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList businessOrgType;
-        
+
         /// <summary>
         /// rfd22 control.
         /// </summary>
@@ -165,7 +157,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator rfd22;
-        
+
         /// <summary>
         /// agentType control.
         /// </summary>
@@ -174,7 +166,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList agentType;
-        
+
         /// <summary>
         /// isSettlingAgent control.
         /// </summary>
@@ -183,7 +175,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList isSettlingAgent;
-        
+
         /// <summary>
         /// RequiredFieldValidator4 control.
         /// </summary>
@@ -192,7 +184,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator4;
-        
+
         /// <summary>
         /// businessType control.
         /// </summary>
@@ -201,7 +193,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList businessType;
-        
+
         /// <summary>
         /// contractExpiryDate control.
         /// </summary>
@@ -210,7 +202,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox contractExpiryDate;
-        
+
         /// <summary>
         /// rv1 control.
         /// </summary>
@@ -219,7 +211,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RangeValidator rv1;
-        
+
         /// <summary>
         /// renewalFollowupDate control.
         /// </summary>
@@ -228,7 +220,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox renewalFollowupDate;
-        
+
         /// <summary>
         /// rv2 control.
         /// </summary>
@@ -237,7 +229,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RangeValidator rv2;
-        
+
         /// <summary>
         /// rfv control.
         /// </summary>
@@ -246,7 +238,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator rfv;
-        
+
         /// <summary>
         /// agentGroup control.
         /// </summary>
@@ -255,7 +247,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList agentGroup;
-        
+
         /// <summary>
         /// agentSettCurr control.
         /// </summary>
@@ -264,7 +256,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList agentSettCurr;
-        
+
         /// <summary>
         /// isHeadOffice control.
         /// </summary>
@@ -273,7 +265,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList isHeadOffice;
-        
+
         /// <summary>
         /// rfd9 control.
         /// </summary>
@@ -282,7 +274,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator rfd9;
-        
+
         /// <summary>
         /// agentCountry control.
         /// </summary>
@@ -291,7 +283,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList agentCountry;
-        
+
         /// <summary>
         /// lblRegionType control.
         /// </summary>
@@ -300,7 +292,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblRegionType;
-        
+
         /// <summary>
         /// agentState control.
         /// </summary>
@@ -309,7 +301,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList agentState;
-        
+
         /// <summary>
         /// agentDistrict control.
         /// </summary>
@@ -318,7 +310,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList agentDistrict;
-        
+
         /// <summary>
         /// agentCity control.
         /// </summary>
@@ -327,7 +319,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox agentCity;
-        
+
         /// <summary>
         /// spnAgentLocation control.
         /// </summary>
@@ -336,7 +328,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spnAgentLocation;
-        
+
         /// <summary>
         /// agentLocation control.
         /// </summary>
@@ -345,7 +337,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList agentLocation;
-        
+
         /// <summary>
         /// rfd5 control.
         /// </summary>
@@ -354,7 +346,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator rfd5;
-        
+
         /// <summary>
         /// agentAddress control.
         /// </summary>
@@ -363,7 +355,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox agentAddress;
-        
+
         /// <summary>
         /// mapCodeDom control.
         /// </summary>
@@ -372,7 +364,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox mapCodeDom;
-        
+
         /// <summary>
         /// partnerBankcode control.
         /// </summary>
@@ -381,7 +373,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox partnerBankcode;
-        
+
         /// <summary>
         /// upd2 control.
         /// </summary>
@@ -390,7 +382,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.UpdatePanel upd2;
-        
+
         /// <summary>
         /// rfd11 control.
         /// </summary>
@@ -399,7 +391,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator rfd11;
-        
+
         /// <summary>
         /// agentPhone1 control.
         /// </summary>
@@ -408,7 +400,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox agentPhone1;
-        
+
         /// <summary>
         /// AGENT_PHONE1_FilteredTextBoxExtender control.
         /// </summary>
@@ -417,7 +409,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::AjaxControlToolkit.FilteredTextBoxExtender AGENT_PHONE1_FilteredTextBoxExtender;
-        
+
         /// <summary>
         /// agentPhone2 control.
         /// </summary>
@@ -426,7 +418,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox agentPhone2;
-        
+
         /// <summary>
         /// FilteredTextBoxExtende control.
         /// </summary>
@@ -435,7 +427,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::AjaxControlToolkit.FilteredTextBoxExtender FilteredTextBoxExtende;
-        
+
         /// <summary>
         /// agentMobile1 control.
         /// </summary>
@@ -444,7 +436,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox agentMobile1;
-        
+
         /// <summary>
         /// FilteredTextBoxExtender6 control.
         /// </summary>
@@ -453,7 +445,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::AjaxControlToolkit.FilteredTextBoxExtender FilteredTextBoxExtender6;
-        
+
         /// <summary>
         /// agentFax1 control.
         /// </summary>
@@ -462,7 +454,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox agentFax1;
-        
+
         /// <summary>
         /// FilteredTextBoxExtender5 control.
         /// </summary>
@@ -471,7 +463,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::AjaxControlToolkit.FilteredTextBoxExtender FilteredTextBoxExtender5;
-        
+
         /// <summary>
         /// rfv12443 control.
         /// </summary>
@@ -480,7 +472,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator rfv12443;
-        
+
         /// <summary>
         /// contactPerson1 control.
         /// </summary>
@@ -489,7 +481,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox contactPerson1;
-        
+
         /// <summary>
         /// agentMobile2 control.
         /// </summary>
@@ -498,7 +490,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox agentMobile2;
-        
+
         /// <summary>
         /// FilteredTextBoxExtender8 control.
         /// </summary>
@@ -507,7 +499,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::AjaxControlToolkit.FilteredTextBoxExtender FilteredTextBoxExtender8;
-        
+
         /// <summary>
         /// agentFax2 control.
         /// </summary>
@@ -516,7 +508,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox agentFax2;
-        
+
         /// <summary>
         /// FilteredTextBoxExtender1 control.
         /// </summary>
@@ -525,7 +517,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::AjaxControlToolkit.FilteredTextBoxExtender FilteredTextBoxExtender1;
-        
+
         /// <summary>
         /// contactPerson2 control.
         /// </summary>
@@ -534,7 +526,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox contactPerson2;
-        
+
         /// <summary>
         /// RegularExpressionValidator2 control.
         /// </summary>
@@ -543,7 +535,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RegularExpressionValidator RegularExpressionValidator2;
-        
+
         /// <summary>
         /// agentEmail1 control.
         /// </summary>
@@ -552,7 +544,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox agentEmail1;
-        
+
         /// <summary>
         /// RegularExpressionValidator6 control.
         /// </summary>
@@ -561,7 +553,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RegularExpressionValidator RegularExpressionValidator6;
-        
+
         /// <summary>
         /// agentEmail2 control.
         /// </summary>
@@ -570,7 +562,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox agentEmail2;
-        
+
         /// <summary>
         /// agentBlock control.
         /// </summary>
@@ -579,7 +571,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList agentBlock;
-        
+
         /// <summary>
         /// isActive control.
         /// </summary>
@@ -588,7 +580,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList isActive;
-        
+
         /// <summary>
         /// bankCode control.
         /// </summary>
@@ -597,7 +589,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox bankCode;
-        
+
         /// <summary>
         /// bankBranch control.
         /// </summary>
@@ -606,7 +598,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox bankBranch;
-        
+
         /// <summary>
         /// accHolderName control.
         /// </summary>
@@ -615,7 +607,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox accHolderName;
-        
+
         /// <summary>
         /// accNumber control.
         /// </summary>
@@ -624,7 +616,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox accNumber;
-        
+
         /// <summary>
         /// isApiPartner control.
         /// </summary>
@@ -633,7 +625,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CheckBox isApiPartner;
-        
+
         /// <summary>
         /// intlCheck control.
         /// </summary>
@@ -642,7 +634,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CheckBox intlCheck;
-        
+
         /// <summary>
         /// agentDetails control.
         /// </summary>
@@ -651,7 +643,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox agentDetails;
-        
+
         /// <summary>
         /// headMsgShow control.
         /// </summary>
@@ -660,7 +652,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl headMsgShow;
-        
+
         /// <summary>
         /// headMessage control.
         /// </summary>
@@ -669,7 +661,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox headMessage;
-        
+
         /// <summary>
         /// divAuditLog control.
         /// </summary>
@@ -678,7 +670,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divAuditLog;
-        
+
         /// <summary>
         /// bntSubmit control.
         /// </summary>
@@ -687,7 +679,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button bntSubmit;
-        
+
         /// <summary>
         /// ConfirmButtonExtender2 control.
         /// </summary>
@@ -696,7 +688,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::AjaxControlToolkit.ConfirmButtonExtender ConfirmButtonExtender2;
-        
+
         /// <summary>
         /// btnDelete control.
         /// </summary>
@@ -705,7 +697,7 @@ namespace Swift.web.SwiftSystem.UserManagement.AgentSetup
         /// 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>

Swift.web/Web.config

@@ -72,9 +72,8 @@
     <!--<add key="JMECoreAPIURL" value="http://localhost:65345/" />-->
     <add key="JMECoreAPI_HeaderToken" value="KPb1ttRs3CJnORpVU8SmAKUs7a42vtvjzQ47gU0b4u0vxAEI0PgZref6puzkVhLTX2PRNMGCbnb2TglupsjV5AGhYvw8a8POTcUcFSrEdHmTkhkIGNvUvxSpKjUOXGFQWaGU1bxoqqUSaFOmNE5zGojVmwPoMy38CNLwnpQKjdsIuxCKGCApa2gWHJl9gebmIpUODv9jAZgmMEaXqyR4CLg4iSksfTyYNjdqxEE88P5THYt5GuNk8Ti6K2RxIKfPWY49hBOpiYnXcApgSDiKFYqQG9WuZ7cvDGJIWg5WgWKjGle8Y3OydhONXVkN5OMPXDA4VZkK4c5nM363Zkg4w4qdzWuwhsEoAwU4rej6sMRZue3L0BowBJja1OK0iPoTX70EexX8rviMLOZPUDwhxzkL3eODS69VEEbjHb8WSjhho5h3KnCE4tcqCWihwSZ8Yuyhw1rzIMNw2C8pN1GEJyXc6goIFkf7dmK9ynJSxu52D9GjOkKqoD7dFNFulOFVfgeCuhPDYG2A2c2RSvGHv24VDXvmGVaAMLiPtsTz5oD8f0na7fX1xGg0Qveh0KgQL5THnrMK6gm5Ky7O8nbecIxY"/>
     <!-- Stagin DB Connection -->
-    <!--<add key="connectionString" value="server=77.68.90.58,1433;Database=FastMoneyPro_Account;uid=remituser;pwd=U78SclK6" />
-    <add key="RemittanceString" value="server=77.68.90.58,1433;Database=FastMoneyPro_Remit;uid=remituser;pwd=U78SclK6" />-->
-    <add key="connectionString" value="server=77.68.15.91\MSSQLSERVER01,1434;Database=FastMoneyPro_Account;uid=user_stag;pwd=P@ssw0rd"/>
+    <add key="connectionString" value="server=77.68.15.91\MSSQLSERVER01,1434;Database=FastMoneyPro_Account;uid=sa;pwd=DbAmin123" />
+    <add key="RemittanceString" value="server=77.68.15.91\MSSQLSERVER01,1434;Database=FastMoneyPro_Remit;uid=sa;pwd=DbAmin123" />
     <add key="RemittanceString" value="server=77.68.15.91\MSSQLSERVER01,1434;Database=FastMoneyPro_Remit;uid=user_stag;pwd=P@ssw0rd"/>
     <add key="tranNoName" value="JME No"/>
     <add key="root" value="D:\C# Projects\Personal\JME_Japan\WEB-CORE\Swift.web\"/>
@@ -113,7 +112,7 @@
     <add key="OFAC_ADD" value="https://www.treasury.gov/ofac/downloads/consolidated/cons_add.pip"/>
     <add key="OFAC_UNSCR" value="https://scsanctions.un.org/resources/xml/en/consolidated.xml"/>
     <add key="eto" value="180"/>
-    <add key="methodType" value="loqate"/>
+    <add key="methodType" value="loqate" />
     <add key="verifyDocUpload" value="D:\TestUpload\"/>
     <!--Email Sending configurations-->
     <!--<add key="SendEmailId" value="support@japanremit.com" />

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>

Swift.web/js/swift_calendar.js

@@ -367,6 +367,57 @@ function ShowCalFromToUpToToday(calFrom, calTo, nom) {
     });
 }
 
+function ShowCalendar(calFrom, calTo, nom) {
+    if (nom === null || nom === "" || nom === undefined) nom = 1;
+    $(function () {
+        if (calFrom !== undefined && calFrom.length > 0) {
+            $(calFrom).datepicker({
+                //defaultDate: "+1w",
+                changeMonth: true,
+                changeYear: true,
+                numberOfMonths: 1,
+                showOn: "both",
+                dateFormat: dateFormatType,
+                //buttonImage: imgPath,
+                // buttonImageOnly: true,
+                maxDate: "+0",
+                //minDate: "-2Y",
+                //onSelect: function (selectedDate) {
+                //    alert('aaa');
+                //    $(calTo).datepicker("option", "minDate", selectedDate);
+                //}
+            });
+            //var fromDateIdNameOnly = calFrom.split('#')[1];
+            //document.getElementById(fromDateIdNameOnly).setAttribute("onchange", "return DateValidation('" + fromDateIdNameOnly + "','t')");
+        }
+        if (calTo !== undefined && calTo.length > 0) {
+            $(calTo).datepicker({
+                //defaultDate: "+1w",
+                changeMonth: true,
+                changeYear: true,
+                numberOfMonths: nom,
+                showOn: "both",
+                //buttonImage: imgPath,
+                //buttonImageOnly: true,
+                dateFormat: dateFormatType,
+                maxDate: "+10Y",
+                //minDate: "-2Y",
+                //onSelect: function (selectedDate) {
+                //    alert('dasd');
+                //    $(calFrom).datepicker("option", "maxDate", selectedDate);
+                //}
+            });
+            //var toDateIdNameOnly = calFrom.split('#')[1];
+            //if (calTo !== undefined && calTo.length > 0) {
+            //    document.getElementById(toDateIdNameOnly).removeAttribute("onchange");
+            //    toDateIdNameOnly = calTo.split("#")[1];
+            //    document.getElementById(toDateIdNameOnly).setAttribute("onchange", "return DateValidation('" + toDateIdNameOnly + "','t','" + toDateIdNameOnly + "')");
+            //    document.getElementById(toDateIdNameOnly).setAttribute("onchange", "return DateValidation('" + toDateIdNameOnly + "','t','" + toDateIdNameOnly + "')");
+            //}
+        }
+    });
+}
+
 function ShowCalFromToUpToTodayForInput(calFrom, calTo, nom) {
     if (nom === null || nom === "" || nom === undefined) nom = 1;
     $(function () {
@@ -393,6 +444,7 @@ function ShowCalFromToUpToTodayForInput(calFrom, calTo, nom) {
 //// Input Date Validation
 
 function DateValidation(id, typeVal, compareId, compareTypeVal) {
+    debugger
     var firstDate = '';
     var firstId = id;
     var inputDate = document.getElementById(id).value;
@@ -414,6 +466,8 @@ function DateValidation(id, typeVal, compareId, compareTypeVal) {
                 currentDates[1] = '0' + currentDates[1];
             }
             inputDate = dates[0] + "-" + dates[1] + "-" + dates[2];
+            //currentDate = currentDates[2] + '-' + currentDates[0] + '-' + currentDates[1];
+
             currentDate = currentDates[2] + '-' + currentDates[0] + '-' + currentDates[1];
             if (typeVal === "dob") {
                 CalSenderDOB("#" + id);

Swift.web/js/swift_grid.js

@@ -369,4 +369,5 @@ function DownloadExcel(path) {
     url = path + "/Download.aspx?mode=download";
     window.open(url, "", "width=825,height=500,resizable=1,status=1,toolbar=0,scrollbars=1,center=1");
 }
+
 //GRID FILTER ENDS

Swift.web/packages.config

@@ -9,7 +9,7 @@
   <package id="Microsoft.AspNet.WebPages" version="3.2.9" targetFramework="net481" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net481" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net481" />
-  <package id="Select.HtmlToPdf" version="20.2.0" targetFramework="net481" />
+  <package id="Select.HtmlToPdf" version="20.2.0" targetFramework="net461" />
   <package id="Selenium.WebDriver" version="3.141.0" targetFramework="net481" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net481" />
   <package id="System.ComponentModel.Annotations" version="5.0.0" targetFramework="net481" />

Swift.web/ui/css/style.css

@@ -639,7 +639,6 @@ p {
 .nav-tabs > li > a {
     display: block;
     font-size: 11px;
-    font: Verdana;
     text-decoration: none;
     line-height: 1.3em;
     padding: 10px 15px;
@@ -649,6 +648,8 @@ p {
     border-bottom: 1px solid #bbbbbb;
     background-color: #444d58;
     font-weight: bold;
+    top: 6px;
+    left: 1px;
 }
 
     .nav-tabs > li > a:focus, .nav > li > a:hover {