From 2e40583d3122550a05f61257a2c8ae4f69d63394 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Thu, 2 Feb 2023 10:08:55 -0800
Subject: [PATCH] IO-2164 IO-2163 Additional GSR reports.

---
 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     | 26 ++++++++++++++
 5 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 31b23d3e4..6c65bd587 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
@@ -40880,6 +40880,48 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>gsr_by_atp</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>gsr_by_category</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>gsr_by_csr</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 8d25b3339..23f24f79d 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -2425,6 +2425,8 @@
 				"export_payables": "Export Log - Payables",
 				"export_payments": "Export Log - Payments",
 				"export_receivables": "Export Log - Receivables",
+				"gsr_by_atp": "Gross Sales by ATP",
+				"gsr_by_category": "Gross Sales by Category",
 				"gsr_by_csr": "Gross Sales by CSR",
 				"gsr_by_delivery_date": "Gross Sales by Delivery Date",
 				"gsr_by_estimator": "Gross Sales by Estimator",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 359d844a2..10385ab2e 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -2425,6 +2425,8 @@
 				"export_payables": "",
 				"export_payments": "",
 				"export_receivables": "",
+				"gsr_by_atp": "",
+				"gsr_by_category": "",
 				"gsr_by_csr": "",
 				"gsr_by_delivery_date": "",
 				"gsr_by_estimator": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 78f2d8777..ee9ffb395 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -2425,6 +2425,8 @@
 				"export_payables": "",
 				"export_payments": "",
 				"export_receivables": "",
+				"gsr_by_atp": "",
+				"gsr_by_category": "",
 				"gsr_by_csr": "",
 				"gsr_by_delivery_date": "",
 				"gsr_by_estimator": "",
diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js
index a53040f0f..8869a5b2c 100644
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -1343,6 +1343,32 @@ export const TemplateList = (type, context) => {
             },
             group: "sales",
           },
+          gsr_by_category: {
+            title: i18n.t("reportcenter.templates.gsr_by_category"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.gsr_by_category"),
+            key: "gsr_by_category",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "sales",
+          },
+          gsr_by_atp: {
+            title: i18n.t("reportcenter.templates.gsr_by_atp"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.gsr_by_atp"),
+            key: "gsr_by_atp",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "sales",
+          },
           gsr_labor_only: {
             title: i18n.t("reportcenter.templates.gsr_labor_only"),
             description: "",