Fix subscription check when no subscription present

malmo-monei · malmo-monei · commit c23050e50c35 · 2025-04-28T11:50:17.000+02:00
diff --git a/src/Gateways/Abstracts/WCMoneiPaymentGatewayComponent.php b/src/Gateways/Abstracts/WCMoneiPaymentGatewayComponent.php
@@ -34,7 +34,7 @@ abstract class WCMoneiPaymentGatewayComponent extends WCMoneiPaymentGateway {
 	public function process_payment( $order_id, $allowed_payment_method = null ) {
 		$order   = new WC_Order( $order_id );
 		$payload = $this->create_payload( $order, $allowed_payment_method );
-		$payload = ( $this->handler->is_subscription_order( $order_id ) ) ? $this->handler->create_subscription_payload( $order, $allowed_payment_method, $payload ) : $payload;
+		$payload = $this->handler === null || ! ( $this->handler->is_subscription_order( $order_id ) ) ? $payload : $this->handler->create_subscription_payload( $order, $allowed_payment_method, $payload );
 
 		/**
 		 * If payment is tokenized ( saved cc ) we just need to create_payment with token and everything will work fine.
diff --git a/src/Gateways/PaymentMethods/WCGatewayMoneiCC.php b/src/Gateways/PaymentMethods/WCGatewayMoneiCC.php
@@ -269,7 +269,7 @@ public function payment_fields() {
 			esc_html_e( 'Pay via MONEI: you can add your payment method for future payments.', 'monei' );
 			// Always use component form in Add Payment method page.
 			$this->render_monei_form();
-		} elseif ( $this->handler->is_subscription_change_payment_page() ) {
+		} elseif ( $this->handler !== null && $this->handler->is_subscription_change_payment_page() ) {
 			// On subscription change payment page, we always use component CC.
 			echo esc_html( $this->description );
 			if ( $this->tokenization ) {
@@ -341,7 +341,7 @@ class="wc-block-components-validation-error"
 	 */
 	public function monei_scripts() {
 		// If merchant wants Component CC or is_add_payment_method_page that always use this component method.
-		if ( $this->redirect_flow && ! is_checkout() && ! is_add_payment_method_page() && ! $this->handler->is_subscription_change_payment_page() ) {
+		if ( $this->redirect_flow && ! is_checkout() && ! is_add_payment_method_page() && ($this->handler && ! $this->handler->is_subscription_change_payment_page() )  ) {
 			return;
 		}
 
