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

Preprod merge

Prod
shakun 10 months ago
parent
d21932b619
commit
a200cadf05
33 changed files with 456 additions and 256 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. 1
      Swift.API/Common/ExRate/ExRateRequest.cs
  2. 16
      Swift.DAL/Agentpanel/Send/SendTranIRHDao.cs
  3. 2
      Swift.web/AgentNew/Administration/CustomerSetup/Benificiar/Manage.aspx
  4. 2
      Swift.web/AgentNew/Administration/CustomerSetup/Benificiar/Manage.aspx.cs
  5. 2
      Swift.web/AgentNew/AgentSend/SendV2.aspx
  6. 2
      Swift.web/AgentNew/AgentSend/SendV2.aspx.cs
  7. 4
      Swift.web/AgentNew/SendOnBehalf/SendV2.aspx.cs
  8. 235
      Swift.web/AgentNew/SendTxn/SendIntlReceipt.aspx
  9. 14
      Swift.web/AgentNew/SendTxn/SendIntlReceipt.aspx.cs
  10. 9
      Swift.web/AgentNew/SendTxn/SendIntlReceipt.aspx.designer.cs
  11. 94
      Swift.web/AgentNew/SendTxn/SendV2.aspx
  12. 20
      Swift.web/AgentNew/SendTxn/SendV2.aspx.cs
  13. 45
      Swift.web/AgentNew/SendTxn/SendV2.aspx.designer.cs
  14. 2
      Swift.web/AgentNew/Transaction/ApproveAgentTransaction/SendMoneyRequest.aspx.cs
  15. 23
      Swift.web/AgentNew/js/SendTxn/sendTxnInfo.js
  16. 2
      Swift.web/AgentPanel/International/SendMoney/Send.aspx.cs
  17. 2
      Swift.web/AgentPanel/International/SendMoney/SendV2.aspx.cs
  18. 2
      Swift.web/AgentPanel/International/SendMoneyv2/SendV2.aspx.cs
  19. 2
      Swift.web/AgentPanel/International/SendOnBehalf/SendV2.aspx.cs
  20. 2
      Swift.web/AgentPanel/Send/SendTransaction/Send.aspx.cs
  21. 4
      Swift.web/DashboardV2/Dashboard2.aspx.cs
  22. 62
      Swift.web/Payment/STPaymentCustomerRedirect.aspx
  23. 3
      Swift.web/Payment/STPaymentCustomerRedirect.aspx.cs
  24. 35
      Swift.web/Payment/trans_payment_success.aspx
  25. 8
      Swift.web/Remit/Administration/CustomerRegistration/Manage.aspx
  26. 2
      Swift.web/Remit/Administration/CustomerSetup/CustomerDetails.aspx
  27. 1
      Swift.web/Remit/Compliance/ApproveOFACandComplaince/List.aspx.cs
  28. 17
      Swift.web/Remit/Transaction/ApproveTxn/holdTxnList.aspx.cs
  29. 7
      Swift.web/Remit/Transaction/ApproveTxn/holdTxnListMobile.aspx.cs
  30. 46
      Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs
  31. 38
      Swift.web/Remit/Transaction/VerifyMobileTransaction/VerifyMobileTransaction.aspx
  32. 5
      Swift.web/Remit/Transaction/VerifyMobileTransaction/VerifyMobileTransaction.aspx.cs
  33. 3
      Swift.web/Responsive/Send/SendV2.aspx.cs

1
Swift.API/Common/ExRate/ExRateRequest.cs
View File

@ -41,5 +41,6 @@
public bool isExRateCalcByPartner { get; set; }
public string payerName { get; set; }
public string Introducer { get; set; }
public string RewardAmt { get; set; }
}
}

16
Swift.DAL/Agentpanel/Send/SendTranIRHDao.cs
View File

@ -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 tpExRate, string isManualSc = "",
string schemeCode, string senderId, string introducer, string sessionId, string couponId, string tpExRate, string rewardAmt, string isManualSc = "",
string sc = "", string calcBy = "", string payoutPartner = "")
{
var sql = "EXEC proc_sendIRH @flag = 'exRate'";
@ -420,6 +420,7 @@ namespace Swift.DAL.BL.AgentPanel.Send
sql += ", @sessionId = " + FilterString(sessionId);
sql += ", @couponTranNo = " + FilterString(couponId);
sql += ", @tpExRate = " + FilterString(tpExRate);
sql += ", @rewardAmt = " + FilterString(rewardAmt);
sql += ", @isManualSc = " + FilterString(isManualSc);
sql += ", @partnerId = " + FilterString(payoutPartner);
sql += ", @manualSc = " + FilterString(sc);
@ -468,7 +469,7 @@ namespace Swift.DAL.BL.AgentPanel.Send
string pCountryId, string pAgent, string pCurr, string deliveryMethod, string cAmt, string pAmt,
string schemeCode, string senderId, string sessionId, string couponId
, string isManualSc, string sc
, string exRateTp, string pCurrTp, string calcBy, string introducer, string payoutPartner = "")
, string exRateTp, string pCurrTp, string calcBy, string introducer, string rewardAmt, string payoutPartner = "")
{
var sql = "EXEC proc_sendIRHTP @flag = 'exRate'";
sql += ", @user = " + FilterString(user);
@ -492,6 +493,7 @@ namespace Swift.DAL.BL.AgentPanel.Send
sql += ", @isManualSc = " + FilterString(isManualSc);
sql += ", @partnerId = " + FilterString(payoutPartner);
sql += ", @manualSc = " + FilterString(sc);
sql += ", @rewardAmt = " + FilterString(rewardAmt);
sql += ", @introducer = " + FilterString(introducer);
//sql += ", @calcBy = " + FilterString(calcBy);
@ -773,6 +775,7 @@ namespace Swift.DAL.BL.AgentPanel.Send
sql += ", @goodsOrigin = " + FilterString(trn.goodsOrigin);
sql += ", @portOfShipment = " + FilterString(trn.portOfShipment);
sql += ", @calculatedOriginalSc = " + FilterString(trn.calcOriginalSc);
sql += ", @rewardAmt = " + FilterString(trn.rewardAmt);
var ds = ExecuteDataset(sql);
if (ds == null || ds.Tables.Count == 0)
@ -993,6 +996,7 @@ namespace Swift.DAL.BL.AgentPanel.Send
sql += ", @tpExRate = " + FilterString(trn.tpExRate);
sql += ", @calculatedOriginalSc = " + FilterString(trn.calcOriginalSc);
sql += ", @rewardAmt = " + FilterString(trn.rewardAmt);
var ds = ExecuteDataset(sql);
if (ds == null || ds.Tables.Count == 0)
return null;
@ -1101,14 +1105,15 @@ namespace Swift.DAL.BL.AgentPanel.Send
sql += ", @ofacRes = " + FilterString(trn.OfacRes);
sql += ", @sDcInfo = " + FilterString(trn.DcInfo);
sql += ", @sIpAddress = " + FilterString(trn.IpAddress);
sql += ", @rewardAmt = " + FilterString(trn.rewardAmt);
return ParseDbResult(sql);
}
public DataTable GetAgentQuota(string user)
public DataTable GetAgentQuota(string customerId)
{
var sql = "EXEC ProcIntroducerCommissionSetup @flag = 'checkAgentQuota'";
sql += ", @user = " + FilterString(user);
var sql = "EXEC ProcIntroducerCommissionSetup @flag = 'getRewardAmount'";
sql += ", @customerId = " + FilterString(customerId);
return ExecuteDataTable(sql);
}
public DataSet GetAllTranInformation(string senderId, string benId, string agentId, string pCountry, string user)
@ -1439,6 +1444,7 @@ namespace Swift.DAL.BL.AgentPanel.Send
sql += ", @calculatedOriginalSc = " + FilterString(trn.calcOriginalSc);
sql += ", @paymentOption = " + FilterString(trn.paymentOption);
sql += ", @siteReference = " + FilterString(trn.siteReference);
sql += ", @rewardAmt = " + FilterString(trn.rewardAmt);
return ParseDbResult(sql);
}

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

@ -407,7 +407,7 @@
var PurposeOfRemitance = $("#<%=ddlPurposeOfRemitance.ClientID%>").val();
var PurposeOfRemitanceOther = $("#<%=purposeOther.ClientID%>").val();
var BankLocation = bankBranch;
var BankName = $("#<%=txtBankName.ClientID%>").val();
var BankName = $("#<%=ddlPayoutPatner.ClientID%> option:selected").text();
var BenificaryAc = $("#<%=txtBenificaryAc.ClientID%>").val();
var Remarks = $("#<%=txtRemarks.ClientID%>").val();
var membershipId = $("#<%=hideMembershipId.ClientID%>").val();

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

@ -435,7 +435,7 @@ namespace Swift.web.AgentNew.Administration.CustomerSetup.Benificiar
PaymentMode = ddlPaymentMode.SelectedValue,
PayoutPatner = ddlPayoutPatner.SelectedValue,
BankLocation = DDLBankBranch.SelectedValue,
BankName = txtBankName.Text,
BankName = ddlPayoutPatner.Text,
BenificaryAc = txtBenificaryAc.Text,
Remarks = txtRemarks.Text,
OtherRelationDescription = otherRelationshipTextBox.Text,

2
Swift.web/AgentNew/AgentSend/SendV2.aspx
View File

@ -1555,6 +1555,7 @@
return;
}
if (data.length > 0) {
debugger
//****Transaction Detail****
$("#receiverName").text(data[0].firstName + ' ' + data[0].middleName + ' ' + data[0].lastName1);
$("#<%=txtRecFName.ClientID %>").val(data[0].firstName);
@ -1600,6 +1601,7 @@
$(".readonlyOnCustomerSelect").attr("disabled", "disabled");
$("#txtpBranch_aValue").val('');
$("#txtpBranch_aText").val('');
$("lblRemainingQuota").text('Reward Amount : ' + data[0].rewardPoints);
<%--if ($("#<%=pCountry.ClientID%> option:selected ").val() != "") {
PcountryOnChange('c', "");
SetPayCurrency($("#<%=pCountry.ClientID%>").val());

2
Swift.web/AgentNew/AgentSend/SendV2.aspx.cs
View File

@ -978,6 +978,7 @@ namespace Swift.web.AgentNew.AgentSend
var couponId = Request.Form["couponId"];
var isManualSc = Request.Form["isManualSc"];
var sc = Request.Form["sc"];
var rewardAmt = Request.Form["rewardAmt"];
dt = st.GetExRate(GetStatic.GetUser()
, GetStatic.GetCountryId()
@ -995,6 +996,7 @@ namespace Swift.web.AgentNew.AgentSend
, senderId
, GetStatic.GetSessionId()
, couponId
, rewardAmt
, isManualSc
, sc);

4
Swift.web/AgentNew/SendOnBehalf/SendV2.aspx.cs
View File

@ -917,6 +917,7 @@ namespace Swift.web.AgentNew.SendOnBehalf
var couponId = Request.Form["couponId"];
var isManualSc = Request.Form["isManualSc"];
var sc = Request.Form["sc"];
var rewardAmt = Request.Form["rewardAmt"];
dt = st.GetExRate(GetStatic.GetUser()
, GetStatic.GetCountryId()
@ -935,7 +936,8 @@ namespace Swift.web.AgentNew.SendOnBehalf
, GetStatic.GetSessionId()
, couponId
, isManualSc
, sc);
, sc
, rewardAmt);
Response.ContentType = "text/plain";
var json = DataTableToJson(dt);

235
Swift.web/AgentNew/SendTxn/SendIntlReceipt.aspx
View File

@ -67,8 +67,12 @@
font-family: 'Noto Sans JP', sans-serif;
}
.receipt p {
font-family: 'Noto Sans JP', sans-serif;
.receipt p {
font-family: 'Noto Sans JP', sans-serif;
}
.auto-style1 {
height: 43px;
}
</style>
</asp:Content>
@ -76,7 +80,7 @@
<div class="div-send-sms" style="margin-top: 10px;">
<div class="row">
<div class="col-md-6 form-group">
<asp:TextBox ID="smsToSend" runat="server" CssClass="form-control" TextMode="MultiLine"></asp:TextBox>
<asp:TextBox ID="smsToSend" runat="server" CssClass="form-control" Rows="4" TextMode="MultiLine"></asp:TextBox>
</div>
</div>
<div class="row">
@ -98,44 +102,36 @@
<tr>
<td style="width: 5%;">
<div class="logo">
<%-- <img src="/images/jme.png" />--%>
<img src="../../Images/ime-london-logo-receipt.png" style="padding-bottom:5px;" />
<%-- <img src="/images/jme.png" />--%>
<img src="../../Images/ime-london-logo.png" style="padding-bottom: 30px; height: 85px; width: 205px;" class="auto-style1" />
</div>
</td>
<td style="width: 90%;" colspan="2">
<td style="width: 45%;" colspan="2">
<table style="width: 100%;">
<tr>
<td style="padding: 0 10px; width: 45%;">
<h3 style="font-size: 12px;">IME London (Subhida UK Ltd. Company)</h3>
<p style="font-size: 9px;">
Registration No.: 6432399, FCA Registration No.: 576127 <br />
HMRC Registration No.: 12663526 <br />
<p style="font-size: 9px; margin-bottom: 2px;">
Registration No.: 6432399, FCA Registration No.: 576127
</p>
<p style="font-size: 9px; margin-bottom: 2px;">
HMRC Registration No.: 12663526
</p>
<p style="font-size: 9px; margin-bottom: 2px;">
Registered Address : Pentax House South Hill Avenue, South Harrow, London, HA2 0DU
</p>
<p style="font-size: 9px;">
<p style="font-size: 9px; margin-bottom: 2px;">
Tel: +4402088660307, +4407984713677<br />
</p>
<p style="font-size: 9px; margin-bottom: 2px;">
Email:info@imelondon.co.uk
</p>
</td>
<%--<td style="padding: 0 10px; width: 55%;">
<h3 style="font-size: 12px;">ジャパンマネーエクスプレス株式会社</h3>
<p style="font-size: 9px;">
〒169-0073　東京都新宿区百人町一丁目１０番７号<br />
大森ビル４階AB号室
</p>
<p style="font-size: 9px;">
Tel: 03-5475-3913, Fax: 03-5475-3914<br />
https://www.japanremit.com
</p>
</td>--%>
</tr>
<tr>
<td colspan="2">
<h3 style="font-size: 25px; text-align: center;"><span style="text-decoration: underline; font-size: 23px;">Remittance Statement
</span>&nbsp;&nbsp;&nbsp;&nbsp;<span style="text-decoration: underline; color: #ff0000; font-size: 17px; float: right; margin-top: 10px; margin-right: 10px;">Office Copy</span></h3>
<%--<p style="text-decoration: underline; color: #ff0000; font-size: 18px; text-align: end;">Office Copy</p>--%>
</td>
</tr>
</table>
@ -230,7 +226,7 @@
<!--Receiver information-->
<tr style="">
<td>
<table width="100%;" style="border: 1px solid #ccc; padding: 5px; border-collapse: collapse;" class="tbl-sender-rec-info">
<table width="100%;" style="border: 1px solid #ccc; padding: 5px; border-collapse: collapse;" class="tbl-sender-rec-info">
<tr style="border-bottom: 1px solid #ccc;">
<td colspan="4" class="details">
<h4>BENEFICIARY INFORMATION</h4>
@ -264,7 +260,7 @@
<label>Mode of Receipt</label>
</td>
<td><span class="sender-value">
<asp:Label ID="paymentMode" runat="server"></asp:Label></span>
<asp:Label ID="paymentMode" runat="server"></asp:Label></span>
</td>
</tr>
<tr style="border-bottom: 1px solid #ccc;">
@ -283,7 +279,7 @@
<asp:Label ID="pBankName" runat="server"></asp:Label></span>
</td>
</tr>
<tr style="border-bottom: 1px solid #ccc;">
<tr style="border-bottom: 1px solid #ccc;">
<td>
<label>Deposit Type: </label>
</td>
@ -295,7 +291,6 @@
<tr style="border-bottom: 1px solid #ccc;">
<td>
<label>
Relation with Beneficiary</label>
</td>
<td>
@ -329,32 +324,32 @@
</td>
<td width="20%" class="amount-info">
<table width="100%;" border="1" cellspacing="0 " cellpadding="0 ">
<table width="100%;" border="1" cellspacing="2 " cellpadding="2">
<tr>
<td style="font-weight: bold;">
<h2>Reference NO:<span><asp:Label ID="controlNo" runat="server"></asp:Label></span></h2>
</td>
</tr>
<tr>
<td>
<p>
<td style="padding: 5px;">
<p style="padding: 3px;">
<asp:Label ID="createdBy" runat="server"></asp:Label>
</p>
<p>
<span>
<span style="padding: 3px;">
<asp:Label ID="approvedDate" runat="server"></asp:Label></span>
</p>
</td>
</tr>
<tr>
<td>
<td style="padding: 5px;">
<p>Collect Amount</p>
<h3><span>
<asp:Label ID="cAmt" runat="server"></asp:Label></span></h3>
</td>
</tr>
<tr>
<td>
<td style="padding: 5px;">
<p>Service Charge</p>
<p>
<span>
@ -363,7 +358,7 @@
</td>
</tr>
<tr>
<td>
<td style="padding: 5px;">
<p>Transfer Amount</p>
<p>
<span>
@ -372,7 +367,7 @@
</td>
</tr>
<tr>
<td>
<td style="padding: 5px;">
<p>Exchange Rate</p>
<p>
<span>
@ -381,14 +376,14 @@
</td>
</tr>
<tr>
<td>
<td style="padding: 5px;">
<p>Payout Amount</p>
<h3><span>
<asp:Label ID="pAmt" runat="server"></asp:Label></span></h3>
</td>
</tr>
<tr>
<td>
<td style="padding: 5px;">
<p>
Serial:<span>
<asp:Label ID="serial1" runat="server"></asp:Label></span>
@ -396,7 +391,7 @@
</td>
</tr>
<tr style="display: none;">
<td>
<td style="padding: 5px;">
<p>Deposit Type</p>
<p>
<span>
@ -408,42 +403,15 @@
</td>
</tr>
<!--information section-->
<tr valign="top">
<%--<tr valign="top">
<td colspan="2">
<table width="100%;" style="border: 1px solid #ccc; padding: 5px;">
<tr>
<td colspan="4" style="font-weight: 600; padding-top:5px; padding-left: 5px; padding-bottom: 5px;">Signature and Declaration
<td colspan="4" style="font-weight: 600; padding-top: 5px; padding-left: 5px; padding-bottom: 5px;">Signature and Declaration
</td>
</tr>
<tr>
<%--<td colspan="2" style="padding: 5px;">
<p style="font-size: 8px;">
(1) I understood and agreed to the Terms and Conditions of JME published on the website.<br />
(2) I read and understood the Privacy Policy of JME published on the website.<br />
(3) I confirmed the information provided above is true and correct.<br />
(4) I declare that<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- This request has nothing to do with Democratic People`s Republic of Korea (DPRK) and Islamic<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Republic of Iran;<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- I have no relation to Anti-Social Forces;<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- This beneficiary is not Politically Exposed Person (PEPs)<br />
</p>
</td>
<td colspan="2">
<p style="font-size: 8px;">
(1) ウェブサイト上で公開されている当社の「海外送金規約」を理解し合意しています。
<br />
(2) ウェブサイト上で公開されている当社の「個人情報保護方針」を確認し理解しました。<br />
(3) 上記の記載内容に相違がないことを確認しました。<br />
(4) 更に、以下の点につき表明します。<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- 本件依頼は朝鮮民主主義人民共和国及びイラン・イスラム共和国とは<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;一切関わりがないこと。<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- 私は反社会的勢力とは何ら関わりがないこと。<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- 私は一切違法行為を行っていないこと。<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- 本受取人は外国の政府等において重要な地位を占める者 (PEPs)ではありません <br />
</p>
</td>--%>
<td style="padding-top:5px; padding-left: 5px; padding-bottom:5px;">
This is the digital copy generated from the system hence no signature is required. Please do contact IME London for further information.
<td style="padding-top: 5px; padding-left: 5px; padding-bottom: 5px;">This is the digital copy generated from the system hence no signature is required. Please do contact IME London for further information.
</td>
</tr>
<tr>
@ -453,12 +421,9 @@
<td style="padding: 5px;">
<label>Signature or Stamp</label>
</td>
<td style="padding-top: 10px !important;">..................................................
</td>
<td style="display: none;">
<label>Operator:(<asp:Label ID="operator1" runat="server"></asp:Label>)</label>
</td>
<td style="padding-top: 10px !important; display: none;">..................................................
<td class="logo">
<img src="../../Images/ime-london-logo-receipt.png" style="padding-bottom: 5px;" />
</td>
</tr>
<tr>
@ -466,7 +431,35 @@
</tr>
</table>
</td>
</tr>--%>
<tr valign="top">
<td colspan="2">
<table width="100%;" style="border: 1px solid #ccc; padding: 5px;">
<tr>
<td colspan="4" style="font-weight: 600; padding-top: 5px; padding-left: 5px; padding-bottom: 5px;">Signature and Declaration</td>
</tr>
<tr>
<td style="padding-top: 5px; padding-left: 5px; padding-bottom: 5px;">This is the digital copy generated from the system hence no signature is required. Please do contact IME London for further information.</td>
</tr>
<tr>
<%--<td style="padding: 5px;">
<label>Signature or Stamp</label>
</td>--%>
<td style="padding: 5px; text-align: right;" class="logo">
<img src="../../Images/ime-london-logo-receipt.png" style="padding-bottom: 5px; padding-right: 5px; height: 115px; width: 125px;" />
</td>
</tr>
<tr>
<td style="padding: 5px; text-align: right;" class="logo">
<label style="text-align: center;">Signature or Stamp</label>
</td>
</tr>
</table>
</td>
</tr>
</table>
<table width="100%;" style="margin: 50px 0;" id="divInvoiceSecond" runat="server">
@ -485,42 +478,36 @@
<tr>
<td style="width: 5%;">
<div class="logo">
<%-- <img src="/images/jme.png" />--%>
<img src="../../Images/ime-london-logo-receipt.png" style="padding-bottom:5px;" />
<%-- <img src="/images/jme.png" />--%>
<img src="../../Images/ime-london-logo.png" style="padding-bottom: 30px; height: 85px; width: 205px;" class="auto-style1" />
</div>
</td>
<td style="width: 90%;" colspan="2">
<td style="width: 45%;" colspan="2">
<table style="width: 100%;">
<tr>
<td style="padding: 0 10px; width: 45%;">
<h3 style="font-size: 12px;">IME London (Subhida UK Ltd. Company)</h3>
<p style="font-size: 9px;">
Registration No.: 6432399, FCA Registration No.: 576127 <br />
HMRC Registration No.: 12663526 <br />
<p style="font-size: 9px; margin-bottom: 2px;">
Registration No.: 6432399, FCA Registration No.: 576127
</p>
<p style="font-size: 9px; margin-bottom: 2px;">
HMRC Registration No.: 12663526
</p>
<p style="font-size: 9px; margin-bottom: 2px;">
Registered Address : Pentax House South Hill Avenue, South Harrow, London, HA2 0DU
</p>
<p style="font-size: 9px;">
<p style="font-size: 9px; margin-bottom: 2px;">
Tel: +4402088660307, +4407984713677<br />
</p>
<p style="font-size: 9px; margin-bottom: 2px;">
Email:info@imelondon.co.uk
</p>
</td>
<%-- <td style="padding: 0 10px; width: 55%;">
<h3 style="font-size: 12px;">ジャパンマネーエクスプレス株式会社</h3>
<p style="font-size: 9px;">
〒169-0073　東京都新宿区百人町一丁目１０番７号<br />
大森ビル４階AB号室
</p>
<p style="font-size: 9px;">
Tel: 03-5475-3913, Fax: 03-5475-3914<br />
https://www.japanremit.com
</p>
</td>--%>
</tr>
<tr>
<td colspan="2">
<h3 style="font-size: 24px; text-align: center;"><span style="text-decoration: underline; font-size: 23px;">Remittance Statement</span>&nbsp;&nbsp;&nbsp;&nbsp;<span style="text-decoration: underline; color: #ff0000; margin-right: 10px; font-size: 17px; float: right; margin-top: 10px;">Customer Copy</span></h3>
<%--<p style="text-decoration: underline; color: #ff0000; font-size: 18px; text-align: end;">Office Copy</p>--%>
<h3 style="font-size: 25px; text-align: center;"><span style="text-decoration: underline; font-size: 23px;">Remittance Statement
</span>&nbsp;&nbsp;&nbsp;&nbsp;<span style="text-decoration: underline; color: #ff0000; font-size: 17px; float: right; margin-top: 10px; margin-right: 10px;">Office Copy</span></h3>
</td>
</tr>
</table>
@ -632,7 +619,7 @@
<label>Mode of Receipt</label>
</td>
<td><span class="sender-value">
<asp:Label ID="paymentMode1" runat="server"></asp:Label></span>
<asp:Label ID="paymentMode1" runat="server"></asp:Label></span>
</td>
</tr>
<tr style="border-bottom: 1px solid #ccc;">
@ -668,7 +655,7 @@
<asp:Label ID="pBranchName1" runat="server"></asp:Label></span>
</td>
</tr>
<tr style="border-bottom: 1px solid #ccc;">
<tr style="border-bottom: 1px solid #ccc;">
<td>
<label>Deposit Type: </label>
</td>
@ -695,32 +682,32 @@
</td>
<td width="20%" class="amount-info">
<table width="100%;" border="1" cellspacing="0 " cellpadding="0 ">
<table width="100%;" border="1" cellspacing="2 " cellpadding="2">
<tr>
<td style="font-weight: bold;">
<h2>Reference NO:<span><asp:Label ID="controlNo1" runat="server"></asp:Label></span></h2>
</td>
</tr>
<tr>
<td>
<p>
<td style="padding: 5px;">
<p style="padding: 3px;">
<asp:Label ID="createdBy1" runat="server"></asp:Label>
</p>
<p>
<span>
<span style="padding: 3px;">
<asp:Label ID="approvedDate1" runat="server"></asp:Label></span>
</p>
</td>
</tr>
<tr>
<td>
<td style="padding: 5px;">
<p>Collect Amount</p>
<h3><span>
<asp:Label ID="cAmt1" runat="server"></asp:Label></span></h3>
</td>
</tr>
<tr>
<td>
<td style="padding: 5px;">
<p>Service Charge</p>
<p>
<span>
@ -729,7 +716,7 @@
</td>
</tr>
<tr>
<td>
<td style="padding: 5px;">
<p>Transfer Amount</p>
<p>
<span>
@ -738,7 +725,7 @@
</td>
</tr>
<tr>
<td>
<td style="padding: 5px;">
<p>Exchange Rate</p>
<p>
<span>
@ -747,19 +734,22 @@
</td>
</tr>
<tr>
<td>
<td style="padding: 5px;">
<p>Payout Amount</p>
<h3><span>
<asp:Label ID="pAmt1" runat="server"></asp:Label></span></h3>
</td>
</tr>
<tr>
<td>
<p>Serial:<span><asp:Label ID="serial2" runat="server"></asp:Label></span></p>
<td style="padding: 5px;">
<p>
Serial:<span>
<asp:Label ID="serial2" runat="server"></asp:Label></span>
</p>
</td>
</tr>
<tr style="display: none;">
<td>
<td style="padding: 5px;">
<p>Deposit Type</p>
<p>
<span>
@ -775,34 +765,23 @@
<td colspan="2">
<table width="100%;" style="border: 1px solid #ccc; padding: 5px; min-height: 100px;">
<tr valign="top" style="height: 90px; display: none;">
<%--<td colspan="4" style="padding: 5px;">
<p>
(1) I understand and agree to the Terms and Conditions of JME on its website.<br />
(2) I declare the information above is true and correct.<br />
(3) I confirm that<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- This request has nothing to do with Democratic People's Republic of Korea (DPRK) and Iran;<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- I have no relation to Ani-Social Forces;and<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- I do not engage in any illegal activities;
<br />
</p>
</td>--%>
<td>
This is the digital copy generated from the system hence no signature is required. Please do contact IME London for further information.
<td>This is the digital copy generated from the system hence no signature is required. Please do contact IME London for further information.
</td>
</tr>
<tr class="bottom-box" style="min-height: 100px;">
<td colspan="2" style="padding: 5px; width: 50%; text-align: center;" class="print-gray">
<span style="font-size: 25px;">Company Stamp</span>
<img src="../../Images/ime-london-logo-receipt.png" style="padding-bottom: 5px; padding-right: 5px; height: 115px; width: 125px;" />
</td>
<td style="vertical-align: bottom; padding-bottom:5px;">
<td style="vertical-align: bottom; padding-bottom: 5px;">
<label>Operator:(<asp:Label ID="operator2" runat="server"></asp:Label>)</label>
</td>
<td style="vertical-align: bottom; padding-bottom:10px;">..................................................
<td style="vertical-align: bottom; padding-bottom: 10px;">..................................................
</td>
</tr>
<%--<tr>
<td colspan="4">&nbsp;</td>
</tr>--%>
</table>
</td>
</tr>

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

@ -97,7 +97,7 @@ namespace Swift.web.AgentNew.SendTxn
pAmt.Text = GetStatic.ShowDecimal(sRow["pAmt"].ToString()) + "&nbsp" + sRow["payoutCurr"].ToString();
depositType.Text = sRow["collMode"].ToString();
depositType1.Text = sRow["collMode"].ToString();
operator1.Text = sRow["createdBy"].ToString();
//operator1.Text = sRow["createdBy"].ToString();
//for second from
//Load Sender Information
@ -152,20 +152,20 @@ namespace Swift.web.AgentNew.SendTxn
{
FullName _fullNameS = GetStatic.ParseName(sRow["senderName"].ToString());
FullName _fullNameR = GetStatic.ParseName(sRow["receiverName"].ToString());
string controlNo = sRow["controlNo"].ToString();
string sms = "";
if (sRow["paymentMethod"].ToString().ToLower() == "bank deposit")
{
FullName _bankName = GetStatic.ParseName(sRow["pBankName"].ToString());
sms += "Dear Mr/Ms " + _fullNameS.FirstName + ", your money sent to account of Mr/Ms " + _fullNameR.FirstName + " in ";
sms += _bankName.FirstName + "... Bank. Amt sent: JPY " + GetStatic.ShowWithoutDecimal(sRow["cAmt"].ToString());
sms += ", Deposit Amt " + sRow["payoutCurr"].ToString() + " " + GetStatic.ShowWithoutDecimal(sRow["pAmt"].ToString()) + ". Thank you-JME.";
sms += "Dear " + _fullNameS.FirstName + ", Your TXN with Reference Number " + controlNo + " has been completed. Your Receiver account will be credited within 1 Workhing Hour.";
sms += "\nThank you!";
}
else
{
sms += "Dear Mr/Ms " + _fullNameS.FirstName + ", your money sent to Mr/Ms " + _fullNameR.FirstName + ". Amt sent: JPY ";
sms += GetStatic.ShowWithoutDecimal(sRow["cAmt"].ToString()) + ", Payout Amt " + sRow["payoutCurr"].ToString() + " " + GetStatic.ShowWithoutDecimal(sRow["pAmt"].ToString()) + ". PIN NO: " + sRow["controlNo"].ToString() + ". Thank you-JME.";
sms += "Dear " + _fullNameS.FirstName + ", Your TXN with Reference Number " + controlNo + " has been completed. Your Receiver can now collect the transaction within 10 minutes from any IME London Agent.";
sms += "\nThank you!";
}
return sms;

9
Swift.web/AgentNew/SendTxn/SendIntlReceipt.aspx.designer.cs
View File

@ -320,15 +320,6 @@ namespace Swift.web.AgentNew.SendTxn
/// </remarks>
protected global::System.Web.UI.WebControls.Label depositType;
/// <summary>
/// operator1 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 operator1;
/// <summary>
/// divInvoiceSecond control.
/// </summary>

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

@ -893,6 +893,16 @@
<td colspan="2" rowspan="4">
<span id="spnPayoutLimitInfo" style="color: red; font-size: 16px; font-weight: bold;"></span></td>
</tr>
<tr>
<td>Reward Amount:
</td>
<td>
<asp:HiddenField ID="HiddenField1" runat="server" />
<asp:TextBox ID="txtRewardAmt" runat="server" class="form-control" Width="20%" Style="display: inherit !important;" ></asp:TextBox>
<%-- <asp:Label ID="lblAgentQuota" runat="server" Text="" style="background-color: yellow; font-weight: 600;"></asp:Label>--%>
<asp:Label ID="lblRemainingQuota" runat="server" Text="" style="background-color: yellow; font-weight: 600;"></asp:Label>
</td>
</tr>
<tr>
<td valign="top">Collection Amount:
<span class="ErrMsg" id='txtCollAmt_err'>*</span>
@ -936,9 +946,8 @@
<td>
<asp:Label ID="lblExRate" runat="server" Text="0.00" class="amountLabel"></asp:Label>
<asp:Label ID="lblExCurr" runat="server" Text="" class="amountLabel"></asp:Label>
<asp:Label ID="lblAgentQuota" runat="server" Text="" style="background-color: yellow; font-weight: 600;">Free service charge quota exceeded.</asp:Label>
<%-- <label id="lblRemainingQuota" runat="server" style="background-color: yellow; font-weight: 600;"></label>--%>
<asp:Label ID="lblRemainingQuota" runat="server" Text="" style="background-color: yellow; font-weight: 600;"></asp:Label>
<%-- <asp:Label ID="lblAgentQuota" runat="server" Text="" style="background-color: yellow; font-weight: 600;"></asp:Label>
<asp:Label ID="lblRemainingQuota" runat="server" Text="" style="background-color: yellow; font-weight: 600;"></asp:Label>--%>
</td>
</tr>
</table>
@ -1756,6 +1765,78 @@
}
}
function SearchReceiverDetails(customerId) {
if (customerId == "" || customerId == null) {
ClearReceiverData();
alert('Invalid receiver selected!');
}
var dataToSend = { MethodName: 'SearchReceiver', customerId: customerId };
$.post('<%=ResolveUrl("SendV2.aspx") %>?x=' + new Date().getTime(), dataToSend, function (response) {
ParseResponseForReceiverData(response);
}).fail(function () {
});
return true;
}
function ParseResponseForReceiverData(response) {
ClearTxnData();
$('.readonlyOnReceiverSelect').attr("disabled", "disabled");
var data = jQuery.parseJSON(response);
CheckSession(data);
if (data[0].errorCode != "0") {
alert(data[0].msg);
return;
}
if (data.length > 0) {
debugger
//****Transaction Detail****
$("#receiverName").text(data[0].firstName + ' ' + data[0].middleName + ' ' + data[0].lastName1);
$("#<%=txtRecFName.ClientID %>").val(data[0].firstName);
$("#<%=txtRecMName.ClientID %>").val(data[0].middleName);
$("#<%=txtRecLName.ClientID %>").val(data[0].lastName1);
$("#<%=txtRecAdd1.ClientID %>").val(data[0].address);
$("#<%=txtRecCity.ClientID %>").val(data[0].city);
$("#<%=txtRecMobile.ClientID %>").val(data[0].mobile);
$("#<%=txtRecTel.ClientID %>").val(data[0].homePhone);
$("#<%=txtRecIdNo.ClientID %>").val(data[0].idNumber);
$("#<%=txtRecEmail.ClientID %>").val(data[0].email);
$("#<%=ddlRecGender.ClientID %>").val(data[0].gender);
SetDDLValueSelected("<%=ddlRecIdType.ClientID %>", data[0].idType);
SetDDLTextSelected("<%=ddlRecGender.ClientID %>", data[0].gender);
SetDDLValueSelected("<%=ddlReceiver.ClientID %>", data[0].receiverId);
if ($.isNumeric(data[0].purposeOfRemit)) {
SetDDLValueSelected("<%=purpose.ClientID %>", data[0].purposeOfRemit);
} else {
SetDDLTextSelected("<%=purpose.ClientID %>", data[0].purposeOfRemit);
}
if ($.isNumeric(data[0].relationship)) {
SetDDLValueSelected("<%=relationship.ClientID %>", data[0].relationship);
} else {
SetDDLTextSelected("<%=relationship.ClientID %>", data[0].relationship);
}
//****Transaction Detail****
SetDDLValueSelected("<%=pCountry.ClientID%>", data[0].COUNTRYID);
PcountryOnChange('c', data[0].paymentMethod.toUpperCase(), data[0].bankId);
//select bank branch
//if (data[0].paymentMethod.toUpperCase() == 'BANK DEPOSIT') {
// var isBranchByName = 'N';
// var branch = '';
//}
PopulateBankDetails(data[0].bankId, 2, 'N', data[0].branchId);
SetPayCurrency(data[0].COUNTRYID);
PAgentChange();
$('#<%=txtRecDepAcNo.ClientID%>').val(data[0].receiverAccountNo);
ManageHiddenFields(data[0].paymentMethod.toUpperCase());
$(".readonlyOnCustomerSelect").attr("disabled", "disabled");
$("#txtpBranch_aValue").val('');
$("#txtpBranch_aText").val('');
$('#<%=lblRemainingQuota.ClientID%>').text('Reward Amount: ' + data[0].rewardPoints);
<%--if ($("#<%=pCountry.ClientID%> option:selected ").val() != "") {
PcountryOnChange('c', "");
SetPayCurrency($("#<%=pCountry.ClientID%>").val());
}--%>
ManageLocationData();
}
}
$(document).ready(function () {
$("#" + mId + "lblLoyaltyFreeSc").hide();
$("#" + mId + "lblAgentQuota").hide();
@ -2090,6 +2171,7 @@
$('#<%=customerRateFields.ClientID%>').hide();
var paymentOption = $('#ContentPlaceHolder1_ddlPaymentOption option:selected').text();
$(window).focus(function () {
if ($('#confirmHidden').val() != '') {
var id = $('#confirmHidden').val();
@ -2107,6 +2189,12 @@
}
else {
ClearAllCustomerInfo();
if (paymentOption == "DEBIT_CARD") {
var url = '@ConfigurationManager.AppSettings["trustpaymentCallback"]';
//var id = HttpUtility.UrlDecode(WebUtils.EncryptString(res[2]));
//var cn = HttpUtility.UrlDecode(WebUtils.EncryptString(res[3]));
window.location.replace(url + "?id=" + res[2] + "&cn=" + res[3]);
}
window.location.replace("/AgentNew/SendTxn/SendIntlReceipt.aspx?controlNo=" + res[2] + "&invoicePrint=" + res[3]);
}
}

20
Swift.web/AgentNew/SendTxn/SendV2.aspx.cs
View File

@ -49,6 +49,7 @@ namespace Swift.web.AgentNew.SendTxn
_sdd.CheckSession();
GetStatic.PrintMessage(Page);
txtCollAmt.Attributes.Add("onkeyup", "return CalcOnEnter((event?event:evt));");
txtRewardAmt.Attributes.Add("onkeyup", "return CalcOnEnter((event?event:evt));");
string reqMethod = Request.Form["MethodName"];
if (!string.IsNullOrEmpty(reqMethod))
{
@ -214,9 +215,9 @@ namespace Swift.web.AgentNew.SendTxn
case "insertAddDocLog":
InsertAdditionalDocumentLog();
break;
case "checkAgentQuota":
CheckAgentQuota();
break;
//case "checkAgentQuota":
// CheckAgentQuota("customerId");
// break;
}
#endregion Ajax methods
@ -1047,7 +1048,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..");
_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)
@ -1180,8 +1181,8 @@ namespace Swift.web.AgentNew.SendTxn
exRate.CalcBy = Request.Form["calcBy"];
exRate.ProviderId = Request.Form["payoutPartner"];
exRate.Introducer = Request.Form["introducerTxt"];
exRate.TpExRate = Request.Form["tpExRate"]; ;
//if (string.IsNullOrEmpty(exRate.Introducer))
exRate.TpExRate = Request.Form["tpExRate"];
exRate.RewardAmt = Request.Form["rewardAmt"];
//{
// DataTable errTbl = new DataTable();
// DataColumn dCol1 = new DataColumn("ErrCode", typeof(System.String));
@ -1239,6 +1240,7 @@ namespace Swift.web.AgentNew.SendTxn
, exRate.PCurrency
, exRate.CalcBy
, exRate.Introducer
, exRate.RewardAmt
, exRate.ProviderId
);
}
@ -1264,6 +1266,7 @@ namespace Swift.web.AgentNew.SendTxn
, GetStatic.GetSessionId()
, exRate.ForexSessionId
, exRate.TpExRate
, exRate.RewardAmt
, Request.Form["isManualSc"]
, exRate.ManualSc
, exRate.CalcBy
@ -1277,9 +1280,10 @@ namespace Swift.web.AgentNew.SendTxn
Response.End();
}
private void CheckAgentQuota()
private void CheckAgentQuota(string customerId)
{
var dt = st.GetAgentQuota(GetStatic.GetUser());
var custId = Request.Form["customerId"];
var dt = st.GetAgentQuota(custId);
Response.ContentType = "text/plain";
var json = DataTableToJson(dt);
Response.Write(json);

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

@ -1256,6 +1256,33 @@ namespace Swift.web.AgentNew.SendTxn
/// </remarks>
protected global::Swift.web.Component.AutoComplete.SwiftTextBox introducerTxt;
/// <summary>
/// HiddenField1 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.HiddenField HiddenField1;
/// <summary>
/// txtRewardAmt 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.TextBox txtRewardAmt;
/// <summary>
/// lblRemainingQuota 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 lblRemainingQuota;
/// <summary>
/// txtCollAmt control.
/// </summary>
@ -1373,24 +1400,6 @@ namespace Swift.web.AgentNew.SendTxn
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblExCurr;
/// <summary>
/// lblAgentQuota 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 lblAgentQuota;
/// <summary>
/// lblRemainingQuota 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 lblRemainingQuota;
/// <summary>
/// depositedBankDDL control.
/// </summary>

2
Swift.web/AgentNew/Transaction/ApproveAgentTransaction/SendMoneyRequest.aspx.cs
View File

@ -243,6 +243,7 @@ namespace Swift.web.AgentNew.Transaction.ApproveAgentTransaction
exRate.ForexSessionId = Request.Form["couponId"];
exRate.IsManualSc = (Request.Form["isManualSc"] == "N" ? false : true);
exRate.ManualSc = Request.Form["sc"];
exRate.RewardAmt = Request.Form["discount"];
if (exRate.isExRateCalcByPartner)
{
@ -306,6 +307,7 @@ namespace Swift.web.AgentNew.Transaction.ApproveAgentTransaction
, "N"
, "N"
,""
,exRate.RewardAmt
);
}

23
Swift.web/AgentNew/js/SendTxn/sendTxnInfo.js
View File

@ -190,8 +190,10 @@ function ClearTxnData() {
}
function CalculateTxn(amt, obj, isManualSc) {
debugger
var agentUser = $("#" + mId + "hddTxnRequestFromAgent").val();
CheckAgentQuota(agentUser);
checkPaymentOption();
//alert($('#ContentPlaceHolder1_branch').val());
if (isManualSc === undefined) {
if ($("#" + mId + "editServiceCharge").is(':checked')) {
@ -211,7 +213,7 @@ function CalculateTxn(amt, obj, isManualSc) {
//}
var discount = $("#" + mId + "txtRewardAmount").val();
var rewardAmt = $("#" + mId + "txtRewardAmt").val();
var partnerId = $("#" + mId + "ddlPayoutPartner").val();
// alert(partnerId);
var quota = $("#" + mId + "hdnQuota").val();
@ -398,7 +400,7 @@ function CalculateTxn(amt, obj, isManualSc) {
, 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, tpExRate: tpExRate, discount: discount
, payerName: payerName, tpExRate: tpExRate, rewardAmt: rewardAmt
};
var options =
@ -416,6 +418,17 @@ function CalculateTxn(amt, obj, isManualSc) {
$("#DivLoad").hide();
return true;
}
function checkPaymentOption() {
var paymentOption = $("#" + mId + "ddlPaymentOption option:selected").text().toLowerCase();
if (paymentOption === '' || paymentOption === undefined || paymentOption === 'select') {
$("#" + mId + "ddlPaymentOption").focus().css('outline', '2px solid red');
alert('Please select Payment Option and Calculate again!');
return false;
}
else {
$("#" + mId + "ddlPaymentOption").css('outline', '');
}
}
//function CheckAgentQuota(agentUser) {
function CheckAgentQuota() {
debugger
@ -715,7 +728,6 @@ function SendTransactionMethod() {
var customerTotalAmt = GetValue("txtCustomerLimit");
var payAmt = GetValue(mId + "txtPayAmt");
var scharge = $("#" + mId + "lblServiceChargeAmt").val();
var rewardAmt = GetValue(mId + "txtRewardAmt");
var discount = $('#lblDiscAmt').text();
var handling = "0";
var exRate = $("#" + mId + "lblExRate").text();
@ -922,6 +934,7 @@ function SendTransactionMethod() {
var portOfShipment = $("#" + mId + "portOfShipment").val();
var calcOriginalSc = $("#" + mId + "hdnCalcOriginalSc").val();
var paymentOption = $("#" + mId + "ddlPaymentOption option:selected").text().replace("Select", "");
var rewardAmt = $("#" + mId + "txtRewardAmt").val();
var url = "Confirm.aspx?senderId=" + senderId +
"&sfName=" + sfName +
"&smName=" + smName +
@ -976,7 +989,6 @@ function SendTransactionMethod() {
"&payAmt=" + FilterString(payAmt) +
"&sendAmt=" + FilterString(sendAmt) +
"&scharge=" + FilterString(scharge) +
"&rewardAmt=" + FilterString(rewardAmt) +
"&customerTotalAmt=" + FilterString(customerTotalAmt) +
"&discount=" + FilterString(discount) +
"&scDiscount=" + FilterString(scDiscount) +
@ -1034,7 +1046,8 @@ function SendTransactionMethod() {
"&sCustLocationText=" + sCustLocationText +
"&nameAsPerBank=" + nameAsPerBank +
"&calcOriginalSc=" + calcOriginalSc +
"&paymentOption=" + paymentOption;
"&paymentOption=" + paymentOption +
"&rewardAmt=" + rewardAmt;
var param = "dialogHeight:900px;dialogWidth:900px;dialogLeft:200;dialogTop:100;center:yes";

2
Swift.web/AgentPanel/International/SendMoney/Send.aspx.cs
View File

@ -717,6 +717,7 @@ namespace Swift.web.AgentPanel.International.SendMoney
var senderId = Request.Form["senderId"];
var schemeCode = Request.Form["schemeCode"];
var couponId = Request.Form["couponId"];
var rewardAmt = Request.Form["rewardAmt"];
var dt = st.GetExRate(GetStatic.GetUser()
, GetStatic.GetCountryId()
@ -735,6 +736,7 @@ namespace Swift.web.AgentPanel.International.SendMoney
, ""
, GetStatic.GetSessionId()
, couponId
, rewardAmt
, "");
Response.ContentType = "text/plain";

2
Swift.web/AgentPanel/International/SendMoney/SendV2.aspx.cs
View File

@ -724,6 +724,7 @@ namespace Swift.web.AgentPanel.International.SendMoney
var senderId = Request.Form["senderId"];
var schemeCode = Request.Form["schemeCode"];
var couponId = Request.Form["couponId"];
var rewardAmt = Request.Form["rewardAmt"];
var dt = st.GetExRate(GetStatic.GetUser()
, GetStatic.GetCountryId()
@ -742,6 +743,7 @@ namespace Swift.web.AgentPanel.International.SendMoney
, ""
, GetStatic.GetSessionId()
, couponId
, rewardAmt
, "");
Response.ContentType = "text/plain";

2
Swift.web/AgentPanel/International/SendMoneyv2/SendV2.aspx.cs
View File

@ -918,6 +918,7 @@ namespace Swift.web.AgentPanel.International.SendMoneyv2
var couponId = Request.Form["couponId"];
var isManualSc = Request.Form["isManualSc"];
var sc = Request.Form["sc"];
var rewardAmt = Request.Form["rewardAmt"];
dt = st.GetExRate(GetStatic.GetUser()
, GetStatic.GetCountryId()
@ -935,6 +936,7 @@ namespace Swift.web.AgentPanel.International.SendMoneyv2
, senderId
, GetStatic.GetSessionId()
, couponId
, rewardAmt
, isManualSc
, sc);

2
Swift.web/AgentPanel/International/SendOnBehalf/SendV2.aspx.cs
View File

@ -917,6 +917,7 @@ namespace Swift.web.AgentPanel.International.SendOnBehalf
var couponId = Request.Form["couponId"];
var isManualSc = Request.Form["isManualSc"];
var sc = Request.Form["sc"];
var rewardAmt = Request.Form["rewardAmt"];
dt = st.GetExRate(GetStatic.GetUser()
, GetStatic.GetCountryId()
@ -934,6 +935,7 @@ namespace Swift.web.AgentPanel.International.SendOnBehalf
, senderId
, GetStatic.GetSessionId()
, couponId
, rewardAmt
, isManualSc
, sc);

2
Swift.web/AgentPanel/Send/SendTransaction/Send.aspx.cs
View File

@ -723,6 +723,7 @@ namespace Swift.web.AgentPanel.Send.SendTransactionIRH
var senderId = Request.Form["senderId"];
var schemeCode = Request.Form["schemeCode"];
var couponId = Request.Form["couponId"];
var rewardAmt = Request.Form["rewardAmt"];
var dt = st.GetExRate(GetStatic.GetUser()
, GetStatic.GetCountryId()
@ -741,6 +742,7 @@ namespace Swift.web.AgentPanel.Send.SendTransactionIRH
, ""
, GetStatic.GetSessionId()
, couponId
, rewardAmt
, "");
Response.ContentType = "text/plain";

4
Swift.web/DashboardV2/Dashboard2.aspx.cs
View File

@ -255,8 +255,8 @@ namespace Swift.web.DashboardV2
{
data.ComplianceData = new ComplianceData
{
OFACComplianceTxns = Convert.ToString(ds.Tables[1].Rows[0]["Count"]),
OFACComplianceMobileTxnsKycLater = Convert.ToString(ds.Tables[1].Rows[1]["Count"]),
OFACComplianceMobileTxnsKycLater = Convert.ToString(ds.Tables[1].Rows[0]["Count"]),
OFACComplianceTxns = Convert.ToString(ds.Tables[1].Rows[1]["Count"]),
// OFACComplianceMobileTxnsKycNow = Convert.ToString(ds.Tables[1].Rows[2]["Count"])
};
}

62
Swift.web/Payment/STPaymentCustomerRedirect.aspx
View File

@ -52,46 +52,52 @@
</div>
<form runat="server" id="from">
<asp:HiddenField ID="sitereference" runat="server" />
<input type="hidden" name="stprofile" value="default"/>
<input type="hidden" name="currencyiso3a" value="GBP"/>
<input type="hidden" name="mainamount" id="mainamount" runat="server"/>
<input type="hidden" name="version" value="2"/>
<asp:HiddenField ID="sitereference" runat="server" />
<input type="hidden" name="stprofile" value="default" />
<input type="hidden" name="currencyiso3a" value="GBP" />
<input type="hidden" name="mainamount" id="mainamount" runat="server" />
<input type="hidden" name="version" value="2" />
<asp:HiddenField ID="orderreference" runat="server" />
<input type="hidden" name="request_source" value="ORM"/>
<input type="hidden" name="billingfirstname" id="billingfirstname" runat="server"/>
<input type="hidden" name="billinglastname" id="billinglastname" runat="server"/>
<input type="hidden" name="billingstreet" id="billingstreet" runat="server"/>
<input type="hidden" name="customerpremise" id="customerpremise" runat="server"/>
<input type="hidden" name="customerstreet" id="customerstreet" runat="server"/>
<input type="hidden" name="billingpostcode" id="billingpostcode" runat="server"/>
<input type="hidden" name="customerpostcode" id="customerpostcode" runat="server"/>
<input type="hidden" name="billingtown" id="billingtown" runat="server"/>
<input type="hidden" name="customertown" id="customertown" runat="server"/>
<input type="hidden" name="billingcountryiso2a" value="GB"/>
<input type="hidden" name="customercountryiso2a" value="GB"/>
<input type="hidden" name="billingtelephone" id="billingtelephone" runat="server"/>
<input type="hidden" name="customertelephone" id="customertelephone" runat="server"/>
<input type="hidden" name="billingemail" id="billingemail" runat="server"/>
<input type="hidden" name="customeremail" id="customeremail" runat="server"/>
<input type="hidden" name="customertelephonetype" value="M"/>
<input type="hidden" name="ruleidentifier" value="STR-6"/>
<input type="hidden" name="request_source" value="ORM" />
<input type="hidden" name="billingfirstname" id="billingfirstname" runat="server" />
<input type="hidden" name="billinglastname" id="billinglastname" runat="server" />
<input type="hidden" name="billingstreet" id="billingstreet" runat="server" />
<input type="hidden" name="customerpremise" id="customerpremise" runat="server" />
<input type="hidden" name="customerstreet" id="customerstreet" runat="server" />
<input type="hidden" name="billingpostcode" id="billingpostcode" runat="server" />
<input type="hidden" name="customerpostcode" id="customerpostcode" runat="server" />
<input type="hidden" name="billingtown" id="billingtown" runat="server" />
<input type="hidden" name="customertown" id="customertown" runat="server" />
<input type="hidden" name="billingcountryiso2a" value="GB" />
<input type="hidden" name="customercountryiso2a" value="GB" />
<input type="hidden" name="billingtelephone" id="billingtelephone" runat="server" />
<input type="hidden" name="customertelephone" id="customertelephone" runat="server" />
<input type="hidden" name="billingemail" id="billingemail" runat="server" />
<input type="hidden" name="customeremail" id="customeremail" runat="server" />
<input type="hidden" name="customertelephonetype" value="M" />
<input type="hidden" name="ruleidentifier" value="STR-6" />
<input type="hidden" runat="server" id="successfulurlredirect" name="successfulurlredirect" />
<input type="hidden" runat="server" id="declinedurlredirect" name="declinedurlredirect" />
<!--Sends email confirmation to the customer, following successful transaction:-->
<input type="hidden" name="ruleidentifier" value="STR-2" />
<!--Sends email confirmation to the customer, following declined transaction:-->
<input type="hidden" name="ruleidentifier" value="STR-3" />
<asp:HiddenField ID="sitesecuritytimestamp" runat="server" />
<asp:HiddenField ID="sitesecurity" runat="server" />
<%-- <input type="hidden" name="sitesecuritytimestamp" value="2023-09-14 15:13:04">
<input type="hidden" name="sitesecurity" value="hb180e83d1a161c4dd32c2fccd368b77a85679563d3ac20f85bbe4ae65bc39f01">--%>
<%-- <input type="hidden" name="ruleidentifier" value="STR-4"/>--%>
<%-- <input type="hidden" name="ruleidentifier" value="STR-4"/>--%>
<!--Sends email confirmation to the merchant, following declined transaction:-->
<%--<input type="hidden" name="ruleidentifier" value="STR-5">--%>
<input type="hidden" name="merchantemail" runat="server" id="merchantemail" value="shakun@japanremit.com"/>
<input type="hidden" name="merchantemail" runat="server" id="merchantemail" value="shakun@japanremit.com" />
<asp:Button ID="btnSubmit" UseSubmitBehavior="true" runat="server" />

3
Swift.web/Payment/STPaymentCustomerRedirect.aspx.cs
View File

@ -79,6 +79,9 @@ namespace Swift.web.Payment
billingtelephone.Value = customertelephone.Value = Convert.ToString(dt.Rows[0]["mobile"]);
billingemail.Value = customeremail.Value = Convert.ToString(dt.Rows[0]["email"]);
successfulurlredirect.Value = GetStatic.ReadWebConfig("sitesuccessfulurlredirect", "");
declinedurlredirect.Value = GetStatic.ReadWebConfig("sitedeclinedurlredirect", "");
merchantemail.Value= GetStatic.ReadWebConfig("merchantemail", "");

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

@ -7,6 +7,7 @@
<link href="../css/currency-flags.min.css" rel="stylesheet" />
<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>
<link href="../Bootstrap/css/font-awesome.min.css" rel="stylesheet" />
<style>
body {
margin-top: 20px;
@ -29,12 +30,22 @@
}
.table-condensed {
font-size: 18px;
font-size: 26px;
}
.receipt
{
font-size: 20px !important;
.receipt {
font-size: 24px !important;
}
.success-icon {
color: #fff;
font-size: 20px;
width: 30px;
height: 30px;
line-height: 30px;
border-radius: 50%;
background-color: #08b236;
display: inline-block;
text-align: center;
}
</style>
@ -155,16 +166,26 @@
<div class="card-body p-2">
<asp:HiddenField ID="hdnorderreference" runat="server" />
<table class="table no-border table-condensed" style="text-align: center;">
<tr>
<td style="text-align: center;">
<i class="fa fa-check success-icon"></i>
</td>
</tr>
<tr>
<td>
<strong>Your payment has been sucessfully received.</strong>
</td>
</tr>
<tr>
<td>
<strong>Status:</strong>
<strong>Transaction Status:</strong>
<asp:Label ID="lblStatusDetail" runat="server"></asp:Label>
<%--<span id="lblStatusDetail" runat="server"></span>--%>
</td>
</tr>
<tr>
<td style="font-size: 18px;">
<strong>Amount :</strong>
<td >
<strong>Total Payout Amount :</strong>
<asp:Label ID="lblAmount" runat="server"></asp:Label>
<%--<span id="lblAmount" runat="server"></span>--%>
</td>

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

@ -14,8 +14,8 @@
<link href="/ui/css/style.css" type="text/css" rel="stylesheet" />
<link href="/js/jQuery/jquery.gritter.css" rel="stylesheet" type="text/css" />
<link href="/ui/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
<link href="/AgentNew/css/signature-pad.css" rel="stylesheet" />
<link href="/AgentNew/css/Document.css" rel="stylesheet" />
<link href="../../../AgentNew/css/signature-pad.css" rel="stylesheet" />
<link href="../../../AgentNew/css/Document.css" rel="stylesheet" />
<link href="/js/jQuery/jquery-ui.css" rel="stylesheet" type="text/css" />
<script src="/ui/js/jquery.min.js"></script>
<script src="/ui/bootstrap/js/bootstrap.min.js"></script>
@ -52,6 +52,10 @@
.lowercase {
text-transform: lowercase !important;
}
.doc {
height: 300px;
width: 400px
}
</style>
<script type="text/javascript">

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

@ -570,7 +570,7 @@
<th style="width: 3%;">SN.</th>
<th style="width: 8%;">Created Date</th>
<th style="width: 12%;">Receiver Name</th>
<th style="width: 8%;">JME No</th>
<th style="width: 8%;">IME No</th>
<th style="width: 9%;">Collect Amount</th>
<th style="width: 9%;">Service Charge</th>
<th style="width: 10%;">Transfer Amount</th>

1
Swift.web/Remit/Compliance/ApproveOFACandComplaince/List.aspx.cs
View File

@ -44,6 +44,7 @@ namespace Swift.web.Remit.Compliance.ApproveOFACandComplaince
new GridColumn("controlNo", "Control No", "", "T"),
new GridColumn("branchName", "Sending Branch", "", "T"),
new GridColumn("type", "Type", "", "T"),
new GridColumn("createdDate", "Created Date", "", "T"),
new GridColumn("senderName", "Sender Name", "", "T"),
new GridColumn("receiverName", "Receiver Name", "", "T"),
new GridColumn("createdBy", " Email", "", "T"),

17
Swift.web/Remit/Transaction/ApproveTxn/holdTxnList.aspx.cs
View File

@ -102,13 +102,15 @@ namespace Swift.web.Remit.Transaction.ApproveTxn
sb.Append("<th>Tran Id</th>");
sb.Append("<th>PIN No.</th>");
sb.Append("<th>Sending Branch</th>");
sb.Append("<th>Txn Channel</th>");
sb.Append("<th>Country</th>");
sb.Append("<th>Sender</th>");
sb.Append("<th>Receiver</th>");
sb.Append("<th>Payout Amt</th>");
sb.Append("<th>Coll Amt</th>");
sb.Append("<th>Coll.Mode</th>");
sb.Append("<th>Voucher No</th>");
sb.Append("<th>Payment Method</th>");
sb.Append("<th>Payment Option</th>");
//sb.Append("<th>Voucher No</th>");
sb.Append("<th nowrap='nowrap'>Tran Date</th>");
sb.Append("<th>User</th>");
@ -137,14 +139,19 @@ namespace Swift.web.Remit.Transaction.ApproveTxn
sb.Append("<td>" + dr["id"].ToString() + "</td>");
sb.Append("<td>" + dr["controlNo"].ToString() + "</td>");
sb.Append("<td>" + dr["BranchName"].ToString() + "</td>");
sb.Append("<td>" + dr["tranType"].ToString() + "</td>");
sb.Append("<td>" + dr["country"].ToString() + "</td>");
sb.Append("<td>" + dr["sender"].ToString() + "</td>");
sb.Append("<td>" + dr["receiver"].ToString() + "</td>");
sb.Append("<td style=\"font-weight: bold; font-style: italic; text-align: right;\">");
sb.Append(GetStatic.FormatData(dr["pAmt"].ToString(), "M"));
sb.Append("<td style=\"font-weight: bold; font-style: italic; text-align: right;\">");
sb.Append(GetStatic.FormatData(dr["amt"].ToString(), "M"));
sb.Append("<td>" + dr["collMode"].ToString() + "</td>");
sb.Append("<td>" + dr["voucherNo"].ToString() + "</td>");
sb.Append("<td>" + dr["depositType"].ToString() + "</td>");
//sb.Append("<td>" + dr["voucherNo"].ToString() + "</td>");
sb.Append("<td>" + GetStatic.FormatData(dr["txnDate"].ToString(), "D") + "</td>");
sb.Append("<td>" + dr["txncreatedBy"].ToString() + "</td>");

7
Swift.web/Remit/Transaction/ApproveTxn/holdTxnListMobile.aspx.cs
View File

@ -110,6 +110,7 @@ namespace Swift.web.Remit.Transaction.ApproveTxn
sb.Append("<th>Sender</th>");
sb.Append("<th>Receiver</th>");
sb.Append("<th>Email</th>");
sb.Append("<th>Payout Amt</th>");
sb.Append("<th>Coll Amt</th>");
sb.Append("<th>Coll.Mode</th>");
@ -148,6 +149,8 @@ namespace Swift.web.Remit.Transaction.ApproveTxn
sb.Append("<td>" + dr["receiver"].ToString() + "</td>");
sb.Append("<td>" + dr["email"].ToString() + "</td>");
sb.Append("<td style=\"font-weight: bold; font-style: italic; text-align: right;\">");
sb.Append(GetStatic.FormatData(dr["pAmt"].ToString(), "M"));
sb.Append("<td style=\"font-weight: bold; font-style: italic; text-align: right;\">");
sb.Append(GetStatic.FormatData(dr["amt"].ToString(), "M"));
sb.Append("<td>" + dr["collMode"].ToString() + "</td>");
@ -174,8 +177,8 @@ namespace Swift.web.Remit.Transaction.ApproveTxn
if (allowApprove)
//sb.Append("&nbsp;<input type = 'button' class='btn btn-primary m-t-25' onclick = \"ViewDetails(" + dr["id"].ToString() + ");\" value = 'Approve' id = 'btn_" + dr["id"].ToString() + "' showDocPanel = 'N' />");
sb.Append("&nbsp;<input type='button' class='btn btn-primary m-t-25' onclick=\"window.location.href='Manage.aspx?id=" + dr["id"].ToString() + "&showDocPanel=N';\" value='Approve' id='btn_" + dr["id"].ToString() + "' showDocPanel='N' />");
if (allowReject)
sb.Append("&nbsp;<input type = 'button' class='btn btn-primary m-t-25' onclick = \"Reject(" + dr["id"].ToString() + ");\" value = 'Reject' id = 'btn_r_" + dr["id"].ToString() + "' />");
// sb.Append("&nbsp;<input type = 'button' class='btn btn-primary m-t-25' onclick = \"Reject(" + dr["id"].ToString() + ");\" value = 'Reject' id = 'btn_r_" + dr["id"].ToString() + "' />");
sb.Append("</td>");
}

46
Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs
View File

@ -71,7 +71,10 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
{
string currentPayoutPartner = string.Empty;
bool isFirstRow = true;
int[] totalAmountIndexes = { 14, 16, 18, 20, 22 };
decimal[] totalAmounts = new decimal[cols];
Array.Clear(totalAmounts, 0, totalAmounts.Length);
foreach (DataRow dr in dt.Rows)
{
string payoutPartner = dr["PAYOUT_PARTNER"].ToString();
@ -80,7 +83,21 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
{
if (!isFirstRow)
{
str.Append("</table>");
str.Append("<tr>");
str.Append("<td align=\"left\"><b>Total</b></td>");
for (int i = 1; i < cols; i++)
{
if (totalAmountIndexes.Contains(i))
{
str.Append("<td align=\"left\">" + totalAmounts[i] + "</td>");
totalAmounts[i] = 0; // Reset totalAmount for the new partner
}
else
{
str.Append("<td align=\"left\"></td>");
}
}
str.Append("</tr>");
}
str.Append("<h3><b>Payout Partner: " + payoutPartner + "</b></h3>");
@ -97,11 +114,34 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
for (int i = 0; i < cols; i++)
{
str.Append("<td align=\"left\">" + dr[i] + "</td>");
if (totalAmountIndexes.Contains(i))
{
decimal currentAmount;
if (decimal.TryParse(dr[i].ToString(), out currentAmount))
{
totalAmounts[i] += currentAmount; // Accumulate total amount for each specific column index
}
}
}
str.Append("</tr>");
}
if (!isFirstRow)
{
str.Append("<tr>");
str.Append("<td align=\"left\"><b>Total</b></td>");
for (int i = 1; i < cols; i++)
{
if (totalAmountIndexes.Contains(i))
{
str.Append("<td align=\"left\">" + totalAmounts[i] + "</td>");
}
else
{
str.Append("<td align=\"left\"></td>");
}
}
str.Append("</tr>");
}
str.Append("</table>");
}
str.Append("</table>");
rpt_grid.InnerHtml = str.ToString();

38
Swift.web/Remit/Transaction/VerifyMobileTransaction/VerifyMobileTransaction.aspx
View File

@ -231,24 +231,25 @@
return false;
}
function Verify(id, cAmt, cAmtByUser, collMode, depositType) {
if (collMode == "Cash Collect") {
if (cAmt != cAmtByUser) {
alert("Collected amount by user and actual amount is not equal!!!");
return
}
//else {
// alert("Do you want to verify cash collect?");
//}
}
if (collMode == "Bank Depsoit") {
if (cAmt > cAmtByUser) {
alert("Bank Deposit amount cannot be less the actual amount!!!");
return
}
//else {
// alert("Do you want to verify bank deposit?");
//}
}
//if (collMode == "Cash Collect") {
// if (cAmt != cAmtByUser) {
// alert("Collected amount by user and actual amount is not equal!!!");
// return
// }
// //else {
// // alert("Do you want to verify cash collect?");
// //}
//}
//if (collMode == "BANK DEPOSIT") {
// if (cAmt > cAmtByUser) {
// alert("Bank Deposit amount cannot be less the actual amount!!!");
// return
// }
// //else {
// // alert("Do you want to verify bank deposit?");
// //}
//}
dataToSend = { MethodName: 'Verify', tranId: id, DepositType:depositType };
if (collMode == "Cash Collect") {
if (confirm('Do you want to verify cash collect?')) {
@ -263,6 +264,7 @@
}
}
if (collMode == "Bank Deposit") {
debugger
if (confirm('Do you want to verify bank deposit?')) {
// if (confirm) {
$.post("", dataToSend, function (response) {

5
Swift.web/Remit/Transaction/VerifyMobileTransaction/VerifyMobileTransaction.aspx.cs
View File

@ -146,9 +146,10 @@ namespace Swift.web.Remit.Transaction.VerifyMobileTransaction
sb.Append("<th>Sender Mobile</th>");
sb.Append("<th>Receiver</th>");
sb.Append("<th>Email</th>");
sb.Append("<th>Payout Amount</th>");
sb.Append("<th>Coll Amt</th>");
sb.Append("<th>Coll.Mode</th>");
sb.Append("<th>Payment Method</th>");
sb.Append("<th nowrap='nowrap'>Tran Date</th>");
sb.Append("<th nowrap='nowrap'>Payment Option</th>");
//sb.Append("<th nowrap='nowrap'>Mapped Detail</th>");
@ -185,6 +186,8 @@ namespace Swift.web.Remit.Transaction.VerifyMobileTransaction
sb.Append("<td>" + dr["receiver"].ToString() + "</td>");
sb.Append("<td>" + dr["email"].ToString() + "</td>");
sb.Append("<td style=\"font-weight: bold; font-style: italic; text-align: right;\">");
sb.Append(GetStatic.FormatData(dr["pAmt"].ToString(), "M"));
sb.Append("<td style=\"font-weight: bold; font-style: italic; text-align: right;\">");
sb.Append(GetStatic.FormatData(dr["amt"].ToString(), "M"));
sb.Append("<td>" + CreateRadioGroup(dr["collMode"].ToString(), dr["id"].ToString(), dr["customerId"].ToString(), dr["cAmt"].ToString(), dr["REFERRAL_DETAIL"].ToString()) + "</td>");

3
Swift.web/Responsive/Send/SendV2.aspx.cs
View File

@ -822,7 +822,7 @@ namespace Swift.web.Responsive.Send.SendMoneyv2
var couponId = Request.Form["couponId"];
var isManualSc = Request.Form["isManualSc"];
var sc = Request.Form["sc"];
var rewardAmt = Request.Form["rewardAmt"];
//if (pCountryFv.ToString() != "151" && pCountryFv.ToString() != "203")
//{
// IMtradeSendAPIDao _mtrade = new MtradeSendAPIDao();
@ -865,6 +865,7 @@ namespace Swift.web.Responsive.Send.SendMoneyv2
, senderId
, GetStatic.GetSessionId()
, couponId
, rewardAmt
, isManualSc
, sc);

Write Preview
Loading…
Cancel
Save