From c9fb2bc07415af612ccf5dc0fc203579ea59c824 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Thu, 25 Feb 2021 15:57:45 -0800
Subject: [PATCH] Included subject on document generation

---
 .../job-3rd-party-modal.component.jsx               |  2 +-
 .../parts-order-modal.container.jsx                 | 13 ++++++++-----
 .../payment-modal/payment-modal.container.jsx       |  5 +++--
 .../payment-list-paginated.component.jsx            |  5 +++--
 .../print-center-item.component.jsx                 |  2 +-
 client/src/utils/TemplateConstants.js               |  9 +--------
 6 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx b/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx
index a27d7a68f..f6a069ad7 100644
--- a/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx
+++ b/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx
@@ -48,7 +48,7 @@ export function Jobd3RdPartyModal({ bodyshop, jobId }) {
         variables: { id: jobId },
         context: restVals,
       },
-      {},
+      { subject: TemplateList("job_special").thirdpartypayer.subject },
       sendtype
     );
   };
diff --git a/client/src/components/parts-order-modal/parts-order-modal.container.jsx b/client/src/components/parts-order-modal/parts-order-modal.container.jsx
index 713784a37..bd9a341f5 100644
--- a/client/src/components/parts-order-modal/parts-order-modal.container.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal.container.jsx
@@ -156,6 +156,7 @@ export function PartsOrderModalContainer({
 
     if (refetch) refetch();
     toggleModalVisible();
+    const Templates = TemplateList("partsorder");
 
     if (sendType === "e") {
       const matchingVendor = data.vendors.filter(
@@ -165,8 +166,8 @@ export function PartsOrderModalContainer({
       GenerateDocument(
         {
           name: isReturn
-            ? TemplateList("partsorder").parts_return_slip.key
-            : TemplateList("partsorder").parts_order.key,
+            ? Templates.parts_return_slip.key
+            : Templates.parts_order.key,
           variables: {
             id: insertResult.data.insert_parts_orders.returning[0].id,
           },
@@ -174,7 +175,9 @@ export function PartsOrderModalContainer({
         {
           to: matchingVendor ? [matchingVendor.email] : null,
           replyTo: bodyshop.email,
-          subject: TemplateList("partsorder", {}).parts_order.subject,
+          subject: isReturn
+            ? Templates.parts_return_slip.subject
+            : Templates.parts_order.subject,
         },
         "e"
       );
@@ -182,8 +185,8 @@ export function PartsOrderModalContainer({
       GenerateDocument(
         {
           name: isReturn
-            ? TemplateList("partsorder").parts_return_slip.key
-            : TemplateList("partsorder").parts_order.key,
+            ? Templates.parts_return_slip.key
+            : Templates.parts_order.key,
           variables: {
             id: insertResult.data.insert_parts_orders.returning[0].id,
           },
diff --git a/client/src/components/payment-modal/payment-modal.container.jsx b/client/src/components/payment-modal/payment-modal.container.jsx
index d93f5dfc9..33138d605 100644
--- a/client/src/components/payment-modal/payment-modal.container.jsx
+++ b/client/src/components/payment-modal/payment-modal.container.jsx
@@ -118,10 +118,10 @@ function BillEnterModalContainer({
         } else {
           notification["error"]({ message: t("payments.errors.payment") });
         }
-
+        const Templates = TemplateList("payment");
         GenerateDocument(
           {
-            name: TemplateList("payment").payment_receipt.key,
+            name: Templates.payment_receipt.key,
             variables: {
               id: newPayment.data.insert_payments.returning[0].id,
             },
@@ -129,6 +129,7 @@ function BillEnterModalContainer({
           {
             // to: [appData.email],
             replyTo: bodyshop.email,
+            subject: Templates.payment_receipt.subject,
           },
           sendby === "email" ? "e" : "p"
         );
diff --git a/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx b/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx
index e6a837199..5fe5ab0d8 100644
--- a/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx
+++ b/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx
@@ -36,7 +36,7 @@ export function PaymentsListPaginated({
     sortedInfo: {},
     filteredInfo: { text: "" },
   });
-
+  const Templates = TemplateList("payment");
   const { t } = useTranslation();
   const columns = [
     {
@@ -156,9 +156,10 @@ export function PaymentsListPaginated({
           </Button>
           <PrintWrapperComponent
             templateObject={{
-              name: TemplateList("payment").payment_receipt.key,
+              name: Templates.payment_receipt.key,
               variables: { id: record.id },
             }}
+            messageObject={{ subject: Templates.payment_receipt.subject }}
           />
         </Space>
       ),
diff --git a/client/src/components/print-center-item/print-center-item.component.jsx b/client/src/components/print-center-item/print-center-item.component.jsx
index ed369f17f..204383813 100644
--- a/client/src/components/print-center-item/print-center-item.component.jsx
+++ b/client/src/components/print-center-item/print-center-item.component.jsx
@@ -50,7 +50,7 @@ export function PrintCenterItemComponent({
               name: item.key,
               variables: { id: id },
             },
-            { to: context.job && context.job.ownr_ea },
+            { to: context.job && context.job.ownr_ea, subject: item.subject },
             "e"
           );
         }}
diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js
index 61c23a049..72cd46721 100644
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -201,14 +201,7 @@ export const TemplateList = (type, context) => {
             description: "Parts Order",
             key: "parts_order",
             subject: `${bodyshop && bodyshop.shopname} Parts Order ${
-              (context &&
-                context &&
-                context.job &&
-                context.job &&
-                context &&
-                context.job &&
-                context.job.ro_number) ||
-              ""
+              (context && context.job && context.job.ro_number) || ""
             }`,
             disabled: false,
           },