Browse Source

Fix for send moeny & reward points

feature/19315_Customer-Registration-new
shakun 11 months ago
parent
commit
2a998f33ff
  1. 4
      CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs
  2. 1
      CustomerOnlineV2/CustomerOnlineV2.Common/Models/HomeModel/HomeModel.cs
  3. 1
      CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/ExrateResponse.cs
  4. 20
      CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/HomeRepository/HomeRepository.cs
  5. 16
      CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/RegisterRepository.cs
  6. 10
      CustomerOnlineV2/CustomerOnlineV2/Views/Customer/Refer.cshtml
  7. 11
      CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout.cshtml
  8. 2
      CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout2.cshtml
  9. 60
      CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml

4
CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs

@ -111,6 +111,7 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness
ProcessId = sendMoneyRequest.ProcessId,
UserName = loginDetails.UserName,
ProviderId = "online",
DiscountedFee = sendMoneyRequest.DiscountFee,
};
}
@ -142,7 +143,8 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness
UserName = loginDetails.UserName,
SessionId = calcRequest.ProcessId,
SchemeId = calcRequest.SchemeId,
TpExRate = partnerDetails.TpExRate
TpExRate = partnerDetails.TpExRate,
DiscountedFee = calcRequest.DiscountFee
};
}

1
CustomerOnlineV2/CustomerOnlineV2.Common/Models/HomeModel/HomeModel.cs

@ -109,5 +109,6 @@ namespace CustomerOnlineV2.Common.Models.HomeModel
public class CustomerNotificationModel : CommonResponse
{
public List<NotificationModel>? NotificationModel { get; set; }
public string? RewardAmount { get; set; }
}
}

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

@ -163,6 +163,7 @@ namespace CustomerOnlineV2.Common.Models.TransactionModel
public string? SessionId { get; set; }
public string? RequestBy { get; set; }
public string? ProviderId { get; set; }
public string? DiscountedFee { get; set; }
}
public class ReceiverModel

20
CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/HomeRepository/HomeRepository.cs

@ -34,7 +34,7 @@ namespace CustomerOnlineV2.Repository.Repository.HomeRepository
if (dt == null || dt.Rows.Count <= 0)
{
_response.ResponseCode = ResponseHelper.NORECORD;
_response.ResponseCode = ResponseHelper.SUCCESS;
_response.ResponseMessage = "No Receiver(s).";
_logger.LogError("HOMEREPOSITORY | GETCUSTOMERRECEIVERLIST | DB RESPONSE | " + JsonConvert.SerializeObject(_response));
@ -83,7 +83,7 @@ namespace CustomerOnlineV2.Repository.Repository.HomeRepository
if (dt == null || dt.Rows.Count <= 0)
{
_response.ResponseCode = ResponseHelper.NORECORD;
_response.ResponseCode = ResponseHelper.SUCCESS;
_response.ResponseMessage = "No Transaction History Found!";
_logger.LogError("HOMEREPOSITORY | GETCUSTOMERTRANSACTIONLIST | DB RESPONSE | " + JsonConvert.SerializeObject(_response));
@ -327,17 +327,20 @@ namespace CustomerOnlineV2.Repository.Repository.HomeRepository
// sql += ",@User = " + _connHelper.FilterString(loginDetails.UserName);
sql += ",@customerId = " + _connHelper.FilterString(loginDetails.UserId);
_logger.LogDebug("HOMEREPOSITORY | GETCUSTOMERNOTIFLIST | SQL | " + sql);
var dt = _connHelper.ExecuteDataTable(sql);
var ds = _connHelper.ExecuteDataset(sql);
if (dt == null || dt.Rows.Count <= 0)
if (ds == null || ds.Tables.Count <= 0)
{
_response.ResponseCode = ResponseHelper.NORECORD;
_response.ResponseMessage = "No Any Notifications";
_response.ResponseCode = ResponseHelper.SUCCESS;
_response.ResponseMessage = "No Any Records";
_logger.LogError("HOMEREPOSITORY | GETCUSTOMERNOTIFLIST | DB RESPONSE | " + JsonConvert.SerializeObject(_response));
}
else
{
if (ds.Tables.Count > 0)
{
var dt = ds.Tables[0];
_response.ResponseCode = Convert.ToInt16(dt.Rows[0]["errorCode"]);
_response.ResponseMessage = Convert.ToString(dt.Rows[0]["msg"]);
@ -360,6 +363,11 @@ namespace CustomerOnlineV2.Repository.Repository.HomeRepository
});
}
_response.NotificationModel = obj;
}
if (ds.Tables.Count > 1)
{
_response.RewardAmount = ds.Tables[1].Rows[0]["RewardAmount"].ToString();
}
}
}
catch (Exception ex)

16
CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/RegisterRepository.cs

@ -395,11 +395,11 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository
// sql += ",@User = " + _connHelper.FilterString(loginDetails.UserName);
sql += ",@sourceCustomerId = " + _connHelper.FilterString(loginDetails.UserId);
_logger.LogDebug("HOMEREPOSITORY | GETREWARDPOINTS | SQL | " + sql);
var dt = _connHelper.ExecuteDataTable(sql);
var ds = _connHelper.ExecuteDataset(sql);
if (dt == null || dt.Rows.Count <= 0)
if (ds == null || ds.Tables.Count <= 0)
{
_response.ResponseCode = ResponseHelper.FAILED;
_response.ResponseCode = ResponseHelper.SUCCESS;
_response.ResponseMessage = "DB Null Error!";
_logger.LogError("HOMEREPOSITORY | GETREWARDPOINTS | DB RESPONSE | " + JsonConvert.SerializeObject(_response));
@ -409,6 +409,13 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository
//_response.ResponseCode = Convert.ToInt16(dt.Rows[0]["errorCode"]);
//_response.ResponseMessage = Convert.ToString(dt.Rows[0]["msg"]);
if (ds.Tables.Count > 0)
{
_response.RewardAmount = ds.Tables[0].Rows[0]["RewardMoney"].ToString();
}
if (ds.Tables.Count > 1)
{
var dt = ds.Tables[1];
List<NotificationModel> obj = new List<NotificationModel>();
foreach (DataRow item in dt.Rows)
@ -421,7 +428,7 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository
CustomerName = Convert.ToString(item["CUSTOMER_NAME"]),
Date = Convert.ToString(item["CREATED_DATE"]),
RewardPoints = Convert.ToString(item["REWARD_POINTS"]),
ReferralCode = loginDetails.MembershipId,
ReferralCode = Convert.ToString(item["REFERRAL_CODE"]),
//ReferralCode = Convert.ToString(item["REFERRAL_CODE"]),
//IsRead = Convert.ToString(item["isRead"]),
//Type = Convert.ToString(item["type"]),
@ -433,6 +440,7 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository
});
}
_response.NotificationModel = obj;
}
}
}
catch (Exception ex)

10
CustomerOnlineV2/CustomerOnlineV2/Views/Customer/Refer.cshtml

@ -64,7 +64,7 @@
}
#reward-table tbody tr:nth-child(even) {
background-color: #f9f9f9;
background-color: beige;
}
#reward-table tbody tr:hover {
@ -157,7 +157,7 @@
<div class="col-md-6">
<br />
<div class="mb-4">
<h2 class="referral-code-header">Available Reward Points: <span id="showRewardPoints"></span></h2>
<h2 class="referral-code-header">Available Reward Amount: <span id="showRewardPoints" style="color:green;"></span></h2>
</div>
<h2 class="referral-code-header">Refer Now</h2>
<p class="text-black fs-5">Receive a FREE £5.00 bonus credit as Reward Amount</p>
@ -167,7 +167,7 @@
@* <p class="text-black fs-5">Refer IME Londong to your friends &amp; get many more exciting deals <br> plus discount on your every transfer.</p> *@
<h2 class="referral-code-header">Your Referral Code:</h2>
<div class="referral-code-container">
<input type="text" id="referralCode" class="referral-code" readonly>
<input type="text" id="referralCode" class="referral-code" value="@User.FindFirst("MembershipId").Value" readonly>
<span class="copy-icon" id="copyReferralCode" onclick="copyReferralCode()">
<i class="fa fa-copy"></i>
</span>
@ -180,7 +180,7 @@
</div>
</div>
<div id="referrals-content" style="display: none;">
<table id="reward-table" class="table">
<table id="reward-table" class="transaction-title">
<thead>
<tr>
<th>Reward Type</th>
@ -235,7 +235,7 @@
$.ajax({
type: 'GET',
contentType: 'application/json; charset=utf-8',
url: '/GetRewardDetails',
url: '/GetRewardAmount',
data: {},
success: function (response) {
debugger

11
CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout.cshtml

@ -21,6 +21,11 @@
.login-signup ul.navbar-nav > li.dropdown.notifications .dropdown-menu li > a:not(.btn) > i:not(.arrow) {
left: -14px !important;
}
.reward-text {
font-size: 15px;
font-weight: bold;
color: green !important;
}
</style>
</head>
<body>
@ -177,7 +182,7 @@
<div class="bg-white rounded text-center p-3 mb-4">
<div class="text-17 text-light my-3"><i class="fa fa-bullhorn"></i></div>
<h3 class="text-5 fw-400 my-4"> <a href="/Customer/Refer" class="text-3">Refer & Earn</a></h3>
<p id="rewardAmount" class="text mb-4">Reward Amount <strong>: <span class="reward-text" id="rewardValue"></span></strong></p>
<p id="rewardAmount" class="text mb-4"><strong> <span class="reward-text" id="rewardValue"></span></strong> Reward Amount </p>
@* <div class="d-grid">
<p id="rewardAmount" class="reward-text">Available Reward Points: <span class="reward-text" id="rewardValue"></span></p>
@ -231,7 +236,7 @@
ShowAlertMessage(errorCode, errorMsg);
$(document).ready(function () {
GetNotificationList();
GetRewardDetails();
// GetRewardDetails();
});
function GetNotificationList() {
@ -318,6 +323,8 @@
debugger
var result = response.notificationModel;
if (response.responseCode == 0) {
var rewardPoints = response.rewardAmount;
$('#rewardValue').text(rewardPoints);
var notificationDetail = $('#notificationDetail');
var countElement = $('#count');
var notificationCount = response.notificationModel[0].notificationCount;

2
CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout2.cshtml

@ -210,7 +210,7 @@
}
function PopulateNotificationData(response) {
debugger
// debugger
var result = response.notificationModel;
if (response.responseCode == 0) {

60
CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml

@ -7,6 +7,7 @@
.reward-text {
font-size: 16px;
font-weight: bold;
color: green !important;
}
</style>
<div class="container">
@ -49,7 +50,7 @@
<div class="mb-3">
<div class="form-floating">
<select asp-for="SchemeId" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("howToPay", true)" class="form-select" required></select>
<label class="form-label">How do you pay us? </label>
<label class="form-label">How do like to pay? </label>
</div>
</div>
</div>
@ -67,7 +68,7 @@
<div class="mb-3">
<div class="form-floating mb-3">
<input type="text" asp-for="PayoutAmount" class="form-control" placeholder="00.00">
<label for="floatingInput">Receive Amount NPR</label>
<label for="floatingInput" id="floatingInputPcurr">Receive Amount XXX</label>
</div>
</div>
</div>
@ -75,17 +76,17 @@
<div class="row">
<div class="col-md-5">
<div class="mb-3">
@* <p id="rewardAmount" class="reward-text">Available Reward Amount: <span class="reward-text"></span></p> *@
<p id="rewardAmount" class="text mb-2">
You have <span class="reward-text" id="rewardValue">0</span> reward amount available
</p>
<div class="form-floating mb-3">
<input type="text" asp-for="DiscountFee" maxlength="10" class="form-control" placeholder="">
<label for="floatingInput" id="lblReward">Reward Amount</label>
<label for="floatingInput" id="lblReward" placeholder=""> Use Reward Amount</label>
</div>
</div>
</div>
<div class="col-md-4">
@* <div class="mb-3"> *@
<p id="rewardAmount" class="reward-text">Available Reward Points: <span class="reward-text" id="rewardValue"></span></p>
@* </div> *@
</div>
</div>
<div class="row">
<div class="mb-5 mt-2">
@ -170,7 +171,7 @@
</td>
</tr>
<tr>
<td>Total Sent Amount :</td>
<td>Sent Amount :</td>
<td>
<strong><span id="sAmt">0.00 GBP</span></strong>
</td>
@ -183,9 +184,9 @@
</tr>
<tr>
<td>Total Payout Amount(<label id="pCurrency">XXX</label>) :</td>
<td> Payout Amount :</td>
<td>
<strong><span id="payoutAmount">0.00</span></strong>
<strong><span id="payoutAmount">0.00 <label id="pCurrency">XXX</label></span></strong>
</td>
</tr>
@ -225,6 +226,16 @@
$('#Receiver').empty();
}
});
$('#SchemeId').on('change', function () {
var collectionAmount;
var payoutAmount;
if (isNaN(parseFloat($('#CollectAmount').val())))
collectionAmount = 0;
if (isNaN(parseFloat($('#PayoutAmount').val())))
payoutAmount = 0;
if (collectionAmount > 0 | payoutAmount > 0)
DoCalcualtion();
});
$('#CollectAmount').on('change', function () {
if (!isNaN(parseFloat($(this).val())) && parseFloat($(this).val()) > 0) {
@ -244,10 +255,13 @@
});
$("#PayoutAmount").blur(function () {
checkdata($("#hdnCalcBy").val(), 'c');
// checkdata($("#hdnCalcBy").val(), 'c');
});
$("#DiscountFee").blur(function () {
DoCalcualtion();
});
$('#SchemeId').on('change', function () {
alert('a');
GetRewardDetails();
});
});
@ -258,12 +272,8 @@
url: '/GetRewardAmount',
data: {},
success: function (response) {
debugger
var data = response.notificationModel;
if (data.length > 0) {
var rewardPoints = data[0].rewardPoints;
$('#rewardValue').text(rewardPoints);
}
debugger;
$('#rewardValue').text(response.rewardAmount);
},
error: function (error) {
console.error(error);
@ -324,7 +334,7 @@
let payoutAmount = parseFloat($('#PayoutAmount').val());
let promoCode = $('#PromoCode').val();
let calcBy = $('#hdnCalcBy').val();
let discount = $('#DiscountFee').val();
let schemeId = $('#SchemeId').val();
if (calcBy == '') {
@ -370,7 +380,8 @@
PayoutAmount: payoutAmount,
PromoCode: promoCode,
CalcBy: calcBy,
SchemeId: schemeId
SchemeId: schemeId,
DiscountFee: discount
};
$.ajax(
@ -405,7 +416,8 @@
$('#sCharge').text(NumberWithCommas(response.scCharge));
$('#sAmt').text(NumberWithCommas(response.sAmt) + ' ' + response.collCurr);
$('#pCurrency').text(response.pCurr);
$('#floatingInputPcurr').text("Receiving Amount " + response.pCurr);
$('#rewardPoint').text(response.discountedFee);
//set hiddend fields for send money
$('#hdnPayoutPartner').val(response.payoutPartner);
$('#hdnPayoutCurrency').val(response.pCurr);
@ -447,6 +459,7 @@
let exRate = $('#hdnExRate').val();
let forexSessionId = $('#hdnForexSessionId').val();
let processId = $('#hdnProcessId').val();
let discount = $('#DiscountFee').val();
if (calcBy == '') {
ShowAlertMessage(1, 'Invalid param calculate by!');
@ -503,7 +516,8 @@
ForexSessionId: forexSessionId,
ProcessId: processId,
SchemeId: schemeId,
TpExRate: tpExRate
TpExRate: tpExRate,
DiscountFee: discount
};
$.ajax(

Loading…
Cancel
Save