diff --git a/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx b/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx
index 5fb2275cb..168492abd 100644
--- a/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx
+++ b/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx
@@ -22,7 +22,7 @@ export default function ProductionBoardCard(
) {
const { t } = useTranslation();
- let employee_body, employee_prep, employee_refinish; //employee_csr;
+ let employee_body, employee_prep, employee_refinish, employee_csr;
if (card.employee_body) {
employee_body = bodyshop.employees.find((e) => e.id === card.employee_body);
}
@@ -34,6 +34,9 @@ export default function ProductionBoardCard(
(e) => e.id === card.employee_refinish
);
}
+ if (card.employee_csr) {
+ employee_csr = bodyshop.employees.find((e) => e.id === card.employee_csr);
+ }
// if (card.employee_csr) {
// employee_csr = bodyshop.employees.find((e) => e.id === card.employee_csr);
// }
@@ -131,11 +134,11 @@ export default function ProductionBoardCard(
)} ${employee_refinish.last_name.charAt(0)}`
: ""
} ${card.larhrs.aggregate.sum.mod_lb_hrs || "?"}h`}
- {/*
{`C: ${
+ {`C: ${
employee_csr
? `${employee_csr.first_name} ${employee_csr.last_name}`
: ""
- }`} */}
+ }`}
)}
diff --git a/client/src/components/production-board-kanban/production-board-kanban.utils.js b/client/src/components/production-board-kanban/production-board-kanban.utils.js
index 4d2231621..4ed1a45d5 100644
--- a/client/src/components/production-board-kanban/production-board-kanban.utils.js
+++ b/client/src/components/production-board-kanban/production-board-kanban.utils.js
@@ -66,6 +66,7 @@ export const createBoardData = (AllStatuses, Jobs, filter) => {
include ||
j.employee_body === employeeId ||
j.employee_prep === employeeId ||
+ j.employee_csr === employeeId ||
j.employee_refinish === employeeId;
}
@@ -76,9 +77,8 @@ export const createBoardData = (AllStatuses, Jobs, filter) => {
Object.keys(DataGroupedByStatus).map((statusGroupKey) => {
try {
- boardLanes.columns.find(
- (l) => l.id === statusGroupKey
- ).cards = sortByParentId(DataGroupedByStatus[statusGroupKey]);
+ boardLanes.columns.find((l) => l.id === statusGroupKey).cards =
+ sortByParentId(DataGroupedByStatus[statusGroupKey]);
} catch (error) {
console.log("Error while creating board card", error);
}
diff --git a/client/src/components/vendor-search-select/vendor-search-select.component.jsx b/client/src/components/vendor-search-select/vendor-search-select.component.jsx
index 465007841..7f3c67729 100644
--- a/client/src/components/vendor-search-select/vendor-search-select.component.jsx
+++ b/client/src/components/vendor-search-select/vendor-search-select.component.jsx
@@ -1,6 +1,7 @@
import { HeartOutlined } from "@ant-design/icons";
-import { Select, Tag } from "antd";
+import { Select, Space, Tag } from "antd";
import React, { forwardRef, useEffect, useState } from "react";
+import PhoneNumberFormatter from "../../utils/PhoneFormatter";
const { Option } = Select;
//To be used as a form element only.
@@ -35,6 +36,7 @@ const VendorSearchSelect = (
style={{
width: "100%",
}}
+ dropdownMatchSelectWidth={false}
onChange={setOption}
optionFilterProp="name"
onSelect={onSelect}
@@ -50,10 +52,15 @@ const VendorSearchSelect = (
>
{o.name}
-
- {o.discount && o.discount !== 0 ? (
-
{`${o.discount * 100}%`}
- ) : null}
+
+
+ {o.phone && (
+ {o.phone}
+ )}
+ {o.discount && o.discount !== 0 ? (
+ {`${o.discount * 100}%`}
+ ) : null}
+
))
@@ -64,9 +71,14 @@ const VendorSearchSelect = (
{o.name}
- {o.discount && o.discount !== 0 ? (
-
{`${o.discount * 100}%`}
- ) : null}
+
+ {o.phone && (
+ {o.phone}
+ )}
+ {o.discount && o.discount !== 0 ? (
+ {`${o.discount * 100}%`}
+ ) : null}
+
))
diff --git a/client/src/graphql/vendors.queries.js b/client/src/graphql/vendors.queries.js
index d4a3986cf..f18b124ff 100644
--- a/client/src/graphql/vendors.queries.js
+++ b/client/src/graphql/vendors.queries.js
@@ -87,6 +87,7 @@ export const QUERY_ALL_VENDORS_FOR_ORDER = gql`
discount
email
active
+ phone
}
jobs(where: { id: { _eq: $jobId } }) {
v_make_desc
diff --git a/client/src/utils/RenderTemplate.js b/client/src/utils/RenderTemplate.js
index 9511416f8..7aab1139a 100644
--- a/client/src/utils/RenderTemplate.js
+++ b/client/src/utils/RenderTemplate.js
@@ -39,7 +39,7 @@ export default async function RenderTemplate(
...templateObject.context,
headerpath: `/${bodyshop.imexshopid}/header.html`,
bodyshop: bodyshop,
- offset: moment().utcOffset(),
+ offset: bodyshop.timezone, //moment().utcOffset(),
},
};