Merge master

Signed-off-by: Dave Richer <dave@imexsystems.ca>
2024-01-08 11:18:22 -05:00
parent 1f14688199 de90bd1bb0
commit 3a3b3af13f
16 changed files with 131 additions and 32 deletions
--- a/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx
+++ b/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx
@@ -73,10 +73,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 && dayjs(nextservicedate).isBefore(dayjs());
+          nextservicedate && dayjs(nextservicedate).end('day').isSameOrBefore(dayjs());

        return (
          <Space>