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

Merge branch 'feature/Redmine-16525-Cosmetic_Changes' of http://202.166.220.79:3000/IME-LONDON/WEB_CORE into staging

feature/Redmine-16525-Cosmetic_Changes
Leeza Baidar 2 months ago
parent
46bbeed0c9 5e948969f3
commit
d850677320
6 changed files with 54 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Swift.web/AgentNew/Administration/CustomerSetup/Benificiar/AddBeneficiary.aspx
  2. 9
      Swift.web/AgentNew/Administration/CustomerSetup/Benificiar/AddBeneficiary.aspx.designer.cs
  3. 22
      Swift.web/AgentNew/SendTxn/SendV2.aspx
  4. 29
      Swift.web/AgentNew/js/SendTxn/sendSender.js
  5. 11
      Swift.web/AgentNew/js/SendTxn/usableunctions.js
  6. 2
      Swift.web/Remit/Administration/CustomerSetup/CustomerDetails.aspx.cs

4
Swift.web/AgentNew/Administration/CustomerSetup/Benificiar/AddBeneficiary.aspx
View File

@ -842,7 +842,7 @@
<asp:TextBox ID="txtRemarks" runat="server" TextMode="MultiLine" Rows="2" CssClass="form-control"></asp:TextBox>
</div>
</div>
<div class="col-md-12" id="isFromPhoneDiv" runat="server">
<%--<div class="col-md-12" id="isFromPhoneDiv" runat="server">
<div class="form-group">
<label class="checkbox-ui">
<input type="checkbox" id="isFromPhone" name="isFromPhone" required="required" />
@ -851,7 +851,7 @@
</small>
</label>
</div>
</div>
</div>--%>
<%--End body part--%>
</div>
</div>

9
Swift.web/AgentNew/Administration/CustomerSetup/Benificiar/AddBeneficiary.aspx.designer.cs
View File

@ -428,15 +428,6 @@ namespace Swift.web.AgentNew.Administration.CustomerSetup.Benificiar
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtRemarks;
/// <summary>
/// isFromPhoneDiv 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.HtmlGenericControl isFromPhoneDiv;
/// <summary>
/// register control.
/// </summary>

22
Swift.web/AgentNew/SendTxn/SendV2.aspx
View File

@ -671,25 +671,25 @@
<span class="ErrMsg" id='txtRecFName_err'>*</span>
</td>
<td>
<asp:TextBox ID="txtRecFName" autocomplete="stopdoingthat" runat="server" placeholder="First Name" CssClass="required SmallTextBox form-control readonlyOnReceiverSelect" onblur="CheckForSpecialCharacter(this, 'Receiver First Name');"></asp:TextBox>
<asp:TextBox ID="txtRecFName" autocomplete="stopdoingthat" runat="server" placeholder="First Name" CssClass="required SmallTextBox form-control" onblur="CheckForSpecialCharacter(this, 'Receiver First Name');"></asp:TextBox>
</td>
<td>
<asp:TextBox ID="txtRecMName" autocomplete="stopdoingthat" runat="server" placeholder="Middle Name" CssClass="SmallTextBox form-control readonlyOnReceiverSelect" onblur="CheckForSpecialCharacter(this, 'Receiver Middle Name');"></asp:TextBox>
<asp:TextBox ID="txtRecMName" autocomplete="stopdoingthat" runat="server" placeholder="Middle Name" CssClass="SmallTextBox form-control" onblur="CheckForSpecialCharacter(this, 'Receiver Middle Name');"></asp:TextBox>
</td>
<td>
<asp:TextBox ID="txtRecLName" autocomplete="stopdoingthat" runat="server" placeholder="Last Name" CssClass=" required SmallTextBox form-control readonlyOnReceiverSelect" onblur="CheckForSpecialCharacter(this, 'Receiver Last Name');"></asp:TextBox>
<asp:TextBox ID="txtRecLName" autocomplete="stopdoingthat" runat="server" placeholder="Last Name" CssClass=" required SmallTextBox form-control" onblur="CheckForSpecialCharacter(this, 'Receiver Last Name');"></asp:TextBox>
<span class="ErrMsg" id='txtRecLName_err'></span>
</td>
<td style="display: none;">
<asp:TextBox ID="txtRecSLName" runat="server" CssClass="SmallTextBox form-control readonlyOnReceiverSelect" onblur="CheckForSpecialCharacter(this, 'Receiver Second Last Name');"></asp:TextBox>
<asp:TextBox ID="txtRecSLName" runat="server" CssClass="SmallTextBox form-control" onblur="CheckForSpecialCharacter(this, 'Receiver Second Last Name');"></asp:TextBox>
</td>
</tr>
<tr id="receiverNameFromPartnerTR">
<%--<tr id="receiverNameFromPartnerTR">
<td>&nbsp;</td>
<td colspan="3"><span class="form-control" style="background-color: #c1d6f1; text-transform: uppercase; font-size: 15px !important; font-weight: bold;">Beneficiary Name as per bank: <span style="background-color: yellow;">
<label id="lblReceiverName"></label>
</span></span></td>
</tr>
</tr>--%>
<tr id="trRecAddress1" runat="server">
<td>Address1:
<span runat="server" class="ErrMsg" id='txtRecAdd1_err'>*</span>
@ -711,7 +711,7 @@
<span runat="server" class="ErrMsg" id='txtRecCity_err'>*</span>
</td>
<td id="tdRecCityTxt" runat="server" colspan="3">
<asp:TextBox ID="txtRecCity" placeholder="Receiver City" runat="server" CssClass="form-control readonlyOnReceiverSelect" onblur="CheckForSpecialCharacter(this, 'Receiver City');"></asp:TextBox>
<asp:TextBox ID="txtRecCity" placeholder="Receiver City" runat="server" CssClass="form-control" onblur="CheckForSpecialCharacter(this, 'Receiver City');"></asp:TextBox>
</td>
<asp:TextBox Style="display: none" ID="txtRecPostal" runat="server" CssClass="form-control" onblur="CheckForSpecialCharacter(this, 'Receiver Postal Code');"></asp:TextBox>
</tr>
@ -722,7 +722,7 @@
<asp:TextBox ID="txtRecMobile" autocomplete="stopdoingthat" runat="server" placeholder="Mobile Number" MaxLength="16" CssClass="required form-control" onchange="CheckForMobileNumber(this, 'Receiver Mobile No.');"></asp:TextBox>
</td>
<td id="tdRecTelNoTxt" runat="server">
<asp:TextBox ID="txtRecTel" autocomplete="stopdoingthat" runat="server" placeholder="Phone Number" MaxLength="15" CssClass="form-control readonlyOnReceiverSelect" onchange="CheckForPhoneNumber(this, 'Receiver Tel. No.');"></asp:TextBox>
<asp:TextBox ID="txtRecTel" autocomplete="stopdoingthat" runat="server" placeholder="Phone Number" MaxLength="15" CssClass="form-control" onchange="CheckForPhoneNumber(this, 'Receiver Tel. No.');"></asp:TextBox>
</td>
</tr>
</table>
@ -741,7 +741,7 @@
<span runat="server" class="ErrMsg" id='ddlRecIdType_err'>*</span>
</td>
<td colspan="3">
<asp:DropDownList ID="ddlRecIdType" runat="server" CssClass="form-control readonlyOnReceiverSelect"></asp:DropDownList>
<asp:DropDownList ID="ddlRecIdType" runat="server" CssClass="form-control"></asp:DropDownList>
</td>
</tr>
<tr id="trRecId1" runat="server" class="trRecId">
@ -750,7 +750,7 @@
<span runat="server" class="ErrMsg" id='txtRecIdNo_err'>*</span>
</td>
<td colspan="3">
<asp:TextBox ID="txtRecIdNo" runat="server" placeholder="ID Number" CssClass="form-control readonlyOnReceiverSelect" onblur="CheckForSpecialCharacter(this, 'Receiver ID Number');"></asp:TextBox>
<asp:TextBox ID="txtRecIdNo" runat="server" placeholder="ID Number" CssClass="form-control" onblur="CheckForSpecialCharacter(this, 'Receiver ID Number');"></asp:TextBox>
</td>
</tr>
<tr style="display: none">
@ -2077,7 +2077,7 @@
$("#ContentPlaceHolder1_occupation").prop("disabled", true);
//$("#ContentPlaceHolder1_ddlOccupation").prop("disabled", true);
$('#ContentPlaceHolder1_txtRecIdNo').attr('readonly', true);
//$('#ContentPlaceHolder1_txtRecIdNo').attr('readonly', true);
//$("#ContentPlaceHolder1_introducerTxt_aText").prop('required', true);
$("#ContentPlaceHolder1_branch").change(function () {
var choosePayer = $("#" + mId + "hddChoosePayer").val();

29
Swift.web/AgentNew/js/SendTxn/sendSender.js
View File

@ -64,6 +64,35 @@ function SearchCustomerDetails(customerId, type) {
return true;
}
function PopulateReceiverDataDDL(response) {
//var data = jQuery.parseJSON(response);
var data = response;
var ddl = GetElement(mId + "ddlReceiver");
$(ddl).empty();
var option = document.createElement("option");
option.text = 'Select Receiver';
option.value = '';
ddl.options.add(option);
for (var i = 0; i < data.length; i++) {
option = document.createElement("option");
option.text = data[i].fullName.toUpperCase();
option.value = data[i].receiverId;
try {
ddl.options.add(option);
}
catch (e) {
alert(e);
}
}
option = document.createElement("option");
option.text = 'New Receiver';
option.value = '0';
ddl.options.add(option);
}
function PopulateCustomerDocumentDetails(result) {
var table = $('#customerDocDetails');
table.find("tbody tr").remove();

11
Swift.web/AgentNew/js/SendTxn/usableunctions.js
View File

@ -630,6 +630,17 @@ function ClearReceiverData() {
}
/////////// End Function For Receiver Info Data //////////////
function ClearReceiverValidationData() {
//new added for receiver name validation
$('#receiverNameFromPartnerTR').hide();
$('#lblReceiverNamePartner').text('');
$('#lblReceiverName').text('');
$('#hddReceiverNameFromPartner').val('');
$('#hddShowPopupForReceiver').val('N');
$('#calc').attr('disabled', false);
$('#btnSendTxnCDDI').attr('disabled', false);
}
///////////// Start Function For Location/Reciving Mode/Payout Currency Info Data //////////
function ClearLocationRModeCurrencyInfoData() {
SetDDLValueSelected(mId + "pCountry", "");

2
Swift.web/Remit/Administration/CustomerSetup/CustomerDetails.aspx.cs
View File

@ -305,8 +305,8 @@ namespace Swift.web.Remit.Administration.CustomerSetup
str.Append("<td>" + dr["createdFrom"].ToString() + "</td>");
str.Append("<td>" + dr["verifiedDate"].ToString() + "</td>");
str.Append("<td>" + dr["verifiedBy"].ToString() + "</td>");
str.Append("<td>" + dr["approvedDate"].ToString() + "</td>");
str.Append("<td>" + dr["approvedBy"].ToString() + "</td>");
str.Append("<td>" + dr["approvedDate"].ToString() + "</td>");
str.Append("<td>" + dr["lastLoginTs"].ToString() + "</td>");
str.Append("<td>" + dr["phoneBrand"].ToString() + "</td>");
str.Append("</tr>");

Write Preview
Loading…
Cancel
Save