From 9f5b1c4ea513ee34421a5456c4804bdfc19d28ee Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Thu, 10 Feb 2022 14:21:56 -0800 Subject: [PATCH] Resolve in house bill posting. --- .../components/bill-enter-modal/bill-enter-modal.container.jsx | 1 + server/scheduling/scheduling-job.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx index 6c0eeaa60..98bb7ac50 100644 --- a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx +++ b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx @@ -93,6 +93,7 @@ function BillEnterModalContainer({ deductedfromlbr, lbr_adjustment, location: lineLocation, + part_type, ...restI } = i; diff --git a/server/scheduling/scheduling-job.js b/server/scheduling/scheduling-job.js index d461e1395..192db7856 100644 --- a/server/scheduling/scheduling-job.js +++ b/server/scheduling/scheduling-job.js @@ -150,7 +150,7 @@ exports.job = async (req, res) => { const yesterday = moment().tz(timezone).subtract(1, "day"); const today = moment().tz(timezone).startOf("day"); - const end = moment.tz(timezone).max([ + const end = moment.max([ ...filteredArrJobs.map((a) => moment(a.scheduled_in).tz(timezone)), ...filteredCompJobs .map((p) => moment(p.actual_completion || p.scheduled_completion).tz(timezone))