From 3439f09d9a898084fd14a536c07d42ba4a288607 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Wed, 16 Mar 2022 11:47:32 -0700
Subject: [PATCH 1/2] IO-1693 Allow 0 line supplements.

---
 .../jobs-available-supplement.estlines.util.js      |  8 +++++++-
 .../jobs-available-table.container.jsx              | 13 +++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/client/src/components/jobs-available-table/jobs-available-supplement.estlines.util.js b/client/src/components/jobs-available-table/jobs-available-supplement.estlines.util.js
index c3cd83c54..fea46d8d9 100644
--- a/client/src/components/jobs-available-table/jobs-available-supplement.estlines.util.js
+++ b/client/src/components/jobs-available-table/jobs-available-supplement.estlines.util.js
@@ -37,7 +37,6 @@ export const GetSupplementDelta = async (client, jobId, newLines) => {
   });
 
   //Wahtever is left in the existing lines, are lines that should be removed.
-
   const insertQueries = linesToInsert.reduce((acc, value, idx) => {
     return acc + generateInsertQuery(value, idx, jobId);
   }, "");
@@ -49,6 +48,13 @@ export const GetSupplementDelta = async (client, jobId, newLines) => {
   const removeQueries = existingLines.reduce((acc, value, idx) => {
     return acc + generateRemoveQuery(value, idx);
   }, "");
+  console.log(insertQueries, updateQueries, removeQueries);
+
+  if ((insertQueries + updateQueries + removeQueries).trim() === "") {
+    return new Promise((resolve, reject) => {
+      resolve(null);
+    });
+  }
 
   return new Promise((resolve, reject) => {
     resolve(gql`
diff --git a/client/src/components/jobs-available-table/jobs-available-table.container.jsx b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
index 9f2b3fd08..1287e288c 100644
--- a/client/src/components/jobs-available-table/jobs-available-table.container.jsx
+++ b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
@@ -220,12 +220,13 @@ export function JobsAvailableContainer({
       );
 
       delete supp.joblines;
-      await client.mutate({
-        mutation: gql`
-          ${suppDelta}
-        `,
-      });
-
+      if (suppDelta !== null) {
+        await client.mutate({
+          mutation: gql`
+            ${suppDelta}
+          `,
+        });
+      }
       const updateResult = await updateJob({
         variables: {
           jobId: selectedJob,

From 9c39c8d59b7c7096ba1ae528cbf6f4faf747935a Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Wed, 16 Mar 2022 13:53:30 -0700
Subject: [PATCH 2/2] Add header and footer margins.

---
 bodyshop_translations.babel                   | 44 ++++++++++++++++++-
 .../shop-info/shop-info.general.component.jsx | 12 +++++
 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, 61 insertions(+), 1 deletion(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index d82244e68..dee3450e9 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
@@ -4388,6 +4388,48 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>logo_img_footer_margin</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>logo_img_header_margin</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>logo_img_path</name>
                                         <definition_loaded>false</definition_loaded>
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 603ef790f..29288b9ee 100644
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -142,6 +142,18 @@ export default function ShopInfoGeneral({ form }) {
         >
           <Input />
         </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.logo_img_header_margin")}
+          name={["logo_img_path", "headerMargin"]}
+        >
+          <InputNumber min={0} />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.logo_img_footer_margin")}
+          name={["logo_img_path", "footerMargin"]}
+        >
+          <InputNumber min={0} />
+        </Form.Item>
       </LayoutFormRow>
       <LayoutFormRow header={t("bodyshop.labels.accountingsetup")}>
         <Form.Item
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index e8cb5b900..1457b7eb1 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -275,6 +275,8 @@
 					"mash": "Job Costing - Shop Materials Hourly Cost Rate"
 				},
 				"lastnumberworkingdays": "Scoreboard - Last Number of Working Days",
+				"logo_img_footer_margin": "Footer Margin (px)",
+				"logo_img_header_margin": "Header Margin (px)",
 				"logo_img_path": "Shop Logo",
 				"logo_img_path_height": "Logo Image Height",
 				"logo_img_path_width": "Logo Image Width",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index e00010111..6a0cb1e76 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -275,6 +275,8 @@
 					"mash": ""
 				},
 				"lastnumberworkingdays": "",
+				"logo_img_footer_margin": "",
+				"logo_img_header_margin": "",
 				"logo_img_path": "",
 				"logo_img_path_height": "",
 				"logo_img_path_width": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 99306174b..ece3097ef 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -275,6 +275,8 @@
 					"mash": ""
 				},
 				"lastnumberworkingdays": "",
+				"logo_img_footer_margin": "",
+				"logo_img_header_margin": "",
 				"logo_img_path": "",
 				"logo_img_path_height": "",
 				"logo_img_path_width": "",