@@ -235,8 +232,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 (
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 b11d57f5a..7b5cc8ec2 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
@@ -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 (
diff --git a/client/src/components/dms-log-events/dms-log-events.component.jsx b/client/src/components/dms-log-events/dms-log-events.component.jsx
index b791cd177..3cca7eb38 100644
--- a/client/src/components/dms-log-events/dms-log-events.component.jsx
+++ b/client/src/components/dms-log-events/dms-log-events.component.jsx
@@ -28,7 +28,7 @@ export function DmsLogEvents({ socket, logs, bodyshop }) {
items={logs.map((log, idx) => ({
key: idx,
color: LogLevelHierarchy(log.level),
- label: (
+ children: (
{log.level}
{dayjs(log.timestamp).format("MM/DD/YYYY HH:mm:ss")}
diff --git a/client/src/components/document-editor/document-editor.component.jsx b/client/src/components/document-editor/document-editor.component.jsx
index 5a761e70b..c94e582e3 100644
--- a/client/src/components/document-editor/document-editor.component.jsx
+++ b/client/src/components/document-editor/document-editor.component.jsx
@@ -62,7 +62,8 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
// attach an event handler to assign annotated image back to our image element
markerArea.current.addEventListener("close", (closeEvent) => {});
- markerArea.current.addEventListener("render", (dataUrl) => {
+ markerArea.current.addEventListener("render", (event) => {
+ const dataUrl = event.dataUrl;
imgRef.current.src = dataUrl;
markerArea.current.close();
triggerUpload(dataUrl);
diff --git a/client/src/components/form-date-picker/form-date-picker.component.jsx b/client/src/components/form-date-picker/form-date-picker.component.jsx
index b50a2e0cf..aba56a059 100644
--- a/client/src/components/form-date-picker/form-date-picker.component.jsx
+++ b/client/src/components/form-date-picker/form-date-picker.component.jsx
@@ -1,100 +1,105 @@
-import { DatePicker } from "antd";
+import {DatePicker} from "antd";
import dayjs from "../../utils/day";
-import React, { useRef } from "react";
+import React, {useRef} from "react";
+
+import {connect} from "react-redux";
+import {createStructuredSelector} from "reselect";
+import {selectBodyshop} from "../../redux/user/user.selectors";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
const mapStateToProps = createStructuredSelector({
- bodyshop: selectBodyshop,
+ bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+ //setUserLanguage: language => dispatch(setUserLanguage(language))
});
-const mapDispatchToProps = (dispatch) => ({});
export default connect(mapStateToProps, mapDispatchToProps)(FormDatePicker);
const dateFormat = "MM/DD/YYYY";
-
-// TODO, this is causing a dirty change when it should not (click the picker, click off the picker)
export function FormDatePicker({
- bodyshop,
- value,
- onChange,
- onBlur,
- onlyFuture,
- isDateOnly = true,
- ...restProps
+ bodyshop,
+ value,
+ onChange,
+ onBlur,
+ onlyFuture,
+ isDateOnly = true,
+ ...restProps
}) {
- const ref = useRef();
+ const ref = useRef();
- const handleChange = (newDate) => {
- if (value !== newDate && onChange) {
- onChange(isDateOnly ? newDate && newDate.format("YYYY-MM-DD") : newDate);
- }
- };
-
- const handleKeyDown = (e) => {
- if (e.key.toLowerCase() === "t") {
- if (onChange) {
- onChange(isDateOnly ? dayjs().format("YYYY-MM-DD") : dayjs());
- }
- } else if (e.key.toLowerCase() === "enter") {
- if (ref.current && ref.current.blur) ref.current.blur();
- }
- };
-
- const handleBlur = (e) => {
- const v = e.target.value;
- if (!v) return;
-
- const _a = dayjs(
- v,
- ["MMDDYY", "MMDDYYYY", "MMDD", "MM/DD/YY"],
- "en",
- false
- );
-
- if (
- _a.isValid()
- && value
- && value.isValid
- && value.isValid()
- ) {
- _a.set({
- hours: value.hours(),
- minutes: value.minutes(),
- seconds: value.seconds(),
- milliseconds: value.milliseconds(),
- });
- }
-
- if (_a.isValid() && onChange) {
- if (onlyFuture) {
- if (dayjs().subtract(1, "day").isBefore(_a)) {
- onChange(isDateOnly ? _a.format("YYYY-MM-DD") : _a);
- } else {
- onChange(isDateOnly ? dayjs().format("YYYY-MM-DD") : dayjs());
+ const handleChange = (newDate) => {
+ if (value !== newDate && onChange) {
+ onChange(isDateOnly ? newDate && newDate.format("YYYY-MM-DD") : newDate);
}
- } else {
- onChange(isDateOnly ? _a.format("YYYY-MM-DD") : _a);
- }
- }
- };
+ };
- return (
-
- dayjs().subtract(1, "day").isAfter(d),
- })}
- {...restProps}
- />
-
- );
+ const handleKeyDown = (e) => {
+ if (e.key.toLowerCase() === "t") {
+ if (onChange) {
+ onChange(isDateOnly ? dayjs().format("YYYY-MM-DD") : dayjs());
+ }
+ } else if (e.key.toLowerCase() === "enter") {
+ if (ref.current && ref.current.blur) ref.current.blur();
+ }
+ };
+
+ const handleBlur = (e) => {
+ const v = e.target.value;
+ if (!v) return;
+
+ const formats = ["MMDDYY", "MMDDYYYY", "MMDD", "MM/DD/YY", "MM/DD/YYYY"];
+ let _a;
+
+ // Iterate through formats to find the correct one
+ for (let format of formats) {
+ _a = dayjs(v, format);
+ if (v === _a.format(format)) {
+ break;
+ }
+ }
+
+ if (
+ _a.isValid()
+ && value
+ && value.isValid
+ && value.isValid()
+ ) {
+ _a.set({
+ hours: value.hours(),
+ minutes: value.minutes(),
+ seconds: value.seconds(),
+ milliseconds: value.milliseconds(),
+ });
+ }
+
+ if (_a.isValid() && onChange) {
+ if (onlyFuture) {
+ if (dayjs().subtract(1, "day").isBefore(_a)) {
+ onChange(isDateOnly ? _a.format("YYYY-MM-DD") : _a);
+ } else {
+ onChange(isDateOnly ? dayjs().format("YYYY-MM-DD") : dayjs());
+ }
+ } else {
+ onChange(isDateOnly ? _a.format("YYYY-MM-DD") : _a);
+ }
+ }
+ };
+
+ return (
+
+ dayjs().subtract(1, "day").isAfter(d),
+ })}
+ {...restProps}
+ />
+
+ );
}
\ No newline at end of file
diff --git a/client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx b/client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx
index 973eec6f2..ebb1ae042 100644
--- a/client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx
+++ b/client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx
@@ -16,7 +16,7 @@ export default function JobDetailCardsDatesComponent({loading, data}) {
? [
{
key: "date_last_contacted",
- label: (
+ children: (
<>
{data.date_last_contacted}
@@ -29,7 +29,7 @@ export default function JobDetailCardsDatesComponent({loading, data}) {
? [
{
key: "date_open",
- label: (
+ children: (
<>
{data.date_open}
@@ -42,7 +42,7 @@ export default function JobDetailCardsDatesComponent({loading, data}) {
? [
{
key: "date_estimated",
- label: (
+ children: (
<>
{data.date_estimated}
@@ -55,7 +55,7 @@ export default function JobDetailCardsDatesComponent({loading, data}) {
? [
{
key: "date_scheduled",
- label: (
+ children: (
<>
{data.date_scheduled}
@@ -68,7 +68,7 @@ export default function JobDetailCardsDatesComponent({loading, data}) {
? [
{
key: "scheduled_in",
- label: (
+ children: (
<>
{data.scheduled_in}
@@ -81,7 +81,7 @@ export default function JobDetailCardsDatesComponent({loading, data}) {
? [
{
key: "actual_in",
- label: (
+ children: (
<>
{data.actual_in}
@@ -94,7 +94,7 @@ export default function JobDetailCardsDatesComponent({loading, data}) {
? [
{
key: "date_repairstarted",
- label: (
+ children: (
<>
{data.date_repairstarted}
@@ -107,7 +107,7 @@ export default function JobDetailCardsDatesComponent({loading, data}) {
? [
{
key: "scheduled_completion",
- label: (
+ children: (
<>
{data.scheduled_completion}
@@ -120,7 +120,7 @@ export default function JobDetailCardsDatesComponent({loading, data}) {
? [
{
key: "actual_completion",
- label: (
+ children: (
<>
{data.actual_completion}
@@ -133,7 +133,7 @@ export default function JobDetailCardsDatesComponent({loading, data}) {
? [
{
key: "scheduled_delivery",
- label: (
+ children: (
<>
{data.scheduled_delivery}
@@ -146,7 +146,7 @@ export default function JobDetailCardsDatesComponent({loading, data}) {
? [
{
key: "actual_delivery",
- label: (
+ children: (
<>
{data.actual_delivery}
@@ -159,7 +159,7 @@ export default function JobDetailCardsDatesComponent({loading, data}) {
? [
{
key: "date_invoiced",
- label: (
+ children: (
<>
{data.date_invoiced}
@@ -172,7 +172,7 @@ export default function JobDetailCardsDatesComponent({loading, data}) {
? [
{
key: "date_exported",
- label: (
+ children: (
<>
{data.date_exported}
diff --git a/client/src/components/job-detail-lines/job-lines-expander.component.jsx b/client/src/components/job-detail-lines/job-lines-expander.component.jsx
index 51b70e3eb..2d3f932ed 100644
--- a/client/src/components/job-detail-lines/job-lines-expander.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines-expander.component.jsx
@@ -32,7 +32,7 @@ export default function JobLinesExpander({jobline, jobid}) {
data.parts_order_lines.length > 0
? data.parts_order_lines.map((line) => ({
key: line.id,
- label: (
+ children: (
} wrap>
0
? data.billlines.map((line) => ({
key: line.id,
- label: (
+ children: (
{
return bodyshop.md_ro_statuses.production_statuses.includes(job.status);
}, [job, bodyshop.md_ro_statuses.production_statuses]);
@@ -97,7 +106,7 @@ export function JobsDetailHeaderActions({
);
}, [job.status, bodyshop.md_ro_statuses.post_production_statuses]);
- const handleDuplicate =() =>
+ const handleDuplicate = () =>
DuplicateJob(
client,
job.id,
@@ -694,33 +703,37 @@ export function JobsDetailHeaderActions({
context: {jobid: job.id},
});
}
- },
- {
- key: 'entercardpayments',
- disabled: !job.converted,
- label: t("menus.header.entercardpayment"),
- onClick: () => {
- logImEXEvent("job_header_enter_card_payment");
+ }];
- setCardPaymentContext({
- actions: {},
- context: {jobid: job.id},
- });
- }
- },
- {
- key: 'cccontract',
- disabled: jobRO || !job.converted,
- label:
- {t("menus.jobsactions.newcccontract")}
-
- }
- ];
+ if (ImEXPay.treatment === "on") {
+ menuItems.push({
+ key: 'entercardpayments',
+ disabled: !job.converted,
+ label: t("menus.header.entercardpayment"),
+ onClick: () => {
+ logImEXEvent("job_header_enter_card_payment");
+
+ setCardPaymentContext({
+ actions: {},
+ context: {jobid: job.id},
+ });
+ }
+ },
+ );
+ }
+
+ menuItems.push({
+ key: 'cccontract',
+ disabled: jobRO || !job.converted,
+ label:
+ {t("menus.jobsactions.newcccontract")}
+
+ });
menuItems.push(
job.inproduction ?
diff --git a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
index 30bb98560..9ae08588d 100644
--- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
+++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
@@ -221,6 +221,11 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
{`${job.v_vin || t("general.labels.na")}`}
+ {bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (
+ job.v_vin.length !== 17 ? (
+
+ ) : null
+ ) : null}
{job.regie_number || t("general.labels.na")}
diff --git a/client/src/components/production-list-columns/production-list-columns.add.component.jsx b/client/src/components/production-list-columns/production-list-columns.add.component.jsx
index fb346ace2..7088f6726 100644
--- a/client/src/components/production-list-columns/production-list-columns.add.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.add.component.jsx
@@ -24,6 +24,7 @@ export function ProductionColumnsComponent({
columnState,
technician,
bodyshop,
+ data,
tableState,
}) {
const [columns, setColumns] = columnState;
@@ -36,6 +37,7 @@ export function ProductionColumnsComponent({
bodyshop,
technician,
state: tableState,
+ data,
activeStatuses: bodyshop.md_ro_statuses.active_statuses,
}).filter((i) => i.key === e.key),
]);
@@ -44,6 +46,7 @@ export function ProductionColumnsComponent({
const columnKeys = columns.map((i) => i.key);
const cols = dataSource({
technician,
+ data,
state: tableState,
activeStatuses: bodyshop.md_ro_statuses.active_statuses,
});
diff --git a/client/src/components/production-list-columns/production-list-columns.data.js b/client/src/components/production-list-columns/production-list-columns.data.js
index e9b57df19..003a3b864 100644
--- a/client/src/components/production-list-columns/production-list-columns.data.js
+++ b/client/src/components/production-list-columns/production-list-columns.data.js
@@ -1,4 +1,4 @@
-import { PauseCircleOutlined, BranchesOutlined } from "@ant-design/icons";
+import { BranchesOutlined, PauseCircleOutlined } from "@ant-design/icons";
import { Space, Tooltip } from "antd";
import i18n from "i18next";
import dayjs from "../../utils/day";
@@ -6,6 +6,7 @@ import { Link } from "react-router-dom";
import CurrencyFormatter from "../../utils/CurrencyFormatter";
import { TimeFormatter } from "../../utils/DateFormatter";
import PhoneFormatter from "../../utils/PhoneFormatter";
+import { onlyUnique } from "../../utils/arrayHelper";
import { alphaSort, dateSort, statusSort } from "../../utils/sorters";
import JobAltTransportChange from "../job-at-change/job-at-change.component";
import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component";
@@ -25,7 +26,7 @@ import ProductionListColumnCategory from "./production-list-columns.status.categ
import ProductionListColumnStatus from "./production-list-columns.status.component";
import ProductionlistColumnTouchTime from "./prodution-list-columns.touchtime.component";
-const r = ({ technician, state, activeStatuses, bodyshop }) => {
+const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
return [
{
title: i18n.t("jobs.actions.viewdetail"),
@@ -536,6 +537,36 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
),
},
+ {
+ title: i18n.t("jobs.labels.estimator"),
+ dataIndex: "estimator",
+ key: "estimator",
+ sorter: (a, b) =>
+ alphaSort(
+ `${a.est_ct_fn || ""} ${a.est_ct_ln || ""}`.trim(),
+ `${b.est_ct_fn || ""} ${b.est_ct_ln || ""}`.trim()
+ ),
+ sortOrder:
+ state.sortedInfo.columnKey === "estimator" && state.sortedInfo.order,
+ filters:
+ (data &&
+ data
+ .map((j) => `${j.est_ct_fn || ""} ${j.est_ct_ln || ""}`.trim())
+ .filter(onlyUnique)
+ .map((s) => {
+ return {
+ text: s || "N/A",
+ value: [s],
+ };
+ })) ||
+ [],
+ onFilter: (value, record) =>
+ value.includes(
+ `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim()
+ ),
+ render: (text, record) =>
+ `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim(),
+ },
//Added as a place holder for St Claude. Not implemented as it requires another join for a field used by only 1 client.
// {
diff --git a/client/src/components/production-list-table/production-list-table-view-select.component.jsx b/client/src/components/production-list-table/production-list-table-view-select.component.jsx
index 48a1f7222..dd58b5d16 100644
--- a/client/src/components/production-list-table/production-list-table-view-select.component.jsx
+++ b/client/src/components/production-list-table/production-list-table-view-select.component.jsx
@@ -24,6 +24,7 @@ export function ProductionListTable({
technician,
currentUser,
state,
+ data,
setColumns,
setState,
}) {
@@ -41,6 +42,7 @@ export function ProductionListTable({
bodyshop,
technician,
state,
+ data: data,
activeStatuses: bodyshop.md_ro_statuses.active_statuses,
}).find((e) => e.key === k.key),
width: k.width,
@@ -95,6 +97,7 @@ export function ProductionListTable({
...ProductionListColumns({
technician,
state,
+ data: data,
activeStatuses: bodyshop.md_ro_statuses.active_statuses,
}).find((e) => e.key === k.key),
width: k.width,
diff --git a/client/src/components/production-list-table/production-list-table.component.jsx b/client/src/components/production-list-table/production-list-table.component.jsx
index b817a379d..fcce11281 100644
--- a/client/src/components/production-list-table/production-list-table.component.jsx
+++ b/client/src/components/production-list-table/production-list-table.component.jsx
@@ -1,8 +1,8 @@
import {SyncOutlined} from "@ant-design/icons";
import {useSplitTreatments} from "@splitsoftware/splitio-react";
-import {Button, Dropdown, Input, Space, Statistic, Table,} from "antd";
+import {Button, Dropdown, Input, Space, Statistic, Table} from "antd";
import {PageHeader} from "@ant-design/pro-layout";
-import React, {useMemo, useState} from "react";
+import React, {useEffect, useMemo, useState} from "react";
import ReactDragListView from "react-drag-listview";
import {useTranslation} from "react-i18next";
import {connect} from "react-redux";
@@ -66,6 +66,7 @@ export function ProductionListTable({loading, data, refetch, bodyshop, technicia
bodyshop,
technician,
state,
+ data,
activeStatuses: bodyshop.md_ro_statuses.active_statuses,
}).find((e) => e.key === k.key),
width: k.width ?? 100,
@@ -74,6 +75,34 @@ export function ProductionListTable({loading, data, refetch, bodyshop, technicia
[]
);
+ useEffect(() => {
+ const newColumns =
+ (state &&
+ matchingColumnConfig &&
+ matchingColumnConfig.columns.columnKeys.map((k) => {
+ return {
+ ...ProductionListColumns({
+ bodyshop,
+ technician,
+ state,
+ data: data,
+ activeStatuses: bodyshop.md_ro_statuses.active_statuses,
+ }).find((e) => e.key === k.key),
+ width: k.width ?? 100,
+ };
+ })) ||
+ [];
+ setColumns(newColumns);
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [
+ //state,
+ matchingColumnConfig,
+ bodyshop,
+ technician,
+ data,
+ ]); //State removed from dependency array as it causes race condition when removing columns from table view and is not needed.
+
+
const handleTableChange = (pagination, filters, sorter) => {
setState({
...state,
@@ -89,10 +118,11 @@ export function ProductionListTable({loading, data, refetch, bodyshop, technicia
setColumns(columnsCopy);
};
- const removeColumn = (e) => {
- const {key} = e;
- setColumns(columns.filter((i) => i.key !== key));
- };
+ const removeColumn = (e) => {
+ const { key } = e;
+ const newColumns = columns.filter((i) => i.key !== key);
+ setColumns(newColumns);
+ };
const handleResize =
(index) =>
@@ -221,6 +251,7 @@ export function ProductionListTable({loading, data, refetch, bodyshop, technicia
({
key: item.id,
color: item.canceled ? "red" : item.arrived ? "green" : "blue",
- label: (
+ children: (
<>
{item.canceled
? t("appointments.labels.cancelledappointment")
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index b18673de6..fbeb8740d 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -364,6 +364,8 @@ export const QUERY_JOBS_IN_PRODUCTION = gql`
employee_refinish
employee_prep
employee_csr
+ est_ct_fn
+ est_ct_ln
suspended
date_repairstarted
joblines_status {
diff --git a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
index 87e86ae2f..42acb504a 100644
--- a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
+++ b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
@@ -261,17 +261,15 @@ export function JobsDetailPage({
items={[
{
key: "general",
- label: (
- {t("menus.jobsdetail.general")}
- ),
+ icon: ,
+ label: t("menus.jobsdetail.general"),
forceRender: true,
children: ,
},
{
key: "repairdata",
- label: (
- {t("menus.jobsdetail.repairdata")}
- ),
+ icon: ,
+ label: t("menus.jobsdetail.repairdata"),
forceRender: true,
children: (
{t("menus.jobsdetail.rates")}
- ),
+ icon: ,
+ label: t("menus.jobsdetail.rates"),
forceRender: true,
children: ,
},
{
key: "totals",
- label: (
- {t("menus.jobsdetail.totals")}
- ),
+ icon: ,
+ label: t("menus.jobsdetail.totals"),
children: ,
},
{
key: "partssublet",
- label: (
- {t("menus.jobsdetail.partssublet")}
- ),
+ icon: ,
+ label: t("menus.jobsdetail.partssublet"),
children: ,
},
{
key: "labor",
- label: (
- {t("menus.jobsdetail.labor")}
- ),
+ icon: ,
+ label: t("menus.jobsdetail.labor"),
children: ,
},
{
key: "dates",
- label: (
- {t("menus.jobsdetail.dates")}
- ),
+ icon: ,
+ label: t("menus.jobsdetail.dates"),
forceRender: true,
children: ,
},
{
key: "documents",
- label: (
- {t("jobs.labels.documents")}
- ),
+ icon: ,
+ label: t("jobs.labels.documents"),
children: bodyshop.uselocalmediaserver ? (
) : (
@@ -332,15 +324,14 @@ export function JobsDetailPage({
},
{
key: "notes",
- label: (
- {t("jobs.labels.notes")}
- ),
+ icon: ,
+ label: t("jobs.labels.notes"),
children: ,
},
{
key: "audit",
- label: ({t("jobs.labels.audit")}
- ),
+ icon: ,
+ label: t("jobs.labels.audit"),
children: ,
},
]}
diff --git a/client/src/pages/scoreboard/scoreboard.page.container.jsx b/client/src/pages/scoreboard/scoreboard.page.container.jsx
index e7098d015..c5cae70d5 100644
--- a/client/src/pages/scoreboard/scoreboard.page.container.jsx
+++ b/client/src/pages/scoreboard/scoreboard.page.container.jsx
@@ -77,22 +77,22 @@ export function ScoreboardContainer({ setBreadcrumbs, setSelectedHeader }) {
items={[
{
key: "sb",
- label: ({t("scoreboard.labels.jobs")}
- ),
+ icon: ,
+ label: t("scoreboard.labels.jobs"),
forceRender: true,
children: ,
},
{
key: "tickets",
- label: ({t("scoreboard.labels.timeticketsemployee")}
- ),
+ icon: ,
+ label: t("scoreboard.labels.timeticketsemployee"),
forceRender: true,
children: ,
},
{
key: "ticketsstats",
- label: ({t("scoreboard.labels.allemployeetimetickets")}
- ),
+ icon: ,
+ label: t("scoreboard.labels.allemployeetimetickets"),
forceRender: true,
children: ,
},
diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index 216ac8c48..9867b3f8e 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -2023,24 +2023,24 @@
- active:
_eq: true
columns:
- - labor_rates
- - percentage
- created_at
- - updated_at
- employeeid
- id
+ - labor_rates
+ - percentage
- teamid
+ - updated_at
select_permissions:
- role: user
permission:
columns:
- - labor_rates
- - percentage
- created_at
- - updated_at
- employeeid
- id
+ - labor_rates
+ - percentage
- teamid
+ - updated_at
filter:
employee_team:
bodyshop:
@@ -2055,13 +2055,13 @@
- role: user
permission:
columns:
- - labor_rates
- - percentage
- created_at
- - updated_at
- employeeid
- id
+ - labor_rates
+ - percentage
- teamid
+ - updated_at
filter:
employee_team:
bodyshop:
@@ -2123,21 +2123,23 @@
_eq: true
columns:
- active
- - name
- - created_at
- - updated_at
- bodyshopid
+ - created_at
- id
+ - max_load
+ - name
+ - updated_at
select_permissions:
- role: user
permission:
columns:
- active
- - name
- - created_at
- - updated_at
- bodyshopid
+ - created_at
- id
+ - max_load
+ - name
+ - updated_at
filter:
bodyshop:
associations:
@@ -2153,6 +2155,7 @@
columns:
- active
- bodyshopid
+ - max_load
- name
- updated_at
filter:
diff --git a/hasura/migrations/1704401074280_alter_table_public_employee_team_members_add_column_max_load/down.sql b/hasura/migrations/1704401074280_alter_table_public_employee_team_members_add_column_max_load/down.sql
new file mode 100644
index 000000000..8df675f00
--- /dev/null
+++ b/hasura/migrations/1704401074280_alter_table_public_employee_team_members_add_column_max_load/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"."employee_team_members" add column "max_load" numeric
+-- not null default '10000';
diff --git a/hasura/migrations/1704401074280_alter_table_public_employee_team_members_add_column_max_load/up.sql b/hasura/migrations/1704401074280_alter_table_public_employee_team_members_add_column_max_load/up.sql
new file mode 100644
index 000000000..7b49a8dcd
--- /dev/null
+++ b/hasura/migrations/1704401074280_alter_table_public_employee_team_members_add_column_max_load/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."employee_team_members" add column "max_load" numeric
+ not null default '10000';
diff --git a/hasura/migrations/1704403786392_alter_table_public_employee_team_members_drop_column_max_load/down.sql b/hasura/migrations/1704403786392_alter_table_public_employee_team_members_drop_column_max_load/down.sql
new file mode 100644
index 000000000..a869e6890
--- /dev/null
+++ b/hasura/migrations/1704403786392_alter_table_public_employee_team_members_drop_column_max_load/down.sql
@@ -0,0 +1,3 @@
+alter table "public"."employee_team_members" alter column "max_load" set default '10000'::numeric;
+alter table "public"."employee_team_members" alter column "max_load" drop not null;
+alter table "public"."employee_team_members" add column "max_load" numeric;
diff --git a/hasura/migrations/1704403786392_alter_table_public_employee_team_members_drop_column_max_load/up.sql b/hasura/migrations/1704403786392_alter_table_public_employee_team_members_drop_column_max_load/up.sql
new file mode 100644
index 000000000..18bf59cf3
--- /dev/null
+++ b/hasura/migrations/1704403786392_alter_table_public_employee_team_members_drop_column_max_load/up.sql
@@ -0,0 +1 @@
+alter table "public"."employee_team_members" drop column "max_load" cascade;
diff --git a/hasura/migrations/1704403846373_alter_table_public_employee_teams_add_column_max_load/down.sql b/hasura/migrations/1704403846373_alter_table_public_employee_teams_add_column_max_load/down.sql
new file mode 100644
index 000000000..58a0f9b6d
--- /dev/null
+++ b/hasura/migrations/1704403846373_alter_table_public_employee_teams_add_column_max_load/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"."employee_teams" add column "max_load" numeric
+-- not null default '10000';
diff --git a/hasura/migrations/1704403846373_alter_table_public_employee_teams_add_column_max_load/up.sql b/hasura/migrations/1704403846373_alter_table_public_employee_teams_add_column_max_load/up.sql
new file mode 100644
index 000000000..c55ba33d0
--- /dev/null
+++ b/hasura/migrations/1704403846373_alter_table_public_employee_teams_add_column_max_load/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."employee_teams" add column "max_load" numeric
+ not null default '10000';
diff --git a/server/intellipay/intellipay.js b/server/intellipay/intellipay.js
index 0ece0c69c..60b74c1b5 100644
--- a/server/intellipay/intellipay.js
+++ b/server/intellipay/intellipay.js
@@ -132,6 +132,7 @@ exports.payment_refund = async (req, res) => {
exports.generate_payment_url = async (req, res) => {
logger.log("intellipay-payment-url", "DEBUG", req.user?.email, null, null);
const shopCredentials = await getShopCredentials(req.body.bodyshop);
+
try {
const options = {
method: "POST",
@@ -139,7 +140,12 @@ exports.generate_payment_url = async (req, res) => {
//TODO: Move these to environment variables/database.
data: qs.stringify({
...shopCredentials,
- ...req.body,
+ //...req.body,
+ amount: Dinero({ amount: Math.round(req.body.amount * 100) }).toFormat(
+ "0.00"
+ ),
+ account: req.body.account,
+ invoice: req.body.invoice,
createshorturl: true,
//The postback URL is set at the CP teller global terminal settings page.
}),