Validation and confirmation messages.

bodyshop_translations.babel

@@ -46289,6 +46289,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>payall</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>shiftalreadyclockedon</name>
                                         <definition_loaded>false</definition_loaded>
@@ -47249,6 +47270,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>payall</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>
                                 </children>
                             </folder_node>
                             <folder_node>

client/src/components/labor-allocations-table/labor-allocations-table.payroll.component.jsx

@@ -1,5 +1,14 @@
-import { Button, Card, Col, Row, Space, Table, Typography } from "antd";
+import {
-import { SyncOutlined } from '@ant-design/icons'
+  Button,
+  Card,
+  Col,
+  Row,
+  Space,
+  Table,
+  Typography,
+  notification,
+} from "antd";
+import { SyncOutlined } from "@ant-design/icons";
 import axios from "axios";
 import _ from "lodash";
 import React, { useEffect, useMemo, useState } from "react";
@@ -225,10 +234,34 @@ export function PayrollLaborAllocationsTable({
             <Space>
               <Button
                 onClick={async () => {
-                  await axios.post("/payroll/payall", {
+                  const response = await axios.post("/payroll/payall", {
                     jobid: jobId,
                   });
-                  if (refetch) refetch();
+
+                  if (response.status === 200) {
+                    if (response.data.success) {
+                      notification.open({
+                        type: "success",
+                        message: t("timetickets.successes.payall"),
+                      });
+                    } else {
+                      notification.open({
+                        type: "error",
+                        message: t("timetickets.errors.payall", {
+                          error: response.data.error,
+                        }),
+                      });
+                    }
+
+                    if (refetch) refetch();
+                  } else {
+                    notification.open({
+                      type: "error",
+                      message: t("timetickets.errors.payall", {
+                        error: JSON.stringify(""),
+                      }),
+                    });
+                  }
                 }}
               >
                 {t("timetickets.actions.payall")}
@@ -242,7 +275,7 @@ export function PayrollLaborAllocationsTable({
                   refetch();
                 }}
               >
-                <SyncOutlined/>
+                <SyncOutlined />
               </Button>
             </Space>
           }

client/src/components/tech-sider/tech-sider.component.jsx

@@ -1,4 +1,8 @@
-import Icon, { SearchOutlined, ScheduleOutlined } from "@ant-design/icons";
+import Icon, {
+  SearchOutlined,
+  ScheduleOutlined,
+  UserAddOutlined,
+} from "@ant-design/icons";
 import { Layout, Menu } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -68,19 +72,28 @@ export function TechSider({
           <Link to={`/tech/joblookup`}>{t("menus.tech.joblookup")}</Link>
         </Menu.Item>
         {Enhanced_Payroll.treatment === "on" ? (
-          <Menu.Item
+          <>
-            key="3"
+            <Menu.Item
-            disabled={!!!technician}
+              key="TechAssignedProdJobs"
-            icon={<Icon component={FaBusinessTime} />}
+              disabled={!!!technician}
-            onClick={() => {
+              icon={<UserAddOutlined />}
-              setTimeTicketTaskContext({
+            >
-                actions: {},
+              <Link to={`/tech/assigned`}> {t("menus.tech.assignedjobs")}</Link>
-                context: { jobid: null },
+            </Menu.Item>
-              });
+            <Menu.Item
-            }}
+              key="3"
-          >
+              disabled={!!!technician}
-            {t("menus.tech.claimtask")}
+              icon={<Icon component={FaBusinessTime} />}
-          </Menu.Item>
+              onClick={() => {
+                setTimeTicketTaskContext({
+                  actions: {},
+                  context: { jobid: null },
+                });
+              }}
+            >
+              {t("menus.tech.claimtask")}
+            </Menu.Item>
+          </>
         ) : (
           <Menu.Item
             key="3"
@@ -107,13 +120,7 @@ export function TechSider({
         >
           <Link to={`/tech/board`}> {t("menus.tech.productionboard")}</Link>
         </Menu.Item>
-        <Menu.Item
+
-          key="TechAssignedProdJobs"
-          disabled={!!!technician}
-          icon={<Icon component={BsKanban} />}
-        >
-          <Link to={`/tech/assigned`}> {t("menus.tech.assignedjobs")}</Link>
-        </Menu.Item>
         <Menu.Item
           key="7"
           disabled={!!!technician}

client/src/components/time-ticket-task-modal/time-ticket-task-modal.component.jsx

@@ -74,7 +74,7 @@ export function TimeTicketTaskModalComponent({
             <Form.Item dependencies={["task"]}>
               {() => {
                 const { task } = form.getFieldsValue();
-                const theTaskPreset = bodyshop.md_tasks_presets.presets.find(
+                const theTaskPreset = bodyshop.md_tasks_presets?.presets?.find(
                   (tp) => tp.name === task
                 );
 

client/src/pages/tech-assigned-prod-jobs/tech-assigned-prod-jobs.component.jsx

@@ -178,7 +178,7 @@ export function TechAssignedProdJobs({
       },
     },
     {
-      title: t("jobs.labels.actions"),
+      title: t("general.labels.actions"),
       dataIndex: "actions",
       key: "actions",
       render: (text, record) => (

client/src/translations/en_us/common.json

@@ -2746,6 +2746,7 @@
 				"deleting": "Error deleting time ticket. {{message}}",
 				"noemployeeforuser": "Unable to use Shift Clock",
 				"noemployeeforuser_sub": "An employee record has not been created for this user. Please create one before using the shift clock. ",
+				"payall": "Error flagging hours. {{error}}",
 				"shiftalreadyclockedon": "You are already clocked onto a shift. Unable to create shift entry."
 			},
 			"fields": {
@@ -2796,7 +2797,8 @@
 				"clockedout": "Clocked out successfully.",
 				"committed": "Time Tickets Committed Successfully",
 				"created": "Time ticket entered successfully.",
-				"deleted": "Time ticket deleted successfully."
+				"deleted": "Time ticket deleted successfully.",
+				"payall": "All hours paid out successfully."
 			},
 			"validation": {
 				"clockoffmustbeafterclockon": "Clock off time must be the same or after clock in time.",

client/src/translations/es/common.json

@@ -2746,6 +2746,7 @@
 				"deleting": "",
 				"noemployeeforuser": "",
 				"noemployeeforuser_sub": "",
+				"payall": "",
 				"shiftalreadyclockedon": ""
 			},
 			"fields": {
@@ -2796,7 +2797,8 @@
 				"clockedout": "",
 				"committed": "",
 				"created": "",
-				"deleted": ""
+				"deleted": "",
+				"payall": ""
 			},
 			"validation": {
 				"clockoffmustbeafterclockon": "",

client/src/translations/fr/common.json

@@ -2746,6 +2746,7 @@
 				"deleting": "",
 				"noemployeeforuser": "",
 				"noemployeeforuser_sub": "",
+				"payall": "",
 				"shiftalreadyclockedon": ""
 			},
 			"fields": {
@@ -2796,7 +2797,8 @@
 				"clockedout": "",
 				"committed": "",
 				"created": "",
-				"deleted": ""
+				"deleted": "",
+				"payall": ""
 			},
 			"validation": {
 				"clockoffmustbeafterclockon": "",

server/payroll/pay-all.js

@@ -32,7 +32,7 @@ exports.payall = async function (req, res) {
     const { employeeHash, assignmentHash } = CalculateExpectedHoursForJob(job);
     const ticketHash = CalculateTicketsHoursForJob(job);
     if (assignmentHash.unassigned > 0) {
-      res.json({ success: false, error: "Unassigned hours." });
+      res.json({ success: false, error: "Not all hours have been assigned." });
       return;
     }
 
@@ -65,7 +65,7 @@ exports.payall = async function (req, res) {
               cost_center:
                 job.bodyshop.md_responsibility_centers.defaults.costs[key],
               flat_rate: true,
-              memo: `*SYS-PAY* Add unflagged hours. (${req.user.email})`,
+              memo: `Add unflagged hours. (${req.user.email})`,
             });
           });
         } else {
@@ -83,7 +83,7 @@ exports.payall = async function (req, res) {
               job.bodyshop.md_responsibility_centers.defaults.costs[
                 path.mod_lbr_ty
               ],
-            memo: `*SYS-PAY* Add unflagged hours. (${req.user.email})`,
+            memo: `Add unflagged hours. (${req.user.email})`,
           });
         }
       } else if (diff.op === "update") {
@@ -102,7 +102,7 @@ exports.payall = async function (req, res) {
             job.bodyshop.md_responsibility_centers.defaults.costs[
               path.mod_lbr_ty
             ],
-          memo: `*SYS-PAY* Adjust flagged hours per assignment. (${req.user.email})`,
+          memo: `Adjust flagged hours per assignment. (${req.user.email})`,
         });
       } else {
         //Has to be a delete
@@ -124,7 +124,7 @@ exports.payall = async function (req, res) {
               cost_center:
                 job.bodyshop.md_responsibility_centers.defaults.costs[key],
               flat_rate: true,
-              memo: `*SYS-PAY* Remove flagged hours per assignment. (${req.user.email})`,
+              memo: `Remove flagged hours per assignment. (${req.user.email})`,
             });
           });
         } else {
@@ -142,7 +142,7 @@ exports.payall = async function (req, res) {
                 path.mod_lbr_ty
               ],
             flat_rate: true,
-            memo: `*SYS-PAY* Remove flagged hours per assignment. (${req.user.email})`,
+            memo: `Remove flagged hours per assignment. (${req.user.email})`,
           });
         }
       }
@@ -163,10 +163,10 @@ exports.payall = async function (req, res) {
       jobid,
       {
         jobid: jobid,
-        error,
+        error: JSON.stringify(error),
       }
     );
-    res.status(503).send();
+    res.status(400).json({ error: error.message });
   }
 };