Common/Model/BenificiaryModel/BenificiaryModel.cs

@@ -39,5 +39,6 @@ namespace Common.Model.BenificiaryModel
         public string NativeCountry { get; set; }
         public string OtherRelationDescription { get; set; }
         public int agentId { get; set; }
+        public string branchText { get; set; }
     }
 }

Database/Sp/PROC_AGENT_RECEIVER_SETUP.sql

@@ -39,6 +39,7 @@ ALTER PROC PROC_AGENT_RECEIVER_SETUP
 	  @otherRelationDesc		VARCHAR(20)		= NULL,
       @RelationshipOther		VARCHAR(100)	= NULL,
       @PurposeOfRemitanceOther	VARCHAR(100)	= NULL,
+	  @branchManual 			VARCHAR(100)	= NULL,
 	  @loginBranchId			BIGINT			= NULL
 AS
 SET NOCOUNT ON;
@@ -98,15 +99,18 @@ BEGIN
                       (fullname
 						,membershipId ,customerId ,firstName ,middleName ,lastName1 ,lastName2 ,country ,NativeCountry,[address] ,[state] ,zipCode ,city ,email ,
                         homePhone ,workPhone ,mobile ,relationship ,receiverType ,idType ,idNumber ,placeOfIssue ,paymentMode ,bankLocation ,payOutPartner ,
-                        bankName ,receiverAccountNo ,remarks ,purposeOfRemit ,createdBy ,createdDate,otherRelationDesc,agentId, relationOther, purposeOther, isCDDIUpdated				
+                        bankName ,receiverAccountNo ,remarks ,purposeOfRemit ,createdBy ,createdDate,otherRelationDesc,agentId, relationOther, purposeOther, isCDDIUpdated,
+						bankBranchName
 		              )
                       SELECT    ISNULL(@firstName,'') + ISNULL(' ' + @middleName,'') +ISNULL(' ' + @lastName1,''),
 						@membershipId ,@customerIdNew ,@firstName ,@middleName ,@lastName1 ,@lastName2 ,@country ,@nativeCountry,@address ,@state ,@zipCode ,@city ,@email ,
                               @homePhone ,@workPhone ,@mobile ,@RELATION ,@receiverType ,@idType ,@idNumber ,@placeOfIssue ,@paymentMode ,@bankLocation ,@payOutPartner ,
-                              @bankName ,@receiverAccountNo ,@remarks ,@PURPOSEID ,@user ,GETDATE(),@otherRelationDesc,@loginBranchId, @RelationshipOther, @PurposeOfRemitanceOther, 1	
+                              @bankName ,@receiverAccountNo ,@remarks ,@PURPOSEID ,@user ,GETDATE(),@otherRelationDesc,@loginBranchId, @RelationshipOther, @PurposeOfRemitanceOther, 1	,
+							  @branchManual
 		
 		SET @receiverId=SCOPE_IDENTITY();						
               SELECT  '0' errorCode ,'Receiver Successfully added.' msg ,id = @receiverId,extra = cast(@customerIdNew as varchar) + '|' + cast(@membershipId as varchar);
               RETURN; 			
           END;
-END
+END
+

JMEAgentSystem/Scripts/Receiver/ReceiverRegistrationNew.js

@@ -2,7 +2,6 @@
     CustomerSignature();
     $(document).ready(function () {
         $("#MainContent_BenificiaryAgreement").click(function () {
-            debugger
             if ($("#MainContent_BenificiaryAgreement").is(":checked")) {
                 $("#" + mId + "register").removeAttr("disabled");
 
@@ -132,6 +131,16 @@ 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();
@@ -195,12 +204,10 @@ function PopulatePayoutPartner() {
     var pmode = $("#" + mId + "ddlPaymentMode option:selected").val();
     if (pmode == "2") {
         $("#" + mId + "receiverAccountNo").show();
-        $("#agentBankBranchDiv").show();
     }
     else {
         $("#" + mId + "receiverAccountNo").hide();
         $("#" + mId + "DDLBankLocation").val("");
-        $("#agentBankBranchDiv").hide();
     }
 
     var data =
@@ -375,12 +382,10 @@ function PopulateLocation() {
     var pmode = $("#" + mId + "ddlPaymentMode option:selected").val();
     if (pmode == "2") {
         $("#" + mId + "receiverAccountNo").show();
-        $("#agentBankBranchDiv").show();
     }
     else {
         $("#" + mId + "receiverAccountNo").hide();
         $("#" + mId + "DDLBankLocation").val("");
-        $("#agentBankBranchDiv").hide();
     }
 
     var data =

JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx

@@ -269,11 +269,16 @@
                                                         <asp:TextBox ID="txtBenificaryAc" runat="server" CssClass="form-control clearOnNotBank"></asp:TextBox>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-4" id="agentBankBranchDiv">
+                                                <div class="col-md-4 col-sm-4" id="branchSelect">
                                                     <div class="form-group">
-                                                        <label>Agnet/Bank Branch</label>
-                                                        <asp:DropDownList ID="DDLBankLocation" runat="server" CssClass="form-control">
-                                                        </asp:DropDownList>
+                                                        <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="form-group">
+                                                        <label>Branch:<span class="errormsg" id="branchTxtRequired">*</span></label>
+                                                        <asp:TextBox ID="branch_manual" runat="server" CssClass="required form-control"></asp:TextBox>
                                                     </div>
                                                 </div>
                                                 <div class="col-md-12">

JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx.cs

@@ -184,6 +184,7 @@ namespace JMEAgentSystem.WebPages.BenificiaryRegistration
             benificiar.ReceiverId = Request.Form["ReceiverId"].ToString();
             //benificiar.customerId = (Request.Form["hideCustomerId"].ToString() != "" ? Request.Form["hideCustomerId"].ToString() : null);
             benificiar.customerId = customerIdVal;
+            benificiar.branchText = branch_manual.Text;
             //benificiar.agentId = GetStatic.GetAgent().ToInt();
 
             benificiar.Flag = (Request.Form["hideBenificialId"].ToString() != "" ? "u" : "i-new");
@@ -385,6 +386,7 @@ namespace JMEAgentSystem.WebPages.BenificiaryRegistration
                 OtherRelationDescription = otherRelationshipTextBox.Text,
                 membershipId = hideMembershipId.Value,
                 ReceiverId = hideBenificialId.Value,
+                branchText = branch_manual.Text,
                 customerId = (hideCustomerId.Value != "" ? hideCustomerId.Value : null),
                 Flag = (hideBenificialId.Value != "" ? "u" : "i")
             };

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

@@ -363,6 +363,15 @@ namespace JMEAgentSystem.WebPages.BenificiaryRegistration {
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList DDLBankLocation;
         
+        /// <summary>
+        /// branch_manual 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 branch_manual;
+        
         /// <summary>
         /// txtRemarks control.
         /// </summary>

JMEAgentSystem/bin/JMEAgentSystem.dll.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" />

Repository/Repository/OnlineCustomerDao/CustomerRepository.cs

@@ -332,6 +332,7 @@ namespace Repository.Repository.OnlineCustomerDao
             sql += ",@otherRelationDesc =" + FilterString(benificiar.OtherRelationDescription);
             sql += ",@user =" + FilterString(user);
             sql += ",@loginBranchId=" + FilterString(benificiar.agentId.ToString());
+            sql += ",@branchManual=" + FilterString(benificiar.branchText);
             return ParseDbResult(sql);
         }
         public DataTable GetCustomerDetailsWitDT(string customerId, string user)