IO-2354 Add Color to Available C/C Table

IO-2170 Correct for Shift clock so Job Status is only on Job Clock

bodyshop_translations.babel

@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -4318,6 +4318,27 @@
                                     <folder_node>
                                         <name>dms</name>
                                         <children>
+                                            <concept_node>
+                                                <name>apcontrol</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                             <concept_node>
                                                 <name>appostingaccount</name>
                                                 <definition_loaded>false</definition_loaded>

client/src/components/chat-messages-list/chat-message-list.component.jsx

@@ -1,5 +1,5 @@
 import Icon from "@ant-design/icons";
-import { Spin, Tooltip } from "antd";
+import { Tooltip } from "antd";
 import i18n from "i18next";
 import moment from "moment";
 import React, { useEffect, useRef } from "react";
@@ -12,8 +12,6 @@ import {
 } from "react-virtualized";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import "./chat-message-list.styles.scss";
-import { useState } from "react";
-import axios from "axios";
 
 export default function ChatMessageListComponent({ messages }) {
   const virtualizedListRef = useRef(null);
@@ -97,7 +95,9 @@ const MessageRender = (message) => {
               key={idx}
               style={{ display: "flex", justifyContent: "center" }}
             >
-              <ImageDisplay src={i} />
+              <a href={i} target="__blank">
+                <img alt="Received" className="message-img" src={i} />
+              </a>
             </div>
           ))}
         <div>{message.text}</div>
@@ -116,21 +116,3 @@ const StatusRender = (status) => {
       return null;
   }
 };
-
-const ImageDisplay = ({ src }) => {
-  const [state, setstate] = useState({ loading: true, url: null });
-
-  useEffect(() => {
-    axios
-
-      .post("/sms/fetchmedia", { mediaUrl: src })
-      .then(({ data }) => setstate({ loading: false, url: data }));
-  }, [src]);
-
-  if (state.loading === true) return <Spin />;
-  return (
-    <a href={i} target="__blank">
-      <img alt="Received" className="message-img" src={state.url} />
-    </a>
-  );
-};

client/src/components/contract-cars/contract-cars.component.jsx

@@ -59,6 +59,14 @@ export default function ContractsCarsComponent({
       sortOrder:
         state.sortedInfo.columnKey === "model" && state.sortedInfo.order,
     },
+    {
+      title: t("courtesycars.fields.color"),
+      dataIndex: "color",
+      key: "color",
+      sorter: (a, b) => alphaSort(a.color, b.color),
+      sortOrder:
+        state.sortedInfo.columnKey === "color" && state.sortedInfo.order,
+    },
     {
       title: t("courtesycars.fields.plate"),
       dataIndex: "plate",
@@ -93,6 +101,9 @@ export default function ContractsCarsComponent({
             (cc.model || "")
               .toLowerCase()
               .includes(state.search.toLowerCase()) ||
+            (cc.color || "")
+              .toLowerCase()
+              .includes(state.search.toLowerCase()) ||
             (cc.plate || "").toLowerCase().includes(state.search.toLowerCase())
         );
 

client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx

@@ -175,6 +175,19 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                 />
               </Form.Item>
             )}
+            {bodyshop.pbs_serialnumber && (
+              <Form.Item
+                label={t("bodyshop.fields.dms.apcontrol")}
+                name={["pbs_configuration", "apcontrol"]}
+              >
+                <Select
+                  options={[
+                    { value: "ro", label: "RO Number" },
+                    { value: "vendordmsid", label: "Vendor DMS ID" },
+                  ]}
+                />
+              </Form.Item>
+            )}
           </LayoutFormRow>
           <LayoutFormRow header={t("bodyshop.labels.dms.cdk.payers")}>
             <Form.List name={["cdk_configuration", "payers"]}>

client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx

@@ -5,10 +5,10 @@ import {
   Col,
   Form,
   InputNumber,
-  notification,
   Popover,
   Row,
   Select,
+  notification,
 } from "antd";
 import axios from "axios";
 import React, { useState } from "react";
@@ -16,13 +16,14 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import { GET_LINE_TICKET_BY_PK } from "../../graphql/jobs-lines.queries";
+import { UPDATE_JOB_STATUS } from "../../graphql/jobs.queries";
 import { UPDATE_TIME_TICKET } from "../../graphql/timetickets.queries";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import { CalculateAllocationsTotals } from "../labor-allocations-table/labor-allocations-table.utility";
 import TechJobClockoutDelete from "../tech-job-clock-out-delete/tech-job-clock-out-delete.component";
 import { LaborAllocationContainer } from "../time-ticket-modal/time-ticket-modal.component";
-import { GET_LINE_TICKET_BY_PK } from "../../graphql/jobs-lines.queries";
-import { CalculateAllocationsTotals } from "../labor-allocations-table/labor-allocations-table.utility";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -40,6 +41,7 @@ export function TechClockOffButton({
 }) {
   const [loading, setLoading] = useState(false);
   const [updateTimeticket] = useMutation(UPDATE_TIME_TICKET);
+  const [updateJobStatus] = useMutation(UPDATE_JOB_STATUS);
   const [form] = Form.useForm();
   const { queryLoading, data: lineTicketData } = useQuery(
     GET_LINE_TICKET_BY_PK,
@@ -59,7 +61,8 @@ export function TechClockOffButton({
 
   const handleFinish = async (values) => {
     logImEXEvent("tech_clock_out_job");
-
+    const status = values.status;
+    delete values.status;
     setLoading(true);
     const result = await updateTimeticket({
       variables: {
@@ -98,6 +101,26 @@ export function TechClockOffButton({
         message: t("timetickets.successes.clockedout"),
       });
     }
+    if (!isShiftTicket) {
+      const job_update_result = await updateJobStatus({
+        variables: {
+          jobId: jobId,
+          status: status,
+        },
+      });
+
+      if (!!job_update_result.errors) {
+        notification["error"]({
+          message: t("jobs.errors.updating", {
+            message: JSON.stringify(result.errors),
+          }),
+        });
+      } else {
+        notification["success"]({
+          message: t("jobs.successes.updated"),
+        });
+      }
+    }
     setLoading(false);
     if (completedCallback) completedCallback();
   };
@@ -195,7 +218,6 @@ export function TechClockOffButton({
                   </Form.Item>
                 </div>
               ) : null}
-
               <Form.Item
                 name="cost_center"
                 label={t("timetickets.fields.cost_center")}
@@ -228,6 +250,29 @@ export function TechClockOffButton({
                 </Select>
               </Form.Item>
 
+              {isShiftTicket ? (
+                <div></div>
+              ) : (
+                <Form.Item
+                  name="status"
+                  label={t("jobs.fields.status")}
+                  initialValue={
+                    lineTicketData && lineTicketData.jobs_by_pk.status
+                  }
+                  rules={[
+                    {
+                      required: true,
+                      //message: t("general.validation.required"),
+                    },
+                  ]}
+                >
+                  <Select>
+                    {bodyshop.md_ro_statuses.production_statuses.map((item) => (
+                      <Select.Option key={item}></Select.Option>
+                    ))}
+                  </Select>
+                </Form.Item>
+              )}
               <Button type="primary" htmlType="submit" loading={loading}>
                 {t("general.actions.save")}
               </Button>

client/src/graphql/jobs-lines.queries.js

@@ -34,6 +34,7 @@ export const GET_LINE_TICKET_BY_PK = gql`
       id
       lbr_adjustments
       converted
+      status
     }
     joblines(where: { jobid: { _eq: $id }, removed: { _eq: false } }) {
       id

client/src/translations/en_us/common.json

@@ -269,6 +269,7 @@
 					"templates": "Delivery Templates"
 				},
 				"dms": {
+					"apcontrol": "AP Control Number",
 					"appostingaccount": "AP Posting Account",
 					"cashierid": "Cashier ID",
 					"default_journal": "Default Journal",

client/src/translations/es/common.json

@@ -269,6 +269,7 @@
 					"templates": ""
 				},
 				"dms": {
+					"apcontrol": "",
 					"appostingaccount": "",
 					"cashierid": "",
 					"default_journal": "",

client/src/translations/fr/common.json

@@ -269,6 +269,7 @@
 					"templates": ""
 				},
 				"dms": {
+					"apcontrol": "",
 					"appostingaccount": "",
 					"cashierid": "",
 					"default_journal": "",

package.json

@@ -53,7 +53,7 @@
     "socket.io": "^4.6.1",
     "ssh2-sftp-client": "^9.0.4",
     "stripe": "^9.15.0",
-    "twilio": "^4.13.0",
+    "twilio": "^4.8.0",
     "uuid": "^9.0.0",
     "xml2js": "^0.4.23",
     "xmlbuilder2": "^3.0.2"

server.js

@@ -123,13 +123,6 @@ app.post(
   twilio.webhook({ validate: process.env.NODE_ENV === "PRODUCTION" }),
   smsStatus.status
 );
-const smsFetchMedia = require("./server/sms/fetch-media");
-app.post(
-  "/sms/fetchmedia",
-  fb.validateFirebaseIdToken,
-  smsFetchMedia.fetchmedia
-);
-
 app.post(
   "/sms/markConversationRead",
   fb.validateFirebaseIdToken,

server/accounting/pbs/pbs-ap-allocations.js

@@ -127,7 +127,10 @@ async function PbsCalculateAllocationsAp(socket, billids) {
               bodyshop.pbs_configuration.appostingaccount === "wip"
                 ? cc.dms_wip_acctnumber
                 : cc.dms_acctnumber,
-            ControlNumber: bill.vendor.dmsid,
+            ControlNumber:
+              bodyshop.pbs_configuration.apcontrol === "ro"
+                ? bill.job.ro_number
+                : bill.vendor.dmsid,
             Amount: Dinero(),
             // Comment: "String",
             AdditionalInfo: bill.vendor.name,

server/sms/fetch-media.js

@@ -1,31 +0,0 @@
-const path = require("path");
-require("dotenv").config({
-  path: path.resolve(
-    process.cwd(),
-    `.env.${process.env.NODE_ENV || "development"}`
-  ),
-});
-const twilio = require("twilio");
-const client = twilio(
-  process.env.TWILIO_AUTH_TOKEN,
-  process.env.TWILIO_AUTH_KEY
-);
-const logger = require("../utils/logger");
-
-exports.fetchmedia = async (req, res) => {
-  try {
-    const r = await client.request({
-      method: "get",
-      uri: req.body.mediaUrl, //|| "https://api.twilio.com/2010-04-01/Accounts/AC59171266556bbd507234b5fc6a23e4ee/Messages/MMa287a6e411c873e9177953e630f21df0/Media/ME18357bbec8c0092bfbc805aa8e6c6185",
-    });
-
-    res.send(r.headers.location);
-  } catch (error) {
-    console.log(error);
-    logger.log("sms-fetch-media-error", "ERROR", req.user?.email, null, {
-      // conversationid,
-      error: error.message,
-    });
-    res.sendStatus(500);
-  }
-};

yarn.lock

@@ -4338,10 +4338,10 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
   integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
 
-twilio@^4.13.0:
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/twilio/-/twilio-4.13.0.tgz#6b8f9f14d4def821ca02abb2c561ed3e4dde7a4d"
-  integrity sha512-fecPGy2lXnULwle4iXcCH3rP5z4fgkirzp+rRIXsFi45+y3qjkY5DBZSzmYr5T4vUOzZ2djmODZJ2jpRfgIBSw==
+twilio@^4.8.0:
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/twilio/-/twilio-4.10.0.tgz#4a0e744045e54934c5cf69033df8e3c5193268a3"
+  integrity sha512-j6reVBUqwrGHBKnCIoL1hUDPl/Yw6EYVvkYLmFBpVQ74AGf/9BCKXnvlkAgIkwFXzZikpNuo0mqIY/k9oMiFsA==
   dependencies:
     axios "^0.26.1"
     dayjs "^1.8.29"