From aa7e3669a7a3c60a755491c1137e0823621fe977 Mon Sep 17 00:00:00 2001 From: Shakun Shrestha Date: Wed, 15 May 2024 00:23:46 +0545 Subject: [PATCH] change from master --- .../Common/Enum/Notification_BACKUP_1404.cs | 70 ----------- .../Common/Enum/Notification_BASE_1404.cs | 60 --------- .../Common/Enum/Notification_LOCAL_1404.cs | 62 ---------- .../Common/Enum/Notification_REMOTE_1404.cs | 63 ---------- Swift.DAL/Agentpanel/Domain/IRHTranDetail.cs | 2 + Swift.DAL/Agentpanel/Send/SendTranIRHDao.cs | 27 ++-- Swift.DAL/MobileDao/MobileConfigDao.cs | 3 +- .../Remittance/APIPartner/APIPartnerDao.cs | 3 +- .../ReferralSetup/ReferralSetupDao.cs | 18 +-- Swift.DAL/Remittance/TPSetup/PartnerDao.cs | 2 +- .../CustomerRegistration/Manage.aspx | 1 - .../CustomerRegistration/Manage.aspx.cs | 2 +- Swift.web/AgentNew/AgentSend/SendV2.aspx.cs | 1 + .../ReferralReport/ReferralReportNew.aspx | 13 +- .../ReferralReport/ReferralReportNew.aspx.cs | 39 +++--- .../Reports/ReferralReport/SearchNew.aspx | 8 +- .../ReferralReport/SearchNew.aspx.designer.cs | 16 +-- .../AgentNew/SendOnBehalf/SendV2.aspx.cs | 3 +- Swift.web/AgentNew/SendTxn/Confirm.aspx | 2 + Swift.web/AgentNew/SendTxn/Confirm.aspx.cs | 19 ++- .../AgentNew/SendTxn/Confirm.aspx.designer.cs | 2 + Swift.web/AgentNew/SendTxn/SendV2.aspx | 74 ++++++++++- Swift.web/AgentNew/SendTxn/SendV2.aspx.cs | 8 +- .../AgentNew/SendTxn/SendV2.aspx.designer.cs | 27 ++++ .../AgentNew/js/SendTxn/agentAndLocation.js | 2 +- Swift.web/AgentNew/js/SendTxn/sendTxnInfo.js | 52 ++++---- .../AgentNew/js/SendTxn/usableunctions.js | 3 + .../International/SendMoney/Send.aspx.cs | 1 + .../International/SendMoney/SendV2.aspx.cs | 1 + .../International/SendMoneyv2/SendV2.aspx.cs | 1 + .../International/SendOnBehalf/SendV2.aspx.cs | 1 + .../Send/SendTransaction/Send.aspx.cs | 1 + Swift.web/DashboardV2/Dashboard2.aspx | 15 +++ Swift.web/Download.aspx.cs | 81 +++++++++++- Swift.web/Library/PasswordGenerator.cs | 10 ++ .../PushNotification/ManageBroadCast.aspx | 117 ++++++++++++------ .../PushNotification/ManageBroadCast.aspx.cs | 5 +- .../ManageBroadCast.aspx.designer.cs | 25 ++-- .../CustomerRegistrationStatus.aspx.cs | 2 +- .../PromotionalRateSetup/List.aspx.cs | 5 +- .../PromotionalRateSetup/Manage.aspx | 11 ++ .../PromotionalRateSetup/Manage.aspx.cs | 3 +- .../Manage.aspx.designer.cs | 27 ++++ .../CustomerRegistration/Manage.aspx.cs | 23 ++-- .../Administration/CustomerSetup/List.aspx.cs | 8 +- .../Administration/PromotionalRateDao.cs | 3 +- .../ReferralSetup/Manage.aspx.cs | 5 +- .../ReferPointMasterSetup.aspx.cs | 4 +- .../ReferralSetup/ReferPointSetup.aspx.cs | 6 +- .../ReferralSetup/CommisionRuleSetup.aspx | 22 ++-- .../ReferralSetup/CommisionRuleSetup.aspx.cs | 60 ++++----- .../CommisionRuleSetup.aspx.designer.cs | 78 ++---------- .../ReferralSetup/CommissionRuleList.aspx | 4 +- .../ReferralSetup/CommissionRuleList.aspx.cs | 14 +-- Swift.web/Remit/ReferralSetup/List.aspx.cs | 6 +- Swift.web/Remit/ReferralSetup/Manage.aspx | 67 +++++++--- Swift.web/Remit/ReferralSetup/Manage.aspx.cs | 25 ++-- .../ReferralSetup/Manage.aspx.designer.cs | 78 +++++------- .../BankAndBranchSetup/AddBankMapping.aspx | 2 +- .../BankAndBranchSetup/AddBankMapping.aspx.cs | 2 +- .../AddBankMapping.aspx.designer.cs | 2 +- .../PromotionalCampaign/List.aspx.cs | 1 + .../PromotionalCampaign/Manage.aspx | 40 +++++- .../PromotionalCampaign/Manage.aspx.cs | 2 +- .../Manage.aspx.designer.cs | 47 ++++--- .../ReferralReport/ReferralReportComm.aspx | 34 ++--- .../ReferralReport/ReferralReportComm.aspx.cs | 104 +++++----------- .../ReferralReport/SearchReferralReport.aspx | 4 +- .../Remit/UserControl/UcTransaction.ascx.cs | 2 +- .../DynamicReport/DynamicReportView.aspx | 2 +- .../DynamicReport/DynamicReportView.aspx.cs | 10 ++ .../RemittanceReports/Reports.aspx.cs | 4 +- Swift.web/Responsive/Send/SendV2.aspx.cs | 1 + .../UserManagement/AgentSetup/Manage.aspx | 5 +- .../AgentSetup/Manage.aspx.designer.cs | 7 +- Swift.web/js/swift_grid.js | 8 ++ 76 files changed, 814 insertions(+), 754 deletions(-) delete mode 100644 Swift.API/Common/Enum/Notification_BACKUP_1404.cs delete mode 100644 Swift.API/Common/Enum/Notification_BASE_1404.cs delete mode 100644 Swift.API/Common/Enum/Notification_LOCAL_1404.cs delete mode 100644 Swift.API/Common/Enum/Notification_REMOTE_1404.cs diff --git a/Swift.API/Common/Enum/Notification_BACKUP_1404.cs b/Swift.API/Common/Enum/Notification_BACKUP_1404.cs deleted file mode 100644 index 8cd857b..0000000 --- a/Swift.API/Common/Enum/Notification_BACKUP_1404.cs +++ /dev/null @@ -1,70 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Swift.API.Common.Enum -{ - [DefaultValue(NONE)] - public enum NotifyTemplate - { - NONE, - - - [Description("Email to customer txn is created for bank transfer")] - BANK_TRANSFER_TXN_PENDING = 1, - - [Description("Email to customer after txn payment is cleared by IME London")] - BANK_TRANSFER_TXN_CLEARED = 2, - - [Description("Email to customer after txn is accepted by Pay-out partner")] - BANK_TXN_POST = 3, - - [Description("Email to customer after txn has been accepted by Pay-out partner (Cash Collection)")] - CASH_TXN_POST = 4, - - [Description("Email to customer for reset password. JsonRX")] - RESET_PASSWORD_EMAIL = 5, - - [Description("Email to customer after Basic Registration has been completed")] - BASIC_REGISTRATION_EMAIL = 6, - - [Description("Email to customer after KYC completion")] - KYC_VERIFICATION_EMAIL = 7, - - [Description("Email to customer for OTP")] - OTP_EMAIL = 8, -<<<<<<< HEAD - - [Description("Customer Password and Txn Pin")] - PIN_PASSWORD_EMAIL = 20, - FORCE_PASSWORD_CHANGE=9, -======= - - [Description("Customer Password and Txn Pin")] - PIN_PASSWORD_EMAIL = 20, - - FORCE_PASSWORD_CHANGE =9, ->>>>>>> 5b31b325d13826c742cc26f037a36f94f71d5634 - - TRANSACTION_APPROVED = 10, - - TRANSACTION_MODIFY = 11, - - JP_POST_APPROVED = 12, - - TRANSACTION_CANCELLED = 13, - - TRANSACTION_PAID = 14, - - TRANSACTION_SUCCESS = 15, - - TF_NO_BALANCE = 16, - - CUSTOMER_MOBILE_NOT_REGISTER = 17, - CUSTOMER_LAWSON_REGISTER = 18, - CUSTOMER_REFERRAL_500 = 19 - } -} diff --git a/Swift.API/Common/Enum/Notification_BASE_1404.cs b/Swift.API/Common/Enum/Notification_BASE_1404.cs deleted file mode 100644 index 93f7e46..0000000 --- a/Swift.API/Common/Enum/Notification_BASE_1404.cs +++ /dev/null @@ -1,60 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Swift.API.Common.Enum -{ - [DefaultValue(NONE)] - public enum NotifyTemplate - { - NONE, - - - [Description("Email to customer txn is created for bank transfer")] - BANK_TRANSFER_TXN_PENDING = 1, - - [Description("Email to customer after txn payment is cleared by IME London")] - BANK_TRANSFER_TXN_CLEARED = 2, - - [Description("Email to customer after txn is accepted by Pay-out partner")] - BANK_TXN_POST = 3, - - [Description("Email to customer after txn has been accepted by Pay-out partner (Cash Collection)")] - CASH_TXN_POST = 4, - - [Description("Email to customer for reset password. JsonRX")] - RESET_PASSWORD_EMAIL = 5, - - [Description("Email to customer after Basic Registration has been completed")] - BASIC_REGISTRATION_EMAIL = 6, - - [Description("Email to customer after KYC completion")] - KYC_VERIFICATION_EMAIL = 7, - - [Description("Email to customer for OTP")] - OTP_EMAIL = 8, - - FORCE_PASSWORD_CHANGE=9, - - TRANSACTION_APPROVED = 10, - - TRANSACTION_MODIFY = 11, - - JP_POST_APPROVED = 12, - - TRANSACTION_CANCELLED = 13, - - TRANSACTION_PAID = 14, - - TRANSACTION_SUCCESS = 15, - - TF_NO_BALANCE = 16, - - CUSTOMER_MOBILE_NOT_REGISTER = 17, - CUSTOMER_LAWSON_REGISTER = 18, - CUSTOMER_REFERRAL_500 = 19 - } -} diff --git a/Swift.API/Common/Enum/Notification_LOCAL_1404.cs b/Swift.API/Common/Enum/Notification_LOCAL_1404.cs deleted file mode 100644 index 4a7bd51..0000000 --- a/Swift.API/Common/Enum/Notification_LOCAL_1404.cs +++ /dev/null @@ -1,62 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Swift.API.Common.Enum -{ - [DefaultValue(NONE)] - public enum NotifyTemplate - { - NONE, - - - [Description("Email to customer txn is created for bank transfer")] - BANK_TRANSFER_TXN_PENDING = 1, - - [Description("Email to customer after txn payment is cleared by IME London")] - BANK_TRANSFER_TXN_CLEARED = 2, - - [Description("Email to customer after txn is accepted by Pay-out partner")] - BANK_TXN_POST = 3, - - [Description("Email to customer after txn has been accepted by Pay-out partner (Cash Collection)")] - CASH_TXN_POST = 4, - - [Description("Email to customer for reset password. JsonRX")] - RESET_PASSWORD_EMAIL = 5, - - [Description("Email to customer after Basic Registration has been completed")] - BASIC_REGISTRATION_EMAIL = 6, - - [Description("Email to customer after KYC completion")] - KYC_VERIFICATION_EMAIL = 7, - - [Description("Email to customer for OTP")] - OTP_EMAIL = 8, - - [Description("Customer Password and Txn Pin")] - PIN_PASSWORD_EMAIL = 20, - FORCE_PASSWORD_CHANGE=9, - - TRANSACTION_APPROVED = 10, - - TRANSACTION_MODIFY = 11, - - JP_POST_APPROVED = 12, - - TRANSACTION_CANCELLED = 13, - - TRANSACTION_PAID = 14, - - TRANSACTION_SUCCESS = 15, - - TF_NO_BALANCE = 16, - - CUSTOMER_MOBILE_NOT_REGISTER = 17, - CUSTOMER_LAWSON_REGISTER = 18, - CUSTOMER_REFERRAL_500 = 19 - } -} diff --git a/Swift.API/Common/Enum/Notification_REMOTE_1404.cs b/Swift.API/Common/Enum/Notification_REMOTE_1404.cs deleted file mode 100644 index a656eb3..0000000 --- a/Swift.API/Common/Enum/Notification_REMOTE_1404.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Swift.API.Common.Enum -{ - [DefaultValue(NONE)] - public enum NotifyTemplate - { - NONE, - - - [Description("Email to customer txn is created for bank transfer")] - BANK_TRANSFER_TXN_PENDING = 1, - - [Description("Email to customer after txn payment is cleared by IME London")] - BANK_TRANSFER_TXN_CLEARED = 2, - - [Description("Email to customer after txn is accepted by Pay-out partner")] - BANK_TXN_POST = 3, - - [Description("Email to customer after txn has been accepted by Pay-out partner (Cash Collection)")] - CASH_TXN_POST = 4, - - [Description("Email to customer for reset password. JsonRX")] - RESET_PASSWORD_EMAIL = 5, - - [Description("Email to customer after Basic Registration has been completed")] - BASIC_REGISTRATION_EMAIL = 6, - - [Description("Email to customer after KYC completion")] - KYC_VERIFICATION_EMAIL = 7, - - [Description("Email to customer for OTP")] - OTP_EMAIL = 8, - - [Description("Customer Password and Txn Pin")] - PIN_PASSWORD_EMAIL = 20, - - FORCE_PASSWORD_CHANGE =9, - - TRANSACTION_APPROVED = 10, - - TRANSACTION_MODIFY = 11, - - JP_POST_APPROVED = 12, - - TRANSACTION_CANCELLED = 13, - - TRANSACTION_PAID = 14, - - TRANSACTION_SUCCESS = 15, - - TF_NO_BALANCE = 16, - - CUSTOMER_MOBILE_NOT_REGISTER = 17, - CUSTOMER_LAWSON_REGISTER = 18, - CUSTOMER_REFERRAL_500 = 19 - } -} diff --git a/Swift.DAL/Agentpanel/Domain/IRHTranDetail.cs b/Swift.DAL/Agentpanel/Domain/IRHTranDetail.cs index 43c528d..547d9dc 100644 --- a/Swift.DAL/Agentpanel/Domain/IRHTranDetail.cs +++ b/Swift.DAL/Agentpanel/Domain/IRHTranDetail.cs @@ -158,6 +158,8 @@ public string rewardAmt { get; set; } public string paymentOption { get; set; } public string siteReference { get; set; } + public string isPromoCode { get; set; } + public string rowId { get; set; } } public class IRHTranDetailNew diff --git a/Swift.DAL/Agentpanel/Send/SendTranIRHDao.cs b/Swift.DAL/Agentpanel/Send/SendTranIRHDao.cs index 07fc164..8cc2333 100644 --- a/Swift.DAL/Agentpanel/Send/SendTranIRHDao.cs +++ b/Swift.DAL/Agentpanel/Send/SendTranIRHDao.cs @@ -78,10 +78,8 @@ namespace Swift.DAL.BL.AgentPanel.Send { var sql = "EXEC proc_countryRateMaster @flag='payment-method'"; sql += ", @countryId = " + FilterString(pCountryId); - return ExecuteDataTable(sql); } - public DataTable LoadCustomerData(string searchType, string searchValue, string flag, string sCountryId, string settlementAgent) { var sql = "EXEC proc_searchCustomerIRH @flag =" + FilterString(flag); @@ -407,7 +405,7 @@ namespace Swift.DAL.BL.AgentPanel.Send public DataTable GetExRate(string user, string sCountryId, string sSuperAgent, string sAgent, string sBranch, string collCurr, string pCountryId, string pAgent, string pCurr, string deliveryMethod, string cAmt, string pAmt, - string schemeCode, string senderId, string introducer, string sessionId, string couponId, string tpExRate, string rewardAmt, string isManualSc = "", + string schemeCode, string senderId, string introducer, string sessionId, string couponId, string tpExRate, string rewardAmt, string customerId, string isManualSc = "", string sc = "", string calcBy = "", string payoutPartner = "") { var sql = "EXEC proc_sendIRH @flag = 'exRate'"; @@ -429,12 +427,13 @@ namespace Swift.DAL.BL.AgentPanel.Send sql += ", @couponTranNo = " + FilterString(couponId); sql += ", @tpExRate = " + FilterString(tpExRate); sql += ", @rewardAmt = " + FilterString(rewardAmt); + sql += ", @customerId = " + FilterString(customerId); sql += ", @isManualSc = " + FilterString(isManualSc); sql += ", @partnerId = " + FilterString(payoutPartner); sql += ", @manualSc = " + FilterString(sc); sql += ", @calcBy = " + FilterString(calcBy); sql += ", @introducer = " + FilterString(introducer); - + var ds = ExecuteDataset(sql); if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) @@ -477,7 +476,7 @@ namespace Swift.DAL.BL.AgentPanel.Send string pCountryId, string pAgent, string pCurr, string deliveryMethod, string cAmt, string pAmt, string schemeCode, string senderId, string sessionId, string couponId , string isManualSc, string sc - , string exRateTp, string pCurrTp, string calcBy, string introducer, string rewardAmt, string payoutPartner = "") + , string exRateTp, string pCurrTp, string calcBy, string introducer, string rewardAmt, string customerId, string payoutPartner = "") { var sql = "EXEC proc_sendIRHTP @flag = 'exRate'"; sql += ", @user = " + FilterString(user); @@ -502,8 +501,8 @@ namespace Swift.DAL.BL.AgentPanel.Send sql += ", @partnerId = " + FilterString(payoutPartner); sql += ", @manualSc = " + FilterString(sc); sql += ", @rewardAmt = " + FilterString(rewardAmt); + sql += ", @customerId = " + FilterString(customerId); sql += ", @introducer = " + FilterString(introducer); - //sql += ", @calcBy = " + FilterString(calcBy); var ds = ExecuteDataset(sql); @@ -785,6 +784,8 @@ namespace Swift.DAL.BL.AgentPanel.Send sql += ", @portOfShipment = " + FilterString(trn.portOfShipment); sql += ", @calculatedOriginalSc = " + FilterString(trn.calcOriginalSc); sql += ", @rewardAmt = " + FilterString(trn.rewardAmt); + sql += ", @isPromoCode = " + FilterString(trn.isPromoCode); + sql += ", @promoRowId = " + FilterString(trn.rowId); var ds = ExecuteDataset(sql); if (ds == null || ds.Tables.Count == 0) @@ -1006,6 +1007,7 @@ namespace Swift.DAL.BL.AgentPanel.Send sql += ", @tpExRate = " + FilterString(trn.tpExRate); sql += ", @calculatedOriginalSc = " + FilterString(trn.calcOriginalSc); sql += ", @rewardAmt = " + FilterString(trn.rewardAmt); + sql += ", @isPromoCode = " + FilterString(trn.isPromoCode); var ds = ExecuteDataset(sql); if (ds == null || ds.Tables.Count == 0) return null; @@ -1119,12 +1121,6 @@ namespace Swift.DAL.BL.AgentPanel.Send return ParseDbResult(sql); } - //public DataTable GetAgentQuota(string user) - //{ - // var sql = "EXEC ProcIntroducerCommissionSetup @flag = 'checkAgentQuota'"; - // sql += ", @user = " + FilterString(user); - // return ExecuteDataTable(sql); - //} public DataTable GetAgentQuota(string customerId) { var sql = "EXEC ProcIntroducerCommissionSetup @flag = 'getRewardAmount'"; @@ -1307,6 +1303,9 @@ namespace Swift.DAL.BL.AgentPanel.Send sql += ", @trackBy = " + FilterString(trn.trackBy); sql += ", @nameAsPerBank = " + FilterString(trn.nameAsPerBank); sql += ", @calculatedOriginalSc = " + FilterString(trn.calcOriginalSc); + sql += ", @calculatedOriginalSc = " + FilterString(trn.calcOriginalSc); + sql += ", @isPromoCode = " + FilterString(trn.isPromoCode); + sql += ", @promoRowId = " + FilterString(trn.rowId); return ParseDbResultV2(sql); } @@ -1456,10 +1455,12 @@ namespace Swift.DAL.BL.AgentPanel.Send sql += ", @portOfShipment = " + FilterString(trn.portOfShipment); sql += ", @trackBy = " + FilterString(trn.trackBy); sql += ", @nameAsPerBank = " + FilterString(trn.nameAsPerBank); - sql += ", @calculatedOriginalSc = " + FilterString(trn.calcOriginalSc); + sql += ", @calculatedOriginalSc = " + FilterString(trn.calcOriginalSc); sql += ", @paymentOption = " + FilterString(trn.paymentOption); sql += ", @siteReference = " + FilterString(trn.siteReference); sql += ", @rewardAmt = " + FilterString(trn.rewardAmt); + sql += ", @isPromoCode = " + FilterString(trn.isPromoCode); + sql += ", @promoRowId = " + FilterString(trn.rowId); return ParseDbResult(sql); } diff --git a/Swift.DAL/MobileDao/MobileConfigDao.cs b/Swift.DAL/MobileDao/MobileConfigDao.cs index ba7722a..a6fa41d 100644 --- a/Swift.DAL/MobileDao/MobileConfigDao.cs +++ b/Swift.DAL/MobileDao/MobileConfigDao.cs @@ -78,7 +78,7 @@ namespace Swift.DAL.MobileDao return ParseDbResult(sql); } - public DbResult SaveBroadCastCustomer(string user, string rowId, string customerId, string msgType, string body, string customerType , string nativeCountry) + public DbResult SaveBroadCastCustomer(string user, string rowId, string customerId, string msgType, string body, string customerType , string nativeCountry, string postCode) { var sql = "EXEC ProcMobileConfig @flag = '" + (string.IsNullOrEmpty(rowId) ? "IN-BROADCAST" : "UN-BROADCAST") + "'"; sql += ", @User = " + FilterString(user); @@ -88,6 +88,7 @@ namespace Swift.DAL.MobileDao sql += ", @msgType = " + FilterString(msgType); sql += ", @customerType = " + FilterString(customerType); sql += ", @nativeCountry = " + FilterString(nativeCountry); + sql += ", @postCode = " + FilterString(postCode); return ParseDbResult(sql); } diff --git a/Swift.DAL/Remittance/APIPartner/APIPartnerDao.cs b/Swift.DAL/Remittance/APIPartner/APIPartnerDao.cs index e561b60..03cc44d 100644 --- a/Swift.DAL/Remittance/APIPartner/APIPartnerDao.cs +++ b/Swift.DAL/Remittance/APIPartner/APIPartnerDao.cs @@ -72,7 +72,7 @@ namespace Swift.DAL.Remittance.APIPartner public DbResult InsertUpdatePromotion(string user, string flag, string rowId, string promotionCode, string promotionMsg , string promotionType, string country, string paymentMethod, string isActive, string startDt - , string endDt, string promotionAmount) + , string endDt, string promotionAmount, string minAmt) { var sql = "EXEC PROC_PROMOTIONAL_CAMPAIGN @flag = '" + flag + "'"; sql += ", @user = " + FilterString(user); @@ -86,6 +86,7 @@ namespace Swift.DAL.Remittance.APIPartner sql += ", @IS_ACTIVE = " + FilterString(isActive); sql += ", @START_DT = " + FilterString(startDt); sql += ", @END_DT = " + FilterString(endDt); + sql += ", @MIN_AMT = " + FilterString(minAmt); return ParseDbResult(sql); } diff --git a/Swift.DAL/Remittance/ReferralSetup/ReferralSetupDao.cs b/Swift.DAL/Remittance/ReferralSetup/ReferralSetupDao.cs index e0ecc62..bf0da41 100644 --- a/Swift.DAL/Remittance/ReferralSetup/ReferralSetupDao.cs +++ b/Swift.DAL/Remittance/ReferralSetup/ReferralSetupDao.cs @@ -12,7 +12,7 @@ namespace Swift.DAL.Remittance.ReferralSetup string referralAddress, string referralEmail, string isActive, string referralMobile, string branchId, string rowId, string referralTypecode, string referralType, - string ruleType, string cashHoldLimitAmount) + string cashHoldLimitAmount, string refCode, string regRule) { var sql = "EXEC PROC_REFERALSETUP @flag = '" + flag + "'"; sql += ", @user = " + FilterString(user); @@ -25,8 +25,10 @@ namespace Swift.DAL.Remittance.ReferralSetup sql += ", @rowId = " + FilterString(rowId); sql += ", @referralTypecode = " + FilterString(referralTypecode); sql += ", @referralType = " + FilterString(referralType); - sql += ", @ruleType = " + FilterString(ruleType); + //sql += ", @ruleType = " + FilterString(ruleType); sql += ", @cashHoldLimitAmount = " + FilterString(cashHoldLimitAmount); + sql += ", @referralCode = " + FilterString(refCode); + sql += ", @ruleType = " + FilterString(regRule); //sql += ", @DEDUCT_TAX_ON_SC = " + FilterString(deductTaxOnSC); return ParseDbResult(sql); @@ -120,17 +122,17 @@ namespace Swift.DAL.Remittance.ReferralSetup sql += ", @user = " + FilterString(user); sql += ", @referralId = " + FilterString(cm.ReferralId.ToString()); sql += ", @ROW_ID = " + FilterString(cm.ROW_ID.ToString()); - sql += ", @partnerId = " + FilterString(cm.PartnerId.ToString()); + //sql += ", @partnerId = " + FilterString(cm.PartnerId.ToString()); sql += ", @commissionPercent = " + FilterString(cm.CommissionPercent.ToString()); - sql += ", @forexPercent = " + FilterString(cm.ForexPercent.ToString()); - sql += ", @applyFxPercentOn = " + FilterString(cm.ApplyFxPercentOn.ToString()); + //sql += ", @forexPercent = " + FilterString(cm.ForexPercent.ToString()); + //sql += ", @applyFxPercentOn = " + FilterString(cm.ApplyFxPercentOn.ToString()); sql += ", @flatTxnWise = " + FilterString(cm.FlatTxnWise.ToString()); - sql += ", @NewCustomer = " + FilterString(cm.NewCustomer.ToString()); + // sql += ", @NewCustomer = " + FilterString(cm.NewCustomer.ToString()); sql += ", @effectiveFrom = " + FilterString(cm.EffectiveFrom.ToString()); sql += ", @isActive = " + FilterString(cm.isActive); sql += ", @referralCode = " + FilterString(cm.ReferralCode); - sql += ", @DEDUCT_TAX_ON_SC = " + FilterString(cm.deductTaxOnSC); - sql += ", @DEDUCT_P_COMM_ON_SC = " + FilterString(cm.deductPCommOnSC); + //sql += ", @DEDUCT_TAX_ON_SC = " + FilterString(cm.deductTaxOnSC); + //sql += ", @DEDUCT_P_COMM_ON_SC = " + FilterString(cm.deductPCommOnSC); return ParseDbResult(sql); } } diff --git a/Swift.DAL/Remittance/TPSetup/PartnerDao.cs b/Swift.DAL/Remittance/TPSetup/PartnerDao.cs index 39ced13..9da8682 100644 --- a/Swift.DAL/Remittance/TPSetup/PartnerDao.cs +++ b/Swift.DAL/Remittance/TPSetup/PartnerDao.cs @@ -42,7 +42,7 @@ namespace Swift.DAL.Remittance.Partner return ExecuteDataset(sql); } - public DataSet CashStatusReportReferralNew(string user, string fromDate, string toDate, string referralAcctNum, string flag, string agentId = "") + public DataSet CashStatusReportReferralNew(string user, string fromDate, string toDate, string referralAcctNum, string flag, string agentId) { string sql = "EXEC PROC_CASH_STATUS_REPORT_REFERRAL @FLAG = " + FilterString(flag); sql += ",@user=" + FilterString(user); diff --git a/Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx b/Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx index 818622a..d3fefc0 100644 --- a/Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx +++ b/Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx @@ -166,7 +166,6 @@ $("#apiDataPopup").modal("hide"); }) - }) //$("#ContentPlaceHolder1_occupation").prop("disabled", true); <%-- $("#<%=verificationTypeNo.ClientID%>").on("change", function () { var idtype = $("#<%=idType.ClientID%>").val(); diff --git a/Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx.cs b/Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx.cs index 843f9bf..7bffe91 100644 --- a/Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx.cs +++ b/Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx.cs @@ -220,7 +220,7 @@ namespace Swift.web.AgentNew.Administration.CustomerSetup.CustomerRegistration { var postCode = zipCode.ToUpper(); string ProcessId = Guid.NewGuid().ToString().Replace("-", "") + ":" + postCode; - string methodType = "loqate"; //Utility.ReadWebConfig("methodType", ""); + string methodType = Utility.ReadWebConfig("methodType", ""); string countryName = "United Kingdom"; AddressRequest requestObj = new AddressRequest() diff --git a/Swift.web/AgentNew/AgentSend/SendV2.aspx.cs b/Swift.web/AgentNew/AgentSend/SendV2.aspx.cs index ad6fc57..b1c2e6b 100644 --- a/Swift.web/AgentNew/AgentSend/SendV2.aspx.cs +++ b/Swift.web/AgentNew/AgentSend/SendV2.aspx.cs @@ -998,6 +998,7 @@ namespace Swift.web.AgentNew.AgentSend , GetStatic.GetSessionId() , couponId , rewardAmt + ,"" , isManualSc , sc); diff --git a/Swift.web/AgentNew/Reports/ReferralReport/ReferralReportNew.aspx b/Swift.web/AgentNew/Reports/ReferralReport/ReferralReportNew.aspx index 37ea9bb..807d895 100644 --- a/Swift.web/AgentNew/Reports/ReferralReport/ReferralReportNew.aspx +++ b/Swift.web/AgentNew/Reports/ReferralReport/ReferralReportNew.aspx @@ -50,12 +50,13 @@ - - - - - - + + + + + + + diff --git a/Swift.web/AgentNew/Reports/ReferralReport/ReferralReportNew.aspx.cs b/Swift.web/AgentNew/Reports/ReferralReport/ReferralReportNew.aspx.cs index c148a6c..00917d8 100644 --- a/Swift.web/AgentNew/Reports/ReferralReport/ReferralReportNew.aspx.cs +++ b/Swift.web/AgentNew/Reports/ReferralReport/ReferralReportNew.aspx.cs @@ -44,32 +44,43 @@ namespace Swift.web.AgentNew.Reports.ReferralReport string referralAcctNum = GetStatic.ReadQueryString("referralAcctNum", ""); string flag = GetStatic.ReadQueryString("flag", ""); string user = GetStatic.GetUser(); + string refId = GetStatic.GetMapCodeDom(); - DataSet ds = _dao.CashStatusReportReferralNew(user, fromDate, toDate, referralAcctNum, flag, GetStatic.GetSettlingAgent()); + DataSet ds = _dao.CashStatusReportReferralNew(user, fromDate, toDate, referralAcctNum, flag, refId); StringBuilder sb = new StringBuilder(""); - int sNo = 0; - double totalOpeningAmt = 0; - double totalInAmt = 0; - double totalOutAmt = 0; - double totalClosingAmt = 0; + int sNo = 1; + double tranPtsTotal = 0, regPtsTotal = 0, total = 0; string agentId = ""; foreach (DataRow item in ds.Tables[0].Rows) { - agentId = item["AGENTID"].ToString(); - DataRow[] rows = ds.Tables[1].Select("BRANCH_ID = ('" + agentId + "')"); + string REFERRAL_NAME = item["REFERRAL_NAME"].ToString(); + string DATE = item["DATE"].ToString(); + string tranPts = item["FX_PCNT"].ToString(); + string regPts = item["COMMISSION_PCNT"].ToString(); + total = 0; sb.AppendLine(""); - sb.AppendLine(""); - sb.AppendLine(GetRows(item["AGENTNAME"].ToString(), rows, ref sNo, ref totalOpeningAmt, ref totalInAmt, ref totalOutAmt, ref totalClosingAmt)); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + tranPtsTotal += Convert.ToDouble(tranPts); + regPtsTotal += Convert.ToDouble(regPts); + sNo++; + sb.AppendLine(""); } - sb.AppendLine(""); - sb.AppendLine(""); - sb.AppendLine(""); - sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); sb.AppendLine(""); cashCollectedList.InnerHtml = sb.ToString(); + } private string GetRows(string agentName, DataRow[] rows, ref int sNo, ref double totalOpeningAmt, ref double totalInAmt, ref double totalOutAmt, ref double totalClosingAmt) diff --git a/Swift.web/AgentNew/Reports/ReferralReport/SearchNew.aspx b/Swift.web/AgentNew/Reports/ReferralReport/SearchNew.aspx index f19527b..268434f 100644 --- a/Swift.web/AgentNew/Reports/ReferralReport/SearchNew.aspx +++ b/Swift.web/AgentNew/Reports/ReferralReport/SearchNew.aspx @@ -57,7 +57,7 @@ -
+ @@ -107,7 +107,7 @@ if (type == 'd') { url = "../../../AccountReport/AccountStatement/StatementDetails.aspx?endDate=" + endDate + "&type=a&startDate=" + startDate + "&acNum="+referralAcctNum+"&acName="+referralAcctName+""; } else if (type == 's') { - url = "ReferralReportNew.aspx?flag=cash-rpt-new&fromDate=" + startDate + "&toDate=" + endDate + "&referralAcctNum=" + referralAcctNum +"&acName="+referralAcctName+""; + url = "ReferralReportNew.aspx?flag=summary&fromDate=" + startDate + "&toDate=" + endDate + "&referralAcctNum=" + referralAcctNum +"&acName="+referralAcctName+""; } OpenInNewWindow(url); } diff --git a/Swift.web/AgentNew/Reports/ReferralReport/SearchNew.aspx.designer.cs b/Swift.web/AgentNew/Reports/ReferralReport/SearchNew.aspx.designer.cs index dcb3f74..a009d7d 100644 --- a/Swift.web/AgentNew/Reports/ReferralReport/SearchNew.aspx.designer.cs +++ b/Swift.web/AgentNew/Reports/ReferralReport/SearchNew.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace Swift.web.AgentNew.Reports.ReferralReport { - - - public partial class SearchNew { - +namespace Swift.web.AgentNew.Reports.ReferralReport +{ + + + public partial class SearchNew + { + /// /// startDate control. /// @@ -20,7 +22,7 @@ namespace Swift.web.AgentNew.Reports.ReferralReport { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox startDate; - + /// /// toDate control. /// @@ -29,7 +31,7 @@ namespace Swift.web.AgentNew.Reports.ReferralReport { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox toDate; - + /// /// ddlReferralName control. /// diff --git a/Swift.web/AgentNew/SendOnBehalf/SendV2.aspx.cs b/Swift.web/AgentNew/SendOnBehalf/SendV2.aspx.cs index 07f419b..bfd06ae 100644 --- a/Swift.web/AgentNew/SendOnBehalf/SendV2.aspx.cs +++ b/Swift.web/AgentNew/SendOnBehalf/SendV2.aspx.cs @@ -937,7 +937,8 @@ namespace Swift.web.AgentNew.SendOnBehalf , couponId , isManualSc , sc - , rewardAmt); + , rewardAmt + , ""); Response.ContentType = "text/plain"; var json = DataTableToJson(dt); diff --git a/Swift.web/AgentNew/SendTxn/Confirm.aspx b/Swift.web/AgentNew/SendTxn/Confirm.aspx index 815adbb..b03fd30 100644 --- a/Swift.web/AgentNew/SendTxn/Confirm.aspx +++ b/Swift.web/AgentNew/SendTxn/Confirm.aspx @@ -691,6 +691,8 @@ + +
diff --git a/Swift.web/AgentNew/SendTxn/Confirm.aspx.cs b/Swift.web/AgentNew/SendTxn/Confirm.aspx.cs index 4d5364c..96b9e0b 100644 --- a/Swift.web/AgentNew/SendTxn/Confirm.aspx.cs +++ b/Swift.web/AgentNew/SendTxn/Confirm.aspx.cs @@ -98,7 +98,9 @@ namespace Swift.web.AgentNew.SendTxn private readonly string scDiscount = GetStatic.ReadQueryString("scDiscount", ""); private readonly string exRateOffer = GetStatic.ReadQueryString("exRateOffer", ""); private readonly string _couponId = GetStatic.ReadQueryString("couponId", ""); - private readonly string _rewardAmt = GetStatic.ReadQueryString("rewardAmt",""); + private readonly string _rewardAmt = GetStatic.ReadQueryString("rewardAmt", ""); + private readonly string _isPromoCode = GetStatic.ReadQueryString("isPromoCode", ""); + private readonly string _rowId = GetStatic.ReadQueryString("rowId", ""); private readonly string _pLocation = GetStatic.ReadQueryString("pLocation", ""); private readonly string _pLocationText = GetStatic.ReadQueryString("pLocationText", ""); @@ -327,6 +329,8 @@ namespace Swift.web.AgentNew.SendTxn total.Text = GetStatic.ShowDecimal(_cAmt.ToString()); rewardAmt.Text = _rewardAmt; + hdnIsPromoCode.Value = _isPromoCode; + hdnRowId.Value = _rowId; exchangeRate.Text = _customerRate.ToString(); payoutAmt.Text = GetStatic.ShowDecimal(_pAmt.ToString()); payoutAmtInWords.Text = NumberToWordsConverter.NumberToWord(Convert.ToDouble(_pAmt.ToString())); @@ -578,6 +582,10 @@ namespace Swift.web.AgentNew.SendTxn trn.ECustomer = _eCust; trn.MemberCode = _memberCode; trn.rewardAmt = _rewardAmt; + hdnIsPromoCode.Value = _isPromoCode; + trn.isPromoCode = _isPromoCode; + hdnRowId.Value = _rowId; + trn.rowId = _rowId; trn.SBranch = GetStatic.GetBranch(); trn.SBranchName = GetStatic.GetBranchName(); @@ -620,6 +628,7 @@ namespace Swift.web.AgentNew.SendTxn trn.goodsOrigin = _goodsOrigin; trn.portOfShipment = _portOfShipment; + DataSet ds = new DataSet(); if (_isExrateFromPartner == "true") @@ -937,14 +946,14 @@ namespace Swift.web.AgentNew.SendTxn if (dbResult.ErrorCode == "0" || dbResult.ErrorCode == "100" || dbResult.ErrorCode == "101") { - if(dbResult.Extra2 == "DEBIT_CARD") + if (dbResult.Extra2 == "DEBIT_CARD") { var url = GetStatic.ReadWebConfig("trustpaymentCallback", ""); var id = HttpUtility.UrlEncode(WebUtils.EncryptString(dbResult.Extra)); var cn = HttpUtility.UrlEncode(WebUtils.EncryptString(dbResult.Id)); string reference = dbResult.Extra3; url = $"{url}?ref={reference}&id={id}&cn={cn}"; - Response.Redirect(url,false); + Response.Redirect(url, false); } else { @@ -1071,6 +1080,10 @@ namespace Swift.web.AgentNew.SendTxn trn.ECustomer = _eCust; trn.MemberCode = _memberCode; trn.rewardAmt = _rewardAmt; + hdnIsPromoCode.Value = _isPromoCode; + trn.isPromoCode = _isPromoCode; + hdnRowId.Value = _rowId; + trn.rowId = _rowId; trn.CancelRequestId = _cancelrequestId; trn.Salary = _salary; diff --git a/Swift.web/AgentNew/SendTxn/Confirm.aspx.designer.cs b/Swift.web/AgentNew/SendTxn/Confirm.aspx.designer.cs index 03d937e..0384d79 100644 --- a/Swift.web/AgentNew/SendTxn/Confirm.aspx.designer.cs +++ b/Swift.web/AgentNew/SendTxn/Confirm.aspx.designer.cs @@ -1003,5 +1003,7 @@ namespace Swift.web.AgentNew.SendTxn /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HiddenField hddXMLCDDI; + protected global::System.Web.UI.WebControls.HiddenField hdnIsPromoCode; + protected global::System.Web.UI.WebControls.HiddenField hdnRowId; } } diff --git a/Swift.web/AgentNew/SendTxn/SendV2.aspx b/Swift.web/AgentNew/SendTxn/SendV2.aspx index 1a56330..e598b45 100644 --- a/Swift.web/AgentNew/SendTxn/SendV2.aspx +++ b/Swift.web/AgentNew/SendTxn/SendV2.aspx @@ -304,6 +304,9 @@ + + +
@@ -1038,7 +1041,6 @@
-
S. No.Agent NameOpening BalanceIn AmountOut AmountClosing BalanceS. No.Agent NameCustomer NameDateTransaction PointsRegistration PointsReferral Type
" + sNo + "" + REFERRAL_NAME + "" + item["SENDERNAME"] + "" + DATE + "" + GetStatic.ShowDecimal(tranPts) + "" + GetStatic.ShowDecimal(regPts) + "" + item["REFERRAL_TYPE"] + "
Grand Total:" + GetStatic.ShowDecimal(totalOpeningAmt.ToString()) + "" + GetStatic.ShowDecimal(totalInAmt.ToString()) + "" + GetStatic.ShowDecimal(totalOutAmt.ToString()) + "" + GetStatic.ShowDecimal(totalClosingAmt.ToString()) + ""); + sb.Append("
Total"); + sb.AppendLine("" + tranPtsTotal + "" + regPtsTotal + "
@@ -1846,6 +1848,36 @@ var countryId = data[0].COUNTRYID; LoadPaymentOptionsDynamically(countryId); + <%--if (data[0].branchDetails) { + debugger; + if (data[0].manualType === 'Y') { + $('#branch_manual').val(data[0].branchDetails); + } + else { + var branchId = data[0].branchDetails.split('|')[0]; + var text = data[0].branchDetails.split('|')[1]; + SetDDLValueSelected("<%=branch.ClientID %>", text); + GetBranch(branchId, text); + $('#ContentPlaceHolder1_branch').val(text); + } + }--%> + if (data[0].branchDetails) { + if (data[0].manualType === 'Y') { + $("#" + mId + "branch_manual").val(data[0].branchDetails); + } + else { + var dataSelectDDL = { + id: data[0].branchDetails.split('|')[0], + text: data[0].branchDetails.split('|')[1] + }; + if (dataSelectDDL.id !== 'N/A') { + var newOption = new Option(dataSelectDDL.text, dataSelectDDL.id, false, false); + $('.js-example-basic-single').append(newOption).trigger('change'); + $('.js-example-basic-single').val(dataSelectDDL.id); // Select the option with a value of '1' + $('.js-example-basic-single').trigger('change'); + } + } + } <%--if ($("#<%=pCountry.ClientID%> option:selected ").val() != "") { PcountryOnChange('c', ""); SetPayCurrency($("#<%=pCountry.ClientID%>").val()); @@ -1854,6 +1886,44 @@ } } + function GetBranch(branchId, text) { + var dataToSend = { + MethodName: 'PopulateBranch', + payoutPartner: $('#ContentPlaceHolder1_hddPayoutPartner').val(), + Bank: $('#ContentPlaceHolder1_pAgent').val(), + Country: $('#ContentPlaceHolder1_pCountry').val(), + PayMode: $('#ContentPlaceHolder1_pMode').val(), + // searchText: params.term, // search term + // page: params.page + }; + $.post('SendV2.aspx?x=' + new Date().getTime(), dataToSend, function (response) { + debugger + var results = []; + if (response !== null) { + $.each(response, function (index, item) { + results.push({ + id: item.agentId, + text: item.agentName + }); + }); + + var count = results.length; + for (var i = 0; i < count; i++) { + if (results[i].id === branchId) { + var newOption = new Option(text, branchId, false, false); + $('.js-example-basic-single').append(newOption).trigger('change'); + $('.js-example-basic-single').val(branchId); + $('.js-example-basic-single').trigger('change'); + + $("#branchDetail").text(text); + return; + } + } + $('#branch_manual').val(''); + } + }) + } + function LoadPaymentOptionsDynamically(countryId) { $.ajax({ type: "POST", @@ -1862,7 +1932,6 @@ contentType: "application/json; charset=utf-8", dataType: "json", success: function (data) { - debugger BindPaymentOptions(data); }, error: function (error) { @@ -2228,7 +2297,6 @@ var paymentOption = $('#ContentPlaceHolder1_ddlPaymentOption option:selected').text(); $(window).focus(function () { - debugger if ($('#confirmHidden').val() != '') { var id = $('#confirmHidden').val(); $('#confirmHidden').val(''); diff --git a/Swift.web/AgentNew/SendTxn/SendV2.aspx.cs b/Swift.web/AgentNew/SendTxn/SendV2.aspx.cs index 8421b02..46aeabb 100644 --- a/Swift.web/AgentNew/SendTxn/SendV2.aspx.cs +++ b/Swift.web/AgentNew/SendTxn/SendV2.aspx.cs @@ -993,7 +993,7 @@ namespace Swift.web.AgentNew.SendTxn var pCountryFv = GetStatic.ReadFormData("pCountry", ""); var pBankType = GetStatic.ReadFormData("pBankType", ""); var dt = st.GetAgentSetting(GetStatic.GetUser(), pCountryFv, pAgentFv, pModeFv, pBankType); - Response.ContentType = "text/plain"; + Response.ContentType = "text/plain"; var json = DataTableToJson(dt); Response.Write(json); Response.End(); @@ -1220,7 +1220,7 @@ namespace Swift.web.AgentNew.SendTxn exRate.Introducer = Request.Form["introducerTxt"]; exRate.TpExRate = Request.Form["tpExRate"]; exRate.RewardAmt = Request.Form["rewardAmt"]; - // errTbl.Columns.Add(dCol2); + exRate.CustomerId = Request.Form["customerId"]; if (exRate.isExRateCalcByPartner) { @@ -1263,8 +1263,9 @@ namespace Swift.web.AgentNew.SendTxn , exRate.CalcBy , exRate.Introducer , exRate.RewardAmt + , exRate.CustomerId , exRate.ProviderId - + ); } else @@ -1290,6 +1291,7 @@ namespace Swift.web.AgentNew.SendTxn , exRate.ForexSessionId , exRate.TpExRate , exRate.RewardAmt + , exRate.CustomerId , Request.Form["isManualSc"] , exRate.ManualSc , exRate.CalcBy diff --git a/Swift.web/AgentNew/SendTxn/SendV2.aspx.designer.cs b/Swift.web/AgentNew/SendTxn/SendV2.aspx.designer.cs index 5ec4c35..bc09bdd 100644 --- a/Swift.web/AgentNew/SendTxn/SendV2.aspx.designer.cs +++ b/Swift.web/AgentNew/SendTxn/SendV2.aspx.designer.cs @@ -194,6 +194,33 @@ namespace Swift.web.AgentNew.SendTxn /// protected global::System.Web.UI.WebControls.HiddenField additionalAddressNotFound; + /// + /// hdnRewardAmt control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField hdnRewardAmt; + + /// + /// hdnIsPromoCode control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField hdnIsPromoCode; + + /// + /// hdnRowId control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField hdnRowId; + /// /// txtSendFirstName control. /// diff --git a/Swift.web/AgentNew/js/SendTxn/agentAndLocation.js b/Swift.web/AgentNew/js/SendTxn/agentAndLocation.js index 709784e..b8ba609 100644 --- a/Swift.web/AgentNew/js/SendTxn/agentAndLocation.js +++ b/Swift.web/AgentNew/js/SendTxn/agentAndLocation.js @@ -526,7 +526,7 @@ function ApplyAgentSetting(response, pModeTxt) { } if (data[0].ROW_ID !== '') { - $('#lblCampaign').text(data[0].PROMOTIONAL_MSG + ': (' + data[0].PROMOTION_TYPE + ') ' + data[0].PROMOTION_VALUE + ' JPY'); + $('#lblCampaign').text(data[0].PROMOTIONAL_MSG + ': (' + data[0].PROMOTION_TYPE + ') ' + data[0].PROMOTION_VALUE + ' GBP'); $('#hddPromotionCode').val(data[0].ROW_ID); $('#hddPromotionAmt').val(data[0].PROMOTION_VALUE); $("#" + mId + "editServiceCharge").attr("disabled", true); diff --git a/Swift.web/AgentNew/js/SendTxn/sendTxnInfo.js b/Swift.web/AgentNew/js/SendTxn/sendTxnInfo.js index 4daf90f..2105c73 100644 --- a/Swift.web/AgentNew/js/SendTxn/sendTxnInfo.js +++ b/Swift.web/AgentNew/js/SendTxn/sendTxnInfo.js @@ -191,7 +191,7 @@ function ClearTxnData() { } function CalculateTxn(amt, obj, isManualSc) { - debugger + //debugger var agentUser = $("#" + mId + "hddTxnRequestFromAgent").val(); // CheckAgentQuota(agentUser); checkPaymentOption(); @@ -210,14 +210,14 @@ function CalculateTxn(amt, obj, isManualSc) { // return false; //} if ($("#" + mId + "txtCollAmt").val()) - if (isManualSc === undefined) { - if ($("#" + mId + "editServiceCharge").is(':checked')) { - isManualSc = 'Y'; - } - else { - isManualSc = 'N'; - } + if (isManualSc === undefined) { + if ($("#" + mId + "editServiceCharge").is(':checked')) { + isManualSc = 'Y'; + } + else { + isManualSc = 'N'; } + } //if (isManualSc === undefined) { // $("#" + mId + "editServiceCharge").prop("checked", false); @@ -239,25 +239,10 @@ function CalculateTxn(amt, obj, isManualSc) { //} //else if (partnerId == '394130') { //if ($("#" + mId + "allowEditSC").val() === 'N') { - // $("#" + mId + "editServiceCharge").attr('disabled'); - // $("#" + mId + "editServiceCharge").attr('readonly'); - //} - //else { - // $("#" + mId + "allowEditSC").val("Y"); - // $("#" + mId + "editServiceCharge").removeAttr('disabled'); - // $("#" + mId + "editServiceCharge").removeAttr('readonly'); - //} - - //if ($("#" + mId + "allowEditSC").val() === 'N') { - // $("#" + mId + "editServiceCharge").prop("checked", false); - //} - //else { - // $("#" + mId + "editServiceCharge").prop("checked", true); - //} + $("#" + mId + "allowEditSC").val("N"); + $("#" + mId + "editServiceCharge").attr('disabled'); + $("#" + mId + "editServiceCharge").attr('readonly'); - $("#" + mId + "allowEditSC").val("N"); - $("#" + mId + "editServiceCharge").attr('disabled'); - $("#" + mId + "editServiceCharge").attr('readonly'); // var ischecked = $(this).is(':checked'); //var ischecked = $("#" + mId + "editServiceCharge").is(':checked'); //if (ischecked) { @@ -430,7 +415,7 @@ function CalculateTxn(amt, obj, isManualSc) { , pAgentBranch: pAgentBranch, collAmt: collAmt, payAmt: payAmt, payCurr: payCurr, collCurr: collCurr , pModetxt: pModetxt, senderId: senderId, schemeCode: schemeCode, couponId: couponId, isManualSc: isManualSc , sc: sc, payoutPartner: payoutPartner, IsExrateFromPartner: IsExrateFromPartner, PCountryCode: PCountryCode, calcBy: obj - , payerName: payerName, tpExRate: tpExRate, rewardAmt: rewardAmt + , payerName: payerName, tpExRate: tpExRate, rewardAmt: rewardAmt, customerId: customerId }; var options = @@ -494,7 +479,7 @@ function checkPaymentOption() { //} function CheckAgentQuota() { - debugger + //debugger var customerId = $('#finalSenderId').text(); var dataToSend = { MethodName: 'checkAgentQuota', customerId: customerId @@ -507,7 +492,6 @@ function CheckAgentQuota() { type: 'POST', async: false, success: function (response) { - debugger var data = response; // var data = jQuery.parseJSON(response); // alert(data[0].ErrorCode); @@ -644,6 +628,7 @@ $(document).on('click', '#btnSendTxnCDDI', function () { }); function SendTransactionMethod() { + debugger ReCalculate(); //if ($("#" + mId + "visaStatusNotFound").val() === 'true') { // var visaStatusId = $("#ContentPlaceHolder1_visaStatusDdl").val(); @@ -997,8 +982,11 @@ function SendTransactionMethod() { var portOfShipment = $("#" + mId + "portOfShipment").val(); var calcOriginalSc = $("#" + mId + "hdnCalcOriginalSc").val(); var paymentOption = $("#" + mId + "ddlPaymentOption option:selected").text().replace("Select", ""); - var rewardAmt = $("#" + mId + "txtRewardAmt").val(); + var rewardAmt = $("#" + mId + "hdnRewardAmt").val(); + var isPromoCode = $("#" + mId + "hdnIsPromoCode").val(); + var rowId = $("#" + mId + "hdnRowId").val(); + var url = "Confirm.aspx?senderId=" + senderId + "&sfName=" + sfName + "&smName=" + smName + @@ -1111,7 +1099,9 @@ function SendTransactionMethod() { "&nameAsPerBank=" + nameAsPerBank + "&calcOriginalSc=" + calcOriginalSc + "&paymentOption=" + paymentOption + - "&rewardAmt=" + rewardAmt; + "&rewardAmt=" + rewardAmt + + "&isPromoCode=" + isPromoCode + + "&rowId=" + rowId; var param = "dialogHeight:900px;dialogWidth:900px;dialogLeft:200;dialogTop:100;center:yes"; diff --git a/Swift.web/AgentNew/js/SendTxn/usableunctions.js b/Swift.web/AgentNew/js/SendTxn/usableunctions.js index 1837390..7e83f75 100644 --- a/Swift.web/AgentNew/js/SendTxn/usableunctions.js +++ b/Swift.web/AgentNew/js/SendTxn/usableunctions.js @@ -175,6 +175,9 @@ function ParseCalculateData(response, amtType) { $("#" + mId + "lblServiceChargeAmt").attr("readonly", true); } $("#" + mId + "hddExRateConfirmID").val(data[0].exRateConfirmId); + $("#" + mId + "hdnRewardAmt").val(data[0].rewardAmt); + $("#" + mId + "hdnIsPromoCode").val(data[0].isPromoCode); + $("#" + mId + "hdnRowId").val(data[0].rowId); } function CheckSession1(data) { diff --git a/Swift.web/AgentPanel/International/SendMoney/Send.aspx.cs b/Swift.web/AgentPanel/International/SendMoney/Send.aspx.cs index 4c59916..73c1bf4 100644 --- a/Swift.web/AgentPanel/International/SendMoney/Send.aspx.cs +++ b/Swift.web/AgentPanel/International/SendMoney/Send.aspx.cs @@ -737,6 +737,7 @@ namespace Swift.web.AgentPanel.International.SendMoney , GetStatic.GetSessionId() , couponId , rewardAmt + , "" , ""); Response.ContentType = "text/plain"; diff --git a/Swift.web/AgentPanel/International/SendMoney/SendV2.aspx.cs b/Swift.web/AgentPanel/International/SendMoney/SendV2.aspx.cs index 86290f4..74b6f6c 100644 --- a/Swift.web/AgentPanel/International/SendMoney/SendV2.aspx.cs +++ b/Swift.web/AgentPanel/International/SendMoney/SendV2.aspx.cs @@ -744,6 +744,7 @@ namespace Swift.web.AgentPanel.International.SendMoney , GetStatic.GetSessionId() , couponId , rewardAmt + , "" , ""); Response.ContentType = "text/plain"; diff --git a/Swift.web/AgentPanel/International/SendMoneyv2/SendV2.aspx.cs b/Swift.web/AgentPanel/International/SendMoneyv2/SendV2.aspx.cs index f67fbb9..90c0914 100644 --- a/Swift.web/AgentPanel/International/SendMoneyv2/SendV2.aspx.cs +++ b/Swift.web/AgentPanel/International/SendMoneyv2/SendV2.aspx.cs @@ -937,6 +937,7 @@ namespace Swift.web.AgentPanel.International.SendMoneyv2 , GetStatic.GetSessionId() , couponId , rewardAmt + ,"" , isManualSc , sc); diff --git a/Swift.web/AgentPanel/International/SendOnBehalf/SendV2.aspx.cs b/Swift.web/AgentPanel/International/SendOnBehalf/SendV2.aspx.cs index 9c81586..2507512 100644 --- a/Swift.web/AgentPanel/International/SendOnBehalf/SendV2.aspx.cs +++ b/Swift.web/AgentPanel/International/SendOnBehalf/SendV2.aspx.cs @@ -936,6 +936,7 @@ namespace Swift.web.AgentPanel.International.SendOnBehalf , GetStatic.GetSessionId() , couponId , rewardAmt + , "" , isManualSc , sc); diff --git a/Swift.web/AgentPanel/Send/SendTransaction/Send.aspx.cs b/Swift.web/AgentPanel/Send/SendTransaction/Send.aspx.cs index f13f65f..2a7839e 100644 --- a/Swift.web/AgentPanel/Send/SendTransaction/Send.aspx.cs +++ b/Swift.web/AgentPanel/Send/SendTransaction/Send.aspx.cs @@ -743,6 +743,7 @@ namespace Swift.web.AgentPanel.Send.SendTransactionIRH , GetStatic.GetSessionId() , couponId , rewardAmt + , "" , ""); Response.ContentType = "text/plain"; diff --git a/Swift.web/DashboardV2/Dashboard2.aspx b/Swift.web/DashboardV2/Dashboard2.aspx index 3d42a03..90b8536 100644 --- a/Swift.web/DashboardV2/Dashboard2.aspx +++ b/Swift.web/DashboardV2/Dashboard2.aspx @@ -515,6 +515,21 @@ + +
+
+ +
+
+

KYC Not Completed

+

0

+
+ +
+
diff --git a/Swift.web/Download.aspx.cs b/Swift.web/Download.aspx.cs index c8b6651..14563ed 100644 --- a/Swift.web/Download.aspx.cs +++ b/Swift.web/Download.aspx.cs @@ -34,7 +34,10 @@ namespace Swift.web { data = GenerateCsvForReport(); } - + else if (mode.ToLower() == "download") + { + data = GenerateCsv(); + } Response.Clear(); Response.ClearContent(); Response.ClearHeaders(); @@ -160,5 +163,81 @@ namespace Swift.web return html.ToString(); } + + private string GenerateCsv() + { + var sql = GetStatic.ReadSession("exportSource", ""); + sql = sql.Split(',')[0].Split('=')[0] + "='download'"; + + if (string.IsNullOrEmpty(sql)) + return ""; + + var type = GetStatic.ReadQueryString("type", "").ToLower(); + + var ds = new DataSet(); + + if (type == "remit") + { + ds = remit.ExecuteDataset(sql); + } + + else + { + ds = dao.ExecuteDataset(sql); + } + + var columnList = (List)Session["grid_column"]; + if (ds == null || columnList == null) + return ""; + var dt = ds.Tables[0]; + //var html = new StringBuilder(""); + var html = new StringBuilder("
"); + + html.Append(""); + + foreach (var column in columnList) + { + if (column.Description != "") + //html.Append(""); + html.Append(""); // Added border style + + } + html.Append(""); + + foreach (DataRow dr in dt.Rows) + { + html.Append(""); + + foreach (var column in columnList) + { + switch (column.Type.ToUpper()) + { + case "M": + html.Append(""); // Added border style + break; + case "D": + html.Append(""); // Added border style + break; + case "DT": + html.Append(""); // Added border style + break; + case "NOSORT": + if (column.Description.Trim() != "") + html.Append(""); // Added border style + break; + case "CHECKBOX": + break; + default: + html.Append(""); // Added border style + break; + } + } + + html.Append(""); + } + html.Append("
" + column.Description + "" + column.Description + "
" + SwiftGrid.FormatData(dr[column.Key].ToString(), "M") + "" + SwiftGrid.FormatData(dr[column.Key].ToString(), "D") + "" + SwiftGrid.FormatData(dr[column.Key].ToString(), "DT") + "" + dr[column.Key] + "" + dr[column.Key] + "
"); + + return html.ToString(); + } } } \ No newline at end of file diff --git a/Swift.web/Library/PasswordGenerator.cs b/Swift.web/Library/PasswordGenerator.cs index 977f9e6..39e9954 100644 --- a/Swift.web/Library/PasswordGenerator.cs +++ b/Swift.web/Library/PasswordGenerator.cs @@ -75,7 +75,17 @@ namespace Swift.web.Library return new string(chars.ToArray()); } + public static string GenerateRandomNumericPassword(int length = 8) + { + Random rand = new Random(); + string password = ""; + for (int i = 0; i < length; i++) + { + password += rand.Next(0, 10); + } + return password; + } } } diff --git a/Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx b/Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx index faa5ba1..78e4d38 100644 --- a/Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx +++ b/Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx @@ -29,15 +29,15 @@ + - +<%-- --%> - +<%-- --%>