From 2e763f1dd5685762c324e1fca4fb99ad7f36dcb1 Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@thinkimex.com>
Date: Wed, 9 Aug 2023 20:14:44 -0700
Subject: [PATCH] Minor updates to intellipay processing.

---
 .../card-payment-modal.component..jsx         |  6 ++--
 .../job-payments/job-payments.component.jsx   |  1 +
 client/src/graphql/jobs.queries.js            |  1 -
 client/src/graphql/payments.queries.js        |  9 ++++++
 client/src/translations/en_us/common.json     | 28 -------------------
 server/intellipay/intellipay.js               | 11 ++++----
 6 files changed, 19 insertions(+), 37 deletions(-)

diff --git a/client/src/components/card-payment-modal/card-payment-modal.component..jsx b/client/src/components/card-payment-modal/card-payment-modal.component..jsx
index 8e19c2a61..c34c201e2 100644
--- a/client/src/components/card-payment-modal/card-payment-modal.component..jsx
+++ b/client/src/components/card-payment-modal/card-payment-modal.component..jsx
@@ -136,10 +136,10 @@ const CardPaymentModalComponent = ({
       },
       update(cache, { data }) {
         cache.modify({
-          id: cache.identify({ id: jobid, __typename: "jobs" }),
+          id: cache.identify({ id: values.jobid, __typename: "jobs" }),
           fields: {
-            payments(payments) {
-              return [...data.insert_payments.returning, ...payments];
+            payments(cachedPayments) {
+              return [...data.insert_payments.returning, ...cachedPayments];
             },
           },
         });
diff --git a/client/src/components/job-payments/job-payments.component.jsx b/client/src/components/job-payments/job-payments.component.jsx
index 65943905d..9c85faf6a 100644
--- a/client/src/components/job-payments/job-payments.component.jsx
+++ b/client/src/components/job-payments/job-payments.component.jsx
@@ -209,6 +209,7 @@ export function JobPayments({
           >
             {t("menus.header.enterpayment")}
           </Button>
+        
           <Button
             onClick={() =>
               setCardPaymentContext({
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index afffecc3c..be7fc56fe 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -747,7 +747,6 @@ export const GET_JOB_BY_PK = gql`
         amount
         payer
         created_at
-        stripeid
         transactionid
         memo
         date
diff --git a/client/src/graphql/payments.queries.js b/client/src/graphql/payments.queries.js
index 98614f53f..bc14d14f1 100644
--- a/client/src/graphql/payments.queries.js
+++ b/client/src/graphql/payments.queries.js
@@ -5,6 +5,15 @@ export const INSERT_NEW_PAYMENT = gql`
     insert_payments(objects: $paymentInput) {
       returning {
         id
+        jobid
+        amount
+        payer
+        created_at
+        transactionid
+        memo
+        date
+        type
+        exportedat
       }
     }
   }
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 9c980db76..54c0fda80 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -64,7 +64,6 @@
         "severalerrorsfound": "Several jobs have issues which may prevent accurate smart scheduling. Click to expand.",
         "smartscheduling": "Smart Scheduling",
         "smspaymentreminder": "This is {{shopname}} reminding you about your remaining balance of {{amount}}. To pay for the said balance click the link {{payment_link}}. Thank you very much.",
-				"smspaymentreminder": "",
         "suggesteddates": "Suggested Dates"
       },
       "successes": {
@@ -107,7 +106,6 @@
         "billposted": "Bill with invoice number {{invoice_number}} posted.",
         "billupdated": "Bill with invoice number {{invoice_number}} updated.",
         "failedpayment": "Failed payment",
-				"failedpayment": "",
         "jobassignmentchange": "Employee {{name}} assigned to {{operation}}",
         "jobassignmentremoved": "Employee assignment removed for {{operation}}",
         "jobchecklist": "Checklist type \"{{type}}\" completed.  In production set to {{inproduction}}.  Status set to {{status}}.",
@@ -1215,30 +1213,6 @@
         "transactionid": "Transaction ID"
       }
     },
-		"job_payments": {
-			"buttons": {
-				"goback": "",
-				"proceedtopayment": "",
-				"refundpayment": ""
-			},
-			"notifications": {
-				"error": {
-					"description": "",
-					"title": ""
-				}
-			},
-			"titles": {
-				"amount": "",
-				"dateOfPayment": "",
-				"descriptions": "",
-				"payer": "",
-				"payername": "",
-				"paymentid": "",
-				"paymenttype": "",
-				"refundamount": "",
-				"transactionid": ""
-			}
-		},
     "joblines": {
       "actions": {
         "converttolabor": "Convert amount to Labor.",
@@ -1953,7 +1927,6 @@
         "dashboard": "Dashboard",
         "enterbills": "Enter Bills",
         "entercardpayment": "Enter Card Payments",
-				"entercardpayment": "",
         "enterpayment": "Enter Payments",
         "entertimeticket": "Enter Time Tickets",
         "export": "Export",
@@ -1966,7 +1939,6 @@
         "owners": "Owners",
         "parts-queue": "Parts Queue",
         "paymentremindersms": "Send Payment Reminder via SMS",
-				"paymentremindersms": "",
         "phonebook": "Phonebook",
         "productionboard": "Production Board - Visual",
         "productionlist": "Production Board - List",
diff --git a/server/intellipay/intellipay.js b/server/intellipay/intellipay.js
index 367303926..3acf796b5 100644
--- a/server/intellipay/intellipay.js
+++ b/server/intellipay/intellipay.js
@@ -20,8 +20,8 @@ const getShopCredentials = async (bodyshop) => {
   // Development only
   if (process.env.NODE_ENV === undefined) {
     return {
-      merchantkey: process.env.DEV_INTELLIPAY_MERCHANTKEY,
-      apikey: process.env.DEV_INTELLIPAY_APIKEY,
+      merchantkey: process.env.INTELLIPAY_MERCHANTKEY,
+      apikey: process.env.INTELLIPAY_APIKEY,
     };
   }
 
@@ -47,9 +47,10 @@ exports.lightbox_credentials = async (req, res) => {
       data: qs.stringify({
         ...shopCredentials,
         operatingenv:
-          process.env.NODE_ENV === undefined
-            ? process.env.NODE_ENV
-            : "businessattended",
+          // process.env.NODE_ENV === undefined
+          //   ? process.env.NODE_ENV
+          //   :
+          "businessattended",
       }),
       url: `https://${domain}.cpteller.com/api/custapi.cfc?method=autoterminal`,
     };