Merge pull request #182 from kimcoleman/fix-wc-checkout-hide-banner

Adjusting logic so the entire checkout process in WC can hide the banner, if desired.

Author: andrewlimaza

modules/ecommerce/wc/class-swsales-module-wc.php

@@ -253,18 +253,34 @@ public static function create_coupon_ajax() {
 	} // end create_discount_code_ajax()
 
 	/**
-	 * Returns whether the current page is the landing page
-	 * for the passed Sitewide Sale.
+	 * Returns whether the current page is the the checkout, cart or confirmation page.
 	 *
 	 * @param boolean               $is_checkout_page current value from filter.
 	 * @param SWSales_Sitewide_Sale $sitewide_sale being checked.
-	 * @return boolean
+	 * @return boolean 				$is_checkout_page true if we are on the checkout, cart, or confirmation page, false otherwise.
 	 */
 	public static function is_checkout_page( $is_checkout_page, $sitewide_sale ) {
 		if ( 'wc' !== $sitewide_sale->get_sale_type() ) {
 			return $is_checkout_page;
 		}
-		return ( ! empty( wc_get_page_id( 'cart' ) ) && is_page( wc_get_page_id( 'cart' ) ) ) ? true : $is_checkout_page;
+
+		// Check for cart page.
+		$is_cart_page = wc_get_page_id( 'cart' );
+		if ( ! empty( $is_cart_page ) && is_page( $is_cart_page ) ) {
+			return true;
+		}
+
+		// Check for checkout page.
+		if ( function_exists( 'is_checkout' ) && is_checkout() ) {
+			return true;
+		}
+
+		// Check for order confirmation/thank you page.
+		if ( is_wc_endpoint_url( 'order-received' ) ) {
+			return true;
+		}
+
+		return $is_checkout_page;
 	}
 
 	/**