Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tamarazuk-raw-cancel-order-url'

This commit is contained in:
Barry Kooij 2015-03-06 15:06:41 +01:00
parent 66e6366be0 c45c4fd1a2
commit b0ad011eee
1 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
includes/abstracts/abstract-wc-order.php
View File

@ -1878,7 +1878,6 @@ abstract class WC_Abstract_Order {
return $has_downloadable_item; return $has_downloadable_item;
} }
/** /**
* Generates a URL so that a customer can pay for their (unpaid - pending) order. Pass 'true' for the checkout version which doesn't offer gateway choices. * Generates a URL so that a customer can pay for their (unpaid - pending) order. Pass 'true' for the checkout version which doesn't offer gateway choices.
* *
@ -1902,7 +1901,6 @@ abstract class WC_Abstract_Order {
return apply_filters( 'woocommerce_get_checkout_payment_url', $pay_url, $this ); return apply_filters( 'woocommerce_get_checkout_payment_url', $pay_url, $this );
} }
/** /**
* Generates a URL for the thanks page (order received) * Generates a URL for the thanks page (order received)
* *
@ -1921,7 +1919,6 @@ abstract class WC_Abstract_Order {
return apply_filters( 'woocommerce_get_checkout_order_received_url', $order_received_url, $this ); return apply_filters( 'woocommerce_get_checkout_order_received_url', $order_received_url, $this );
} }
/** /**
* Generates a URL so that a customer can cancel their (unpaid - pending) order. * Generates a URL so that a customer can cancel their (unpaid - pending) order.
* *
@ -1930,6 +1927,47 @@ abstract class WC_Abstract_Order {
* @return string * @return string
*/ */
public function get_cancel_order_url( $redirect = '' ) { public function get_cancel_order_url( $redirect = '' ) {
// Get cancel endpoint
$cancel_endpoint = $this->get_cancel_endpoint();
return apply_filters( 'woocommerce_get_cancel_order_url', wp_nonce_url( add_query_arg( array(
'cancel_order' => 'true',
'order' => $this->order_key,
'order_id' => $this->id,
'redirect' => $redirect
), $cancel_endpoint ), 'woocommerce-cancel_order' ) );
}
/**
* Generates a raw (unescaped) cancel-order URL for use by payment gateways
*
* @param string $redirect
*
* @return string The unescaped cancel-order URL
*/
public function get_cancel_order_url_raw( $redirect = '' ) {
// Get cancel endpoint
$cancel_endpoint = $this->get_cancel_endpoint();
return apply_filters( 'woocommerce_get_cancel_order_url_raw', add_query_arg( array(
'cancel_order' => 'true',
'order' => $this->order_key,
'order_id' => $this->id,
'redirect' => $redirect,
'_wpnonce' => wp_create_nonce( 'woocommerce-cancel_order' )
), $cancel_endpoint ) );
}
/**
* Helper method to return the cancel endpoint
*
* @return string the cancel endpoint; either the cart page or the home page
*/
public function get_cancel_endpoint() {
$cancel_endpoint = wc_get_page_permalink( 'cart' ); $cancel_endpoint = wc_get_page_permalink( 'cart' );
if ( ! $cancel_endpoint ) { if ( ! $cancel_endpoint ) {
$cancel_endpoint = home_url(); $cancel_endpoint = home_url();
@ -1939,9 +1977,10 @@ abstract class WC_Abstract_Order {
$cancel_endpoint = trailingslashit( $cancel_endpoint ); $cancel_endpoint = trailingslashit( $cancel_endpoint );
} }
return apply_filters('woocommerce_get_cancel_order_url', wp_nonce_url( add_query_arg( array( 'cancel_order' => 'true', 'order' => $this->order_key, 'order_id' => $this->id, 'redirect' => $redirect ), $cancel_endpoint ), 'woocommerce-cancel_order' ) ); return $cancel_endpoint;
} }
/** /**
* Generates a URL to view an order from the my account page * Generates a URL to view an order from the my account page
* *