Merge pull request #306 from reepay/dev

v 1.6.3 - Woocommerce zero payment fixes

Readme.txt

@@ -18,6 +18,7 @@ The Billwerk+ Payments plugin extends WooCommerce allowing you to take payments
 See installation guide right here: https://docu.billwerk.plus/help/en/apps/woocommerce/setup-woocommerce-plugin.html
 
 == Changelog ==
+v 1.6.3 - Woocommerce zero payment fixes
 v 1.6.2 - Fix user handle generate
 v 1.6.1 - Card saving fixes, user creation fixes
 v 1.6.0 - Lots of updates and fixes

includes/Actions/Checkout.php

@@ -21,24 +21,6 @@ class Checkout {
 	 */
 	public function __construct() {
 		add_action( 'woocommerce_checkout_create_order_line_item', array( $this, 'action_checkout_create_order_line_item' ), 10, 4 );
-		add_filter( 'woocommerce_cart_needs_payment', array( $this, 'check_need_payment' ), 10 );
-	}
-
-	/**
-	 * Count line item discount
-	 *
-	 * @param bool $need_payment need payment marker.
-	 *
-	 * @see WC_Cart::needs_payment
-	 *
-	 * @return bool
-	 */
-	public function check_need_payment( bool $need_payment ): bool {
-		if ( wcs_cart_have_subscription() ) {
-			return true;
-		}
-
-		return $need_payment;
 	}
 
 	/**

includes/Actions/Subscriptions.php

@@ -176,9 +176,10 @@ public function update_failing_payment_method( WC_Subscription $subscription, WC
 	public function delete_resubscribe_meta( WC_Order $resubscribe_order ) {
 		if ( in_array( $resubscribe_order->get_payment_method(), self::PAYMENT_METHODS, true ) ) {
 			// Delete tokens.
-			delete_post_meta( $resubscribe_order->get_id(), '_payment_tokens' );
-			delete_post_meta( $resubscribe_order->get_id(), '_reepay_token' );
-			delete_post_meta( $resubscribe_order->get_id(), '_reepay_token_id' );
+			$resubscribe_order->delete_meta_data( '_payment_tokens' );
+			$resubscribe_order->delete_meta_data( '_reepay_token' );
+			$resubscribe_order->delete_meta_data( '_reepay_token_id' );
+			$resubscribe_order->save_meta_data();
 		}
 	}
 
@@ -256,7 +257,8 @@ public function save_subscription_payment_meta( WC_Subscription $subscription, s
 			// Add tokens.
 			foreach ( explode( ',', $meta_value ) as $reepay_token ) {
 				ReepayTokens::assign_payment_token( $subscription, $reepay_token );
-				update_post_meta( $subscription->get_id(), 'reepay_token', $reepay_token );
+				$subscription->update_meta_data( 'reepay_token', $reepay_token );
+				$subscription->save_meta_data();
 			}
 		}
 	}
@@ -362,6 +364,12 @@ public function scheduled_subscription_payment( float $amount_to_charge, WC_Orde
 				throw new Exception( $result->get_error_message(), $result->get_error_code() );
 			}
 
+			// Fix for subscriptions can create the invoice.
+			sleep( 5 );
+			if ( $renewal_order->get_status() === 'pending' ) {
+				sleep( 5 );
+			}
+
 			// Instant settle.
 			do_action( 'reepay_instant_settle', $renewal_order );
 		} catch ( Exception $e ) {
@@ -467,7 +475,7 @@ public function save_new_payment_method_option_html( string $html, WC_Payment_Ga
 	 */
 	public function create_sub_invoice( int $order_id, string $this_status_transition_from, string $this_status_transition_to, WC_Order $instance ) {
 		$renewal_order = wc_get_order( $order_id );
-		$renewal_sub   = get_post_meta( $order_id, '_subscription_renewal', true );
+		$renewal_sub   = $renewal_order->get_meta( '_subscription_renewal' );
 		$gateway       = rp_get_payment_method( $renewal_order );
 		if ( ! empty( $renewal_sub ) && ! empty( $gateway ) ) {
 			$order_data = reepay()->api( $gateway )->get_invoice_data( $renewal_order );
@@ -498,7 +506,9 @@ public function create_sub_invoice( int $order_id, string $this_status_transitio
 	 */
 	public function sync_reepay_token_meta( int $meta_id, int $post_id, string $meta_key, $meta_value ) {
 		if ( 'reepay_token' === $meta_key ) {
-			update_post_meta( $post_id, '_reepay_token', $meta_value );
+			$order = wc_get_order( $post_id );
+			$order->update_meta_data( '_reepay_token', $meta_value );
+			$order->save_meta_data();
 		}
 	}
 }