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.

Sign up for GitHub

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

Jump to bottom

Revert "SL-271 New payment methods integration" #231

Merged
merged 1 commit into from
Nov 29, 2024
Merged

Revert "SL-271 New payment methods integration" #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions saferpayofficial.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
*@license SIX Payment Services
*/

use Invertus\SaferPay\Config\SaferPayConfig;

if (!defined('_PS_VERSION_')) {
exit;
}
Expand Down Expand Up @@ -222,8 +220,7 @@ public function hookPaymentOptions($params)
continue;
}

if (!in_array($this->context->currency->iso_code, $paymentMethods[$paymentMethod['paymentMethod']]['currencies'])
&& !in_array($paymentMethod['paymentMethod'], SaferPayConfig::WALLET_PAYMENT_METHODS)) {
if (!in_array($this->context->currency->iso_code, $paymentMethods[$paymentMethod['paymentMethod']]['currencies'])) {
continue;
}

Expand Down
12 changes: 2 additions & 10 deletions src/Config/SaferPayConfig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class SaferPayConfig
const RESTRICT_REFUND_AMOUNT_TO_CAPTURED_AMOUNT = 'SAFERPAY_RESTRICT_REFUND_AMOUNT_TO_CAPTURED_AMOUNT';
const CONFIGURATION_NAME = 'SAFERPAY_CONFIGURATION_NAME';
const TEST_SUFFIX = '_TEST';
const API_VERSION = '1.43';
const API_VERSION = '1.40';
const PAYMENT_METHODS = [
self::PAYMENT_ALIPAY,
self::PAYMENT_AMEX,
Expand Down Expand Up @@ -78,7 +78,6 @@ class SaferPayConfig
self::PAYMENT_WLCRYPTOPAYMENTS,
self::PAYMENT_WECHATPAY,
self::PAYMENT_ACCOUNTTOACCOUNT,
self::PAYMENT_CLICKTOPAY,
];

const PAYMENT_ALIPAY = 'ALIPAY';
Expand Down Expand Up @@ -114,13 +113,10 @@ class SaferPayConfig
const PAYMENT_CARD = 'CARD';
const PAYMENT_POSTFINANCE_PAY = 'POSTFINANCEPAY';
const PAYMENT_WECHATPAY = 'WECHATPAY';
const PAYMENT_CLICKTOPAY = 'CLICKTOPAY';
const PAYMENT_BLIK = 'BLIK';

const WALLET_PAYMENT_METHODS = [
self::PAYMENT_APPLEPAY,
self::PAYMENT_GOOGLEPAY,
self::PAYMENT_CLICKTOPAY
];

const PAYMENT_METHODS_KEYS = [
Expand Down Expand Up @@ -148,8 +144,6 @@ class SaferPayConfig
'Card' => self::PAYMENT_CARD,
'PostFinancePay' => self::PAYMENT_POSTFINANCE_PAY,
'WeChatPay' => self::PAYMENT_WECHATPAY,
'ClickToPay' => self::PAYMENT_CLICKTOPAY,
'Blik' => self::PAYMENT_BLIK,
];

const FIELD_SUPPORTED_PAYMENT_METHODS = [
Expand Down Expand Up @@ -321,9 +315,7 @@ public static function isRedirectPayment($paymentMethod)
self::PAYMENT_POSTFINANCE_PAY,
self::PAYMENT_DIRECTDEBIT,
self::PAYMENT_SOFORT,
self::PAYMENT_PAYPAL,
self::PAYMENT_CLICKTOPAY,
self::PAYMENT_BLIK,
self::PAYMENT_PAYPAL
];

return in_array($paymentMethod, $paymentsAlwaysRedirect);
Expand Down
4 changes: 0 additions & 4 deletions src/Service/LegacyTranslator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

use Invertus\SaferPay\Config\SaferPayConfig;
use Invertus\SaferPay\Factory\ModuleFactory;
use PrestaShop\Module\PsAccounts\Vendor\phpseclib\Net\SSH1;
use SaferPayOfficial;

if (!defined('_PS_VERSION_')) {
Expand Down Expand Up @@ -83,9 +82,6 @@ private function getTranslations()
SaferPayConfig::PAYMENT_CARD => $this->module->l('Card', self::FILE_NAME),
SaferPayConfig::PAYMENT_POSTFINANCE_PAY => $this->module->l('PostFinancePay', self::FILE_NAME),
SaferPayConfig::PAYMENT_WECHATPAY => $this->module->l('WeChatPay', self::FILE_NAME),
SaferPayConfig::PAYMENT_BLIK => $this->module->l('Blik', self::FILE_NAME),
SaferPayConfig::PAYMENT_GOOGLEPAY => $this->module->l('Googlepay'),
SaferPayConfig::PAYMENT_CLICKTOPAY => $this->module->l('Clicktopay', self::FILE_NAME),
];
}
}
1 change: 1 addition & 0 deletions src/Service/SaferPayObtainPaymentMethods.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ public function obtainPaymentMethods()
$paymentMethods[$wallet->WalletName] = [
'paymentMethod' => $wallet->WalletName,
'logoUrl' => $wallet->LogoUrl,
'currencies' => $paymentMethodObject->Currencies,
];
}
}
Expand Down
Loading