diff --git a/Database/Sp/proc_customerInfo.sql b/Database/Sp/proc_customerInfo.sql
index a3f12c4..15ab359 100644
--- a/Database/Sp/proc_customerInfo.sql
+++ b/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
+
diff --git a/Database/Sp/proc_sendRequest.sql b/Database/Sp/proc_sendRequest.sql
index d7ce260..e874e97 100644
--- a/Database/Sp/proc_sendRequest.sql
+++ b/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
+
diff --git a/JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx b/JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx
index 701f622..249dea2 100644
--- a/JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx
+++ b/JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx
@@ -32,7 +32,10 @@
Date Of Birth : |
|
-
+
+ Collection Mode: |
+ |
+
|
diff --git a/JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx.cs b/JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx.cs
index 2b41245..b5fc5db 100644
--- a/JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx.cs
+++ b/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)
{
diff --git a/JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx.designer.cs b/JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx.designer.cs
index f9b030b..c7fdde1 100644
--- a/JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx.designer.cs
+++ b/JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx.designer.cs
@@ -75,6 +75,15 @@ namespace JMEAgentSystem.WebPages.SendTxn {
///
protected global::System.Web.UI.HtmlControls.HtmlTableCell custDob;
+ ///
+ /// collMode control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlTableCell collMode;
+
///
/// recFullName control.
///
diff --git a/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx b/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx
index 7e9041e..9645de0 100644
--- a/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx
+++ b/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx
@@ -168,6 +168,15 @@
+
diff --git a/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx.cs b/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx.cs
index 7a2172d..bf0dcc1 100644
--- a/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx.cs
+++ b/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);
diff --git a/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx.designer.cs b/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx.designer.cs
index 133a280..b91baef 100644
--- a/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx.designer.cs
+++ b/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx.designer.cs
@@ -264,6 +264,15 @@ namespace JMEAgentSystem.WebPages.SendTxn {
///
protected global::System.Web.UI.WebControls.TextBox otherRelationshipTextBox;
+ ///
+ /// ddlCollMode control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.DropDownList ddlCollMode;
+
///
/// referralName control.
///
diff --git a/Repository/DAO/SendTxnIRHDao/SendTxnIRHDao.cs b/Repository/DAO/SendTxnIRHDao/SendTxnIRHDao.cs
index f508441..0b4571a 100644
--- a/Repository/DAO/SendTxnIRHDao/SendTxnIRHDao.cs
+++ b/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);
diff --git a/Repository/Model/SendTransactionModel.cs b/Repository/Model/SendTransactionModel.cs
index 02de616..7550234 100644
--- a/Repository/Model/SendTransactionModel.cs
+++ b/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; }
}
}