Database/Sp/proc_jme_agent_system_customer.sql

@@ -97,6 +97,7 @@ alter PROC [dbo].[proc_jme_agent_system_customer]
 	@rowid						BIGINT				=	NULL,
 	@docType					INT					=	NULL,
 	@otherOccupationText		VARCHAR(50)			=	NULL,
+	@loginUser					VARCHAR(50)			=	NULL,
 
 	--for receiverData
       @recFirstName				VARCHAR(100)	= NULL,
@@ -293,7 +294,7 @@ BEGIN
                INSERT  INTO customerMaster(
 						firstName,middleName,lastName1,lastName2,country,[address],zipCode,district,city,email,homePhone,workPhone,mobile,
 						nativeCountry,dob,placeOfIssue,occupation,isBlackListed,lastTranId,relationId,relativeName,gender,salaryRange,address2,
-						fullName,
+						fullName,howDidYouHear,
 						createdBy,createdDate,postalCode,idIssueDate,idExpiryDate,idType,idNumber,telNo,agentId,branchId,onlineUser,
 						ipAddress,customerPassword,customerType,isActive,verifiedBy,verifiedDate,isForcedPwdChange,bankName,bankAccountNo,HasDeclare,
 						membershipId,[state],sourceOfFund,street,streetUnicode,cityUnicode,visaStatus,employeeBusinessType,nameOfEmployeer,SSNNO,
@@ -303,7 +304,7 @@ BEGIN
                        VALUES (
 						@firstName,@middleName,@lastName1,@lastName2,@country,@custAdd1,ISNULL(@zipCode, @custPostal),@district,@custCity,@custEmail,null,@workPhone,@custMobile,
 						@custNativecountry,@custDOB,@placeOfIssue,@occupation,@isBlackListed,@lastTranId,@relationId,@relativeName,@custGender,@custSalary,@custAdd2,
-						@fullName,
+						@fullName,@loginUser,
                            @user,DATEADD(HH, 0, GETUTCDATE()),@custPostal,@custIdissueDate,@custIdValidDate,@customerIdType,@customerIdNo,@custTelNo,@loginBranchId,@branch,@onlineUser,
 						@ipAddress,dbo.FNAEncryptString(@newPassword),@customerType,'Y',@user,NULL,'1',@bankId,@accountNumber,@HasDeclare,---- New Added Values
 						@membershipId,@state,@sourceOfFound,@street,@streetUnicode,@cityUnicode,@visaStatus,@employeeBusinessType,@nameOfEmployeer,@SSNNO,

Database/Sp/proc_sendRequest.sql

@@ -27,6 +27,7 @@ ALTER PROC proc_sendRequest
 		,@bankName						VARCHAR(100)	=	NULL
 		,@branchName					VARCHAR(100)	=	NULL
 		,@collMode						VARCHAR(30)		=	NULL
+		,@loginUser						VARCHAR(30)		=	NULL
 AS
 SET NOCOUNT ON ;
 SET XACT_ABORT ON;
@@ -49,14 +50,14 @@ BEGIN
 		INSERT INTO send_money_request(IdNumber,MembershipId,ReceiverFullName,Receiveraddress
 		,ReceiverMobileNumber,purposeOfRemittance,otherPurpose,relationShip,otherRelation,referralName
 		,PCountryId,PmodeId,PagentId,BranchId,AccountNumber,CAmt,Tamt,ServiceCharge,createdby,createddate,BranchManual
-		,pBankName, pBranchName, collMode
+		,pBankName, pBranchName, collMode,loginUser
 		)
 		values
 		(
 		@idNumber,@membershipId,@receiverFullName	,@receiveraddress
 		,@receiverMobileNumber,@purposeOfRemittanceId,@otherPurposeOfRemittance,@relationShipId,@otherRelation,@referralName			
 		,@pCountryId ,@pModeId,@pagentId ,@branchId ,@accountNumber ,@cAmt ,@tamt ,@serviceCharge,@user,Getdate(),@branchManual,
-		@bankName, @branchName, @collMode
+		@bankName, @branchName, @collMode,@loginUser
 		)
 
 		SET @rowId = @@IDENTITY

Database/TC/create table send_money_request.sql

@@ -28,3 +28,4 @@ CREATE TABLE send_money_request
 
  alter table send_money_request add otherPurpose varchar(100)
  alter table send_money_request add otherRelation varchar(100)
+ alter table send_money_request add loginUser varchar(100)

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>E:\C# Projects\UAT\JME_JAPAN\JME_Remit_Live\Published_JME\JME_Agent_System</publishUrl>
+    <publishUrl>H:\JME\JME_Remit_Live\Published_JME\JME_Agent_System</publishUrl>
     <DeleteExistingFiles>False</DeleteExistingFiles>
   </PropertyGroup>
 </Project>

JMEAgentSystem/Scripts/Customer/CustomerRegistration.js

@@ -11,8 +11,8 @@ $(document).ready(function () {
     $("#" + mId + "recReceiverAccountNo").hide();
     $("#" + mId + "agentBankBranchDiv").hide();
 
-    PopulateCustomerData();
-    PopulateBenifiairyData();
+    //PopulateCustomerData();
+    //PopulateBenifiairyData();
 
     $("#" + mId + "ExpireDate").click(function () {
         $("#" + mId + "ExpireDate").val("");
@@ -777,9 +777,9 @@ function RegisterCustomerAndReeiverFromAjaxCall() {
     var occupationHidden = $("#" + mId + "occupationHidden").val();
 
 
-
+    debugger
     //receiver data
-    var recDdlCountry = $("#" + mId + "recDdlCountry option:selected").val().split('(')[0];
+    var recDdlCountry = $("#" + mId + "recDdlCountry option:selected").text().split('(')[0];
     var recDdlBenificiaryType = $("#" + mId + "recDdlBenificiaryType option:selected").val();
     var recTxtReceiverFName = $("#" + mId + "recTxtReceiverFName").val();
     var recTxtReceiverMName = $("#" + mId + "recTxtReceiverMName").val();
@@ -873,6 +873,7 @@ function RegisterCustomerAndReeiverFromAjaxCall() {
         processData: false, // Not to process data  
 
         success: function (response) {
+            alert(response.Msg);
             debugger
             if (response.ErrorCode == "1") {
                 alert(response.Msg);
@@ -884,39 +885,9 @@ function RegisterCustomerAndReeiverFromAjaxCall() {
             }
         },
         error: function (error) {
+            debugger
             alert("Something went wrong!!!");
             return false;
         }
     });
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 }

JMEAgentSystem/Scripts/Receiver/ReceiverRegistation.js

@@ -3,6 +3,8 @@
     $("#" + mId + "register").prop("disabled", true);
     $("#" + mId + "otherRelationDiv").hide();
     $("#divOccupation").hide();
+    $('#branchSelect').hide();
+    $('#branchManual').hide();
 
     //divOccupation
     if (a == "true") {

JMEAgentSystem/Scripts/SendTxnJs/SendMoneyRequest.js

@@ -1,7 +1,8 @@
 
 $(document).ready(function () {
     $("#branchRequired").hide();
-
+    $('#branchSelect').hide();
+    $('#branchManual').hide();
     $(document).on("change", "#" + mId + "receiverMobileNumber", function () {
         var isValid = CheckForMobileNumber(this, "Mobile No.");
         if (isValid === false) {

JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx

@@ -135,8 +135,8 @@
                                         </div>
                                         <div class="col-md-4">
                                             <div class="form-group">
-                                                <label>Mid Name:</label>
-                                                <asp:TextBox runat="server" ID="txtReceiverMName" CssClass="form-control" placeholder="Beneficiary Mid Name"></asp:TextBox>
+                                                <label>Middle Name:</label>
+                                                <asp:TextBox runat="server" ID="txtReceiverMName" CssClass="form-control" placeholder="Beneficiary Middle Name"></asp:TextBox>
                                             </div>
                                         </div>
                                         <div class="col-md-4">

JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx

@@ -363,7 +363,7 @@
                                             </div>
                                         </div>
                                         <div class="row">
-                                            <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="recTxtContactNo" CssClass="form-control" placeholder="Beneficiary Contact No" MaxLength="15" onchange="return CheckForPhoneNumber(this,'Phone No.')"></asp:TextBox>

JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx.cs

@@ -33,7 +33,6 @@ namespace JMEAgentSystem.WebPages.CustomerRegistration
             //signatureDiv.Visible = !CheckAddOrEdit() && _sl.HasRight(SignatureFunctionId);
             //isDisplaySignature.Value = !CheckAddOrEdit() && _sl.HasRight(SignatureFunctionId) ? "true" : "false";
             //agreementDiv.Visible = !CheckAddOrEdit();
-            GetStatic.PrintMessage(Page);
             ////displayOnlyOnEdit.Visible = CheckAddOrEdit();
             //addEditPanel.Attributes.Add("style", "display:" + (CheckAddOrEdit() ? "none" : ""));
             //displayCounterVisit.Visible = !CheckAddOrEdit();
@@ -626,6 +625,7 @@ namespace JMEAgentSystem.WebPages.CustomerRegistration
         }
         public void SaveCustomerAndReceiver()
         {
+            var dbResult = new DbResult();
             try
             {
                 var jsonString = "";
@@ -666,7 +666,7 @@ namespace JMEAgentSystem.WebPages.CustomerRegistration
                 OnlineCustomerModel customerModel = PrepareCutomerDataFromAjax();
                 BenificiaryModel benificiaryModel = PrepareBenificiaryDataFromAjax();
 
-                var dbResult = _customerServices.RegisterCustomerAndReceiver(customerModel, benificiaryModel);
+                dbResult = _customerServices.RegisterCustomerAndReceiver(customerModel, benificiaryModel);
                 var hddImgURL = Request.Form["hddImgURL"].ToString();
                 if (dbResult.ErrorCode == "0" && !string.IsNullOrEmpty(hddImgURL) && !string.IsNullOrWhiteSpace(hddImgURL))
                 {
@@ -681,28 +681,24 @@ namespace JMEAgentSystem.WebPages.CustomerRegistration
                         _customerServices.AddCustomerSignature(customerId, GetStatic.GetUser(), signatureName, "agent-upload", customerId);
                     }
                 }
-                GetStatic.SetMessage(dbResult.ErrorCode, dbResult.Msg);
                 if (dbResult.ErrorCode == "0")
                 {
                     saveCustomerDocument(dbResult);
-                    jsonString = JsonConvert.SerializeObject(dbResult);
-                    Response.ContentType = "application/json";
-                    Response.Write(jsonString);
-                    Response.End();
                 }
             }
             catch (Exception ex)
             {
-                DbResult dbResult = new DbResult()
+                dbResult = new DbResult()
                 {
                     ErrorCode = "1",
                     Msg = ex.Message
                 };
-                var jsonString = JsonConvert.SerializeObject(dbResult);
-                Response.ContentType = "application/json";
-                Response.Write(jsonString);
-                Response.End();
+
             }
+            var jsonString1 = JsonConvert.SerializeObject(dbResult);
+            Response.ContentType = "application/json";
+            Response.Write(jsonString1);
+            Response.End();
         }
         public OnlineCustomerModel PrepareCutomerDataFromAjax()
         {

JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx

@@ -68,8 +68,8 @@
                                         <div class="row">
                                             <div class="col-md-4 col-sm-4">
                                                 <div class="form-group">
-                                                    <label>Beneficiary Fullname:<span class="errormsg">*</span></label>
-                                                    <asp:TextBox ID="receiverFullName" runat="server" placeholder="FullName" CssClass="form-control required" />
+                                                    <label>Beneficiary Full Name:<span class="errormsg">*</span></label>
+                                                    <asp:TextBox ID="receiverFullName" runat="server" placeholder="Full Name" CssClass="form-control required" />
                                                 </div>
                                             </div>
                                             <div class="col-md-4 col-sm-4">