From 202fde95b56708b33efe675e3779ed88c1750720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=CA=9C=E1=B4=80=C9=B4?= <codemascot@hotmail.com>
Date: Tue, 1 Oct 2019 03:15:41 +0600
Subject: [PATCH] Simplified intervals_missing method of TimeInterval
 (https://github.com/woocommerce/woocommerce-admin/pull/2919)

---
 .../src/API/Reports/TimeInterval.php          | 40 ++++++-------------
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/plugins/woocommerce-admin/src/API/Reports/TimeInterval.php b/plugins/woocommerce-admin/src/API/Reports/TimeInterval.php
index 345ba348bc8..6c6dbe6f809 100644
--- a/plugins/woocommerce-admin/src/API/Reports/TimeInterval.php
+++ b/plugins/woocommerce-admin/src/API/Reports/TimeInterval.php
@@ -510,35 +510,21 @@ class TimeInterval {
 	 * @return bool
 	 */
 	public static function intervals_missing( $expected_interval_count, $db_records, $items_per_page, $page_no, $order, $order_by, $intervals_count ) {
-		if ( $expected_interval_count > $db_records ) {
-			if ( 'date' === $order_by ) {
-				$expected_intervals_on_page = self::expected_intervals_on_page( $expected_interval_count, $items_per_page, $page_no );
-				if ( $intervals_count < $expected_intervals_on_page ) {
-					return true;
-				} else {
-					return false;
-				}
-			} else {
-				if ( 'desc' === $order ) {
-					if ( $page_no > floor( $db_records / $items_per_page ) ) {
-						return true;
-					} else {
-						return false;
-					}
-				} elseif ( 'asc' === $order ) {
-					if ( $page_no <= ceil( ( $expected_interval_count - $db_records ) / $items_per_page ) ) {
-						return true;
-					} else {
-						return false;
-					}
-				} else {
-					// Invalid ordering.
-					return false;
-				}
-			}
-		} else {
+		if ( $expected_interval_count <= $db_records ) {
 			return false;
 		}
+		if ( 'date' === $order_by ) {
+			$expected_intervals_on_page = self::expected_intervals_on_page( $expected_interval_count, $items_per_page, $page_no );
+			return $intervals_count < $expected_intervals_on_page;
+		}
+		if ( 'desc' === $order ) {
+			return $page_no > floor( $db_records / $items_per_page );
+		}
+		if ( 'asc' === $order ) {
+			return $page_no <= ceil( ( $expected_interval_count - $db_records ) / $items_per_page );
+		}
+		// Invalid ordering.
+		return false;
 	}
 
 	/**