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);

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);
 

Common/Common.csproj

@@ -33,9 +33,15 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DynamicPDF.NETFramework40, Version=10.34.0.42021, Culture=neutral, PublicKeyToken=09b5ce0d5c0a9d8b, processorArchitecture=MSIL">
+      <HintPath>..\packages\ceTe.DynamicPDF.CoreSuite.NET.10.34.0\lib\net40\DynamicPDF.NETFramework40.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="Select.HtmlToPdf, Version=20.1.0.0, Culture=neutral, PublicKeyToken=e0ae9f6e27a97018, processorArchitecture=MSIL">
+      <HintPath>..\packages\Select.HtmlToPdf.20.1.0\lib\net40\Select.HtmlToPdf.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
@@ -70,4 +76,11 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\ceTe.DynamicPDF.CoreSuite.NET.10.34.0\build\net40\ceTe.DynamicPDF.CoreSuite.NET.targets" Condition="Exists('..\packages\ceTe.DynamicPDF.CoreSuite.NET.10.34.0\build\net40\ceTe.DynamicPDF.CoreSuite.NET.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>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}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\ceTe.DynamicPDF.CoreSuite.NET.10.34.0\build\net40\ceTe.DynamicPDF.CoreSuite.NET.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ceTe.DynamicPDF.CoreSuite.NET.10.34.0\build\net40\ceTe.DynamicPDF.CoreSuite.NET.targets'))" />
+  </Target>
 </Project>

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);

Common/packages.config

@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="ceTe.DynamicPDF.CoreSuite.NET" version="10.34.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="11.0.1" targetFramework="net461" />
+  <package id="Select.HtmlToPdf" version="20.1.0" targetFramework="net461" />
 </packages>

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 '<a class="link" href="/WebPages/receipt/ViewReceipt?controlNo='+dbo.FNADecryptString(controlNo)+'">'+dbo.FNADecryptString(controlNo)+'</a>'  CONTROLNO
+				, CONVERT(VARCHAR,CREATEDDATE,102) CREATEDDATE, CAMT, SENDERNAME, COLLMODE
 		FROM REMITTRAN (NOLOCK)
 		WHERE PROMOTIONCODE = @REFERRAL_CODE
 		AND TRANSTATUS <> 'CANCEL'
@@ -31,3 +32,4 @@ BEGIN
 	END
 END
 
+

JMEAgentSystem/JMEAgentSystem.csproj

@@ -729,6 +729,8 @@
     <Content Include="ui\font-awesome\scss\_rotated-flipped.scss" />
     <Content Include="ui\font-awesome\scss\_stacked.scss" />
     <Content Include="ui\font-awesome\scss\_variables.scss" />
+    <Content Include="temp\pdf\202009071356388745_admin" />
+    <Content Include="temp\pdf\202009071357305118_admin.pdf" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>

JMEAgentSystem/Properties/PublishProfiles/FolderProfile.pubxml

@@ -12,7 +12,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
     <SiteUrlToLaunchAfterPublish />
     <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
     <ExcludeApp_Data>False</ExcludeApp_Data>
-    <publishUrl>H:\JME\JME_Remit_Live\Published_JME\JME_Agent_System</publishUrl>
+    <publishUrl>E:\C# Projects\UAT\JME_JAPAN\JME_Remit_Live\Published_JME\JME_Agent_System</publishUrl>
     <DeleteExistingFiles>False</DeleteExistingFiles>
   </PropertyGroup>
 </Project>

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();
+    }
+}

JMEAgentSystem/Scripts/ReferralReports/DashBoard.js

@@ -1,5 +1,5 @@
 $(document).ready(function () {
-    //LoadLastFiveTransactions();
+    LoadLastFiveTransactions();
 });
 
 function LoadLastFiveTransactions() {

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,16 +274,6 @@ 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);

JMEAgentSystem/Web.config

@@ -78,9 +78,9 @@
   </system.web>
   <appSettings>
     <add key="virtualDirName" value="" />
-    <add key="customerDocPath" value="H:\JMEFiles\" />
+    <add key="customerDocPath" value="E:\JMEFiles\" />
     <add key="customerDocFileExtension" value=".jpeg,.jpg" />
-    <add key="root" value="H:\JME\JME_Remit_Dev\JMEAgentSystem\JMEAgentSystem\" />
+    <add key="root" value="E:\C# Projects\UAT\JME_JAPAN\JME_Remit_Live\JMEAgentSystem\JMEAgentSystem\" />
     <add key="urlRoot" value="http://localhost:63438" />
 
     <!-- API PartnerId-->

JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx

@@ -111,7 +111,7 @@
                                                 </asp:DropDownList>
                                             </div>
                                         </div>
-                                        <div class="col-md-4">
+                                        <div class="col-md-4" style="display:none;">
                                             <div class="form-group">
                                                 <label>Contact No:</label>
                                                 <asp:TextBox runat="server" ID="txtContactNo" onchange="CheckForPhoneNumber(this,'Contact No.')" CssClass="form-control" placeholder="Beneficiary Contact No" MaxLength="13"></asp:TextBox>
@@ -204,7 +204,6 @@
                                                 <asp:TextBox runat="server" ID="otherRelationshipTextBox" CssClass="form-control" placeholder="Other Relation Description"></asp:TextBox>
                                             </div>
                                         </div>
-
                                         <div class="clearfix"></div>
                                         <p class="col-md-12">
                                             <label class="">Transaction Information</label>
@@ -242,19 +241,19 @@
                                                 <asp:TextBox ID="txtBankName" runat="server" CssClass="form-control clearOnNotBank"></asp:TextBox>
                                             </div>
                                         </div>
-                                        <div class="col-md-4 showOnBankMethod" id="receiverAccountNo" runat="server">
+                                        <div class="col-md-4 showOnBankMethod" id="receiverAccountNo" runat="server" style="display:none;">
                                             <div class="form-group">
                                                 <label>Beneficiary A/c #:</label>
                                                 <asp:TextBox ID="txtBenificaryAc" runat="server" CssClass="form-control clearOnNotBank"></asp:TextBox>
                                             </div>
                                         </div>
-                                        <div class="col-md-4 col-sm-4" id="branchSelect">
+                                        <div class="col-md-4 col-sm-4" id="branchSelect" style="display:none;">
                                             <div class="form-group">
                                                 <label>Branch:<span class="errormsg" id="branchRequired">*</span></label>
                                                 <asp:DropDownList ID="DDLBankLocation" runat="server" CssClass="required form-control"></asp:DropDownList>
                                             </div>
                                         </div>
-                                        <div class="col-md-4 col-sm-4" id="branchManual">
+                                        <div class="col-md-4 col-sm-4" id="branchManual" style="display:none;">
                                             <div class="form-group">
                                                 <label>Branch:<span class="errormsg" id="branchTxtRequired">*</span></label>
                                                 <asp:TextBox ID="branch_manual" runat="server" CssClass="required form-control"></asp:TextBox>
@@ -369,7 +368,7 @@
 
     <script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@1.5.4/src/loadingoverlay.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@1.5.4/extras/loadingoverlay_progress/loadingoverlay_progress.min.js"></script>
-    <script src="../../Scripts/Receiver/ReceiverRegistrationNew.js?v=1.1"></script>
+    <script src="../../Scripts/Receiver/ReceiverRegistrationNew.js?v=1.5"></script>
     <script type="text/javascript">
         $(document).ready(function () {
             $("#" + mId + "regUp").hide();

JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx.cs

@@ -34,7 +34,6 @@ namespace JMEAgentSystem.WebPages.BenificiaryRegistration
         {
             GetStatic.PrintMessage(Page);
             _sl.CheckSession();
-            receiverAccountNo.Attributes.Add("hidden", "hidden");
             if (!IsPostBack)
             {
                 PopulateDDL();

JMEAgentSystem/WebPages/BenificiaryRegistration/PrintBeneficiaryDetails.aspx

@@ -1,7 +1,7 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="PrintBeneficiaryDetails.aspx.cs" Inherits="JMEAgentSystem.WebPages.BenificiaryRegistration.PrintBeneficiaryDetails" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
-    <div class="detailInfo">
+    <div class="detailInfo" id="downloadDivPDF" runat="server">
         <div class="page-wrapper">
             <table class="tg table-borderless" runat="server">
                 <tr>
@@ -31,19 +31,15 @@
                 </tr>
                 <tr>
                     <td class="tg-fymr">Full Name:</td>
-                    <td class="tg-0pky" runat="server" id="recFullName" colspan="5"></td>
-                </tr>
-                <tr>
+                    <td class="tg-0pky" runat="server" id="recFullName" colspan="2"></td>
                     <td style="white-space: nowrap" class="tg-fymr">Native Country:</td>
                     <td colspan="2" class="tg-0pky" runat="server" id="recNativeCountry"></td>
-                    <td class="tg-fymr">Beneficiary Address:</td>
-                    <td colspan="2" class="tg-0pky" runat="server" id="recAddress"></td>
                 </tr>
                 <tr>
+                    <td class="tg-fymr">Beneficiary Address:</td>
+                    <td colspan="2" class="tg-0pky" runat="server" id="recAddress"></td>
                     <td class="tg-fymr">City:</td>
                     <td style="white-space: nowrap" colspan="2" class="tg-0pky" runat="server" id="recCity"></td>
-                    <td class="tg-fymr">Contact No:</td>
-                    <td colspan="2" class="tg-0pky" runat="server" id="recContactNo"></td>
                 </tr>
                 <tr>
                     <td style="white-space: nowrap" class="tg-fymr">Mobile:</td>
@@ -114,7 +110,7 @@
                     <div class="form-group">
                         <div class="col-md-12">
                             <label>Date :</label>
-                            <label id="todaysDate"></label>
+                            <label id="todaysDate" runat="server"></label>
                         </div>
                     </div>
                 </div>
@@ -148,23 +144,6 @@
     <script src="/Scripts/js/swift_calendar.js"></script>
     <script src="/Scripts/SendTxnJs/CustomerSignature.js" type="text/javascript"></script>
     <script src="/Scripts/jquery.validate.js"></script>
-    <script type="text/javascript">
-        $(document).ready(function () {
-            var today = new Date();
-            var dd = today.getDate();
-            var mm = today.getMonth() + 1; //January is 0!
-
-            var yyyy = today.getFullYear();
-            if (dd < 10) {
-                dd = '0' + dd;
-            }
-            if (mm < 10) {
-                mm = "0" + mm;
-            }
-            today = dd + '-' + mm + '-' + yyyy;
-            $("#todaysDate").text(today);
-        });
-    </script>
     <script type="text/javascript">
         function PrintDiv() {
             var divToPrint = document.getElementById('mainDiv');

JMEAgentSystem/WebPages/BenificiaryRegistration/PrintBeneficiaryDetails.aspx.cs

@@ -3,13 +3,11 @@ using Business.Customer;
 using Common.Helper;
 using JMEAgentSystem.WebPages.CustomerRegistration;
 using System;
-using System.Collections.Generic;
 using System.Data;
-using System.Linq;
+using System.IO;
 using System.Text;
 using System.Web;
 using System.Web.UI;
-using System.Web.UI.WebControls;
 
 namespace JMEAgentSystem.WebPages.BenificiaryRegistration
 {
@@ -22,9 +20,40 @@ namespace JMEAgentSystem.WebPages.BenificiaryRegistration
             {
                 GetStatic.PrintMessage(this.Page);
                 LoadCustomerDetails();
+
+                todaysDate.InnerText = DateTime.Now.ToString("dd-MM-yyyy");
+                SavePDF();
             }
         }
 
+        private void SavePDF()
+        {
+            var result = _customerServices.GetCustomerDetailsForPDFSave(GetMembershipId(), GetReceiverId(), "receiver").Split('|');
+            if (result[0] != "0")
+            {
+                return;
+            }
+            var customerId = result[1];
+            var membershipId = result[2];
+            var registerDate = result[3];
+            var fileNameSignature = result[4];
+            string path = GetStatic.GetCustomerFilePath() + "CustomerDocument\\" + registerDate.Replace("-", "\\") + "\\" + membershipId + "\\";
+
+            var sb = new StringBuilder();
+            downloadDivPDF.RenderControl(new HtmlTextWriter(new StringWriter(sb)));
+        
+            string s = sb.ToString();
+
+            string replaceText = "/WebPages/GetFileView.ashx?registerDate=" + Convert.ToDateTime(registerDate).ToString("yyyy-MM-dd") + "&customerId=" + customerId + "&membershipNo=" + membershipId + "&fileName=" + fileNameSignature;
+            s = s.Replace(replaceText, path + fileNameSignature);
+
+            //s = s + "<img src=\"E:\\JMEFiles\\CustomerDocument\\2020\\09\\07\\AGT031733\\48305_signature_15249_2020_09_07.png\" />";
+            String originalPath = new Uri(HttpContext.Current.Request.Url.AbsoluteUri).OriginalString;
+
+            string fileName = GetStatic.HTMLToPDF(s, GetStatic.GetUser(), path, "bene-reg-form");
+            _customerServices.AddCustomerPDFUpload(customerId, GetStatic.GetUser(), fileName, "receiver", GetReceiverId());
+        }
+
         protected void approve_Click(object sender, EventArgs e)
         {
 
@@ -45,14 +74,17 @@ namespace JMEAgentSystem.WebPages.BenificiaryRegistration
             docDiv.InnerHtml =  pd.GetSignatrueHtml(dataSet, "agent-upload-receiver", dataSet.Tables[2].Rows[0]["receiverId"].ToString());
 
         }
+
         private string GetMembershipId()
         {
             return GetStatic.ReadQueryString("membershipId", "");
         }
+
         private string GetReceiverId()
         {
             return GetStatic.ReadQueryString("receiverId", "");
         }
+
         private void SetReceiverDetails(DataRow dr)
         {
             recCountry.InnerText = dr["country"].ToString();
@@ -61,7 +93,6 @@ namespace JMEAgentSystem.WebPages.BenificiaryRegistration
             recNativeCountry.InnerText = dr["NativeCountry"].ToString();
             recAddress.InnerText = dr["address"].ToString();
             recCity.InnerText = dr["city"].ToString();
-            recContactNo.InnerText = dr["homePhone"].ToString();
             recMobile.InnerText = dr["mobile"].ToString();
             recIdType.InnerText = dr["idType"].ToString();
             recIdNumber.InnerText = dr["idNumber"].ToString();
@@ -82,7 +113,5 @@ namespace JMEAgentSystem.WebPages.BenificiaryRegistration
             customerName.InnerText = dr["fullName"].ToString();
             membershiId.InnerText = dr["membershipId"].ToString();
         }
-        
-
     }
 }

JMEAgentSystem/WebPages/BenificiaryRegistration/PrintBeneficiaryDetails.aspx.designer.cs

@@ -12,6 +12,15 @@ namespace JMEAgentSystem.WebPages.BenificiaryRegistration {
     
     public partial class PrintBeneficiaryDetails {
         
+        /// <summary>
+        /// downloadDivPDF 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 downloadDivPDF;
+        
         /// <summary>
         /// customerName control.
         /// </summary>
@@ -84,15 +93,6 @@ namespace JMEAgentSystem.WebPages.BenificiaryRegistration {
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTableCell recCity;
         
-        /// <summary>
-        /// recContactNo 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.HtmlTableCell recContactNo;
-        
         /// <summary>
         /// recMobile control.
         /// </summary>
@@ -228,6 +228,15 @@ namespace JMEAgentSystem.WebPages.BenificiaryRegistration {
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl dateDiv;
         
+        /// <summary>
+        /// todaysDate 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 todaysDate;
+        
         /// <summary>
         /// hdnCustomerId control.
         /// </summary>

JMEAgentSystem/WebPages/Default.aspx

@@ -108,7 +108,7 @@
                                                 </thead>
                                                 <tbody>
                                                     <tr>
-                                                        <td colspan="5" align="center">No data to display!</td>
+                                                        <td colspan="6" align="center">No data to display!</td>
                                                     </tr>
                                                 </tbody>
                                             </table>
@@ -128,5 +128,5 @@
     <script src="/Plugins/jquery-ui/jquery-ui.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@1.5.4/src/loadingoverlay.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@1.5.4/extras/loadingoverlay_progress/loadingoverlay_progress.min.js"></script>
-    <script src="/Scripts/ReferralReports/DashBoard.js?v=1.1"></script>
+    <script src="/Scripts/ReferralReports/DashBoard.js?v=1.5"></script>
 </asp:Content>

JMEAgentSystem/WebPages/Default.aspx.cs

@@ -15,8 +15,8 @@ namespace JMEAgentSystem
         protected void Page_Load(object sender, EventArgs e)
         {
             var methodName = GetStatic.ReadFormData("MethodName", "");
-            //if (methodName.Equals("ViewTopFiveTransactionList"))
-            //    ViewTopFiveTransactionList();
+            if (methodName.Equals("ViewTopFiveTransactionList"))
+                ViewTopFiveTransactionList();
         }
 
         private void ViewTopFiveTransactionList()

JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx

@@ -31,8 +31,31 @@
                                         </div>
                                     </div>
                                 </div>
+                                <div class="panel panel-default clearfix m-b-20" id="step2SendRemittanceCustomer" style="display: none;">
+                                    <div class="panel-heading">Customer:
+                                        <label id="customerName" runat="server"></label>
+                                        (
+                                        <label id="membershiId" runat="server"></label>
+                                        )</div>
+                                    <div class="panel-body">
+                                        <div style="margin-left: 15px">
+                                            <div class="row">
+                                                <div class="col-md-4 col-sm-4">
+                                                    <div class="form-group">
+                                                        <label>Collection Mode(Money Received from Customer):<span class="errormsg">*</span></label>
+                                                        <asp:DropDownList runat="server" ID="ddlCollMode" CssClass="form-control">
+                                                            <asp:ListItem Text="Select" Value=""></asp:ListItem>
+                                                            <asp:ListItem Text="Cash Collect" Value="Cash Collect"></asp:ListItem>
+                                                            <asp:ListItem Text="Bank Deposited (JP Bank)" Value="Bank Deposit"></asp:ListItem>
+                                                        </asp:DropDownList>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
                                 <div class="panel panel-default clearfix m-b-20" id="step2SendRemittance" style="display: none;">
-                                    <div class="panel-heading">Beneficiary Information : <label id="customerName" runat="server"></label>  ( <label id="membershiId" runat="server"></label> )</div>
+                                    <div class="panel-heading">Beneficiary Information : </div>
                                     <div class="panel-body">
                                         <div class="row">
                                             <div class="col-md-4 col-sm-4">
@@ -87,13 +110,13 @@
                                             </div>
                                         </div>
                                         <div class="row">
-                                            <div class="col-md-4 col-sm-4" id="branchSelect">
+                                            <div class="col-md-4 col-sm-4" id="branchSelect" style="display:none;">
                                                 <div class="form-group">
                                                     <label>Branch:<span class="errormsg" id="branchRequired">*</span></label>
                                                     <asp:DropDownList ID="branch" runat="server" CssClass="js-example-basic-single form-group"></asp:DropDownList>
                                                 </div>
                                             </div>
-                                            <div class="col-md-4 col-sm-4" id="branchManual">
+                                            <div class="col-md-4 col-sm-4" id="branchManual" style="display:none;">
                                                 <div class="form-group">
                                                     <label>Branch:<span class="errormsg" id="branchTxtRequired">*</span></label>
                                                     <asp:TextBox ID="branch_manual" runat="server" CssClass="required form-control"></asp:TextBox>
@@ -168,15 +191,6 @@
                                                     <asp:TextBox runat="server" ID="otherRelationshipTextBox" CssClass="form-control" placeholder="Other Relation Description"></asp:TextBox>
                                                 </div>
                                             </div>
-                                            <div class="col-md-4 col-sm-4">
-                                                <div class="form-group">
-                                                    <label>Collection Mode(Money Received from Customer):</label>
-                                                    <asp:DropDownList runat="server" ID="ddlCollMode" CssClass="form-control">
-                                                        <asp:ListItem Text="Cash Collect" Value="Cash Collect"></asp:ListItem>
-                                                        <asp:ListItem Text="Bank Deposited (JP Bank)" Value="Bank Deposit"></asp:ListItem>
-                                                    </asp:DropDownList>
-                                                </div>
-                                            </div>
                                         </div>
                                         <div class="row">
                                             <div class="col-md-4 col-sm-4" style="display: none">
@@ -270,6 +284,7 @@
         input, textarea {
             text-transform: uppercase;
         }
+
         @media print {
             hr {
                 display: none;
@@ -278,7 +293,7 @@
     </style>
     <link href="/Content/css/signature-pad.css" rel="stylesheet" />
     <link href="https://cdn.jsdelivr.net/npm/select2@4.0.12/dist/css/select2.min.css" rel="stylesheet" />
-    <script src="/Scripts/SendTxnJs/SendMoneyRequest.js"></script>
+    <script src="/Scripts/SendTxnJs/SendMoneyRequest.js?v=1.0"></script>
     <script src="/Scripts/functions.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/select2@4.0.12/dist/js/select2.min.js"></script>
     <script src="/js/singnature/signature_pad.umd.js"></script>

JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx.designer.cs

@@ -57,6 +57,15 @@ namespace JMEAgentSystem.WebPages.SendTxn {
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl membershiId;
         
+        /// <summary>
+        /// ddlCollMode 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 ddlCollMode;
+        
         /// <summary>
         /// ddlBenedeciary control.
         /// </summary>
@@ -264,15 +273,6 @@ namespace JMEAgentSystem.WebPages.SendTxn {
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox otherRelationshipTextBox;
         
-        /// <summary>
-        /// ddlCollMode 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 ddlCollMode;
-        
         /// <summary>
         /// referralName control.
         /// </summary>

JMEAgentSystem/bin/JMEAgentSystem.dll.config

@@ -78,9 +78,9 @@
   </system.web>
   <appSettings>
     <add key="virtualDirName" value="" />
-    <add key="customerDocPath" value="H:\JMEFiles\" />
+    <add key="customerDocPath" value="E:\JMEFiles\" />
     <add key="customerDocFileExtension" value=".jpeg,.jpg" />
-    <add key="root" value="H:\JME\JME_Remit_Dev\JMEAgentSystem\JMEAgentSystem\" />
+    <add key="root" value="E:\C# Projects\UAT\JME_JAPAN\JME_Remit_Live\JMEAgentSystem\JMEAgentSystem\" />
     <add key="urlRoot" value="http://localhost:63438" />
 
     <!-- API PartnerId-->

JMEAgentSystem/temp/pdf/202009071357305118_admin.pdf

@@ -0,0 +1,9 @@
+                                                                                       Gmail फोटो    साइन इन
+
+        Google खोजी                                 म भा यमानी अनभु िू त ग ररहछे ु
+
+                                                    Google यी भाषामा उपल ध छ: English
+
+नपे ाल  वसाय यस बारमे ा खोज सिु वधाले काम गन त रका                                     गोपनीयता सतह  ाथिमकताह
+िव ापन
+

JMEAgentSystem/temp/pdf/202009071619066582_JME0001.pdf

@@ -0,0 +1,41 @@
+                                              Japan Money Express Co. Ltd
+
+                                                       Add Beneficiary Request
+
+Customer Information: FASDF ASDF( AGT031733)
+
+Beneficiary Information
+
+Country:                 NEPAL                Beneficiary Type:                                                                                                     Individual
+                                                                                                                                                                    Nepal
+Full Name:               KHAKJSHKH HKJ KJHKJ  Native Country:
+                                                                                                                                                                    ­
+Beneficiary Address: TEST                     City:                                                                                                                 TEST
+
+Mobile:                  +977685989898        Id Type:
+
+Id Number:                                    Place Of Issue :
+
+Relationship To          Parents (In Law)     Other Relation Description:
+Beneficiary:
+
+Purpose Of Remittance: Living Expense         Other Purpose of Remittance:
+
+Payment Mode:            Cash Payment
+
+Agent/Bank:              ANY WHERE            Beneficiary A/c:
+
+Agent/Bank Branch:                            Remarks:
+
+私は本依頼書に記載されているジャパンマネーエクスプレス株式会社の「海外送金利用規約」の内容に同意します。
+私の依頼する送金は、北朝鮮及びイランとは関係無い取引であり、反社会勢力と一切の関りはありません。
+受取人及び私は「外内国の重要な公的な地位にある者」ではありません。
+また申込書に表示された内容について間違いが無い事を確認した上で、JME送金サービスの受取人登録を依頼します.
+I understand and agree to the ”Terms and Conditions for Overseas Remittance” of Japan Money Express Co., Ltd. (JME).
+Beneficiary and I have no relation with North Korea or Iran. Also, we have no relation to any Anti­Social Forces and we are not engaged in any illegal activities.
+Beneficiary and I are not Politically Exposed Persons(PEPs).
+I confirm the information shown in this application to register beneficiary/ beneficiaries is true and correct.
+
+Customer Signature
+Date : 07­09­2020
+

Repository/Repository/OnlineCustomerDao/CustomerRepository.cs

@@ -100,6 +100,16 @@ namespace Repository.Repository.OnlineCustomerDao
             sql += " ,@signatureUploadId=" + FilterString(signatureId);
             return ParseDbResult(sql);
         }
+        public DbResult AddCustomerPDFUpload(string customerId, string user, string fileName, string fileType, string rowIdField)
+        {
+            string sql = "exec proc_customerDocumentType @flag='Add-file-save',@customerId =" + FilterString(customerId);
+            sql += " ,@user=" + FilterString(user);
+            sql += " ,@fileName=" + FilterString(fileName);
+            sql += " ,@fileType=" + FilterString(fileType);
+            sql += " ,@rowIdField=" + FilterString(rowIdField);
+
+            return ParseDbResult(sql);
+        }
         public string GetCustomerDetailsForFileUpload(string customerId)
         {
             string sql = "exec proc_customerDocumentType @flag='customer-upload-path'";
@@ -107,6 +117,17 @@ namespace Repository.Repository.OnlineCustomerDao
 
             return GetSingleResult(sql);
         }
+
+        public string GetCustomerDetailsForPDFSave(string membershipId, string rowIdField, string type)
+        {
+            string sql = "exec proc_customerDocumentType @flag='customer-path-check'";
+            sql += " ,@membershipId=" + FilterString(membershipId);
+            sql += " ,@rowIdField=" + FilterString(rowIdField);
+            sql += " ,@fileType=" + FilterString(type);
+
+            return GetSingleResult(sql);
+        }
+
         public DataTable GetAddressByZipCodeNew(string zipCode, string user, string rowId)
         {
             string sql = "exec proc_customerBankModify";

Repository/Repository/OnlineCustomerDao/ICustomerRepository.cs

@@ -19,7 +19,9 @@ namespace Repository.Repository.OnlineCustomerDao
         DbResult RegisterCustomerNew(OnlineCustomerModel onlineCustomerModel);
 
         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);