From acaba96e3ba7cef96c28dcdc445946122c1f1de3 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Fri, 21 Jul 2023 14:08:42 -0700 Subject: [PATCH 1/7] IO-2117 Void Date Add to table --- hasura/metadata/tables.yaml | 3 +++ .../down.sql | 4 ++++ .../up.sql | 2 ++ .../down.sql | 1 + .../up.sql | 1 + 5 files changed, 11 insertions(+) create mode 100644 hasura/migrations/1689973479186_alter_table_public_jobs_add_column_void_date/down.sql create mode 100644 hasura/migrations/1689973479186_alter_table_public_jobs_add_column_void_date/up.sql create mode 100644 hasura/migrations/1689973508700_alter_table_public_jobs_alter_column_void_date/down.sql create mode 100644 hasura/migrations/1689973508700_alter_table_public_jobs_alter_column_void_date/up.sql diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml index ee39e05c3..c5a78e27a 100644 --- a/hasura/metadata/tables.yaml +++ b/hasura/metadata/tables.yaml @@ -3495,6 +3495,7 @@ - v_model_yr - v_vin - vehicleid + - void_date - voided select_permissions: - role: user @@ -3761,6 +3762,7 @@ - v_model_yr - v_vin - vehicleid + - void_date - voided filter: bodyshop: @@ -4037,6 +4039,7 @@ - v_model_yr - v_vin - vehicleid + - void_date - voided filter: bodyshop: diff --git a/hasura/migrations/1689973479186_alter_table_public_jobs_add_column_void_date/down.sql b/hasura/migrations/1689973479186_alter_table_public_jobs_add_column_void_date/down.sql new file mode 100644 index 000000000..b8c658dd0 --- /dev/null +++ b/hasura/migrations/1689973479186_alter_table_public_jobs_add_column_void_date/down.sql @@ -0,0 +1,4 @@ +-- Could not auto-generate a down migration. +-- Please write an appropriate down migration for the SQL below: +-- alter table "public"."jobs" add column "void_date" Timestamp +-- null; diff --git a/hasura/migrations/1689973479186_alter_table_public_jobs_add_column_void_date/up.sql b/hasura/migrations/1689973479186_alter_table_public_jobs_add_column_void_date/up.sql new file mode 100644 index 000000000..7c41363ed --- /dev/null +++ b/hasura/migrations/1689973479186_alter_table_public_jobs_add_column_void_date/up.sql @@ -0,0 +1,2 @@ +alter table "public"."jobs" add column "void_date" Timestamp + null; diff --git a/hasura/migrations/1689973508700_alter_table_public_jobs_alter_column_void_date/down.sql b/hasura/migrations/1689973508700_alter_table_public_jobs_alter_column_void_date/down.sql new file mode 100644 index 000000000..42a67c083 --- /dev/null +++ b/hasura/migrations/1689973508700_alter_table_public_jobs_alter_column_void_date/down.sql @@ -0,0 +1 @@ +ALTER TABLE "public"."jobs" ALTER COLUMN "void_date" TYPE timestamp without time zone; diff --git a/hasura/migrations/1689973508700_alter_table_public_jobs_alter_column_void_date/up.sql b/hasura/migrations/1689973508700_alter_table_public_jobs_alter_column_void_date/up.sql new file mode 100644 index 000000000..97504d6c8 --- /dev/null +++ b/hasura/migrations/1689973508700_alter_table_public_jobs_alter_column_void_date/up.sql @@ -0,0 +1 @@ +ALTER TABLE "public"."jobs" ALTER COLUMN "void_date" TYPE timestamptz; From e70edaec7c9dc9b89dc40def71cb997cf3ee6387 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Fri, 21 Jul 2023 15:50:49 -0700 Subject: [PATCH 2/7] IO-2117 Void Date --- .../jobs-admin-dates.component.jsx | 22 ++++++++++++------- .../jobs-admin-unvoid.component.jsx | 3 ++- .../jobs-detail-dates.component.jsx | 4 ++++ .../jobs-detail-header-actions.component.jsx | 5 +++-- client/src/graphql/jobs.queries.js | 3 +++ client/src/translations/en_us/common.json | 1 + client/src/translations/es/common.json | 1 + client/src/translations/fr/common.json | 1 + client/src/utils/TemplateConstants.js | 2 +- hasura/metadata/tables.yaml | 3 +++ .../down.sql | 1 + .../up.sql | 1 + 12 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 hasura/migrations/1689978551428_alter_table_public_jobs_alter_column_void_date/down.sql create mode 100644 hasura/migrations/1689978551428_alter_table_public_jobs_alter_column_void_date/up.sql diff --git a/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx b/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx index d497c9618..bfddbfefc 100644 --- a/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx +++ b/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx @@ -1,14 +1,14 @@ -import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component"; import { useMutation } from "@apollo/client"; import { Button, Form, notification } from "antd"; +import moment from "moment"; import React, { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; import { UPDATE_JOB } from "../../graphql/jobs.queries"; -import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component"; -import LayoutFormRow from "../layout-form-row/layout-form-row.component"; -import moment from "moment"; -import FormDatePicker from "../form-date-picker/form-date-picker.component"; import AuditTrailMapping from "../../utils/AuditTrailMappings"; +import FormDatePicker from "../form-date-picker/form-date-picker.component"; +import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component"; +import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component"; +import LayoutFormRow from "../layout-form-row/layout-form-row.component"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; @@ -38,8 +38,8 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) { setLoading(true); const result = await updateJob({ variables: { jobId: job.id, job: values }, - refetchQueries: ['GET_JOB_BY_PK'], - awaitRefetchQueries:true + refetchQueries: ["GET_JOB_BY_PK"], + awaitRefetchQueries: true, }); const changedAuditFields = form.getFieldsValue( @@ -126,7 +126,10 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) { - + + + + diff --git a/client/src/components/jobs-admin-unvoid/jobs-admin-unvoid.component.jsx b/client/src/components/jobs-admin-unvoid/jobs-admin-unvoid.component.jsx index 51d5d33ed..7963fd05f 100644 --- a/client/src/components/jobs-admin-unvoid/jobs-admin-unvoid.component.jsx +++ b/client/src/components/jobs-admin-unvoid/jobs-admin-unvoid.component.jsx @@ -33,8 +33,9 @@ export function JobsAdminUnvoid({ mutation UNVOID_JOB($jobId: uuid!) { update_jobs_by_pk(pk_columns: {id: $jobId}, _set: {voided: false, status: "${ bodyshop.md_ro_statuses.default_imported - }"}) { + }", date_void: null}) { id + date_void voided status } diff --git a/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx b/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx index ac501c7e1..05cd1b289 100644 --- a/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx +++ b/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx @@ -141,6 +141,10 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) { + + + + ); diff --git a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx index 48118f1c0..4565864f5 100644 --- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx +++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx @@ -5,10 +5,10 @@ import { Dropdown, Form, Menu, - notification, Popconfirm, Popover, Select, + notification, } from "antd"; import React, { useMemo } from "react"; import { useTranslation } from "react-i18next"; @@ -24,12 +24,12 @@ import { selectBodyshop, selectCurrentUser, } from "../../redux/user/user.selectors"; +import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component"; import JobsDetailHeaderActionsAddevent from "./jobs-detail-header-actions.addevent"; import AddToProduction from "./jobs-detail-header-actions.addtoproduction.util"; import JobsDetaiLheaderCsi from "./jobs-detail-header-actions.csi.component"; import DuplicateJob from "./jobs-detail-header-actions.duplicate.util"; import JobsDetailHeaderActionsExportcustdataComponent from "./jobs-detail-header-actions.exportcustdata.component"; -import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component"; const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop, @@ -480,6 +480,7 @@ export function JobsDetailHeaderActions({ scheduled_in: null, scheduled_completion: null, inproduction: false, + date_void: new Date(), }, note: [ { diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js index 9a226c831..afffecc3c 100644 --- a/client/src/graphql/jobs.queries.js +++ b/client/src/graphql/jobs.queries.js @@ -682,6 +682,7 @@ export const GET_JOB_BY_PK = gql` date_rentalresp date_exported date_repairstarted + date_void status owner_owing tax_registration_number @@ -1078,6 +1079,7 @@ export const UPDATE_JOB = gql` scheduled_completion actual_in date_repairstarted + date_void } } } @@ -1125,6 +1127,7 @@ export const VOID_JOB = gql` update_jobs_by_pk(_set: $job, pk_columns: { id: $jobId }) { id date_exported + date_void status alt_transport ro_number diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index 345d72f08..e8a1bb563 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -1439,6 +1439,7 @@ "date_repairstarted": "Repairs Started", "date_scheduled": "Scheduled", "date_towin": "Towed In", + "date_void": "Void", "ded_amt": "Deductible", "ded_note": "Deductible Note", "ded_status": "Deductible Status", diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index dbecbc9d1..60fc62d36 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -1439,6 +1439,7 @@ "date_repairstarted": "", "date_scheduled": "Programado", "date_towin": "", + "date_void": "", "ded_amt": "Deducible", "ded_note": "", "ded_status": "Estado deducible", diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index 88033bd4c..fe1289614 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -1439,6 +1439,7 @@ "date_repairstarted": "", "date_scheduled": "Prévu", "date_towin": "", + "date_void": "", "ded_amt": "Déductible", "ded_note": "", "ded_status": "Statut de franchise", diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js index c07e375fa..0c4c33520 100644 --- a/client/src/utils/TemplateConstants.js +++ b/client/src/utils/TemplateConstants.js @@ -1237,7 +1237,7 @@ export const TemplateList = (type, context) => { disabled: false, rangeFilter: { object: i18n.t("reportcenter.labels.objects.jobs"), - field: i18n.t("jobs.fields.date_open"), + field: i18n.t("jobs.fields.date_void"), }, group: "sales", }, diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml index ee39e05c3..12664c718 100644 --- a/hasura/metadata/tables.yaml +++ b/hasura/metadata/tables.yaml @@ -3495,6 +3495,7 @@ - v_model_yr - v_vin - vehicleid + - date_void - voided select_permissions: - role: user @@ -3761,6 +3762,7 @@ - v_model_yr - v_vin - vehicleid + - date_void - voided filter: bodyshop: @@ -4037,6 +4039,7 @@ - v_model_yr - v_vin - vehicleid + - date_void - voided filter: bodyshop: diff --git a/hasura/migrations/1689978551428_alter_table_public_jobs_alter_column_void_date/down.sql b/hasura/migrations/1689978551428_alter_table_public_jobs_alter_column_void_date/down.sql new file mode 100644 index 000000000..085b24071 --- /dev/null +++ b/hasura/migrations/1689978551428_alter_table_public_jobs_alter_column_void_date/down.sql @@ -0,0 +1 @@ +alter table "public"."jobs" rename column "date_void" to "void_date"; diff --git a/hasura/migrations/1689978551428_alter_table_public_jobs_alter_column_void_date/up.sql b/hasura/migrations/1689978551428_alter_table_public_jobs_alter_column_void_date/up.sql new file mode 100644 index 000000000..4a6b2bfc8 --- /dev/null +++ b/hasura/migrations/1689978551428_alter_table_public_jobs_alter_column_void_date/up.sql @@ -0,0 +1 @@ +alter table "public"."jobs" rename column "void_date" to "date_void"; From 6b52723ba99ce80c7591f5fb1758cd7a609bc6fe Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Mon, 24 Jul 2023 15:43:34 -0700 Subject: [PATCH 3/7] IO-2356 Auto CC for Parts Return --- .../shop-info/shop-info.general.component.jsx | 12 ++++++++++++ client/src/translations/en_us/common.json | 1 + client/src/translations/es/common.json | 1 + client/src/translations/fr/common.json | 1 + client/src/utils/TemplateConstants.js | 9 ++++++++- 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/client/src/components/shop-info/shop-info.general.component.jsx b/client/src/components/shop-info/shop-info.general.component.jsx index 416d2f658..99245c76e 100644 --- a/client/src/components/shop-info/shop-info.general.component.jsx +++ b/client/src/components/shop-info/shop-info.general.component.jsx @@ -602,6 +602,18 @@ export default function ShopInfoGeneral({ form }) { > + { }, parts_return_slip: { title: i18n.t("printcenter.jobs.parts_return_slip"), - subject: i18n.t("printcenter.jobs.parts_return_slip"), + subject: i18n.t("printcenter.subjects.jobs.parts_return_slip", { + ro_number: context && context.job && context.job.ro_number, + name: ( + (context && context.job && context.job.ownr_ln) || + (context && context.job && context.job.ownr_co_nm) || + "" + ).trim(), + }), description: "", key: "parts_return_slip", disabled: false, From 88101b02522cebe2c4517e973d078d9b012206c5 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Wed, 26 Jul 2023 16:36:51 -0700 Subject: [PATCH 4/7] IO-2364 UnInvoice Audit Trail --- .../jobs-admin-mark-reexport.component.jsx | 13 ++++++++----- client/src/translations/en_us/common.json | 1 + client/src/translations/es/common.json | 1 + client/src/translations/fr/common.json | 1 + client/src/utils/AuditTrailMappings.js | 1 + 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx b/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx index 137c074aa..18fa4b3eb 100644 --- a/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx +++ b/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx @@ -1,19 +1,18 @@ -import { useMutation } from "@apollo/client"; +import { gql, useMutation } from "@apollo/client"; import { Button, notification } from "antd"; -import { gql } from "@apollo/client"; import React, { useState } from "react"; import { useTranslation } from "react-i18next"; +import moment from "moment"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; +import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries"; +import { insertAuditTrail } from "../../redux/application/application.actions"; import { selectBodyshop, selectCurrentUser, } from "../../redux/user/user.selectors"; -import moment from "moment"; import AuditTrailMapping from "../../utils/AuditTrailMappings"; -import { insertAuditTrail } from "../../redux/application/application.actions"; -import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries"; const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop, currentUser: selectCurrentUser, @@ -150,6 +149,10 @@ export function JobAdminMarkReexport({ if (!result.errors) { notification["success"]({ message: t("jobs.successes.save") }); + insertAuditTrail({ + jobid: job.id, + operation: AuditTrailMapping.admin_jobmarkforreexport(), + }); } else { notification["error"]({ message: t("jobs.errors.saving", { diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index 345d72f08..5032912df 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -101,6 +101,7 @@ "messages": { "admin_jobmarkexported": "ADMIN: Job marked as exported.", "admin_jobmarkforreexport": "ADMIN: Job marked for re-export.", + "admin_jobuninvoice": "ADMIN: Job has been uninvoiced.", "admin_jobunvoid": "ADMIN: Job has been unvoided.", "billposted": "Bill with invoice number {{invoice_number}} posted.", "billupdated": "Bill with invoice number {{invoice_number}} updated.", diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index dbecbc9d1..6e70ee940 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -101,6 +101,7 @@ "messages": { "admin_jobmarkexported": "", "admin_jobmarkforreexport": "", + "admin_jobuninvoice": "", "admin_jobunvoid": "", "billposted": "", "billupdated": "", diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index 88033bd4c..ac7ed56dc 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -101,6 +101,7 @@ "messages": { "admin_jobmarkexported": "", "admin_jobmarkforreexport": "", + "admin_jobuninvoice": "", "admin_jobunvoid": "", "billposted": "", "billupdated": "", diff --git a/client/src/utils/AuditTrailMappings.js b/client/src/utils/AuditTrailMappings.js index e3019c731..863a6db4d 100644 --- a/client/src/utils/AuditTrailMappings.js +++ b/client/src/utils/AuditTrailMappings.js @@ -36,6 +36,7 @@ const AuditTrailMapping = { jobnoteupdated: () => i18n.t("audit_trail.messages.jobnoteupdated"), jobnotedeleted: () => i18n.t("audit_trail.messages.jobnotedeleted"), admin_jobunvoid: () => i18n.t("audit_trail.messages.admin_jobunvoid"), + admin_jobuninvoice: () => i18n.t("audit_trail.messages.admin_jobunvoid"), admin_jobmarkforreexport: () => i18n.t("audit_trail.messages.admin_jobmarkforreexport"), admin_jobmarkexported: () => From ea774ff22bc293746d0c697dcd1ba9e70e6d7eaa Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Wed, 26 Jul 2023 16:45:00 -0700 Subject: [PATCH 5/7] IO-2364 UnInvoice Audit Trail --- .../jobs-admin-mark-reexport.component.jsx | 2 +- client/src/utils/AuditTrailMappings.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx b/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx index 18fa4b3eb..c47c30def 100644 --- a/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx +++ b/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx @@ -151,7 +151,7 @@ export function JobAdminMarkReexport({ notification["success"]({ message: t("jobs.successes.save") }); insertAuditTrail({ jobid: job.id, - operation: AuditTrailMapping.admin_jobmarkforreexport(), + operation: AuditTrailMapping.admin_jobuninvoice(), }); } else { notification["error"]({ diff --git a/client/src/utils/AuditTrailMappings.js b/client/src/utils/AuditTrailMappings.js index 863a6db4d..99a9a014b 100644 --- a/client/src/utils/AuditTrailMappings.js +++ b/client/src/utils/AuditTrailMappings.js @@ -36,7 +36,7 @@ const AuditTrailMapping = { jobnoteupdated: () => i18n.t("audit_trail.messages.jobnoteupdated"), jobnotedeleted: () => i18n.t("audit_trail.messages.jobnotedeleted"), admin_jobunvoid: () => i18n.t("audit_trail.messages.admin_jobunvoid"), - admin_jobuninvoice: () => i18n.t("audit_trail.messages.admin_jobunvoid"), + admin_jobuninvoice: () => i18n.t("audit_trail.messages.admin_jobuninvoice"), admin_jobmarkforreexport: () => i18n.t("audit_trail.messages.admin_jobmarkforreexport"), admin_jobmarkexported: () => From a7ad18fae25c50f418fcc5df78224d33cb1c4611 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Thu, 27 Jul 2023 11:23:44 -0700 Subject: [PATCH 6/7] Timeticket schema update to include task_name --- hasura/metadata/tables.yaml | 3 +++ .../down.sql | 4 ++++ .../up.sql | 2 ++ 3 files changed, 9 insertions(+) create mode 100644 hasura/migrations/1690482057097_alter_table_public_timetickets_add_column_task_name/down.sql create mode 100644 hasura/migrations/1690482057097_alter_table_public_timetickets_add_column_task_name/up.sql diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml index 12664c718..cf189ea3f 100644 --- a/hasura/metadata/tables.yaml +++ b/hasura/metadata/tables.yaml @@ -5562,6 +5562,7 @@ - memo - productivehrs - rate + - task_name - ttapprovalqueueid - updated_at select_permissions: @@ -5585,6 +5586,7 @@ - memo - productivehrs - rate + - task_name - ttapprovalqueueid - updated_at filter: @@ -5617,6 +5619,7 @@ - memo - productivehrs - rate + - task_name - ttapprovalqueueid - updated_at filter: diff --git a/hasura/migrations/1690482057097_alter_table_public_timetickets_add_column_task_name/down.sql b/hasura/migrations/1690482057097_alter_table_public_timetickets_add_column_task_name/down.sql new file mode 100644 index 000000000..9335d1ce8 --- /dev/null +++ b/hasura/migrations/1690482057097_alter_table_public_timetickets_add_column_task_name/down.sql @@ -0,0 +1,4 @@ +-- Could not auto-generate a down migration. +-- Please write an appropriate down migration for the SQL below: +-- alter table "public"."timetickets" add column "task_name" text +-- null; diff --git a/hasura/migrations/1690482057097_alter_table_public_timetickets_add_column_task_name/up.sql b/hasura/migrations/1690482057097_alter_table_public_timetickets_add_column_task_name/up.sql new file mode 100644 index 000000000..e88d3a79b --- /dev/null +++ b/hasura/migrations/1690482057097_alter_table_public_timetickets_add_column_task_name/up.sql @@ -0,0 +1,2 @@ +alter table "public"."timetickets" add column "task_name" text + null; From 6e21b1bdf63626019ab51392ec681e7b009f952b Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Fri, 28 Jul 2023 12:59:10 -0700 Subject: [PATCH 7/7] IO-2366 Scoreboard Sales Calculation correction of formula --- .../scoreboard-chart/scoreboard-chart.component.jsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/client/src/components/scoreboard-chart/scoreboard-chart.component.jsx b/client/src/components/scoreboard-chart/scoreboard-chart.component.jsx index 545030397..4e9aa85d0 100644 --- a/client/src/components/scoreboard-chart/scoreboard-chart.component.jsx +++ b/client/src/components/scoreboard-chart/scoreboard-chart.component.jsx @@ -47,9 +47,7 @@ export function ScoreboardChart({ sbEntriesByDate, bodyshop }) { bodyhrs: dayAcc.bodyhrs + dayVal.bodyhrs, painthrs: dayAcc.painthrs + dayVal.painthrs, sales: - dayAcc.painthrs + - dayVal.job.job_totals.totals.subtotal.amount / 100 + - 2500, + dayAcc.sales + dayVal.job.job_totals.totals.subtotal.amount / 100, }; }, { bodyhrs: 0, painthrs: 0, sales: 0 }