Merge pull request #12883 from woocommerce/order-tracking-messages
Use notices functions in order tracking
This commit is contained in:
commit
d757b85167
|
@ -7,7 +7,7 @@
|
|||
* @author WooThemes
|
||||
* @category Shortcodes
|
||||
* @package WooCommerce/Shortcodes/Order_Tracking
|
||||
* @version 2.3.0
|
||||
* @version 2.7.0
|
||||
*/
|
||||
class WC_Shortcode_Order_Tracking {
|
||||
|
||||
|
@ -43,19 +43,13 @@ class WC_Shortcode_Order_Tracking {
|
|||
$order_email = empty( $_REQUEST['order_email'] ) ? '' : esc_attr( $_REQUEST['order_email'] );
|
||||
|
||||
if ( ! $order_id ) {
|
||||
|
||||
echo '<p class="woocommerce-error">' . __( 'Please enter a valid order ID', 'woocommerce' ) . '</p>';
|
||||
|
||||
wc_add_notice( __( 'Please enter a valid order ID', 'woocommerce' ), 'error' );
|
||||
} elseif ( ! $order_email ) {
|
||||
|
||||
echo '<p class="woocommerce-error">' . __( 'Please enter a valid order email', 'woocommerce' ) . '</p>';
|
||||
|
||||
wc_add_notice( __( 'Please enter a valid order email', 'woocommerce' ), 'error' );
|
||||
} else {
|
||||
|
||||
$order = wc_get_order( apply_filters( 'woocommerce_shortcode_order_tracking_order_id', $order_id ) );
|
||||
|
||||
if ( $order && $order->get_id() && $order_email ) {
|
||||
|
||||
if ( strtolower( $order->get_billing_email() ) == strtolower( $order_email ) ) {
|
||||
do_action( 'woocommerce_track_order', $order->get_id() );
|
||||
wc_get_template( 'order/tracking.php', array(
|
||||
|
@ -65,12 +59,12 @@ class WC_Shortcode_Order_Tracking {
|
|||
return;
|
||||
}
|
||||
} 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' );
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue