From eb05a746c4df51698c827740b2b9901e2ec2c213 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Mon, 7 Feb 2022 10:38:05 -0800
Subject: [PATCH] Resolve dashboard/reporting discrepancy.

---
 .../projected-monthly-sales.component.jsx     | 24 ++++++++++++-------
 .../dashboard-grid.component.jsx              | 15 ++++++------
 client/src/translations/en_us/common.json     |  2 +-
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/client/src/components/dashboard-components/pojected-monthly-sales/projected-monthly-sales.component.jsx b/client/src/components/dashboard-components/pojected-monthly-sales/projected-monthly-sales.component.jsx
index abe4b9485..ba461678f 100644
--- a/client/src/components/dashboard-components/pojected-monthly-sales/projected-monthly-sales.component.jsx
+++ b/client/src/components/dashboard-components/pojected-monthly-sales/projected-monthly-sales.component.jsx
@@ -31,16 +31,24 @@ export default function DashboardProjectedMonthlySales({ data, ...cardProps }) {
 }
 
 export const DashboardProjectedMonthlySalesGql = `
-    projected_monthly_sales: jobs(where: {_or: [{_and: [{date_invoiced: {_gte: "${moment()
-      .startOf("month")
-      .format("YYYY-MM-DD")}"}}, {date_invoiced: {_lte: "${moment()
-  .endOf("month")
-  .format("YYYY-MM-DD")}"}}]}, {_and: [{scheduled_completion: {_gte: "${moment()
+    projected_monthly_sales: jobs(where: {
+      voided: {_eq: false},
+      _or: [
+        {_and: [{date_invoiced: {_gte: "${moment()
+      .startOf("month").startOf('day').toISOString()}"}}, {date_invoiced: {_lte: "${moment()
+  .endOf("month").endOf('day').toISOString()}"}}]},
+  
+  {_and: [
+    {date_invoiced: {_is_null: true}}, 
+    {scheduled_completion: {_gte: "${moment()
   .startOf("month")
-  .format("YYYY-MM-DD")}"}}, {scheduled_completion: {_lte: "${moment()
-  .endOf("month")
-  .format("YYYY-MM-DD")}"}}]}]}) {
+ .startOf('day').toISOString()}"}}, {scheduled_completion: {_lte: "${moment()
+  .endOf("month").endOf('day').toISOString()}"}}]}
+
+]}) {
     id
+    ro_number
+    voided
     date_invoiced
     job_totals
   }
diff --git a/client/src/components/dashboard-grid/dashboard-grid.component.jsx b/client/src/components/dashboard-grid/dashboard-grid.component.jsx
index f1b2f3c22..39a5432c2 100644
--- a/client/src/components/dashboard-grid/dashboard-grid.component.jsx
+++ b/client/src/components/dashboard-grid/dashboard-grid.component.jsx
@@ -280,12 +280,13 @@ const createDashboardQuery = (state) => {
   return gql`
     query QUERY_DASHBOARD_DETAILS {
          ${componentBasedAdditions || ""}
-      monthly_sales: jobs(where: {_and: [{date_invoiced: {_gte: "${moment()
-        .startOf("month")
-        .format("YYYY-MM-DD")}"}}, {date_invoiced: {_lte: "${moment()
-    .endOf("month")
-    .format("YYYY-MM-DD")}"}}]}) {
+      monthly_sales: jobs(where: {_and: [
+        { voided: {_eq: false}},
+        {date_invoiced: {_gte: "${moment()
+        .startOf("month").startOf('day').toISOString()}"}}, {date_invoiced: {_lte: "${moment()
+    .endOf("month").endOf('day').toISOString()}"}}]}) {
     id
+    ro_number
     date_invoiced
     job_totals
           rate_la1
@@ -333,14 +334,14 @@ const createDashboardQuery = (state) => {
           part_qty
           part_type
         }
-        labhrs: joblines_aggregate(where: { mod_lbr_ty: { _neq: "LAR" } }) {
+        labhrs: joblines_aggregate(where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }) {
           aggregate {
             sum {
               mod_lb_hrs
             }
           }
         }
-        larhrs: joblines_aggregate(where: { mod_lbr_ty: { _eq: "LAR" } }) {
+        larhrs: joblines_aggregate(where: { mod_lbr_ty: { _eq: "LAR" }, removed: { _eq: false } }) {
           aggregate {
             sum {
               mod_lb_hrs
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 5d75851df..1461ccc73 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -2230,7 +2230,7 @@
 				"gsr_by_csr": "Gross Sales by CSR",
 				"gsr_by_delivery_date": "Gross Sales by Delivery Date",
 				"gsr_by_estimator": "Gross Sales by Estimator",
-				"gsr_by_exported_date": "Gross Sales by Export Date",
+				"gsr_by_exported_date": "Exported Gross Sales",
 				"gsr_by_ins_co": "Gross Sales by Insurance Company",
 				"gsr_by_make": "Gross Sales by Vehicle Make",
 				"gsr_by_referral": "Gross Sales by Referral Source",