Database/Sp/proc_customerInfo.sql

@@ -1,3 +1,4 @@
+
 ALTER proc proc_customerInfo
 	@flag			VARCHAR(30)	,
 	@customerId		VARCHAR(20)	=	NULL,
@@ -91,7 +92,8 @@ BEGIN
                        email,  
                        sdg.detailTitle AS [gender] ,  
                        cmn.countryName AS [nativeCountry] ,  
-					   [address] = ' '+ ISNULL(substring(cm.zipcode,1,3),'') + '-' +  ISNULL(substring(cm.zipcode,4,7),'') + isnull(', ' + csm.stateName,'')+ISNULL('-'+ detail.state_japanese,'') +  isnull(', ' +cm.city,'')+ISNULL('-'+ detail.city_japanese,'') +  isnull(', ' + cm.street,'')+ISNULL('-'+ detail.street_japanese,'') + +isnull(', ' +cm.ADDITIONALADDRESS,''),
+					   [address] = ' '+ ISNULL(substring(cm.zipcode,1,3),'') + '-' +  ISNULL(substring(cm.zipcode,4,7),'') + isnull(', ' + csm.stateName,'')+ISNULL('-'+ detail.state_japanese,'') +  isnull(', ' +cm.city,'')+ISNULL('-'+ detail.city_japanese,'') +  isnull(
+', ' + cm.street,'')+ISNULL('-'+ detail.street_japanese,'') + +isnull(', ' +cm.ADDITIONALADDRESS,''),
                        cm.city ,  
                        COALESCE(cm.telNo,cm.homePhone) telNo,  
                        cm.mobile ,  
@@ -190,7 +192,8 @@ BEGIN
      BANK_NAME = pBankName,  
      BRANCH_NAME = ISNULL(pBranchName, BranchManual),  
      smq.otherPurpose,  
-     smq.otherRelation  
+     smq.otherRelation,
+	 smq.collMode  
    FROM send_money_request smq (NOLOCK)   
    INNER JOIN customermaster cmm (NOLOCK) ON cmm.idnumber = smq.idNumber  
    LEFT JOIN  STATICDATAVALUE purpose (NOLOCK) ON purpose.valueId = smq.purposeOfRemittance  
@@ -199,3 +202,4 @@ BEGIN
     where rowId = @rowId  
      END;  
 END
+

Database/Sp/proc_sendRequest.sql

@@ -1,3 +1,5 @@
+
+
 ALTER PROC proc_sendRequest
 
 		@flag							VARCHAR(20)		
@@ -24,6 +26,7 @@ ALTER PROC proc_sendRequest
 		,@benefeciaryId					BIGINT			=	NULL
 		,@bankName						VARCHAR(100)	=	NULL
 		,@branchName					VARCHAR(100)	=	NULL
+		,@collMode						VARCHAR(30)		=	NULL
 AS
 SET NOCOUNT ON ;
 SET XACT_ABORT ON;
@@ -46,14 +49,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
+		,pBankName, pBranchName, collMode
 		)
 		values
 		(
 		@idNumber,@membershipId,@receiverFullName	,@receiveraddress
 		,@receiverMobileNumber,@purposeOfRemittanceId,@otherPurposeOfRemittance,@relationShipId,@otherRelation,@referralName			
 		,@pCountryId ,@pModeId,@pagentId ,@branchId ,@accountNumber ,@cAmt ,@tamt ,@serviceCharge,@user,Getdate(),@branchManual,
-		@bankName, @branchName
+		@bankName, @branchName, @collMode
 		)
 
 		SET @rowId = @@IDENTITY
@@ -110,3 +113,4 @@ BEGIN
 		WHERE receiverId = @benefeciaryId
 	END
 END
+

JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx

@@ -32,7 +32,10 @@
                     <td style="white-space: nowrap; width: 13%;" class="tg-fymr">Date Of Birth :</td>
                     <td colspan="3" class="tg-0pky" runat="server" id="custDob" style="width: 37%;"></td>
                 </tr>
-
+                <tr>
+                    <td style="white-space: nowrap; width: 13%;" class="tg-fymr">Collection Mode:</td>
+                    <td colspan="2" class="tg-0pky" runat="server" id="collMode" style="width: 37%;"></td>
+                </tr>
                 <tr>
                     <td colspan="6">&nbsp;</td>
                 </tr>

JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx.cs

@@ -71,6 +71,7 @@ namespace JMEAgentSystem.WebPages.SendTxn
             relationship.InnerText = dr["relationship"].ToString();
             otherRelation.InnerText = dr["otherRelation"].ToString();
             otherPurpose.InnerText = dr["otherPurpose"].ToString();
+            collMode.InnerText = dr["collMode"].ToString();
         }
         private void SetCustomerDetails(DataRow dr)
         {

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

@@ -75,6 +75,15 @@ namespace JMEAgentSystem.WebPages.SendTxn {
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTableCell custDob;
         
+        /// <summary>
+        /// collMode 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 collMode;
+        
         /// <summary>
         /// recFullName control.
         /// </summary>

JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx

@@ -168,6 +168,15 @@
                                                     <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">

JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx.cs

@@ -334,6 +334,7 @@ namespace JMEAgentSystem.WebPages.SendTxn
             var relationShipId = relationship.SelectedValue;
             var otherRelation = otherRelationshipTextBox.Text;
             var referralNameValue = referralName.Text;
+            var collectionMode = ddlCollMode.SelectedValue;
 
             SendTransactionModel sendTxn = new SendTransactionModel()
             {
@@ -356,7 +357,8 @@ namespace JMEAgentSystem.WebPages.SendTxn
                 ReferralName = referralNameValue,
                 BranchManual = branch_manual.Text,
                 bankName = hddPagentName.Value,
-                branchName = hddPBranchName.Value
+                branchName = hddPBranchName.Value,
+                collMode = collectionMode
             };
 
             var result = st.SaveSendRequest(GetStatic.GetUser(), sendTxn);

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

@@ -264,6 +264,15 @@ 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>

Repository/DAO/SendTxnIRHDao/SendTxnIRHDao.cs

@@ -192,6 +192,7 @@ namespace Repository.DAO.SendTxnIRHDao
             sql += ", @branchManual = " + FilterString(sendTxn.BranchManual);
             sql += ", @bankName = " + FilterString(sendTxn.bankName);
             sql += ", @branchName = " + FilterString(sendTxn.branchName);
+            sql += ", @collMode = " + FilterString(sendTxn.collMode);
 
 
             DbResult dr = ParseDbResult(sql);

Repository/Model/SendTransactionModel.cs

@@ -30,5 +30,6 @@ namespace Repository.Model
         public string IdNumber { get; set; }
         public string bankName { get; set; }
         public string branchName { get; set; }
+        public string collMode { get; set; }
     }
 }