IME-LONDON
/
WEB_CORE
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

bank edit 

bank modify
Prod
shakun 9 months ago
parent
53af4028eb
commit
a07b59b364
19 changed files with 158 additions and 74 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      Swift.DAL/Remittance/Transaction/ModifyTransactionDao.cs
  2. 2
      Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx
  3. 2
      Swift.web/AgentNew/SendTxn/SendIntlReceipt.aspx.cs
  4. 7
      Swift.web/Library/GetStatic.cs
  5. 50
      Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx
  6. 4
      Swift.web/MobileRemit/Admin/Operation/ManageActivate.aspx
  7. 1
      Swift.web/Payment/trans_payment_success.aspx
  8. 6
      Swift.web/Remit/Administration/CustomerRegistration/Manage.aspx
  9. 4
      Swift.web/Remit/Administration/CustomerRegistration/Manage.aspx.cs
  10. 4
      Swift.web/Remit/Administration/CustomerSetup/Manage.aspx
  11. 4
      Swift.web/Remit/Administration/CustomerSetup/ManageNew.aspx
  12. 2
      Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx
  13. 23
      Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx.cs
  14. 61
      Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx.designer.cs
  15. 19
      Swift.web/Remit/Transaction/Modify/ModifyTran.aspx
  16. 2
      Swift.web/Remit/Transaction/ReprintVoucher/SendIntlReceipt.aspx.cs
  17. 2
      Swift.web/Remit/UserControl/UcTransaction.ascx
  18. 22
      Swift.web/Remit/UserControl/UcTransaction.ascx.cs
  19. 9
      Swift.web/Remit/UserControl/UcTransaction.ascx.designer.cs

8
Swift.DAL/Remittance/Transaction/ModifyTransactionDao.cs
View File

@ -207,6 +207,14 @@ namespace Swift.DAL.BL.Remit.Transaction
return GetSingleResult(sql); return GetSingleResult(sql);
} }
public string SelectBankName(string user, string tranId)
{
string sql = "EXEC [proc_modifyTXN]";
sql += " @flag = 'branchId'";
sql += ", @user = " + FilterString(user);
sql += ", @tranId = " + FilterString(tranId);
return GetSingleResult(sql);
}
public DbResult TranViewLog( public DbResult TranViewLog(
string user string user
, string tranId , string tranId

2
Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx
View File

@ -38,7 +38,7 @@
} }
.lowercase { .lowercase {
text-transform: lowercase !important;
text-transform: none !important;
} }
</style> </style>
<script type="text/javascript"> <script type="text/javascript">

2
Swift.web/AgentNew/SendTxn/SendIntlReceipt.aspx.cs
View File

@ -91,7 +91,7 @@ namespace Swift.web.AgentNew.SendTxn
createdBy.Text = sRow["companyaddress"].ToString(); createdBy.Text = sRow["companyaddress"].ToString();
approvedDate.Text = DateTime.Parse(sRow["createdDate"].ToString()).ToString("yyyy-MM-dd hh:mm:ss tt"); approvedDate.Text = DateTime.Parse(sRow["createdDate"].ToString()).ToString("yyyy-MM-dd hh:mm:ss tt");
cAmt.Text = GetStatic.ShowDecimal(sRow["cAmt"].ToString()) + "&nbsp" + sRow["collCurr"].ToString(); cAmt.Text = GetStatic.ShowDecimal(sRow["cAmt"].ToString()) + "&nbsp" + sRow["collCurr"].ToString();
serviceCharge.Text = GetStatic.ShowDecimal(sRow["serviceCharge"].ToString()) + "&nbsp" + sRow["collCurr"].ToString();
serviceCharge.Text = GetStatic.ShowTwoDecimal(sRow["serviceCharge"].ToString()) + "&nbsp" + sRow["collCurr"].ToString();
tAmt.Text = GetStatic.ShowDecimal(sRow["tAmt"].ToString()) + "&nbsp" + sRow["collCurr"].ToString(); tAmt.Text = GetStatic.ShowDecimal(sRow["tAmt"].ToString()) + "&nbsp" + sRow["collCurr"].ToString();
exRate.Text = sRow["exRate"].ToString() + "&nbsp" + sRow["payoutCurr"].ToString(); exRate.Text = sRow["exRate"].ToString() + "&nbsp" + sRow["payoutCurr"].ToString();
pAmt.Text = GetStatic.ShowDecimal(sRow["pAmt"].ToString()) + "&nbsp" + sRow["payoutCurr"].ToString(); pAmt.Text = GetStatic.ShowDecimal(sRow["pAmt"].ToString()) + "&nbsp" + sRow["payoutCurr"].ToString();

7
Swift.web/Library/GetStatic.cs
View File

@ -1836,6 +1836,13 @@ namespace Swift.web.Library
return strVal; return strVal;
} }
public static String ShowTwoDecimal(String strVal)
{
if (strVal != "")
return double.Parse(strVal).ToString("0.00");
else
return strVal;
}
public static String ShowDecimal(String strVal) public static String ShowDecimal(String strVal)
{ {
if (strVal != "") if (strVal != "")

50
Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx
View File

@ -55,6 +55,10 @@
height: 300px; height: 300px;
width: 400px width: 400px
} }
.lowercase {
text-transform: none !important;
}
</style> </style>
<script> <script>
$(document).ready(function () { $(document).ready(function () {
@ -82,8 +86,8 @@
$("#editSelfie").click(function () { $("#editSelfie").click(function () {
$("#uploadcustomerSelfieDiv2").show(); $("#uploadcustomerSelfieDiv2").show();
}) })
/* $("#" + mId + "occupation").change(function () {*/ /* $("#" + mId + "occupation").change(function () {*/
$("#occupation").change(function () { $("#occupation").change(function () {
$("#divOccupation").hide(); $("#divOccupation").hide();
@ -326,7 +330,7 @@
ParseCustomerData(response); ParseCustomerData(response);
PopulateImage(); PopulateImage();
PopulateSignature(); PopulateSignature();
//DisableFields(); //DisableFields();
ChangeOrganisationType(); ChangeOrganisationType();
}).fail(function () { }).fail(function () {
@ -404,7 +408,7 @@
$('#<%=hdnreg_additional_id2CdId.ClientID%>').val(url4.FileName + '|' + url4.CdId); $('#<%=hdnreg_additional_id2CdId.ClientID%>').val(url4.FileName + '|' + url4.CdId);
} }
else else
$("#divAdditional_id2").hide();
$("#divAdditional_id2").hide();
debugger; debugger;
const filtered = data.filter(item => item.isEkyc === true); const filtered = data.filter(item => item.isEkyc === true);
@ -412,10 +416,10 @@
if (filtered != null) { if (filtered != null) {
var selfie = filtered.filter(item => item.DocumentName === "Customer Selfie")[0]; var selfie = filtered.filter(item => item.DocumentName === "Customer Selfie")[0];
if (selfie) { if (selfie) {
/* $("#customerSelfieDiv").show();*/
/* $("#customerSelfieDiv").show();*/
$("#imgselfieId").attr("src", selfie.ImageUrl); $("#imgselfieId").attr("src", selfie.ImageUrl);
editSelfieCrop.setAttribute('onclick', 'documentCrop( " ' + selfie.FileName + ' ", " ' + selfie.CdId + ' " , " ' + filtered.FileType + ' " , this.id )'); editSelfieCrop.setAttribute('onclick', 'documentCrop( " ' + selfie.FileName + ' ", " ' + selfie.CdId + ' " , " ' + filtered.FileType + ' " , this.id )');
@ -429,9 +433,9 @@
} }
else else
/*$("#customerSelfieDiv").hide();*/ /*$("#customerSelfieDiv").hide();*/
var facePicture = filtered.filter(item => item.DocumentName === "Face Picture")[0];
var facePicture = filtered.filter(item => item.DocumentName === "Face Picture")[0];
if (facePicture) { if (facePicture) {
$("#FacePictureDiv").show(); $("#FacePictureDiv").show();
@ -478,7 +482,7 @@
} }
} }
else { else {
// $("#customerSelfieDiv").hide();
// $("#customerSelfieDiv").hide();
//$("#FacePictureDiv").hide(); //$("#FacePictureDiv").hide();
$("#AdditionalIDFront2Div").hide(); $("#AdditionalIDFront2Div").hide();
$("#IDFrontFeatureDiv").hide(); $("#IDFrontFeatureDiv").hide();
@ -747,7 +751,7 @@
return true; return true;
} }
function CheckFormValidation() { function CheckFormValidation() {
debugger;
debugger;
var reqField = ""; var reqField = "";
var val = $("#<% =hdnCustomerId.ClientID%>").val(); var val = $("#<% =hdnCustomerId.ClientID%>").val();
var customerType = $("#<% =ddlCustomerType.ClientID%>").val(); var customerType = $("#<% =ddlCustomerType.ClientID%>").val();
@ -1207,7 +1211,7 @@
<div class="col-md-4 col-sm-4"> <div class="col-md-4 col-sm-4">
<div class="form-group"> <div class="form-group">
<label>City:<span class="errormsg">*</span></label> <label>City:<span class="errormsg">*</span></label>
<asp:TextBox ID="city" runat="server" placeholder="City" CssClass="form-control required" />
<asp:TextBox ID="city" runat="server" placeholder="City" CssClass="form-control required" />
</div> </div>
</div> </div>
<%--<div class="col-md-4 col-sm-4"> <%--<div class="col-md-4 col-sm-4">
@ -1226,14 +1230,14 @@
<div class="form-group"> <div class="form-group">
<label>Address 1:<span class="errormsg">*</span> </label> <label>Address 1:<span class="errormsg">*</span> </label>
<input style="display: none" type="text" name="txtAdditionalAddress1" /> <input style="display: none" type="text" name="txtAdditionalAddress1" />
<asp:TextBox name="address1" ID="address1" runat="server" placeholder="Address 1" CssClass="form-control required" />
<asp:TextBox name="address1" ID="address1" runat="server" placeholder="Address 1" CssClass="form-control required" />
</div> </div>
</div> </div>
<div class="col-md-4 col-sm-4"> <div class="col-md-4 col-sm-4">
<div class="form-group"> <div class="form-group">
<label>Address 2:</label> <label>Address 2:</label>
<input style="display: none" type="text" name="txtAdditionalAddress2" /> <input style="display: none" type="text" name="txtAdditionalAddress2" />
<asp:TextBox name="txtAdditionalAddress" ID="txtAdditionalAddress" runat="server" placeholder="Address 2" CssClass="form-control" />
<asp:TextBox name="txtAdditionalAddress" ID="txtAdditionalAddress" runat="server" placeholder="Address 2" CssClass="form-control" />
</div> </div>
</div> </div>
@ -1267,14 +1271,14 @@
<div class="col-md-4 col-sm-4"> <div class="col-md-4 col-sm-4">
<div class="form-group"> <div class="form-group">
<label>E-Mail ID:</label> <label>E-Mail ID:</label>
<asp:TextBox ID="email" autocomplete="stopdoingthat" runat="server" placeholder="Email" CssClass="form-control" />
<asp:TextBox ID="email" autocomplete="stopdoingthat" runat="server" placeholder="Email" CssClass="form-control lowercase" />
<asp:RegularExpressionValidator ID="rev1" runat="server" Display="Dynamic" <asp:RegularExpressionValidator ID="rev1" runat="server" Display="Dynamic"
ErrorMessage="Invalid Email Id!" ForeColor="Red" SetFocusOnError="True" ValidationGroup="send" ErrorMessage="Invalid Email Id!" ForeColor="Red" SetFocusOnError="True" ValidationGroup="send"
ValidationExpression="\w+([-+.']\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*" CssClass="inv" ValidationExpression="\w+([-+.']\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*" CssClass="inv"
ControlToValidate="email"></asp:RegularExpressionValidator> ControlToValidate="email"></asp:RegularExpressionValidator>
</div> </div>
</div> </div>
<div class="col-md-4 col-sm-4"> <div class="col-md-4 col-sm-4">
<div class="form-group"> <div class="form-group">
<label>Telephone No.:</label> <label>Telephone No.:</label>
@ -1476,7 +1480,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row" id="signatureDiv" runat="server" style="display: none"> <div class="row" id="signatureDiv" runat="server" style="display: none">
<div class="col-md-6"> <div class="col-md-6">
<label class="control-label">Customer Signature:</label> <label class="control-label">Customer Signature:</label>
@ -1506,7 +1510,7 @@
<div class="panel panel-default clearfix m-b-20"> <div class="panel panel-default clearfix m-b-20">
<div class="panel-heading">Document Information</div> <div class="panel-heading">Document Information</div>
<div class="panel-body"> <div class="panel-body">
<div class="col-md-6" id="divreg_front_id" >
<div class="col-md-6" id="divreg_front_id">
<div class="form-group"> <div class="form-group">
<label id="lblreg_front_id"> <label id="lblreg_front_id">
<asp:Localize runat="server" meta:resourcekey="Register_040" Text="ID Front"></asp:Localize></label> <asp:Localize runat="server" meta:resourcekey="Register_040" Text="ID Front"></asp:Localize></label>
@ -1642,7 +1646,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-6" id="customerSelfieDiv"> <div class="col-md-6" id="customerSelfieDiv">
<div class="form-group"> <div class="form-group">
<label>Customer Selfie</label> <label>Customer Selfie</label>
@ -1656,7 +1660,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-group" id="uploadcustomerSelfieDiv2">
<div class="form-group" id="uploadcustomerSelfieDiv2">
<div class="file-upload" id="facePictureId"> <div class="file-upload" id="facePictureId">
<asp:FileUpload ID="reg_customerSelfie" type="file" runat="server" class="uploadbutton" accept="image/*" meta:resourcekey="reg_back_idResource1" /> <asp:FileUpload ID="reg_customerSelfie" type="file" runat="server" class="uploadbutton" accept="image/*" meta:resourcekey="reg_back_idResource1" />
<%--<input type="file" name="reg-back-id" id="reg-back-id" required="required" class="uploadbutton" accept="image/*" />--%> <%--<input type="file" name="reg-back-id" id="reg-back-id" required="required" class="uploadbutton" accept="image/*" />--%>
@ -1671,7 +1675,7 @@
<div class="col-md-6" style="display: none;" id="FacePictureDiv"> <div class="col-md-6" style="display: none;" id="FacePictureDiv">
<div class="form-group"> <div class="form-group">
<label>Customer Face Picture</label> <label>Customer Face Picture</label>
<input type="button" id="editFacePicture" style="display: none;" class="btn btn-info" value="Edit Face Picture" />
<input type="button" id="editFacePicture" style="display: none;" class="btn btn-info" value="Edit Face Picture" />
<input type="button" id="editFacePictureCrop" class="btn btn-warning" value="Crop" /> <input type="button" id="editFacePictureCrop" class="btn btn-warning" value="Crop" />
<input type="button" id="undoFacePicture" style="display: none;" class="btn btn-primary" value="Undo" /> <input type="button" id="undoFacePicture" style="display: none;" class="btn btn-primary" value="Undo" />
<div> <div>
@ -1681,10 +1685,10 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="panel panel-default clearfix m-b-20"> <div class="panel panel-default clearfix m-b-20">

4
Swift.web/MobileRemit/Admin/Operation/ManageActivate.aspx
View File

@ -146,7 +146,7 @@
}); });
$(document).ready(function () { $(document).ready(function () {
$("#<%=verificationTypeNo.ClientID%>").on("change", function () {
<%-- $("#<%=verificationTypeNo.ClientID%>").on("change", function () {
var idtype = $("#<%=idType.ClientID%>").val(); var idtype = $("#<%=idType.ClientID%>").val();
if (idtype.split('|')[0] == 11168 && idtype != '') { if (idtype.split('|')[0] == 11168 && idtype != '') {
var idNumber = $("#<%=verificationTypeNo.ClientID%>").val(); var idNumber = $("#<%=verificationTypeNo.ClientID%>").val();
@ -160,7 +160,7 @@
return false; return false;
} }
} }
});
});--%>
$('#chkSkip').click(function () { $('#chkSkip').click(function () {
if ($(this).is(':checked')) { if ($(this).is(':checked')) {
$("#<%=email.ClientID%>").removeClass("required"); $("#<%=email.ClientID%>").removeClass("required");

1
Swift.web/Payment/trans_payment_success.aspx
View File

@ -8,6 +8,7 @@
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script> <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
<script src="//code.jquery.com/jquery-1.11.1.min.js"></script> <script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
<link href="../Bootstrap/css/font-awesome.min.css" rel="stylesheet" /> <link href="../Bootstrap/css/font-awesome.min.css" rel="stylesheet" />
<script defer src="https://use.fontawesome.com/releases/v5.0.8/js/all.js" integrity="sha384-SlE991lGASHoBfWbelyBPLsUlwY1GwNDJo3jSJO04KZ33K2bwfV9YBauFfnzvynJ" crossorigin="anonymous"></script>
<style> <style>
body { body {
margin-top: 20px; margin-top: 20px;

6
Swift.web/Remit/Administration/CustomerRegistration/Manage.aspx
View File

@ -50,7 +50,7 @@
color: #FA4345; color: #FA4345;
} }
.lowercase { .lowercase {
text-transform: lowercase !important;
text-transform: none !important;
} }
.doc { .doc {
height: 300px; height: 300px;
@ -199,7 +199,7 @@
}); });
}); });
$(document).ready(function () { $(document).ready(function () {
$("#<%=verificationTypeNo.ClientID%>").on("change", function () {
<%-- $("#<%=verificationTypeNo.ClientID%>").on("change", function () {
var idtype = $("#<%=idType.ClientID%>").val(); var idtype = $("#<%=idType.ClientID%>").val();
if (idtype.split('|')[0] == 11168 && idtype != '') { if (idtype.split('|')[0] == 11168 && idtype != '') {
var idNumber = $("#<%=verificationTypeNo.ClientID%>").val(); var idNumber = $("#<%=verificationTypeNo.ClientID%>").val();
@ -213,7 +213,7 @@
return false; return false;
} }
} }
});
});--%>
$('#chkSkip').click(function () { $('#chkSkip').click(function () {
if ($(this).is(':checked')) { if ($(this).is(':checked')) {
$("#<%=email.ClientID%>").removeClass("required"); $("#<%=email.ClientID%>").removeClass("required");

4
Swift.web/Remit/Administration/CustomerRegistration/Manage.aspx.cs
View File

@ -280,7 +280,7 @@ namespace Swift.web.Remit.Administration.CustomerRegistration
string trimmedlastName = lastName.Text.Trim() == "" ? null : lastName.Text.Trim(); string trimmedlastName = lastName.Text.Trim() == "" ? null : lastName.Text.Trim();
string occupationVal = occupationHidden.Value; string occupationVal = occupationHidden.Value;
string additionalAddress = hdnAdditionalAddress.Value;
string additionalAddress = txtAdditionalAddress.Text;
string city = cityHidden.Value; string city = cityHidden.Value;
OnlineCustomerModel customerModel = new OnlineCustomerModel() OnlineCustomerModel customerModel = new OnlineCustomerModel()
@ -293,7 +293,7 @@ namespace Swift.web.Remit.Administration.CustomerRegistration
customerType = ddlCustomerType.SelectedValue, customerType = ddlCustomerType.SelectedValue,
country = countryList.Text, country = countryList.Text,
AdditionalAddress = additionalAddress, //txtAdditionalAddress.Text, AdditionalAddress = additionalAddress, //txtAdditionalAddress.Text,
address = additionalAddress,
address = address1.Text,
zipCode = zipCode.Text, zipCode = zipCode.Text,
street = hf_editable_townArea.Value, street = hf_editable_townArea.Value,
city = city, //cityHidden.Value, city = city, //cityHidden.Value,

4
Swift.web/Remit/Administration/CustomerSetup/Manage.aspx
View File

@ -26,7 +26,7 @@
<script> <script>
$(document).ready(function () { $(document).ready(function () {
$("#<%=verificationTypeNo.ClientID%>").on("change", function () {
<%-- $("#<%=verificationTypeNo.ClientID%>").on("change", function () {
var idtype = $("#<%=idType.ClientID%>").val(); var idtype = $("#<%=idType.ClientID%>").val();
if (idtype.split('|')[0] == 11168 && idtype != '') { if (idtype.split('|')[0] == 11168 && idtype != '') {
var idNumber = $("#<%=verificationTypeNo.ClientID%>").val(); var idNumber = $("#<%=verificationTypeNo.ClientID%>").val();
@ -40,7 +40,7 @@
return false; return false;
} }
} }
});
});--%>
$("#<%=zipCode.ClientID%>").keyup(function () { $("#<%=zipCode.ClientID%>").keyup(function () {
var len = $(this).val().length; var len = $(this).val().length;
if (len == '7') { if (len == '7') {

4
Swift.web/Remit/Administration/CustomerSetup/ManageNew.aspx
View File

@ -59,7 +59,7 @@
$(document).ready(function () { $(document).ready(function () {
$("#<%=verificationTypeNo.ClientID%>").on("change", function () {
<%-- $("#<%=verificationTypeNo.ClientID%>").on("change", function () {
var idtype = $("#<%=idType.ClientID%>").val(); var idtype = $("#<%=idType.ClientID%>").val();
if (idtype.split('|')[0] == 11168 && idtype != '') { if (idtype.split('|')[0] == 11168 && idtype != '') {
var idNumber = $("#<%=verificationTypeNo.ClientID%>").val(); var idNumber = $("#<%=verificationTypeNo.ClientID%>").val();
@ -73,7 +73,7 @@
return false; return false;
} }
} }
});
});--%>
$("#<%=idType.ClientID%>").on("change", function () { $("#<%=idType.ClientID%>").on("change", function () {
$("#<%=verificationTypeNo.ClientID%>").val(''); $("#<%=verificationTypeNo.ClientID%>").val('');
var idTypeValue = $("#<%=idType.ClientID%>").val().split('|')[0]; var idTypeValue = $("#<%=idType.ClientID%>").val().split('|')[0];

2
Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx
View File

@ -98,7 +98,7 @@
AutoPostBack="True" onselectedindexchanged="ddlBank_SelectedIndexChanged"></asp:DropDownList> AutoPostBack="True" onselectedindexchanged="ddlBank_SelectedIndexChanged"></asp:DropDownList>
</td> </td>
</tr> </tr>
<tr>
<tr id="bankBranch" runat="server">
<td nowrap="nowrap"> <td nowrap="nowrap">
<div align="right"> Branch : </div> <div align="right"> Branch : </div>
</td> </td>

23
Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx.cs
View File

@ -19,6 +19,15 @@ namespace Swift.web.Remit.Transaction.Modify
{ {
DisplayLabel(); DisplayLabel();
lblOldValue.Text = getOldValue(); lblOldValue.Text = getOldValue();
var countryId = GetStatic.ReadQueryString("pCountryId","");
if(countryId == "151")
{
bankBranch.Visible = false;
}
else
{
bankBranch.Visible = true;
}
} }
} }
private void Authenticate() private void Authenticate()
@ -27,6 +36,8 @@ namespace Swift.web.Remit.Transaction.Modify
} }
private void DisplayLabel() private void DisplayLabel()
{ {
var countryId = GetStatic.ReadQueryString("pCountryId", "");
var user = GetStatic.GetUser();
lblFieldName.Text = GetLabel(); lblFieldName.Text = GetLabel();
if (getFieldName() == "pAgentLocation")//paying agent location if (getFieldName() == "pAgentLocation")//paying agent location
{ {
@ -43,13 +54,13 @@ namespace Swift.web.Remit.Transaction.Modify
{ {
showBranch.Visible = true; showBranch.Visible = true;
rptShowOther.Visible = false; rptShowOther.Visible = false;
sd.SetDDL(ref ddlBank, "EXEC proc_agentMaster @flag = 'bankList'", "agentId", "agentName", "", "Select");
sd.SetDDL(ref ddlBank, "EXEC proc_agentMaster @flag = 'bankList' ,@pCountryId = " + countryId + "", "agentId", "agentName", "", "Select");
} }
if (getFieldName() == "BranchName")//bank branch if (getFieldName() == "BranchName")//bank branch
{ {
string BankId = mtd.SelectBankNameById(GetStatic.GetUser(), GetTranId().ToString());
sd.SetDDL(ref ddlNewValue, "EXEC proc_agentMaster @flag = 'bbl', @parentId = " + BankId + "", "agentId", "agentName", "", "Select");
string BankId = mtd.SelectBankName(GetStatic.GetUser(), GetTranId().ToString());
sd.SetDDL(ref ddlNewValue, "EXEC PROC_API_BANK_BRANCH_SETUP @flag = 'getBranch-new', @CountryId = " + countryId + " ,@PaymentMethod = '2' ,@user = " + user + " ,@bankId = " + BankId + "", "agentId", "agentName", "", "Select");
} }
if (getFieldName() == "pBranchName")//paying Branch if (getFieldName() == "pBranchName")//paying Branch
{ {
@ -139,9 +150,13 @@ namespace Swift.web.Remit.Transaction.Modify
protected void ddlBank_SelectedIndexChanged(object sender, EventArgs e) protected void ddlBank_SelectedIndexChanged(object sender, EventArgs e)
{ {
var countryId = GetStatic.ReadQueryString("pCountryId", "");
var user = GetStatic.GetUser();
if (ddlBank.Text != "") if (ddlBank.Text != "")
{ {
sd.SetDDL(ref ddlBranch, "EXEC proc_agentMaster @flag = 'bbl', @parentId = " + ddlBank.Text + "", "agentId", "agentName", "", "Select");
sd.SetDDL(ref ddlBranch, "EXEC PROC_API_BANK_BRANCH_SETUP @flag = 'getBranch-new', @CountryId = " + countryId + " ,@PaymentMethod = '2' ,@user = " + user + " ,@bankId = " + ddlBank.Text + "", "agentId", "agentName", "", "Select");
//sd.SetDDL(ref ddlBranch, "EXEC proc_agentMaster @flag = 'bbl', @parentId = " + ddlBank.Text + "", "agentId", "agentName", "", "Select");
} }
} }
} }

61
Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx.designer.cs
View File

@ -7,11 +7,13 @@
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace Swift.web.Remit.Transaction.Modify {
public partial class ModifyLocation {
namespace Swift.web.Remit.Transaction.Modify
{
public partial class ModifyLocation
{
/// <summary> /// <summary>
/// Head1 control. /// Head1 control.
/// </summary> /// </summary>
@ -20,7 +22,7 @@ namespace Swift.web.Remit.Transaction.Modify {
/// To modify move field declaration from designer file to code-behind file. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1; protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
/// <summary> /// <summary>
/// Base1 control. /// Base1 control.
/// </summary> /// </summary>
@ -29,7 +31,7 @@ namespace Swift.web.Remit.Transaction.Modify {
/// To modify move field declaration from designer file to code-behind file. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl Base1; protected global::System.Web.UI.HtmlControls.HtmlGenericControl Base1;
/// <summary> /// <summary>
/// form1 control. /// form1 control.
/// </summary> /// </summary>
@ -38,7 +40,7 @@ namespace Swift.web.Remit.Transaction.Modify {
/// To modify move field declaration from designer file to code-behind file. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1; protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary> /// <summary>
/// sc control. /// sc control.
/// </summary> /// </summary>
@ -47,7 +49,7 @@ namespace Swift.web.Remit.Transaction.Modify {
/// To modify move field declaration from designer file to code-behind file. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.ScriptManager sc; protected global::System.Web.UI.ScriptManager sc;
/// <summary> /// <summary>
/// hddField control. /// hddField control.
/// </summary> /// </summary>
@ -56,7 +58,7 @@ namespace Swift.web.Remit.Transaction.Modify {
/// To modify move field declaration from designer file to code-behind file. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hddField; protected global::System.Web.UI.WebControls.HiddenField hddField;
/// <summary> /// <summary>
/// hddOldValue control. /// hddOldValue control.
/// </summary> /// </summary>
@ -65,7 +67,7 @@ namespace Swift.web.Remit.Transaction.Modify {
/// To modify move field declaration from designer file to code-behind file. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hddOldValue; protected global::System.Web.UI.WebControls.HiddenField hddOldValue;
/// <summary> /// <summary>
/// hdnValueType control. /// hdnValueType control.
/// </summary> /// </summary>
@ -74,7 +76,7 @@ namespace Swift.web.Remit.Transaction.Modify {
/// To modify move field declaration from designer file to code-behind file. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hdnValueType; protected global::System.Web.UI.WebControls.HiddenField hdnValueType;
/// <summary> /// <summary>
/// lblMsg control. /// lblMsg control.
/// </summary> /// </summary>
@ -83,7 +85,7 @@ namespace Swift.web.Remit.Transaction.Modify {
/// To modify move field declaration from designer file to code-behind file. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.Label lblMsg; protected global::System.Web.UI.WebControls.Label lblMsg;
/// <summary> /// <summary>
/// lblFieldName control. /// lblFieldName control.
/// </summary> /// </summary>
@ -92,7 +94,7 @@ namespace Swift.web.Remit.Transaction.Modify {
/// To modify move field declaration from designer file to code-behind file. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.Label lblFieldName; protected global::System.Web.UI.WebControls.Label lblFieldName;
/// <summary> /// <summary>
/// lblOldValue control. /// lblOldValue control.
/// </summary> /// </summary>
@ -101,7 +103,7 @@ namespace Swift.web.Remit.Transaction.Modify {
/// To modify move field declaration from designer file to code-behind file. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.Label lblOldValue; protected global::System.Web.UI.WebControls.Label lblOldValue;
/// <summary> /// <summary>
/// rptShowOther control. /// rptShowOther control.
/// </summary> /// </summary>
@ -110,7 +112,7 @@ namespace Swift.web.Remit.Transaction.Modify {
/// To modify move field declaration from designer file to code-behind file. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl rptShowOther; protected global::System.Web.UI.HtmlControls.HtmlGenericControl rptShowOther;
/// <summary> /// <summary>
/// ddlNewValue control. /// ddlNewValue control.
/// </summary> /// </summary>
@ -119,7 +121,7 @@ namespace Swift.web.Remit.Transaction.Modify {
/// To modify move field declaration from designer file to code-behind file. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlNewValue; protected global::System.Web.UI.WebControls.DropDownList ddlNewValue;
/// <summary> /// <summary>
/// showBranch control. /// showBranch control.
/// </summary> /// </summary>
@ -128,7 +130,7 @@ namespace Swift.web.Remit.Transaction.Modify {
/// To modify move field declaration from designer file to code-behind file. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl showBranch; protected global::System.Web.UI.HtmlControls.HtmlGenericControl showBranch;
/// <summary> /// <summary>
/// ddlBank control. /// ddlBank control.
/// </summary> /// </summary>
@ -137,7 +139,16 @@ namespace Swift.web.Remit.Transaction.Modify {
/// To modify move field declaration from designer file to code-behind file. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlBank; protected global::System.Web.UI.WebControls.DropDownList ddlBank;
/// <summary>
/// bankBranch 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.HtmlTableRow bankBranch;
/// <summary> /// <summary>
/// ddlBranch control. /// ddlBranch control.
/// </summary> /// </summary>
@ -146,7 +157,7 @@ namespace Swift.web.Remit.Transaction.Modify {
/// To modify move field declaration from designer file to code-behind file. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlBranch; protected global::System.Web.UI.WebControls.DropDownList ddlBranch;
/// <summary> /// <summary>
/// rptAccountNo control. /// rptAccountNo control.
/// </summary> /// </summary>
@ -155,7 +166,7 @@ namespace Swift.web.Remit.Transaction.Modify {
/// To modify move field declaration from designer file to code-behind file. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl rptAccountNo; protected global::System.Web.UI.HtmlControls.HtmlGenericControl rptAccountNo;
/// <summary> /// <summary>
/// txtNewValue control. /// txtNewValue control.
/// </summary> /// </summary>
@ -164,7 +175,7 @@ namespace Swift.web.Remit.Transaction.Modify {
/// To modify move field declaration from designer file to code-behind file. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtNewValue; protected global::System.Web.UI.WebControls.TextBox txtNewValue;
/// <summary> /// <summary>
/// rptBranch control. /// rptBranch control.
/// </summary> /// </summary>
@ -173,7 +184,7 @@ namespace Swift.web.Remit.Transaction.Modify {
/// To modify move field declaration from designer file to code-behind file. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl rptBranch; protected global::System.Web.UI.HtmlControls.HtmlGenericControl rptBranch;
/// <summary> /// <summary>
/// hdnBranchName control. /// hdnBranchName control.
/// </summary> /// </summary>
@ -182,7 +193,7 @@ namespace Swift.web.Remit.Transaction.Modify {
/// To modify move field declaration from designer file to code-behind file. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hdnBranchName; protected global::System.Web.UI.WebControls.HiddenField hdnBranchName;
/// <summary> /// <summary>
/// hdnBranchId control. /// hdnBranchId control.
/// </summary> /// </summary>
@ -191,7 +202,7 @@ namespace Swift.web.Remit.Transaction.Modify {
/// To modify move field declaration from designer file to code-behind file. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hdnBranchId; protected global::System.Web.UI.WebControls.HiddenField hdnBranchId;
/// <summary> /// <summary>
/// btnUpdate control. /// btnUpdate control.
/// </summary> /// </summary>

19
Swift.web/Remit/Transaction/Modify/ModifyTran.aspx
View File

@ -133,6 +133,25 @@
"&oldValue=" + oldValue + "&oldValue=" + oldValue +
"&tranId=" + tranId + "&tranId=" + tranId +
"&pCountryId=" + pCountryId; "&pCountryId=" + pCountryId;
var id = PopUpWindow(url, "");
if (id == "undefined" || id == null || id == "") {
}
else {
GetElement("<%=btnReloadDetail.ClientID %>").click();
}
return false;
}
function EditBranchName(label, fieldName, oldValue, tranId, pCountryId) {
var url = "ModifyLocation.aspx?label=" + label +
"&fieldName=" + fieldName +
"&oldValue=" + oldValue +
"&tranId=" + tranId +
"&pCountryId=" + pCountryId;
var id = PopUpWindow(url, ""); var id = PopUpWindow(url, "");
if (id == "undefined" || id == null || id == "") { if (id == "undefined" || id == null || id == "") {
} }

2
Swift.web/Remit/Transaction/ReprintVoucher/SendIntlReceipt.aspx.cs
View File

@ -111,7 +111,7 @@ namespace Swift.web.Remit.Transaction.ReprintVoucher
createdBy.Text = sRow["createdBy"].ToString(); createdBy.Text = sRow["createdBy"].ToString();
approvedDate.Text = DateTime.Parse(sRow["createdDate"].ToString()).ToString("yyyy-MM-dd hh:mm:ss tt"); approvedDate.Text = DateTime.Parse(sRow["createdDate"].ToString()).ToString("yyyy-MM-dd hh:mm:ss tt");
cAmt.Text = GetStatic.ShowDecimal(sRow["cAmt"].ToString()) + "&nbsp" + sRow["collCurr"].ToString(); cAmt.Text = GetStatic.ShowDecimal(sRow["cAmt"].ToString()) + "&nbsp" + sRow["collCurr"].ToString();
serviceCharge.Text = GetStatic.ShowDecimal(sRow["serviceCharge"].ToString()) + "&nbsp" + sRow["collCurr"].ToString();
serviceCharge.Text = GetStatic.ShowTwoDecimal(sRow["serviceCharge"].ToString()) + "&nbsp" + sRow["collCurr"].ToString();
tAmt.Text = GetStatic.ShowDecimal(sRow["tAmt"].ToString()) + "&nbsp" + sRow["collCurr"].ToString(); tAmt.Text = GetStatic.ShowDecimal(sRow["tAmt"].ToString()) + "&nbsp" + sRow["collCurr"].ToString();
exRate.Text = sRow["exRate"].ToString() + "&nbsp" + sRow["payoutCurr"].ToString(); exRate.Text = sRow["exRate"].ToString() + "&nbsp" + sRow["payoutCurr"].ToString();
pAmt.Text = GetStatic.ShowDecimal(sRow["pAmt"].ToString()) + "&nbsp" + sRow["payoutCurr"].ToString(); pAmt.Text = GetStatic.ShowDecimal(sRow["pAmt"].ToString()) + "&nbsp" + sRow["payoutCurr"].ToString();

2
Swift.web/Remit/UserControl/UcTransaction.ascx
View File

@ -861,7 +861,7 @@
<asp:Label ID="bankName" runat="server"></asp:Label> <asp:Label ID="bankName" runat="server"></asp:Label>
</td> </td>
</tr> </tr>
<tr id="trBranch">
<tr id="trBranch" runat="server">
<td>Branch Name: </td> <td>Branch Name: </td>
<td class="text"> <td class="text">
<asp:Label ID="branchName" runat="server"></asp:Label> <asp:Label ID="branchName" runat="server"></asp:Label>

22
Swift.web/Remit/UserControl/UcTransaction.ascx.cs
View File

@ -265,7 +265,7 @@ namespace Swift.web.Remit.UserControl
{ {
accountNo.Text = GetLinkTextForModification("Account No", "accountNo", tRow); accountNo.Text = GetLinkTextForModification("Account No", "accountNo", tRow);
bankName.Text = GetLinkBankPayoutLocation("Bank Name", "BankName", tRow); bankName.Text = GetLinkBankPayoutLocation("Bank Name", "BankName", tRow);
branchName.Text = GetLinkTextForModification("Branch Name", "pBranchName", tRow);
branchName.Text = GetLinkBankPayoutLocation("Branch Name", "pBranchName", tRow);
} }
} }
else else
@ -338,7 +338,7 @@ namespace Swift.web.Remit.UserControl
{ {
accountNo.Text = GetLinkPayoutLocation("Account Number", "accountNo", tRow); accountNo.Text = GetLinkPayoutLocation("Account Number", "accountNo", tRow);
bankName.Text = GetLinkBankPayoutLocation("Bank Name", "BankName", tRow); bankName.Text = GetLinkBankPayoutLocation("Bank Name", "BankName", tRow);
branchName.Text = GetLinkPayoutLocation("Branch Name", "BranchName", tRow);
branchName.Text = GetLinkBankPayoutLocation("Branch Name", "BranchName", tRow);
pBranchName.Text = GetLinkPayoutLocation("Paying Branch", "pBranchName", tRow); pBranchName.Text = GetLinkPayoutLocation("Paying Branch", "pBranchName", tRow);
pAgentLocation.Text = tRow["pAgentLocation"].ToString(); pAgentLocation.Text = tRow["pAgentLocation"].ToString();
} }
@ -364,6 +364,15 @@ namespace Swift.web.Remit.UserControl
pBranchName.Text = tRow["pBranchName"].ToString(); pBranchName.Text = tRow["pBranchName"].ToString();
pAgentLocation.Text = tRow["pAgentLocation"].ToString(); pAgentLocation.Text = tRow["pAgentLocation"].ToString();
if (tRow["rCountryName"].ToString().ToLower() == "nepal")
{
trBranch.Visible = false;
}
else
{
trBranch.Visible = true;
}
pAgentName.Text = tRow["pAgentName"].ToString(); pAgentName.Text = tRow["pAgentName"].ToString();
modeOfPayment.Text = tRow["paymentMethod"].ToString(); modeOfPayment.Text = tRow["paymentMethod"].ToString();
modeOfDeposit.Text = tRow["depositType"].ToString(); modeOfDeposit.Text = tRow["depositType"].ToString();
@ -445,7 +454,7 @@ namespace Swift.web.Remit.UserControl
trNameAsPerBank.Visible = true; trNameAsPerBank.Visible = true;
lblNameAsPerBank.Text = tRow["receiverNameAlt"].ToString(); lblNameAsPerBank.Text = tRow["receiverNameAlt"].ToString();
} }
} }
if (displayType != "cancelpartner") if (displayType != "cancelpartner")
{ {
@ -847,6 +856,7 @@ namespace Swift.web.Remit.UserControl
public string GetLinkBankPayoutLocation(string label, string fieldName, DataRow dr) public string GetLinkBankPayoutLocation(string label, string fieldName, DataRow dr)
{ {
string fieldValue = dr[fieldName].ToString().Trim(); string fieldValue = dr[fieldName].ToString().Trim();
var str = "<a href=# title='Edit Record'><div class = \"link\" onclick = \"EditBankName('" + label + "', '" + fieldName + "', '" + fieldValue + "','" + hddTranId.Value + "','" + dr["pCountryId"] + "')\">" + var str = "<a href=# title='Edit Record'><div class = \"link\" onclick = \"EditBankName('" + label + "', '" + fieldName + "', '" + fieldValue + "','" + hddTranId.Value + "','" + dr["pCountryId"] + "')\">" +
fieldValue + "<img border=0 src=\"/Images/edit.gif\"/></a></div>"; fieldValue + "<img border=0 src=\"/Images/edit.gif\"/></a></div>";
return str; return str;
@ -1627,7 +1637,7 @@ namespace Swift.web.Remit.UserControl
{ {
accountNo.Text = GetLinkTextForModification("Account No", "accountNo", tRow); accountNo.Text = GetLinkTextForModification("Account No", "accountNo", tRow);
bankName.Text = GetLinkBankPayoutLocation("Bank Name", "BankName", tRow); bankName.Text = GetLinkBankPayoutLocation("Bank Name", "BankName", tRow);
branchName.Text = GetLinkTextForModification("Branch Name", "pBranchName", tRow);
branchName.Text = GetLinkBankPayoutLocation("Branch Name", "pBranchName", tRow);
} }
} }
else else
@ -1685,7 +1695,7 @@ namespace Swift.web.Remit.UserControl
{ {
accountNo.Text = GetLinkPayoutLocation("Account Number", "accountNo", tRow); accountNo.Text = GetLinkPayoutLocation("Account Number", "accountNo", tRow);
bankName.Text = GetLinkBankPayoutLocation("Bank Name", "BankName", tRow); bankName.Text = GetLinkBankPayoutLocation("Bank Name", "BankName", tRow);
branchName.Text = GetLinkPayoutLocation("Branch Name", "BranchName", tRow);
branchName.Text = GetLinkBankPayoutLocation("Branch Name", "BranchName", tRow);
pBranchName.Text = GetLinkPayoutLocation("Paying Branch", "pBranchName", tRow); pBranchName.Text = GetLinkPayoutLocation("Paying Branch", "pBranchName", tRow);
pAgentLocation.Text = tRow["pAgentLocation"].ToString(); pAgentLocation.Text = tRow["pAgentLocation"].ToString();
} }
@ -2102,7 +2112,7 @@ namespace Swift.web.Remit.UserControl
{ {
NotificationContent = new NotificationDTO() { NotificationContent = new NotificationDTO() {
Body = comments, Body = comments,
Title = "JME",
Title = "IME LONDON",
MessageType = "INFO", MessageType = "INFO",
ClickActivity = "OPEN_ACTIVITY_NOTIFICATION" ClickActivity = "OPEN_ACTIVITY_NOTIFICATION"
}, },

9
Swift.web/Remit/UserControl/UcTransaction.ascx.designer.cs
View File

@ -878,6 +878,15 @@ namespace Swift.web.Remit.UserControl
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.Label bankName; protected global::System.Web.UI.WebControls.Label bankName;
/// <summary>
/// trBranch 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.HtmlTableRow trBranch;
/// <summary> /// <summary>
/// branchName control. /// branchName control.
/// </summary> /// </summary>

Write Preview
Loading…
Cancel
Save