From e9bf1c05ad9713f1240498aab4238b34f38e93fb Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Tue, 3 Aug 2021 10:56:33 -0700
Subject: [PATCH 1/4] IO-594 Adjust Autohouse FIle Name

---
 server/data/autohouse.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/data/autohouse.js b/server/data/autohouse.js
index 190d4f053..9720887cc 100644
--- a/server/data/autohouse.js
+++ b/server/data/autohouse.js
@@ -76,7 +76,7 @@ exports.default = async (req, res) => {
 
         allxmlsToUpload.push({
           xml: ret,
-          filename: `IM_${bodyshop.imexshopid}_${moment().format(
+          filename: `IM_${bodyshop.autohouseid}_${moment().format(
             "DDMMYYYY_HHMMSS"
           )}.xml`,
         });

From 4e4c59ce4dd9f9c0ca9faa0dc931cdb8d9eaea91 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Tue, 3 Aug 2021 11:14:49 -0700
Subject: [PATCH 2/4] IO-1262 Add SMS reminder to schedule.

---
 bodyshop_translations.babel                   |  44 ++++++-
 .../schedule-event.component.jsx              | 113 ++++++++++++++----
 client/src/translations/en_us/common.json     |   2 +
 client/src/translations/es/common.json        |   2 +
 client/src/translations/fr/common.json        |   2 +
 5 files changed, 139 insertions(+), 24 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 8adbd10a7..2c43e6db6 100644
--- a/bodyshop_translations.babel
+++ b/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
@@ -799,6 +799,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>reminder</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>scheduledfor</name>
                                         <definition_loaded>false</definition_loaded>
@@ -14305,6 +14326,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>sms</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>
                                     <folder_node>
                                         <name>sub_status</name>
                                         <children>
diff --git a/client/src/components/job-at-change/schedule-event.component.jsx b/client/src/components/job-at-change/schedule-event.component.jsx
index 45e3fa9c0..026e5b56b 100644
--- a/client/src/components/job-at-change/schedule-event.component.jsx
+++ b/client/src/components/job-at-change/schedule-event.component.jsx
@@ -1,26 +1,50 @@
-import { Button, Divider, Popover, Space } from "antd";
 import { AlertFilled } from "@ant-design/icons";
+import {
+  Button,
+  Divider,
+  Dropdown,
+  Menu,
+  notification,
+  Popover,
+  Space,
+} from "antd";
+import parsePhoneNumber from "libphonenumber-js";
+import moment from "moment";
+import queryString from "query-string";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useHistory, useLocation } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
+import {
+  openChatByPhone,
+  setMessage,
+} from "../../redux/messaging/messaging.actions";
 import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import PhoneFormatter from "../../utils/PhoneFormatter";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
+import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import DataLabel from "../data-label/data-label.component";
 import ScheduleAtChange from "./job-at-change.component";
 import ScheduleEventColor from "./schedule-event.color.component";
-import queryString from "query-string";
 import ScheduleEventNote from "./schedule-event.note.component";
 
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
 const mapDispatchToProps = (dispatch) => ({
   setScheduleContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "schedule" })),
+  openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
+  setMessage: (text) => dispatch(setMessage(text)),
 });
 
 export function ScheduleEventComponent({
+  bodyshop,
+  setMessage,
+  openChatByPhone,
   event,
   refetch,
   handleCancel,
@@ -77,9 +101,10 @@ export function ScheduleEventComponent({
             {(event.job && event.job.ownr_ea) || ""}
           </DataLabel>
           <DataLabel label={t("jobs.fields.ownr_ph1")}>
-            <PhoneFormatter>
-              {(event.job && event.job.ownr_ph1) || ""}
-            </PhoneFormatter>
+            <ChatOpenButton
+              phone={event.job && event.job.ownr_ph1}
+              jobid={event.job.id}
+            />
           </DataLabel>
           <DataLabel label={t("jobs.fields.alt_transport")}>
             {(event.job && event.job.alt_transport) || ""}
@@ -109,23 +134,62 @@ export function ScheduleEventComponent({
             {t("appointments.actions.preview")}
           </Button>
         ) : null}
-        <Button
-          onClick={() => {
-            const Template = TemplateList("job").appointment_reminder;
-            GenerateDocument(
-              {
-                name: Template.key,
-                variables: { id: event.job.id },
-              },
-              { to: event.job && event.job.ownr_ea, subject: Template.subject },
-              "e",
-              event.job && event.job.id
-            );
-          }}
-          disabled={event.arrived}
+
+        <Dropdown
+          overlay={
+            <Menu>
+              <Menu.Item
+                onClick={() => {
+                  const Template = TemplateList("job").appointment_reminder;
+                  GenerateDocument(
+                    {
+                      name: Template.key,
+                      variables: { id: event.job.id },
+                    },
+                    {
+                      to: event.job && event.job.ownr_ea,
+                      subject: Template.subject,
+                    },
+                    "e",
+                    event.job && event.job.id
+                  );
+                }}
+                disabled={event.arrived}
+              >
+                {t("general.labels.email")}
+              </Menu.Item>
+              <Menu.Item
+                onClick={() => {
+                  const p = parsePhoneNumber(event.job.ownr_ph1, "CA");
+                  if (p && p.isValid()) {
+                    openChatByPhone({
+                      phone_num: p.formatInternational(),
+                      jobid: event.job.id,
+                    });
+                    setMessage(
+                      t("appointments.labels.reminder", {
+                        shopname: bodyshop.shopname,
+                        date: moment(event.start).format("MM/DD/YYYY"),
+                        time: moment(event.start).format("HH:MM a"),
+                      })
+                    );
+                    setVisible(false);
+                  } else {
+                    notification["error"]({
+                      message: t("messaging.error.invalidphone"),
+                    });
+                  }
+                }}
+                disabled={event.arrived || !bodyshop.messagingservicesid}
+              >
+                {t("general.labels.sms")}
+              </Menu.Item>
+            </Menu>
+          }
         >
-          {t("appointments.actions.sendreminder")}
-        </Button>
+          <Button>{t("appointments.actions.sendreminder")}</Button>
+        </Dropdown>
+
         <Button onClick={() => handleCancel(event.id)} disabled={event.arrived}>
           {t("appointments.actions.cancel")}
         </Button>
@@ -206,4 +270,7 @@ export function ScheduleEventComponent({
     </Popover>
   );
 }
-export default connect(null, mapDispatchToProps)(ScheduleEventComponent);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ScheduleEventComponent);
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 579b39067..f5c1fb355 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -53,6 +53,7 @@
 				"nocompletingjobs": "No jobs scheduled for completion.",
 				"nodateselected": "No date has been selected.",
 				"priorappointments": "Previous Appointments",
+				"reminder": "This is {{shopname}} reminding you about an appointment on {{date}} at {{time}}. Please let us know if you are not able to make the appointment. We look forward to seeing you soon. ",
 				"scheduledfor": "Scheduled appointment for: ",
 				"smartscheduling": "Smart Scheduling",
 				"suggesteddates": "Suggested Dates"
@@ -897,6 +898,7 @@
 				"sendagain": "Send Again",
 				"sendby": "Send By",
 				"signin": "Sign In",
+				"sms": "SMS",
 				"sub_status": {
 					"expired": "The subscription for this shop has expired.  Please contact technical support to reactivate the subscription. "
 				},
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index c0a8a2919..dc16fe66b 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -53,6 +53,7 @@
 				"nocompletingjobs": "",
 				"nodateselected": "No se ha seleccionado ninguna fecha.",
 				"priorappointments": "Nombramientos previos",
+				"reminder": "",
 				"scheduledfor": "Cita programada para:",
 				"smartscheduling": "",
 				"suggesteddates": ""
@@ -897,6 +898,7 @@
 				"sendagain": "",
 				"sendby": "",
 				"signin": "",
+				"sms": "",
 				"sub_status": {
 					"expired": ""
 				},
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 72f5c96a7..63d29f9fe 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -53,6 +53,7 @@
 				"nocompletingjobs": "",
 				"nodateselected": "Aucune date n'a été sélectionnée.",
 				"priorappointments": "Rendez-vous précédents",
+				"reminder": "",
 				"scheduledfor": "Rendez-vous prévu pour:",
 				"smartscheduling": "",
 				"suggesteddates": ""
@@ -897,6 +898,7 @@
 				"sendagain": "",
 				"sendby": "",
 				"signin": "",
+				"sms": "",
 				"sub_status": {
 					"expired": ""
 				},

From b0ec7867b5708cb1fa2e50620aea71911489eb15 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Tue, 3 Aug 2021 11:27:03 -0700
Subject: [PATCH 3/4] IO-1281 System setting for posting time tickets to closed
 RO

---
 bodyshop_translations.babel                   | 21 +++++
 .../job-search-select.component.jsx           |  2 +
 .../shop-info/shop-info.general.component.jsx |  7 ++
 .../tech-job-clock-in-form.component.jsx      |  5 +-
 .../time-ticket-modal.component.jsx           |  5 +-
 client/src/graphql/bodyshop.queries.js        |  2 +
 client/src/graphql/jobs.queries.js            |  2 +
 client/src/translations/en_us/common.json     |  1 +
 client/src/translations/es/common.json        |  1 +
 client/src/translations/fr/common.json        |  1 +
 .../down.yaml                                 |  5 ++
 .../up.yaml                                   |  6 ++
 .../down.yaml                                 | 88 ++++++++++++++++++
 .../up.yaml                                   | 89 +++++++++++++++++++
 .../down.yaml                                 | 80 +++++++++++++++++
 .../up.yaml                                   | 81 +++++++++++++++++
 hasura/migrations/metadata.yaml               |  2 +
 17 files changed, 396 insertions(+), 2 deletions(-)
 create mode 100644 hasura/migrations/1628014681446_alter_table_public_bodyshops_add_column_tt_allow_post_to_invoiced/down.yaml
 create mode 100644 hasura/migrations/1628014681446_alter_table_public_bodyshops_add_column_tt_allow_post_to_invoiced/up.yaml
 create mode 100644 hasura/migrations/1628014693949_update_permission_user_public_table_bodyshops/down.yaml
 create mode 100644 hasura/migrations/1628014693949_update_permission_user_public_table_bodyshops/up.yaml
 create mode 100644 hasura/migrations/1628014707161_update_permission_user_public_table_bodyshops/down.yaml
 create mode 100644 hasura/migrations/1628014707161_update_permission_user_public_table_bodyshops/up.yaml

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 2c43e6db6..c2bb2b5a5 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -7054,6 +7054,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>tt_allow_post_to_invoiced</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>use_fippa</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/job-search-select/job-search-select.component.jsx b/client/src/components/job-search-select/job-search-select.component.jsx
index 3d31d2e5a..11dcafcb4 100644
--- a/client/src/components/job-search-select/job-search-select.component.jsx
+++ b/client/src/components/job-search-select/job-search-select.component.jsx
@@ -15,6 +15,7 @@ const JobSearchSelect = (
   {
     disabled,
     convertedOnly = false,
+    notInvoiced = false,
     notExported = true,
     clm_no = false,
     ...restProps
@@ -30,6 +31,7 @@ const JobSearchSelect = (
             variables: {
               ...(convertedOnly ? { isConverted: true } : {}),
               ...(notExported ? { notExported: true } : {}),
+              ...(notInvoiced ? { notInvoiced: true } : {}),
             },
           }
         : {}),
diff --git a/client/src/components/shop-info/shop-info.general.component.jsx b/client/src/components/shop-info/shop-info.general.component.jsx
index 26a92dcab..c58635431 100644
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -444,6 +444,13 @@ export default function ShopInfoGeneral({ form }) {
         >
           <Switch />
         </Form.Item>
+        <Form.Item
+          name={["tt_allow_post_to_invoiced"]}
+          label={t("bodyshop.fields.tt_allow_post_to_invoiced")}
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
       </LayoutFormRow>
       <LayoutFormRow grow header={t("bodyshop.labels.messagingpresets")}>
         <Form.List name={["md_messaging_presets"]}>
diff --git a/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.component.jsx b/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.component.jsx
index 114dad1f0..e7920ee95 100644
--- a/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.component.jsx
+++ b/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.component.jsx
@@ -30,7 +30,10 @@ export function TechClockInComponent({ form, bodyshop, technician }) {
             },
           ]}
         >
-          <JobSearchSelect />
+          <JobSearchSelect
+            convertedOnly={!bodyshop.tt_allow_post_to_invoiced}
+            notExported={!bodyshop.tt_allow_post_to_invoiced}
+          />
         </Form.Item>
 
         <Form.Item
diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
index 6d8356f5d..e7d98ddb8 100644
--- a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
@@ -82,7 +82,10 @@ export function TimeTicketModalComponent({
                 },
               ]}
             >
-              <JobSearchSelect convertedOnly notExported={false} />
+              <JobSearchSelect
+                convertedOnly={!bodyshop.tt_allow_post_to_invoiced}
+                notExported={!bodyshop.tt_allow_post_to_invoiced}
+              />
             </Form.Item>
           )}
         </Form.Item>
diff --git a/client/src/graphql/bodyshop.queries.js b/client/src/graphql/bodyshop.queries.js
index 0b65d35d8..41073abdb 100644
--- a/client/src/graphql/bodyshop.queries.js
+++ b/client/src/graphql/bodyshop.queries.js
@@ -92,6 +92,7 @@ export const QUERY_BODYSHOP = gql`
       cdk_dealerid
       features
       attach_pdf_to_email
+      tt_allow_post_to_invoiced
       employees {
         id
         active
@@ -180,6 +181,7 @@ export const UPDATE_SHOP = gql`
         md_jobline_presets
         cdk_dealerid
         attach_pdf_to_email
+        tt_allow_post_to_invoiced
         employees {
           id
           first_name
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index 8bbcc6e1a..aad807da1 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -1025,6 +1025,7 @@ export const SEARCH_JOBS_FOR_AUTOCOMPLETE = gql`
     $search: String
     $isConverted: Boolean
     $notExported: Boolean
+    $notInvoiced: Boolean
   ) {
     search_jobs(
       args: { search: $search }
@@ -1033,6 +1034,7 @@ export const SEARCH_JOBS_FOR_AUTOCOMPLETE = gql`
         _and: {
           converted: { _eq: $isConverted }
           date_exported: { _is_null: $notExported }
+          date_invoiced: { _is_null: $notInvoiced }
         }
       }
     ) {
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index f5c1fb355..7c629ead4 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -446,6 +446,7 @@
 					"production_statuses": "Production Statuses"
 				},
 				"target_touchtime": "Target Touch Time",
+				"tt_allow_post_to_invoiced": "Allow Time Tickets to be posted to Invoiced & Exported Jobs",
 				"use_fippa": "Use FIPPA for Names on Generated Documents?",
 				"website": "Website",
 				"zip_post": "Zip/Postal Code"
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index dc16fe66b..63e5f30df 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -446,6 +446,7 @@
 					"production_statuses": ""
 				},
 				"target_touchtime": "",
+				"tt_allow_post_to_invoiced": "",
 				"use_fippa": "",
 				"website": "",
 				"zip_post": ""
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 63d29f9fe..32f7b95d9 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -446,6 +446,7 @@
 					"production_statuses": ""
 				},
 				"target_touchtime": "",
+				"tt_allow_post_to_invoiced": "",
 				"use_fippa": "",
 				"website": "",
 				"zip_post": ""
diff --git a/hasura/migrations/1628014681446_alter_table_public_bodyshops_add_column_tt_allow_post_to_invoiced/down.yaml b/hasura/migrations/1628014681446_alter_table_public_bodyshops_add_column_tt_allow_post_to_invoiced/down.yaml
new file mode 100644
index 000000000..1ac7830ce
--- /dev/null
+++ b/hasura/migrations/1628014681446_alter_table_public_bodyshops_add_column_tt_allow_post_to_invoiced/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."bodyshops" DROP COLUMN "tt_allow_post_to_invoiced";
+  type: run_sql
diff --git a/hasura/migrations/1628014681446_alter_table_public_bodyshops_add_column_tt_allow_post_to_invoiced/up.yaml b/hasura/migrations/1628014681446_alter_table_public_bodyshops_add_column_tt_allow_post_to_invoiced/up.yaml
new file mode 100644
index 000000000..7cbe393e4
--- /dev/null
+++ b/hasura/migrations/1628014681446_alter_table_public_bodyshops_add_column_tt_allow_post_to_invoiced/up.yaml
@@ -0,0 +1,6 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."bodyshops" ADD COLUMN "tt_allow_post_to_invoiced" boolean
+      NOT NULL DEFAULT false;
+  type: run_sql
diff --git a/hasura/migrations/1628014693949_update_permission_user_public_table_bodyshops/down.yaml b/hasura/migrations/1628014693949_update_permission_user_public_table_bodyshops/down.yaml
new file mode 100644
index 000000000..c8a09ddd4
--- /dev/null
+++ b/hasura/migrations/1628014693949_update_permission_user_public_table_bodyshops/down.yaml
@@ -0,0 +1,88 @@
+- args:
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - accountingconfig
+      - address1
+      - address2
+      - appt_alt_transport
+      - appt_colors
+      - appt_length
+      - attach_pdf_to_email
+      - bill_tax_rates
+      - cdk_dealerid
+      - city
+      - country
+      - created_at
+      - default_adjustment_rate
+      - deliverchecklist
+      - email
+      - enforce_class
+      - enforce_referral
+      - features
+      - federal_tax_id
+      - id
+      - imexshopid
+      - inhousevendorid
+      - insurance_vendor_id
+      - intakechecklist
+      - jc_hourly_rates
+      - jobsizelimit
+      - logo_img_path
+      - md_categories
+      - md_ccc_rates
+      - md_classes
+      - md_hour_split
+      - md_ins_cos
+      - md_jobline_presets
+      - md_labor_rates
+      - md_messaging_presets
+      - md_notes_presets
+      - md_order_statuses
+      - md_parts_locations
+      - md_payment_types
+      - md_rbac
+      - md_referral_sources
+      - md_responsibility_centers
+      - md_ro_statuses
+      - messagingservicesid
+      - phone
+      - prodtargethrs
+      - production_config
+      - region_config
+      - schedule_end_time
+      - schedule_start_time
+      - scoreboard_target
+      - shopname
+      - shoprates
+      - speedprint
+      - ssbuckets
+      - state
+      - state_tax_id
+      - stripe_acct_id
+      - sub_status
+      - target_touchtime
+      - template_header
+      - textid
+      - updated_at
+      - use_fippa
+      - website
+      - workingdays
+      - zip_post
+      computed_fields: []
+      filter:
+        associations:
+          user:
+            authid:
+              _eq: X-Hasura-User-Id
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1628014693949_update_permission_user_public_table_bodyshops/up.yaml b/hasura/migrations/1628014693949_update_permission_user_public_table_bodyshops/up.yaml
new file mode 100644
index 000000000..69267f8fa
--- /dev/null
+++ b/hasura/migrations/1628014693949_update_permission_user_public_table_bodyshops/up.yaml
@@ -0,0 +1,89 @@
+- args:
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - accountingconfig
+      - address1
+      - address2
+      - appt_alt_transport
+      - appt_colors
+      - appt_length
+      - attach_pdf_to_email
+      - bill_tax_rates
+      - cdk_dealerid
+      - city
+      - country
+      - created_at
+      - default_adjustment_rate
+      - deliverchecklist
+      - email
+      - enforce_class
+      - enforce_referral
+      - features
+      - federal_tax_id
+      - id
+      - imexshopid
+      - inhousevendorid
+      - insurance_vendor_id
+      - intakechecklist
+      - jc_hourly_rates
+      - jobsizelimit
+      - logo_img_path
+      - md_categories
+      - md_ccc_rates
+      - md_classes
+      - md_hour_split
+      - md_ins_cos
+      - md_jobline_presets
+      - md_labor_rates
+      - md_messaging_presets
+      - md_notes_presets
+      - md_order_statuses
+      - md_parts_locations
+      - md_payment_types
+      - md_rbac
+      - md_referral_sources
+      - md_responsibility_centers
+      - md_ro_statuses
+      - messagingservicesid
+      - phone
+      - prodtargethrs
+      - production_config
+      - region_config
+      - schedule_end_time
+      - schedule_start_time
+      - scoreboard_target
+      - shopname
+      - shoprates
+      - speedprint
+      - ssbuckets
+      - state
+      - state_tax_id
+      - stripe_acct_id
+      - sub_status
+      - target_touchtime
+      - template_header
+      - textid
+      - tt_allow_post_to_invoiced
+      - updated_at
+      - use_fippa
+      - website
+      - workingdays
+      - zip_post
+      computed_fields: []
+      filter:
+        associations:
+          user:
+            authid:
+              _eq: X-Hasura-User-Id
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1628014707161_update_permission_user_public_table_bodyshops/down.yaml b/hasura/migrations/1628014707161_update_permission_user_public_table_bodyshops/down.yaml
new file mode 100644
index 000000000..adce758ee
--- /dev/null
+++ b/hasura/migrations/1628014707161_update_permission_user_public_table_bodyshops/down.yaml
@@ -0,0 +1,80 @@
+- args:
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - accountingconfig
+      - address1
+      - address2
+      - appt_alt_transport
+      - appt_colors
+      - appt_length
+      - attach_pdf_to_email
+      - bill_tax_rates
+      - city
+      - country
+      - created_at
+      - default_adjustment_rate
+      - deliverchecklist
+      - email
+      - enforce_class
+      - enforce_referral
+      - federal_tax_id
+      - id
+      - inhousevendorid
+      - insurance_vendor_id
+      - intakechecklist
+      - jc_hourly_rates
+      - logo_img_path
+      - md_categories
+      - md_ccc_rates
+      - md_classes
+      - md_hour_split
+      - md_ins_cos
+      - md_jobline_presets
+      - md_labor_rates
+      - md_messaging_presets
+      - md_notes_presets
+      - md_order_statuses
+      - md_parts_locations
+      - md_payment_types
+      - md_rbac
+      - md_referral_sources
+      - md_responsibility_centers
+      - md_ro_statuses
+      - phone
+      - prodtargethrs
+      - production_config
+      - schedule_end_time
+      - schedule_start_time
+      - scoreboard_target
+      - shopname
+      - shoprates
+      - speedprint
+      - ssbuckets
+      - state
+      - state_tax_id
+      - target_touchtime
+      - updated_at
+      - use_fippa
+      - website
+      - workingdays
+      - zip_post
+      filter:
+        associations:
+          _and:
+          - user:
+              authid:
+                _eq: X-Hasura-User-Id
+          - active:
+              _eq: true
+      set: {}
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1628014707161_update_permission_user_public_table_bodyshops/up.yaml b/hasura/migrations/1628014707161_update_permission_user_public_table_bodyshops/up.yaml
new file mode 100644
index 000000000..410a953e4
--- /dev/null
+++ b/hasura/migrations/1628014707161_update_permission_user_public_table_bodyshops/up.yaml
@@ -0,0 +1,81 @@
+- args:
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - accountingconfig
+      - address1
+      - address2
+      - appt_alt_transport
+      - appt_colors
+      - appt_length
+      - attach_pdf_to_email
+      - bill_tax_rates
+      - city
+      - country
+      - created_at
+      - default_adjustment_rate
+      - deliverchecklist
+      - email
+      - enforce_class
+      - enforce_referral
+      - federal_tax_id
+      - id
+      - inhousevendorid
+      - insurance_vendor_id
+      - intakechecklist
+      - jc_hourly_rates
+      - logo_img_path
+      - md_categories
+      - md_ccc_rates
+      - md_classes
+      - md_hour_split
+      - md_ins_cos
+      - md_jobline_presets
+      - md_labor_rates
+      - md_messaging_presets
+      - md_notes_presets
+      - md_order_statuses
+      - md_parts_locations
+      - md_payment_types
+      - md_rbac
+      - md_referral_sources
+      - md_responsibility_centers
+      - md_ro_statuses
+      - phone
+      - prodtargethrs
+      - production_config
+      - schedule_end_time
+      - schedule_start_time
+      - scoreboard_target
+      - shopname
+      - shoprates
+      - speedprint
+      - ssbuckets
+      - state
+      - state_tax_id
+      - target_touchtime
+      - tt_allow_post_to_invoiced
+      - updated_at
+      - use_fippa
+      - website
+      - workingdays
+      - zip_post
+      filter:
+        associations:
+          _and:
+          - user:
+              authid:
+                _eq: X-Hasura-User-Id
+          - active:
+              _eq: true
+      set: {}
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/metadata.yaml b/hasura/migrations/metadata.yaml
index 70289c99f..3ec04fbf7 100644
--- a/hasura/migrations/metadata.yaml
+++ b/hasura/migrations/metadata.yaml
@@ -850,6 +850,7 @@ tables:
       - target_touchtime
       - template_header
       - textid
+      - tt_allow_post_to_invoiced
       - updated_at
       - use_fippa
       - website
@@ -916,6 +917,7 @@ tables:
       - state
       - state_tax_id
       - target_touchtime
+      - tt_allow_post_to_invoiced
       - updated_at
       - use_fippa
       - website

From 5b84ebbc25010592b7573489f6a488e4e9cc87a3 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Tue, 3 Aug 2021 11:45:36 -0700
Subject: [PATCH 4/4] IO-1284 Job Admin updates

---
 bodyshop_translations.babel                   |  84 +++++++++++++
 .../jobs-admin-delete-intake.component.jsx    |  48 ++++++--
 .../jobs-admin-mark-reexport.component.jsx    | 112 ++++++++++++++++--
 .../src/pages/jobs-admin/jobs-admin.page.jsx  |   5 +-
 client/src/translations/en_us/common.json     |   6 +-
 client/src/translations/es/common.json        |   4 +
 client/src/translations/fr/common.json        |   4 +
 7 files changed, 241 insertions(+), 22 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index c2bb2b5a5..39f7c8a01 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -16967,6 +16967,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>markasexported</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>markpstexempt</name>
                                         <definition_loaded>false</definition_loaded>
@@ -17177,6 +17198,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>uninvoice</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>unvoid</name>
                                         <definition_loaded>false</definition_loaded>
@@ -21517,6 +21559,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>adminwarning</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>allocations</name>
                                         <definition_loaded>false</definition_loaded>
@@ -22461,6 +22524,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>deletedelivery</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>deleteintake</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/jobs-admin-delete-intake/jobs-admin-delete-intake.component.jsx b/client/src/components/jobs-admin-delete-intake/jobs-admin-delete-intake.component.jsx
index 011ba9f99..db96f74ef 100644
--- a/client/src/components/jobs-admin-delete-intake/jobs-admin-delete-intake.component.jsx
+++ b/client/src/components/jobs-admin-delete-intake/jobs-admin-delete-intake.component.jsx
@@ -6,8 +6,8 @@ import { useTranslation } from "react-i18next";
 export default function JobAdminDeleteIntake({ job }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
-  const [updateJob] = useMutation(gql`
-    mutation UPDATE_JOB($jobId: uuid!) {
+  const [deleteIntake] = useMutation(gql`
+    mutation DELETE_INTAKE($jobId: uuid!) {
       update_jobs_by_pk(
         pk_columns: { id: $jobId }
         _set: { intakechecklist: null }
@@ -18,9 +18,39 @@ export default function JobAdminDeleteIntake({ job }) {
     }
   `);
 
+  const [DELETE_DELIVERY] = useMutation(gql`
+    mutation DELETE_DELIVERY($jobId: uuid!) {
+      update_jobs_by_pk(
+        pk_columns: { id: $jobId }
+        _set: { deliverychecklist: null }
+      ) {
+        id
+        deliverychecklist
+      }
+    }
+  `);
+
   const handleDelete = async (values) => {
     setLoading(true);
-    const result = await updateJob({
+    const result = await deleteIntake({
+      variables: { jobId: job.id },
+    });
+
+    if (!!!result.errors) {
+      notification["success"]({ message: t("jobs.successes.save") });
+    } else {
+      notification["error"]({
+        message: t("jobs.errors.saving", {
+          error: JSON.stringify(result.errors),
+        }),
+      });
+    }
+    setLoading(false);
+  };
+
+  const handleDeleteDelivery = async (values) => {
+    setLoading(true);
+    const result = await DELETE_DELIVERY({
       variables: { jobId: job.id },
     });
 
@@ -34,12 +64,16 @@ export default function JobAdminDeleteIntake({ job }) {
       });
     }
     setLoading(false);
-    //Get the owner details, populate it all back into the job.
   };
 
   return (
-    <Button loading={loading} onClick={handleDelete}>
-      {t("jobs.labels.deleteintake")}
-    </Button>
+    <>
+      <Button loading={loading} onClick={handleDelete}>
+        {t("jobs.labels.deleteintake")}
+      </Button>
+      <Button loading={loading} onClick={handleDeleteDelivery}>
+        {t("jobs.labels.deletedelivery")}
+      </Button>
+    </>
   );
 }
diff --git a/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx b/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx
index f6002d144..18b624606 100644
--- a/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx
+++ b/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx
@@ -7,6 +7,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import moment from "moment";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
@@ -21,8 +22,8 @@ export default connect(
 export function JobAdminMarkReexport({ bodyshop, job }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
-  const [updateJob] = useMutation(gql`
-    mutation UPDATE_JOB($jobId: uuid!) {
+  const [markJobForReexport] = useMutation(gql`
+    mutation MARK_JOB_FOR_REEXPORT($jobId: uuid!) {
       update_jobs_by_pk(
         pk_columns: { id: $jobId }
         _set: { date_exported: null
@@ -30,14 +31,84 @@ export function JobAdminMarkReexport({ bodyshop, job }) {
         }
       ) {
         id
-        intakechecklist
+        date_exported
+        status
+        date_invoiced
       }
     }
   `);
 
-  const handleUpdate = async (values) => {
+  const [markJobExported] = useMutation(gql`
+    mutation MARK_JOB_AS_EXPORTED($jobId: uuid!, $date_exported: timestamptz!) {
+      update_jobs_by_pk(
+        pk_columns: { id: $jobId }
+        _set: { date_exported: $date_exported
+        status: "${bodyshop.md_ro_statuses.default_exported}"
+        }
+      ) {
+        id
+        date_exported
+        date_invoiced
+        status
+      }
+    }
+  `);
+  const [markJobUninvoiced] = useMutation(gql`
+    mutation MARK_JOB_AS_UNINVOICED($jobId: uuid!, ) {
+      update_jobs_by_pk(
+        pk_columns: { id: $jobId }
+        _set: { date_exported: null
+          date_invoiced: null
+        status: "${bodyshop.md_ro_statuses.default_delivered}"
+        }
+      ) {
+        id
+        date_exported
+        date_invoiced
+        status
+      }
+    }
+  `);
+
+  const handleMarkForExport = async () => {
     setLoading(true);
-    const result = await updateJob({
+    const result = await markJobForReexport({
+      variables: { jobId: job.id },
+    });
+
+    if (!result.errors) {
+      notification["success"]({ message: t("jobs.successes.save") });
+    } else {
+      notification["error"]({
+        message: t("jobs.errors.saving", {
+          error: JSON.stringify(result.errors),
+        }),
+      });
+    }
+    setLoading(false);
+  };
+
+  const handleMarkExported = async () => {
+    setLoading(true);
+    const result = await markJobExported({
+      variables: { jobId: job.id, date_exported: moment() },
+    });
+
+    if (!result.errors) {
+      notification["success"]({ message: t("jobs.successes.save") });
+    } else {
+      notification["error"]({
+        message: t("jobs.errors.saving", {
+          error: JSON.stringify(result.errors),
+        }),
+      });
+    }
+    setLoading(false);
+  };
+
+  const handleUninvoice = async () => {
+    setLoading(true);
+    const result = await markJobUninvoiced({
       variables: { jobId: job.id },
     });
 
@@ -51,16 +122,31 @@ export function JobAdminMarkReexport({ bodyshop, job }) {
       });
     }
     setLoading(false);
-    //Get the owner details, populate it all back into the job.
   };
 
   return (
-    <Button
-      loading={loading}
-      disabled={!job.date_exported}
-      onClick={handleUpdate}
-    >
-      {t("jobs.labels.markforreexport")}
-    </Button>
+    <>
+      <Button
+        loading={loading}
+        disabled={!job.date_exported}
+        onClick={handleMarkForExport}
+      >
+        {t("jobs.labels.markforreexport")}
+      </Button>
+      <Button
+        loading={loading}
+        disabled={job.date_exported}
+        onClick={handleMarkExported}
+      >
+        {t("jobs.actions.markasexported")}
+      </Button>
+      <Button
+        loading={loading}
+        disabled={!job.date_invoiced || job.date_exported}
+        onClick={handleUninvoice}
+      >
+        {t("jobs.actions.uninvoice")}
+      </Button>
+    </>
   );
 }
diff --git a/client/src/pages/jobs-admin/jobs-admin.page.jsx b/client/src/pages/jobs-admin/jobs-admin.page.jsx
index b133e314e..ba7e4a989 100644
--- a/client/src/pages/jobs-admin/jobs-admin.page.jsx
+++ b/client/src/pages/jobs-admin/jobs-admin.page.jsx
@@ -1,5 +1,5 @@
 import { useQuery } from "@apollo/client";
-import { Card, Col, Result, Row, Space } from "antd";
+import { Card, Col, Result, Row, Space, Typography } from "antd";
 import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -84,6 +84,9 @@ export function JobsCloseContainer({ setBreadcrumbs, setSelectedHeader }) {
 
   return (
     <RbacWrapper action="jobs:admin">
+      <Typography.Title level={4} style={{ color: "tomato" }}>
+        {t("jobs.labels.adminwarning")}
+      </Typography.Title>
       <Row gutter={[16, 16]}>
         <Col {...colSpan}>
           <Card style={cardStyle}>
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 7c629ead4..c63152b36 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1059,6 +1059,7 @@
 				"intake": "Intake",
 				"manualnew": "Create New Job Manually",
 				"mark": "Mark",
+				"markasexported": "Mark as Exported",
 				"markpstexempt": "Mark Job PST Exempt",
 				"markpstexemptconfirm": "Are you sure you want to do this? To undo this,  you must manually update all PST rates.",
 				"postbills": "Post Bills",
@@ -1069,6 +1070,7 @@
 				"schedule": "Schedule",
 				"sendcsi": "Send CSI",
 				"sync": "Sync",
+				"uninvoice": "Uninvoice",
 				"unvoid": "Unvoid Job",
 				"viewchecklist": "View Checklists",
 				"viewdetail": "View Details"
@@ -1288,6 +1290,7 @@
 				"additionaltotal": "Additional Total",
 				"adjustmentrate": "Adjustment Rate",
 				"adjustments": "Adjustments",
+				"adminwarning": "Use the functionality on this page at your own risk.  You are responsible for any and all changes to your data.",
 				"allocations": "Allocations",
 				"alreadyclosed": "This job has already been closed.",
 				"appointmentconfirmation": "Send confirmation to customer?",
@@ -1340,7 +1343,8 @@
 					"waived": "Waived"
 				},
 				"deleteconfirm": "Are you sure you want to delete this job? This cannot be undone. ",
-				"deleteintake": "Delete Intake",
+				"deletedelivery": "Delete Delivery Checklist",
+				"deleteintake": "Delete Intake Checklist",
 				"deliverchecklist": "Deliver Checklist",
 				"difference": "Difference",
 				"diskscan": "Scan Disk for Estimates",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 63e5f30df..fbe1d0b23 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1059,6 +1059,7 @@
 				"intake": "",
 				"manualnew": "",
 				"mark": "",
+				"markasexported": "",
 				"markpstexempt": "",
 				"markpstexemptconfirm": "",
 				"postbills": "Contabilizar facturas",
@@ -1069,6 +1070,7 @@
 				"schedule": "Programar",
 				"sendcsi": "",
 				"sync": "",
+				"uninvoice": "",
 				"unvoid": "",
 				"viewchecklist": "",
 				"viewdetail": ""
@@ -1288,6 +1290,7 @@
 				"additionaltotal": "",
 				"adjustmentrate": "",
 				"adjustments": "",
+				"adminwarning": "",
 				"allocations": "",
 				"alreadyclosed": "",
 				"appointmentconfirmation": "¿Enviar confirmación al cliente?",
@@ -1340,6 +1343,7 @@
 					"waived": ""
 				},
 				"deleteconfirm": "",
+				"deletedelivery": "",
 				"deleteintake": "",
 				"deliverchecklist": "",
 				"difference": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 32f7b95d9..fd657e45a 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1059,6 +1059,7 @@
 				"intake": "",
 				"manualnew": "",
 				"mark": "",
+				"markasexported": "",
 				"markpstexempt": "",
 				"markpstexemptconfirm": "",
 				"postbills": "Poster des factures",
@@ -1069,6 +1070,7 @@
 				"schedule": "Programme",
 				"sendcsi": "",
 				"sync": "",
+				"uninvoice": "",
 				"unvoid": "",
 				"viewchecklist": "",
 				"viewdetail": ""
@@ -1288,6 +1290,7 @@
 				"additionaltotal": "",
 				"adjustmentrate": "",
 				"adjustments": "",
+				"adminwarning": "",
 				"allocations": "",
 				"alreadyclosed": "",
 				"appointmentconfirmation": "Envoyer une confirmation au client?",
@@ -1340,6 +1343,7 @@
 					"waived": ""
 				},
 				"deleteconfirm": "",
+				"deletedelivery": "",
 				"deleteintake": "",
 				"deliverchecklist": "",
 				"difference": "",