diff --git a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/AccountBusiness/AccountBusiness.cs b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/AccountBusiness/AccountBusiness.cs index d8b0033..783b109 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/AccountBusiness/AccountBusiness.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/AccountBusiness/AccountBusiness.cs @@ -47,10 +47,15 @@ namespace CustomerOnlineV2.Business.Business.AccountBusiness string random_num = result.ToString(); model.RandomPassword = random_num; + var res =await _accountRepo.PasswordReset(model, logindetails); + if (res.ResponseCode == ResponseHelper.SUCCESS) + { + try + { List bodyMappings = new List(); - bodyMappings.Add(new Mapping() { SValue = "CustomerName", SText = logindetails.FullName }); + bodyMappings.Add(new Mapping() { SValue = "CustomerName", SText = res.Extra2 }); bodyMappings.Add(new Mapping() { SValue = "PASS_WORD", SText = random_num }); - bodyMappings.Add(new Mapping() { SValue = "EMAIL_ID", SText = logindetails.Email }); + bodyMappings.Add(new Mapping() { SValue = "EMAIL_ID", SText = model.Username }); SendNotificationRequest request = new SendNotificationRequest() { IsBulkNotification = false, @@ -76,7 +81,13 @@ namespace CustomerOnlineV2.Business.Business.AccountBusiness _logger.LogDebug("PasswordReset.EMAIL | REQUEST : " + JsonConvert.SerializeObject(request)); var jsonRx1 = NotifierV2.SendNotification(request, NOTIFICATION_TYPE.EMAIL); _logger.LogDebug("PasswordReset.EMAIL | RESPONSE : " + JsonConvert.SerializeObject(jsonRx1)); - return await _accountRepo.PasswordReset(model, logindetails); + } + catch (Exception emailException) + { + _logger.LogError("Error sending email", emailException); + } + } + return res; } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/IRegisterBusiness.cs b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/IRegisterBusiness.cs index 5c86330..620bea5 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/IRegisterBusiness.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/IRegisterBusiness.cs @@ -21,6 +21,6 @@ namespace CustomerOnlineV2.Business.Business.RegisterBusiness Task GetRewardPoints(LoginResponse loginDetails); Task UpdateDocuments(CustomerListModel customer, string Id); Task GetRewardAmount(LoginResponse loginDetails); - Task ValidateReferralCode(OnlineCustomerRegisterModel referralCode); + Task ValidateReferralCode(string referralCode); } } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/RegisterBusiness.cs b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/RegisterBusiness.cs index 0159729..c716793 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/RegisterBusiness.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/RegisterBusiness.cs @@ -7,7 +7,6 @@ using CustomerOnlineV2.Common.Models.RegisterModel; using CustomerOnlineV2.Repository.Repository.RegisterRepository; using Microsoft.Extensions.Logging; using Newtonsoft.Json; -using System.Reflection; using Notify = CustomerOnlineV2.Common.Models.Notification; namespace CustomerOnlineV2.Business.Business.RegisterBusiness @@ -112,7 +111,7 @@ namespace CustomerOnlineV2.Business.Business.RegisterBusiness return (CustomerNotificationModel)await _registerRepository.GetRewardAmount(loginDetails); } - public async Task ValidateReferralCode(OnlineCustomerRegisterModel referralCode) + public async Task ValidateReferralCode(string referralCode) { var referralCodeV1 = await _registerRepository.ValidateReferralCode(referralCode); return referralCodeV1; diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/IRegisterRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/IRegisterRepository.cs index 74ed9a1..dc41723 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/IRegisterRepository.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/IRegisterRepository.cs @@ -19,6 +19,6 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository Task GetRewardPoints(LoginResponse loginDetails); Task UpdateDocument1(CustomerListModel model, string id); Task GetRewardAmount(LoginResponse loginDetails); - Task ValidateReferralCode(OnlineCustomerRegisterModel referralCode); + Task ValidateReferralCode(string referralCode); } } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/RegisterRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/RegisterRepository.cs index 2f5c2f9..8bb61a3 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/RegisterRepository.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/RegisterRepository.cs @@ -453,48 +453,51 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository return await Task.FromResult(_response); } - public async Task ValidateReferralCode(OnlineCustomerRegisterModel referralCode) + public async Task ValidateReferralCode(string referralCode) { + CommonResponse _response = new CommonResponse(); try { var sql = "EXEC JsonRx_Proc_UserRegistration_V2"; sql += " @flag = " + _connHelper.FilterString("chk-valid-referralCode"); - sql += ",@referralCode=" + _connHelper.FilterString(referralCode.ReferralCode); + sql += ",@referralCode=" + _connHelper.FilterString(referralCode); - - - - var dt = _connHelper.ExecuteDataTable(sql); if (dt == null || dt.Rows.Count <= 0) { - referralCode.ResponseCode = ResponseHelper.FAILED; - referralCode.ResponseMessage = "DB Null Error!"; + _response.ResponseCode = ResponseHelper.FAILED; + _response.ResponseMessage = "Invalid Referral code."; + } + else if (dt.Rows[0]["errorcode"].Equals("0")) + { + _response.ResponseCode = ResponseHelper.SUCCESS; + _response.ResponseMessage = ""; + } else { - referralCode.ResponseCode = ResponseHelper.SUCCESS; - referralCode.ResponseMessage = ""; + _response.ResponseCode = ResponseHelper.FAILED; + _response.ResponseMessage = "Invalid Referral code"; } } catch (Exception ex) { - referralCode.ResponseCode = ResponseHelper.EXCEPTION; - referralCode.ResponseMessage = "Exception occured: " + ex.Message; + _response.ResponseCode = ResponseHelper.EXCEPTION; + _response.ResponseMessage = "Exception occured: " + ex.Message; } - return await Task.FromResult(referralCode); + return await Task.FromResult(_response); } } } diff --git a/CustomerOnlineV2/CustomerOnlineV2/Controllers/AccountController.cs b/CustomerOnlineV2/CustomerOnlineV2/Controllers/AccountController.cs index 0ca94eb..29ca44d 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Controllers/AccountController.cs +++ b/CustomerOnlineV2/CustomerOnlineV2/Controllers/AccountController.cs @@ -169,7 +169,7 @@ namespace CustomerOnlineV2.Controllers using (LogContext.PushProperty("DebugId", logindetails.UserName)) { _logger.LogDebug("ACCOUNTCONTROLLER | RESETPASSWORD | REQUEST | " + JsonConvert.SerializeObject(model)); - if (string.IsNullOrEmpty(logindetails.UserName)) + if (string.IsNullOrEmpty(model.Username)) { _logger.LogError("ACCOUNTCONTROLLER | RESETPASSWORD | INVALID logindetails.UserName"); RedirectToAction("Index", "Account"); @@ -179,9 +179,12 @@ namespace CustomerOnlineV2.Controllers Log.Debug("Change password response: " + JsonConvert.SerializeObject(response)); if (response.ResponseCode == ResponseHelper.SUCCESS) { - Log.Debug("ACCOUNTCONTROLLER | RESETPASSWORD | REQUEST ARRIVED | " + logindetails.UserName); + Log.Debug("ACCOUNTCONTROLLER | RESETPASSWORD | REQUEST ARRIVED | " + model.Username); HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme); - return RedirectToAction("Index", "Account"); + + ViewBag.ResponseCode = response.ResponseCode; + ViewBag.ResponseMessage = "New password has been sent in the your email."; + return View(); } else { diff --git a/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs b/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs index 85e7ef1..6d6c13e 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs +++ b/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs @@ -12,8 +12,7 @@ using CustomerOnlineV2.Common.Helper; using CustomerOnlineV2.Common.Models.HomeModel; using CustomerOnlineV2.Common.Models.ReceiverModel; using CustomerOnlineV2.Common.Models.AccountModel; -using CustomerOnlineV2.Business.Business; -using Serilog; +using System.Drawing; namespace CustomerOnlineV2.Controllers { @@ -179,16 +178,15 @@ namespace CustomerOnlineV2.Controllers var loginDetails = HttpContext.GetLoginDetails(); return await _registerBusiness.GetRewardAmount(loginDetails); } - [HttpPost] - [Authorization("ValidateReferralCode")] - public async Task ValidateReferralCode(OnlineCustomerRegisterModel referralCode) + [HttpGet] + [Route("ValidateReferralCode/{referralCode}")] + public async Task ValidateReferralCode(string referralCode) { //var loginDetails = HttpContext.GetLoginDetails(); //ReceiverInformationModel _response = new ReceiverInformationModel(); - var referralCodeV1 = await _registerBusiness.ValidateReferralCode(referralCode); - return referralCodeV1; + return await _registerBusiness.ValidateReferralCode(referralCode); } //[HttpPost] ////[ApplicationLevelAuthentication] diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Account/ResetPassword.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Account/ResetPassword.cshtml index bcb2385..9cf8b89 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Account/ResetPassword.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Account/ResetPassword.cshtml @@ -14,7 +14,7 @@ - + @@ -75,7 +75,7 @@

@*
*@ - +
@@ -99,7 +99,7 @@
Dont have username ? Registration won't take more than 5 min, Register Now
-
Already registered, Login Now
+
Already registered, Login Now
@@ -152,8 +152,32 @@ - + + + + \ No newline at end of file diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerRegistration.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerRegistration.cshtml index 95d07f1..e9cdf60 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerRegistration.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerRegistration.cshtml @@ -499,57 +499,29 @@ // }, 1); // }); - $('#ReferralCode').on('change', function () { + $('#ReferralCode').on('blur', function () { ValidateReferralCode(); }); }); - // function ValidateReferralCode() { - // debugger; - // alert('jh') - // var referralCode = $('#ReferralCode').val(); - // console.log(referralCode) - // $.ajax({ - // type: 'POST', - // contentType: 'application/json; charset=utf-8', - // url: 'Customer/ValidateReferralCode', - // data: JSON.stringify({ referralCode: referralCode }), - // // success: function (response) { - // // debugger; - // // $('#ReferralCode').text(response.membershipId); - // // }, - // error: function (error) { - // console.error(error); - // } - // }); - // } function ValidateReferralCode() { debugger; $.ajax({ - url: "/Customer/ValidateReferralCode", - type: "post", + url: "ValidateReferralCode/" + $("#ReferralCode").val(), + ftype: "get", anync: false, - data: { - //CustomerId: $("#customerId").val(), - referralCode: $("#ReferralCode").val(), - - - - + success: function (response) { + debugger; + if (response.responseCode != 0) { + ShowAlertMessageErrorOnly(response, response.responseMessage); + return false; + } }, - // success: function (response) { - // if (response.responseCode != 0) { - // ShowAlertMessageErrorOnly(data, response.responseMessage); - // return false; - // } - // ShowAlertMessage("0", "Document Updated successfully."); - // //getData(); - // }, error: function (data) { //ShowAlertMessageErrorOnly(1, "Error ocurred during update!"); } diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/Refer.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/Refer.cshtml index 028f002..0a578b9 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/Refer.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/Refer.cshtml @@ -163,7 +163,7 @@

Receive a FREE £5.00 bonus credit as Reward Amount

You and your friend will each be given £5.00 in bonus credit. Get £1.00 after they successfully register, and 4$ after their first transaction.

There may be minimum send requirements.

-

Terms & Conditions

+

Terms & Conditions

@*

Refer IME Londong to your friends & get many more exciting deals
plus discount on your every transfer.

*@

Your Referral Code:

@@ -243,8 +243,7 @@ var totalRewardPoints = data.length > 0 ? data[0].rewardPoints : 0; $('#showRewardPoints').text(totalRewardPoints); - var referralCode = data.length > 0 ? data[0].referralCode : ''; - $('#referralCode').val(referralCode); + var tableBody = $('#reward-table-body'); tableBody.empty(); diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout2.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout2.cshtml index fe66e79..7a62a92 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout2.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout2.cshtml @@ -121,9 +121,9 @@
  • Change Password
    • -
  • + @*
  • Promotion Details -
    • + *@
  • Sign Out diff --git a/CustomerOnlineV2/CustomerOnlineV2/wwwroot/js/Custom.js b/CustomerOnlineV2/CustomerOnlineV2/wwwroot/js/Custom.js index e0b5975..222d2be 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/wwwroot/js/Custom.js +++ b/CustomerOnlineV2/CustomerOnlineV2/wwwroot/js/Custom.js @@ -110,7 +110,7 @@ function ShowAlertMessageErrorOnly(errorCode, errorMessage) { else { iziToast.info({ title: 'Info', - timeout: 500, + timeout: 1000, message: errorMessage }); }