From e4b092fe10ca6fab472395e620b1cbf39762c6e8 Mon Sep 17 00:00:00 2001
From: Kevin Hagerty <kevin@khagerty.com>
Date: Sat, 5 Sep 2015 08:06:57 -0400
Subject: [PATCH 1/3] Use the needs_payment function

Instead of checking against a list of valid order statuses, use the needs_payment function which already checks against those statuses
---
 includes/shortcodes/class-wc-shortcode-checkout.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/includes/shortcodes/class-wc-shortcode-checkout.php b/includes/shortcodes/class-wc-shortcode-checkout.php
index 406b948f047..a952471cc8e 100644
--- a/includes/shortcodes/class-wc-shortcode-checkout.php
+++ b/includes/shortcodes/class-wc-shortcode-checkout.php
@@ -84,8 +84,7 @@ class WC_Shortcode_Checkout {
 			// Pay for existing order
 			$order_key            = $_GET[ 'key' ];
 			$order                = wc_get_order( $order_id );
-			$valid_order_statuses = apply_filters( 'woocommerce_valid_order_statuses_for_payment', array( 'pending', 'failed' ), $order );
-
+			
 			if ( ! current_user_can( 'pay_for_order', $order_id ) ) {
 				echo '<div class="woocommerce-error">' . __( 'Invalid order. If you have an account please log in and try again.', 'woocommerce' ) . ' <a href="' . wc_get_page_permalink( 'myaccount' ) . '" class="wc-forward">' . __( 'My Account', 'woocommerce' ) . '</a>' . '</div>';
 				return;
@@ -93,7 +92,7 @@ class WC_Shortcode_Checkout {
 
 			if ( $order->id == $order_id && $order->order_key == $order_key ) {
 
-				if ( $order->has_status( $valid_order_statuses ) ) {
+				if ( $order->needs_payment() ) {
 
 					// Set customer location to order location
 					if ( $order->billing_country )
@@ -118,11 +117,10 @@ class WC_Shortcode_Checkout {
 			// Pay for order after checkout step
 			$order_key            = isset( $_GET['key'] ) ? wc_clean( $_GET['key'] ) : '';
 			$order                = wc_get_order( $order_id );
-			$valid_order_statuses = apply_filters( 'woocommerce_valid_order_statuses_for_payment', array( 'pending', 'failed' ), $order );
-
+			
 			if ( $order->id == $order_id && $order->order_key == $order_key ) {
 
-				if ( $order->has_status( $valid_order_statuses ) ) {
+				if ( $order->needs_payment() ) {
 
 					?>
 					<ul class="order_details">

From 164b39ea428b1d72f1db81aa3e3720d736304f90 Mon Sep 17 00:00:00 2001
From: Kevin Hagerty <kevin@khagerty.com>
Date: Sat, 5 Sep 2015 08:09:47 -0400
Subject: [PATCH 2/3] Use the needs_payment function

Instead of checking against a list of valid order statuses, use the needs_payment function which already checks against those statuses
---
 includes/class-wc-form-handler.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/includes/class-wc-form-handler.php b/includes/class-wc-form-handler.php
index 3cd1c33a260..68a1620e694 100644
--- a/includes/class-wc-form-handler.php
+++ b/includes/class-wc-form-handler.php
@@ -266,9 +266,7 @@ class WC_Form_Handler {
 			$order_id   = absint( $wp->query_vars['order-pay'] );
 			$order      = wc_get_order( $order_id );
 
-			$valid_order_statuses = apply_filters( 'woocommerce_valid_order_statuses_for_payment', array( 'pending', 'failed' ), $order );
-
-			if ( $order->id == $order_id && $order->order_key == $order_key && $order->has_status( $valid_order_statuses ) ) {
+			if ( $order->id == $order_id && $order->order_key == $order_key && $order->needs_payment() ) {
 
 				// Set customer location to order location
 				if ( $order->billing_country ) {

From e419d073d500dfcaf557bcf7c3ad3c943668821d Mon Sep 17 00:00:00 2001
From: Kevin Hagerty <kevin@khagerty.com>
Date: Sat, 5 Sep 2015 08:11:15 -0400
Subject: [PATCH 3/3] Use the needs_payment function

Instead of checking against a list of valid order statuses, use the needs_payment function which already checks against those statuses
---
 templates/myaccount/my-orders.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/myaccount/my-orders.php b/templates/myaccount/my-orders.php
index 2e9ddc2a310..a18e3e047eb 100644
--- a/templates/myaccount/my-orders.php
+++ b/templates/myaccount/my-orders.php
@@ -62,7 +62,7 @@ if ( $customer_orders ) : ?>
 						<?php
 							$actions = array();
 
-							if ( in_array( $order->get_status(), apply_filters( 'woocommerce_valid_order_statuses_for_payment', array( 'pending', 'failed' ), $order ) ) ) {
+							if ( $order->needs_payment() ) {
 								$actions['pay'] = array(
 									'url'  => $order->get_checkout_payment_url(),
 									'name' => __( 'Pay', 'woocommerce' )