diff --git a/Business/Customer/CustomerServices.cs b/Business/Customer/CustomerServices.cs index c6343cc..cf399cd 100644 --- a/Business/Customer/CustomerServices.cs +++ b/Business/Customer/CustomerServices.cs @@ -19,12 +19,20 @@ namespace Business.Customer { return _customerRepo.AddCustomerSignature(customerId, user, fileName, signaturetype, signatureId); } - + public DbResult AddCustomerPDFUpload(string customerId, string user, string fileName, string fileType, string rowIdField) + { + return _customerRepo.AddCustomerPDFUpload(customerId, user, fileName, fileType, rowIdField); + } public string GetCustomerDetailsForFileUpload(string customerId) { return _customerRepo.GetCustomerDetailsForFileUpload(customerId); } + public string GetCustomerDetailsForPDFSave(string membershipId, string rowIdField, string type) + { + return _customerRepo.GetCustomerDetailsForPDFSave(membershipId, rowIdField, type); + } + public DataTable GetAddressByZipCodeNew(string zipCode, string user, string rowId) { return _customerRepo.GetAddressByZipCodeNew(zipCode, user, rowId); diff --git a/Business/Customer/ICustomerServices.cs b/Business/Customer/ICustomerServices.cs index 65a9d07..82f050d 100644 --- a/Business/Customer/ICustomerServices.cs +++ b/Business/Customer/ICustomerServices.cs @@ -19,7 +19,9 @@ namespace Business.Customer DbResult RegisterCustomerAndReceiver(OnlineCustomerModel onlineCustomerModel, BenificiaryModel beniciaryModel); DbResult AddCustomerSignature(string customerId, string user, string fileName, string signaturetype, string signatureId); + DbResult AddCustomerPDFUpload(string customerId, string user, string fileName, string fileType, string rowIdField); string GetCustomerDetailsForFileUpload(string customerId); + string GetCustomerDetailsForPDFSave(string membershipId, string rowIdField, string type); DataTable GetAddressByZipCodeNew(string zipCode, string user, string rowId); diff --git a/Common/Common.csproj b/Common/Common.csproj index 1e7951b..8261ea6 100644 --- a/Common/Common.csproj +++ b/Common/Common.csproj @@ -33,9 +33,15 @@ 4 + + ..\packages\ceTe.DynamicPDF.CoreSuite.NET.10.34.0\lib\net40\DynamicPDF.NETFramework40.dll + ..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\Select.HtmlToPdf.20.1.0\lib\net40\Select.HtmlToPdf.dll + @@ -70,4 +76,11 @@ + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + \ No newline at end of file diff --git a/Common/Helper/GetStatic.cs b/Common/Helper/GetStatic.cs index 3c03bab..de928ed 100644 --- a/Common/Helper/GetStatic.cs +++ b/Common/Helper/GetStatic.cs @@ -1,4 +1,5 @@ using Common.Model; +using SelectPdf; using System; using System.Collections.Generic; using System.Configuration; @@ -33,6 +34,50 @@ namespace Common.Helper } } + public static string URIToPDF(string uri, string user, string fileSaveLocation, string divIdToOnlySelectInURI = "") + { + string fileName = GetDateTimeStamp() + "_" + user + ".pdf"; + string fileLocation = ReadWebConfig("root", "") + "temp\\pdf\\" + fileName; + HtmlToPdf converter = new HtmlToPdf(); + + PdfDocument doc = converter.ConvertUrl(uri); + doc.Save(fileLocation); + doc.Close(); + + if (!File.Exists(fileSaveLocation)) + Directory.CreateDirectory(fileSaveLocation); + + File.Move(fileLocation, fileSaveLocation + fileName); + + return fileName; + } + + public static string HTMLToPDF(string htmlString, string user, string fileSaveLocation, string filePrefix = "") + { + string fileName = GetDateTimeStamp() + "_" + user + ".pdf"; + if (!string.IsNullOrEmpty(filePrefix)) + fileName = filePrefix + fileName; + + string fileLocation = ReadWebConfig("root", "") + "temp\\pdf\\" + fileName; + HtmlToPdf converter = new HtmlToPdf(); + + PdfDocument doc = converter.ConvertHtmlString(htmlString, ReadWebConfig("root", "")); + doc.Save(fileLocation); + doc.Close(); + + if (!File.Exists(fileSaveLocation)) + Directory.CreateDirectory(fileSaveLocation); + + File.Move(fileLocation, fileSaveLocation + fileName); + + return fileName; + } + + public static string GetDateTimeStamp() + { + return DateTime.Now.ToString("yyyyMMddHHmmssffff"); + } + public static void WriteSession(string key, string value) { HttpContext.Current.Session[key] = value; @@ -367,7 +412,7 @@ namespace Common.Helper { string fileExtension = ".png"; string fileName = customerId + "_signature_" + DateTime.Now.Hour.ToString() + DateTime.Now.Millisecond.ToString() + "_" + registerDate.Replace("-", "_") + fileExtension; - string path = GetStatic.GetCustomerFilePath() + "CustomerDocument\\" + registerDate.Replace("-", "\\") + "\\" + membershipId; + string path = GetCustomerFilePath() + "CustomerDocument\\" + registerDate.Replace("-", "\\") + "\\" + membershipId; if (!Directory.Exists(path)) Directory.CreateDirectory(path); diff --git a/Common/packages.config b/Common/packages.config index 449fea3..6347ad5 100644 --- a/Common/packages.config +++ b/Common/packages.config @@ -1,4 +1,6 @@  + + \ No newline at end of file diff --git a/Database/Sp/PROC_REFERRAL_TRANSACTION_REPORT.sql b/Database/Sp/PROC_REFERRAL_TRANSACTION_REPORT.sql index a052074..9c390e0 100644 --- a/Database/Sp/PROC_REFERRAL_TRANSACTION_REPORT.sql +++ b/Database/Sp/PROC_REFERRAL_TRANSACTION_REPORT.sql @@ -14,7 +14,8 @@ SET XACT_ABORT ON; BEGIN IF @FLAG = 'S' BEGIN - SELECT DBO.DECRYPTDB(CONTROLNO) CONTROLNO, CONVERT(VARCHAR,CREATEDDATE,102) CREATEDDATE, CAMT, SENDERNAME, COLLMODE + SELECT ''+dbo.FNADecryptString(controlNo)+'' CONTROLNO + , CONVERT(VARCHAR,CREATEDDATE,102) CREATEDDATE, CAMT, SENDERNAME, COLLMODE FROM REMITTRAN (NOLOCK) WHERE PROMOTIONCODE = @REFERRAL_CODE AND TRANSTATUS <> 'CANCEL' @@ -23,7 +24,7 @@ BEGIN IF @FLAG = 'TOP-5' BEGIN SELECT TOP 5 ''+dbo.FNADecryptString(controlNo)+'' CONTROLNO - , CONVERT(VARCHAR,CREATEDDATE,102) CREATEDDATE, CAMT, SENDERNAME, COLLMODE, PAMT + , CONVERT(VARCHAR,CREATEDDATE,102) CREATEDDATE, CAMT, SENDERNAME, COLLMODE, PAMT FROM REMITTRAN (NOLOCK) WHERE PROMOTIONCODE = @REFERRAL_CODE AND TRANSTATUS <> 'CANCEL' @@ -31,3 +32,4 @@ BEGIN END END + diff --git a/JMEAgentSystem/JMEAgentSystem.csproj b/JMEAgentSystem/JMEAgentSystem.csproj index 8fe764e..221d8e5 100644 --- a/JMEAgentSystem/JMEAgentSystem.csproj +++ b/JMEAgentSystem/JMEAgentSystem.csproj @@ -729,6 +729,8 @@ + + Web.config diff --git a/JMEAgentSystem/Properties/PublishProfiles/FolderProfile.pubxml b/JMEAgentSystem/Properties/PublishProfiles/FolderProfile.pubxml index e8de41a..3b448d5 100644 --- a/JMEAgentSystem/Properties/PublishProfiles/FolderProfile.pubxml +++ b/JMEAgentSystem/Properties/PublishProfiles/FolderProfile.pubxml @@ -12,7 +12,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt True False - H:\JME\JME_Remit_Live\Published_JME\JME_Agent_System + E:\C# Projects\UAT\JME_JAPAN\JME_Remit_Live\Published_JME\JME_Agent_System False \ No newline at end of file diff --git a/JMEAgentSystem/Properties/PublishProfiles/FolderProfile.pubxml.user b/JMEAgentSystem/Properties/PublishProfiles/FolderProfile.pubxml.user index a6fb6bb..63675dc 100644 --- a/JMEAgentSystem/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/JMEAgentSystem/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -6,1325 +6,1325 @@ by editing this MSBuild file. In order to learn more about this please visit htt - <_PublishTargetUrl>H:\JME\JME_Remit_Live\Published_JME\JME_Agent_System + <_PublishTargetUrl>E:\C# Projects\UAT\JME_JAPAN\JME_Remit_Live\Published_JME\JME_Agent_System - 08/31/2020 12:52:53 + 08/28/2020 12:34:36 - 08/11/2020 16:55:36 + 08/06/2020 12:48:04 - 08/11/2020 16:55:50 + 10/20/2019 12:20:23 - 08/11/2020 16:55:50 + 10/20/2019 12:20:23 - 08/11/2020 16:55:37 + 10/20/2019 12:20:23 - 08/11/2020 16:55:37 + 10/20/2019 12:20:23 - 08/11/2020 16:55:35 + 10/20/2019 12:30:45 - 08/11/2020 16:55:47 + 10/20/2019 12:30:49 - 08/11/2020 16:55:35 + 10/20/2019 12:30:45 - 09/01/2020 17:10:26 + 09/03/2020 18:42:30 - 09/01/2020 17:10:26 + 09/03/2020 18:42:30 - 09/01/2020 17:10:25 + 08/27/2020 15:41:27 - 09/01/2020 17:10:25 + 08/27/2020 15:41:27 - 08/11/2020 16:55:33 + 10/20/2019 12:21:00 - 08/11/2020 16:55:34 + 10/20/2019 12:21:00 - 09/02/2020 18:07:05 + 09/03/2020 18:42:31 - 09/02/2020 18:07:05 + 09/03/2020 18:42:31 - 08/11/2020 16:55:49 + 10/20/2019 12:21:02 - 08/11/2020 16:55:49 + 10/20/2019 12:21:02 - 08/11/2020 16:55:50 + 10/20/2019 12:21:03 - 08/11/2020 16:55:48 + 10/20/2019 12:21:03 - 08/11/2020 16:55:50 + 10/20/2019 12:21:06 - 08/11/2020 16:55:47 + 10/20/2019 12:21:58 - 08/11/2020 16:55:50 + 10/20/2019 12:22:56 - 08/11/2020 16:55:37 + 10/20/2019 12:22:56 - 08/11/2020 16:55:39 + 10/20/2019 12:22:57 - 08/11/2020 16:55:28 + 10/20/2019 12:22:57 - 08/11/2020 16:55:32 + 10/20/2019 12:22:57 - 08/11/2020 16:55:36 + 10/20/2019 12:22:57 - 08/11/2020 16:55:49 + 10/20/2019 12:22:57 - 08/11/2020 16:55:48 + 10/20/2019 12:22:58 - 08/11/2020 16:55:47 + 10/20/2019 12:22:58 - 08/11/2020 16:55:39 + 10/20/2019 12:21:05 - 08/11/2020 16:55:39 + 10/20/2019 12:21:05 - 08/11/2020 16:55:47 + 10/20/2019 12:22:58 - 08/11/2020 16:55:31 + 10/20/2019 12:23:11 - 08/11/2020 16:55:49 + 10/20/2019 12:23:17 - 09/01/2020 17:10:25 + 09/03/2020 18:42:30 - 09/01/2020 17:10:25 + 09/03/2020 18:42:30 - 08/11/2020 16:55:44 + 10/20/2019 12:22:55 - 08/11/2020 16:55:45 + 10/20/2019 12:22:55 - 08/11/2020 16:55:44 + 10/20/2019 12:22:55 - 08/11/2020 16:55:45 + 10/20/2019 12:22:55 - 08/11/2020 16:55:45 + 10/20/2019 12:22:55 - 08/11/2020 16:55:44 + 10/20/2019 12:22:55 - 08/11/2020 16:55:46 + 10/20/2019 12:22:55 - 08/11/2020 16:55:45 + 10/20/2019 12:22:55 - 08/11/2020 16:55:44 + 10/20/2019 12:22:55 - 08/11/2020 16:55:44 + 10/20/2019 12:22:55 - 08/11/2020 16:55:45 + 10/20/2019 12:22:55 - 08/11/2020 16:55:44 + 10/20/2019 12:22:55 - 08/11/2020 16:55:43 + 10/20/2019 12:22:55 - 08/11/2020 16:55:43 + 10/20/2019 12:22:55 - 08/11/2020 16:55:45 + 10/20/2019 12:22:55 - 08/11/2020 16:55:45 + 10/20/2019 12:22:55 - 08/11/2020 16:55:44 + 10/20/2019 12:22:55 - 08/11/2020 16:55:46 + 10/20/2019 12:22:55 - 08/11/2020 16:55:44 + 10/20/2019 12:22:55 - 08/11/2020 16:55:45 + 10/20/2019 12:22:55 - 08/11/2020 16:55:45 + 10/20/2019 12:22:55 - 08/11/2020 16:55:43 + 10/20/2019 12:22:55 - 08/11/2020 16:55:45 + 10/20/2019 12:22:55 - 08/11/2020 16:55:44 + 10/20/2019 12:22:55 - 08/11/2020 16:55:46 + 10/20/2019 12:22:55 - 08/11/2020 16:55:44 + 10/20/2019 12:22:55 - 08/11/2020 16:55:44 + 10/20/2019 12:22:55 - 08/11/2020 16:55:45 + 10/20/2019 12:22:55 - 08/11/2020 16:55:44 + 10/20/2019 12:22:55 - 08/11/2020 16:55:44 + 10/20/2019 12:22:55 - 08/11/2020 16:55:45 + 10/20/2019 12:22:55 - 08/11/2020 16:55:44 + 10/20/2019 12:22:55 - 08/11/2020 16:55:44 + 10/20/2019 12:22:55 - 08/11/2020 16:55:44 + 10/20/2019 12:22:55 - 08/11/2020 16:55:46 + 10/20/2019 12:22:55 - 08/11/2020 16:55:44 + 10/20/2019 12:22:55 - 08/11/2020 16:55:43 + 10/20/2019 12:22:55 - 08/11/2020 16:55:43 + 10/20/2019 12:22:55 - 08/11/2020 16:55:45 + 10/20/2019 12:22:55 - 08/11/2020 16:55:46 + 10/20/2019 12:22:55 - 08/11/2020 16:55:43 + 10/20/2019 12:22:55 - 08/11/2020 16:55:43 + 10/20/2019 12:22:55 - 08/11/2020 16:55:44 + 10/20/2019 12:22:55 - 08/11/2020 16:55:46 + 10/20/2019 12:22:55 - 08/11/2020 16:55:44 + 10/20/2019 12:22:55 - 08/11/2020 16:55:44 + 10/20/2019 12:22:55 - 08/11/2020 16:55:38 + 10/20/2019 12:30:50 06/19/2020 16:15:18 - 08/11/2020 16:55:48 + 10/20/2019 12:21:06 - 08/11/2020 16:55:48 + 10/20/2019 12:21:03 - 08/11/2020 16:55:36 + 10/20/2019 12:23:20 - 08/11/2020 16:56:02 + 10/20/2019 12:20:12 - 08/11/2020 16:56:03 + 08/06/2020 12:47:54 - 08/11/2020 16:56:03 + 08/06/2020 12:47:54 - 08/11/2020 16:55:50 + 10/20/2019 12:20:06 - 08/11/2020 16:55:50 + 10/20/2019 12:20:06 - 08/11/2020 16:55:50 + 10/20/2019 12:20:06 - 08/11/2020 16:55:50 + 10/20/2019 12:20:06 - 08/11/2020 16:55:50 + 10/20/2019 12:20:06 - 08/11/2020 16:55:50 + 10/20/2019 12:20:06 - 08/11/2020 16:55:50 + 10/20/2019 12:20:06 - 08/11/2020 16:55:50 + 08/06/2020 12:47:54 - 08/11/2020 16:55:50 + 08/06/2020 12:47:54 - 08/11/2020 16:55:50 + 08/06/2020 12:47:54 - 08/11/2020 16:55:50 + 10/20/2019 12:20:06 - 08/23/2020 09:45:35 + 08/21/2020 15:26:49 - 08/31/2020 12:52:53 + 08/28/2020 09:40:28 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:03 + 10/20/2019 12:20:21 - 08/11/2020 16:56:08 + 10/20/2019 12:20:12 08/31/2020 17:11:38 - 08/11/2020 16:56:04 + 10/20/2019 12:20:22 - 08/11/2020 16:56:04 + 08/06/2020 12:47:56 - 08/11/2020 16:56:04 + 08/06/2020 12:47:56 - 08/11/2020 16:56:04 + 10/20/2019 12:20:22 - 08/11/2020 16:56:04 + 08/21/2020 14:40:33 - 08/11/2020 16:56:04 + 10/23/2019 12:11:08 - 08/11/2020 16:56:04 + 10/20/2019 12:20:22 - 08/11/2020 16:56:04 + 10/20/2019 12:20:22 - 08/11/2020 16:56:04 + 11/08/2019 16:24:37 - 08/11/2020 16:56:04 + 10/20/2019 12:20:22 - 08/11/2020 16:56:04 + 10/23/2019 11:51:54 - 08/11/2020 16:56:05 + 08/06/2020 12:47:56 - 08/11/2020 16:56:05 + 08/06/2020 12:47:56 - 08/11/2020 16:56:05 + 08/06/2020 12:47:56 - 08/11/2020 16:56:05 + 08/06/2020 12:47:56 - 08/11/2020 16:56:05 + 08/06/2020 12:47:56 - 08/11/2020 16:56:05 + 08/06/2020 12:47:56 - 08/11/2020 16:56:05 + 08/06/2020 12:47:56 - 08/11/2020 16:56:05 + 08/06/2020 12:47:56 - 08/11/2020 16:56:05 + 08/06/2020 12:47:56 - 08/11/2020 16:56:05 + 08/06/2020 12:47:56 - 08/11/2020 16:56:05 + 08/06/2020 12:47:56 - 08/11/2020 16:56:05 + 08/06/2020 12:47:56 - 08/11/2020 16:56:08 + 08/06/2020 12:47:56 - 08/11/2020 16:56:04 + 08/06/2020 12:47:56 - 08/11/2020 16:56:05 + 08/06/2020 12:47:56 - 08/11/2020 16:56:08 + 08/06/2020 12:47:56 - 08/11/2020 16:56:08 + 08/06/2020 12:47:56 - 08/11/2020 16:56:04 + 08/06/2020 12:47:56 - 08/11/2020 16:56:07 + 08/06/2020 12:47:56 - 08/11/2020 16:56:08 + 08/06/2020 12:47:56 - 08/11/2020 16:56:06 + 08/06/2020 12:47:56 - 08/11/2020 16:56:05 + 08/06/2020 12:47:56 - 08/11/2020 16:56:05 + 08/06/2020 12:47:56 - 08/11/2020 16:56:05 + 08/06/2020 12:47:56 - 08/11/2020 16:56:05 + 08/06/2020 12:47:56 - 08/11/2020 16:56:05 + 08/06/2020 12:47:56 - 08/11/2020 16:56:05 + 08/06/2020 12:47:56 - 08/11/2020 16:56:05 + 08/06/2020 12:47:56 - 08/11/2020 16:56:05 + 08/06/2020 12:47:57 - 08/11/2020 16:56:05 + 08/06/2020 12:47:57 - 08/11/2020 16:56:06 + 08/06/2020 12:47:57 - 08/11/2020 16:56:06 + 08/06/2020 12:47:57 - 08/11/2020 16:56:06 + 08/06/2020 12:47:57 - 08/11/2020 16:56:06 + 08/06/2020 12:47:57 - 08/11/2020 16:56:06 + 08/06/2020 12:47:57 - 08/11/2020 16:56:06 + 08/06/2020 12:47:57 - 08/11/2020 16:56:06 + 08/06/2020 12:47:57 - 08/11/2020 16:56:06 + 08/06/2020 12:47:57 - 08/11/2020 16:56:06 + 08/06/2020 12:47:57 - 08/11/2020 16:56:06 + 08/06/2020 12:47:57 - 08/11/2020 16:56:06 + 08/06/2020 12:47:57 - 08/11/2020 16:56:05 + 08/06/2020 12:47:57 - 08/11/2020 16:56:05 + 08/06/2020 12:47:57 - 08/11/2020 16:56:07 + 08/06/2020 12:47:57 - 08/11/2020 16:56:07 + 08/06/2020 12:47:57 - 08/11/2020 16:56:07 + 08/06/2020 12:47:57 - 08/11/2020 16:56:04 + 08/06/2020 12:47:56 - 08/11/2020 16:56:04 + 08/06/2020 12:47:57 - 08/11/2020 16:56:04 + 08/06/2020 12:47:57 - 08/11/2020 16:56:04 + 08/06/2020 12:47:57 - 08/11/2020 16:56:07 + 08/06/2020 12:47:57 - 08/11/2020 16:56:04 + 08/06/2020 12:47:57 - 08/11/2020 16:56:04 + 08/06/2020 12:47:57 - 08/11/2020 16:56:04 + 08/06/2020 12:47:57 - 08/11/2020 16:56:08 + 08/06/2020 12:47:56 - 08/11/2020 16:56:08 + 08/06/2020 12:47:56 - 08/11/2020 16:56:08 + 08/06/2020 12:47:57 - 08/18/2020 16:53:27 + 08/18/2020 18:07:38 - 08/12/2020 14:27:30 + 08/12/2020 17:26:58 - 08/11/2020 16:56:08 + 08/06/2020 12:47:57 - 08/11/2020 16:56:07 + 08/06/2020 12:47:57 - 08/11/2020 16:56:08 + 08/06/2020 12:47:57 - 08/11/2020 16:56:04 + 08/06/2020 12:47:57 - 08/11/2020 16:56:04 + 08/06/2020 12:47:57 - 08/11/2020 16:56:05 + 08/06/2020 12:47:57 - 08/11/2020 16:56:03 + 10/23/2019 09:57:25 10/23/2019 13:12:25 - 08/11/2020 16:56:03 + 10/23/2019 09:57:25 - 08/11/2020 16:56:03 + 11/03/2019 11:48:56 - 08/11/2020 16:56:03 + 11/03/2019 10:23:11 10/23/2019 13:12:25 - 08/11/2020 16:56:03 + 10/20/2019 12:20:12 - 08/11/2020 16:56:03 + 10/23/2019 09:57:25 - 08/11/2020 16:56:03 + 10/23/2019 09:57:25 - 08/11/2020 16:56:03 + 10/20/2019 12:20:09 - 08/11/2020 16:56:03 + 10/20/2019 12:20:06 - 08/11/2020 16:56:03 + 10/20/2019 12:20:06 - 08/11/2020 16:56:03 + 10/20/2019 12:20:09 - 08/11/2020 16:56:03 + 10/20/2019 12:20:09 - 08/11/2020 16:56:03 + 10/23/2019 14:20:47 - 08/11/2020 16:56:03 + 10/23/2019 10:12:09 - 08/11/2020 16:56:03 + 10/20/2019 12:20:09 - 08/11/2020 16:56:03 + 10/20/2019 12:20:09 - 08/11/2020 16:56:03 + 10/20/2019 12:20:09 - 08/11/2020 16:56:03 + 10/20/2019 12:20:09 - 08/11/2020 16:56:03 + 10/20/2019 12:20:09 - 08/11/2020 16:56:03 + 10/20/2019 12:20:09 - 08/11/2020 16:56:03 + 10/20/2019 12:20:09 - 08/11/2020 16:56:03 + 10/20/2019 12:20:09 - 08/11/2020 16:56:03 + 10/20/2019 12:20:09 - 08/11/2020 16:56:03 + 10/20/2019 12:20:09 - 08/11/2020 16:56:03 + 10/20/2019 12:20:09 - 08/11/2020 16:56:03 + 10/23/2019 09:57:25 - 08/11/2020 16:56:03 + 10/20/2019 12:20:09 - 08/11/2020 16:56:03 + 10/20/2019 12:20:09 - 08/11/2020 16:56:03 + 10/20/2019 12:20:09 - 08/11/2020 16:56:03 + 10/20/2019 12:20:09 - 08/11/2020 16:56:03 + 10/20/2019 12:20:09 - 08/11/2020 16:56:03 + 10/20/2019 12:20:10 - 08/11/2020 16:56:03 + 10/20/2019 12:20:10 - 08/11/2020 16:56:03 + 11/07/2019 12:22:35 - 08/11/2020 16:56:03 + 10/30/2019 12:06:05 - 08/11/2020 16:56:03 + 10/30/2019 12:06:05 - 08/11/2020 16:56:03 + 10/30/2019 14:31:08 - 08/11/2020 16:56:03 + 11/03/2019 11:48:56 - 08/11/2020 16:56:03 + 11/03/2019 11:48:56 - 08/11/2020 16:56:03 + 10/20/2019 12:20:09 - 08/11/2020 16:56:03 + 10/20/2019 12:20:09 - 08/11/2020 16:56:08 + 05/25/2020 12:29:40 - 08/27/2020 17:37:00 + 08/28/2020 09:21:11 - 09/02/2020 13:42:11 + 09/03/2020 08:36:36 - 08/11/2020 16:56:08 + 08/06/2020 12:47:55 - 08/11/2020 16:56:08 + 11/11/2019 06:43:02 - 08/11/2020 16:56:08 + 10/20/2019 12:20:12 - 08/11/2020 16:56:08 + 10/20/2019 12:20:12 - 08/25/2020 13:54:03 + 08/26/2020 11:29:34 - 09/02/2020 18:01:20 + 09/03/2020 08:36:36 - 08/20/2020 18:22:34 + 08/12/2020 12:05:55 - 08/11/2020 16:56:08 + 10/20/2019 12:20:12 - 08/11/2020 16:56:08 + 11/11/2019 06:43:02 - 08/30/2020 17:16:25 + 08/18/2020 18:07:38 - 08/11/2020 16:56:08 + 10/20/2019 12:20:12 - 08/11/2020 16:56:08 + 10/20/2019 12:20:12 - 08/11/2020 16:56:08 + 10/20/2019 12:20:12 - 08/11/2020 16:56:08 + 10/20/2019 12:20:12 - 08/11/2020 16:56:08 + 10/20/2019 12:20:12 - 08/11/2020 16:56:08 + 10/20/2019 12:20:12 09/30/2019 09:42:58 - 08/11/2020 16:56:08 + 10/20/2019 12:20:12 - 08/11/2020 16:56:08 + 08/06/2020 12:47:55 - 08/11/2020 16:56:08 + 10/20/2019 12:20:12 - 08/11/2020 16:56:08 + 10/20/2019 12:20:12 - 08/11/2020 16:56:08 + 10/20/2019 12:20:12 - 08/11/2020 16:56:08 + 08/06/2020 12:47:55 - 08/11/2020 16:56:08 + 08/06/2020 12:47:55 - 08/12/2020 14:59:25 + 08/12/2020 17:22:08 - 08/11/2020 16:56:08 + 10/20/2019 12:20:12 - 08/11/2020 16:56:08 + 10/20/2019 12:20:12 - 08/11/2020 16:56:08 + 08/06/2020 12:47:55 - 09/02/2020 16:29:25 + 09/03/2020 08:36:36 - 09/02/2020 16:29:10 + 09/03/2020 18:34:06 - 08/27/2020 12:26:11 + 09/03/2020 17:44:20 - 08/18/2020 12:12:16 + 11/07/2019 12:22:35 - 08/11/2020 16:56:08 + 10/30/2019 11:37:18 - 08/11/2020 16:56:08 + 08/06/2020 12:47:55 - 08/18/2020 16:45:45 + 08/06/2020 12:47:55 - 08/11/2020 16:56:08 + 08/06/2020 12:47:55 - 08/25/2020 13:44:43 + 09/03/2020 18:39:17 - 08/11/2020 16:56:08 + 08/06/2020 12:47:55 - 08/11/2020 16:56:08 + 08/06/2020 12:47:55 - 08/11/2020 16:56:08 + 10/20/2019 12:20:12 - 09/01/2020 17:13:20 + 08/28/2020 12:34:08 10/25/2019 16:47:02 - 08/11/2020 16:56:03 + 08/06/2020 12:47:59 - 08/11/2020 16:56:03 + 08/06/2020 12:47:59 - 08/11/2020 16:56:03 + 08/06/2020 12:47:59 - 08/11/2020 16:56:03 + 08/06/2020 12:47:59 - 08/11/2020 16:56:03 + 08/06/2020 12:47:59 - 08/11/2020 16:56:03 + 08/06/2020 12:47:59 - 08/11/2020 16:56:03 + 08/06/2020 12:47:59 - 08/11/2020 16:56:03 + 08/06/2020 12:47:59 - 08/11/2020 16:56:03 + 08/06/2020 12:47:59 - 08/11/2020 16:56:03 + 08/06/2020 12:47:59 - 08/11/2020 16:56:03 + 08/06/2020 12:47:59 - 08/11/2020 16:56:03 + 08/06/2020 12:47:59 - 08/11/2020 16:56:03 + 08/06/2020 12:47:59 - 08/11/2020 16:56:03 + 08/06/2020 12:47:59 - 08/11/2020 16:56:03 + 08/06/2020 12:47:59 - 08/11/2020 16:56:03 + 08/06/2020 12:47:59 - 08/11/2020 16:56:02 + 08/06/2020 12:47:59 - 08/11/2020 16:56:03 + 08/06/2020 12:47:59 - 08/11/2020 16:56:03 + 08/06/2020 12:47:59 - 08/11/2020 16:56:02 + 08/06/2020 12:47:59 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:02 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:02 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:00 - 08/11/2020 16:56:03 + 08/06/2020 12:48:01 - 08/11/2020 16:56:03 + 08/06/2020 12:48:01 - 08/11/2020 16:56:03 + 08/06/2020 12:48:01 - 08/11/2020 16:56:03 + 08/06/2020 12:48:01 - 08/11/2020 16:56:03 + 08/06/2020 12:48:01 - 08/11/2020 16:56:03 + 08/06/2020 12:48:01 - 08/11/2020 16:56:03 + 08/06/2020 12:48:01 - 08/11/2020 16:56:03 + 08/06/2020 12:48:01 - 08/11/2020 16:56:03 + 08/06/2020 12:48:01 - 08/11/2020 16:56:03 + 08/06/2020 12:48:01 - 08/11/2020 16:56:03 + 08/06/2020 12:48:01 - 08/11/2020 16:56:03 + 08/06/2020 12:48:01 - 08/11/2020 16:56:03 + 08/06/2020 12:48:01 - 08/11/2020 16:56:03 + 08/06/2020 12:48:01 - 08/11/2020 16:56:03 + 08/06/2020 12:48:01 - 08/11/2020 16:56:03 + 08/06/2020 12:48:01 - 08/11/2020 16:56:03 + 08/06/2020 12:48:01 - 08/11/2020 16:56:03 + 08/06/2020 12:48:01 - 08/11/2020 16:56:03 + 08/06/2020 12:48:01 - 08/11/2020 16:56:02 + 08/06/2020 12:48:01 - 08/11/2020 16:56:02 + 08/06/2020 12:48:01 - 08/11/2020 16:56:02 + 08/06/2020 12:48:01 - 08/11/2020 16:56:02 + 08/06/2020 12:48:02 - 08/11/2020 16:56:02 + 08/06/2020 12:48:02 - 08/11/2020 16:56:02 + 08/06/2020 12:48:02 - 08/11/2020 16:56:02 + 08/06/2020 12:48:02 - 08/11/2020 16:56:02 + 08/06/2020 12:48:02 - 08/11/2020 16:56:02 + 08/06/2020 12:48:02 - 08/11/2020 16:56:02 + 08/06/2020 12:48:02 - 08/11/2020 16:56:02 + 08/06/2020 12:48:02 - 08/11/2020 16:56:02 + 08/06/2020 12:48:02 - 08/11/2020 16:56:02 + 08/06/2020 12:48:02 - 08/11/2020 16:56:02 + 08/06/2020 12:48:02 - 08/11/2020 16:56:02 + 08/06/2020 12:48:02 - 08/11/2020 16:56:02 + 08/06/2020 12:48:02 - 08/11/2020 16:56:03 + 08/06/2020 12:48:02 - 08/11/2020 16:56:03 + 08/06/2020 12:48:02 - 08/11/2020 16:56:03 + 08/06/2020 12:48:02 - 08/11/2020 16:56:03 + 08/06/2020 12:48:02 - 08/11/2020 16:56:03 + 08/06/2020 12:48:02 - 08/11/2020 16:56:03 + 08/06/2020 12:48:02 - 08/11/2020 16:56:03 + 08/06/2020 12:48:02 - 08/11/2020 16:56:03 + 08/06/2020 12:48:02 - 08/11/2020 16:56:03 + 08/06/2020 12:48:02 - 08/11/2020 16:56:03 + 08/06/2020 12:48:02 - 08/11/2020 16:56:03 + 08/06/2020 12:48:02 - 08/11/2020 16:56:03 + 08/06/2020 12:48:02 - 08/11/2020 16:56:03 + 08/06/2020 12:48:02 - 08/11/2020 16:56:03 + 08/06/2020 12:48:02 - 08/11/2020 16:56:03 + 08/06/2020 12:48:02 - 08/11/2020 16:56:03 + 08/06/2020 12:48:02 - 08/11/2020 16:56:03 + 08/06/2020 12:48:02 - 08/11/2020 16:56:03 + 08/06/2020 12:48:02 - 08/11/2020 16:56:03 + 08/06/2020 12:48:02 10/20/2019 15:35:21 - 09/01/2020 17:19:40 + 08/27/2020 15:42:14 - 08/31/2020 12:52:53 + 08/28/2020 13:05:57 - 08/11/2020 16:56:09 + 11/07/2019 12:22:35 - 08/11/2020 16:56:09 + 05/25/2020 13:30:50 - 08/11/2020 16:56:09 + 08/11/2020 18:25:35 - 08/11/2020 16:56:09 + 08/11/2020 18:25:35 - 08/31/2020 12:52:53 + 08/28/2020 12:35:05 - 08/11/2020 16:56:09 + 08/11/2020 18:25:35 09/01/2020 16:32:37 - 09/02/2020 13:39:53 + 09/03/2020 08:36:36 09/01/2020 16:57:33 @@ -1342,46 +1342,46 @@ by editing this MSBuild file. In order to learn more about this please visit htt 08/12/2020 15:58:42 - 08/31/2020 16:48:14 + 09/03/2020 18:42:15 - 08/27/2020 20:02:00 + 09/03/2020 17:49:33 - 08/27/2020 20:46:41 + 08/28/2020 09:21:10 - 08/31/2020 12:52:53 + 08/28/2020 13:06:05 - 09/02/2020 17:11:57 + 09/03/2020 08:36:36 - 08/31/2020 11:26:26 + 09/03/2020 08:36:36 - 08/31/2020 12:52:53 + 09/03/2020 18:42:00 - 08/11/2020 16:56:10 + 10/21/2019 07:04:55 - 08/11/2020 16:56:09 + 08/06/2020 12:47:55 - 08/24/2020 16:27:05 + 08/25/2020 10:15:18 - 08/18/2020 12:12:21 + 11/11/2019 11:11:30 - 08/11/2020 16:56:09 + 11/11/2019 06:43:02 - 08/27/2020 20:02:26 + 09/03/2020 08:23:47 - 08/24/2020 15:02:47 + 09/03/2020 18:41:37 07/31/2020 10:42:21 diff --git a/JMEAgentSystem/Scripts/Receiver/ReceiverRegistrationNew.js b/JMEAgentSystem/Scripts/Receiver/ReceiverRegistrationNew.js index 96817df..eb3dd27 100644 --- a/JMEAgentSystem/Scripts/Receiver/ReceiverRegistrationNew.js +++ b/JMEAgentSystem/Scripts/Receiver/ReceiverRegistrationNew.js @@ -131,19 +131,10 @@ function CheckForPhoneNumber(nField, fieldName) { function ddlCountryChange() { $("#" + mId + "txtSenderMobileNo").attr("disabled", "disabled"); - var country = $("#" + mId + "ddlCountry option:selected ").text().split('(')[0]; - - if (country.toUpperCase() === 'NEPAL' || country.toUpperCase() === 'VIETNAM') { - $('#branchSelect').hide(); - $('#branchManual').show(); - } - else { - $('#branchSelect').show(); - $('#branchManual').hide(); - } PopulateCountryFlagForMobileNumber(); PopulatePaymentMethod(); PopulatePayoutPartner(); + CheckForBranchShowIde(); } function CallBackAutocomplete(id) { @@ -209,7 +200,7 @@ function PopulatePayoutPartner() { $("#" + mId + "receiverAccountNo").hide(); $("#" + mId + "DDLBankLocation").val(""); } - + CheckForBranchShowIde(); var data = { MethodName: "PopulatePayoutPartner", @@ -357,7 +348,6 @@ function save() { data: data, dataType: "json", success: function (response) { - alert(response); if (response.ErrorCode == "1") { alert(response.Msg); $("#" + mId + "register").prop("disabled", false); @@ -444,3 +434,20 @@ function PopulateBranchDDL(populateData, recDdlId, defaultText) { } } } + +function CheckForBranchShowIde() { + debugger + var country = $("#" + mId + "ddlCountry option:selected ").text().split('(')[0]; + if (country.toUpperCase() === 'NEPAL' || country.toUpperCase() === 'VIETNAM') { + $('#branchSelect').hide(); + $('#branchManual').show(); + if ($('#MainContent_ddlPaymentMode').val() === '1' && country.toUpperCase() === 'NEPAL') { + $('#branchSelect').hide(); + $('#branchManual').hide(); + } + } + else { + $('#branchSelect').show(); + $('#branchManual').hide(); + } +} diff --git a/JMEAgentSystem/Scripts/ReferralReports/DashBoard.js b/JMEAgentSystem/Scripts/ReferralReports/DashBoard.js index e1b9b6f..381212f 100644 --- a/JMEAgentSystem/Scripts/ReferralReports/DashBoard.js +++ b/JMEAgentSystem/Scripts/ReferralReports/DashBoard.js @@ -1,5 +1,5 @@ $(document).ready(function () { - //LoadLastFiveTransactions(); + LoadLastFiveTransactions(); }); function LoadLastFiveTransactions() { diff --git a/JMEAgentSystem/Scripts/SendTxnJs/SendMoneyRequest.js b/JMEAgentSystem/Scripts/SendTxnJs/SendMoneyRequest.js index 87554d2..e5043fb 100644 --- a/JMEAgentSystem/Scripts/SendTxnJs/SendMoneyRequest.js +++ b/JMEAgentSystem/Scripts/SendTxnJs/SendMoneyRequest.js @@ -13,6 +13,8 @@ $(document).ready(function () { $("#searchCustomer").click(function () { ClearAllData(); $('#step2SendRemittance').hide(); + $('#step2SendRemittanceCustomer').hide(); + $('#step2SendRemittanceCustomer').hide(); $('#step2SendRemittanceAgreement').hide(); $('#signatureDiv').hide(); $('#step2SendRemittanceSaveButton').hide(); @@ -38,6 +40,7 @@ $(document).ready(function () { $("#searchCustomer").removeAttr("disabled"); if (response[0].errorCode === 0) { $('#step2SendRemittance').show(); + $('#step2SendRemittanceCustomer').show(); $('#step2SendRemittanceAgreement').show(); $('#signatureDiv').show(); $('#step2SendRemittanceSaveButton').show(); @@ -49,6 +52,7 @@ $(document).ready(function () { else { alert(response[0].Msg); $('#step2SendRemittance').hide(); + $('#step2SendRemittanceCustomer').hide(); $('#step2SendRemittanceAgreement').hide(); $('#signatureDiv').hide(); $('#step2SendRemittanceSaveButton').hide(); @@ -202,6 +206,7 @@ $(document).ready(function () { GetPayoutPartner(); var pmode = $("#" + mId + "pMode").val(); var partnerId = $("#" + mId + "hddPayoutPartner").val(); + CheckForBranchShowIde(); if (partnerId === '394130' || pmode === "2") { $("#" + mId + "branch").addClass('required'); //if ((partnerId === apiPartnerIds[0]) && pmode === "2") { @@ -269,17 +274,7 @@ function PcountryOnChange(obj, pmode, pAgentSelected = "") { if (obj === 'pcurr') { method = "PCurrPcountry"; } - var country = $("#" + mId + "pCountry option:selected ").text(); - - if (country.toUpperCase() === 'NEPAL' || country.toUpperCase() === 'VIETNAM') { - $('#branchSelect').hide(); - $('#branchManual').show(); - } - else { - $('#branchSelect').show(); - $('#branchManual').hide(); - } - + var dataToSend = { MethodName: method, pCountry: pCountry }; var options = { @@ -293,6 +288,8 @@ function PcountryOnChange(obj, pmode, pAgentSelected = "") { LoadPayMode(response, document.getElementById(mId + "pMode"), 'pcurr', "", pmode); ReceivingModeOnChange("", pAgentSelected); GetPayoutPartner(response[0].serviceTypeId); + + CheckForBranchShowIde(); } else if (obj === 'pcurr') { if (response === "") @@ -310,6 +307,23 @@ function PcountryOnChange(obj, pmode, pAgentSelected = "") { }; $.ajax(options); } + +function CheckForBranchShowIde() { + var country = $("#" + mId + "pCountry option:selected ").text(); + if (country.toUpperCase() === 'NEPAL' || country.toUpperCase() === 'VIETNAM') { + $('#branchSelect').hide(); + $('#branchManual').show(); + if ($('#MainContent_pMode').val() === '1' && country.toUpperCase() === 'NEPAL') { + $('#branchSelect').hide(); + $('#branchManual').hide(); + } + } + else { + $('#branchSelect').show(); + $('#branchManual').hide(); + } +} + function LoadLocationDDL(response) { var data = response; var ddl = GetElement(mId + "locationDDL"); @@ -827,7 +841,7 @@ function ValidateDetailsMain() { } function ValidateDetails() { - var reqField = "senderIdNumber,receiverFullName,receiveraddress,receiverMobileNumber,pCountry,pMode,txtCollAmt,purpose,relationship,"; + var reqField = "senderIdNumber,receiverFullName,receiveraddress,ddlCollMode,receiverMobileNumber,pCountry,pMode,txtCollAmt,purpose,relationship,"; //var pmodeId = $("#" + mId + "pMode").val(); //if (pmodeId != "1" && pmodeId != undefined) { // reqField += "branch,"; @@ -864,7 +878,6 @@ function ValidateDetails() { return false; } } - debugger $("#" + mId + "hddPmode").val(pMode); $("#" + mId + "hddPagent").val(pAgent); $("#" + mId + "hddpBranch").val(pbranch); diff --git a/JMEAgentSystem/Web.config b/JMEAgentSystem/Web.config index 3e00d54..a0a2f6d 100644 --- a/JMEAgentSystem/Web.config +++ b/JMEAgentSystem/Web.config @@ -78,9 +78,9 @@ - + - + diff --git a/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx b/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx index ceefe9f..d079f71 100644 --- a/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx +++ b/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx @@ -111,7 +111,7 @@ -
+ -

@@ -242,19 +241,19 @@

-
+ -
+ -
+
+