Brought in shop estimator & made list of estimators unique.

client/src/components/job-payments/job-payments.component.jsx

@@ -99,7 +99,7 @@ export function JobPayments({
       render: (text, record) => (
         <Space wrap>
           <Button
-            disabled={record.exportedat}
+            // disabled={record.exportedat}
             onClick={() => {
               setPaymentContext({
                 actions: { refetch: refetch },

client/src/components/payment-modal/payment-modal.container.jsx

@@ -1,6 +1,6 @@
 import { useMutation } from "@apollo/client";
 
-import { Button, Form, Modal, notification } from "antd";
+import { Button, Form, Modal, notification, Space } from "antd";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -19,6 +19,8 @@ import {
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import PaymentForm from "../payment-form/payment-form.component";
+import { PaymentExportButton } from "../payment-export-button/payment-export-button.component";
+import PaymentReexportButton from "../payment-reexport-button/payment-reexport-button.component";
 
 const mapStateToProps = createStructuredSelector({
   paymentModal: selectPayment,
@@ -176,12 +178,33 @@ function PaymentModalContainer({
         </span>
       }
     >
+      <Space>
+        <PaymentReexportButton
+          payment={context}
+          refetch={() => {
+            toggleModalVisible();
+
+            return actions.refetch;
+          }}
+        />
+        <PaymentExportButton
+          bodyshop={bodyshop}
+          paymentId={context.id}
+          disabled={!!context.exportedat}
+          refetch={() => {
+            toggleModalVisible();
+
+            return actions.refetch;
+          }}
+        />
+      </Space>
       <Form
         onFinish={handleFinish}
         autoComplete={"off"}
         form={form}
         layout="vertical"
         initialValues={context || {}}
+        disabled={context.exportedat}
       >
         <PaymentForm form={form} />
       </Form>

client/src/components/payment-reexport-button/payment-reexport-button.component.jsx

@@ -0,0 +1,49 @@
+import React from "react";
+import { Button, notification } from "antd";
+import { useTranslation } from "react-i18next";
+import { UPDATE_PAYMENT } from "../../graphql/payments.queries";
+import { useMutation } from "@apollo/client";
+
+const PaymentReexportButton = ({ payment, refetch }) => {
+  const { t } = useTranslation();
+  const [updatePayment, { loading }] = useMutation(UPDATE_PAYMENT);
+
+  const handleClick = async () => {
+    const paymentUpdateResponse = await updatePayment({
+      variables: {
+        paymentId: payment.id,
+        payment: {
+          exportedat: null,
+        },
+      },
+    });
+
+    if (!!!paymentUpdateResponse.errors) {
+      notification.open({
+        type: "success",
+        key: "paymentsuccessexport",
+        message: t("payments.successes.reexported"),
+      });
+
+      if (refetch) refetch();
+    } else {
+      notification["error"]({
+        message: t("payments.errors.exporting", {
+          error: JSON.stringify(paymentUpdateResponse.error),
+        }),
+      });
+    }
+  };
+
+  return (
+    <Button
+      onClick={handleClick}
+      loading={loading}
+      disabled={!payment.exportedat}
+    >
+      {t("bills.labels.markforreexport")}
+    </Button>
+  );
+};
+
+export default PaymentReexportButton;

client/src/components/payments-list-paginated/payment-list-paginated.component.jsx

@@ -156,7 +156,7 @@ export function PaymentsListPaginated({
       render: (text, record) => (
         <Space>
           <Button
-            disabled={record.exportedat}
+            // disabled={record.exportedat}
             onClick={async () => {
               let apolloResults;
               if (search.search) {

client/src/components/schedule-calendar/schedule-calendar.component.jsx

@@ -21,6 +21,7 @@ import ScheduleVerifyIntegrity from "../schedule-verify-integrity/schedule-verif
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import _ from "lodash";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
@@ -39,9 +40,39 @@ export function ScheduleCalendarComponent({ data, refetch, bodyshop }) {
     employeevacation: true,
     ins_co_nm: null,
   });
+  const [estimatorsFilter, setEstimatiorsFilter] = useLocalStorage(
+    "estimators",
+    []
+  );
+
+  const estimators = useMemo(() => {
+    return _.uniq([
+      ...data
+        .filter((d) => d.__typename === "appointments")
+        .map((app) =>
+          `${app.job?.est_ct_fn || ""} ${app.job?.est_ct_ln || ""}`.trim()
+        )
+        .filter((e) => e.length > 0),
+      ...bodyshop.md_estimators.map((e) =>
+        `${e.est_ct_fn || ""} ${e.est_ct_ln || ""}`.trim()
+      ),
+    ]);
+  }, [data, bodyshop.md_estimators]);
+
   const filteredData = useMemo(() => {
-    return data.filter(
-      (d) =>
+    return data.filter((d) => {
+      const estFilter =
+        d.__typename === "appointments"
+          ? estimatorsFilter.length === 0
+            ? true
+            : !!estimatorsFilter.find(
+                (e) =>
+                  e ===
+                  `${d.job?.est_ct_fn || ""} ${d.job?.est_ct_ln || ""}`.trim()
+              )
+          : true;
+
+      return (
         (d.block ||
           (filter.intake && d.isintake) ||
           (filter.manual && !d.isintake && d.block === false) ||
@@ -50,9 +81,11 @@ export function ScheduleCalendarComponent({ data, refetch, bodyshop }) {
             !!d.employee)) &&
         (filter.ins_co_nm && filter.ins_co_nm.length > 0
           ? filter.ins_co_nm.includes(d.job?.ins_co_nm)
-          : true)
-    );
-  }, [data, filter]);
+          : true) &&
+        estFilter
+      );
+    });
+  }, [data, filter, estimatorsFilter]);
 
   return (
     <Row gutter={[16, 16]}>
@@ -63,6 +96,21 @@ export function ScheduleCalendarComponent({ data, refetch, bodyshop }) {
           extra={
             <Space wrap>
               <ScheduleAtsSummary appointments={filteredData} />
+              <Select
+                style={{ minWidth: "15rem" }}
+                mode="multiple"
+                placeholder={t("schedule.labels.estimators")}
+                allowClear
+                onClear={() => setEstimatiorsFilter([])}
+                value={[...estimatorsFilter]}
+                onChange={(e) => {
+                  setEstimatiorsFilter(e);
+                }}
+                options={estimators.map((e) => ({
+                  label: e,
+                  value: e,
+                }))}
+              />
               <Select
                 style={{ minWidth: "15rem" }}
                 mode="multiple"

client/src/graphql/appointments.queries.js

@@ -57,6 +57,8 @@ export const QUERY_ALL_ACTIVE_APPOINTMENTS = gql`
         v_model_yr
         v_make_desc
         v_model_desc
+        est_ct_fn
+        est_ct_ln
         labhrs: joblines_aggregate(
           where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }
         ) {

client/src/translations/en_us/common.json

@@ -2217,10 +2217,13 @@
 				"new": "New Payment",
 				"signup": "Please contact support to sign up for electronic payments.",
 				"title": "Payments",
-				"totalpayments": "Total Payments"
+				"totalpayments": "Total Payments",
+				"markforexport": "Mark for Export",
+				"markforreexport": "Mark for Reexport"
 			},
 			"successes": {
 				"exported": "Payment(s) exported successfully.",
+				"reexported": "Payment Re-exported successfully",
 				"markexported": "Payment(s) marked exported.",
 				"payment": "Payment created successfully. ",
 				"stripe": "Credit card transaction charged successfully."
@@ -2316,7 +2319,7 @@
 				"folder_label_multiple": "Folder Label - Multi",
 				"glass_express_checklist": "Glass Express Checklist",
 				"guarantee": "Repair Guarantee",
-				"individual_job_note": "RO Job Note",
+				"individual_job_note": "Job Note RO # {{ro_number}}",
 				"invoice_customer_payable": "Invoice (Customer Payable)",
 				"invoice_total_payable": "Invoice (Total Payable)",
 				"iou_form": "IOU Form",
@@ -2394,7 +2397,6 @@
 			},
 			"subjects": {
 				"jobs": {
-					"individual_job_note": "Job Note RO: {{ro_number}}",
 					"parts_order": "Parts Order PO: {{ro_number}} - {{name}}",
 					"sublet_order": "Sublet Order PO: {{ro_number}} - {{name}}"
 				}
@@ -2620,6 +2622,7 @@
 				"atssummary": "ATS Summary",
 				"employeevacation": "Employee Vacations",
 				"ins_co_nm_filter": "Filter by Insurance Company",
+				"estimators": "Filter by Writer/Customer Rep.",
 				"intake": "Intake Events",
 				"manual": "Manual Events",
 				"manualevent": "Add Manual Event"

client/src/translations/es/common.json

@@ -2394,7 +2394,6 @@
 			},
 			"subjects": {
 				"jobs": {
-					"individual_job_note": "",
 					"parts_order": "",
 					"sublet_order": ""
 				}

client/src/translations/fr/common.json

@@ -2394,7 +2394,6 @@
 			},
 			"subjects": {
 				"jobs": {
-					"individual_job_note": "",
 					"parts_order": "",
 					"sublet_order": ""
 				}

client/src/utils/TemplateConstants.js

@@ -542,7 +542,7 @@ export const TemplateList = (type, context) => {
             title: i18n.t("printcenter.jobs.individual_job_note"),
             description: "",
             key: "individual_job_note",
-            subject: i18n.t("printcenter.subjects.jobs.individual_job_note", {
+            subject: i18n.t("printcenter.jobs.individual_job_note", {
               ro_number: (context && context.ro_number) || "",
             }),
             disabled: false,