diff --git a/Swift.web/Remit/Transaction/Modify/ModifyField.aspx.cs b/Swift.web/Remit/Transaction/Modify/ModifyField.aspx.cs index cecb4c1..6e00206 100644 --- a/Swift.web/Remit/Transaction/Modify/ModifyField.aspx.cs +++ b/Swift.web/Remit/Transaction/Modify/ModifyField.aspx.cs @@ -43,6 +43,15 @@ namespace Swift.web.Remit.Transaction.Modify rptName.Visible = true; rptShowOther.Visible = false; } + else if (getFieldName() == "paymentMethod") + { + rptShowOther.Visible = true; + PopulateDll(getFieldName()); + ddlNewValue.Visible = true; + txtNewValue.Visible = false; + rptName.Visible = false; + txtContactNo.Visible = false; + } else { rptShowOther.Visible = true; @@ -75,6 +84,8 @@ namespace Swift.web.Remit.Transaction.Modify lblFieldName.Text = "Receiver Id No"; else if (getFieldName() == "sIdNo") lblFieldName.Text = "Sender Id No"; + else if (getFieldName() == "paymentMethod") + lblFieldName.Text = "Mode of Payment"; } private string GetLabel() @@ -95,10 +106,13 @@ namespace Swift.web.Remit.Transaction.Modify } private void PopulateDll(string fieldName) { + var country = GetStatic.ReadQueryString("pCountry",""); if (fieldName == "rIdType") sd.SetDDL(ref ddlNewValue, "EXEC proc_online_dropDownList @flag = 'idType', @user = '" + GetStatic.GetUser() + "'", "valueId", "detailTitle", "", "Select.."); else if (fieldName == "sIdType") sd.SetDDL2(ref ddlNewValue, "EXEC proc_countryIdType @flag = 'il', @countryId='151', @spFlag = '5201'", "detailTitle", "", "Select"); + else if (fieldName == "paymentMethod") + sd.SetDDL(ref ddlNewValue, "EXEC proc_online_sendPageLoadData @flag = 'payoutMethods' ,@country = " + country + "", "Key", "Value", "", "Select"); } protected void btnUpdate_Click(object sender, EventArgs e) { diff --git a/Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx b/Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx index e157c88..7a72d70 100644 --- a/Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx +++ b/Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx @@ -107,6 +107,15 @@ + + +
Mode of Payment :
+ + + + + +
diff --git a/Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx.designer.cs b/Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx.designer.cs index a66b978..30f1683 100644 --- a/Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx.designer.cs +++ b/Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx.designer.cs @@ -158,6 +158,24 @@ namespace Swift.web.Remit.Transaction.Modify /// protected global::System.Web.UI.WebControls.DropDownList ddlBranch; + /// + /// modeOfPayment control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlTableRow modeOfPayment; + + /// + /// ddlPaymnetMode control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlPaymnetMode; + /// /// rptAccountNo control. /// diff --git a/Swift.web/Remit/Transaction/Modify/ModifyTran.aspx b/Swift.web/Remit/Transaction/Modify/ModifyTran.aspx index fc082b4..660374d 100644 --- a/Swift.web/Remit/Transaction/Modify/ModifyTran.aspx +++ b/Swift.web/Remit/Transaction/Modify/ModifyTran.aspx @@ -152,6 +152,23 @@ "&pCountryId=" + pCountryId; + var id = PopUpWindow(url, ""); + if (id == "undefined" || id == null || id == "") { + } + else { + GetElement("<%=btnReloadDetail.ClientID %>").click(); + } + return false; + } + + function EditPaymentMode(label, fieldName, oldValue, tranId, pCountry) { + var url = "ModifyField.aspx?label=" + label + + "&fieldName=" + fieldName + + "&oldValue=" + oldValue + + "&tranId=" + tranId + + "&pCountry=" + pCountry; + + var id = PopUpWindow(url, ""); if (id == "undefined" || id == null || id == "") { } diff --git a/Swift.web/Remit/UserControl/UcTransaction.ascx.cs b/Swift.web/Remit/UserControl/UcTransaction.ascx.cs index d559b41..e8da7bc 100644 --- a/Swift.web/Remit/UserControl/UcTransaction.ascx.cs +++ b/Swift.web/Remit/UserControl/UcTransaction.ascx.cs @@ -374,7 +374,8 @@ namespace Swift.web.Remit.UserControl } pAgentName.Text = tRow["pAgentName"].ToString(); - modeOfPayment.Text = tRow["paymentMethod"].ToString(); + //modeOfPayment.Text = tRow["paymentMethod"].ToString(); + modeOfPayment.Text = GetPaymentMode("Mode of Payment", "paymentMethod", tRow); modeOfDeposit.Text = tRow["depositType"].ToString(); payer.Text = tRow["payerName"].ToString(); @@ -861,6 +862,14 @@ namespace Swift.web.Remit.UserControl fieldValue + "
"; return str; } + public string GetPaymentMode(string label, string fieldName, DataRow dr) + { + string fieldValue = dr[fieldName].ToString().Trim(); + + var str = "
" + + fieldValue + "
"; + return str; + } public void SearchData() { @@ -1717,7 +1726,8 @@ namespace Swift.web.Remit.UserControl pBranchName.Text = tRow["pBranchName"].ToString(); } pAgentName.Text = tRow["pAgentName"].ToString(); - modeOfPayment.Text = tRow["paymentMethod"].ToString(); + //modeOfPayment.Text = tRow["paymentMethod"].ToString(); + modeOfPayment.Text = GetPaymentMode("Mode of Payment", "paymentMethod", tRow); modeOfDeposit.Text = tRow["depositType"].ToString(); tranStatus.Text = tRow["tranStatus"].ToString(); payStatus.Text = tRow["payStatus"].ToString();