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

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

Ime-london-webcore
shakun 10 months ago
parent
57470d06d3 f7230153da
commit
833bc6ff05
8 changed files with 554 additions and 96 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. 33
      Swift.web/Payment/trans_payment_success.aspx
  2. 525
      Swift.web/Remit/Administration/CustomerRegistration/Manage.aspx
  3. 2
      Swift.web/Remit/Administration/CustomerSetup/CustomerDetails.aspx
  4. 3
      Swift.web/Remit/Compliance/ApproveOFACandComplaince/List.aspx.cs
  5. 17
      Swift.web/Remit/Transaction/ApproveTxn/holdTxnList.aspx.cs
  6. 3
      Swift.web/Remit/Transaction/ApproveTxn/holdTxnListMobile.aspx.cs
  7. 60
      Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs
  8. 7
      Swift.web/Remit/Transaction/VerifyMobileTransaction/VerifyMobileTransaction.aspx.cs

33
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;
@ -32,9 +33,20 @@
font-size: 18px;
}
.receipt
{
font-size: 20px !important;
.receipt {
font-size: 20px !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 +167,27 @@
<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 recieved.</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>
<strong>Total Payout Amount :</strong>
<asp:Label ID="lblAmount" runat="server"></asp:Label>
<%--<span id="lblAmount" runat="server"></span>--%>
</td>

525
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>
@ -49,9 +49,14 @@
font-size: 12px;
color: #FA4345;
}
.lowercase {
.lowercase {
text-transform: lowercase !important;
}
.doc {
height: 300px;
width: 400px
}
</style>
<script type="text/javascript">
@ -127,72 +132,6 @@
}
});
});
$('#reg_front_id').on('change', function (e) {
$('.loadImg').remove();
ValidateExtension('reg_front_id');
// 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="loadImg"><img src="' + tmppath + '" alt=""></span>');
$(".loadImg img").fadeIn("fast");
}
});
// Image upload for back id
$('#reg_back_id').on('change', function (e) {
$('.loadImg1').remove();
ValidateExtension('reg_back_id');
// 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="loadImg1"><img src="' + tmppath + '" alt=""></span>');
$(".loadImg1 img").fadeIn("fast");
}
});
//new
$('#add_id_front').on('change', function (e) {
$('.loadImg2').remove();
ValidateExtension('add_id_front');
// 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="loadImg2"><img src="' + tmppath + '" alt=""></span>');
$(".loadImg2 img").fadeIn("fast");
}
});
$('#add_id_back').on('change', function (e) {
$('.loadImg3').remove();
ValidateExtension('add_id_back');
// 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="loadImg3"><img src="' + tmppath + '" alt=""></span>');
$(".loadImg3 img").fadeIn("fast");
}
});
$('#other_document').on('change', function (e) {
$('.loadImg4').remove();
ValidateExtensionForOtherDoc('other_document');
// 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="loadImg4"><img src="' + tmppath + '" alt=""></span>');
$(".loadImg4 img").fadeIn("fast");
}
});
$('#reg_form').on('change', function (e) {
$('.loadImg5').remove();
ValidateExtensionForOtherDoc('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 () {
$("#<%=verificationTypeNo.ClientID%>").on("change", function () {
@ -278,6 +217,23 @@
}
});
$("#uploadFrontIdDiv").hide();
$("#uploadBackIdDiv").hide();
$("#uploadAdditionalIdDiv").hide();
$("#uploadAdditionalIdDiv2").hide();
$("#editFrontId").click(function () {
$("#uploadFrontIdDiv").show();
});
$("#editBackId").click(function () {
$("#uploadBackIdDiv").show();
});
$("#editAdditionalId").click(function () {
$("#uploadAdditionalIdDiv").show();
});
$("#editAdditionalId2").click(function () {
$("#uploadAdditionalIdDiv2").show();
});
// mobile country code added
$("#<%=mobile.ClientID%>").intlTelInput({
nationalMode: true,
@ -434,10 +390,12 @@
}
function LoadcustomerData() {
debugger
var eid = $('#<%=hdnCustomerId.ClientID%>').val();
dataToSend = { MethodName: 'GetCustomerDetails', Id: eid };
$.post('/Remit/Administration/CustomerRegistration/Manage.aspx', dataToSend, function (response) {
ParseCustomerData(response);
PopulateImage();
//DisableFields();
ChangeOrganisationType();
}).fail(function () {
@ -492,7 +450,7 @@
$("#otherVerificationTypeDiv").hide();
}
$('#<%=hdnRegisterDate.ClientID%>').val(dr[0].createdDate);
$('#<%=verificationTypeNo.ClientID%>').val(dr[0].idNumber);
$('#<%=otherVerificationTypeNo.ClientID%>').val(dr[0].otherIdNumber);
$('#<%=hddVerificationTypeNo.ClientID%>').val(dr[0].idNumber);
@ -627,14 +585,14 @@
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) {
$(".errormsg1").show();
reqField = reqField.replace(",<%=reg_front_id.ClientID%>,", "")
reqField = reqField.replace(",<%=reg_back_id.ClientID%>,", "")
}
}
}--%>
ChangeOrganisationType();
if (ValidRequiredFieldWithDocNewForAdmin(reqField) === false) {
@ -784,7 +742,240 @@
// });
//}
function documentCrop(fileName, cdId, fileType, id) {
var url = "/Remit/Administration/CustomerRegistration/DocumentCrop.aspx?cdId=" + cdId + "&fileType=" + fileType + "&fileName=" + fileName + "&id=" + id;
/* var url = "/Remit/Administration/CustomerRegistration/DocumentCrop.aspx?fileName=" + fileName;*/
var param = "width=825,height=500,resizable=1,status=1,toolbar=0,scrollbars=1,center=1";
PopUpWindow(url, param);
};
function undoCrop(fileName, cdId, fileType, id) {
//debugger;
var customerId = $('#<%=hdnCustomerId.ClientID%>').val();
var registerDate = $('#<%=hdnRegisterDate.ClientID%>').val();
var membershipId = $('#<%=txtMembershipId.ClientID%>').val();
dataToSend = { MethodName: 'undoCrop', customerId: customerId, registerDate: registerDate, membershipId: membershipId, fileName: fileName, cdId: cdId, fileType: fileType };
if (confirm('Are you sure you want to undo your changes?')) {
$.post("", dataToSend, function (response) {
var data = jQuery.parseJSON(response);
if (data.ErrorCode == 0) {
alert(data.Msg);
PopulateImage();
$('#' + id).hide();
} else {
alert(data.Msg);
}
});
}
return false;
};
function PopulateImage(undoId, isCropped) {
debugger;
var dataToSend = {
MethodName: "GetImageUrl",
customerId: $('#<%=hdnCustomerId.ClientID%>').val(),
registerDate: $('#<%=hdnRegisterDate.ClientID%>').val(),
membershipId: $('#<%=txtMembershipId.ClientID%>').val()
<%-- cdid: $('#<%=txtMembershipId.ClientID%>').val(),--%>
};
$.post('', dataToSend, function (response) {
var data = JSON.parse(response);
var json = data.filter(item => item.isEkyc === false);
var url1 = json[0];
var url2 = json[1];
var url3 = json[2];
var url4 = json[3];
//$("#font").attr("src", url1);
//$("#back").attr("src", url2);
if (url1) {
$("#font").attr("src", url1.ImageUrl);
editFrontIdCrop.setAttribute('onclick', 'documentCrop( " ' + url1.FileName + ' ", " ' + url1.CdId + ' " , " ' + url1.FileType + ' ", this.id)');
$('#<%=hdnreg_front_idCdId.ClientID%>').val(url1.FileName + '|' + url1.CdId);
}
if (url2) {
$("#back").attr("src", url2.ImageUrl);
editBackIdCrop.setAttribute('onclick', 'documentCrop( " ' + url2.FileName + ' ", " ' + url2.CdId + ' " , " ' + url2.FileType + ' ", this.id)');
$('#<%=hdnreg_back_id_idCdId.ClientID%>').val(url2.FileName + '|' + url2.CdId);
}
if (undoId == "editFrontIdCrop" && isCropped == "Y") {
$('#undoFrontId').show();
undoFrontId.setAttribute('onclick', 'undoCrop( " ' + url1.FileName + ' ", " ' + url1.CdId + ' " , " ' + url1.FileType + ' ", " ' + undoId + ' ")');
}
if (undoId == "editBackIdCrop" && isCropped == "Y") {
$('#undoBackId').show();
undoBackId.setAttribute('onclick', 'undoCrop( " ' + url2.FileName + ' ", " ' + url2.CdId + ' " , " ' + url2.FileType + ' ", " ' + undoId + ' ")');
}
if (undoId == "editAdditionalIdCrop" && isCropped == "Y") {
$('#undoAdditionalId').show();
undoAdditionalId.setAttribute('onclick', 'undoCrop( " ' + url3.FileName + ' ", " ' + url3.CdId + ' " , " ' + url3.FileType + ' ", " ' + undoId + ' ")');
}
if (undoId == "editAdditionalId2Crop" && isCropped == "Y") {
$('#undoAdditionalId2').show();
undoAdditionalId2.setAttribute('onclick', 'undoCrop( " ' + url4.FileName + ' ", " ' + url4.CdId + ' " , " ' + url4.FileType + ' ", " ' + undoId + ' ")');
}
if (url3) {
// $("#additionalId").attr("src", url3);
$("#additionalId").attr("src", url3.ImageUrl);
editAdditionalIdCrop.setAttribute('onclick', 'documentCrop( " ' + url3.FileName + ' ", " ' + url3.CdId + ' " , " ' + url3.FileType + ' ", this.id)');
$("#divAdditional_id").show();
$('#<%=hdnreg_additional_idCdId.ClientID%>').val(url3.FileName + '|' + url3.CdId);
}
else
$("#divAdditional_id").hide();
if (url4) {
// $("#additionalId2").attr("src", url4);
$("#additionalId2").attr("src", url4.ImageUrl);
editAdditionalId2Crop.setAttribute('onclick', 'documentCrop( " ' + url4.FileName + ' ", " ' + url4.CdId + ' " , " ' + url4.FileType + ' " , this.id )');
$("#divAdditional_id2").show();
$('#<%=hdnreg_additional_id2CdId.ClientID%>').val(url4.FileName + '|' + url4.CdId);
}
else
$("#divAdditional_id2").hide();
debugger;
const filtered = data.filter(item => item.isEkyc === true);
if (filtered != null) {
var selfie = filtered.filter(item => item.DocumentName === "Customer Selfie")[0];
if (selfie) {
$("#customerSelfieDiv").show();
$("#imgselfieId").attr("src", selfie.ImageUrl);
editSelfieCrop.setAttribute('onclick', 'documentCrop( " ' + selfie.FileName + ' ", " ' + selfie.CdId + ' " , " ' + filtered.FileType + ' " , this.id )');
$('#<%=hdn_selfie.ClientID%>').val(selfie.FileName + '|' + selfie.CdId);
if (undoId == "editSelfieCrop" && isCropped == "Y") {
$('#undoeditSelfie').show();
undoeditSelfie.setAttribute('onclick', 'undoCrop( " ' + selfie.FileName + ' ", " ' + selfie.CdId + ' " , " ' + selfie.FileType + ' ", " ' + undoId + ' ")');
}
}
<%--var facePicture = filtered.filter(item => item.DocumentName === "Face Picture")[0];
if (facePicture) {
$("#FacePictureDiv").show();
$("#FacePictureId").attr("src", facePicture.ImageUrl);
editFacePicture.setAttribute('onclick', 'documentCrop( " ' + facePicture.FileName + ' ", " ' + facePicture.CdId + ' " , " ' + facePicture.FileType + ' " , this.id )');
$('#<%=hdn_FacePicture.ClientID%>').val(facePicture.FileName + '|' + facePicture.CdId);
if (undoId == "editFacePicture" && isCropped == "Y") {
$('#undoFacePicture').show();
undoFacePicture.setAttribute('onclick', 'undoCrop( " ' + facePicture.FileName + ' ", " ' + facePicture.CdId + ' " , " ' + facePicture.FileType + ' ", " ' + undoId + ' ")');
}
}--%>
var AdditionalIDFront2 = filtered.filter(item => item.DocumentName === "Additional ID Front 2")[0];
if (AdditionalIDFront2) {
$("#AdditionalIDFront2Div").show();
$("#imgAdditionalIDFront2Id").attr("src", AdditionalIDFront2.ImageUrl);
editAdditionalIDFront2.setAttribute('onclick', 'documentCrop( " ' + AdditionalIDFront2.FileName + ' ", " ' + AdditionalIDFront2.CdId + ' " , " ' + AdditionalIDFront2.FileType + ' " , this.id )');
$('#<%=hdn_AdditionalIDFront2.ClientID%>').val(AdditionalIDFront2.FileName + '|' + AdditionalIDFront2.CdId);
if (undoId == "editAdditionalIDFront2" && isCropped == "Y") {
$('#undoAdditionalIDFront2Div').show();
undoAdditionalIDFront2Div.setAttribute('onclick', 'undoCrop( " ' + AdditionalIDFront2.FileName + ' ", " ' + AdditionalIDFront2.CdId + ' " , " ' + AdditionalIDFront2.FileType + ' ", " ' + undoId + ' ")');
}
}
<%--var IDFrontFeature = filtered.filter(item => item.DocumentName === "ID Front feature")[0];
if (IDFrontFeature) {
$("#IDFrontFeatureDiv").show();
$("#imgIDFrontFeatureId").attr("src", IDFrontFeature.ImageUrl);
editIDFrontFeature.setAttribute('onclick', 'documentCrop( " ' + IDFrontFeature.FileName + ' ", " ' + IDFrontFeature.CdId + ' " , " ' + IDFrontFeature.FileType + ' " , this.id )');
$('#<%=hdn_AdditionalIDFront2.ClientID%>').val(facePicture.FileName + '|' + facePicture.CdId);
if (undoId == "editIDFrontFeature" && isCropped == "Y") {
$('#undoIDFrontFeature').show();
undoIDFrontFeature.setAttribute('onclick', 'undoCrop( " ' + IDFrontFeature.FileName + ' ", " ' + IDFrontFeature.CdId + ' " , " ' + IDFrontFeature.FileType + ' ", " ' + undoId + ' ")');
}
}--%>
}
else {
$("#customerSelfieDiv").hide();
// $("#FacePictureDiv").hide();
$("#AdditionalIDFront2Div").hide();
//$("#IDFrontFeatureDiv").hide();
}
}).fail(function () {
alert('Oops!!! something went wrong, please try again.');
});
}
$(document).ready(function () {
$('#reg_front_id').on('change', function (e) {
$('.loadImg').remove();
// 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="loadImg"><img src="' + tmppath + '" alt=""></span>');
$(".loadImg img").fadeIn("fast");
}
});
})
// Image upload for back id
$('#reg_back_id').on('change', function (e) {
$('.loadImg2').remove();
// 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="loadImg2"><img src="' + tmppath + '" alt=""></span>');
$(".loadImg2 img").fadeIn("fast");
}
});
// Image upload for add back id
$('#add_id_front').on('change', function (e) {
$('.loadImg3').remove();
// 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="loadImg3"><img src="' + tmppath + '" alt=""></span>');
$(".loadImg3 img").fadeIn("fast");
}
});
// Image upload for add back id2
$('#add_back_front').on('change', function (e) {
/* $(this).closest('span').find('.loadImg1').remove();*/
$('.loadImg4').remove();
// 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="loadImg4"><img src="' + tmppath + '" alt=""></span>');
$(".loadImg4 img").fadeIn("fast");
}
});
function ShowImageDetail(id) {
OpenInNewWindow(id.src);
}
</script>
<style>
.intl-tel-input {
width: 100% !important;
@ -1050,7 +1241,7 @@
<div class="col-md-4 col-sm-4">
<div class="form-group">
<label>Address 2:</label>
<asp:TextBox ID="txtAdditionalAddress" runat="server" placeholder="Address 2" CssClass="form-control" />
<asp:TextBox ID="txtAdditionalAddress" runat="server" placeholder="Address 2" CssClass="form-control" />
</div>
</div>
@ -1313,7 +1504,7 @@
</div>
</div>
<div class="row" id="divUploadImage" runat="server">
<%-- <div class="row" id="divUploadImage" runat="server">
<div class="col-md-6">
<div class="form-group">
<label id="lblreg_front_id">
@ -1330,7 +1521,6 @@
</div>
<div class="file-upload" id="front">
<asp:FileUpload ID="reg_front_id" type="file" runat="server" class="uploadbutton required" accept="image/capture" capture="camera" />
<%--<input type="file" name="reg-front-id" id="reg-front-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>
@ -1355,7 +1545,6 @@
</div>
<div class="file-upload" id="back">
<asp:FileUpload ID="reg_back_id" 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>
@ -1367,7 +1556,6 @@
Additional ID Front</label>
<div class="file-upload" id="add_front">
<asp:FileUpload ID="add_id_front" type="file" runat="server" class="uploadbutton" accept="image/capture" capture="camera" />
<%--<input type="file" name="reg-front-id" id="reg-front-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>
@ -1382,7 +1570,6 @@
Additional ID Back</label>
<div class="file-upload" id="add_back">
<asp:FileUpload ID="add_id_back" type="file" runat="server" class="uploadbutton" 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>
@ -1394,7 +1581,6 @@
Other Document (If any)</label>
<div class="file-upload" id="other_doc">
<asp:FileUpload ID="other_document" type="file" runat="server" class="uploadbutton" 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>
@ -1406,13 +1592,185 @@
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 class="row" id="divUploadImage" runat="server">
<div class="panel panel-default clearfix m-b-20">
<div class="panel-heading">Document Information</div>
<div class="panel-body">
<div class="col-md-6">
<div class="form-group">
<label id="lblreg_front_id">
<asp:Localize runat="server" meta:resourcekey="Register_040" Text="ID Front"></asp:Localize></label>
<%--<button id="editFrontId" ="button" class="btn btn-primary" data-action="undo">Edit ID Front</button>--%>
<input type="button" id="editFrontId" class="btn btn-info" value="Edit ID Front" />
<input type="button" id="editFrontIdCrop" class="btn btn-warning" value="Crop" />
<input type="button" id="undoFrontId" style="display: none;" class="btn btn-primary" value="Undo" />
<div>
<label>
<asp:Localize runat="server" meta:resourcekey="Register_041"></asp:Localize></label>
<div class="samp-control">
<img class="doc" onclick="ShowImageDetail(this)" id="font" src="../../../Images/na.gif">
</div>
</div>
</div>
<div id="uploadFrontIdDiv">
<div class="file-upload" id="frontNew">
<asp:FileUpload ID="reg_front_id" type="file" runat="server" class="uploadbutton" accept="image/*" meta:resourcekey="reg_front_idResource1" />
<%--<input type="file" name="reg-front-id" id="reg-front-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 class="col-md-6" id="divreg_back_id">
<div class="form-group">
<label>
<asp:Localize runat="server" meta:resourcekey="Register_045" Text="ID Back"></asp:Localize></label>
<input type="button" id="editBackId" class="btn btn-info" value="Edit Id Back" />
<input type="button" id="editBackIdCrop" class="btn btn-warning" value="Crop" />
<input type="button" id="undoBackId" style="display: none;" class="btn btn-primary" value="Undo" />
<div>
<label>
<asp:Localize runat="server" meta:resourcekey="Register_041"></asp:Localize></label>
<div class="samp-control">
<img class="doc" onclick="ShowImageDetail(this)" id="back" src="../../../Images/na.gif">
</div>
</div>
</div>
<div class="form-group" id="uploadBackIdDiv">
<div class="file-upload" id="backNew">
<asp:FileUpload ID="reg_back_id" type="file" runat="server" class="uploadbutton" accept="image/*" meta:resourcekey="reg_back_idResource1" />
<%--<input type="file" name="reg-back-id" id="reg-back-id" required="required" class="uploadbutton" accept="image/*" />--%>
<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 class="col-md-6" id="divAdditional_id">
<div class="form-group">
<label>
<asp:Localize runat="server" meta:resourcekey="Register_045" Text="Additional ID Front"></asp:Localize></label>
<input type="button" id="editAdditionalId" class="btn btn-info" value="Edit Additional Id Front" />
<input type="button" id="editAdditionalIdCrop" class="btn btn-warning" value="Crop" />
<input type="button" id="undoAdditionalId" style="display: none;" class="btn btn-primary" value="Undo" />
<div>
<label>
<asp:Localize runat="server" meta:resourcekey="Register_041"></asp:Localize></label>
<div class="samp-control">
<img class="doc" onclick="ShowImageDetail(this)" id="additionalId" src="../../../Images/na.gif">
</div>
</div>
</div>
<div class="form-group" id="uploadAdditionalIdDiv">
<div class="file-upload" id="additional_id">
<asp:FileUpload ID="add_id_front" type="file" runat="server" class="uploadbutton" accept="image/*" meta:resourcekey="reg_back_idResource1" />
<%--<input type="file" name="reg-back-id" id="reg-back-id" required="required" class="uploadbutton" accept="image/*" />--%>
<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 class="col-md-6" id="divAdditional_id2">
<div class="form-group">
<label>
<asp:Localize runat="server" meta:resourcekey="Register_045" Text="Additional ID Back"></asp:Localize></label>
<input type="button" id="editAdditionalId2" class="btn btn-info" value="Edit Additional Id Back" />
<input type="button" id="editAdditionalId2Crop" class="btn btn-warning" value="Crop" />
<input type="button" id="undoAdditionalId2" style="display: none;" class="btn btn-primary" value="Undo" />
<div>
<label>
<asp:Localize runat="server" meta:resourcekey="Register_041"></asp:Localize></label>
<div class="samp-control">
<img class="doc" alt="./../../Images/na.gif" onclick="ShowImageDetail(this)" id="additionalId2" src="../../../Images/na.gif">
</div>
</div>
</div>
<div class="form-group" id="uploadAdditionalIdDiv2">
<div class="file-upload" id="additional_id2">
<asp:FileUpload ID="add_id_back" type="file" runat="server" class="uploadbutton" accept="image/*" meta:resourcekey="reg_back_idResource1" />
<%--<input type="file" name="reg-back-id" id="reg-back-id" required="required" class="uploadbutton" accept="image/*" />--%>
<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 class="col-md-6" style="display: none;" id="AdditionalIDFront2Div">
<div class="form-group">
<label>Additional ID Front </label>
<%-- <input type="button" id="editSelfie" class="btn btn-info" value="Edit Selfie" />--%>
<input type="button" id="editAdditionalIDFront2" class="btn btn-warning" value="Crop" style="display: none;" />
<input type="button" id="undoAdditionalIDFront2Div" style="display: none;" class="btn btn-primary" value="Undo" />
<div>
<div class="samp-control">
<img class="doc" alt="./../../Images/na.gif" onclick="ShowImageDetail(this)" id="imgAdditionalIDFront2Id" src="../../../Images/na.gif">
</div>
</div>
</div>
</div>
<div class="col-md-6" style="display: none;" id="IDFrontFeatureDiv">
<div class="form-group">
<label>Id Front Feature</label>
<%-- <input type="button" id="editSelfie" class="btn btn-info" value="Edit Selfie" />--%>
<input type="button" id="editIDFrontFeature" class="btn btn-warning" value="Crop" />
<input type="button" id="undoIDFrontFeature" style="display: none;" class="btn btn-primary" value="Undo" />
<div>
<div class="samp-control">
<img class="doc" alt="./../../Images/na.gif" onclick="ShowImageDetail(this)" id="imgIDFrontFeatureId" src="../../../Images/na.gif">
</div>
</div>
</div>
</div>
<div class="col-md-6" style="display: none;" id="customerSelfieDiv">
<div class="form-group">
<label>Customer Selfie</label>
<%-- <input type="button" id="editSelfie" class="btn btn-info" value="Edit Selfie" />--%>
<input type="button" id="editSelfieCrop" class="btn btn-warning" value="Crop" />
<input type="button" id="undoeditSelfie" style="display: none;" class="btn btn-primary" value="Undo" />
<div>
<div class="samp-control">
<img class="doc" alt="./../../Images/na.gif" onclick="ShowImageDetail(this)" id="imgselfieId" src="../../../Images/na.gif">
</div>
</div>
</div>
</div>
<div class="col-md-6" style="display: none;" id="FacePictureDiv">
<div class="form-group">
<label>Customer Face Picture</label>
<input type="button" id="editFacePicture" class="btn btn-warning" value="Crop" />
<input type="button" id="undoFacePicture" style="display: none;" class="btn btn-primary" value="Undo" />
<div>
<div class="samp-control">
<img class="doc" alt="./../../Images/na.gif" onclick="ShowImageDetail(this)" id="FacePictureId" src="../../../Images/na.gif">
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row" id="agreementDiv" runat="server">
<div class="col-sm-8 form-group" style="left: 0px; top: 15px">
<label class="checkbox-ui">
@ -1642,6 +2000,13 @@
<asp:HiddenField ID="ddlStateHidden" runat="server" />
<asp:HiddenField runat="server" ID="hddVerificationTypeNo" />
<asp:HiddenField ID="hdnAdditionalAddress" runat="server" />
<asp:HiddenField runat="server" ID="hdnreg_front_idCdId" />
<asp:HiddenField runat="server" ID="hdnreg_back_id_idCdId" />
<asp:HiddenField runat="server" ID="hdnreg_additional_idCdId" />
<asp:HiddenField runat="server" ID="hdnreg_additional_id2CdId" />
<asp:HiddenField runat="server" ID="hdn_selfie" />
<asp:HiddenField runat="server" ID="hdn_AdditionalIDFront2" />
<asp:HiddenField runat="server" ID="hdnRegisterDate" />
</div>
</form>

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>

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

@ -40,10 +40,11 @@ namespace Swift.web.Remit.Compliance.ApproveOFACandComplaince
grid.ColumnList = new List<GridColumn>
{
new GridColumn("tranId", "Tran Id", "", "T"),
new GridColumn("tranId", "Tran Id", "", "T"),
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>");

3
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>");

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

@ -71,6 +71,11 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
{
string currentPayoutPartner = string.Empty;
bool isFirstRow = true;
int[] totalAmountIndexes = { 14, 16, 18, 20, 22 };
// Initializing an array to store the total amounts for each specific column index
decimal[] totalAmounts = new decimal[cols];
Array.Clear(totalAmounts, 0, totalAmounts.Length);
foreach (DataRow dr in dt.Rows)
{
@ -80,8 +85,27 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
{
if (!isFirstRow)
{
str.Append("</table>");
str.Append("<tr>");
// Adding "Total" to the first column for each specific total amount column
str.Append("<td align=\"left\"><b>Total</b></td>");
// Adding the total amounts for each specific column index below their respective columns
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>");
str.Append("<table class='table table-responsive table-bordered'>");
@ -92,16 +116,48 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
currentPayoutPartner = payoutPartner;
isFirstRow = false;
}
str.AppendLine("<tr class=\"" + GetPayStatus(dr["PAYSTATUS"].ToString()) + "\">");
for (int i = 0; i < cols; i++)
{
str.Append("<td align=\"left\">" + dr[i] + "</td>");
// Calculate total amount for specific columns
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>");
}
str.Append("</table>");
// Add the last total amount row for the final partner if there's any row
if (!isFirstRow)
{
str.Append("<tr>");
// Adding "Total" to the first column for each specific total amount column
str.Append("<td align=\"left\"><b>Total</b></td>");
// Adding the total amounts for each specific column index below their respective columns
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>");
rpt_grid.InnerHtml = str.ToString();

7
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>");

Write Preview
Loading…
Cancel
Save