code11/8

service/ocean_order.class.php

@@ -279,13 +279,13 @@ class ocean_order {
             if ($_reportType == "r3") {
                 if ($_reportRef == "Previous 7 Days") {
                     $sqlWhere .= " and eta>(current_date-interval '7 days') and eta<current_date";
-                } else if ($_reportRef == "0 Day") {
+                } else if ($_reportRef == "≤1 Day") {
                     $sqlWhere .= " and eta=current_date";
                 } else if ($_reportRef == "1-2 Days") {
                     $sqlWhere .= " and eta>current_date and eta<=(current_date+interval '2 days')";
                 } else if ($_reportRef == "3-6 Days") {
                     $sqlWhere .= " and eta>(current_date+interval '2 days') and eta<=(current_date+interval '6 days')";
-                } else if ($_reportRef == "7 Days") {
+                } else if ($_reportRef == "≥7 Days") {
                     $sqlWhere .= " and eta>(current_date+interval '6 days')";
                 } else {
                     $sqlWhere .= " and 1<>1";
@@ -293,37 +293,37 @@ class ocean_order {
             } else if ($_reportType == "r4") {
                 if ($_reportRef == "Previous 7 Days") {
                     $sqlWhere .= " and etd>(current_date-interval '7 days') and etd<current_date";
-                } else if ($_reportRef == "0 Day") {
+                } else if ($_reportRef == "≤1 Day") {
                     $sqlWhere .= " and etd=current_date";
                 } else if ($_reportRef == "1-2 Days") {
                     $sqlWhere .= " and etd>current_date and etd<=(current_date+interval '2 days')";
                 }  else if ($_reportRef == "3-6 Days") {
                     $sqlWhere .= " and etd>(current_date+interval '2 days') and etd<=(current_date+interval '6 days')";
-                } else if ($_reportRef == "7 Days") {
+                } else if ($_reportRef == "≥7 Days") {
                     $sqlWhere .= " and etd>(current_date+interval '6 days')";
                 } else {
                     $sqlWhere .= " and 1<>1";
                 }
             } else if ($_reportType == "ata_r3") {
-                if ($_reportRef == "0 Day") {
+                if ($_reportRef == "≤1 Day") {
                     $sqlWhere .= " and ata >= etd and (ata-etd) >= 0 and (ata-etd) < 1";
                 } else if ($_reportRef == "1-2 Days") {
                     $sqlWhere .= " and ata >= etd and (ata-etd) >= 1 and (ata-etd) < 2";
                 }  else if ($_reportRef == "3-6 Days") {
                     $sqlWhere .= " and ata >= etd and (ata-etd) >= 2 and (ata-etd) < 6";
-                } else if ($_reportRef == "7 Days") {
+                } else if ($_reportRef == "≥7 Days") {
                     $sqlWhere .= " and ata >= etd and (ata-etd) >= 6";
                 } else {
                     $sqlWhere .= " and 1<>1";
                 }
             } else if ($_reportType == "atd_r4") {
-                if ($_reportRef == "0 Day") {
+                if ($_reportRef == "≤1 Day") {
                     $sqlWhere .= " and atd >= etd and (atd-etd) >= 0 and (atd-etd) < 1";
                 } else if ($_reportRef == "1-2 Days") {
                     $sqlWhere .= " and atd >= etd and (atd-etd) >= 1 and (atd-etd) < 2";
                 }  else if ($_reportRef == "3-6 Days") {
                     $sqlWhere .= " and atd >= etd and (atd-etd) >= 2 and (atd-etd) < 6";
-                } else if ($_reportRef == "7 Days") {
+                } else if ($_reportRef == "≥7 Days") {
                     $sqlWhere .= " and atd >= etd and (atd-etd) >= 6 ";
                 } else {
                     $sqlWhere .= " and 1<>1";