From cd6866fc5c00ced75328326a87a2cdc5c120f4d0 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Thu, 18 Feb 2021 11:37:01 -0800
Subject: [PATCH] Resolve stripe issues on export IO-490

---
 bodyshop_translations.babel                   | 23 ++++++++++++++++++-
 .../job-checklist-form.component.jsx          |  6 +++--
 .../shop-employees-list.component.jsx         |  6 +----
 client/src/graphql/bodyshop.queries.js        |  2 +-
 .../pages/manage/manage.page.component.jsx    |  5 +++-
 client/src/translations/en_us/common.json     |  3 ++-
 client/src/translations/es/common.json        |  3 ++-
 client/src/translations/fr/common.json        |  3 ++-
 server/accounting/qbxml/qbxml-payments.js     |  3 +--
 9 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 4d4b34426..7bbc85efc 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -23448,6 +23448,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>exporting-partner</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>
diff --git a/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx b/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx
index ca8f89860..0a436cf16 100644
--- a/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx
+++ b/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx
@@ -57,7 +57,9 @@ export function JobChecklistForm({
           ...(type === "intake" && {
             scheduled_completion: values.scheduled_completion,
           }),
-
+          ...(type === "deliver" && {
+            actual_completion: values.actual_completion,
+          }),
           [(type === "intake" && "intakechecklist") ||
           (type === "deliver" && "deliverchecklist")]: {
             ...values,
@@ -154,7 +156,7 @@ export function JobChecklistForm({
       {type === "deliver" && (
         <div>
           <Form.Item
-            name="actualCompletion"
+            name="actual_completion"
             label={t("jobs.fields.actual_completion")}
             rules={[
               {
diff --git a/client/src/components/shop-employees/shop-employees-list.component.jsx b/client/src/components/shop-employees/shop-employees-list.component.jsx
index 029ca22c5..c314d00d3 100644
--- a/client/src/components/shop-employees/shop-employees-list.component.jsx
+++ b/client/src/components/shop-employees/shop-employees-list.component.jsx
@@ -32,11 +32,7 @@ export default function ShopEmployeesListComponent({
       dataIndex: "last_name",
       key: "last_name",
     },
-    {
-      title: t("employees.fields.cost_center"),
-      dataIndex: "cost_center",
-      key: "cost_center",
-    },
+
     {
       title: t("employees.fields.base_rate"),
       dataIndex: "base_rate",
diff --git a/client/src/graphql/bodyshop.queries.js b/client/src/graphql/bodyshop.queries.js
index 9379f40af..1d2f86fa9 100644
--- a/client/src/graphql/bodyshop.queries.js
+++ b/client/src/graphql/bodyshop.queries.js
@@ -198,7 +198,7 @@ export const QUERY_DELIVER_CHECKLIST = gql`
 `;
 export const QUERY_STRIPE_ID = gql`
   query QUERY_STRIPE_ID {
-    bodyshops {
+    bodyshops(where: { associations: { active: { _eq: true } } }) {
       stripe_acct_id
     }
   }
diff --git a/client/src/pages/manage/manage.page.component.jsx b/client/src/pages/manage/manage.page.component.jsx
index 1149faefb..5b0741f9a 100644
--- a/client/src/pages/manage/manage.page.component.jsx
+++ b/client/src/pages/manage/manage.page.component.jsx
@@ -148,9 +148,12 @@ const { Content, Header } = Layout;
 
 const stripePromise = new Promise((resolve, reject) => {
   client.query({ query: QUERY_STRIPE_ID }).then((resp) => {
+    console.log(resp);
+
     resolve(
       loadStripe(process.env.REACT_APP_STRIPE_PUBLIC_KEY, {
-        stripeAccount: resp.data.bodyshops[0].stripe_acct_id || "",
+        stripeAccount:
+          resp.data.bodyshops[0].stripe_acct_id || "No Stripe Id Resolve",
       })
     );
   });
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 4a1d5c9bc..ba2d51802 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1423,7 +1423,8 @@
 		},
 		"payments": {
 			"errors": {
-				"exporting": "Error exporting payment(s). {{error}}"
+				"exporting": "Error exporting payment(s). {{error}}",
+				"exporting-partner": "Error exporting to partner. Please check the partner interaction log for more errors."
 			},
 			"fields": {
 				"amount": "Amount",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 8be8c1397..3dd79dc60 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1423,7 +1423,8 @@
 		},
 		"payments": {
 			"errors": {
-				"exporting": ""
+				"exporting": "",
+				"exporting-partner": ""
 			},
 			"fields": {
 				"amount": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 614ff696a..3b984923e 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1423,7 +1423,8 @@
 		},
 		"payments": {
 			"errors": {
-				"exporting": ""
+				"exporting": "",
+				"exporting-partner": ""
 			},
 			"fields": {
 				"amount": "",
diff --git a/server/accounting/qbxml/qbxml-payments.js b/server/accounting/qbxml/qbxml-payments.js
index 2eb4086b1..f9d75f842 100644
--- a/server/accounting/qbxml/qbxml-payments.js
+++ b/server/accounting/qbxml/qbxml-payments.js
@@ -110,8 +110,7 @@ const generatePayment = (payment) => {
                   payment.job.bodyshop.md_responsibility_centers.ar.accountname,
               },
               TxnDate: moment(payment.date).format("YYYY-MM-DD"), //Trim String
-              RefNumber:
-                payment.paymentnum || payment.stripeid || payment.transactionid,
+              RefNumber: payment.paymentnum || payment.transactionid,
               TotalAmount: Dinero({
                 amount: Math.round(payment.amount * 100),
               }).toFormat(DineroQbFormat),