Browse Source

zip code update

feature/19315_Customer-Registration-new
Dinesh 12 months ago
parent
commit
d6d7c97d5f
  1. 2
      CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/IRegisterBusiness.cs
  2. 25
      CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/ExrateResponse.cs
  3. 17
      CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/TrustPaymentRequest.cs
  4. 25
      CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs
  5. 3
      CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Payment.cshtml
  6. 7
      CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml
  7. 72
      CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Success.cshtml
  8. 14
      CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/TranPaySuccess.cshtml
  9. 184
      DB/mobile_proc_online_customerMaster_V1.sql

2
CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/IRegisterBusiness.cs

@ -15,8 +15,6 @@ namespace CustomerOnlineV2.Business.Business.RegisterBusiness
{
Task<CommonResponse> AddCustomers(OnlineCustomerRegisterModel register);
Task<AddressListResponse> GetAddressList(AddressRequest addressRequest);
// Task<CustomerList> GetTranCustomerById(string id);
//Task<CustomerList> GetCustomerDetailById(LoginResponse loginDetails);
Task<CustomerList> GetTranCustomerById(LoginResponse loginDetails);
Task<CustomerListModel> UpdateCustomers(CustomerListModel customer, string Id);
//Task<CustomerListModel> UpdateCustomers(CustomerListModel customer, string id);

25
CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/ExrateResponse.cs

@ -1,4 +1,5 @@
namespace CustomerOnlineV2.Common.Models.TransactionModel
using CustomerOnlineV2.Common.Models.ReceiverModel;
namespace CustomerOnlineV2.Common.Models.TransactionModel
{
public class ExrateResponse : CommonResponse
{
@ -190,8 +191,11 @@
{
public string? ControlNo { get; set; }
public string? CollectAmount { get; set; }
public string? TransferAmount { get; set; }
public string? CollectCurrency { get; set; }
public string? ReceiverName { get; set; }
public string? SenderName { get; set; }
public string? PCountry { get; set; }
public string? TransactionId { get; set; }
}
@ -219,13 +223,32 @@
public string? TotalToPay { get; set; }
public string? PaidBy { get; set; }
public string? PCountry { get; set; }
public string? Zipcode { get; set; }
public string? Firstname { get; set; }
public string? Lastname1 { get; set; }
public string? Address { get; set; }
public string? Mobile { get; set; }
public string? City { get; set; }
public string? RecFirstName { get; set; }
public string? RecMiddleName { get; set; }
public string? RecLastName { get; set; }
}
public class TranDataModel : ReceiverInformationModel
{
public string? ErrorCode { get; set; }
public string? OrderReference { get; set; }
public string? paymenttypedescription { get; set; }
public string? requestreference { get; set; }
public string? responsesitesecurity { get; set; }
public string? sitereference { get; set; }
public string? transactionreference { get; set; }
}
}

17
CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/TrustPaymentRequest.cs

@ -1,4 +1,5 @@
using System;
using CustomerOnlineV2.Common.Models.ReceiverModel;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@ -6,7 +7,7 @@ using System.Threading.Tasks;
namespace CustomerOnlineV2.Common.Models.TransactionModel
{
public class TrustPaymentRequest
public class TrustPaymentRequest: ReceiverInformationModel
{
public string? sitereference { get; set; }
public string? stprofile { get; set; }
@ -39,5 +40,17 @@ namespace CustomerOnlineV2.Common.Models.TransactionModel
public string? ruleidentifier { get; set; }
public string? merchantemail { get; set; }
public string? securityCode { get; set; }
public string? transactionreference { get; set; }
public string? errorcode { get; set; }
public string? createddate { get; set; }
public string? tranId { get; set; }
public string? settlestatus { get; set; }
public string? paymenttypedescription { get; set; }
public string? requestreference { get; set; }
public string? responsesitesecurity { get; set; }
public string? title { get; set; }
public string? token { get; set; }
}
}

25
CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs

@ -117,7 +117,7 @@ namespace CustomerOnlineV2.Controllers
_request.billingstreet = _tranresponse.Address;
_request.billingpostcode = _tranresponse.Zipcode;
_request.billingtown = _tranresponse.City;
// _request.billingtelephone = _tranresponse.Mobile;
_request.billingtelephone = _tranresponse.Mobile;
_request.billingcountryiso2a = "GB";
_request.customerpremise = _tranresponse.City;
@ -150,12 +150,33 @@ namespace CustomerOnlineV2.Controllers
_request.sitesecurity = $"h{builder.ToString()}";
_logger.LogInformation($"Payment | RESPONSE | {JsonConvert.SerializeObject(_request)}");
var _response = await _transactionBusiness.SaveTranData(_request, loginDetails);
}
return View(_request);
}
public async Task<IActionResult> TranPaySuccess()
{
return View();
var errorCode = Request.Query["errorcode"];
var orderReference = Request.Query["orderreference"];
var paymentTypeDescription = Request.Query["paymenttypedescription"];
var requestReference = Request.Query["requestreference"];
var responseSiteSecurity = Request.Query["responsesitesecurity"];
var settleStatus = Request.Query["settlestatus"];
var siteReference = Request.Query["sitereference"];
var transactionReference = Request.Query["transactionreference"];
var _request = new TrustPaymentRequest
{
errorcode = errorCode.ToString(),
orderreference = orderReference.ToString(),
paymenttypedescription = paymentTypeDescription.ToString(),
requestreference = requestReference.ToString(),
responsesitesecurity = responseSiteSecurity.ToString(),
settlestatus = settleStatus.ToString(),
transactionreference = transactionReference.ToString()
};
var loginDetails = HttpContext.GetLoginDetails();
var _response = await _transactionBusiness.SaveTranData(_request, loginDetails);
return View(_request);
}
public async Task<IActionResult> TranDecline()

3
CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Payment.cshtml

@ -70,7 +70,8 @@
<input asp-for="declinedurlredirect" name="declinedurlredirect" type="hidden" />
<input asp-for="sitesecuritytimestamp" name="sitesecuritytimestamp" type="hidden" />
<input asp-for="sitesecurity" name="sitesecurity" type="hidden" />
<input asp-for="token" name="sitetoken" type="hidden" />
<input type="hidden" name="stextraurlredirectfields" value="sitetoken">
<input asp-for="merchantemail" name="merchantemail" value="shakun@japanremit.com" type="hidden" />
@Html.AntiForgeryToken()
<input type="submit" id="btn_submit" style="display:none;" />

7
CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml

@ -455,6 +455,7 @@
},
async: true,
success: function (response) {
debugger
EnableSendButton();
if (response.responseCode != 0) {
ShowAlertMessage(response.responseCode, response.responseMessage);
@ -462,7 +463,13 @@
}
// window.location.replace("/Transaction/Success?id=" + response.transactionId);
// window.location.replace("/Transaction/Payment?id=" + response.transactionId);
var selectedSchemeId = $('#SchemeId').val();
if (selectedSchemeId === 'DEBIT_CARD') {
window.location.replace("/Transaction/Payment?id=" + response.transactionId);
} else {
window.location.replace("/Transaction/Success?id=" + response.transactionId);
}
},
error: function () {
return null;

72
CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Success.cshtml

@ -14,15 +14,73 @@
<div class="card">
<div class="card-body p-4">
<div class="row">
<div class="col-md-9 col-lg-7 col-xl-6 mx-auto align-items-center text-center">
<div class="my-4">
<p class="text-success text-20 lh-1"><i class="fas fa-check-circle"></i></p>
<p class="text-success text-8 fw-500 lh-1">Success!</p>
<p class="lead">Transactions Complete</p>
<div class="col-md-9 col-lg-7 col-xl-6 mx-auto align-items-center">
<div class="my-3">
<p class="text-success text-7 lh-1"><i class="fas fa-check-circle"></i>Your Transaction is succesfully created! <a class="text-3 d-inline-block btn-link mt-4" href="#"><i class="fas fa-print"></i> Print</a></p>
@* <p class="lead">Transactions Complete</p> *@
</div>
<div style="border:solid 1px; padding:10px; margin:10px; background-color:#FBFBFB;">
<p class="text-3 mb-4">Thank you <span class="fw-500">@Model.SenderName</span> for sending transaction with us. </p>
<p class="text-3 mb-4">Your Transaction ID is <span class="fw-500">@Model.TransactionId</span> <span style="color: red;"> (This is not a Reference No)</span></p>
<p class="text-3 mb-4">Your transaction to <span class="fw-500">@Model.PCountry</span> for <span class="text-4 fw-500">@CustomerOnlineV2.Common.Helper.Utilities.ShowDecimal(Model.TransferAmount) @Model.CollectCurrency</span> is in progress. You will receive an email regarding the transfer update shortly.</p>
<p class="text-3 mb-4">Please log-in your personal online banking and transfer funds directly to our accounts </p>
@* <p class="text-3 mb-4">You've Succesfully sent <span class="text-4 fw-500">@CustomerOnlineV2.Common.Helper.Utilities.ShowDecimal(Model.CollectAmount) @Model.CollectCurrency</span> to <span class="fw-500">@Model.ReceiverName</span>, See transaction details under <a href="/Transaction/Receipt?id=@Model.TransactionId">Transactions Details</a></p> *@
<table>
<tr>
<td>
Bank Name: &nbsp;
<span>CLEAR BANK</span>
<br>
</td>
</tr>
<tr>
<td>
Account Name: &nbsp;
<span>IME LONDON</span>
<br>
</td>
</tr>
<tr>
<td>
Sort Code: &nbsp;
<span>04-6-93</span>
<br>
</td>
</tr>
<tr>
<td>
Account Number: &nbsp;
<span>00000151</span>
<br>
</td>
</tr>
<tr>
<td>
Total To Pay: &nbsp;
<span class="text-4 fw-500">@CustomerOnlineV2.Common.Helper.Utilities.ShowDecimal(Model.CollectAmount) @Model.CollectCurrency</span>
<br>
</td>
</tr>
<tr>
<td>
Reference: &nbsp;
<span class="text-4 fw-500">@Model.SenderName</span>
<br>
</td>
</tr>
</table>
</div>
<p class="text-3 mb-4">You've Succesfully sent <span class="text-4 fw-500">@CustomerOnlineV2.Common.Helper.Utilities.ShowDecimal(Model.CollectAmount) @Model.CollectCurrency</span> to <span class="fw-500">@Model.ReceiverName</span>, See transaction details under <a href="/Transaction/Receipt?id=@Model.TransactionId">Transactions Details</a></p>
<div class="d-grid"><a href="/Transaction/SendMoney"><button class="btn btn-primary">Send Money Again</button></a></div>
<a class="text-3 d-inline-block btn-link mt-4" href="#"><i class="fas fa-print"></i> Print</a>
</div>
</div>
</div>

14
CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/TranPaySuccess.cshtml

@ -1,5 +1,6 @@
@{
Layout = null;
}
<!DOCTYPE html>
<html lang="en">
@ -32,12 +33,16 @@
<div class="card-body p-4">
<div class="row">
<div class="col-md-9 col-lg-7 col-xl-6 mx-auto align-items-center text-center">
<div class="my-4">
<p class="text-success text-20 lh-1"><i class="fas fa-check-circle"></i></p>
<p class="text-success text-8 fw-500 lh-1">Success!</p>
<p class="lead"> Transaction Payment Complete</p>
</div>
@* <p class="text-3 mb-4">You've Succesfully sent <span class="text-4 fw-500">@CustomerOnlineV2.Common.Helper.Utilities.ShowDecimal(Model.CollectAmount) @Model.CollectCurrency</span> to <span class="fw-500">@Model.ReceiverName</span>, See transaction details under <a href="/Transaction/Receipt?id=@Model.TransactionId">Transactions Details</a></p> *@
< class="text-3 mb-4">You've Succesfully sent <span class="text-4 fw-500">@CustomerOnlineV2.Common.Helper.Utilities.ShowDecimal(Model.CollectAmount) @Model.CollectCurrency</span> to <span class="fw-500">@Model.ReceiverName</span>, See transaction details under <a href="/Transaction/Receipt?id=@Model.TransactionId">Transactions Details</a></p>
<div class="d-grid"><a href="/Home/Index"><button class="btn btn-primary">Dashboard Page</button></a></div>
</div>
@ -47,4 +52,9 @@
</div>
</div>
</div>
</html>
</html>
<script>
window.onload = function () {
document.getElementById('saveDataForm').submit();
}
</script>

184
DB/mobile_proc_online_customerMaster_V1.sql

@ -0,0 +1,184 @@
ALTER PROC mobile_proc_online_customerMaster_V1 (
--EXEC mobile_proc_online_customerMaster_V1 @flag='detail',@customerId='3'
@flag VARCHAR(20)
,@customerId VARCHAR(100) = NULL
,@username VARCHAR(100) = NULL
,@postalCode VARCHAR(100) = NULL
,@address1 NVARCHAR(200) = NULL
,@address2 NVARCHAR(200) = NULL
,@city VARCHAR(100) = NULL
,@idType VARCHAR(100) = NULL
,@idTypeNumber VARCHAR(100) = NULL
,@idIssuingCountry VARCHAR(5) = NULL
,@idStartDate VARCHAR(20) = NULL
,@idEndDate VARCHAR(20) = NULL
)
AS
;
SET NOCOUNT ON;
SET XACT_ABORT ON;
BEGIN
IF @flag = 'detail'
BEGIN
--ID TYPE
SELECT valueId AS id
,detailTitle AS [text]
,isBackRequired = CASE sv.valueId
WHEN '10997'
THEN 0
ELSE 1
END
INTO #ID_TYPE
FROM countryIdType CID WITH (NOLOCK)
INNER JOIN staticDataValue SV WITH (NOLOCK) ON CID.IdTypeId = SV.valueId
WHERE ISNULL(SV.ISActive, 'Y') = 'Y'
AND ISNULL(isDeleted, 'N') <> 'Y'
AND COUNTRYID = 233
IF EXISTS (
SELECT 'x'
FROM dbo.customerMasterTemp(NOLOCK)
WHERE customerId = @customerId
)
BEGIN
SELECT TOP 1 cmt.firstName
,fullName
,gender = CASE
WHEN gender = 97
THEN 'M'
WHEN gender = 98
THEN 'F'
ELSE NULL
END
,idType = CASE
WHEN ID.ID = '11402'
THEN CMT.otherIdNumber
ELSE CAST(ID.id AS VARCHAR)
END
,CONVERT(VARCHAR(10), dob, 120) AS dob
,email AS email
,mobile
,city
,address address1
,additionalAddress address2
,nativeCountry
,cm.countryCode nativeCountryCode
,idNumber AS passportNumber
,cmt.idIssueDate
,cmt.idExpiryDate
,idIssueCountry
,KycStatus = ISNULL(verificationCode, 'NOT_COMPLETED')
,KycStatusMsg = CASE verificationCode
WHEN 'NOT_COMPLETED'
THEN 'Not Completed'
WHEN 'PROCESSING'
THEN 'ID Document Submission is in Processing'
WHEN 'COMPLETED'
THEN 'KYC Completed'
ELSE 'NOT COMPLETED'
END
FROM dbo.customerMasterTEMP(NOLOCK) cmt
LEFT JOIN #ID_TYPE ID ON ID.id = cmt.idType
LEFT JOIN dbo.countryMaster(NOLOCK) cm ON cm.countryId = cmt.nativeCountry
WHERE customerId = @customerId
END
ELSE
BEGIN
SELECT TOP 1 cmt.firstName
,fullName
,gender = CASE
WHEN gender = 97
THEN 'M'
WHEN gender = 98
THEN 'F'
ELSE NULL
END
,idType = CASE
WHEN ID.ID = '11402'
THEN CMT.otherIdNumber
ELSE CAST(ID.id AS VARCHAR)
END
,CONVERT(VARCHAR(10), dob, 120) AS dob
,email AS email
,mobile
,city
,address address1
,additionalAddress address2
,nativeCountry
,cm.countryCode nativeCountryCode
,idNumber AS passportNumber
,cmt.idIssueDate
,cmt.idExpiryDate
,idIssueCountry
,KycStatus = ISNULL(verificationCode, 'NOT_COMPLETED')
,KycStatusMsg = CASE verificationCode
WHEN 'NOT_COMPLETED'
THEN 'Not Completed'
WHEN 'PROCESSING'
THEN 'ID Document Submission is in Processing'
WHEN 'COMPLETED'
THEN 'KYC Completed'
ELSE 'NOT COMPLETED'
END
FROM dbo.customerMaster(NOLOCK) cmt
LEFT JOIN #ID_TYPE ID ON ID.id = cmt.idType
LEFT JOIN dbo.countryMaster(NOLOCK) cm ON cm.countryId = cmt.nativeCountry
WHERE customerId = @customerId
END
END
IF @flag = 'update-id-Kyc'
BEGIN
IF EXISTS (
SELECT 'X'
FROM dbo.customerMasterTemp(NOLOCK)
WHERE customerId = @customerId
)
BEGIN
UPDATE dbo.customerMasterTemp
SET idType = ISNULL(@idType, idType)
,idNumber = ISNULL(@idTypeNumber, idNumber)
,idExpiryDate = ISNULL(@idEndDate, idExpiryDate)
,idIssueDate = ISNULL(@idStartDate, idIssueDate)
,idIssueCountry = ISNULL(@idIssuingCountry, idIssueCountry)
WHERE username = @userName
END
ELSE
BEGIN
UPDATE dbo.customerMaster
SET idType = ISNULL(@idType, idType)
,idNumber = ISNULL(@idTypeNumber, idNumber)
,idExpiryDate = ISNULL(@idEndDate, idExpiryDate)
,idIssueDate = ISNULL(@idStartDate, idIssueDate)
,idIssueCountry = ISNULL(@idIssuingCountry, idIssueCountry)
WHERE username = @userName
END
END
IF @flag = 'update-address'
BEGIN
IF EXISTS (
SELECT 'X'
FROM dbo.customerMasterTemp(NOLOCK)
WHERE customerId = @customerId
)
BEGIN
UPDATE dbo.customerMasterTemp
SET zipCode = ISNULL(@postalCode, zipCode)
,address = ISNULL(@address1, address)
,ADDITIONALADDRESS = ISNULL(@address2, ADDITIONALADDRESS)
,city = ISNULL(@city, city)
WHERE customerId = @customerId
END
ELSE
BEGIN
UPDATE dbo.customerMaster
SET zipCode = ISNULL(@postalCode, zipCode)
,address = ISNULL(@address1, address)
,ADDITIONALADDRESS = ISNULL(@address2, ADDITIONALADDRESS)
,city = ISNULL(@city, city)
WHERE customerId = @customerId
END
END
END
Loading…
Cancel
Save