From 823f07409aca7584a804c3118cf3e695209b58df Mon Sep 17 00:00:00 2001
From: Allan Carr <allan.carr@thinkimex.com>
Date: Fri, 29 Dec 2023 16:03:40 -0800
Subject: [PATCH 1/2] IO-2517 All Courtesy Car Warning Indicator

---
 .../courtesy-cars-list/courtesy-cars-list.component.jsx       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx b/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx
index 7c4b25534..3be08fff2 100644
--- a/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx
+++ b/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx
@@ -74,10 +74,10 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
       render: (text, record) => {
         const { nextservicedate, nextservicekm, mileage } = record;
 
-        const mileageOver = nextservicekm <= mileage;
+        const mileageOver = nextservicekm ? nextservicekm <= mileage : false;
 
         const dueForService =
-          nextservicedate && moment(nextservicedate).isBefore(moment());
+          nextservicedate && moment(nextservicedate).isSameOrBefore(moment());
 
         return (
           <Space>

From bfe94e3068c06d9b256269439ae275f2c6cb3f90 Mon Sep 17 00:00:00 2001
From: Allan Carr <allan.carr@thinkimex.com>
Date: Fri, 29 Dec 2023 16:17:37 -0800
Subject: [PATCH 2/2] IO-2517 Add same check within C/C form

---
 .../courtesy-car-form/courtesy-car-form.component.jsx  | 10 ++++------
 .../courtesy-cars-list.component.jsx                   |  3 ++-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx b/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx
index a64cb8a2a..f9a32dfee 100644
--- a/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx
+++ b/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx
@@ -214,10 +214,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
         >
           <CourtesyCarStatus />
         </Form.Item>
-        <Form.Item
-          label={t("courtesycars.fields.readiness")}
-          name="readiness"
-        >
+        <Form.Item label={t("courtesycars.fields.readiness")} name="readiness">
           <CourtesyCarReadiness />
         </Form.Item>
         <div>
@@ -234,8 +231,9 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
           >
             {() => {
               const nextservicekm = form.getFieldValue("nextservicekm");
-              const mileageOver =
-                nextservicekm && nextservicekm <= form.getFieldValue("mileage");
+              const mileageOver = nextservicekm
+                ? nextservicekm <= form.getFieldValue("mileage")
+                : false;
               if (mileageOver)
                 return (
                   <Space direction="vertical" style={{ color: "tomato" }}>
diff --git a/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx b/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx
index 3be08fff2..2c992990c 100644
--- a/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx
+++ b/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx
@@ -77,7 +77,8 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
         const mileageOver = nextservicekm ? nextservicekm <= mileage : false;
 
         const dueForService =
-          nextservicedate && moment(nextservicedate).isSameOrBefore(moment());
+          nextservicedate &&
+          moment(nextservicedate).endOf("day").isSameOrBefore(moment());
 
         return (
           <Space>