Browse Source

reward amount field and source of fund

feature/19315_Customer-Registration
Leeza Baidar 11 months ago
parent
commit
cd0a97523b
  1. 1
      CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/ITransactionBusiness.cs
  2. 4
      CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs
  3. 1
      CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/ExrateResponse.cs
  4. 1
      CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/ITransactionRepository.cs
  5. 60
      CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/TransactionRepository.cs
  6. 11
      CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs
  7. 43
      CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml

1
CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/ITransactionBusiness.cs

@ -16,5 +16,6 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness
Task<SendMoneySuccessModel> UpdateTranData(TrustPaymentRequest tranData, LoginResponse loginDetails);
Task<CustomerTransactionList> GetTranData(LoginResponse loginDetails);
Task<CustomerTransactionList> GetTransactionReportList(LoginResponse loginDetails, CustomerTransaction model);
Task<CustomerNotificationModel> GetRewardPoints(LoginResponse loginDetails);
}
}

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

@ -345,5 +345,9 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness
{
return await _transactionRepo.GetTransactionReportList(loginDetails, model);
}
public async Task<CustomerNotificationModel> GetRewardPoints(LoginResponse loginDetails)
{
return (CustomerNotificationModel)await _transactionRepo.GetRewardPoints(loginDetails);
}
}
}

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

@ -129,6 +129,7 @@ namespace CustomerOnlineV2.Common.Models.TransactionModel
public string? SchemeId { get; set; }
public string? TpExRate { get; set; }
public string? DiscountFee { get; set; }
public string? SourceOfFund { get; set; }
}
public class SendMoneyRequestModel

1
CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/ITransactionRepository.cs

@ -13,5 +13,6 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository
Task<SendMoneySuccessModel> UpdateTranData(TrustPaymentRequest tranData, LoginResponse loginDetails);
Task<CustomerTransactionList> GetTranData(LoginResponse loginDetails);
Task<CustomerTransactionList> GetTransactionReportList(LoginResponse loginDetails, CustomerTransaction model);
Task<CustomerNotificationModel> GetRewardPoints(LoginResponse loginDetails);
}
}

60
CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/TransactionRepository.cs

@ -378,6 +378,66 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository
}
return await Task.FromResult(_response);
}
public async Task<CustomerNotificationModel> GetRewardPoints(LoginResponse loginDetails)
{
CustomerNotificationModel _response = new CustomerNotificationModel();
try
{
var sql = "EXEC mobile_proc_customerMaster";
sql += " @Flag = " + _connHelper.FilterString("get-invite-details");
// sql += ",@User = " + _connHelper.FilterString(loginDetails.UserName);
sql += ",@sourceCustomerId = " + _connHelper.FilterString(loginDetails.UserId);
_logger.LogDebug("HOMEREPOSITORY | GETREWARDPOINTS | SQL | " + sql);
var dt = _connHelper.ExecuteDataTable(sql);
if (dt == null || dt.Rows.Count <= 0)
{
_response.ResponseCode = ResponseHelper.FAILED;
_response.ResponseMessage = "DB Null Error!";
_logger.LogError("HOMEREPOSITORY | GETREWARDPOINTS | DB RESPONSE | " + JsonConvert.SerializeObject(_response));
}
else
{
//_response.ResponseCode = Convert.ToInt16(dt.Rows[0]["errorCode"]);
//_response.ResponseMessage = Convert.ToString(dt.Rows[0]["msg"]);
List<NotificationModel> obj = new List<NotificationModel>();
foreach (DataRow item in dt.Rows)
{
obj.Add(new NotificationModel
{
//Id = Convert.ToString(item["rowId"]),
//Title = Convert.ToString(item["REWARD_TYPE"]),
RewardAmount = Convert.ToString(item["REWARD_AMOUNT"]),
//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"]),
//IsRead = Convert.ToString(item["isRead"]),
//Type = Convert.ToString(item["type"]),
//SentId = Convert.ToString(item["sentId"]),
// Category = Convert.ToString(item["category"]),
//url = Convert.ToString(item["url"]),
//IsClickable = Convert.ToString(item["isClickable"])
// notificationCount = Convert.ToString(item["notificationCount"])
});
}
_response.NotificationModel = obj;
}
}
catch (Exception ex)
{
_response.ResponseCode = ResponseHelper.EXCEPTION;
_response.ResponseMessage = "Exception occured: " + ex.Message;
_logger.LogError("HOMEREPOSITORY | GETREWARDPOINTS | EXCEPTION | " + JsonConvert.SerializeObject(_response));
}
return await Task.FromResult(_response);
}
}
}

11
CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs

@ -44,6 +44,7 @@ namespace CustomerOnlineV2.Controllers
[Authorization("SendMoney")]
public IActionResult SendMoney()
{
return View();
}
@ -228,6 +229,14 @@ namespace CustomerOnlineV2.Controllers
return await _transactionBusiness.GetTranData(loginDetails);
}
[HttpPost]
[ValidateAntiForgeryToken]
[Authorization("GetRewardDetails")]
public async Task<CustomerNotificationModel> GetRewardDetails()
{
var loginDetails = HttpContext.GetLoginDetails();
return await _transactionBusiness.GetRewardPoints(loginDetails);
}
}
}

43
CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml

@ -66,16 +66,22 @@
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-5">
<div class="mb-3">
<div class="form-floating mb-3">
<input type="text" asp-for="PromoCode" maxlength="10" class="form-control" placeholder="">
<label id="lblReward"></label>
<input type="text" asp-for="DiscountFee" maxlength="10" class="form-control" placeholder="">
<label for="floatingInput" id="lblReward">Reward Amount</label>
</div>
</div>
</div>
<div class="col-md-2">
<div class="mb-3">
<p id="rewardAmount">Your available amount: <span id="rewardValue"></span></p>
</div>
</div>
</div>
<div class="row">
<div class="mb-5 mt-2">
@ -97,6 +103,16 @@
</div>
</div>
</div>
<div class="row">
<div class="col-md-10">
<div class="mb-3">
<div class="form-floating">
<select asp-for="SourceOfFund" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("getSourceOfFound", true)" class="form-select" required></select>
<label class="form-label">Source of Fund</label>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-10">
<div class="mb-3">
@ -194,6 +210,7 @@
@section Scripts{
<script type="text/javascript">
$(document).ready(function () {
GetRewardDetails();
$('#ReceivingCountry').change(function () {
if ($(this).val() != '') {
PopulateDDL('DeliveryMethod', 'pMode', $(this).val(), true, '');
@ -216,8 +233,28 @@
$('#hdnCalcBy').val('c');
}
});
});
function GetRewardDetails() {
$.ajax({
type: 'GET',
contentType: 'application/json; charset=utf-8',
url: '/GetRewardAmount',
data: {},
success: function (response) {
debugger
var data = response.notificationModel;
var rewardAmount = data.rewardAmount;
$('#rewardValue').text(rewardAmount);
},
error: function (error) {
console.error(error);
}
});
}
(function () {
'use strict'
// Fetch all the forms we want to apply custom Bootstrap validation styles to
@ -380,6 +417,7 @@
let promoCode = $('#PromoCode').val();
let calcBy = $('#hdnCalcBy').val();
let receiver = $('#Receiver').val();
let sourceOfFund = $('#SourceOfFund').val();
let purposeOfRemit = $('#PurposeOfRemit').val();
let termsAndConditions = $('#TermsAndConditions').val();
@ -438,6 +476,7 @@
PromoCode: promoCode,
CalcBy: calcBy,
Receiver: receiver,
SourceOfFund: sourceOfFund,
PurposeOfRemit: purposeOfRemit,
TermsAndConditions: termsAndConditions,
PayoutPartner: payoutPartner,

Loading…
Cancel
Save