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

edit customer from mobile

Ime-london-webcore
shakun 10 months ago
parent
c9706182ba
commit
99e9f62ca8
9 changed files with 111 additions and 51 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. 7
      Swift.web/AgentNew/SendTxn/Confirm.aspx.cs
  2. 88
      Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx
  3. 17
      Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx.cs
  4. 9
      Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx.designer.cs
  5. 4
      Swift.web/Payment/trans_payment_success.aspx.cs
  6. 26
      Swift.web/Remit/Transaction/VerifyMobileTransaction/VerifyMobileTransaction.aspx.cs
  7. 7
      Swift.web/Remit/UserControl/UcTransaction.ascx
  8. 3
      Swift.web/Remit/UserControl/UcTransaction.ascx.cs
  9. 1
      Swift.web/Remit/UserControl/UcTransaction.ascx.designer.cs

7
Swift.web/AgentNew/SendTxn/Confirm.aspx.cs
View File

@ -694,7 +694,12 @@ namespace Swift.web.AgentNew.SendTxn
}
else if (dbResult.ErrorCode == "101" || dbResult.ErrorCode == "102" || dbResult.ErrorCode == "103")
{
if (ds.Tables.Count > 5)
{
// only compliance
ShowDuplicateTxn(ds.Tables[5], ds.Tables[6]);
}
else
ShowDuplicateTxn(ds.Tables[3], ds.Tables[4]);
return LoadCompliance(dbResult, ds.Tables[1], agentRefId);
}
@ -940,7 +945,7 @@ namespace Swift.web.AgentNew.SendTxn
var cn = HttpUtility.UrlEncode(WebUtils.EncryptString(dbResult.Id));
string reference = dbResult.Extra3;
url = $"{url}?ref={reference}&id={id}&cn={cn}";
Response.Redirect(url);
Response.Redirect(url,false);
}
else
{

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

@ -65,11 +65,10 @@
$("#divreg_back_id").show();
$("#divAdditional_id").show();
$("#divAdditional_id2").show();
$("#uploadFrontIdDiv").hide();
$("#uploadBackIdDiv").hide();
$("#uploadAdditionalIdDiv").hide();
$("#uploadAdditionalIdDiv2").hide();
$("#uploadcustomerSelfieDiv2").hide();
$("#editFrontId").click(function () {
$("#uploadFrontIdDiv").show();
@ -80,9 +79,11 @@
$("#editAdditionalId").click(function () {
$("#uploadAdditionalIdDiv").show();
});
$("#editAdditionalId2").click(function () {
$("#uploadAdditionalIdDiv2").show();
$("#editSelfie").click(function () {
$("#uploadcustomerSelfieDiv2").show();
})
/* $("#" + mId + "occupation").change(function () {*/
$("#occupation").change(function () {
$("#divOccupation").hide();
@ -319,7 +320,6 @@
}
function LoadcustomerData() {
debugger
var eid = $('#<%=hdnCustomerId.ClientID%>').val();
dataToSend = { MethodName: 'GetCustomerDetails', Id: eid };
$.post('', dataToSend, function (response) {
@ -335,7 +335,7 @@
}
function PopulateImage(undoId, isCropped) {
debugger;
// debugger;
var dataToSend = {
MethodName: "GetImageUrl",
customerId: $('#<%=hdnCustomerId.ClientID%>').val(),
@ -393,8 +393,8 @@
$('#<%=hdnreg_additional_idCdId.ClientID%>').val(url3.FileName + '|' + url3.CdId);
}
else
$("#divAdditional_id").hide();
//else
// $("#divAdditional_id").hide();
if (url4) {
// $("#additionalId2").attr("src", url4);
@ -404,7 +404,7 @@
$('#<%=hdnreg_additional_id2CdId.ClientID%>').val(url4.FileName + '|' + url4.CdId);
}
else
$("#divAdditional_id2").hide();
$("#divAdditional_id2").hide();
debugger;
const filtered = data.filter(item => item.isEkyc === true);
@ -412,10 +412,10 @@
if (filtered != null) {
var selfie = filtered.filter(item => item.DocumentName === "Customer Selfie")[0];
if (selfie) {
$("#customerSelfieDiv").show();
/* $("#customerSelfieDiv").show();*/
$("#imgselfieId").attr("src", selfie.ImageUrl);
editSelfieCrop.setAttribute('onclick', 'documentCrop( " ' + selfie.FileName + ' ", " ' + selfie.CdId + ' " , " ' + filtered.FileType + ' " , this.id )');
@ -427,18 +427,20 @@
undoeditSelfie.setAttribute('onclick', 'undoCrop( " ' + selfie.FileName + ' ", " ' + selfie.CdId + ' " , " ' + selfie.FileType + ' ", " ' + undoId + ' ")');
}
}
else
/*$("#customerSelfieDiv").hide();*/
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 )');
editFacePictureCrop.setAttribute('onclick', 'documentCrop( " ' + facePicture.FileName + ' ", " ' + facePicture.CdId + ' " , " ' + facePicture.FileType + ' " , this.id )');
$('#<%=hdn_FacePicture.ClientID%>').val(facePicture.FileName + '|' + facePicture.CdId);
if (undoId == "editFacePicture" && isCropped == "Y") {
if (undoId == "editFacePictureCrop" && isCropped == "Y") {
$('#undoFacePicture').show();
undoFacePicture.setAttribute('onclick', 'undoCrop( " ' + facePicture.FileName + ' ", " ' + facePicture.CdId + ' " , " ' + facePicture.FileType + ' ", " ' + undoId + ' ")');
}
@ -476,8 +478,8 @@
}
}
else {
$("#customerSelfieDiv").hide();
$("#FacePictureDiv").hide();
// $("#customerSelfieDiv").hide();
//$("#FacePictureDiv").hide();
$("#AdditionalIDFront2Div").hide();
$("#IDFrontFeatureDiv").hide();
}
@ -503,6 +505,16 @@
});
}
function ParseCustomerData(response) {
var dr = jQuery.parseJSON(response);
if (dr != null) {
@ -944,8 +956,6 @@
});
}
//function PopulateAreaDDL(data, selectedValue) {
// //debugger;
// var ddl = document.getElementById("txtStreet");
@ -1632,12 +1642,12 @@
</div>
</div>
</div>
<div class="col-md-6" style="display: none;" id="customerSelfieDiv">
<div class="col-md-6" 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="editSelfie" class="btn btn-info" value="Edit Selfie" />
<input type="button" id="editSelfieCrop" class="btn btn-warning" tyle="display: none;" value="Crop" />
<input type="button" id="undoeditSelfie" style="display: none;" class="btn btn-primary" value="Undo" />
<div>
@ -1646,12 +1656,23 @@
</div>
</div>
</div>
<div class="form-group" id="uploadcustomerSelfieDiv2">
<div class="file-upload" id="facePictureId">
<asp:FileUpload ID="reg_customerSelfie" type="file" runat="server" class="uploadbutton" accept="image/*" meta:resourcekey="reg_back_idResource1" />
<%--<input type="file" name="reg-back-id" id="reg-back-id" required="required" class="uploadbutton" accept="image/*" />--%>
<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="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="editFacePicture" style="display: none;" class="btn btn-info" value="Edit Face Picture" />
<input type="button" id="editFacePictureCrop" class="btn btn-warning" value="Crop" />
<input type="button" id="undoFacePicture" style="display: none;" class="btn btn-primary" value="Undo" />
<div>
@ -1660,7 +1681,10 @@
</div>
</div>
</div>
</div>
</div>
</div>
<div class="panel panel-default clearfix m-b-20">
@ -1957,6 +1981,20 @@
$(".loadImg4 img").fadeIn("fast");
}
});
// Image upload for add back id2
$('#reg_customerSelfie').on('change', function (e) {
/* $(this).closest('span').find('.loadImg1').remove();*/
$('.loadImg5').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="loadImg5"><img src="' + tmppath + '" alt=""></span>');
$(".loadImg5 img").fadeIn("fast");
}
});
function ShowImageDetail(id) {
OpenInNewWindow(id.src);
}

17
Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx.cs
View File

@ -771,7 +771,22 @@ namespace Swift.web.MobileRemit.Admin.Operation
cdid = r[0];
}
}
if (keyName.ToLower().Equals("reg_customerSelfie"))
{
documentTypeName = "Customer Selfie";
documentType = "11440";
if (hdn_FacePicture != null & !string.IsNullOrEmpty(hdn_FacePicture.Value))
{
var r = hdn_FacePicture.Value.Split('|');
if (r.Count() > 1)
{
filename = r[0];
cdid = r[1];
}
else
cdid = r[0];
}
}
if (file.ContentLength > 0 && !string.IsNullOrEmpty(file.FileName))
{
string fileNameNew = (!string.IsNullOrWhiteSpace(file.FileName) ? UploadDocument(file, customerId, documentTypeName, membershipId, registerDate, filename, out fileType)

9
Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx.designer.cs
View File

@ -689,6 +689,15 @@ namespace Swift.web.MobileRemit.Admin.Operation
/// </remarks>
protected global::System.Web.UI.WebControls.FileUpload reg_additional_id2;
/// <summary>
/// reg_customerSelfie control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.FileUpload reg_customerSelfie;
/// <summary>
/// pnlOFAC control.
/// </summary>

4
Swift.web/Payment/trans_payment_success.aspx.cs
View File

@ -65,10 +65,10 @@ namespace Swift.web.Payment
//lblpaymenttypedescription.Text = GetStatic.ReadQueryString("paymenttypedescription", "");
//lblrequestreference.Text = GetStatic.ReadQueryString("requestreference", "");
//lbltransactionreference.Text = GetStatic.ReadQueryString("transactionreference", "");
if (dt.Rows[0]["tranType"] == "I")
if (dt.Rows[0]["tranType"].ToString() == "I")
{
string controlNo = dt.Rows[0]["ControlNo"].ToString();
lnkBack.NavigateUrl = GetStatic.ReadWebConfig("CR_Trust_Receipt_url", "?invoicePrint=d&cn=" + controlNo);
lnkBack.NavigateUrl = $"{GetStatic.ReadWebConfig("CR_Trust_Receipt_url")}?invoicePrint=d&cn={controlNo}";
}
else
{

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

@ -572,26 +572,26 @@ namespace Swift.web.Remit.Transaction.VerifyMobileTransaction
List<Mapping> bodyMappings = new List<Mapping>();
bodyMappings.Add(new Mapping() { SValue = "CustomerName", SText = cd.senderName });
//bodyMappings.Add(new Mapping() { SValue = "PayoutCountry", SText = cd.PayoutCountry });
//bodyMappings.Add(new Mapping() { SValue = "BeneName", SText = cd.BeneficiaryName });
//bodyMappings.Add(new Mapping() { SValue = "TransferType", SText = cd.TransferType });
//bodyMappings.Add(new Mapping() { SValue = "BankName", SText = cd.BankName });
//bodyMappings.Add(new Mapping() { SValue = "BankBranch", SText = cd.BankBranch });
//bodyMappings.Add(new Mapping() { SValue = "AccNum", SText = cd.AccountNo });
//bodyMappings.Add(new Mapping() { SValue = "PayoutAmt", SText = cd.PayoutAmount });
//bodyMappings.Add(new Mapping() { SValue = "TransferAmt", SText = cd.TransferAmount });
//bodyMappings.Add(new Mapping() { SValue = "Fee", SText = cd.serviceCharge });
//bodyMappings.Add(new Mapping() { SValue = "Discount", SText = cd.rewardPoints });
bodyMappings.Add(new Mapping() { SValue = "PayoutCountry", SText = cd.PayoutCountry });
bodyMappings.Add(new Mapping() { SValue = "BeneName", SText = cd.BeneficiaryName });
bodyMappings.Add(new Mapping() { SValue = "TransferType", SText = cd.TransferType });
bodyMappings.Add(new Mapping() { SValue = "BankName", SText = cd.BankName });
bodyMappings.Add(new Mapping() { SValue = "BankBranch", SText = cd.BankBranch });
bodyMappings.Add(new Mapping() { SValue = "AccNum", SText = cd.AccountNo });
bodyMappings.Add(new Mapping() { SValue = "PayoutAmt", SText = cd.PayoutAmount });
bodyMappings.Add(new Mapping() { SValue = "TransferAmt", SText = cd.TransferAmount });
bodyMappings.Add(new Mapping() { SValue = "Fee", SText = cd.serviceCharge });
bodyMappings.Add(new Mapping() { SValue = "Discount", SText = cd.rewardPoints });
bodyMappings.Add(new Mapping() { SValue = "TotalAmt", SText = cd.TotalAmount });
//bodyMappings.Add(new Mapping() { SValue = "TxnDate", SText = cd.TranDate });
bodyMappings.Add(new Mapping() { SValue = "TxnDate", SText = cd.TranDate });
SendNotificationRequestMobile request = new SendNotificationRequestMobile()
{
IsBulkNotification = false,
UserName = cd.email,
ProcessId = "Transaction_Verification",
ProviderId = NotifyTemplate.BANK_TRANSFER_TXN_PENDING.ToString(),
ProviderId = NotifyTemplate.BANK_TRANSFER_TXN_CLEARED.ToString(),
NotificationTypeId = NOTIFICATION_TYPE.EMAIL.ToString(),
Template = NotifyTemplate.BANK_TRANSFER_TXN_PENDING,
Template = NotifyTemplate.BANK_TRANSFER_TXN_CLEARED,
Recipients = new List<RecipientViewModel>()
{
new RecipientViewModel()

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

@ -818,12 +818,7 @@
<asp:Label ID="modeOfDeposit" runat="server"></asp:Label>
</td>
</tr>
<tr>
<td>Payment Option: </td>
<td class="text">
<asp:Label ID="paymentOption" runat="server"></asp:Label>
</td>
</tr>
<tr>
<td>Trust Pay Id: </td>
<td class="text">

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

@ -363,7 +363,7 @@ namespace Swift.web.Remit.UserControl
modeOfPayment.Text = tRow["paymentMethod"].ToString();
modeOfDeposit.Text = tRow["depositType"].ToString();
payer.Text = tRow["payerName"].ToString();
paymentOption.Text = tRow["depositType"].ToString();
transactionReference.Text = tRow["trustPaymentId"].ToString();
tranStatus.Text = tRow["tranStatus"].ToString();
payStatus.Text = tRow["payStatus"].ToString();
@ -1699,7 +1699,6 @@ namespace Swift.web.Remit.UserControl
modeOfDeposit.Text = tRow["depositType"].ToString();
tranStatus.Text = tRow["tranStatus"].ToString();
payStatus.Text = tRow["payStatus"].ToString();
paymentOption.Text = tRow["depositType"].ToString();
transactionReference.Text = tRow["trustPaymentId"].ToString();
sAgentComm.Text = GetStatic.FormatData(tRow["sAgentComm"].ToString(), "M");

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

@ -840,7 +840,6 @@ namespace Swift.web.Remit.UserControl
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label paymentOption;
/// <summary>
/// transactionReference control.

Write Preview
Loading…
Cancel
Save