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 @@
S. No. | -Agent Name | -Opening Balance | -In Amount | -Out Amount | -Closing Balance | +S. No. | +Agent Name | +Customer Name | +Date | +Transaction Points | +Registration Points | +Referral Type |
---|---|---|---|---|---|---|---|---|---|---|---|---|
"); - sb.AppendLine(GetRows(item["AGENTNAME"].ToString(), rows, ref sNo, ref totalOpeningAmt, ref totalInAmt, ref totalOutAmt, ref totalClosingAmt)); + sb.AppendLine(" | " + sNo + " | "); + sb.AppendLine("" + REFERRAL_NAME + " | "); + sb.AppendLine("" + item["SENDERNAME"] + " | "); + sb.AppendLine("" + DATE + " | "); + sb.AppendLine("" + GetStatic.ShowDecimal(tranPts) + " | "); + sb.AppendLine("" + GetStatic.ShowDecimal(regPts) + " | "); + sb.AppendLine("" + item["REFERRAL_TYPE"] + " | "); + tranPtsTotal += Convert.ToDouble(tranPts); + regPtsTotal += Convert.ToDouble(regPts); + sNo++; + sb.AppendLine("|||||
Grand Total: | " + GetStatic.ShowDecimal(totalOpeningAmt.ToString()) + " | "); - sb.AppendLine("" + GetStatic.ShowDecimal(totalInAmt.ToString()) + " | "); - sb.AppendLine("" + GetStatic.ShowDecimal(totalOutAmt.ToString()) + " | "); - sb.AppendLine("" + GetStatic.ShowDecimal(totalClosingAmt.ToString()) + "");
+ sb.Append("Total | ");
+ sb.AppendLine(" | " + tranPtsTotal + " | ");
+ sb.AppendLine("" + regPtsTotal + " | ");
sb.AppendLine("
+
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 @@
@@ -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
+ {
+
///
@@ -1038,7 +1041,6 @@
|
||||
@@ -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;
+ ///
+
+
+
+
+
+
+
+ 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
|