WooCommerce_pay validation. Closes #1744.

This commit is contained in:
Mike Jolley 2012-11-13 23:50:20 +00:00
parent 514a313f0a
commit 62fe207a02
1 changed files with 41 additions and 26 deletions

View File

@ -501,54 +501,69 @@ function woocommerce_checkout_action() {
function woocommerce_pay_action() { function woocommerce_pay_action() {
global $woocommerce; global $woocommerce;
if (isset($_POST['woocommerce_pay']) && $woocommerce->verify_nonce('pay')) : if ( isset( $_POST['woocommerce_pay'] ) && $woocommerce->verify_nonce( 'pay' ) ) {
ob_start(); ob_start();
// Pay for existing order // Pay for existing order
$order_key = urldecode( $_GET['order'] ); $order_key = urldecode( $_GET['order'] );
$order_id = (int) $_GET['order_id']; $order_id = absint( $_GET['order_id'] );
$order = new WC_Order( $order_id ); $order = new WC_Order( $order_id );
if ($order->id == $order_id && $order->order_key == $order_key && in_array($order->status, array('pending', 'failed'))) : if ( $order->id == $order_id && $order->order_key == $order_key && in_array( $order->status, array( 'pending', 'failed' ) ) ) {
// Set customer location to order location // Set customer location to order location
if ($order->billing_country) $woocommerce->customer->set_country( $order->billing_country ); if ( $order->billing_country )
if ($order->billing_state) $woocommerce->customer->set_state( $order->billing_state ); $woocommerce->customer->set_country( $order->billing_country );
if ($order->billing_postcode) $woocommerce->customer->set_postcode( $order->billing_postcode ); if ( $order->billing_state )
$woocommerce->customer->set_state( $order->billing_state );
if ( $order->billing_postcode )
$woocommerce->customer->set_postcode( $order->billing_postcode );
if ( $order->billing_city )
$woocommerce->customer->set_city( $order->billing_city );
// Update payment method // Update payment method
if ($order->order_total > 0 ) : if ( $order->order_total > 0 ) {
$payment_method = woocommerce_clean($_POST['payment_method']); $payment_method = woocommerce_clean( $_POST['payment_method'] );
$available_gateways = $woocommerce->payment_gateways->get_available_payment_gateways(); $available_gateways = $woocommerce->payment_gateways->get_available_payment_gateways();
// Update meta // Update meta
update_post_meta( $order_id, '_payment_method', $payment_method); update_post_meta( $order_id, '_payment_method', $payment_method );
if (isset($available_gateways) && isset($available_gateways[$payment_method])) :
$payment_method_title = $available_gateways[$payment_method]->get_title(); if ( isset( $available_gateways[ $payment_method ] ) )
endif; $payment_method_title = $available_gateways[ $payment_method ]->get_title();
update_post_meta( $order_id, '_payment_method_title', $payment_method_title); update_post_meta( $order_id, '_payment_method_title', $payment_method_title);
$result = $available_gateways[$payment_method]->process_payment( $order_id ); // Validate
$available_gateways[ $payment_method ]->validate_fields();
// Redirect to success/confirmation/payment page // Process
if ($result['result']=='success') : if ( $woocommerce->error_count() == 0 ) {
wp_redirect( $result['redirect'] );
exit; $result = $available_gateways[ $payment_method ]->process_payment( $order_id );
endif;
else : // Redirect to success/confirmation/payment page
if ( $result['result'] == 'success' ) {
wp_redirect( $result['redirect'] );
exit;
}
}
} else {
// No payment was required for order // No payment was required for order
$order->payment_complete(); $order->payment_complete();
wp_safe_redirect( get_permalink(woocommerce_get_page_id('thanks')) ); wp_safe_redirect( get_permalink( woocommerce_get_page_id( 'thanks' ) ) );
exit; exit;
endif; }
endif; }
endif; }
} }