Database/Sp/proc_sendRequest.sql

@@ -24,24 +24,19 @@ SET XACT_ABORT ON;
 BEGIN
 	IF @flag = 'sendRequest'
 	BEGIN
-		DECLARE @CUSTOMERID BIGINT
-		IF NOT EXISTS (select 1 from customermaster where idnumber = @idNumber)
-
+		DECLARE @CUSTOMERID BIGINT, @rowId BIGINT
+		IF NOT EXISTS (select 1 from customermaster where idnumber = @idNumber AND ISNULL(isActive, 'Y') = 'Y')
 		BEGIN
-			SELECT '1' ERROR_CODE, 'Customer with idNumber /'''+@idNumber+'''/'' does not exixts' Msg,@idNumber id
+			SELECT '1' ERROR_CODE, 'Customer with idNumber '''+@idNumber+''' does not exixts' Msg,@idNumber id
 			RETURN
 		END
-		select @CUSTOMERID = CUSTOMERID,@membershipId = membershipId FROM CUSTOMERMASTER WHERE idNumber = @idNumber
+		select @CUSTOMERID = CUSTOMERID FROM CUSTOMERMASTER WHERE idNumber = @idNumber AND ISNULL(ISACTIVE, 'Y') = 'Y'
 		--IF NOT EXISTS (SELECT 1 from receiverinformation where fullname = LTRIM(RTRIM(@receiverFullName))  and customerid = @CUSTOMERID)
 		--BEGIN
 		--	SELECT '1' ERROR_CODE, 'Receiver with name '''+@receiverFullName+''' does not exist of customer with membershipId '''+@membershipId+'''' Msg,@membershipId id
 		--	RETURN
 		--END
-		IF NOT EXISTS (SELECT 1 from referral_agent_wise where referral_Name = LTRIM(RTRIM(@referralName)))
-		BEGIN
-			SELECT '1' ERROR_CODE, 'Referral with name '''+@referralName+''' does not exist.' Msg,@idNumber id
-			RETURN
-		END
+
 		INSERT INTO send_money_request(IdNumber,MembershipId,ReceiverFullName,Receiveraddress
 		,ReceiverMobileNumber,purposeOfRemittance,relationShip,referralName
 		,PCountryId,PmodeId,PagentId,BranchId,AccountNumber,CAmt,Tamt,ServiceCharge,createdby,createddate
@@ -53,7 +48,9 @@ BEGIN
 		,@pCountryId ,@pModeId,@pagentId ,@branchId ,@accountNumber ,@cAmt ,@tamt ,@serviceCharge,@user,Getdate()
 		)
 
-		SELECT '0' ERROR_CODE,'Request Send Successfully' Msg,@idNumber id
+		SET @rowId = @@IDENTITY
+
+		SELECT '0' ERROR_CODE,'Request Send Successfully' Msg,@rowId id, @CUSTOMERID EXTRA
 	END
 	IF @flag = 'validateData'
 	BEGIN
@@ -63,7 +60,7 @@ BEGIN
 			SELECT '1' ERROR_CODE, 'Customer with idNumber '''+@idNumber+''' does not exixts' Msg,@idNumber id
 			RETURN
 		END
-		select @CUSTOMERID = CUSTOMERID FROM CUSTOMERMASTER WHERE idNumber = @idNumber
+		select @CUSTOMERID = CUSTOMERID FROM CUSTOMERMASTER WHERE idNumber = @idNumber AND ISNULL(ISACTIVE, 'Y') = 'Y'
 		IF NOT EXISTS (SELECT 1 from receiverinformation where fullname = LTRIM(RTRIM(@receiverFullName))  and customerid = @CUSTOMERID)
 		BEGIN
 			SELECT '1' ERROR_CODE, 'Receiver with name '''+@receiverFullName+''' does not exist of customer with idNumber '''+@idNumber+'''' Msg,@idNumber id

JMEAgentSystem/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -37,16 +37,16 @@ by editing this MSBuild file. In order to learn more about this please visit htt
       <publishTime>10/20/2019 12:30:45</publishTime>
     </File>
     <File Include="bin/Business.dll">
-      <publishTime>08/13/2020 10:43:56</publishTime>
+      <publishTime>08/13/2020 15:16:40</publishTime>
     </File>
     <File Include="bin/Business.pdb">
-      <publishTime>08/13/2020 10:43:56</publishTime>
+      <publishTime>08/13/2020 15:16:40</publishTime>
     </File>
     <File Include="bin/Common.dll">
-      <publishTime>08/13/2020 10:43:54</publishTime>
+      <publishTime>08/13/2020 15:16:40</publishTime>
     </File>
     <File Include="bin/Common.pdb">
-      <publishTime>08/13/2020 10:43:54</publishTime>
+      <publishTime>08/13/2020 15:16:40</publishTime>
     </File>
     <File Include="bin/EntityFramework.dll">
       <publishTime>10/20/2019 12:21:00</publishTime>
@@ -55,10 +55,10 @@ by editing this MSBuild file. In order to learn more about this please visit htt
       <publishTime>10/20/2019 12:21:00</publishTime>
     </File>
     <File Include="bin/JMEAgentSystem.dll">
-      <publishTime>08/13/2020 11:17:48</publishTime>
+      <publishTime>08/13/2020 15:16:41</publishTime>
     </File>
     <File Include="bin/JMEAgentSystem.pdb">
-      <publishTime>08/13/2020 11:17:48</publishTime>
+      <publishTime>08/13/2020 15:16:41</publishTime>
     </File>
     <File Include="bin/Microsoft.AspNet.FriendlyUrls.dll">
       <publishTime>10/20/2019 12:21:02</publishTime>
@@ -121,10 +121,10 @@ by editing this MSBuild file. In order to learn more about this please visit htt
       <publishTime>10/20/2019 12:23:17</publishTime>
     </File>
     <File Include="bin/Repository.dll">
-      <publishTime>08/13/2020 10:43:55</publishTime>
+      <publishTime>08/13/2020 15:16:40</publishTime>
     </File>
     <File Include="bin/Repository.pdb">
-      <publishTime>08/13/2020 10:43:55</publishTime>
+      <publishTime>08/13/2020 15:16:40</publishTime>
     </File>
     <File Include="bin/roslyn/csc.exe">
       <publishTime>10/20/2019 12:22:55</publishTime>
@@ -613,7 +613,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
       <publishTime>08/06/2020 12:47:57</publishTime>
     </File>
     <File Include="js/singnature/customerSignature.js">
-      <publishTime>08/12/2020 21:57:06</publishTime>
+      <publishTime>08/13/2020 14:28:15</publishTime>
     </File>
     <File Include="js/singnature/signature_pad.umd.js">
       <publishTime>08/12/2020 17:26:58</publishTime>
@@ -784,7 +784,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
       <publishTime>10/20/2019 12:20:12</publishTime>
     </File>
     <File Include="Scripts/Customer/CustomerRegistration.js">
-      <publishTime>08/12/2020 17:22:08</publishTime>
+      <publishTime>08/13/2020 13:58:44</publishTime>
     </File>
     <File Include="Scripts/Customer/Document.js">
       <publishTime>08/12/2020 12:05:55</publishTime>
@@ -853,10 +853,10 @@ by editing this MSBuild file. In order to learn more about this please visit htt
       <publishTime>08/06/2020 12:47:55</publishTime>
     </File>
     <File Include="Scripts/Receiver/ReceiverRegistation.js">
-      <publishTime>08/11/2020 18:25:35</publishTime>
+      <publishTime>08/13/2020 14:34:37</publishTime>
     </File>
     <File Include="Scripts/Receiver/ReceiverRegistrationNew.js">
-      <publishTime>08/11/2020 16:56:08</publishTime>
+      <publishTime>08/13/2020 14:47:21</publishTime>
     </File>
     <File Include="Scripts/ReferralReports/DashBoard.js">
       <publishTime>12/22/2019 11:23:09</publishTime>
@@ -1282,7 +1282,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
       <publishTime>10/20/2019 15:35:21</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>08/12/2020 21:57:45</publishTime>
+      <publishTime>08/13/2020 15:16:42</publishTime>
     </File>
     <File Include="WebPages/About.aspx">
       <publishTime>10/20/2019 12:20:12</publishTime>
@@ -1309,16 +1309,16 @@ by editing this MSBuild file. In order to learn more about this please visit htt
       <publishTime>08/12/2020 15:58:42</publishTime>
     </File>
     <File Include="WebPages/BenificiaryRegistration/Manage.aspx">
-      <publishTime>08/12/2020 17:59:54</publishTime>
+      <publishTime>08/13/2020 14:42:31</publishTime>
     </File>
     <File Include="WebPages/Contact.aspx">
       <publishTime>10/23/2019 07:47:04</publishTime>
     </File>
     <File Include="WebPages/CustomerRegistration/Manage.aspx">
-      <publishTime>08/12/2020 21:57:29</publishTime>
+      <publishTime>08/13/2020 13:58:45</publishTime>
     </File>
     <File Include="WebPages/CustomerRegistration/PrintDetails.aspx">
-      <publishTime>08/12/2020 17:22:09</publishTime>
+      <publishTime>08/13/2020 13:58:45</publishTime>
     </File>
     <File Include="WebPages/Default.aspx">
       <publishTime>05/25/2020 16:52:39</publishTime>

JMEAgentSystem/Scripts/Receiver/ReceiverRegistrationNew.js

@@ -14,7 +14,6 @@ $(document).ready(function () {
     }
 
     $("#" + mId + "register").click(function () {
-        debugger
         var isFormDataValid = CheckFormValidation();
         if (isFormDataValid === true) {
             var customerSignature = CheckSignatureCustomerFromCustomerRegister();

JMEAgentSystem/Scripts/SendTxnJs/SendMoneyRequest.js

@@ -78,7 +78,6 @@ $(document).ready(function () {
     });
 
     $("#" + mId + "pMode").on('change', function () {
-        debugger
         var pmode = $("#" + mId + "pMode").val();
         if (pmode == "2") {
             $("#accountDiv").show();
@@ -656,9 +655,18 @@ function roundNumber(rnum, rlength) { // Arguments: number to round, number of d
     return parseFloat(newnumber); // Output the result to the form field (change for your purposes)
 }
 
+function ValidateDetailsMain() {
+    var isFormDataValid = ValidateDetails();
+    if (isFormDataValid === true) {
+        return CheckSignatureCustomerFromCustomerRegister();
+    }
+    else {
+        return false;
+    }
+}
+
 function ValidateDetails() {
     var reqField = "senderIdNumber,receiverFullName,receiveraddress,receiverMobileNumber,pCountry,pMode,pAgent,txtCollAmt,purpose,relationship,referralName,";
-    debugger
     var pmodeId = $("#" + mId + "pMode").val();
     if (pmodeId != "1" && pmodeId != undefined) {
         reqField += "branch,";
@@ -693,7 +701,6 @@ function VerifyDetails() {
     }
     $.post('', dataToSend, function (response) {
         var data = JSON.parse(response);
-        debugger
         if (data[0].ERROR_CODE == '0') {
             var pMode = $("#" + mId + "pMode").val();
             var pgent = $("#" + mId + "pAgent").val();

JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx.cs

@@ -192,7 +192,7 @@ namespace JMEAgentSystem.WebPages.BenificiaryRegistration
                     string signatureName = GetStatic.UploadSignatureImage(signatureImage, registerDate, membershipId, customerId);
                     if (signatureName != "1")
                     {
-                        _cd.AddCustomerSignature(customerId, GetStatic.GetUser(), signatureName, "agent-upload-receiver", null);
+                        _cd.AddCustomerSignature(customerId, GetStatic.GetUser(), signatureName, "agent-upload-receiver", dbResult.Id);
                     }
                 }
             }

JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx

@@ -156,8 +156,9 @@
                                                         私は、本依頼書に記載されているジャパンマネーエクスプレス株式会社の「海外送金利用規約」の内容に同意します。
                                                         私の依頼する送金は、北朝鮮及びイランとは関係無い取引であり、反社会勢力と一切の関りはありません。
                                                         私は「外内国の重要な公的な地位にある者」ではありません。
-                                                        また申込書に表示された内容について間違いが無い事を確認した上で、JME送金サービスの利用を依頼します。 <br />
-                                                        
+                                                        また申込書に表示された内容について間違いが無い事を確認した上で、JME送金サービスの利用を依頼します。
+                                                        <br />
+
                                                         「Application for Remittance」
                                                         I understand and agree to the ”Terms and Conditions for Overseas Remittance” of Japan Money Express Co., Ltd. (JME).
                                                         I confirm that this remittance has nothing to do with North Korea nor Iran、and have no relation to any Anti-Social Forces nor engagement in any illegal activities.
@@ -168,9 +169,35 @@
                                                 </label>
                                             </div>
                                         </div>
+                                        <div class="row" id="signatureDiv" runat="server">
+                                            <div class="col-md-6 form-group">
+                                                <label class="control-label">Customer Signature:</label>
+                                                <div id="signature-pad" class="signature-pad" style="height: 350px;">
+                                                    <div class="signature-pad--body">
+                                                        <canvas></canvas>
+                                                    </div>
+                                                    <div class="signature-pad--footer">
+                                                        <div class="description">Sign above</div>
+                                                        <div class="signature-pad--actions">
+                                                            <div class="form-group">
+                                                                <button type="button" class="btn btn-primary clear" data-action="clear">Clear</button>
+                                                                &nbsp;&nbsp;&nbsp;
+                                                                <button type="button" class="btn btn-primary" data-action="undo">Undo</button>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="col-md-6 form-group" style="display: none">
+                                                <label class="control-label">Customer Password:</label>
+                                                <div>
+                                                    <asp:TextBox autocomplete="stopdoingthat" TextMode="Password" ID="customerPassword" runat="server" CssClass="form-control" MaxLength="20"></asp:TextBox>
+                                                </div>
+                                            </div>
+                                        </div>
                                         <div class="row" runat="server">
                                             <div class="col-md-4 form-group">
-                                                <asp:Button ID="Save" Text="Save" runat="server" CssClass="btn btn-primary" OnClientClick="return ValidateDetails()" OnClick="Save_Click" />
+                                                <asp:Button ID="Save" Text="Save" runat="server" CssClass="btn btn-primary" OnClientClick="return ValidateDetailsMain()" OnClick="Save_Click" />
                                             </div>
                                         </div>
                                     </div>
@@ -182,10 +209,14 @@
             </div>
         </div>
     </div>
+    <asp:HiddenField ID="hddImgURL" runat="server" />
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="Script" runat="server">
+    <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/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>
+    <script src="/js/singnature/customerSignature.js"></script>
 </asp:Content>

JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx.cs

@@ -318,6 +318,19 @@ namespace JMEAgentSystem.WebPages.SendTxn
             var result = st.SaveSendRequest(GetStatic.GetUser(), sendTxn);
             if(result.ErrorCode == "0")
             {
+                if (result.ErrorCode == "0" && !string.IsNullOrEmpty(hddImgURL.Value) && !string.IsNullOrWhiteSpace(hddImgURL.Value))
+                {
+                    var res = _customerServices.GetCustomerDetailsForFileUpload(result.Extra).Split('|');
+                    var customerId = res[0];
+                    var membershipId = res[1];
+                    var registerDate = res[2];
+
+                    string signatureName = GetStatic.UploadSignatureImage(hddImgURL.Value, registerDate, membershipId, customerId);
+                    if (signatureName != "1")
+                    {
+                        _customerServices.AddCustomerSignature(customerId, GetStatic.GetUser(), signatureName, "agent-upload-txn", result.Id);
+                    }
+                }
                 GetStatic.SetMessage(result.ErrorCode, result.Msg);
                 Response.Redirect("SendTxnRequest.aspx");
             }

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

@@ -309,6 +309,24 @@ namespace JMEAgentSystem.WebPages.SendTxn {
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputCheckBox TransactionAgreement;
         
+        /// <summary>
+        /// signatureDiv 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 signatureDiv;
+        
+        /// <summary>
+        /// customerPassword 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 customerPassword;
+        
         /// <summary>
         /// Save control.
         /// </summary>
@@ -317,5 +335,14 @@ namespace JMEAgentSystem.WebPages.SendTxn {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button Save;
+        
+        /// <summary>
+        /// hddImgURL 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 hddImgURL;
     }
 }

JMEAgentSystem/bin/JMEAgentSystem.dll.config

@@ -74,12 +74,12 @@
         <add name="DefaultSessionProvider" type="System.Web.Providers.DefaultSessionStateProvider, System.Web.Providers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" />
       </providers>
     </sessionState>
-      <customErrors mode="off" defaultRedirect="mycustompage.htm"/>
+      <customErrors mode="Off" defaultRedirect="mycustompage.htm"/>
   </system.web>
   <appSettings>
     <add key="virtualDirName" value="" />
     <add key="customerDocPath" value="H:\JMEFiles\" />
-    <add key="customerDocFileExtension" value=".jpeg,.png,.jpg" />
+    <add key="customerDocFileExtension" value=".jpeg,.jpg" />
     <add key="root" value="H:\JME\JME_Remit_Dev\JMEAgentSystem\JMEAgentSystem\" />
     <add key="urlRoot" value="http://localhost:63438" />
 

JMEAgentSystem/obj/Release/Package/PackageTmp/Scripts/Customer/CustomerRegistration.js

@@ -1,6 +1,7 @@
 $(document).ready(function () {
-    //PopulateCustomerData();
-    //PopulateBenifiairyData();
+    $("#" + mId + "occupation").prop("disabled", true);
+    PopulateCustomerData();
+    PopulateBenifiairyData();
     $("#" + mId + "ExpireDate").click(function () {
         $("#" + mId + "ExpireDate").val("");
     });
@@ -11,15 +12,51 @@
             GetAddressByZipCode();
         }
     });
-    //$("#" + mId + "zipCode").keydown(function () {
-    //    var len = $(this).val().length;
-    //    if (len == "6") {
-    //        GetAddressByZipCode();
-    //    }
-    //});
+    $("#" + mId + "ddlVisaStatus").change(function () {
+        var gen_emp_arr = ["official", "professor", "artist", "religious activities", "journalist", "highly skilled professional", "business manager", "legal/accounting services"
+            , "medical services", "researcher", "instructor", "engineer/specialist in humanities/international services", "intra-company transferee"
+            , "nursing care", "entertainer", "skilled labor", "technical intern training", "permanent resident", "spouse or child of japanese national"
+            , "spouse or child of permanent resident", "long-term resident", "japanese", "specified skilled worker", "designated activities"];
+
+        var house_wife_husband_arr = ["dependent"];
+        var student_arr = ["student"];
+        var part_time_worker_arr = ["trainee", "cultural activities", "temporary visitor"];
+        var other_arr = ["diplomat"];
+
+        selectedText = $("#" + mId + "ddlVisaStatus option:selected").text().toLowerCase();
+        $("#divOccupation").hide();
+
+        if (jQuery.inArray(selectedText, gen_emp_arr) >= 0) {
+            $("#" + mId + "occupationHidden").val(11379);
+            $("#" + mId + "occupation").val(11379);
+        }
+        else if (jQuery.inArray(selectedText, house_wife_husband_arr) >= 0) {
+            $("#" + mId + "occupationHidden").val(11382);
+            $("#" + mId + "occupation").val(11382);
+        }
+        else if (jQuery.inArray(selectedText, student_arr) >= 0) {
+            $("#" + mId + "occupationHidden").val(11380);
+            $("#" + mId + "occupation").val(11380);
+        }
+        else if (jQuery.inArray(selectedText, part_time_worker_arr) >= 0) {
+            $("#" + mId + "occupationHidden").val(11381);
+            $("#" + mId + "occupation").val(11381);
+        }
+        else if (jQuery.inArray(selectedText, other_arr) >= 0) {
+            $("#" + mId + "occupationHidden").val(11383);
+            $("#" + mId + "occupation").val(11383);
+            $("#divOccupation").show();
+        }
+    });
+    $("#" + mId + "occupation").change(function () {
+        $("#divOccupation").hide();
+        if ($("#" + mId + "occupation>").val() === "11376") {
+            $("#divOccupation").show();
+        }
+    });
     $("#" + mId + "ddlSearchBy").change(function () {
-        $("#ContentPlaceHolder1_txtSearchData_aText").val("");
-        $("#ContentPlaceHolder1_addEditPanel").hide();
+        $("#" + mId + "txtSearchData_aText").val("");
+        $("#" + mId + "addEditPanel").hide();
         $("#" + mId + "ddlCustomerType").val("4700");
         $("#" + mId + "membershipDiv").hide();
         $("#" + mId + "customerType").hide();
@@ -272,6 +309,14 @@ function ParseCustomerData(response) {
 
 function CheckMasterFormValidation() {
     debugger
+    var requiredFieldAllPresent = ValidateRequiredfields();
+    if (requiredFieldAllPresent) {
+        return CheckSignatureCustomerFromCustomerRegister();
+    } else {
+        return requiredFieldAllPresent;
+    }
+}
+function ValidateRequiredfields() {
     if (CheckRequiredFields() == true && CheckCustomerValidation() == true && CheckReceiverValidation() == true && CheckDocumentFormat() == true) {
         //PrepareDataForAjaxCall();
         var a = $("#" + mId + "recDdlPaymentMode option:selected").val();

JMEAgentSystem/obj/Release/Package/PackageTmp/Scripts/Receiver/ReceiverRegistation.js

@@ -7,7 +7,20 @@
     }
 
     $("#" + mId + "register").click(function () {
-        return CheckFormValidation();
+        debugger
+        var isFormDataValid = CheckFormValidation();
+        if (isFormDataValid === 'true') {
+            var customerSignature = CheckSignatureCustomerFromCustomerRegister();
+            if (customerSignature === 'true') {
+                save();
+            }
+            else {
+                return false;
+            }
+        }
+        else {
+            return false;
+        }
     });
 
 
@@ -186,7 +199,6 @@ function getUrlVars() {
 }
 
 function showTextBox() {
-    debugger
     var res = $("#" + mId + "recDdlRelationship").val();
     if (res.toUpperCase() == "11339") {
         $("#" + mId + "otherRelationDiv").show();
@@ -197,7 +209,6 @@ function showTextBox() {
 }
 
 function CheckFormValidation() {
-    debugger
     $("#" + mId + "recDdlIdType").removeAttr("style");
     $("#" + mId + "recTxtIdValue").removeAttr("style");
     var input = $("#" + mId + "recTxtRecMobileNo");
@@ -233,7 +244,6 @@ function CheckFormValidation() {
         return false;
     }
     $("#" + mId + "register").attr("disabled", "disabled");
-    save();
 };
 function save() {
     var addType = 'GetReceiverAddType()';
@@ -265,13 +275,13 @@ function save() {
             PurposeOfRemitance: $("#" + mId + "recDdlPurposeOfRemitance").val(),
             BankLocation: bankBranch,
             BankName: $("#" + mId + "recTxtBankName").val(),
-            BenificaryAc: $("#" + mId + "recTxtBenificaryAc").val(),
             Remarks: $("#" + mId + "recTxtRemarksRec").val(),
             OtherRelationDescription: $("#" + mId + "otherRelationshipTextBox").val(),
             membershipId: $("#" + mId + "hideMembershipId").val(),
             ReceiverId: $("#" + mId + "hideBenificialId").val(),
             hideCustomerId: $("#" + mId + "hideCustomerId").val(),
-            hideBenificialId: $("#" + mId + "hideBenificialId").val()
+            hideBenificialId: $("#" + mId + "hideBenificialId").val(),
+            hddSignatureImage: $("#" + mId + "hddImgURL").val()
         };
     $.ajax({
         url: "",
@@ -330,7 +340,6 @@ $(document).ready(function () {
     });
 
     $("#" + mId + "recTxtRecMobileNo").on("change", function () {
-        debugger
         var input = $("#" + mId + "recTxtRecMobileNo");
         var mobileNo = input.val();
         var countryCode = $(".receiver .country.active .dial-code").text();

JMEAgentSystem/obj/Release/Package/PackageTmp/Web.config

@@ -75,7 +75,7 @@
   </system.web>
   <appSettings>
     <add key="virtualDirName" value="" />
-    <add key="customerDocPath" value="E:\JMEFiles\" />
+    <add key="customerDocPath" value="H:\JMEFiles\" />
     <add key="customerDocFileExtension" value=".jpeg,.jpg" />
     <add key="root" value="H:\JME\JME_Remit_Dev\JMEAgentSystem\JMEAgentSystem\" />
     <add key="urlRoot" value="http://localhost:63438" />

JMEAgentSystem/obj/Release/Package/PackageTmp/WebPages/CustomerRegistration/Manage.aspx

@@ -103,7 +103,7 @@
                                                 <label>Date of Birth:<span class="errormsg">*</span></label>
                                                 <div class="form-inline">
                                                     <div class="input-group input-daterange">
-                                                        <input type="text" class="form-control" runat="server" name="start" id="dob" placeholder="yyyy-mm-dd" onchange="return DateValidation('dob','dob')" MaxLength="10" AutoComplete="off" />
+                                                        <input type="text" class="form-control" runat="server" name="start" id="dob" placeholder="yyyy-mm-dd" onchange="return DateValidation('dob','dob')" maxlength="10" autocomplete="off" />
                                                         <div class="input-group-addon"><i class="fa fa-calendar"></i></div>
                                                     </div>
                                                 </div>
@@ -166,6 +166,12 @@
                                                 <asp:DropDownList runat="server" ID="occupation" CssClass="form-control clearOnOrganisation required"></asp:DropDownList>
                                             </div>
                                         </div>
+                                        <div class="col-md-4 col-sm-4 hideForOrganisation" id="divOccupation" style="display: none;">
+                                            <div class="form-group">
+                                                <label>Occupation (If Other only):<span class="errormsg">*</span></label>
+                                                <asp:TextBox runat="server" ID="occupationText" CssClass="form-control clearOnOrganisation required"></asp:TextBox>
+                                            </div>
+                                        </div>
                                         <div class="col-md-4 col-sm-4">
                                             <div class="form-group">
                                                 <label>Source of Fund:<span class="errormsg">*</span></label>
@@ -212,7 +218,7 @@
                                                         <label>Issue Date:<span class="errormsg">*</span></label>
                                                         <div class="form-inline">
                                                             <div class="input-group input-daterange">
-                                                                <input type="text" class="form-control" runat="server" name="start" id="IssueDate" placeholder="yyyy-mm-dd" onchange="return DateValidation('IssueDate','i')"/>
+                                                                <input type="text" class="form-control" runat="server" name="start" id="IssueDate" placeholder="yyyy-mm-dd" onchange="return DateValidation('IssueDate','i')" />
                                                                 <div class="input-group-addon"><i class="fa fa-calendar"></i></div>
                                                             </div>
                                                         </div>
@@ -224,8 +230,8 @@
                                                     <div class="form-group">
                                                         <label>Valid Date:<span class="errormsg" id="expireRequired">*</span></label>
                                                         <div class="form-inline">
-                                                                <div class="input-group input-daterange">
-                                                                <input type="text" class="form-control" runat="server" name="start" id="ExpireDate" placeholder="yyyy-mm-dd" onchange="return DateValidation('ExpireDate','f')"/>
+                                                            <div class="input-group input-daterange">
+                                                                <input type="text" class="form-control" runat="server" name="start" id="ExpireDate" placeholder="yyyy-mm-dd" onchange="return DateValidation('ExpireDate','f')" />
                                                                 <div class="input-group-addon"><i class="fa fa-calendar"></i></div>
                                                             </div>
                                                         </div>
@@ -564,7 +570,7 @@
                                         <div class="row" id="signatureDiv" runat="server">
                                             <div class="col-md-6 form-group">
                                                 <label class="control-label">Customer Signature:</label>
-                                                <div id="signature-pad" class="signature-pad" style="height:350px;">
+                                                <div id="signature-pad" class="signature-pad" style="height: 350px;">
                                                     <div class="signature-pad--body">
                                                         <canvas></canvas>
                                                     </div>
@@ -807,10 +813,5 @@
     <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/Customer/CustomerRegistration.js"></script>
     <script src="/Scripts/Receiver/ReceiverRegistation.js"></script>
-    
-    <script type="text/javascript">
-        function CheckMasterFormValidation() {
-            return CheckSignatureCustomerFromCustomerRegister();
-        }
-    </script>
+
 </asp:Content>

JMEAgentSystem/obj/Release/Package/PackageTmp/WebPages/CustomerRegistration/PrintDetails.aspx

@@ -4,9 +4,8 @@
     <div class="detailInfo">
         <div class="page-wrapper">
             <table class="tg" runat="server">
-                <tr style="padding-left: 200px">
-                    <th class="tg-lboi" colspan="6">
-                        <img style="height: 50px; width: 190px; position: relative; left: 33%" src="/images/jme.png" /></th>
+                <tr>
+                    <td colspan="6" style="text-align: center; font-weight: bold">Japan Money Express Co. Ltd</td>
                 </tr>
                 <tr>
                     <td class="tg-7btt" colspan="6">Customer Information</td>
@@ -111,7 +110,7 @@
                     <td colspan="2" class="tg-0pky" runat="server" id="txtOnlineLoginAllowed"></td>
                 </tr>
                 <tr>
-                    <td class="tg-7btt" colspan="6">Benificiary Information</td>
+                    <td class="tg-7btt" colspan="6">Beneficiary Information</td>
                 </tr>
                 <tr>
                     <td style="white-space: nowrap" class="tg-fymr">Country:</td>
@@ -166,16 +165,32 @@
                 <tr>
                     <td style="white-space: nowrap" class="tg-fymr">Agent/Bank:</td>
                     <td colspan="2" class="tg-0pky" runat="server" id="pagent"></td>
-                    <td class="tg-fymr">Benificiary A/c:</td>
+                    <td class="tg-fymr">Beneficiary A/c:</td>
                     <td colspan="2" class="tg-0pky" runat="server" id="recAccountNumber"></td>
                 </tr>
                 <tr>
                     <td style="white-space: nowrap" class="tg-fymr">Agent/Bank Branch:</td>
                     <td colspan="2" class="tg-0pky" runat="server" id="pBranch"></td>
                     <td class="tg-fymr">Remarks:</td>
-                    <td colspan="2" class="tg-0pky" runat="server" id="recREmarks"></td>
+                    <td colspan="2" class="tg-0pky" runat="server" id="recRemarks"></td>
                 </tr>
                 <tr>
+                    <td class="tg-7btt" colspan="6">
+                        <small class="custom-control-label">海外送金サービス利用申込書」
+                                                                    私は、本依頼書に記載されているジャパンマネーエクスプレス株式会社の「海外送金利用規約」の内容に同意します。
+                                                                    私の依頼する送金は、北朝鮮及びイランとは関係無い取引であり、反社会勢力と一切の関りはありません。
+                                                                    私は「外内国の重要な公的な地位にある者」ではありません。
+                                                                    また申込書に表示された内容について間違いが無い事を確認した上で、JME送金サービスの利用を依頼します。
+                                                        <br />
+
+                            「Overseas Remittance Service Application」(customer registration)
+                                                                    I understand and agree to the ”Terms and Conditions for Overseas Remittance” of Japan Money Express Co., Ltd. (JME).
+                                                                    I confirm that this remittance has nothing to do with North Korea nor Iran、and have no relation to any Anti-Social Forces nor engagement in any illegal activities.
+                                                                    I am not Politically Exposed Persons(PEPs).
+                                                                    I confirm the information shown in this application to avail the remittance service is true and correct.
+
+                        </small>
+                    </td>
                 </tr>
             </table>
             <div class="panel-body row" id="docDiv" runat="server">
@@ -289,7 +304,7 @@
             .tg .tg-7btt {
                 font-weight: bold;
                 border-color: inherit;
-                text-align: center;
+                text-align: left;
                 vertical-align: top
             }
 
@@ -298,12 +313,17 @@
         }
 
         @media print {
-            .page-wrapper {
-                min-height: 350px;
+            .content {
+                margin-top: 0px !important;
+            }
+
+            img {
+                height: 70px !important;
+                width: 100px !important;
             }
 
-            .detailInfo {
-                margin-top: 0px;
+            footer {
+                display: none;
             }
         }
     </style>

JMEAgentSystem/obj/Release/TransformWebConfig/original/Web.config

@@ -78,7 +78,7 @@
   </system.web>
   <appSettings>
     <add key="virtualDirName" value="" />
-    <add key="customerDocPath" value="E:\JMEFiles\" />
+    <add key="customerDocPath" value="H:\JMEFiles\" />
     <add key="customerDocFileExtension" value=".jpeg,.jpg" />
     <add key="root" value="H:\JME\JME_Remit_Dev\JMEAgentSystem\JMEAgentSystem\" />
     <add key="urlRoot" value="http://localhost:63438" />

JMEAgentSystem/obj/Release/TransformWebConfig/transformed/Web.config

@@ -75,7 +75,7 @@
   </system.web>
   <appSettings>
     <add key="virtualDirName" value="" />
-    <add key="customerDocPath" value="E:\JMEFiles\" />
+    <add key="customerDocPath" value="H:\JMEFiles\" />
     <add key="customerDocFileExtension" value=".jpeg,.jpg" />
     <add key="root" value="H:\JME\JME_Remit_Dev\JMEAgentSystem\JMEAgentSystem\" />
     <add key="urlRoot" value="http://localhost:63438" />