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

Merge pull request #12883 from woocommerce/order-tracking-messages 

Use notices functions in order tracking
This commit is contained in:
Mike Jolley 2017-01-20 10:38:02 +00:00 committed by GitHub
parent 9d513737ed ddc8ce93a4
commit d757b85167
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
includes/shortcodes/class-wc-shortcode-order-tracking.php
View File

@ -4,10 +4,10 @@
* *
* Lets a user see the status of an order by entering their order details. * Lets a user see the status of an order by entering their order details.
* *
* @author WooThemes * @author WooThemes
* @category Shortcodes * @category Shortcodes
* @package WooCommerce/Shortcodes/Order_Tracking * @package WooCommerce/Shortcodes/Order_Tracking
* @version 2.3.0 * @version 2.7.0
*/ */
class WC_Shortcode_Order_Tracking { class WC_Shortcode_Order_Tracking {
@ -39,23 +39,17 @@ class WC_Shortcode_Order_Tracking {
if ( ! empty( $_REQUEST['orderid'] ) && isset( $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'woocommerce-order_tracking' ) ) { if ( ! empty( $_REQUEST['orderid'] ) && isset( $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'woocommerce-order_tracking' ) ) {
$order_id = empty( $_REQUEST['orderid'] ) ? 0 : esc_attr( $_REQUEST['orderid'] ); $order_id = empty( $_REQUEST['orderid'] ) ? 0 : esc_attr( $_REQUEST['orderid'] );
$order_email = empty( $_REQUEST['order_email'] ) ? '' : esc_attr( $_REQUEST['order_email'] ); $order_email = empty( $_REQUEST['order_email'] ) ? '' : esc_attr( $_REQUEST['order_email'] );
if ( ! $order_id ) { if ( ! $order_id ) {
wc_add_notice( __( 'Please enter a valid order ID', 'woocommerce' ), 'error' );
echo '<p class="woocommerce-error">' . __( 'Please enter a valid order ID', 'woocommerce' ) . '</p>';
} elseif ( ! $order_email ) { } elseif ( ! $order_email ) {
wc_add_notice( __( 'Please enter a valid order email', 'woocommerce' ), 'error' );
echo '<p class="woocommerce-error">' . __( 'Please enter a valid order email', 'woocommerce' ) . '</p>';
} else { } else {
$order = wc_get_order( apply_filters( 'woocommerce_shortcode_order_tracking_order_id', $order_id ) ); $order = wc_get_order( apply_filters( 'woocommerce_shortcode_order_tracking_order_id', $order_id ) );
if ( $order && $order->get_id() && $order_email ) { if ( $order && $order->get_id() && $order_email ) {
if ( strtolower( $order->get_billing_email() ) == strtolower( $order_email ) ) { if ( strtolower( $order->get_billing_email() ) == strtolower( $order_email ) ) {
do_action( 'woocommerce_track_order', $order->get_id() ); do_action( 'woocommerce_track_order', $order->get_id() );
wc_get_template( 'order/tracking.php', array( wc_get_template( 'order/tracking.php', array(
@ -65,13 +59,13 @@ class WC_Shortcode_Order_Tracking {
return; return;
} }
} else { } else {
wc_add_notice( __( 'Sorry, we could not find that order ID in our database.', 'woocommerce' ), 'error' );
echo '<p class="woocommerce-error">' . __( 'Sorry, we could not find that order ID in our database.', 'woocommerce' ) . '</p>';
} }
} }
} }
wc_print_notices();
wc_get_template( 'order/form-tracking.php' ); wc_get_template( 'order/form-tracking.php' );
} }
} }