From 70f442abf870b265348f850eb24d61c8097bc8c6 Mon Sep 17 00:00:00 2001 From: shakun Date: Wed, 7 Feb 2024 01:50:20 +0545 Subject: [PATCH] #24416 Country Wise Margin Setup #24827 Promotional Rate Feature --- Business/Business.csproj | 22 ++-------- .../BusinessLogic/SMSApiService/SMSService.cs | 1 - .../Factory/ApiFactoryServices.cs | 40 ++++--------------- Business/DIConfig/UnityConfig.cs | 32 ++------------- Common/Models/Enums/GeneralEnum.cs | 2 + GMENepal/GMENepalAPIService/GMENepalAPI.cs | 2 +- ThirdPartyAPIs.sln | 40 +++---------------- .../Templates/BASIC_REGISTRATION_EMAIL.html | 15 ++++--- ThirdPartyAPIs/Config/Mapping.json | 5 +++ ThirdPartyAPIs/Web.config | 11 +++-- 10 files changed, 44 insertions(+), 126 deletions(-) diff --git a/Business/Business.csproj b/Business/Business.csproj index fcf3dbd..b2d1f9e 100644 --- a/Business/Business.csproj +++ b/Business/Business.csproj @@ -192,26 +192,10 @@ - - {76f39343-b64e-4ca6-8b20-76a81793645e} - BankOfCeylon - - - {f668b1cb-5655-4f36-9b52-2dd0f04826a7} - BracBank - - - {80f5422a-4706-450c-8795-8edaee47f48c} - Cebuana - {d626fe23-51c8-4441-b3c7-92a54d1f572e} Common - - {24E7AA99-A828-4E76-A786-6C62BE7588E7} - Donga - {0F5ACC33-43D7-46D3-BB17-0F067EAEE173} GMENepal @@ -220,9 +204,9 @@ {3dede19d-6d7b-4825-b537-ccc7afc38f56} Repository - - {5a7b31a2-b799-4bae-8ece-12afb8eaa3cb} - Transfast + + {4EB6BF60-AD44-4913-8794-C91341879288} + TPServices diff --git a/Business/BusinessLogic/SMSApiService/SMSService.cs b/Business/BusinessLogic/SMSApiService/SMSService.cs index 0d5818c..bb1f4ba 100644 --- a/Business/BusinessLogic/SMSApiService/SMSService.cs +++ b/Business/BusinessLogic/SMSApiService/SMSService.cs @@ -44,7 +44,6 @@ namespace Business.BusinessLogic.SMSApiService "?username=" + _userName + "&password=" + _password + "&number=" + model.MobileNumber + "&message=" + HttpUtility.UrlEncode(model.SMSBody) + "&orig=" + HttpUtility.UrlEncode(_senderId); - _log.Debug(url); HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url); HttpWebResponse response = (HttpWebResponse)request.GetResponse(); Stream resStream = response.GetResponseStream(); diff --git a/Business/BusinessLogic/TPApiServices/Factory/ApiFactoryServices.cs b/Business/BusinessLogic/TPApiServices/Factory/ApiFactoryServices.cs index ea726e6..199bcca 100644 --- a/Business/BusinessLogic/TPApiServices/Factory/ApiFactoryServices.cs +++ b/Business/BusinessLogic/TPApiServices/Factory/ApiFactoryServices.cs @@ -1,12 +1,8 @@ -using BankOfCeylon.BankOfCeylonAPIService; -using BracBank.BracBankApiService; -using Cebuana.ApiService; -using Common.TPService; +using Common.TPService; using Common.Utility; -using Donga.DongaAPIService; using GMENepal.GMENepalAPIService; using log4net; -using Transfast.ApiServices; +using TPService.GCC.Services; using Unity; namespace Business.BusinessLogic.TPApiServices.Factory @@ -20,37 +16,15 @@ namespace Business.BusinessLogic.TPApiServices.Factory public ITPApiServices GetServices(string providerNo) { - if (providerNo == GetStatic.ReadWebConfig("donga", "")) - { - log.Debug("Choose Provider as DongaAPI"); - //apiFactory = _container.Resolve(); - apiFactory = _container.Resolve(); - } - - else if (providerNo == GetStatic.ReadWebConfig("transfast", "")) - { - log.Debug("Choose Provider as TFAPI"); - apiFactory = _container.Resolve(); - } - else if (providerNo == GetStatic.ReadWebConfig("gmenepal", "")) + if (providerNo == GetStatic.ReadWebConfig("gmenepal", "")) { log.Debug("Choose Provider as GMENepalAPI"); apiFactory = _container.Resolve(); - } - else if (providerNo == GetStatic.ReadWebConfig("bankofceylon", "")) - { - log.Debug("Choose Provider as bankofceylon"); - apiFactory = _container.Resolve(); - } - else if (providerNo == GetStatic.ReadWebConfig("Bracbank", "")) - { - log.Debug("Choose Provider as Brac Bank"); - apiFactory = _container.Resolve(); - } - else if (providerNo == GetStatic.ReadWebConfig("Cebuana", "")) + } + else if (providerNo == GetStatic.ReadWebConfig("gccremit", "")) { - log.Debug("Choose Provider as Cebuana "); - apiFactory = _container.Resolve(); + log.Debug("Choose Provider as GCC "); + apiFactory = _container.Resolve(); } return apiFactory; diff --git a/Business/DIConfig/UnityConfig.cs b/Business/DIConfig/UnityConfig.cs index db636eb..fff9125 100644 --- a/Business/DIConfig/UnityConfig.cs +++ b/Business/DIConfig/UnityConfig.cs @@ -1,15 +1,11 @@ -using BankOfCeylon.BankOfCeylonAPIService; -using BracBank.BracBankApiService; using Business.BusinessLogic.Auth; using Business.BusinessLogic.TPApiServices.Factory; using Business.BusinessLogic.TPApiServices.TPServices; using Business.TokenManagement; using Common.TPService; -using Donga.DongaAPIService; using GMENepal.GMENepalAPIService; using Repository.DAO.ThirdParty; using System.Web.Http; -using Transfast.ApiServices; using Unity; using Unity.WebApi; @@ -37,37 +33,15 @@ namespace Business.DIConfig container.RegisterType(); - #endregion Config for Repo Layer - - #region IDongaAPI - - container.RegisterType(); - - #endregion IDongaAPI - - #region TRANSFAST - - container.RegisterType(); - - #endregion TRANSFAST + #endregion Config for Repo Layer #region GMENEPAL container.RegisterType(); - #endregion GMENEPAL - - #region Bank Of Ceylon - - container.RegisterType(); - - #endregion Bank Of Ceylon - - #region BRAC - - container.RegisterType(); + #endregion GMENEPAL + - #endregion BRAC //////// GlobalConfiguration.Configuration.DependencyResolver = new UnityDependencyResolver(container); } diff --git a/Common/Models/Enums/GeneralEnum.cs b/Common/Models/Enums/GeneralEnum.cs index 0d3b1dd..cd8768b 100644 --- a/Common/Models/Enums/GeneralEnum.cs +++ b/Common/Models/Enums/GeneralEnum.cs @@ -55,6 +55,8 @@ namespace Common.Models.Enums [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, diff --git a/GMENepal/GMENepalAPIService/GMENepalAPI.cs b/GMENepal/GMENepalAPIService/GMENepalAPI.cs index 4f5dac5..ce84fd4 100644 --- a/GMENepal/GMENepalAPIService/GMENepalAPI.cs +++ b/GMENepal/GMENepalAPIService/GMENepalAPI.cs @@ -462,7 +462,7 @@ namespace GMENepal.GMENepalAPIService PaymentMethod = eR.PaymentType == "Wallet" ? "W" : eR.PaymentType, ReceivingAgentId = eR.PAgentName, ReceivingCountry = eR.PCountryName, - RemitAmount = eR.CalcBy == "C" ? eR.CAmount.ToString() : eR.PAmount.ToString() + RemitAmount = eR.CalcBy == "P" ? eR.CAmount.ToString() : eR.PAmount.ToString() }; } diff --git a/ThirdPartyAPIs.sln b/ThirdPartyAPIs.sln index e546a3d..f104f96 100644 --- a/ThirdPartyAPIs.sln +++ b/ThirdPartyAPIs.sln @@ -11,21 +11,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Common\Common.csp EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Business", "Business\Business.csproj", "{143E1F73-BD44-4C9E-99D0-0768BF302285}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Donga", "Donga\Donga.csproj", "{24E7AA99-A828-4E76-A786-6C62BE7588E7}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Transfast", "Transfast\Transfast.csproj", "{5A7B31A2-B799-4BAE-8ECE-12AFB8EAA3CB}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GMENepal", "GMENepal\GMENepal.csproj", "{0F5ACC33-43D7-46D3-BB17-0F067EAEE173}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BankOfCeylon", "BankOfCeylon\BankOfCeylon.csproj", "{76F39343-B64E-4CA6-8B20-76A81793645E}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BracBank", "BracBank\BracBank.csproj", "{F668B1CB-5655-4F36-9B52-2DD0F04826A7}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SignatureAPI", "SignatureAPI\SignatureAPI.csproj", "{0E8E9384-5E24-445D-9677-1D100820FAE3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cebuana", "Cebuana\Cebuana.csproj", "{80F5422A-4706-450C-8795-8EDAEE47F48C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wing", "Wing\Wing.csproj", "{1505C180-8ED5-4357-B759-4EA68E74D047}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TPServices", "TPServices\TPServices.csproj", "{4EB6BF60-AD44-4913-8794-C91341879288}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -49,38 +39,18 @@ Global {143E1F73-BD44-4C9E-99D0-0768BF302285}.Debug|Any CPU.Build.0 = Debug|Any CPU {143E1F73-BD44-4C9E-99D0-0768BF302285}.Release|Any CPU.ActiveCfg = Release|Any CPU {143E1F73-BD44-4C9E-99D0-0768BF302285}.Release|Any CPU.Build.0 = Release|Any CPU - {24E7AA99-A828-4E76-A786-6C62BE7588E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {24E7AA99-A828-4E76-A786-6C62BE7588E7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {24E7AA99-A828-4E76-A786-6C62BE7588E7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {24E7AA99-A828-4E76-A786-6C62BE7588E7}.Release|Any CPU.Build.0 = Release|Any CPU - {5A7B31A2-B799-4BAE-8ECE-12AFB8EAA3CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A7B31A2-B799-4BAE-8ECE-12AFB8EAA3CB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A7B31A2-B799-4BAE-8ECE-12AFB8EAA3CB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A7B31A2-B799-4BAE-8ECE-12AFB8EAA3CB}.Release|Any CPU.Build.0 = Release|Any CPU {0F5ACC33-43D7-46D3-BB17-0F067EAEE173}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0F5ACC33-43D7-46D3-BB17-0F067EAEE173}.Debug|Any CPU.Build.0 = Debug|Any CPU {0F5ACC33-43D7-46D3-BB17-0F067EAEE173}.Release|Any CPU.ActiveCfg = Release|Any CPU {0F5ACC33-43D7-46D3-BB17-0F067EAEE173}.Release|Any CPU.Build.0 = Release|Any CPU - {76F39343-B64E-4CA6-8B20-76A81793645E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {76F39343-B64E-4CA6-8B20-76A81793645E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {76F39343-B64E-4CA6-8B20-76A81793645E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {76F39343-B64E-4CA6-8B20-76A81793645E}.Release|Any CPU.Build.0 = Release|Any CPU - {F668B1CB-5655-4F36-9B52-2DD0F04826A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F668B1CB-5655-4F36-9B52-2DD0F04826A7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F668B1CB-5655-4F36-9B52-2DD0F04826A7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F668B1CB-5655-4F36-9B52-2DD0F04826A7}.Release|Any CPU.Build.0 = Release|Any CPU {0E8E9384-5E24-445D-9677-1D100820FAE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0E8E9384-5E24-445D-9677-1D100820FAE3}.Debug|Any CPU.Build.0 = Debug|Any CPU {0E8E9384-5E24-445D-9677-1D100820FAE3}.Release|Any CPU.ActiveCfg = Release|Any CPU {0E8E9384-5E24-445D-9677-1D100820FAE3}.Release|Any CPU.Build.0 = Release|Any CPU - {80F5422A-4706-450C-8795-8EDAEE47F48C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {80F5422A-4706-450C-8795-8EDAEE47F48C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {80F5422A-4706-450C-8795-8EDAEE47F48C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {80F5422A-4706-450C-8795-8EDAEE47F48C}.Release|Any CPU.Build.0 = Release|Any CPU - {1505C180-8ED5-4357-B759-4EA68E74D047}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1505C180-8ED5-4357-B759-4EA68E74D047}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1505C180-8ED5-4357-B759-4EA68E74D047}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1505C180-8ED5-4357-B759-4EA68E74D047}.Release|Any CPU.Build.0 = Release|Any CPU + {4EB6BF60-AD44-4913-8794-C91341879288}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4EB6BF60-AD44-4913-8794-C91341879288}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4EB6BF60-AD44-4913-8794-C91341879288}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4EB6BF60-AD44-4913-8794-C91341879288}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ThirdPartyAPIs/App_Data/Templates/BASIC_REGISTRATION_EMAIL.html b/ThirdPartyAPIs/App_Data/Templates/BASIC_REGISTRATION_EMAIL.html index dc847ea..e31738d 100644 --- a/ThirdPartyAPIs/App_Data/Templates/BASIC_REGISTRATION_EMAIL.html +++ b/ThirdPartyAPIs/App_Data/Templates/BASIC_REGISTRATION_EMAIL.html @@ -1,11 +1,16 @@  + -
- -
+
+
+ imelondon + imelondon +
+
+
Dear {CustomerName}, @@ -22,8 +27,8 @@

Please use the referal code - {RefCode} - to invite your friends and get 1£ after your friend sucessfully registers and 4 £ after sending the transaction. + {UserId} + to invite your friends and get £ {RegReward} after your friend sucessfully registers and {TranReward}£ after sending the transaction.
** Terms and Condition applied diff --git a/ThirdPartyAPIs/Config/Mapping.json b/ThirdPartyAPIs/Config/Mapping.json index 414ad9b..d36fbb1 100644 --- a/ThirdPartyAPIs/Config/Mapping.json +++ b/ThirdPartyAPIs/Config/Mapping.json @@ -61,6 +61,11 @@ "SValue": "RESET_PASSWORD_EMAIL", "DValue": "App_Data\\Templates\\RESET_PASSWORD_EMAIL.html", "Dtext": "Reset Password" + }, + { + "SValue": "PIN_PASSWORD_EMAIL", + "DValue": "App_Data\\Templates\\PIN_PASSWORD_EMAIL.html", + "Dtext": "Mobile Login Activate" } ] }, diff --git a/ThirdPartyAPIs/Web.config b/ThirdPartyAPIs/Web.config index e24c2dc..470f099 100644 --- a/ThirdPartyAPIs/Web.config +++ b/ThirdPartyAPIs/Web.config @@ -57,14 +57,19 @@ - - + + + + + + + + -