Browse Source

#24416 Country Wise Margin Setup

#24827  Promotional Rate Feature
prod
shakun 8 months ago
parent
commit
70f442abf8
  1. 22
      Business/Business.csproj
  2. 1
      Business/BusinessLogic/SMSApiService/SMSService.cs
  3. 40
      Business/BusinessLogic/TPApiServices/Factory/ApiFactoryServices.cs
  4. 32
      Business/DIConfig/UnityConfig.cs
  5. 2
      Common/Models/Enums/GeneralEnum.cs
  6. 2
      GMENepal/GMENepalAPIService/GMENepalAPI.cs
  7. 40
      ThirdPartyAPIs.sln
  8. 15
      ThirdPartyAPIs/App_Data/Templates/BASIC_REGISTRATION_EMAIL.html
  9. 5
      ThirdPartyAPIs/Config/Mapping.json
  10. 11
      ThirdPartyAPIs/Web.config

22
Business/Business.csproj

@ -192,26 +192,10 @@
<Compile Include="TokenManagement\TokenManagementServices.cs" /> <Compile Include="TokenManagement\TokenManagementServices.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\BankOfCeylon\BankOfCeylon.csproj">
<Project>{76f39343-b64e-4ca6-8b20-76a81793645e}</Project>
<Name>BankOfCeylon</Name>
</ProjectReference>
<ProjectReference Include="..\BracBank\BracBank.csproj">
<Project>{f668b1cb-5655-4f36-9b52-2dd0f04826a7}</Project>
<Name>BracBank</Name>
</ProjectReference>
<ProjectReference Include="..\Cebuana\Cebuana.csproj">
<Project>{80f5422a-4706-450c-8795-8edaee47f48c}</Project>
<Name>Cebuana</Name>
</ProjectReference>
<ProjectReference Include="..\Common\Common.csproj"> <ProjectReference Include="..\Common\Common.csproj">
<Project>{d626fe23-51c8-4441-b3c7-92a54d1f572e}</Project> <Project>{d626fe23-51c8-4441-b3c7-92a54d1f572e}</Project>
<Name>Common</Name> <Name>Common</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Donga\Donga.csproj">
<Project>{24E7AA99-A828-4E76-A786-6C62BE7588E7}</Project>
<Name>Donga</Name>
</ProjectReference>
<ProjectReference Include="..\GMENepal\GMENepal.csproj"> <ProjectReference Include="..\GMENepal\GMENepal.csproj">
<Project>{0F5ACC33-43D7-46D3-BB17-0F067EAEE173}</Project> <Project>{0F5ACC33-43D7-46D3-BB17-0F067EAEE173}</Project>
<Name>GMENepal</Name> <Name>GMENepal</Name>
@ -220,9 +204,9 @@
<Project>{3dede19d-6d7b-4825-b537-ccc7afc38f56}</Project> <Project>{3dede19d-6d7b-4825-b537-ccc7afc38f56}</Project>
<Name>Repository</Name> <Name>Repository</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Transfast\Transfast.csproj">
<Project>{5a7b31a2-b799-4bae-8ece-12afb8eaa3cb}</Project>
<Name>Transfast</Name>
<ProjectReference Include="..\TPServices\TPServices.csproj">
<Project>{4EB6BF60-AD44-4913-8794-C91341879288}</Project>
<Name>TPServices</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

1
Business/BusinessLogic/SMSApiService/SMSService.cs

@ -44,7 +44,6 @@ namespace Business.BusinessLogic.SMSApiService
"?username=" + _userName + "&password=" + _password + "?username=" + _userName + "&password=" + _password +
"&number=" + model.MobileNumber + "&message=" + HttpUtility.UrlEncode(model.SMSBody) + "&number=" + model.MobileNumber + "&message=" + HttpUtility.UrlEncode(model.SMSBody) +
"&orig=" + HttpUtility.UrlEncode(_senderId); "&orig=" + HttpUtility.UrlEncode(_senderId);
_log.Debug(url);
HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url); HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
HttpWebResponse response = (HttpWebResponse)request.GetResponse(); HttpWebResponse response = (HttpWebResponse)request.GetResponse();
Stream resStream = response.GetResponseStream(); Stream resStream = response.GetResponseStream();

40
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 Common.Utility;
using Donga.DongaAPIService;
using GMENepal.GMENepalAPIService; using GMENepal.GMENepalAPIService;
using log4net; using log4net;
using Transfast.ApiServices;
using TPService.GCC.Services;
using Unity; using Unity;
namespace Business.BusinessLogic.TPApiServices.Factory namespace Business.BusinessLogic.TPApiServices.Factory
@ -20,37 +16,15 @@ namespace Business.BusinessLogic.TPApiServices.Factory
public ITPApiServices GetServices(string providerNo) public ITPApiServices GetServices(string providerNo)
{ {
if (providerNo == GetStatic.ReadWebConfig("donga", ""))
{
log.Debug("Choose Provider as DongaAPI");
//apiFactory = _container.Resolve<DongaAPI>();
apiFactory = _container.Resolve<DongApiV2>();
}
else if (providerNo == GetStatic.ReadWebConfig("transfast", ""))
{
log.Debug("Choose Provider as TFAPI");
apiFactory = _container.Resolve<TFAPI>();
}
else if (providerNo == GetStatic.ReadWebConfig("gmenepal", ""))
if (providerNo == GetStatic.ReadWebConfig("gmenepal", ""))
{ {
log.Debug("Choose Provider as GMENepalAPI"); log.Debug("Choose Provider as GMENepalAPI");
apiFactory = _container.Resolve<GMENepalAPI>(); apiFactory = _container.Resolve<GMENepalAPI>();
}
else if (providerNo == GetStatic.ReadWebConfig("bankofceylon", ""))
{
log.Debug("Choose Provider as bankofceylon");
apiFactory = _container.Resolve<BankOfCeylonAPI>();
}
else if (providerNo == GetStatic.ReadWebConfig("Bracbank", ""))
{
log.Debug("Choose Provider as Brac Bank");
apiFactory = _container.Resolve<BracBankAPI>();
}
else if (providerNo == GetStatic.ReadWebConfig("Cebuana", ""))
}
else if (providerNo == GetStatic.ReadWebConfig("gccremit", ""))
{ {
log.Debug("Choose Provider as Cebuana ");
apiFactory = _container.Resolve<CebuanaApi>();
log.Debug("Choose Provider as GCC ");
apiFactory = _container.Resolve<GCCAPI>();
} }
return apiFactory; return apiFactory;

32
Business/DIConfig/UnityConfig.cs

@ -1,15 +1,11 @@
using BankOfCeylon.BankOfCeylonAPIService;
using BracBank.BracBankApiService;
using Business.BusinessLogic.Auth; using Business.BusinessLogic.Auth;
using Business.BusinessLogic.TPApiServices.Factory; using Business.BusinessLogic.TPApiServices.Factory;
using Business.BusinessLogic.TPApiServices.TPServices; using Business.BusinessLogic.TPApiServices.TPServices;
using Business.TokenManagement; using Business.TokenManagement;
using Common.TPService; using Common.TPService;
using Donga.DongaAPIService;
using GMENepal.GMENepalAPIService; using GMENepal.GMENepalAPIService;
using Repository.DAO.ThirdParty; using Repository.DAO.ThirdParty;
using System.Web.Http; using System.Web.Http;
using Transfast.ApiServices;
using Unity; using Unity;
using Unity.WebApi; using Unity.WebApi;
@ -37,37 +33,15 @@ namespace Business.DIConfig
container.RegisterType<IThirdPartyRepo, ThirdPartyRepo>(); container.RegisterType<IThirdPartyRepo, ThirdPartyRepo>();
#endregion Config for Repo Layer
#region IDongaAPI
container.RegisterType<ITPApiServices, DongApiV2>();
#endregion IDongaAPI
#region TRANSFAST
container.RegisterType<ITPApiServices, TFAPI>();
#endregion TRANSFAST
#endregion Config for Repo Layer
#region GMENEPAL #region GMENEPAL
container.RegisterType<ITPApiServices, GMENepalAPI>(); container.RegisterType<ITPApiServices, GMENepalAPI>();
#endregion GMENEPAL
#region Bank Of Ceylon
container.RegisterType<ITPApiServices, BankOfCeylonAPI>();
#endregion Bank Of Ceylon
#region BRAC
container.RegisterType<ITPApiServices, BracBankAPI>();
#endregion GMENEPAL
#endregion BRAC
//////// ////////
GlobalConfiguration.Configuration.DependencyResolver = new UnityDependencyResolver(container); GlobalConfiguration.Configuration.DependencyResolver = new UnityDependencyResolver(container);
} }

2
Common/Models/Enums/GeneralEnum.cs

@ -55,6 +55,8 @@ namespace Common.Models.Enums
[Description("Email to customer for OTP")] [Description("Email to customer for OTP")]
OTP_EMAIL = 8, OTP_EMAIL = 8,
[Description("Customer Password and Txn Pin")]
PIN_PASSWORD_EMAIL = 20,
FORCE_PASSWORD_CHANGE = 9, FORCE_PASSWORD_CHANGE = 9,
TRANSACTION_APPROVED = 10, TRANSACTION_APPROVED = 10,

2
GMENepal/GMENepalAPIService/GMENepalAPI.cs

@ -462,7 +462,7 @@ namespace GMENepal.GMENepalAPIService
PaymentMethod = eR.PaymentType == "Wallet" ? "W" : eR.PaymentType, PaymentMethod = eR.PaymentType == "Wallet" ? "W" : eR.PaymentType,
ReceivingAgentId = eR.PAgentName, ReceivingAgentId = eR.PAgentName,
ReceivingCountry = eR.PCountryName, ReceivingCountry = eR.PCountryName,
RemitAmount = eR.CalcBy == "C" ? eR.CAmount.ToString() : eR.PAmount.ToString()
RemitAmount = eR.CalcBy == "P" ? eR.CAmount.ToString() : eR.PAmount.ToString()
}; };
} }

40
ThirdPartyAPIs.sln

@ -11,21 +11,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Common\Common.csp
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Business", "Business\Business.csproj", "{143E1F73-BD44-4C9E-99D0-0768BF302285}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Business", "Business\Business.csproj", "{143E1F73-BD44-4C9E-99D0-0768BF302285}"
EndProject 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}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GMENepal", "GMENepal\GMENepal.csproj", "{0F5ACC33-43D7-46D3-BB17-0F067EAEE173}"
EndProject 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}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SignatureAPI", "SignatureAPI\SignatureAPI.csproj", "{0E8E9384-5E24-445D-9677-1D100820FAE3}"
EndProject 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 EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution 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}.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.ActiveCfg = Release|Any CPU
{143E1F73-BD44-4C9E-99D0-0768BF302285}.Release|Any CPU.Build.0 = 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.ActiveCfg = Debug|Any CPU
{0F5ACC33-43D7-46D3-BB17-0F067EAEE173}.Debug|Any CPU.Build.0 = 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.ActiveCfg = Release|Any CPU
{0F5ACC33-43D7-46D3-BB17-0F067EAEE173}.Release|Any CPU.Build.0 = 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.ActiveCfg = Debug|Any CPU
{0E8E9384-5E24-445D-9677-1D100820FAE3}.Debug|Any CPU.Build.0 = 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.ActiveCfg = Release|Any CPU
{0E8E9384-5E24-445D-9677-1D100820FAE3}.Release|Any CPU.Build.0 = 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 EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

15
ThirdPartyAPIs/App_Data/Templates/BASIC_REGISTRATION_EMAIL.html

@ -1,11 +1,16 @@
 
<body> <body>
<div style="color:#434444; padding: 15px; font-family: Roboto; font-size: 15px; margin-top: 1px">
<hr style="background-color: #fff; border-top: 1.5px solid #2B3C90; border-bottom: none;" />
<div style="color:#434444; padding: 15px; font-family: Roboto; font-size: 15px; margin-top: 10px">
<div style="text-align: left;">
<img src="https://imelondon.co.uk/assets/images/logo.png" alt="imelondon" class="CToWUd" height="50" width="150" style="height: 50px;width:150;border:0;">
<img src="https://imelondon.co.uk/assets/dist/images/imelondan.svg" alt="imelondon" class="CToWUd" height="50" width="155" style="height: 50px;width:155px;border:0;">
</div>
<br />
<hr style="background-color: #fff; border-top: 1.5px solid #2B3C90; border-bottom: none;" />
<div class="body"> <div class="body">
Dear <strong>{CustomerName}</strong>, Dear <strong>{CustomerName}</strong>,
@ -22,8 +27,8 @@
<p style="margin-top: 20px"> <p style="margin-top: 20px">
Please use the referal code <b> Please use the referal code <b>
{RefCode}
</b> to invite your friends and get 1£ after your friend sucessfully registers and 4 £ after sending the transaction.
{UserId}
</b> to invite your friends and get £ {RegReward} after your friend sucessfully registers and {TranReward}£ after sending the transaction.
<br /> <br />
** Terms and Condition applied ** Terms and Condition applied

5
ThirdPartyAPIs/Config/Mapping.json

@ -61,6 +61,11 @@
"SValue": "RESET_PASSWORD_EMAIL", "SValue": "RESET_PASSWORD_EMAIL",
"DValue": "App_Data\\Templates\\RESET_PASSWORD_EMAIL.html", "DValue": "App_Data\\Templates\\RESET_PASSWORD_EMAIL.html",
"Dtext": "Reset Password" "Dtext": "Reset Password"
},
{
"SValue": "PIN_PASSWORD_EMAIL",
"DValue": "App_Data\\Templates\\PIN_PASSWORD_EMAIL.html",
"Dtext": "Mobile Login Activate"
} }
] ]
}, },

11
ThirdPartyAPIs/Web.config

@ -57,14 +57,19 @@
<add key="gme_password" value="Gmesend@123" /> <add key="gme_password" value="Gmesend@123" />
<add key="gme_partnerId" value="BRNNP9943" /> <add key="gme_partnerId" value="BRNNP9943" />
<add key="gme_key" value="1!VE_#A>DAD#$%%$(8DH|}{+_Privat_)(@(*#@@R_Kops_@ngrY_BD%#DS^6" /> <add key="gme_key" value="1!VE_#A>DAD#$%%$(8DH|}{+_Privat_)(@(*#@@R_Kops_@ngrY_BD%#DS^6" />
<!-- API PartnerId--> <!-- API PartnerId-->
<add key="gmenepal" value="394397" /> <add key="gmenepal" value="394397" />
<add key="gccremit" value="394449" />
<!--GCC Remit API -->
<add key="gcc_base_url" value="http://demo.api.gccremit.com/SendAPI.svc" />
<add key="gcc_password" value="demo123@" />
<add key="gcc_securityKey" value="6HumnMSbNxltKc8UmOJ/mA==" />
<add key="gcc_partnerId" value="06327532" />
<!-- END API PartnerId--> <!-- END API PartnerId-->
<!--SMS API URL--> <!--SMS API URL-->
<add key="onewaysmsURL" value="https://api.textmarketer.co.uk/gateway/" /> <add key="onewaysmsURL" value="https://api.textmarketer.co.uk/gateway/" />
<add key="onewaysmsURLStatus" value="http://gateway.onewaysms.jp:10001/bulktrx.aspx" /> <add key="onewaysmsURLStatus" value="http://gateway.onewaysms.jp:10001/bulktrx.aspx" />

Loading…
Cancel
Save