Browse Source

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

Ime-london-webcore
shakun 12 months ago
parent
commit
699f5e2f5f
  1. 2
      Swift.API/ThirdPartyApiServices/SyncStateCityTownService.cs
  2. 3
      Swift.DAL/Agentpanel/Send/SendTranIRHDao.cs
  3. 29
      Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx
  4. 9
      Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx.designer.cs
  5. 17
      Swift.web/AgentNew/Reports/TransactionReport/Manage.aspx
  6. 6
      Swift.web/AgentNew/Reports/TransactionReport/Manage.aspx.cs
  7. 9
      Swift.web/AgentNew/Reports/TransactionReport/Manage.aspx.designer.cs
  8. 25
      Swift.web/AgentNew/SendTxn/SendV2.aspx
  9. 72
      Swift.web/AgentNew/SendTxn/SendV2.aspx.cs
  10. 45
      Swift.web/AgentNew/SendTxn/SendV2.aspx.designer.cs
  11. 1
      Swift.web/AgentNew/Transaction/ApproveAgentTransaction/SendMoneyRequest.aspx.cs
  12. 70
      Swift.web/AgentNew/js/SendTxn/sendTxnInfo.js
  13. 3
      Swift.web/AgentPanel/International/SendMoney/Send.aspx.cs
  14. 3
      Swift.web/AgentPanel/International/SendMoney/SendV2.aspx.cs
  15. 3
      Swift.web/AgentPanel/Send/SendTransaction/Send.aspx.cs
  16. 10
      Swift.web/DashboardV2/Dashboard2.aspx.cs
  17. 3
      Swift.web/DashboardV2/assets/js/dashboardv2.js
  18. 17
      Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx
  19. 8
      Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx.cs
  20. 9
      Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx.designer.cs
  21. 3
      Swift.web/Remit/UserControl/UcTransaction.ascx
  22. 9
      Swift.web/Remit/UserControl/UcTransaction.ascx.cs
  23. 4
      Swift.web/Remit/UserControl/UcTransaction.ascx.designer.cs

2
Swift.API/ThirdPartyApiServices/SyncStateCityTownService.cs

@ -24,7 +24,7 @@ namespace Swift.API.ThirdPartyApiServices
var jbdContent = new StringContent(obj.ToString(), Encoding.UTF8, "application/json");
try
{
var URL = "api/v1/TP/addressList";
var URL = "http://77.68.15.91:1083/api/v1/TP/addressList";
HttpResponseMessage resp = client.PostAsync(URL, jbdContent).Result;
string resultData = resp.Content.ReadAsStringAsync().Result;

3
Swift.DAL/Agentpanel/Send/SendTranIRHDao.cs

@ -399,7 +399,7 @@ namespace Swift.DAL.BL.AgentPanel.Send
public DataTable GetExRate(string user, string sCountryId, string sSuperAgent, string sAgent, string sBranch, string collCurr,
string pCountryId, string pAgent, string pCurr, string deliveryMethod, string cAmt, string pAmt,
string schemeCode, string senderId, string introducer, string sessionId, string couponId, string isManualSc = "",
string schemeCode, string senderId, string introducer, string sessionId, string couponId, string tpExRate, string isManualSc = "",
string sc = "", string calcBy = "", string payoutPartner = "")
{
var sql = "EXEC proc_sendIRH @flag = 'exRate'";
@ -419,6 +419,7 @@ namespace Swift.DAL.BL.AgentPanel.Send
sql += ", @senderId = " + FilterString(senderId);
sql += ", @sessionId = " + FilterString(sessionId);
sql += ", @couponTranNo = " + FilterString(couponId);
sql += ", @tpExRate = " + FilterString(tpExRate);
sql += ", @isManualSc = " + FilterString(isManualSc);
sql += ", @partnerId = " + FilterString(payoutPartner);
sql += ", @manualSc = " + FilterString(sc);

29
Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx

@ -144,16 +144,16 @@
$(".loadImg4 img").fadeIn("fast");
}
});
$('#ContentPlaceHolder1_reg_form').on('change', function (e) {
$('.loadImg5').remove();
ValidateExtensionForOtherDoc('ContentPlaceHolder1_reg_form');
// console.log(e.target, 'e')
for (var i = 0; i < e.target.files.length; i++) {
var tmppath = URL.createObjectURL(e.target.files[i]);
$(this).after('<span class="loadImg5"><img src="' + tmppath + '" alt=""></span>');
$(".loadImg5 img").fadeIn("fast");
}
});
//$('#ContentPlaceHolder1_reg_form').on('change', function (e) {
// $('.loadImg5').remove();
// ValidateExtensionForOtherDoc('ContentPlaceHolder1_reg_form');
// // console.log(e.target, 'e')
// for (var i = 0; i < e.target.files.length; i++) {
// var tmppath = URL.createObjectURL(e.target.files[i]);
// $(this).after('<span class="loadImg5"><img src="' + tmppath + '" alt=""></span>');
// $(".loadImg5 img").fadeIn("fast");
// }
//});
});
$(document).ready(function () {
@ -691,13 +691,13 @@
var customerId = $('#<%=hdnCustomerId.ClientID%>').val();
var previousVerificationId = $("#<%=hddVerificationTypeNo.ClientID%>").val().toLowerCase();
var currentVerificationId = $("#<%=verificationTypeNo.ClientID%>").val().toLowerCase();
if (customerId != '') {
<%-- if (customerId != '') {
reqField = reqField.replace(",<%=reg_form.ClientID%>,", "")
if (previousVerificationId == currentVerificationId) {
reqField = reqField.replace(",<%=reg_front_id.ClientID%>,", "")
reqField = reqField.replace(",<%=reg_back_id.ClientID%>,", "")
}
}
}--%>
ChangeOrganisationType();
@ -1553,18 +1553,17 @@
</div>
</div>
</div>
<div class="col-md-6" id="divreg_reg_form">
<%--<div class="col-md-6" id="divreg_reg_form">
<div class="form-group">
<label>
Registration Form <span class="errormsg1">*</span></label>
<div class="file-upload" id="reg_Form">
<asp:FileUpload ID="reg_form" type="file" runat="server" class="uploadbutton required" accept="image/capture" capture="camera" />
<%--<input type="file" name="reg-back-id" id="reg-back-id" required="required" class="uploadbutton" accept="image/*" />--%>
<span>
<asp:Localize runat="server" meta:resourcekey="Register_042" Text="Drag and drop your file here or "></asp:Localize><span class="primary-c"><asp:Localize runat="server" meta:resourcekey="Register_043" Text="Browse"></asp:Localize></span><asp:Localize runat="server" meta:resourcekey="Register_044" Text=" for a document to upload"></asp:Localize></span>
</div>
</div>
</div>
</div>--%>
</div>
</div>
<div class="row" id="agreementDiv" runat="server">

9
Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx.designer.cs

@ -707,15 +707,6 @@ namespace Swift.web.AgentNew.Administration.CustomerSetup.CustomerRegistration
/// </remarks>
protected global::System.Web.UI.WebControls.FileUpload other_document;
/// <summary>
/// reg_form 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.FileUpload reg_form;
/// <summary>
/// agreementDiv control.
/// </summary>

17
Swift.web/AgentNew/Reports/TransactionReport/Manage.aspx

@ -22,7 +22,7 @@
country = GetElement("<% = pCountry.ClientID%>").options[GetElement("<% = pCountry.ClientID%>").selectedIndex].text;
}
var agent = GetValue("<% =pAgent.ClientID %>");
var sBranch = GetValue("<% =Sbranch.ClientID %>");
<%--var sBranch = GetValue("<% =Sbranch.ClientID %>");--%>
<%-- var depositType = GetValue("<% =depositType.ClientID %>");--%>
<%-- var depositType = GetValue("<%4 =depositType.ClientID %>");--%>
var depositType = "";
@ -50,7 +50,7 @@
var url = "../Reports.aspx?reportName=txnReport&pCountry=" + country +
//var url = "../Reports.aspx?reportName=40111600&pCountry=" + country +
"&pAgent=" + agent +
"&sBranch=" + sBranch +
//"&sBranch=" + sBranch +
"&depositType=" + depositType +
"&searchBy=" + searchBy +
"&searchByValue=" + searchByValue +
@ -112,14 +112,14 @@
<asp:ListItem Value="">All</asp:ListItem>
</asp:DropDownList>
</div>
<div class="col-md-3 form-group">
<div class="col-md-3 form-group" style="display: none;">
<label>Branch Name:</label>
</div>
<div class="col-md-9 form-group">
<div class="col-md-9 form-group" style="display: none;">
<asp:DropDownList ID="Sbranch" runat="server" CssClass="form-control">
</asp:DropDownList>
</div>
<div class="col-md-3 form-group">
<div class="col-md-3 form-group" >
<label>Search By:</label>
</div>
<div class="col-md-4 form-group">
@ -170,6 +170,13 @@
<asp:DropDownList runat="server" ID="paymentType" CssClass="form-control">
</asp:DropDownList>
</div>
<div class="col-md-3 form-group">
<label>Payment Option:</label>
</div>
<div class="col-md-9 form-group">
<asp:DropDownList runat="server" ID="depositType" CssClass="form-control">
</asp:DropDownList>
</div>
<div class="col-md-3 form-group">
<label>Transaction From :</label>
</div>

6
Swift.web/AgentNew/Reports/TransactionReport/Manage.aspx.cs

@ -21,6 +21,7 @@ namespace Swift.web.AgentNew.Reports.TransactionReport
{
PopulateBenificiary();
PopulatePaymentType();
PopulatePaymentOption();
sl.SetPayStatusDdl(ref status, "", "All");
PopulateTranStatus();
frmDate.Text = DateTime.Now.ToString("yyyy-MM-dd");
@ -76,6 +77,11 @@ namespace Swift.web.AgentNew.Reports.TransactionReport
sl.SetDDL(ref paymentType, sql, "serviceTypeId", "typeTitle", "", "All");
}
private void PopulatePaymentOption()
{
sl.SetDDL(ref depositType, "EXEC proc_online_dropDownList @flag='paymentMode',@user='" + GetStatic.GetUser() + "'", "detailDesc", "detailTitle", "", "All");
}
protected void status_SelectedIndexChanged(object sender, EventArgs e)
{
PopulateTranStatus();

9
Swift.web/AgentNew/Reports/TransactionReport/Manage.aspx.designer.cs

@ -95,6 +95,15 @@ namespace Swift.web.AgentNew.Reports.TransactionReport
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList paymentType;
/// <summary>
/// depositType 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 depositType;
/// <summary>
/// tFrom control.
/// </summary>

25
Swift.web/AgentNew/SendTxn/SendV2.aspx

@ -191,7 +191,7 @@
<div class="row">
<div class="col-md-12">
<div class="infoDiv">
<div class="panel panel-default">
<%--<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">Sending Branch</h4>
</div>
@ -208,7 +208,7 @@
</div>
</div>
</div>
</div>
</div>--%>
<div class="panel panel-default">
<div class="panel-heading">
<div class="row" style="display: none;">
@ -256,7 +256,7 @@
<asp:DropDownList ID="sCountry" runat="server" CssClass="form-control"></asp:DropDownList>
</div>
</div>
<div class="row">
<%--<div class="row">
<div class="col-xs-12">
<div class="table-responsive">
<table class="table">
@ -269,7 +269,7 @@
</table>
</div>
</div>
</div>
</div>--%>
<div class="row" id="rowTblDocument" style="display: none;">
<div class="col-xs-12" style="overflow-y: scroll; max-height: 150px;">
<table class="table table-responsive table-bordered table-condensed tbl-border-black" id="customerDocDetails">
@ -893,6 +893,7 @@
<td colspan="2" rowspan="4">
<span id="spnPayoutLimitInfo" style="color: red; font-size: 16px; font-weight: bold;"></span></td>
</tr>
<tr>
<td valign="top">Collection Amount:
<span class="ErrMsg" id='txtCollAmt_err'>*</span>
@ -1012,6 +1013,7 @@
<select id="pCurrDdl" runat="server" class="required form-control" onchange="CalculateTxn();"></select>
</td>
</tr>
<tr>
<td>Payout Amount: <span class="ErrMsg" id='txtPayAmt_err'>*</span></td>
<td>
@ -1024,7 +1026,16 @@
</div>
</td>
</tr>
<tr id="paymentOptionRow" runat="server">
<td >
<asp:Label runat="server" ID="paymentOption" Text="Payment Option: "></asp:Label>
<span class="ErrMsg" id='paymentOption_err'>*</span>
</td>
<td>
<asp:DropDownList ID="ddlPaymentOption" runat="server" CssClass="required form-control" onchange="CalculateTxn(this);"></asp:DropDownList>
</td>
</tr>
<tr>
<td id="tdScheme" style="display: none;" valign="top">Scheme/Offer:</td>
<td id="tdSchemeVal" style="display: none;">
@ -2106,12 +2117,12 @@
$(".readonlyOnCustomerSelect").attr("disabled", "disabled");
var allowOnBehalf = '<%=IsAllowOnBehalf%>';
if (allowOnBehalf == 'N') {
<%--var allowOnBehalf = '<%=IsAllowOnBehalf%>';--%>
<%--if (allowOnBehalf == 'N') {
$("#<%=sendingAgentOnBehalfDDL.ClientID%>").attr("disabled", "disabled");
$('#<%=sendingAgentOnBehalfDDL.ClientID%>').val('<%=LogginBranch%>');
OnBehalfAgentOnChange();
}
}--%>
$("#form2").validate();
})

72
Swift.web/AgentNew/SendTxn/SendV2.aspx.cs

@ -597,10 +597,10 @@ namespace Swift.web.AgentNew.SendTxn
if (ds == null)
return;
var dr = ds.Tables[0].Rows[0];
if (null != ds.Tables[1])
{
ManageCollMode(ds.Tables[1]);
}
//if (null != ds.Tables[1])
//{
// ManageCollMode(ds.Tables[1]);
//}
//Sender ID
ddSenIdType_err.Visible = false;
txtSendIdNo_err.Visible = false;
@ -878,18 +878,18 @@ namespace Swift.web.AgentNew.SendTxn
hdnRelationshipReq.Value = dr["rRelationShip"].ToString();
}
private void ManageCollMode(DataTable dt)
{
StringBuilder sb = new StringBuilder();
foreach (DataRow item in dt.Rows)
{
string checkedOrNot = item["ISDEFAULT"].ToString() == "1" ? "checked=\"checked\"" : "";
sb.AppendLine("<input " + checkedOrNot + " type=\"checkbox\" id=\"" + item["COLLMODE"] + "\" name=\"chkCollMode\" value=\"" + item["detailTitle"] + "\" class=\"collMode-chk\">&nbsp;<label for=\"" + item["COLLMODE"] + "\">" + item["detailDesc"] + "</label>&nbsp;&nbsp;");
}
//private void ManageCollMode(DataTable dt)
//{
// StringBuilder sb = new StringBuilder();
// foreach (DataRow item in dt.Rows)
// {
// string checkedOrNot = item["ISDEFAULT"].ToString() == "1" ? "checked=\"checked\"" : "";
// sb.AppendLine("<input " + checkedOrNot + " type=\"checkbox\" id=\"" + item["COLLMODE"] + "\" name=\"chkCollMode\" value=\"" + item["detailTitle"] + "\" class=\"collMode-chk\">&nbsp;<label for=\"" + item["COLLMODE"] + "\">" + item["detailDesc"] + "</label>&nbsp;&nbsp;");
// }
sb.AppendLine("<span style='background-color: yellow; font-weight: 600;padding: 4px; display:none;' id='availableBalSpan'> Available Bal: <label id=\"availableBal\" style=\"font-size: 14px;font-weight: 800;\"></label>&nbsp;GBP</span>");
collModeTd.InnerHtml = sb.ToString();
}
// sb.AppendLine("<span style='background-color: yellow; font-weight: 600;padding: 4px; display:none;' id='availableBalSpan'> Available Bal: <label id=\"availableBal\" style=\"font-size: 14px;font-weight: 800;\"></label>&nbsp;GBP</span>");
// collModeTd.InnerHtml = sb.ToString();
//}
private void LoadSchemeByRCountry()
{
@ -1033,7 +1033,7 @@ namespace Swift.web.AgentNew.SendTxn
_sdd.SetDDL(ref ddlIdIssuedCountry, "EXEC proc_sendPageLoadData @flag='idIssuedCountry'", "countryId", "countryName", "", "SELECT COUNTRY");
_sdd.SetDDL(ref ddlEmpBusinessType, "EXEC proc_online_dropDownList @flag='dropdownList',@parentId=7002", "valueId", "detailTitle", "11007", "");
// _sdd.SetDDL(ref custLocationDDL, "EXEC proc_online_dropDownList @flag='state',@countryId='233'", "stateId", "stateName", "", "SELECT");
_sdd.SetDDL(ref sendingAgentOnBehalfDDL, "EXEC proc_sendPageLoadData @flag='S-AGENT-BEHALF',@user='" + GetStatic.GetUser() + "',@sAgent='" + GetStatic.GetAgent() + "'", "agentId", "agentName", "", "Select Branch/Agent");
//_sdd.SetDDL(ref sendingAgentOnBehalfDDL, "EXEC proc_sendPageLoadData @flag='S-AGENT-BEHALF',@user='" + GetStatic.GetUser() + "',@sAgent='" + GetStatic.GetAgent() + "'", "agentId", "agentName", "", "Select Branch/Agent");
_sdd.SetDDL(ref ddlRecIdType, "EXEC proc_online_dropDownList @flag='idType',@user='" + GetStatic.GetUser() + "'", "valueId", "detailTitle", "", "Select..");
_sdd.SetDDL(ref sourceOfFund, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=3900", "valueId", "detailTitle", "", "Select..");
_sdd.SetDDL(ref purpose, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=3800", "valueId", "detailTitle", "8060", "Select..");
@ -1047,6 +1047,7 @@ namespace Swift.web.AgentNew.SendTxn
_sdd.SetDDL(ref ddlVisaStatus, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=7005", "valueId", "detailTitle", "", "Select..");
_sdd.SetDDL(ref ddlOccupation, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=2000", "valueId", "detailTitle", "", "Select..");
//_sdd.SetDDL(ref ddlPayoutPartner, "EXEC proc_sendPageLoadData @flag='choose-partner',@user='" + GetStatic.GetUser() + "'", "AGENTID", "AGENTNAME", "", "Select Partner");
_sdd.SetDDL(ref ddlPaymentOption, "EXEC proc_online_dropDownList @flag='paymentMode',@user='" + GetStatic.GetUser() + "'", "detailDesc", "detailTitle", "", "Select..");
}
private void LoadSenderCountry(ref DropDownList ddl, string defaultValue, string label)
@ -1179,24 +1180,25 @@ namespace Swift.web.AgentNew.SendTxn
exRate.CalcBy = Request.Form["calcBy"];
exRate.ProviderId = Request.Form["payoutPartner"];
exRate.Introducer = Request.Form["introducerTxt"];
if (string.IsNullOrEmpty(exRate.Introducer))
{
DataTable errTbl = new DataTable();
DataColumn dCol1 = new DataColumn("ErrCode", typeof(System.String));
DataColumn dCol2 = new DataColumn("Msg", typeof(System.String));
errTbl.Columns.Add(dCol1);
errTbl.Columns.Add(dCol2);
DataRow row = errTbl.NewRow();
row[dCol1] = "1";
row[dCol2] = "Introducer value can not be empty";
errTbl.Rows.Add(row);
Response.ContentType = "text/plain";
var jsonRes = DataTableToJson(errTbl);
Response.Write(jsonRes);
Response.End();
}
exRate.TpExRate = Request.Form["tpExRate"]; ;
//if (string.IsNullOrEmpty(exRate.Introducer))
//{
// DataTable errTbl = new DataTable();
// DataColumn dCol1 = new DataColumn("ErrCode", typeof(System.String));
// DataColumn dCol2 = new DataColumn("Msg", typeof(System.String));
// errTbl.Columns.Add(dCol1);
// errTbl.Columns.Add(dCol2);
// //DataRow row = errTbl.NewRow();
// //row[dCol1] = "1";
// //row[dCol2] = "Introducer value can not be empty";
// //errTbl.Rows.Add(row);
// Response.ContentType = "text/plain";
// var jsonRes = DataTableToJson(errTbl);
// Response.Write(jsonRes);
// Response.End();
//}
if (exRate.isExRateCalcByPartner)
{
exRate.CalcBy = Request.Form["calcBy"] == "cAmt" ? "C" : "P";
@ -1261,10 +1263,12 @@ namespace Swift.web.AgentNew.SendTxn
, exRate.Introducer
, GetStatic.GetSessionId()
, exRate.ForexSessionId
, exRate.TpExRate
, Request.Form["isManualSc"]
, exRate.ManualSc
, exRate.CalcBy
, exRate.ProviderId
);
}

45
Swift.web/AgentNew/SendTxn/SendV2.aspx.designer.cs

@ -32,15 +32,6 @@ namespace Swift.web.AgentNew.SendTxn
/// </remarks>
protected global::System.Web.UI.WebControls.Label balCurrency;
/// <summary>
/// sendingAgentOnBehalfDDL 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 sendingAgentOnBehalfDDL;
/// <summary>
/// NewCust control.
/// </summary>
@ -95,15 +86,6 @@ namespace Swift.web.AgentNew.SendTxn
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList sCountry;
/// <summary>
/// collModeTd 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 collModeTd;
/// <summary>
/// hdnAgentUser control.
/// </summary>
@ -1481,6 +1463,33 @@ namespace Swift.web.AgentNew.SendTxn
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblPayCurr;
/// <summary>
/// paymentOptionRow 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 paymentOptionRow;
/// <summary>
/// paymentOption 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.Label paymentOption;
/// <summary>
/// ddlPaymentOption 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 ddlPaymentOption;
/// <summary>
/// Td1 control.
/// </summary>

1
Swift.web/AgentNew/Transaction/ApproveAgentTransaction/SendMoneyRequest.aspx.cs

@ -305,6 +305,7 @@ namespace Swift.web.AgentNew.Transaction.ApproveAgentTransaction
, exRate.ForexSessionId
, "N"
, "N"
,""
);
}

70
Swift.web/AgentNew/js/SendTxn/sendTxnInfo.js

@ -294,6 +294,7 @@ function CalculateTxn(amt, obj, isManualSc) {
var pCountrytxt = $("#" + mId + "pCountry option:selected").text();
var pMode = GetValue(mId + "pMode");
var pModetxt = $("#" + mId + "pMode option:selected").text();
var tpExRate = $("#" + mId + "ddlPaymentOption option:selected").val();
if (pCountry === "" || pCountry === null || pCountry === undefined) {
alert("Please choose payout country");
@ -306,12 +307,19 @@ function CalculateTxn(amt, obj, isManualSc) {
GetElement(mId + "pMode").focus();
return false;
}
var sAgent = $("#" + mId + "sendingAgentOnBehalfDDL option:selected").val();
if (sAgent === "" || sAgent === null || sAgent === undefined) {
alert("Please choose Sending AgentBbranch");
GetElement(mId + "sendingAgentOnBehalfDDL").focus();
return false;
}
//if (tpExRate === "" || tpExRate === null || tpExRate === undefined) {
// alert("Please choose payment option");
// GetElement(mId + "pMode").focus();
// return false;
//}
//var sAgent = $("#" + mId + "sendingAgentOnBehalfDDL option:selected").val();
//if (sAgent === "" || sAgent === null || sAgent === undefined) {
// alert("Please choose Sending AgentBbranch");
// GetElement(mId + "sendingAgentOnBehalfDDL").focus();
// return false;
//}
//added by gagan
if ($("#" + mId + "introducerTxt_aSearch").val() !== "") {
var res = CheckReferralBalAndCamt();
@ -382,19 +390,25 @@ function CalculateTxn(amt, obj, isManualSc) {
if (pMode === '13')
payerName = $("#" + mId + "pAgent option:selected").text();
var introducerTxt = $("#" + mId + "introducerTxt_aValue").val();
if (introducerTxt == '' || introducerTxt == null || introducerTxt == undefined) {
alert("Introducer value can not be empty");
ClearAmountFields();
return false;
}
//var introducerTxt = $("#" + mId + "introducerTxt_aValue").val();
//if (introducerTxt == '' || introducerTxt == null || introducerTxt == undefined) {
// alert("Introducer value can not be empty");
// ClearAmountFields();
// return false;
//}
//var tpExRate = $("#" + mId + "ddlPaymentOption").val();
//if (tpExRate == '' || tpExRate == null || tpExRate == undefined) {
// alert("Payment Option must be selected.");
// ClearAmountFields();
// return false;
//}
$("#" + mId + "hddCalcBy").val(obj);
var dataToSend = {
MethodName: 'CalculateTxn', pCountry: pCountry, pCountrytxt: pCountrytxt, pMode: pMode, pAgent: pAgent
, pAgentBranch: pAgentBranch, collAmt: collAmt, payAmt: payAmt, payCurr: payCurr, collCurr: collCurr
, pModetxt: pModetxt, senderId: senderId, schemeCode: schemeCode, couponId: couponId, isManualSc: isManualSc
, sc: sc, payoutPartner: payoutPartner, IsExrateFromPartner: IsExrateFromPartner, PCountryCode: PCountryCode, calcBy: obj
, payerName: payerName, introducerTxt: introducerTxt
, payerName: payerName, tpExRate: tpExRate
};
var options =
@ -811,13 +825,13 @@ function SendTransactionMethod() {
//********IF NEW CUSTOMER CHECK REQUIRED FIELD******
var enrollCustomer = "N";
var collModeFrmCustomer = $("input[name='chkCollMode']:checked").val();
if (collModeFrmCustomer === undefined || collModeFrmCustomer === '') {
alert('Please choose collect mode first!');
return false;
} if (collModeFrmCustomer === "Existing Balance") {
collModeFrmCustomer = "Bank Deposit";
}
//var collModeFrmCustomer = $("input[name='chkCollMode']:checked").val();
//if (collModeFrmCustomer === undefined || collModeFrmCustomer === '') {
// alert('Please choose collect mode first!');
// return false;
//} if (collModeFrmCustomer === "Existing Balance") {
// collModeFrmCustomer = "Bank Deposit";
//}
//New params added
var sCustStreet = $("#" + mId + "sCustStreet").val();
@ -856,7 +870,7 @@ function SendTransactionMethod() {
return false;
}
}
var cashCollMode = collModeFrmCustomer;
//var cashCollMode = collModeFrmCustomer;
var customerDepositedBank = $("#" + mId + "depositedBankDDL").val();
var introducerTxt = $("#" + mId + "introducerTxt_aValue").val();
@ -904,8 +918,8 @@ function SendTransactionMethod() {
var isRealTime = $("#" + mId + "hddIsRealTimeTxn").val();
var tpExRate = $("#" + mId + "hddTPExRate").val();
var IsExrateFromPartner = $("#" + mId + "hddFetchExrateFromPartner").val();
var branchId = $("#" + mId + "sendingAgentOnBehalfDDL").val().split('|')[0];
var branchName = $("#" + mId + "sendingAgentOnBehalfDDL :selected").text();
// var branchId = $("#" + mId + "sendingAgentOnBehalfDDL").val().split('|')[0];
// var branchName = $("#" + mId + "sendingAgentOnBehalfDDL :selected").text();
var txnRequestFromAgent = $("#" + mId + "hddTxnRequestFromAgent").val();
var txnRequestRowId = $("#" + mId + "hddTxnRequestRowId").val();
var goodsType = $("#" + mId + "goodsType").val();
@ -990,21 +1004,21 @@ function SendTransactionMethod() {
"&manualSC=" + manualSC +
"&isManualSC=" + isManualSC +
//new fields
"&sCustStreet=" + sCustStreet +
"&sCustLocation=" + sCustLocation +
//"&sCustStreet=" + sCustStreet +
//"&sCustLocation=" + sCustLocation +
"&sCustomerType=" + sCustomerType +
"&sCustBusinessType=" + sCustBusinessType +
"&sCustIdIssuedCountry=" + sCustIdIssuedCountry +
"&sCustIdIssuedDate=" + sCustIdIssuedDate +
"&receiverId=" + receiverId +
"&payoutPartnerId=" + payoutPartnerId +
"&cashCollMode=" + cashCollMode +
//"&cashCollMode=" + cashCollMode +
"&customerDepositedBank=" + customerDepositedBank +
"&introducerTxt=" + introducerTxt +
"&pSubLocationText=" + pSubLocationText +
"&payerId=" + payerId +
"&payerBranchId=" + payerBranchId +
"&branchId=" + branchId +
//"&branchId=" + branchId +
"&isCDDI=" + FilterString(isCDDI) +
"&isRealTime=" + isRealTime +
"&agentRefId=" + hddAgentRefId +
@ -1014,7 +1028,7 @@ function SendTransactionMethod() {
"&relationOther=" + relationOther +
"&purposeOther=" + purposeOther +
"&promotionAmount=" + promotionAmount +
"&branchName=" + branchName +
//"&branchName=" + branchName +
"&txnRequestFromAgent=" + txnRequestFromAgent +
"&txnRequestRowId=" + txnRequestRowId +
"&goodsType=" + goodsType +

3
Swift.web/AgentPanel/International/SendMoney/Send.aspx.cs

@ -734,7 +734,8 @@ namespace Swift.web.AgentPanel.International.SendMoney
, senderId
, ""
, GetStatic.GetSessionId()
, couponId);
, couponId
, "");
Response.ContentType = "text/plain";
var json = DataTableToJson(dt);

3
Swift.web/AgentPanel/International/SendMoney/SendV2.aspx.cs

@ -741,7 +741,8 @@ namespace Swift.web.AgentPanel.International.SendMoney
, senderId
, ""
, GetStatic.GetSessionId()
, couponId);
, couponId
, "");
Response.ContentType = "text/plain";
var json = DataTableToJson(dt);

3
Swift.web/AgentPanel/Send/SendTransaction/Send.aspx.cs

@ -740,7 +740,8 @@ namespace Swift.web.AgentPanel.Send.SendTransactionIRH
, senderId
, ""
, GetStatic.GetSessionId()
, couponId);
, couponId
, "");
Response.ContentType = "text/plain";
var json = DataTableToJson(dt);

10
Swift.web/DashboardV2/Dashboard2.aspx.cs

@ -244,7 +244,7 @@ namespace Swift.web.DashboardV2
if (ds.Tables.Count > 1)
{
{
if (ds.Tables[1] != null || ds.Tables[1].Rows.Count <= 0)
{
try
@ -252,7 +252,8 @@ namespace Swift.web.DashboardV2
data.ComplianceData = new ComplianceData
{
OFACComplianceTxns = Convert.ToString(ds.Tables[1].Rows[0]["Count"]),
OFACComplianceMobileTxns = Convert.ToString(ds.Tables[1].Rows[1]["Count"])
OFACComplianceMobileTxnsKycLater = Convert.ToString(ds.Tables[1].Rows[1]["Count"]),
OFACComplianceMobileTxnsKycNow = Convert.ToString(ds.Tables[1].Rows[2]["Count"])
};
}
catch (Exception ex)
@ -347,8 +348,7 @@ namespace Swift.web.DashboardV2
.Select(x => new { BranchName= x.Field<string>("sAgentName"), CurrentMonth = (x.Field<int>("CurrentMonth")).ToString(), PreviousMonth = (x.Field<int>("PreviousMonth")).ToString() })
.ToList();
}
}
}
GetStatic.JsonResponse(data, this);
}
@ -426,6 +426,8 @@ namespace Swift.web.DashboardV2
{
public string OFACComplianceTxns { get; set; }
public string OFACComplianceMobileTxns { get; set; }
public string OFACComplianceMobileTxnsKycLater { get; set; }
public string OFACComplianceMobileTxnsKycNow { get; set; }
}
public class TransactionStatics

3
Swift.web/DashboardV2/assets/js/dashboardv2.js

@ -115,7 +115,8 @@ function LoadChartData() {
if (loadDate) {
//Compliance/OFAC Hold Transactions
$('#complianceHoldCount').text(Response.ComplianceData.OFACComplianceTxns);
$('#complianceHoldCountMobile').text(Response.ComplianceData.OFACComplianceMobileTxns);
$('#complianceHoldCountMobileKycLater').text(Response.ComplianceData.OFACComplianceMobileTxnsKycLater);
$('#complianceHoldCountMobileKycNow').text(Response.ComplianceData.OFACComplianceMobileTxnsKycNow);
//Customer Count data
$('#totalCustomerCount').text(Response.CustomerData.TotalCustomers);

17
Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx

@ -39,10 +39,10 @@
country = GetElement("<% = pCountry.ClientID%>").options[GetElement("<% = pCountry.ClientID%>").selectedIndex].text;
}
var agent = GetValue("<% =pAgent.ClientID %>");
var sBranch = GetValue("<% =Sbranch.ClientID %>").split('|')[0];
<%--var sBranch = GetValue("<% =Sbranch.ClientID %>").split('|')[0];--%>
<%-- var depositType = GetValue("<% =depositType.ClientID %>");--%>
<%-- var depositType = GetValue("<%4 =depositType.ClientID %>");--%>
var depositType = "";
var depositType = GetValue("<% =depositType.ClientID %>");
var orderBy = GetValue("<% =orderBy.ClientID %>");
var status = GetValue("<% =status.ClientID %>");
@ -65,7 +65,7 @@
var url = "../../../../AgentNew/Reports/Reports.aspx?reportName=txnReport&pCountry=" + country +
//var url = "../Reports.aspx?reportName=40111600&pCountry=" + country +
"&pAgent=" + agent +
"&sBranch=" + sBranch +
//"&sBranch=" + sBranch +
"&depositType=" + depositType +
"&searchBy=" + searchBy +
"&searchByValue=" + searchByValue +
@ -129,10 +129,10 @@
<asp:ListItem Value="">All</asp:ListItem>
</asp:DropDownList>
</div>
<div class="col-md-3 form-group">
<div class="col-md-3 form-group" style="display: none;">
<label>Branch Name:</label>
</div>
<div class="col-md-9 form-group">
<div class="col-md-9 form-group" style="display: none;">
<asp:DropDownList ID="Sbranch" runat="server" CssClass="form-control">
</asp:DropDownList>
</div>
@ -186,6 +186,13 @@
<div class="col-md-9 form-group">
<asp:DropDownList runat="server" ID="paymentType" CssClass="form-control">
</asp:DropDownList>
</div>
<div class="col-md-3 form-group">
<label>Payment Option:</label>
</div>
<div class="col-md-9 form-group">
<asp:DropDownList runat="server" ID="depositType" CssClass="form-control">
</asp:DropDownList>
</div>
<div class="col-md-3 form-group">
<label>Transaction From :</label>

8
Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx.cs

@ -26,6 +26,7 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
{
PopulateBenificiary();
PopulatePaymentType();
PopulatePaymentOption();
sl.SetPayStatusDdl(ref status, "", "All");
PopulateTranStatus();
frmDate.Text = DateTime.Now.ToString("yyyy-MM-dd");
@ -62,6 +63,7 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
{
var label = "";
if (status.Text.ToLower().Equals("unpaid") || string.IsNullOrWhiteSpace(status.Text))
if (status.Text.ToLower().Equals("unpaid") || string.IsNullOrWhiteSpace(status.Text))
{
label = "All";
@ -81,6 +83,12 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
sl.SetDDL(ref paymentType, sql, "serviceTypeId", "typeTitle", "", "All");
}
private void PopulatePaymentOption()
{
sl.SetDDL(ref depositType, "EXEC proc_online_dropDownList @flag='paymentMode',@user='" + GetStatic.GetUser() + "'", "detailDesc", "detailTitle", "", "All");
}
protected void status_SelectedIndexChanged(object sender, EventArgs e)
{
PopulateTranStatus();

9
Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx.designer.cs

@ -104,6 +104,15 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList paymentType;
/// <summary>
/// depositType 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 depositType;
/// <summary>
/// tFrom control.
/// </summary>

3
Swift.web/Remit/UserControl/UcTransaction.ascx

@ -939,8 +939,7 @@
<br>
<asp:Button ID="btnAdd" runat="server" CssClass="btn btn-primary" OnClick="btnAdd_Click"
Text="Add New Complain" />
<asp:Button ID="btnEditCustomer" runat="server" CssClass="btn btn-edit" OnClick="btnEditCustomer_Click" Text="Edit Customer" />
<asp:Label ID="editCust" runat="server"></asp:Label>
</td>
</tr>
</asp:Panel>

9
Swift.web/Remit/UserControl/UcTransaction.ascx.cs

@ -279,7 +279,7 @@ namespace Swift.web.Remit.UserControl
sContactNo.Text = tRow["sContactNo"].ToString(); //
sIdType.Text = tRow["sIdType"].ToString(); //
sIdNo.Text = tRow["sIdNo"].ToString(); //
editCust.Text = tRow["editCustomer"].ToString();
hdnRName.Value = tRow["receiverName"].ToString();
@ -962,13 +962,6 @@ namespace Swift.web.Remit.UserControl
ShowLog();
}
protected void btnEditCustomer_Click(object sender, EventArgs e)
{
string customerId = hdnCustomerId.Value;
//Response.Redirect("/Remit/Administration/CustomerRegistration/Manage.aspx?customerId=" + customerId + "");
Response.Redirect("/Remit/Administration/CustomerRegistration/Manage.aspx?customerId=" + customerId + "&MethodName=GetCustomerDetailsForEdit");
}
#region for desplaying a transaction comments log
public void ShowLog()

4
Swift.web/Remit/UserControl/UcTransaction.ascx.designer.cs

@ -1087,13 +1087,13 @@ namespace Swift.web.Remit.UserControl
protected global::System.Web.UI.WebControls.Button btnAdd;
/// <summary>
/// btnEditCustomer control.
/// editCust 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.Button btnEditCustomer;
protected global::System.Web.UI.WebControls.Label editCust;
/// <summary>
/// pnlOFAC control.

Loading…
Cancel
Save