From a5512588952b09e07e2298424fff4230dd104a72 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Mon, 26 Dec 2022 10:33:47 -0800
Subject: [PATCH 1/2] IO-2129 Add reports to report center.

---
 bodyshop_translations.babel               | 44 ++++++++++++++++++++++-
 client/src/translations/en_us/common.json |  2 ++
 client/src/translations/es/common.json    |  2 ++
 client/src/translations/fr/common.json    |  2 ++
 client/src/utils/TemplateConstants.js     | 32 +++++++++++++++++
 5 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index fce81ae47..6cd6a8469 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project version="1.2" be_version="2.7.1">
+<babeledit_project be_version="2.7.1" version="1.2">
     <!--
 
     BabelEdit project file
@@ -42077,6 +42077,48 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>returns_grouped_by_vendor_detailed</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>returns_grouped_by_vendor_summary</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>schedule</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 7fd3e1f2e..6abca68d5 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -2482,6 +2482,8 @@
 				"purchases_by_vendor_summary_date_range": "Purchases by Vendor - Summary",
 				"purchases_grouped_by_vendor_detailed": "Purchases Grouped by Vendor - Detailed",
 				"purchases_grouped_by_vendor_summary": "Purchases Grouped by Vendor - Summary",
+				"returns_grouped_by_vendor_detailed": "Returns Grouped by Vendor - Detailed",
+				"returns_grouped_by_vendor_summary": "Returns Grouped by Vendor - Summary",
 				"schedule": "Appointment Schedule",
 				"scoreboard_detail": "Scoreboard Detail",
 				"scoreboard_summary": "Scoreboard Summary",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 03a825249..16b1a2a93 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -2482,6 +2482,8 @@
 				"purchases_by_vendor_summary_date_range": "",
 				"purchases_grouped_by_vendor_detailed": "",
 				"purchases_grouped_by_vendor_summary": "",
+				"returns_grouped_by_vendor_detailed": "",
+				"returns_grouped_by_vendor_summary": "",
 				"schedule": "",
 				"scoreboard_detail": "",
 				"scoreboard_summary": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 7557faf8a..d11e9091a 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -2482,6 +2482,8 @@
 				"purchases_by_vendor_summary_date_range": "",
 				"purchases_grouped_by_vendor_detailed": "",
 				"purchases_grouped_by_vendor_summary": "",
+				"returns_grouped_by_vendor_detailed": "",
+				"returns_grouped_by_vendor_summary": "",
 				"schedule": "",
 				"scoreboard_detail": "",
 				"scoreboard_summary": "",
diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js
index dee451080..d1c5bafb8 100644
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -1702,6 +1702,38 @@ export const TemplateList = (type, context) => {
             },
             group: "jobs",
           },
+          returns_grouped_by_vendor_summary: {
+            title: i18n.t(
+              "reportcenter.templates.returns_grouped_by_vendor_summary"
+            ),
+            subject: i18n.t(
+              "reportcenter.templates.returns_grouped_by_vendor_summary"
+            ),
+            key: "returns_grouped_by_vendor_summary",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.parts_orders"),
+              field: i18n.t("parts_orders.fields.order_date"),
+            },
+            group: "jobs",
+          },
+          returns_grouped_by_vendor_detailed: {
+            title: i18n.t(
+              "reportcenter.templates.returns_grouped_by_vendor_detailed"
+            ),
+            subject: i18n.t(
+              "reportcenter.templates.returns_grouped_by_vendor_detailed"
+            ),
+            key: "returns_grouped_by_vendor_detailed",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.parts_orders"),
+              field: i18n.t("parts_orders.fields.order_date"),
+            },
+            group: "jobs",
+          },
         }
       : {}),
     ...(!type || type === "courtesycarcontract"

From b0755a0cdef045f0b07f981cb3b7d5a7fc308c56 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Tue, 27 Dec 2022 13:32:24 -0800
Subject: [PATCH 2/2] IO-2133 Manual Line Highlighting

---
 client/src/App/App.styles.scss                             | 7 ++++++-
 .../components/job-detail-lines/job-lines.component.jsx    | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/client/src/App/App.styles.scss b/client/src/App/App.styles.scss
index e8389290f..bb4824cd0 100644
--- a/client/src/App/App.styles.scss
+++ b/client/src/App/App.styles.scss
@@ -147,4 +147,9 @@
 //Update row highlighting on production board. 
 .ant-table-tbody > tr.ant-table-row:hover > td {
   background: #eaeaea !important;
-}
\ No newline at end of file
+}
+
+.job-line-manual{
+  color: tomato;
+  font-style: italic;
+}
diff --git a/client/src/components/job-detail-lines/job-lines.component.jsx b/client/src/components/job-detail-lines/job-lines.component.jsx
index 5c0cad744..5097f668c 100644
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -103,6 +103,7 @@ export function JobLinesComponent({
       fixed: "left",
       key: "line_desc",
       sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
+      onCell: (record) => ({ className: record.manual_line && "job-line-manual" }),
       sortOrder:
         state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order,
       ellipsis: true,