From 592b47b5d4b3335c246bb15404eea1b10f2096a1 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Mon, 21 Mar 2022 11:47:25 -0600
Subject: [PATCH 1/8] IO-1789 Incoming hours cap

---
 bodyshop_translations.babel                   | 26 ++++++
 .../shop-info.scheduling.component.jsx        |  6 ++
 client/src/graphql/bodyshop.queries.js        |  3 +-
 client/src/translations/en_us/common.json     |  3 +
 client/src/translations/es/common.json        |  3 +
 client/src/translations/fr/common.json        |  3 +
 hasura/metadata/tables.yaml                   |  2 +
 .../down.sql                                  |  4 +
 .../up.sql                                    |  2 +
 server/graphql-client/queries.js              |  1 +
 server/scheduling/scheduling-job.js           | 89 +++++++++++++++----
 11 files changed, 124 insertions(+), 18 deletions(-)
 create mode 100644 hasura/migrations/1647876980174_alter_table_public_bodyshops_add_column_ss_configuration/down.sql
 create mode 100644 hasura/migrations/1647876980174_alter_table_public_bodyshops_add_column_ss_configuration/up.sql

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index d11e1ed2d..28764f991 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -7280,6 +7280,32 @@
                                             </concept_node>
                                         </children>
                                     </folder_node>
+                                    <folder_node>
+                                        <name>ss_configuration</name>
+                                        <children>
+                                            <concept_node>
+                                                <name>dailyhrslimit</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>
                                         <name>ssbuckets</name>
                                         <children>
diff --git a/client/src/components/shop-info/shop-info.scheduling.component.jsx b/client/src/components/shop-info/shop-info.scheduling.component.jsx
index d071cc9de..85e64c555 100644
--- a/client/src/components/shop-info/shop-info.scheduling.component.jsx
+++ b/client/src/components/shop-info/shop-info.scheduling.component.jsx
@@ -70,6 +70,12 @@ export default function ShopInfoSchedulingComponent({ form }) {
         >
           <Select mode="tags" />
         </Form.Item>
+        <Form.Item
+          name={["ss_configuration", "dailyhrslimit"]}
+          label={t("bodyshop.fields.ss_configuration.dailyhrslimit")}
+        >
+          <InputNumber min={0} />
+        </Form.Item>
       </LayoutFormRow>
       <Divider orientation="left">{t("bodyshop.labels.workingdays")}</Divider>
       <Space wrap size="large">
diff --git a/client/src/graphql/bodyshop.queries.js b/client/src/graphql/bodyshop.queries.js
index f0bd54a21..88f9b7bec 100644
--- a/client/src/graphql/bodyshop.queries.js
+++ b/client/src/graphql/bodyshop.queries.js
@@ -101,6 +101,7 @@ export const QUERY_BODYSHOP = gql`
       md_filehandlers
       md_email_cc
       timezone
+      ss_configuration
       employees {
         user_email
         id
@@ -199,6 +200,7 @@ export const UPDATE_SHOP = gql`
         md_filehandlers
         md_email_cc
         timezone
+        ss_configuration
         employees {
           id
           first_name
@@ -266,7 +268,6 @@ export const QUERY_DELIVER_CHECKLIST = gql`
       ro_number
       actual_completion
       actual_delivery
-      
     }
   }
 `;
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 255a81a03..595bd958f 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -455,6 +455,9 @@
 					"label": "Label",
 					"templates": "Templates"
 				},
+				"ss_configuration": {
+					"dailyhrslimit": "Daily Incoming Hours Limit"
+				},
 				"ssbuckets": {
 					"gte": "Greater Than/Equal to (hrs)",
 					"id": "ID",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 336ba07d4..3d3c44a0d 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -455,6 +455,9 @@
 					"label": "",
 					"templates": ""
 				},
+				"ss_configuration": {
+					"dailyhrslimit": ""
+				},
 				"ssbuckets": {
 					"gte": "",
 					"id": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 67435a1fc..d44d11e95 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -455,6 +455,9 @@
 					"label": "",
 					"templates": ""
 				},
+				"ss_configuration": {
+					"dailyhrslimit": ""
+				},
 				"ssbuckets": {
 					"gte": "",
 					"id": "",
diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index c91b048fc..8473f5887 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -860,6 +860,7 @@
       - shopname
       - shoprates
       - speedprint
+      - ss_configuration
       - ssbuckets
       - state
       - state_tax_id
@@ -938,6 +939,7 @@
       - shopname
       - shoprates
       - speedprint
+      - ss_configuration
       - ssbuckets
       - state
       - state_tax_id
diff --git a/hasura/migrations/1647876980174_alter_table_public_bodyshops_add_column_ss_configuration/down.sql b/hasura/migrations/1647876980174_alter_table_public_bodyshops_add_column_ss_configuration/down.sql
new file mode 100644
index 000000000..fbb2eef6c
--- /dev/null
+++ b/hasura/migrations/1647876980174_alter_table_public_bodyshops_add_column_ss_configuration/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."bodyshops" add column "ss_configuration" jsonb
+--  null default jsonb_build_object();
diff --git a/hasura/migrations/1647876980174_alter_table_public_bodyshops_add_column_ss_configuration/up.sql b/hasura/migrations/1647876980174_alter_table_public_bodyshops_add_column_ss_configuration/up.sql
new file mode 100644
index 000000000..c693c6d4e
--- /dev/null
+++ b/hasura/migrations/1647876980174_alter_table_public_bodyshops_add_column_ss_configuration/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "ss_configuration" jsonb
+ null default jsonb_build_object();
diff --git a/server/graphql-client/queries.js b/server/graphql-client/queries.js
index 306cb06cb..641adbd82 100644
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -464,6 +464,7 @@ exports.QUERY_UPCOMING_APPOINTMENTS = `query QUERY_UPCOMING_APPOINTMENTS($now: t
   jobs_by_pk(id: $jobId) {
     bodyshop {
       ssbuckets
+      ss_configuration
       target_touchtime
       workingdays
       timezone
diff --git a/server/scheduling/scheduling-job.js b/server/scheduling/scheduling-job.js
index a314022c9..316bc7974 100644
--- a/server/scheduling/scheduling-job.js
+++ b/server/scheduling/scheduling-job.js
@@ -5,6 +5,7 @@ const Dinero = require("dinero.js");
 const moment = require("moment-timezone");
 const logger = require("../utils/logger");
 const _ = require("lodash");
+const { filter } = require("lodash");
 require("dotenv").config({
   path: path.resolve(
     process.cwd(),
@@ -32,7 +33,8 @@ exports.job = async (req, res) => {
       });
 
     const { jobs_by_pk, blockedDays, prodJobs, arrJobs, compJobs } = result;
-    const { ssbuckets, workingdays, timezone } = result.jobs_by_pk.bodyshop;
+    const { ssbuckets, workingdays, timezone, ss_configuration } =
+      result.jobs_by_pk.bodyshop;
     const jobHrs = result.jobs_by_pk.jobhrs.aggregate.sum.mod_lb_hrs;
 
     const JobBucket = ssbuckets.filter(
@@ -63,29 +65,68 @@ exports.job = async (req, res) => {
       }
     });
 
-    const filteredArrJobs = arrJobs.filter(
-      (j) => JobBucket.id === CheckJobBucket(ssbuckets, j)
-    );
+    // const filteredArrJobs = arrJobs.filter(
+    //   (j) => JobBucket.id === CheckJobBucket(ssbuckets, j)
+    // );
+    const filteredArrJobs = [];
+
+    // filteredArrJobs.forEach((item) => {
+    //   const itemDate = moment(item.scheduled_in)
+    //     .tz(timezone)
+    //     .format("yyyy-MM-DD");
+    //   if (!!load[itemDate]) {
+    //     load[itemDate].hoursIn =
+    //       (load[itemDate].hoursIn || 0) +
+    //       item.labhrs.aggregate.sum.mod_lb_hrs +
+    //       item.larhrs.aggregate.sum.mod_lb_hrs;
+    //     load[itemDate].jobsIn.push(item);
+    //   } else {
+    //     load[itemDate] = {
+    //       jobsIn: [item],
+    //       jobsOut: [],
+    //       hoursIn:
+    //         item.labhrs.aggregate.sum.mod_lb_hrs +
+    //         item.larhrs.aggregate.sum.mod_lb_hrs,
+    //     };
+    //   }
+    // });
+
+    arrJobs.forEach((item) => {
+      let isSameBucket = false;
+      if (JobBucket.id === CheckJobBucket(ssbuckets, item)) {
+        filteredArrJobs.push(item);
+        isSameBucket = true;
+      }
+
+      let jobHours =
+        item.labhrs.aggregate.sum.mod_lb_hrs +
+        item.larhrs.aggregate.sum.mod_lb_hrs;
 
-    filteredArrJobs.forEach((item) => {
       const itemDate = moment(item.scheduled_in)
         .tz(timezone)
         .format("yyyy-MM-DD");
-      if (!!load[itemDate]) {
-        load[itemDate].hoursIn =
-          (load[itemDate].hoursIn || 0) +
-          item.labhrs.aggregate.sum.mod_lb_hrs +
-          item.larhrs.aggregate.sum.mod_lb_hrs;
-        load[itemDate].jobsIn.push(item);
-      } else {
+      if (isSameBucket) {
+        if (!!load[itemDate]) {
+          load[itemDate].hoursIn = (load[itemDate].hoursIn || 0) + jobHours;
+          load[itemDate].jobsIn.push(item);
+        } else {
+          load[itemDate] = {
+            jobsIn: [item],
+            jobsOut: [],
+            hoursIn: jobHours,
+          };
+        }
+      }
+      if (!load[itemDate]) {
         load[itemDate] = {
-          jobsIn: [item],
+          jobsIn: [],
           jobsOut: [],
-          hoursIn:
-            item.labhrs.aggregate.sum.mod_lb_hrs +
-            item.larhrs.aggregate.sum.mod_lb_hrs,
+          hoursIn: 0,
+          hoursInTotal: 0,
         };
       }
+      load[itemDate].hoursInTotal =
+        (load[itemDate].hoursInTotal || 0) + jobHours;
     });
 
     //Get the completing jobs.
@@ -214,11 +255,25 @@ exports.job = async (req, res) => {
         (workingdays[dayOfWeekMapper(moment(loadKey).day())] || false) &&
         !load[loadKey].blocked;
 
+      let isUnderDailyTotalLimit = true;
+
+      if (
+        ss_configuration &&
+        ss_configuration.dailyhrslimit &&
+        ss_configuration.dailyhrslimit > 0 &&
+        load[loadKey] &&
+        load[loadKey].hoursInTotal &&
+        load[loadKey].hoursInTotal > ss_configuration.dailyhrslimit
+      ) {
+        isUnderDailyTotalLimit = false;
+      }
+
       if (
         load[loadKey].expectedLoad &&
         load[loadKey].expectedLoad[JobBucket.id] &&
         JobBucket.target > load[loadKey].expectedLoad[JobBucket.id].count &&
-        isShopOpen
+        isShopOpen &&
+        isUnderDailyTotalLimit
       )
         possibleDates.push(new Date(loadKey).toISOString().substr(0, 10));
     });

From 7ccd356f0ab21ae7b84014360d1521ec4186c915 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Mon, 21 Mar 2022 10:51:44 -0700
Subject: [PATCH 2/8] Add margin to templates generation.

---
 client/src/utils/RenderTemplate.js | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/client/src/utils/RenderTemplate.js b/client/src/utils/RenderTemplate.js
index 7aab1139a..76d1f090c 100644
--- a/client/src/utils/RenderTemplate.js
+++ b/client/src/utils/RenderTemplate.js
@@ -30,7 +30,21 @@ export default async function RenderTemplate(
       name: useShopSpecificTemplate
         ? `/${bodyshop.imexshopid}/${templateObject.name}`
         : `/${templateObject.name}`,
-      ...(renderAsHtml ? {} : { recipe: "chrome-pdf" }),
+      ...(renderAsHtml
+        ? {}
+        : {
+            recipe: "chrome-pdf",
+            chrome: {
+              marginTop:
+                (bodyshop.logo_img_path &&
+                  bodyshop.logo_img_path.headerMargin) ||
+                "36px",
+              marginBottom:
+                (bodyshop.logo_img_path &&
+                  bodyshop.logo_img_path.footerMargin) ||
+                "36px",
+            },
+          }),
       ...(renderAsExcel ? { recipe: "html-to-xlsx" } : {}),
     },
     data: {
@@ -151,7 +165,7 @@ export async function RenderTemplates(
   };
 
   try {
-    const render = await jsreport.renderAsync(reportRequest);
+    const render = await jsreport.renderAsync({ reportRequest });
     if (!renderAsHtml) {
       render.download("Speed Print");
     } else {

From d6924c22924911d6e7ba884b4cc07c55ebf90619 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Mon, 21 Mar 2022 11:52:44 -0600
Subject: [PATCH 3/8] Add JSR margins to speed print.

---
 client/src/utils/RenderTemplate.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/client/src/utils/RenderTemplate.js b/client/src/utils/RenderTemplate.js
index 76d1f090c..d19cbb81b 100644
--- a/client/src/utils/RenderTemplate.js
+++ b/client/src/utils/RenderTemplate.js
@@ -135,7 +135,21 @@ export async function RenderTemplates(
       name: rootTemplate.useShopSpecificTemplate
         ? `/${bodyshop.imexshopid}/${rootTemplate.templateObject.name}`
         : `/${rootTemplate.templateObject.name}`,
-      ...(renderAsHtml ? {} : { recipe: "chrome-pdf" }),
+      ...(renderAsHtml
+        ? {}
+        : {
+            recipe: "chrome-pdf",
+            chrome: {
+              marginTop:
+                (bodyshop.logo_img_path &&
+                  bodyshop.logo_img_path.headerMargin) ||
+                "36px",
+              marginBottom:
+                (bodyshop.logo_img_path &&
+                  bodyshop.logo_img_path.footerMargin) ||
+                "36px",
+            },
+          }),
       pdfOperations: templateAndData.map((template) => {
         return {
           template: {

From 15c305317a841ef8eecce70e0bcdff4579a4f022 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Tue, 22 Mar 2022 11:11:47 -0600
Subject: [PATCH 4/8] Update header and footer margins.

---
 client/src/utils/RenderTemplate.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/client/src/utils/RenderTemplate.js b/client/src/utils/RenderTemplate.js
index d19cbb81b..9a2201c2f 100644
--- a/client/src/utils/RenderTemplate.js
+++ b/client/src/utils/RenderTemplate.js
@@ -37,11 +37,13 @@ export default async function RenderTemplate(
             chrome: {
               marginTop:
                 (bodyshop.logo_img_path &&
-                  bodyshop.logo_img_path.headerMargin) ||
+                  bodyshop.logo_img_path.headerMargin &&
+                  bodyshop.logo_img_path.headerMargin > 36) ||
                 "36px",
               marginBottom:
                 (bodyshop.logo_img_path &&
-                  bodyshop.logo_img_path.footerMargin) ||
+                  bodyshop.logo_img_path.footerMargin &&
+                  bodyshop.logo_img_path.footerMargin > 36) ||
                 "36px",
             },
           }),
@@ -142,11 +144,13 @@ export async function RenderTemplates(
             chrome: {
               marginTop:
                 (bodyshop.logo_img_path &&
-                  bodyshop.logo_img_path.headerMargin) ||
+                  bodyshop.logo_img_path.headerMargin &&
+                  bodyshop.logo_img_path.headerMargin > 36) ||
                 "36px",
               marginBottom:
                 (bodyshop.logo_img_path &&
-                  bodyshop.logo_img_path.footerMargin) ||
+                  bodyshop.logo_img_path.footerMargin &&
+                  bodyshop.logo_img_path.footerMargin > 36) ||
                 "36px",
             },
           }),

From f2b2011900d3ebfe14f5f052812860680c6639d3 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Tue, 22 Mar 2022 13:41:06 -0600
Subject: [PATCH 5/8] Ignore custom margins on certain templates.

---
 client/src/utils/RenderTemplate.js    | 43 ++++++++++++++++-----------
 client/src/utils/TemplateConstants.js |  2 ++
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/client/src/utils/RenderTemplate.js b/client/src/utils/RenderTemplate.js
index 9a2201c2f..716322937 100644
--- a/client/src/utils/RenderTemplate.js
+++ b/client/src/utils/RenderTemplate.js
@@ -24,6 +24,7 @@ export default async function RenderTemplate(
   let { contextData, useShopSpecificTemplate } = await fetchContextData(
     templateObject
   );
+  const { ignoreCustomMargins } = Templates[templateObject.name];
 
   let reportRequest = {
     template: {
@@ -34,18 +35,22 @@ export default async function RenderTemplate(
         ? {}
         : {
             recipe: "chrome-pdf",
-            chrome: {
-              marginTop:
-                (bodyshop.logo_img_path &&
+            ...(!ignoreCustomMargins && {
+              chrome: {
+                marginTop:
+                  bodyshop.logo_img_path &&
                   bodyshop.logo_img_path.headerMargin &&
-                  bodyshop.logo_img_path.headerMargin > 36) ||
-                "36px",
-              marginBottom:
-                (bodyshop.logo_img_path &&
+                  bodyshop.logo_img_path.headerMargin > 36
+                    ? bodyshop.logo_img_path.headerMargin
+                    : "36px",
+                marginBottom:
+                  bodyshop.logo_img_path &&
                   bodyshop.logo_img_path.footerMargin &&
-                  bodyshop.logo_img_path.footerMargin > 36) ||
-                "36px",
-            },
+                  bodyshop.logo_img_path.footerMargin > 36
+                    ? bodyshop.logo_img_path.footerMargin
+                    : "36px",
+              },
+            }),
           }),
       ...(renderAsExcel ? { recipe: "html-to-xlsx" } : {}),
     },
@@ -143,15 +148,17 @@ export async function RenderTemplates(
             recipe: "chrome-pdf",
             chrome: {
               marginTop:
-                (bodyshop.logo_img_path &&
-                  bodyshop.logo_img_path.headerMargin &&
-                  bodyshop.logo_img_path.headerMargin > 36) ||
-                "36px",
+                bodyshop.logo_img_path &&
+                bodyshop.logo_img_path.headerMargin &&
+                bodyshop.logo_img_path.headerMargin > 36
+                  ? bodyshop.logo_img_path.headerMargin
+                  : "36px",
               marginBottom:
-                (bodyshop.logo_img_path &&
-                  bodyshop.logo_img_path.footerMargin &&
-                  bodyshop.logo_img_path.footerMargin > 36) ||
-                "36px",
+                bodyshop.logo_img_path &&
+                bodyshop.logo_img_path.footerMargin &&
+                bodyshop.logo_img_path.footerMargin > 36
+                  ? bodyshop.logo_img_path.footerMargin
+                  : "36px",
             },
           }),
       pdfOperations: templateAndData.map((template) => {
diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js
index 6201afada..06f624a4a 100644
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -371,6 +371,7 @@ export const TemplateList = (type, context) => {
             subject: i18n.t("printcenter.jobs.parts_label_single"),
             disabled: false,
             group: "ro",
+            ignoreCustomMargins: true,
           },
           envelope_return_address: {
             title: i18n.t("printcenter.jobs.envelope_return_address"),
@@ -379,6 +380,7 @@ export const TemplateList = (type, context) => {
             key: "envelope_return_address",
             disabled: false,
             group: "ro",
+            ignoreCustomMargins: true,
           },
           sgi_certificate_of_repairs: {
             title: i18n.t("printcenter.jobs.sgi_certificate_of_repairs"),

From 832674662d0ed1143d6a31645b70c84d31733dc7 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Thu, 24 Mar 2022 11:55:48 -0600
Subject: [PATCH 6/8] Autohouse add PVRT to salestax per request.

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

diff --git a/server/data/autohouse.js b/server/data/autohouse.js
index 8e0befe51..76030b5af 100644
--- a/server/data/autohouse.js
+++ b/server/data/autohouse.js
@@ -576,6 +576,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         SalesTaxTotal: Dinero(job.job_totals.totals.local_tax)
           .add(Dinero(job.job_totals.totals.state_tax))
           .add(Dinero(job.job_totals.totals.federal_tax))
+          .add(Dinero(job.job_totals.additional.pvrt))
           .toFormat(AHDineroFormat),
         SalesTaxTotalCost: 0,
         GrossTotal: Dinero(job.job_totals.totals.total_repairs).toFormat(

From 3896a0b03df9954188a35f17bef760ddce7419be Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Thu, 24 Mar 2022 14:54:36 -0600
Subject: [PATCH 7/8] IO-1799 Change from address for emails.

---
 bodyshop_translations.babel                   | 42 +++++++++++++++++++
 .../email-overlay/email-overlay.component.jsx | 35 +++++++++++++++-
 .../email-overlay/email-overlay.container.jsx | 12 +++---
 .../shop-info/shop-info.general.component.jsx | 13 ++++++
 client/src/graphql/bodyshop.queries.js        |  2 +
 client/src/translations/en_us/common.json     |  2 +
 client/src/translations/es/common.json        |  2 +
 client/src/translations/fr/common.json        |  2 +
 hasura/metadata/tables.yaml                   |  2 +
 .../down.sql                                  |  4 ++
 .../up.sql                                    |  2 +
 11 files changed, 111 insertions(+), 7 deletions(-)
 create mode 100644 hasura/migrations/1648154167416_alter_table_public_bodyshops_add_column_md_from_emails/down.sql
 create mode 100644 hasura/migrations/1648154167416_alter_table_public_bodyshops_add_column_md_from_emails/up.sql

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 28764f991..fe1e7a2a0 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -4598,6 +4598,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>md_from_emails</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>md_hour_split</name>
                                         <children>
@@ -13231,6 +13252,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>from</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>subject</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/email-overlay/email-overlay.component.jsx b/client/src/components/email-overlay/email-overlay.component.jsx
index 6826eba76..baf52d376 100644
--- a/client/src/components/email-overlay/email-overlay.component.jsx
+++ b/client/src/components/email-overlay/email-overlay.component.jsx
@@ -16,9 +16,14 @@ import EmailDocumentsComponent from "../email-documents/email-documents.componen
 import _ from "lodash";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
+
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
+  currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -28,7 +33,12 @@ export default connect(
   mapDispatchToProps
 )(EmailOverlayComponent);
 
-export function EmailOverlayComponent({ form, selectedMediaState, bodyshop }) {
+export function EmailOverlayComponent({
+  form,
+  selectedMediaState,
+  bodyshop,
+  currentUser,
+}) {
   const { t } = useTranslation();
   const handleClick = ({ item, key, keyPath }) => {
     const email = item.props.value;
@@ -51,6 +61,27 @@ export function EmailOverlayComponent({ form, selectedMediaState, bodyshop }) {
 
   return (
     <div>
+      <Form.Item
+        label={t("emails.fields.from")}
+        name="from"
+        rules={[
+          {
+            required: true,
+            //message: t("general.validation.required"),
+          },
+        ]}
+      >
+        <Select>
+          <Select.Option key={currentUser.email}>
+            {currentUser.email}
+          </Select.Option>
+          <Select.Option key={bodyshop.email}>{bodyshop.email}</Select.Option>
+          {bodyshop.md_from_emails &&
+            bodyshop.md_from_emails.map((e) => (
+              <Select.Option key={e}>{e}</Select.Option>
+            ))}
+        </Select>
+      </Form.Item>
       <Form.Item
         label={
           <Space>
diff --git a/client/src/components/email-overlay/email-overlay.container.jsx b/client/src/components/email-overlay/email-overlay.container.jsx
index c2dc7d261..9276f35ee 100644
--- a/client/src/components/email-overlay/email-overlay.container.jsx
+++ b/client/src/components/email-overlay/email-overlay.container.jsx
@@ -56,13 +56,9 @@ export function EmailOverlayContainer({
         : bodyshop.shopname,
       address: EmailSettings.fromAddress,
     },
-    ReplyTo: {
-      Email: currentUser.validemail ? currentUser.email : bodyshop.email,
-      Name: currentUser.displayName,
-    },
   };
 
-  const handleFinish = async (values) => {
+  const handleFinish = async (allValues) => {
     logImEXEvent("email_send_from_modal");
 
     //const attachments = [];
@@ -77,10 +73,15 @@ export function EmailOverlayContainer({
     //     attachments.push(t);
     //   });
 
+    const { from, ...values } = allValues;
     setSending(true);
     try {
       await axios.post("/sendemail", {
         ...defaultEmailFrom,
+        ReplyTo: {
+          Email: from,
+          Name: currentUser.displayName,
+        },
         ...values,
         html: rawHtml,
         attachments: [
@@ -138,6 +139,7 @@ export function EmailOverlayContainer({
     }
 
     form.setFieldsValue({
+      from: currentUser.validemail ? currentUser.email : bodyshop.email,
       ...emailConfig.messageOptions,
       cc:
         emailConfig.messageOptions.cc &&
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 29288b9ee..186234adf 100644
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -507,6 +507,19 @@ export default function ShopInfoGeneral({ form }) {
         >
           <Switch />
         </Form.Item>
+        <Form.Item
+          name={["md_from_emails"]}
+          label={t("bodyshop.fields.md_from_emails")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+              type: "array",
+            },
+          ]}
+        >
+          <Select mode="tags" />
+        </Form.Item>
         <Form.Item
           name={["md_email_cc", "parts_order"]}
           label={t("bodyshop.fields.md_email_cc", { template: "parts_order" })}
diff --git a/client/src/graphql/bodyshop.queries.js b/client/src/graphql/bodyshop.queries.js
index 88f9b7bec..0ce955c15 100644
--- a/client/src/graphql/bodyshop.queries.js
+++ b/client/src/graphql/bodyshop.queries.js
@@ -102,6 +102,7 @@ export const QUERY_BODYSHOP = gql`
       md_email_cc
       timezone
       ss_configuration
+      md_from_emails
       employees {
         user_email
         id
@@ -201,6 +202,7 @@ export const UPDATE_SHOP = gql`
         md_email_cc
         timezone
         ss_configuration
+        md_from_emails
         employees {
           id
           first_name
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 595bd958f..0c456db00 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -285,6 +285,7 @@
 				"md_classes": "Classes",
 				"md_ded_notes": "Deductible Notes",
 				"md_email_cc": "Auto Email CC: $t(printcenter.subjects.jobs.{{template}})",
+				"md_from_emails": "Additional From Emails",
 				"md_hour_split": {
 					"paint": "Paint Hour Split",
 					"prep": "Prep Hour Split"
@@ -830,6 +831,7 @@
 			},
 			"fields": {
 				"cc": "CC",
+				"from": "From",
 				"subject": "Subject",
 				"to": "To"
 			},
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 3d3c44a0d..ea698ce2a 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -285,6 +285,7 @@
 				"md_classes": "",
 				"md_ded_notes": "",
 				"md_email_cc": "",
+				"md_from_emails": "",
 				"md_hour_split": {
 					"paint": "",
 					"prep": ""
@@ -830,6 +831,7 @@
 			},
 			"fields": {
 				"cc": "",
+				"from": "",
 				"subject": "",
 				"to": ""
 			},
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index d44d11e95..70f0141b2 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -285,6 +285,7 @@
 				"md_classes": "",
 				"md_ded_notes": "",
 				"md_email_cc": "",
+				"md_from_emails": "",
 				"md_hour_split": {
 					"paint": "",
 					"prep": ""
@@ -830,6 +831,7 @@
 			},
 			"fields": {
 				"cc": "",
+				"from": "",
 				"subject": "",
 				"to": ""
 			},
diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index 8473f5887..52650b30f 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -834,6 +834,7 @@
       - md_email_cc
       - md_estimators
       - md_filehandlers
+      - md_from_emails
       - md_hour_split
       - md_ins_cos
       - md_jobline_presets
@@ -916,6 +917,7 @@
       - md_email_cc
       - md_estimators
       - md_filehandlers
+      - md_from_emails
       - md_hour_split
       - md_ins_cos
       - md_jobline_presets
diff --git a/hasura/migrations/1648154167416_alter_table_public_bodyshops_add_column_md_from_emails/down.sql b/hasura/migrations/1648154167416_alter_table_public_bodyshops_add_column_md_from_emails/down.sql
new file mode 100644
index 000000000..00a90c958
--- /dev/null
+++ b/hasura/migrations/1648154167416_alter_table_public_bodyshops_add_column_md_from_emails/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."bodyshops" add column "md_from_emails" jsonb
+--  null default jsonb_build_array();
diff --git a/hasura/migrations/1648154167416_alter_table_public_bodyshops_add_column_md_from_emails/up.sql b/hasura/migrations/1648154167416_alter_table_public_bodyshops_add_column_md_from_emails/up.sql
new file mode 100644
index 000000000..108bbd7e8
--- /dev/null
+++ b/hasura/migrations/1648154167416_alter_table_public_bodyshops_add_column_md_from_emails/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "md_from_emails" jsonb
+ null default jsonb_build_array();

From fb380a5b31f97ff5e3cfadeed60ca2d5291f8cd1 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Thu, 24 Mar 2022 15:40:25 -0600
Subject: [PATCH 8/8] IO-1799 Mark md_from_email

---
 .../shop-info/shop-info.general.component.jsx       | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

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 186234adf..3b2b748a0 100644
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -510,13 +510,12 @@ export default function ShopInfoGeneral({ form }) {
         <Form.Item
           name={["md_from_emails"]}
           label={t("bodyshop.fields.md_from_emails")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-              type: "array",
-            },
-          ]}
+          // rules={[
+          //   {
+          //     //message: t("general.validation.required"),
+          //     type: "array",
+          //   },
+          // ]}
         >
           <Select mode="tags" />
         </Form.Item>