Remove bizum and google/apple when subs

malmo-monei · malmo-monei · commit b4c7df6d7abe · 2025-04-28T11:51:41.000+02:00
diff --git a/assets/js/monei-block-checkout-bizum.js b/assets/js/monei-block-checkout-bizum.js
@@ -186,7 +186,7 @@
 		content: <MoneiBizumContent />,
 		edit: <div> { __( bizumData.title, 'monei' ) }</div>,
 		canMakePayment: ( { billingData } ) => {
-			return billingData.country === 'ES';
+			return billingData.country === 'ES' && !bizumData.cart_has_subscription;
 		},
 		supports: bizumData.supports,
 	};
diff --git a/src/Features/Subscriptions/WooCommerceSubscriptionsHandler.php b/src/Features/Subscriptions/WooCommerceSubscriptionsHandler.php
@@ -312,4 +312,17 @@ public function get_subscription_payment_method_friendly_name( $subscription ) {
 		/* translators: 1) card brand 2) last 4 digits */
 		return sprintf( __( '%1$s card ending in %2$s', 'monei' ), $brand, $last_digits );
 	}
+
+    /**
+     * Check if a product is a subscription using WooCommerce Subscription logic
+     *
+     * @param int|WC_Product $product Product ID or WC_Product object
+     * @return bool
+     */
+    function cart_has_subscription() {
+        if (!$this->is_subscriptions_addon_enabled()) {
+            return false;
+        }
+        return is_array( WC()->cart->recurring_carts ) ? count( WC()->cart->recurring_carts ) : 0;
+    }
 }
diff --git a/src/Features/Subscriptions/YithSubscriptionPluginHandler.php b/src/Features/Subscriptions/YithSubscriptionPluginHandler.php
@@ -298,4 +298,23 @@ public function get_subscription_payment_method_friendly_name( $subscription ) {
 		/* translators: 1) card brand 2) last 4 digits */
 		return sprintf( __( '%1$s card ending in %2$s', 'monei' ), $brand, $last_digits );
 	}
+
+    /**
+     * Check if a product is a subscription using YITH WooCommerce Subscription logic
+     *
+     * @param int|WC_Product $product Product ID or WC_Product object
+     * @return bool
+     */
+    function cart_has_subscription() {
+        // Ensure YITH WooCommerce Subscription plugin is active
+        if (!function_exists('YITH_WC_Subscription')) {
+            return false;
+        }
+
+        // Get the YITH_WC_Subscription instance
+        $ywsbs = YITH_WC_Subscription();
+
+        // Use the is_subscription method to check if the product is a subscription
+        return $ywsbs->cart_has_subscriptions();
+    }
 }
diff --git a/src/Gateways/Blocks/MoneiBizumBlocksSupport.php b/src/Gateways/Blocks/MoneiBizumBlocksSupport.php
@@ -3,6 +3,7 @@
 namespace Monei\Gateways\Blocks;
 
 use Automattic\WooCommerce\Blocks\Payments\Integrations\AbstractPaymentMethodType;
+use Monei\Features\Subscriptions\SubscriptionService;
 use Monei\Gateways\Abstracts\WCMoneiPaymentGateway;
 use Monei\Gateways\PaymentMethods\WCGatewayMoneiBizum;
 
@@ -11,9 +12,12 @@ final class MoneiBizumBlocksSupport extends AbstractPaymentMethodType {
 
 	private $gateway;
 	protected $name = 'monei_bizum';
+    protected SubscriptionService $subscriptions_service;
 
-	public function __construct( WCMoneiPaymentGateway $gateway ) {
+    public function __construct( WCMoneiPaymentGateway $gateway, SubscriptionService $subscriptionService) {
 		$this->gateway = $gateway;
+        $this->subscriptions_service = $subscriptionService;
+        $this->handler               = $this->subscriptions_service->getHandler();
 	}
 
 	public function initialize() {
@@ -61,6 +65,7 @@ public function is_active() {
 
 	public function get_payment_method_data() {
 		$total = isset( WC()->cart ) ? WC()->cart->get_total( false ) : 0;
+        $cart_has_subscription = $this->handler? $this->handler->cart_has_subscription(): false;
 		$data  = array(
 
 			'title'       => $this->gateway->title,
@@ -76,6 +81,7 @@ public function get_payment_method_data() {
 			'test_mode'   => $this->gateway->getTestmode() ?? false,
 			'accountId'   => $this->gateway->getAccountId() ?? false,
 			'sessionId'   => ( wc()->session ) ? wc()->session->get_customer_id() : '',
+            'cart_has_subscription' => $cart_has_subscription,
 		);
 
 		if ( 'yes' === $this->get_setting( 'hide_logo' ) ?? 'no' ) {
diff --git a/src/Gateways/PaymentMethods/WCGatewayMoneiAppleGoogle.php b/src/Gateways/PaymentMethods/WCGatewayMoneiAppleGoogle.php
@@ -55,7 +55,10 @@ public function __construct(
 		$this->icon     = ( $this->hide_logo ) ? '' : $iconMarkup;
 		$this->settings = get_option( 'woocommerce_monei_settings', array() );
 		$this->enabled  = ( ! empty( isset( $this->settings['apple_google_pay'] ) && 'yes' === $this->settings['apple_google_pay'] ) ) ? 'yes' : 'no';
-
+        $this->supports = array(
+            'products',
+            'refunds',
+        );
 		add_filter(
 			'woocommerce_available_payment_gateways',
 			array( $this, 'hideAppleGoogleInCheckout' ),
