ISTWCMS-4917: adding check for only upcoming dates

src/Service/UWService.php

@@ -611,32 +611,29 @@ class UWService implements UWServiceInterface {
       // out correct values.
       foreach ($dates as $date) {
 
-        // The all day case, duration is always 1439.
-        if ($date['duration'] == '1439' && $date['end_value'] > strtotime("now")) {
-          $return_dates[] = date('l, F j, Y', $date['value']) . ' (all day)';
-        }
-        else {
-
-          // If the date is upcoming, meaning greater than right now.
-          // Taking this out for now, will be putting it back, if
-          // we figure out how to do this in the view.
-          // if ($date['end_value'] > strtotime("today")) {.
-          // If this is the same day, get the date and the start
-          // and end times.
-          if ($date['duration'] < '1439') {
-            $start_date = date('l, F j, Y g:i A', $date['value']);
-            $end_date = date('g:i A', $date['end_value']);
-          }
+        // Ensure that the dates are greater than now, before
+        // adding it to the dates array.
+        if ($date['end_value'] > strtotime("now")) {
+
+          // The all day case, duration is always 1439.
+          if ($date['duration'] == '1439') {
+            $return_dates[] = date('l, F j, Y', $date['value']) . ' (all day)';
+          } else {
+
+            // If this is the same day, get the date and the start
+            // and end times.
+            if ($date['duration'] < '1439') {
+              $start_date = date('l, F j, Y g:i A', $date['value']);
+              $end_date = date('g:i A', $date['end_value']);
+            } // This is not the day, get the start and end date with time.
+            else {
+              $start_date = date('l, F j, Y g:i A', $date['value']);
+              $end_date = date('l, F j, Y g:i A', $date['end_value']);
+            }
 
-          // This is not the day, get the start and end date with time.
-          else {
-            $start_date = date('l, F j, Y g:i A', $date['value']);
-            $end_date = date('l, F j, Y g:i A', $date['end_value']);
+            // Add the start and end date with timezone.
+            $return_dates[] = $start_date . ' - ' . $end_date . ' ' . date('T', $date['end_value']);
           }
-
-          // Add the start and end date with timezone.
-          $return_dates[] = $start_date . ' - ' . $end_date . ' ' . date('T', $date['end_value']);
-          // }
         }
       }
     }