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

NTR: fix pipeline #869

Merged
merged 1 commit into from
Oct 22, 2024
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
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import HttpClient from '../services/HttpClient';
import Plugin from '../Plugin';

export default class MollieApplePayPaymentMethod extends Plugin {
Expand All @@ -8,10 +7,8 @@ export default class MollieApplePayPaymentMethod extends Plugin {
*/
init() {

const me = this;

const hideAlways = this.options.hideAlways;
const shopUrl = this.getShopUrl();

// if we don't want to always hide it,
// then only hide it, if Apple Pay is not active
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% sw_extends '@Storefront/storefront/component/buy-widget/buy-widget-form.html.twig' %}

{% block buy_widget_buy_container %}
{% block buy_widget_buy_button %}

{% if mollie_subscriptions_enabled and product.translated.customFields.mollie_payments_product_subscription_enabled %}
<div class="d-grid">
Expand Down
15 changes: 5 additions & 10 deletions src/Service/PaymentMethodService.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
use Kiener\MolliePayments\Handler\Method\CreditCardPayment;
use Kiener\MolliePayments\Handler\Method\EpsPayment;
use Kiener\MolliePayments\Handler\Method\GiftCardPayment;
use Kiener\MolliePayments\Handler\Method\GiroPayPayment;
use Kiener\MolliePayments\Handler\Method\iDealPayment;
use Kiener\MolliePayments\Handler\Method\In3Payment;
use Kiener\MolliePayments\Handler\Method\IngHomePayPayment;
Expand Down Expand Up @@ -124,11 +123,7 @@ public function installAndActivatePaymentMethods(Context $context): void
# we still need the min the database
# but always disable them :)
$this->disablePaymentMethod(IngHomePayPayment::class, $context);
$this->disablePaymentMethod(GiroPayPayment::class, $context);
$this->disablePaymentMethod(KlarnaPayLaterPayment::class, $context);
$this->disablePaymentMethod(KlarnaPayNowPayment::class, $context);
$this->disablePaymentMethod(KlarnaSliceItPayment::class, $context);
$this->disablePaymentMethod(SofortPayment::class, $context);

if (! $this->payPalExpressConfig->isEnabled()) {
$this->disablePaymentMethod(PayPalExpressPayment::class, $context);
}
Expand Down Expand Up @@ -444,14 +439,14 @@ public function getPaymentHandlers(): array
GiftCardPayment::class,
iDealPayment::class,
KbcPayment::class,
// KlarnaPayLaterPayment::class,
// KlarnaPayNowPayment::class,
// KlarnaSliceItPayment::class,
KlarnaPayLaterPayment::class,
KlarnaPayNowPayment::class,
KlarnaSliceItPayment::class,
KlarnaOnePayment::class,
PayPalPayment::class,
PaySafeCardPayment::class,
Przelewy24Payment::class,
// SofortPayment::class,
SofortPayment::class,
VoucherPayment::class,
In3Payment::class,
PosPayment::class,
Expand Down
4 changes: 4 additions & 0 deletions tests/PHPUnit/Service/PaymentMethodServiceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,14 @@ public function testSupportedMethods(): void
GiftCardPayment::class,
iDealPayment::class,
KbcPayment::class,
KlarnaPayLaterPayment::class,
KlarnaPayNowPayment::class,
KlarnaSliceItPayment::class,
KlarnaOnePayment::class,
PayPalPayment::class,
PaySafeCardPayment::class,
Przelewy24Payment::class,
SofortPayment::class,
VoucherPayment::class,
In3Payment::class,
PosPayment::class,
Expand Down
Loading