Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.0.9 #27

Merged
merged 4 commits into from
Oct 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -179,3 +179,4 @@ InstalledPlugins.txt

logs
bundles/
src/.vs/SanalPosTR/DesignTimeBuild/.dtbcache.v2
19 changes: 19 additions & 0 deletions src/SanalPosTR/Configuration/BankTypes.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
namespace SanalPosTR
{
public enum BankTypes
{
Ziraat = 0,
Garanti = 1,
Ykb = 2,
Akbank = 3,
Isbank = 4,
DenizBank = 5,
HalkBank = 6,
VakifBank = 7,
FinansBank = 8,
Anadolubank = 9,
TEB = 10,
KuveytTurk = 11,
None = 99
}
}
19 changes: 0 additions & 19 deletions src/SanalPosTR/Configuration/Banks.cs

This file was deleted.

30 changes: 17 additions & 13 deletions src/SanalPosTR/Providers/KuveytTurk/KuveytTurkProviderServices.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,16 @@ public override string OnCompilingTemplate(PaymentModel paymentModel, string tem
{
if (paymentModel.Use3DSecure)
{
var nestConf = (KuveytTurkConfiguration)ProviderConfiguration;
var rnd = Guid.NewGuid().ToString("N").Substring(0, 20).ToUpper();
var installment = (paymentModel.Order.Installment.HasValue && (paymentModel.Order.Installment == 1 || paymentModel.Order.Installment == 0)) ? "" : paymentModel.Order.Installment.ToString();
var amount = paymentModel.Order.Total.ToString(new CultureInfo("en-US"));
var kuveytTurkConfiguration = (KuveytTurkConfiguration)ProviderConfiguration;

var hashStr = string.Concat(
nestConf.MerchantId,
kuveytTurkConfiguration.MerchantId,
paymentModel.Order.OrderId,
amount,
nestConf.SiteSuccessUrl.CompileOrderLink(paymentModel),
nestConf.SiteFailUrl.CompileOrderLink(paymentModel),
nestConf.UserName,
HashHelper.GetSHA1WithUTF8(nestConf.Password)
paymentModel.Order.Total.ToString("0", new CultureInfo("en-US")),
kuveytTurkConfiguration.SiteSuccessUrl.CompileOrderLink(paymentModel),
kuveytTurkConfiguration.SiteFailUrl.CompileOrderLink(paymentModel),
kuveytTurkConfiguration.UserName,
HashHelper.GetSHA1WithUTF8(kuveytTurkConfiguration.Password)
);

paymentModel.Attributes.Add(new SanalPosTRAttribute()
Expand Down Expand Up @@ -80,6 +77,14 @@ public override async Task<PaymentResult> ProcessPayment(PaymentModel paymentMod
if (cloneObj.Order.CurrencyCode.IsEmpty())
cloneObj.Order.CurrencyCode = "0949";

if (cloneObj.CreditCard.ExpireMonth.Length == 1)
cloneObj.CreditCard.ExpireMonth = $"0{cloneObj.CreditCard.ExpireMonth}";

if (cloneObj.CreditCard.ExpireYear.Length == 4)
cloneObj.CreditCard.ExpireYear = cloneObj.CreditCard.ExpireYear.Substring(2);

cloneObj.Order.Total *= 100;

HTTPClient client = new HTTPClient(EndPointConfiguration.BaseUrl);

var xmlTemplate = await base.ProcessPayment(cloneObj);
Expand Down Expand Up @@ -108,15 +113,14 @@ public override async Task<PaymentResult> VerifyPayment(VerifyPaymentModel payme
paymentModel.Attributes.Add(new SanalPosTRAttribute { Key = "OrderId", Value = vPosTransactionResponseContract.MerchantOrderId });
paymentModel.Attributes.Add(new SanalPosTRAttribute { Key = "CurrencyCode", Value = vPosTransactionResponseContract.VPosMessage.CurrencyCode });
paymentModel.Attributes.Add(new SanalPosTRAttribute { Key = "Total", Value = vPosTransactionResponseContract.VPosMessage.Amount });
// paymentModel.Attributes.Add(new SanalPosTRAttribute { Key = "HashData", Value = vPosTransactionResponseContract.HashData });
paymentModel.Attributes.Add(new SanalPosTRAttribute { Key = "MD", Value = vPosTransactionResponseContract.MD });

var nestConf = (KuveytTurkConfiguration)ProviderConfiguration;

var hashStr = string.Concat(
nestConf.MerchantId,
vPosTransactionResponseContract.MerchantOrderId,
vPosTransactionResponseContract.VPosMessage.Amount,
vPosTransactionResponseContract.VPosMessage.Amount.ToString("0", new CultureInfo("en-US")),
nestConf.UserName,
vPosTransactionResponseContract.VPosMessage.HashPassword
);
Expand Down Expand Up @@ -154,7 +158,7 @@ public bool Validate3D(IFormCollection formCollection, VerifyPaymentModel paymen
if (formCollection.Keys.Contains("AuthenticationResponse"))
{
var vPosTransactionResponseContract = GetVPosTransactionResponseContract(formCollection["AuthenticationResponse"]);
return vPosTransactionResponseContract.ResponseCode == "00" && vPosTransactionResponseContract.VPosMessage.Amount == paymentModel.Order.Total;
return vPosTransactionResponseContract.ResponseCode == "00";
}
else
return false;
Expand Down
4 changes: 2 additions & 2 deletions src/SanalPosTR/Providers/KuveytTurk/Resources/3D.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<InstallmentCount>0</InstallmentCount>
{% endif %}

<Amount>{{Order.Total | formatMoneyUS}}</Amount>
<DisplayAmount>{{Order.Total | formatMoneyUS}}</DisplayAmount>
<Amount>{{Order.Total}}</Amount>
<DisplayAmount>{{Order.Total}}</DisplayAmount>
<CurrencyCode>{{ Order.CurrencyCode }}</CurrencyCode>
<MerchantOrderId>{{Order.OrderId}}</MerchantOrderId>
<TransactionSecurity>3</TransactionSecurity>
Expand Down
2 changes: 1 addition & 1 deletion src/SanalPosTR/Providers/KuveytTurk/Resources/3DEnd.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<UserName>{{ Configuration.UserName }}</UserName>
<TransactionType>Sale</TransactionType>
<InstallmentCount>{{Installment}}</InstallmentCount>
<Amount>{{Total | formatMoneyUS}}</Amount>
<Amount>{{Total}}</Amount>
<CurrencyCode>{{ CurrencyCode }}</CurrencyCode>
<MerchantOrderId>{{OrderId}}</MerchantOrderId>
<TransactionSecurity>3</TransactionSecurity>
Expand Down
16 changes: 0 additions & 16 deletions src/SanalPosTR/Providers/ProviderTypes.cs

This file was deleted.

2 changes: 1 addition & 1 deletion src/SanalPosTR/SanalPosTR.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net5.0</TargetFramework>
<AssemblyName>SanalPosTR</AssemblyName>
<RootNamespace>SanalPosTR</RootNamespace>
<Version>1.0.8</Version>
<Version>1.0.9</Version>
<Authors>Fırat Oltulu</Authors>
<Company />
<Description>
Expand Down