IO-2444 update fingerprint JS and re-enable using shop flag.

Merged in release/2023-11-03 (pull request #1043 )
Release/2023 11 03
2023-11-08 12:08:21 -08:00 · 2023-11-03 16:45:23 +00:00 · 2023-11-01 17:28:30 +00:00 · 2023-11-01 10:28:10 -07:00 · 2023-11-01 16:58:32 +00:00 · 2023-10-31 12:36:39 -07:00
112 changed files with 31465 additions and 14064 deletions
--- 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
@@ -1009,27 +1009,6 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
-                                    <concept_node>
-                                        <name>smspaymentreminder</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>suggesteddates</name>
                                        <definition_loaded>false</definition_loaded>
@@ -1474,6 +1453,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
+                                    <concept_node>
+                                        <name>admin_jobuninvoice</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>admin_jobunvoid</name>
                                        <definition_loaded>false</definition_loaded>
@@ -3571,6 +3571,27 @@
                            <folder_node>
                                <name>validation</name>
                                <children>
+                                    <concept_node>
+                                        <name>closingperiod</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>inventoryquantity</name>
                                        <definition_loaded>false</definition_loaded>
@@ -4205,6 +4226,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
+                                    <concept_node>
+                                        <name>closingperiod</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>country</name>
                                        <definition_loaded>false</definition_loaded>
@@ -16165,6 +16207,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
+                                    <concept_node>
+                                        <name>copied</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>copylink</name>
                                        <definition_loaded>false</definition_loaded>
@@ -16501,6 +16564,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
+                                    <concept_node>
+                                        <name>sendbysms</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>senderrortosupport</name>
                                        <definition_loaded>false</definition_loaded>
@@ -19213,6 +19297,27 @@
                                                    </translation>
                                                </translations>
                                            </concept_node>
+                                            <concept_node>
+                                                <name>openingip</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>title</name>
                                                <definition_loaded>false</definition_loaded>
@@ -23689,6 +23794,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
+                                    <concept_node>
+                                        <name>date_void</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>ded_amt</name>
                                        <definition_loaded>false</definition_loaded>
@@ -28469,6 +28595,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
+                                    <concept_node>
+                                        <name>closingperiod</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>contracts</name>
                                        <definition_loaded>false</definition_loaded>
@@ -32879,27 +33026,6 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
-                                    <concept_node>
-                                        <name>paymentremindersms</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>phonebook</name>
                                        <definition_loaded>false</definition_loaded>
@@ -37104,6 +37230,32 @@
                    <folder_node>
                        <name>payments</name>
                        <children>
+                            <folder_node>
+                                <name>actions</name>
+                                <children>
+                                    <concept_node>
+                                        <name>generatepaymentlink</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>
                                <name>errors</name>
                                <children>
@@ -37149,6 +37301,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
+                                    <concept_node>
+                                        <name>inserting</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>
@@ -37621,6 +37794,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
+                                    <concept_node>
+                                        <name>smspaymentreminder</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>title</name>
                                        <definition_loaded>false</definition_loaded>
@@ -40685,6 +40879,27 @@
                                                    </translation>
                                                </translations>
                                            </concept_node>
+                                            <concept_node>
+                                                <name>parts_return_slip</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>sublet_order</name>
                                                <definition_loaded>false</definition_loaded>
@@ -44536,6 +44751,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
+                                    <concept_node>
+                                        <name>work_in_progress_jobs</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>work_in_progress_labour</name>
                                        <definition_loaded>false</definition_loaded>
--- a/client/package-lock.json
+++ b/client/package-lock.json
--- a/client/package.json
+++ b/client/package.json
@@ -7,7 +7,7 @@
    "@apollo/client": "^3.7.9",
    "@asseinfo/react-kanban": "^2.2.0",
    "@craco/craco": "^7.0.0",
-    "@fingerprintjs/fingerprintjs": "^3.3.3",
+    "@fingerprintjs/fingerprintjs": "^3.4.2",
    "@jsreport/browser-client": "^3.1.0",
    "@sentry/react": "^7.40.0",
    "@sentry/tracing": "^7.40.0",
--- a/client/src/components/_test/paymentMethod.jsx
+++ b/client/src/components/_test/paymentMethod.jsx
@@ -1,49 +0,0 @@
-import React from "react";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { logImEXEvent } from "../../firebase/firebase.utils";
-import { setEmailOptions } from "../../redux/email/email.actions";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import { TemplateList } from "../../utils/TemplateConstants";
-
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
-});
-
-const mapDispatchToProps = (dispatch) => ({
-  setEmailOptions: (e) => dispatch(setEmailOptions(e)),
-});
-
-function Test({ bodyshop, setEmailOptions }) {
-  return (
-    <div>
-      <button
-        onClick={() => {
-          setEmailOptions({
-            messageOptions: {
-              to: ["patrickwf@gmail.com"],
-              replyTo: bodyshop.email,
-            },
-            template: {
-              name: TemplateList().parts_order.key,
-              variables: {
-                id: "a7c2d4e1-f519-42a9-a071-c48cf0f22979",
-              },
-            },
-          });
-        }}
-      >
-        send email
-      </button>
-      <button
-        onClick={() => {
-          logImEXEvent("IMEXEVENT", { somethignArThare: 5 });
-        }}
-      >
-        Log an ImEX Event.
-      </button>
-    </div>
-  );
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(Test);
--- a/client/src/components/_test/payment_response.json
+++ b/client/src/components/_test/payment_response.json
@@ -0,0 +1,63 @@
+{
+  "status": 24201299,
+  "custid": 19607899,
+  "paymentid": 24201299,
+  "response": "A",
+  "authcode": "498680",
+  "declinereason": "Approved",
+  "fee": 0,
+  "invoice": "",
+  "account": "john",
+  "amount": 1000,
+  "amountincludesfee": false,
+  "total": 1000,
+  "paymenttype": "C",
+  "methodhint": "VI ***1111",
+  "cardbrand": "Visa",
+  "cardnumdisplay": "***1111",
+  "receiptelements": {
+    "authcode": "498680",
+    "cust_srv_ph_num": "1-555-555-5555",
+    "rcpt_pg_ftr_txt": "Thank You\nPlease Come Again",
+    "rcpt_currency": "USD",
+    "responsecode": "A",
+    "rcpt_pay_mthd": "Visa",
+    "transid": "C00 915799",
+    "merch_disp_nm": "CP Devel Test",
+    "rcpt_input_mthd": "Keyed",
+    "rcpt_pg_hdr_txt": "Welcome!",
+    "rcpt_tran_time": "Thursday February 23 2023, 11:25:36 pm +08",
+    "rcpt_trans_type": "Normal Transaction (Sale)",
+    "message": "Approved",
+    "rcpt_dba_addr": "1234 Storefront Ave\nSome City, UT 84111",
+    "avsdata": "N",
+    "receiptrequirements": "S",
+    "rcpt_cardnum": "************1111",
+    "cv2result": "M",
+    "rfnd_policy_txt": "<b>No Refunds</b>\nStore Credit Only",
+    "labels": {
+      "tranref": "REF#",
+      "tid": "TID",
+      "validationcode": "ValCode",
+      "emvapplicationid": "AID",
+      "emvatc": "ATC",
+      "rcpt_pay_mthd": "Pay Method",
+      "transid": "TransID",
+      "rcpt_input_mthd": "IMode",
+      "emvtsi": "TSI",
+      "emvac": "AC",
+      "rcpt_trans_type": "TranType",
+      "emvapplicationname": "PApp",
+      "visarewards": "RewardsProg"
+    }
+  },
+  "receipttoken": "H4sIAAAAAAAAACXMTQuCMBgA4P/ynh3tw_3dBI/ipQ8NOtRN53QiblpBRfTfCzo/8LwhxGAdZCCwFYoJJFQjI2kvHdGu74lVkgmrWyWNhASW5jW7cB87yHjKKePGJODnxrrnMl7dDTKmEJlSOqV/_N30XPpyj2Eddq57_KKZ8FLzmh_G1VQnVfhjiXGK1XYTc/h8AVOkf4qUAAAA",
+  "call": "card_payment",
+  "nonce": "488b5568-b5c1-4f38-8b2f-3b050f3abb11P",
+  "hmac": "JyPAJ9Yx0SlYBTtqns1OxAFRt+xF3l2UiLPO5zTDRBE=",
+  "paymentreferenceid": "C19607899P24201299",
+  "cardnum": "...1111",
+  "email": "",
+  "nameOnCard": "John Allen",
+  "cardType": "visa"
+}
--- a/client/src/components/_test/test.component.jsx
+++ b/client/src/components/_test/test.component.jsx
@@ -1,9 +0,0 @@
-import React from "react";
-import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
-export default function Test() {
-  return (
-    <div>
-      <QboAuthorizeComponent />
-    </div>
-  );
-}
--- a/client/src/components/_test/test.page.jsx
+++ b/client/src/components/_test/test.page.jsx
@@ -0,0 +1,31 @@
+import { Button } from "antd";
+import React from "react";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { setModalContext } from "../../redux/modals/modals.actions";
+
+const mapStateToProps = createStructuredSelector({});
+
+const mapDispatchToProps = (dispatch) => ({
+  setRefundPaymentContext: (context) =>
+    dispatch(setModalContext({ context: context, modal: "refund_payment" })),
+});
+
+function Test({ setRefundPaymentContext, refundPaymentModal }) {
+  console.log("refundPaymentModal", refundPaymentModal);
+  return (
+    <div>
+      <Button
+        onClick={() =>
+          setRefundPaymentContext({
+            context: {},
+          })
+        }
+      >
+        Open Modal
+      </Button>
+    </div>
+  );
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(Test);
--- a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
+++ b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
@@ -37,8 +37,8 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
  toggleModalVisible: () => dispatch(toggleModalVisible("billEnter")),
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, billid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, billid, operation })),
 });

 const Templates = TemplateList("job_special");
@@ -143,7 +143,7 @@ function BillEnterModalContainer({
          },
        ],
      },
-      refetchQueries: ["QUERY_PARTS_BILLS_BY_JOBID"],
+      refetchQueries: ["QUERY_PARTS_BILLS_BY_JOBID", "GET_JOB_BY_PK"],
    });

    const adjKeys = Object.keys(adjustmentsToInsert);
@@ -316,7 +316,9 @@ function BillEnterModalContainer({
    insertAuditTrail({
      jobid: values.jobid,
      billid: billId,
-      operation: AuditTrailMapping.billposted(remainingValues.invoice_number),
+      operation: AuditTrailMapping.billposted(
+        r1.data.insert_bills.returning[0].invoice_number
+      ),
    });

    if (enterAgain) {
--- a/client/src/components/bill-form/bill-form.component.jsx
+++ b/client/src/components/bill-form/bill-form.component.jsx
@@ -50,6 +50,7 @@ export function BillFormComponent({
  job,
  loadOutstandingReturns,
  loadInventory,
+  preferredMake,
 }) {
  const { t } = useTranslation();
  const client = useApolloClient();
@@ -185,6 +186,7 @@ export function BillFormComponent({
          <VendorSearchSelect
            disabled={disabled}
            options={vendorAutoCompleteOptions}
+            preferredMake={preferredMake}
            onSelect={handleVendorSelect}
          />
        </Form.Item>
--- a/client/src/components/bill-form/bill-form.container.jsx
+++ b/client/src/components/bill-form/bill-form.container.jsx
@@ -1,16 +1,16 @@
 import { useLazyQuery, useQuery } from "@apollo/client";
+import { useTreatments } from "@splitsoftware/splitio-react";
 import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { QUERY_OUTSTANDING_INVENTORY } from "../../graphql/inventory.queries";
 import { GET_JOB_LINES_TO_ENTER_BILL } from "../../graphql/jobs-lines.queries";
+import { QUERY_UNRECEIVED_LINES } from "../../graphql/parts-orders.queries";
 import { SEARCH_VENDOR_AUTOCOMPLETE } from "../../graphql/vendors.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import BillFormComponent from "./bill-form.component";
 import BillCmdReturnsTableComponent from "../bill-cm-returns-table/bill-cm-returns-table.component";
-import { QUERY_UNRECEIVED_LINES } from "../../graphql/parts-orders.queries";
 import BillInventoryTable from "../bill-inventory-table/bill-inventory-table.component";
-import { QUERY_OUTSTANDING_INVENTORY } from "../../graphql/inventory.queries";
-import { useTreatments } from "@splitsoftware/splitio-react";
+import BillFormComponent from "./bill-form.component";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -59,6 +59,7 @@ export function BillFormContainer({
        disableInvNumber={disableInvNumber}
        loadOutstandingReturns={loadOutstandingReturns}
        loadInventory={loadInventory}
+        preferredMake={lineData ? lineData.jobs_by_pk.v_make_desc : null}
      />
      {!billEdit && (
        <BillCmdReturnsTableComponent
--- a/client/src/components/card-payment-modal/card-payment-modal.component..jsx
+++ b/client/src/components/card-payment-modal/card-payment-modal.component..jsx
@@ -0,0 +1,374 @@
+import { DeleteFilled } from "@ant-design/icons";
+import { useLazyQuery, useMutation } from "@apollo/client";
+import {
+  Button,
+  Card,
+  Col,
+  Form,
+  Input,
+  Row,
+  Space,
+  Spin,
+  Statistic,
+  notification,
+} from "antd";
+import axios from "axios";
+import moment from "moment";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import {
+  INSERT_PAYMENT_RESPONSE,
+  QUERY_RO_AND_OWNER_BY_JOB_PKS,
+} from "../../graphql/payment_response.queries";
+import { INSERT_NEW_PAYMENT } from "../../graphql/payments.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import { toggleModalVisible } from "../../redux/modals/modals.actions";
+import { selectCardPayment } from "../../redux/modals/modals.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";
+import JobSearchSelectComponent from "../job-search-select/job-search-select.component";
+
+const mapStateToProps = createStructuredSelector({
+  cardPaymentModal: selectCardPayment,
+  bodyshop: selectBodyshop,
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
+  toggleModalVisible: () => dispatch(toggleModalVisible("cardPayment")),
+});
+
+const CardPaymentModalComponent = ({
+  bodyshop,
+  cardPaymentModal,
+  toggleModalVisible,
+  insertAuditTrail,
+}) => {
+  const { context } = cardPaymentModal;
+
+  const [form] = Form.useForm();
+
+  const [loading, setLoading] = useState(false);
+  const [insertPayment] = useMutation(INSERT_NEW_PAYMENT);
+  const [insertPaymentResponse] = useMutation(INSERT_PAYMENT_RESPONSE);
+  const { t } = useTranslation();
+
+  const [, { data, refetch, queryLoading }] = useLazyQuery(
+    QUERY_RO_AND_OWNER_BY_JOB_PKS,
+    {
+      variables: { jobids: [context.jobid] },
+      skip: true,
+    }
+  );
+
+  console.log("🚀 ~ file: card-payment-modal.component..jsx:61 ~ data:", data);
+  //Initialize the intellipay window.
+  const SetIntellipayCallbackFunctions = () => {
+    console.log("*** Set IntelliPay callback functions.");
+    window.intellipay.runOnClose(() => {
+      //window.intellipay.initialize();
+    });
+
+    window.intellipay.runOnApproval(async function (response) {
+      console.warn("*** Running On Approval Script ***");
+      form.setFieldValue("paymentResponse", response);
+      form.submit();
+    });
+
+    window.intellipay.runOnNonApproval(async function (response) {
+      // Mutate unsuccessful payment
+
+      const { payments } = form.getFieldsValue();
+
+      await insertPaymentResponse({
+        variables: {
+          paymentResponse: payments.map((payment) => ({
+            amount: payment.amount,
+            bodyshopid: bodyshop.id,
+            jobid: payment.jobid,
+            declinereason: response.declinereason,
+            ext_paymentid: response.paymentid.toString(),
+            successful: false,
+            response,
+          })),
+        },
+      });
+
+      payments.forEach((payment) =>
+        insertAuditTrail({
+          jobid: payment.jobid,
+          operation: AuditTrailMapping.failedpayment(),
+        })
+      );
+    });
+  };
+
+  const handleFinish = async (values) => {
+    try {
+      await insertPayment({
+        variables: {
+          paymentInput: values.payments.map((payment) => ({
+            amount: payment.amount,
+            transactionid: (values.paymentResponse.paymentid || "").toString(),
+            payer: t("payments.labels.customer"),
+            type: values.paymentResponse.cardbrand,
+            jobid: payment.jobid,
+            date: moment(Date.now()),
+            payment_responses: {
+              data: [
+                {
+                  amount: payment.amount,
+                  bodyshopid: bodyshop.id,
+
+                  jobid: payment.jobid,
+                  declinereason: values.paymentResponse.declinereason,
+                  ext_paymentid: values.paymentResponse.paymentid.toString(),
+                  successful: true,
+                  response: values.paymentResponse,
+                },
+              ],
+            },
+          })),
+        },
+        refetchQueries: ["GET_JOB_BY_PK"],
+      });
+      toggleModalVisible();
+    } catch (error) {
+      console.error(error);
+      notification.open({
+        type: "error",
+        message: t("payments.errors.inserting", { error: error.message }),
+      });
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const handleIntelliPayCharge = async () => {
+    setLoading(true);
+
+    //Validate
+    try {
+      await form.validateFields();
+    } catch (error) {
+      setLoading(false);
+      return;
+    }
+
+    try {
+      const response = await axios.post("/intellipay/lightbox_credentials", {
+        bodyshop,
+        refresh: !!window.intellipay,
+      });
+
+      if (window.intellipay) {
+        // eslint-disable-next-line no-eval
+        eval(response.data);
+        SetIntellipayCallbackFunctions();
+        window.intellipay.autoOpen();
+      } else {
+        var rg = document.createRange();
+        let node = rg.createContextualFragment(response.data);
+        document.documentElement.appendChild(node);
+        SetIntellipayCallbackFunctions();
+        window.intellipay.isAutoOpen = true;
+        window.intellipay.initialize();
+      }
+    } catch (error) {
+      notification.open({
+        type: "error",
+        message: t("job_payments.notifications.error.openingip"),
+      });
+      setLoading(false);
+    }
+  };
+
+  return (
+    <Card title="Card Payment">
+      <Spin spinning={loading}>
+        <Form
+          onFinish={handleFinish}
+          form={form}
+          layout="vertical"
+          initialValues={{
+            payments: context.jobid ? [{ jobid: context.jobid }] : [],
+          }}
+        >
+          <Form.List name={["payments"]}>
+            {(fields, { add, remove, move }) => {
+              return (
+                <div>
+                  {fields.map((field, index) => (
+                    <Form.Item key={field.key}>
+                      <Row gutter={[16, 16]}>
+                        <Col span={16}>
+                          <Form.Item
+                            key={`${index}jobid`}
+                            label={t("jobs.fields.ro_number")}
+                            name={[field.name, "jobid"]}
+                            rules={[
+                              {
+                                required: true,
+                                //message: t("general.validation.required"),
+                              },
+                            ]}
+                          >
+                            <JobSearchSelectComponent
+                              notExported={false}
+                              clm_no
+                            />
+                          </Form.Item>
+                        </Col>
+                        <Col span={6}>
+                          <Form.Item
+                            key={`${index}amount`}
+                            label={t("payments.fields.amount")}
+                            name={[field.name, "amount"]}
+                            rules={[
+                              {
+                                required: true,
+                                //message: t("general.validation.required"),
+                              },
+                            ]}
+                          >
+                            <CurrencyFormItemComponent />
+                          </Form.Item>
+                        </Col>
+                        <Col span={2}>
+                          <DeleteFilled
+                            style={{ margin: "1rem" }}
+                            onClick={() => {
+                              remove(field.name);
+                            }}
+                          />
+                        </Col>
+                      </Row>
+                    </Form.Item>
+                  ))}
+                  <Form.Item>
+                    <Button
+                      type="dashed"
+                      onClick={() => {
+                        add();
+                      }}
+                      style={{ width: "100%" }}
+                    >
+                      {t("general.actions.add")}
+                    </Button>
+                  </Form.Item>
+                </div>
+              );
+            }}
+          </Form.List>
+
+          <Form.Item
+            shouldUpdate={(prevValues, curValues) =>
+              prevValues.payments?.map((p) => p?.jobid).join() !==
+              curValues.payments?.map((p) => p?.jobid).join()
+            }
+          >
+            {() => {
+              console.log("Updating the owner info section.");
+              //If all of the job ids have been fileld in, then query and update the IP field.
+              const { payments } = form.getFieldsValue();
+              if (
+                payments?.length > 0 &&
+                payments?.filter((p) => p?.jobid).length === payments?.length
+              ) {
+                console.log("**Calling refetch.");
+                refetch({ jobids: payments.map((p) => p.jobid) });
+              }
+              console.log(
+                "Acc info",
+                data,
+                payments && data && data.jobs.length > 0
+                  ? data.jobs.map((j) => j.ro_number).join(", ")
+                  : null
+              );
+              return (
+                <>
+                  <Input
+                    className="ipayfield"
+                    data-ipayname="account"
+                    //type="hidden"
+                    value={
+                      payments && data && data.jobs.length > 0
+                        ? data.jobs.map((j) => j.ro_number).join(", ")
+                        : null
+                    }
+                    hidden
+                  />
+                  <Input
+                    className="ipayfield"
+                    data-ipayname="email"
+                    // type="hidden"
+                    value={
+                      payments && data && data.jobs.length > 0
+                        ? data.jobs.filter((j) => j.ownr_ea)[0]?.ownr_ea
+                        : null
+                    }
+                    hidden
+                  />
+                </>
+              );
+            }}
+          </Form.Item>
+          <Form.Item
+            shouldUpdate={(prevValues, curValues) =>
+              prevValues.payments?.map((p) => p?.amount).join() !==
+              curValues.payments?.map((p) => p?.amount).join()
+            }
+          >
+            {() => {
+              const { payments } = form.getFieldsValue();
+              const totalAmountToCharge = payments?.reduce((acc, val) => {
+                return acc + (val?.amount || 0);
+              }, 0);
+
+              return (
+                <Space style={{ float: "right" }}>
+                  <Statistic
+                    title="Amount To Charge"
+                    value={totalAmountToCharge}
+                    precision={2}
+                  />
+                  <Input
+                    className="ipayfield"
+                    data-ipayname="amount"
+                    //type="hidden"
+                    value={totalAmountToCharge?.toFixed(2)}
+                    hidden
+                  />
+                  <Button
+                    type="primary"
+                    //  data-ipayname="submit"
+                    className="ipayfield"
+                    loading={queryLoading || loading}
+                    disabled={!(totalAmountToCharge > 0)}
+                    onClick={handleIntelliPayCharge}
+                  >
+                    {t("job_payments.buttons.proceedtopayment")}
+                  </Button>
+                </Space>
+              );
+            }}
+          </Form.Item>
+
+          {/* Lightbox payment response when it is completed */}
+          <Form.Item name="paymentResponse" hidden>
+            <Input type="hidden" />
+          </Form.Item>
+        </Form>
+      </Spin>
+    </Card>
+  );
+};
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(CardPaymentModalComponent);
--- a/client/src/components/card-payment-modal/card-payment-modal.container..jsx
+++ b/client/src/components/card-payment-modal/card-payment-modal.container..jsx
@@ -0,0 +1,57 @@
+import { Button, Modal } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { toggleModalVisible } from "../../redux/modals/modals.actions";
+import { selectCardPayment } from "../../redux/modals/modals.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import CardPaymentModalComponent from "./card-payment-modal.component.";
+
+const mapStateToProps = createStructuredSelector({
+  cardPaymentModal: selectCardPayment,
+  bodyshop: selectBodyshop,
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  toggleModalVisible: () => dispatch(toggleModalVisible("cardPayment")),
+});
+
+function CardPaymentModalContainer({
+  cardPaymentModal,
+  toggleModalVisible,
+  bodyshop,
+}) {
+  const { visible } = cardPaymentModal;
+  const { t } = useTranslation();
+
+  const handleCancel = () => {
+    toggleModalVisible();
+  };
+
+  const handleOK = () => {
+    toggleModalVisible();
+  };
+
+  return (
+    <Modal
+      open={visible}
+      onOk={handleOK}
+      onCancel={handleCancel}
+      footer={[
+        <Button key="back" onClick={handleCancel}>
+          {t("job_payments.buttons.goback")}
+        </Button>,
+      ]}
+      width="80%"
+      destroyOnClose
+    >
+      <CardPaymentModalComponent />
+    </Modal>
+  );
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(CardPaymentModalContainer);
--- a/client/src/components/chat-open-button/chat-open-button.component.jsx
+++ b/client/src/components/chat-open-button/chat-open-button.component.jsx
@@ -8,15 +8,23 @@ import PhoneNumberFormatter from "../../utils/PhoneFormatter";

 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import { searchingForConversation } from "../../redux/messaging/messaging.selectors";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
+  searchingForConversation: searchingForConversation,
 });

 const mapDispatchToProps = (dispatch) => ({
  openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
 });

-export function ChatOpenButton({ bodyshop, phone, jobid, openChatByPhone }) {
+export function ChatOpenButton({
+  bodyshop,
+  searchingForConversation,
+  phone,
+  jobid,
+  openChatByPhone,
+}) {
  const { t } = useTranslation();
  if (!phone) return <></>;

@@ -29,7 +37,7 @@ export function ChatOpenButton({ bodyshop, phone, jobid, openChatByPhone }) {
      onClick={(e) => {
        e.stopPropagation();
        const p = parsePhoneNumber(phone, "CA");
-
+        if (searchingForConversation) return; //This is to prevent finding the same thing twice.
        if (p && p.isValid()) {
          openChatByPhone({ phone_num: p.formatInternational(), jobid: jobid });
        } else {
--- a/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx
+++ b/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx
@@ -9,15 +9,15 @@ import {
  Table,
  Tooltip,
 } from "antd";
+import moment from "moment";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
-import { alphaSort } from "../../utils/sorters";
-import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
-import moment from "moment";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
+import { alphaSort } from "../../utils/sorters";
+import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
  const [state, setState] = useState({
    sortedInfo: {},
@@ -115,6 +115,14 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
      sortOrder:
        state.sortedInfo.columnKey === "model" && state.sortedInfo.order,
    },
+    {
+      title: t("courtesycars.fields.color"),
+      dataIndex: "color",
+      key: "color",
+      sorter: (a, b) => alphaSort(a.color, b.color),
+      sortOrder:
+        state.sortedInfo.columnKey === "color" && state.sortedInfo.order,
+    },
    {
      title: t("courtesycars.fields.plate"),
      dataIndex: "plate",
--- a/client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx
+++ b/client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx
@@ -23,36 +23,40 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {

  const appt = []; // Flatten Data
  data.scheduled_in_today.forEach((item) => {
-    var i = {
-      canceled: item.canceled,
-      id: item.id,
-      alt_transport: item.job.alt_transport,
-      clm_no: item.job.clm_no,
-      jobid: item.job.jobid,
-      ins_co_nm: item.job.ins_co_nm,
-      iouparent: item.job.iouparent,
-      ownerid: item.job.ownerid,
-      ownr_co_nm: item.job.ownr_co_nm,
-      ownr_ea: item.job.ownr_ea,
-      ownr_fn: item.job.ownr_fn,
-      ownr_ln: item.job.ownr_ln,
-      ownr_ph1: item.job.ownr_ph1,
-      ownr_ph2: item.job.ownr_ph2,
-      production_vars: item.job.production_vars,
-      ro_number: item.job.ro_number,
-      suspended: item.job.suspended,
-      v_make_desc: item.job.v_make_desc,
-      v_model_desc: item.job.v_model_desc,
-      v_model_yr: item.job.v_model_yr,
-      v_vin: item.job.v_vin,
-      vehicleid: item.job.vehicleid,
-      note: item.note,
-      start: moment(item.start).format("hh:mm a"),
-      title: item.title,
-    };
-    appt.push(i);
+    if (item.job) {
+      var i = {
+        canceled: item.canceled,
+        id: item.id,
+        alt_transport: item.job.alt_transport,
+        clm_no: item.job.clm_no,
+        jobid: item.job.jobid,
+        ins_co_nm: item.job.ins_co_nm,
+        iouparent: item.job.iouparent,
+        ownerid: item.job.ownerid,
+        ownr_co_nm: item.job.ownr_co_nm,
+        ownr_ea: item.job.ownr_ea,
+        ownr_fn: item.job.ownr_fn,
+        ownr_ln: item.job.ownr_ln,
+        ownr_ph1: item.job.ownr_ph1,
+        ownr_ph2: item.job.ownr_ph2,
+        production_vars: item.job.production_vars,
+        ro_number: item.job.ro_number,
+        suspended: item.job.suspended,
+        v_make_desc: item.job.v_make_desc,
+        v_model_desc: item.job.v_model_desc,
+        v_model_yr: item.job.v_model_yr,
+        v_vin: item.job.v_vin,
+        vehicleid: item.job.vehicleid,
+        note: item.note,
+        start: moment(item.start).format("hh:mm a"),
+        title: item.title,
+      };
+      appt.push(i);
+    }
+  });
+  appt.sort(function (a, b) {
+    return new moment(a.start) - new moment(b.start);
  });
-  appt.sort ( function (a, b) { return new Date(a.start) - new Date(b.start); });

  const columns = [
    {
@@ -182,7 +186,12 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
  };

  return (
-    <Card title={t("dashboard.titles.scheduledintoday", {date: moment().startOf("day").format("MM/DD/YYYY")})} {...cardProps}>
+    <Card
+      title={t("dashboard.titles.scheduledintoday", {
+        date: moment().startOf("day").format("MM/DD/YYYY"),
+      })}
+      {...cardProps}
+    >
      <div style={{ height: "100%" }}>
        <Table
          onChange={handleTableChange}
--- a/client/src/components/data-label/data-label.component.jsx
+++ b/client/src/components/data-label/data-label.component.jsx
@@ -18,7 +18,7 @@ export default function DataLabel({
    <div {...props} style={{ display: "flex" }}>
      <div
        style={{
-          flex: 2,
+         // flex: 2,
          marginRight: ".2rem",
        }}
      >
--- a/client/src/components/email-overlay/email-overlay.container.jsx
+++ b/client/src/components/email-overlay/email-overlay.container.jsx
@@ -109,7 +109,7 @@ export function EmailOverlayContainer({
              ]
            : []),
        ],
-        media: selectedMedia.filter((m) => m.isSelected).map((m) => m.src),
+        media: selectedMedia.filter((m) => m.isSelected).map((m) => m.fullsize),
        //attachments,
      });
      notification["success"]({ message: t("emails.successes.sent") });
--- a/client/src/components/header/header.component.jsx
+++ b/client/src/components/header/header.component.jsx
@@ -1,10 +1,9 @@
-import { useTreatments } from "@splitsoftware/splitio-react";
 import Icon, {
  BankFilled,
  BarChartOutlined,
  CarFilled,
-  ClockCircleFilled,
  CheckCircleOutlined,
+  ClockCircleFilled,
  DashboardFilled,
  DollarCircleFilled,
  ExportOutlined,
@@ -26,6 +25,7 @@ import Icon, {
  UnorderedListOutlined,
  UserOutlined,
 } from "@ant-design/icons";
+import { useTreatments } from "@splitsoftware/splitio-react";
 import { Layout, Menu } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -70,6 +70,8 @@ const mapDispatchToProps = (dispatch) => ({
  setReportCenterContext: (context) =>
    dispatch(setModalContext({ context: context, modal: "reportCenter" })),
  signOutStart: () => dispatch(signOutStart()),
+  setCardPaymentContext: (context) =>
+    dispatch(setModalContext({ context: context, modal: "cardPayment" })),
 });

 function Header({
@@ -83,6 +85,7 @@ function Header({
  setPaymentContext,
  setReportCenterContext,
  recentItems,
+  setCardPaymentContext,
 }) {
  const { Simple_Inventory } = useTreatments(
    ["Simple_Inventory"],
@@ -94,6 +97,11 @@ function Header({
    {},
    bodyshop && bodyshop.imexshopid
  );
+  const { ImEXPay } = useTreatments(
+    ["ImEXPay"],
+    {},
+    bodyshop && bodyshop.imexshopid
+  );

  const { t } = useTranslation();

@@ -240,6 +248,20 @@ function Header({
          >
            {t("menus.header.enterpayment")}
          </Menu.Item>
+          {ImEXPay.treatment === "on" && (
+            <Menu.Item
+              key="entercardpayments"
+              onClick={() => {
+                setCardPaymentContext({
+                  actions: {},
+                  context: {},
+                });
+              }}
+              icon={<Icon component={FaCreditCard} />}
+            >
+              {t("menus.header.entercardpayment")}
+            </Menu.Item>
+          )}
          <Menu.Divider key="div5" />
          <Menu.Item key="timetickets" icon={<FieldTimeOutlined />}>
            <Link to="/manage/timetickets">
@@ -252,7 +274,11 @@ function Header({
            onClick={() => {
              setTimeTicketContext({
                actions: {},
-                context: {},
+                context: {
+                  created_by: currentUser.displayName
+                    ? currentUser.email.concat(" | ", currentUser.displayName)
+                    : currentUser.email,
+                },
              });
            }}
          >
--- a/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx
+++ b/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx
@@ -5,6 +5,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { SEARCH_VENDOR_AUTOCOMPLETE_WITH_ADDR } from "../../graphql/vendors.queries";
+import { selectTechnician } from "../../redux/tech/tech.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
@@ -13,13 +14,14 @@ import VendorSearchSelect from "../vendor-search-select/vendor-search-select.com

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
+  technician: selectTechnician,
 });
 const mapDispatchToProps = (dispatch) => ({
  //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(Jobd3RdPartyModal);

-export function Jobd3RdPartyModal({ bodyshop, jobId, job }) {
+export function Jobd3RdPartyModal({ bodyshop, jobId, job, technician }) {
  const [isModalVisible, setIsModalVisible] = useState(false);
  const { t } = useTranslation();
  const [form] = Form.useForm();
@@ -212,7 +214,9 @@ export function Jobd3RdPartyModal({ bodyshop, jobId, job }) {
            ]}
          >
            <Radio.Group>
-              <Radio value={"e"}>{t("parts_orders.labels.email")}</Radio>
+              {!technician ? (
+                <Radio value={"e"}>{t("parts_orders.labels.email")}</Radio>
+              ) : null}
              <Radio value={"p"}>{t("parts_orders.labels.print")}</Radio>
            </Radio.Group>
          </Form.Item>
--- a/client/src/components/job-at-change/schedule-event.component.jsx
+++ b/client/src/components/job-at-change/schedule-event.component.jsx
@@ -29,11 +29,11 @@ import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import DataLabel from "../data-label/data-label.component";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import ScheduleManualEvent from "../schedule-manual-event/schedule-manual-event.component";
 import ScheduleAtChange from "./job-at-change.component";
 import ScheduleEventColor from "./schedule-event.color.component";
 import ScheduleEventNote from "./schedule-event.note.component";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -208,46 +208,56 @@ export function ScheduleEventComponent({
            <Button>{t("appointments.actions.sendreminder")}</Button>
          </Dropdown>
        ) : null}
-        <Popover
-          trigger="click"
-          disabled={event.arrived}
-          content={
-            <Form
-              layout="vertical"
-              onFinish={({ lost_sale_reason }) => {
-                handleCancel({ id: event.id, lost_sale_reason });
-              }}
-            >
-              <Form.Item
-                name="lost_sale_reason"
-                label={t("jobs.fields.lost_sale_reason")}
-                rules={[
-                  {
-                    required: true,
-                    //message: t("general.validation.required"),
-                  },
-                ]}
-              >
-                <Select
-                  options={bodyshop.md_lost_sale_reasons.map((lsr) => ({
-                    label: lsr,
-                    value: lsr,
-                  }))}
-                />
-              </Form.Item>
-              <Button htmlType="submit">
-                {t("appointments.actions.cancel")}
-              </Button>
-            </Form>
-          }
-        >
+        {event.arrived ? (
          <Button
            // onClick={() => handleCancel(event.id)}
            disabled={event.arrived}
          >
            {t("appointments.actions.cancel")}
          </Button>
-        </Popover>
+        ) : (
+          <Popover
+            trigger="click"
+            disabled={event.arrived}
+            content={
+              <Form
+                layout="vertical"
+                onFinish={({ lost_sale_reason }) => {
+                  handleCancel({ id: event.id, lost_sale_reason });
+                }}
+              >
+                <Form.Item
+                  name="lost_sale_reason"
+                  label={t("jobs.fields.lost_sale_reason")}
+                  rules={[
+                    {
+                      required: true,
+                      //message: t("general.validation.required"),
+                    },
+                  ]}
+                >
+                  <Select
+                    options={bodyshop.md_lost_sale_reasons.map((lsr) => ({
+                      label: lsr,
+                      value: lsr,
+                    }))}
+                  />
+                </Form.Item>
+                <Button htmlType="submit">
+                  {t("appointments.actions.cancel")}
+                </Button>
+              </Form>
+            }
+          >
+            <Button
+              // onClick={() => handleCancel(event.id)}
+              disabled={event.arrived}
+            >
+              {t("appointments.actions.cancel")}
+            </Button>
+          </Popover>
+        )}
+
        {event.isintake ? (
          <Button
            disabled={event.arrived}
--- 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
@@ -1,5 +1,6 @@
 import { useMutation } from "@apollo/client";
 import { Button, Card, Form, Input, notification, Switch } from "antd";
+import moment from "moment-business-days";
 import queryString from "query-string";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -12,16 +13,15 @@ import {
  MARK_LATEST_APPOINTMENT_ARRIVED,
 } from "../../../../graphql/appointments.queries";
 import { UPDATE_JOB } from "../../../../graphql/jobs.queries";
+import { UPDATE_OWNER } from "../../../../graphql/owners.queries";
+import { insertAuditTrail } from "../../../../redux/application/application.actions";
 import {
  selectBodyshop,
  selectCurrentUser,
 } from "../../../../redux/user/user.selectors";
+import AuditTrailMapping from "../../../../utils/AuditTrailMappings";
 import ConfigFormComponents from "../../../config-form-components/config-form-components.component";
 import DateTimePicker from "../../../form-date-time-picker/form-date-time-picker.component";
-import moment from "moment-business-days";
-import { insertAuditTrail } from "../../../../redux/application/application.actions";
-import AuditTrailMapping from "../../../../utils/AuditTrailMappings";
-import { UPDATE_OWNER } from "../../../../graphql/owners.queries";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -230,6 +230,7 @@ export function JobChecklistForm({
                )),
            scheduled_delivery:
              job.scheduled_delivery && moment(job.scheduled_delivery),
+            production_vars: job.production_vars,
          }),
          ...(type === "deliver" && {
            removeFromProduction: true,
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -401,7 +401,7 @@ export function JobLinesComponent({
      const markedTypes = [e.key];
      if (e.key === "PAN") markedTypes.push("PAP");
      if (e.key === "PAS") markedTypes.push("PASL");
-      setSelectedLines(
+      setSelectedLines((selectedLines) =>
        _.uniq([
          ...selectedLines,
          ...jobLines.filter((item) => markedTypes.includes(item.part_type)),
@@ -614,8 +614,17 @@ export function JobLinesComponent({
          onSelectAll: (selected, selectedRows, changeRows) => {
            setSelectedLines(selectedRows);
          },
-          onSelect: (record, selected, selectedRows, nativeEvent) =>
-            setSelectedLines(selectedRows),
+          onSelect: (record, selected, selectedRows, nativeEvent) => {
+            if (selected) {
+              setSelectedLines((selectedLines) =>
+                _.uniqBy([...selectedLines, record], "id")
+              );
+            } else {
+              setSelectedLines((selectedLines) =>
+                selectedLines.filter((l) => l.id !== record.id)
+              );
+            }
+          },
        }}
      />
    </div>
--- a/client/src/components/job-lines-bill-reference/job-lines-bill-reference.component.jsx
+++ b/client/src/components/job-lines-bill-reference/job-lines-bill-reference.component.jsx
@@ -8,7 +8,7 @@ export default function JobLinesBillRefernece({ jobline }) {
  return (
    <div style={{ color: subletRequired && "tomato" }}>
      {subletRequired && <WarningFilled />}
-      {`${(billLine.actual_price * billLine.quantity).toFixed(2)} (${
+      {`${billLine.actual_price.toFixed(2)} x ${billLine.quantity} (${
        billLine.bill.vendor.name
      } #${billLine.bill.invoice_number})`}
    </div>
--- a/client/src/components/job-payments/job-payments.component.jsx
+++ b/client/src/components/job-payments/job-payments.component.jsx
@@ -1,19 +1,26 @@
-import { Button, Card, Space, Table } from "antd";
 import { EditFilled } from "@ant-design/icons";
+import { Button, Card, Space, Table } from "antd";
 import Dinero from "dinero.js";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
+import {
+  openChatByPhone,
+  setMessage,
+} from "../../redux/messaging/messaging.actions";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
-import { alphaSort, dateSort } from "../../utils/sorters";
 import { TemplateList } from "../../utils/TemplateConstants";
+import { alphaSort, dateSort } from "../../utils/sorters";
 import DataLabel from "../data-label/data-label.component";
+import PaymentExpandedRowComponent from "../payment-expanded-row/payment-expanded-row.component";
+import PaymentsGenerateLink from "../payments-generate-link/payments-generate-link.component";
 import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
+import { useTreatments } from "@splitsoftware/splitio-react";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -23,20 +30,34 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
  setPaymentContext: (context) =>
    dispatch(setModalContext({ context: context, modal: "payment" })),
+  setCardPaymentContext: (context) =>
+    dispatch(setModalContext({ context: context, modal: "cardPayment" })),
+  openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
+  setMessage: (text) => dispatch(setMessage(text)),
 });

 export function JobPayments({
  job,
  jobRO,
  bodyshop,
+  setMessage,
+  openChatByPhone,
  setPaymentContext,
+  setCardPaymentContext,
  refetch,
 }) {
+  const { ImEXPay } = useTreatments(
+    ["ImEXPay"],
+    {},
+    bodyshop && bodyshop.imexshopid
+  );
+
  const { t } = useTranslation();
  const [state, setState] = useState({
    sortedInfo: {},
    filteredInfo: {},
  });
+
  const columns = [
    {
      title: t("payments.fields.date"),
@@ -149,6 +170,21 @@ export function JobPayments({
      title={t("payments.labels.title")}
      extra={
        <Space wrap>
+          {ImEXPay.treatment === "on" && (
+            <>
+              <Button
+                onClick={() =>
+                  setCardPaymentContext({
+                    actions: { refetch },
+                    context: { jobid: job.id, balance },
+                  })
+                }
+              >
+                {t("menus.header.entercardpayment")}
+              </Button>
+              <PaymentsGenerateLink job={job} />
+            </>
+          )}
          <Button
            disabled={!job.converted}
            onClick={() =>
@@ -160,6 +196,7 @@ export function JobPayments({
          >
            {t("menus.header.enterpayment")}
          </Button>
+
          <DataLabel
            valueStyle={{ color: balance.getAmount() !== 0 ? "red" : "green" }}
            label={t("payments.labels.balance")}
@@ -178,6 +215,11 @@ export function JobPayments({
        scroll={{
          x: true,
        }}
+        expandable={{
+          expandedRowRender: (record) => (
+            <PaymentExpandedRowComponent record={record} bodyshop={bodyshop} />
+          ),
+        }}
        summary={() => (
          <>
            <Table.Summary.Row>
--- a/client/src/components/job-search-select/job-search-select.component.jsx
+++ b/client/src/components/job-search-select/job-search-select.component.jsx
@@ -33,7 +33,9 @@ const JobSearchSelect = (
    useLazyQuery(SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE);

  const executeSearch = (v) => {
-    if (v && v !== "") callSearch(v);
+    console.log(v);
+    if (v && v.variables?.search !== "" && v.variables.search.length >= 2)
+      callSearch(v);
  };
  const debouncedExecuteSearch = _.debounce(executeSearch, 500);

--- a/client/src/components/jobs-available-table/jobs-available-table.container.jsx
+++ b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
@@ -3,7 +3,7 @@ import {
  useApolloClient,
  useLazyQuery,
  useMutation,
-  useQuery
+  useQuery,
 } from "@apollo/client";
 import { useTreatments } from "@splitsoftware/splitio-react";
 import { Col, notification, Row } from "antd";
@@ -20,7 +20,7 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import {
  DELETE_AVAILABLE_JOB,
  QUERY_AVAILABLE_JOBS,
-  QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK
+  QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK,
 } from "../../graphql/available-jobs.queries";
 import { INSERT_NEW_JOB, UPDATE_JOB } from "../../graphql/jobs.queries";
 import { INSERT_NEW_NOTE } from "../../graphql/notes.queries";
@@ -28,7 +28,7 @@ import { SEARCH_VEHICLE_BY_VIN } from "../../graphql/vehicles.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import {
  selectBodyshop,
-  selectCurrentUser
+  selectCurrentUser,
 } from "../../redux/user/user.selectors";
 import confirmDialog from "../../utils/asyncConfirm";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
@@ -135,6 +135,7 @@ export function JobsAvailableContainer({
      owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat("0.00"),
      job_totals: newTotals,
      date_open: moment(),
+      status: bodyshop.md_ro_statuses.default_imported,
      notes: {
        data: {
          created_by: currentUser.email,
--- a/client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx
+++ b/client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx
@@ -4,22 +4,35 @@ import axios from "axios";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
+import { useHistory } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { auth } from "../../firebase/firebase.utils";
+import { auth, logImEXEvent } from "../../firebase/firebase.utils";
+import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import {
  selectBodyshop,
  selectCurrentUser,
 } from "../../redux/user/user.selectors";
-import { logImEXEvent } from "../../firebase/firebase.utils";
-import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
-import { useHistory } from "react-router-dom";
+import client from "../../utils/GraphQLClient";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
  currentUser: selectCurrentUser,
 });

+function updateJobCache(items) {
+  client.cache.modify({
+    id: "ROOT_QUERY",
+    fields: {
+      jobs(existingJobs = []) {
+        return existingJobs.filter(
+          (jobRef) => jobRef.__ref.includes(items) === false
+        );
+      },
+    },
+  });
+}
+
 export function JobsCloseExportButton({
  bodyshop,
  currentUser,
@@ -101,6 +114,9 @@ export function JobsCloseExportButton({

    //Check to see if any of them failed. If they didn't don't execute the update.
    const failedTransactions = PartnerResponse.data.filter((r) => !r.success);
+    const successfulTransactions = PartnerResponse.data.filter(
+      (r) => r.success
+    );
    if (failedTransactions.length > 0) {
      //Uh oh. At least one was no good.
      failedTransactions.forEach((ft) => {
@@ -159,12 +175,15 @@ export function JobsCloseExportButton({
          },
        });

-        if (!jobUpdateResponse.errors) {
+        if (!!!jobUpdateResponse.errors) {
          notification.open({
            type: "success",
            key: "jobsuccessexport",
            message: t("jobs.successes.exported"),
          });
+          updateJobCache(
+            jobUpdateResponse.data.update_jobs.returning.map((job) => job.id)
+          );
        } else {
          notification["error"]({
            message: t("jobs.errors.exporting", {
@@ -173,13 +192,31 @@ export function JobsCloseExportButton({
          });
        }
      }
+      if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && successfulTransactions.length > 0) {
+        notification.open({
+          type: "success",
+          key: "jobsuccessexport",
+          message: t("jobs.successes.exported"),
+        });
+        updateJobCache([
+          ...new Set(
+            successfulTransactions.map(
+              (st) =>
+                st[
+                  bodyshop.accountingconfig && bodyshop.accountingconfig.qbo
+                    ? "jobid"
+                    : "id"
+                ]
+            )
+          ),
+        ]);
+      }
      if (setSelectedJobs) {
        setSelectedJobs((selectedJobs) => {
          return selectedJobs.filter((i) => i !== jobId);
        });
      }
    }
-    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
    setLoading(false);
  };

--- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
+++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
@@ -48,6 +48,8 @@ const mapDispatchToProps = (dispatch) => ({
    dispatch(setModalContext({ context: context, modal: "jobCosting" })),
  setTimeTicketContext: (context) =>
    dispatch(setModalContext({ context: context, modal: "timeTicket" })),
+  setCardPaymentContext: (context) =>
+    dispatch(setModalContext({ context: context, modal: "cardPayment" })),
 });

 export function JobsDetailHeaderActions({
@@ -61,6 +63,7 @@ export function JobsDetailHeaderActions({
  setJobCostingContext,
  jobRO,
  setTimeTicketContext,
+  setCardPaymentContext,
 }) {
  const { t } = useTranslation();
  const client = useApolloClient();
@@ -137,63 +140,67 @@ export function JobsDetailHeaderActions({
      <Menu.Item
        disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
      >
-        <Popover
-          trigger="click"
-          disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
-          content={
-            <Form
-              layout="vertical"
-              onFinish={async ({ lost_sale_reason }) => {
-                const jobUpdate = await cancelAllAppointments({
-                  variables: {
-                    jobid: job.id,
-                    job: {
-                      date_scheduled: null,
-                      scheduled_in: null,
-                      scheduled_completion: null,
-                      lost_sale_reason,
-                      status: bodyshop.md_ro_statuses.default_imported,
+        {job.status !== bodyshop.md_ro_statuses.default_scheduled ? (
+          t("menus.jobsactions.cancelallappointments")
+        ) : (
+          <Popover
+            trigger="click"
+            disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
+            content={
+              <Form
+                layout="vertical"
+                onFinish={async ({ lost_sale_reason }) => {
+                  const jobUpdate = await cancelAllAppointments({
+                    variables: {
+                      jobid: job.id,
+                      job: {
+                        date_scheduled: null,
+                        scheduled_in: null,
+                        scheduled_completion: null,
+                        lost_sale_reason,
+                        status: bodyshop.md_ro_statuses.default_imported,
+                      },
                    },
-                  },
-                });
-                if (!jobUpdate.errors) {
-                  notification["success"]({
-                    message: t("appointments.successes.canceled"),
                  });
-                  return;
-                }
-              }}
-            >
-              <Form.Item
-                name="lost_sale_reason"
-                label={t("jobs.fields.lost_sale_reason")}
-                rules={[
-                  {
-                    required: true,
-                    //message: t("general.validation.required"),
-                  },
-                ]}
+                  if (!jobUpdate.errors) {
+                    notification["success"]({
+                      message: t("appointments.successes.canceled"),
+                    });
+                    return;
+                  }
+                }}
              >
-                <Select
-                  options={bodyshop.md_lost_sale_reasons.map((lsr) => ({
-                    label: lsr,
-                    value: lsr,
-                  }))}
-                />
-              </Form.Item>
-              <Button
-                htmlType="submit"
-                disabled={
-                  job.status !== bodyshop.md_ro_statuses.default_scheduled
-                }
-              >
-                {t("appointments.actions.cancel")}
-              </Button>
-            </Form>
-          }
-        >
-          {t("menus.jobsactions.cancelallappointments")}
-        </Popover>
+                <Form.Item
+                  name="lost_sale_reason"
+                  label={t("jobs.fields.lost_sale_reason")}
+                  rules={[
+                    {
+                      required: true,
+                      //message: t("general.validation.required"),
+                    },
+                  ]}
+                >
+                  <Select
+                    options={bodyshop.md_lost_sale_reasons.map((lsr) => ({
+                      label: lsr,
+                      value: lsr,
+                    }))}
+                  />
+                </Form.Item>
+                <Button
+                  htmlType="submit"
+                  disabled={
+                    job.status !== bodyshop.md_ro_statuses.default_scheduled
+                  }
+                >
+                  {t("appointments.actions.cancel")}
+                </Button>
+              </Form>
+            }
+          >
+            {t("menus.jobsactions.cancelallappointments")}
+          </Popover>
+        )}
      </Menu.Item>
      <Menu.Item
        disabled={
@@ -239,7 +246,12 @@ export function JobsDetailHeaderActions({

          setTimeTicketContext({
            actions: {},
-            context: { jobId: job.id },
+            context: {
+              jobId: job.id,
+              created_by: currentUser.displayName
+                ? currentUser.email.concat(" | ", currentUser.displayName)
+                : currentUser.email,
+            },
          });
        }}
      >
@@ -259,6 +271,18 @@ export function JobsDetailHeaderActions({
      >
        {t("menus.header.enterpayment")}
      </Menu.Item>
+      <Menu.Item
+        key="entercardpayments"
+        disabled={!job.converted}
+        onClick={() => {
+          setCardPaymentContext({
+            actions: {},
+            context: { jobid: job.id },
+          });
+        }}
+      >
+        {t("menus.header.entercardpayment")}
+      </Menu.Item>
      <Menu.Item key="cccontract" disabled={jobRO || !job.converted}>
        <Link
          to={{
--- a/client/src/components/jobs-documents-gallery/jobs-documents-gallery.external.component.jsx
+++ b/client/src/components/jobs-documents-gallery/jobs-documents-gallery.external.component.jsx
@@ -1,7 +1,7 @@
 import React, { useEffect } from "react";
 import { Gallery } from "react-grid-gallery";
 import { useTranslation } from "react-i18next";
-import { GenerateThumbUrl } from "./job-documents.utility";
+import { GenerateSrcUrl, GenerateThumbUrl } from "./job-documents.utility";

 function JobsDocumentGalleryExternal({
  data,
@@ -15,7 +15,7 @@ function JobsDocumentGalleryExternal({
    let documents = data.reduce((acc, value) => {
      if (value.type.startsWith("image")) {
        acc.push({
-          //src: GenerateSrcUrl(value),
+          fullsize: GenerateSrcUrl(value),
          src: GenerateThumbUrl(value),
          thumbnailHeight: 225,
          thumbnailWidth: 225,
--- a/client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.external.component.jsx
+++ b/client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.external.component.jsx
@@ -52,7 +52,7 @@ function JobDocumentsLocalGalleryExternal({
              val.type.mime &&
              val.type.mime.startsWith("image")
            ) {
-              acc.push({ ...val, src: val.thumbnail });
+              acc.push({ ...val, src: val.thumbnail, fullsize: val.src });
            }
            return acc;
          }, [])
--- a/client/src/components/jobs-export-all-button/jobs-export-all-button.component.jsx
+++ b/client/src/components/jobs-export-all-button/jobs-export-all-button.component.jsx
@@ -13,12 +13,26 @@ import {
  selectBodyshop,
  selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import client from "../../utils/GraphQLClient";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
  currentUser: selectCurrentUser,
 });

+function updateJobCache(items) {
+  client.cache.modify({
+    id: "ROOT_QUERY",
+    fields: {
+      jobs(existingJobs = []) {
+        return existingJobs.filter(
+          (jobRef) => jobRef.__ref.includes(items) === false
+        );
+      },
+    },
+  });
+}
+
 export function JobsExportAllButton({
  bodyshop,
  currentUser,
@@ -96,7 +110,9 @@ export function JobsExportAllButton({
      Object.keys(groupedData).map(async (key) => {
        //Check to see if any of them failed. If they didn't don't execute the update.
        const failedTransactions = groupedData[key].filter((r) => !r.success);
-
+        const successfulTransactions = groupedData[key].filter(
+          (r) => r.success
+        );
        if (failedTransactions.length > 0) {
          //Uh oh. At least one was no good.
          failedTransactions.forEach((ft) => {
@@ -155,12 +171,17 @@ export function JobsExportAllButton({
              },
            });

-            if (!jobUpdateResponse.errors) {
+            if (!!!jobUpdateResponse.errors) {
              notification.open({
                type: "success",
                key: "jobsuccessexport",
                message: t("jobs.successes.exported"),
              });
+              updateJobCache(
+                jobUpdateResponse.data.update_jobs.returning.map(
+                  (job) => job.id
+                )
+              );
            } else {
              notification["error"]({
                message: t("jobs.errors.exporting", {
@@ -169,14 +190,31 @@ export function JobsExportAllButton({
              });
            }
          }
+          if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && successfulTransactions.length > 0) {
+            notification.open({
+              type: "success",
+              key: "jobsuccessexport",
+              message: t("jobs.successes.exported"),
+            });
+            updateJobCache([
+              ...new Set(
+                successfulTransactions.map(
+                  (st) =>
+                    st[
+                      bodyshop.accountingconfig && bodyshop.accountingconfig.qbo
+                        ? "jobid"
+                        : "id"
+                    ]
+                )
+              ),
+            ]);
+          }
        }
      })
    );
-    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();

    if (!!completedCallback) completedCallback([]);
    if (!!loadingCallback) loadingCallback(false);
-
    setLoading(false);
  };

--- a/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx
+++ b/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx
@@ -231,7 +231,14 @@ export function LaborAllocationsTable({
                  {summary.adjustments.toFixed(1)}
                </Table.Summary.Cell>
                <Table.Summary.Cell>
-                  {summary.difference.toFixed(1)}
+                  <Typography.Text
+                    style={{
+                      fontWeight: "bold",
+                      color: summary.difference >= 0 ? "green" : "red",
+                    }}
+                  >
+                    {summary.difference.toFixed(1)}
+                  </Typography.Text>
                </Table.Summary.Cell>
              </Table.Summary.Row>
            )}
--- a/client/src/components/owner-detail-jobs/owner-detail-jobs.component.jsx
+++ b/client/src/components/owner-detail-jobs/owner-detail-jobs.component.jsx
@@ -6,6 +6,7 @@ import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import { alphaSort, statusSort } from "../../utils/sorters";
 import OwnerDetailUpdateJobsComponent from "../owner-detail-update-jobs/owner-detail-update-jobs.component";

 const mapStateToProps = createStructuredSelector({
@@ -15,6 +16,15 @@ const mapStateToProps = createStructuredSelector({
 function OwnerDetailJobsComponent({ bodyshop, owner }) {
  const { t } = useTranslation();
  const [selectedJobs, setSelectedJobs] = useState([]);
+  const [state, setState] = useState({
+    sortedInfo: {},
+    filteredInfo: { text: "" },
+  });
+
+  const handleTableChange = (pagination, filters, sorter) => {
+    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+  };
+  
  const columns = [
    {
      title: t("jobs.fields.ro_number"),
@@ -26,6 +36,9 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
          {record.ro_number || t("general.labels.na")}
        </Link>
      ),
+      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
+      sortOrder:
+        state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
    },
    {
      title: t("jobs.fields.vehicle"),
@@ -46,11 +59,17 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
      title: t("jobs.fields.clm_no"),
      dataIndex: "clm_no",
      key: "clm_no",
+      sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
+      sortOrder:
+        state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
    },
    {
      title: t("jobs.fields.status"),
      dataIndex: "status",
      key: "status",
+      sorter: (a, b) => statusSort(a.status, b.status, bodyshop.md_ro_statuses.statuses),
+      sortOrder:
+        state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
    },

    {
@@ -60,6 +79,9 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
      render: (text, record) => (
        <CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
      ),
+      sorter: (a, b) => a.clm_total - b.clm_total,
+      sortOrder:
+        state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
    },
  ];

@@ -80,6 +102,7 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
        scroll={{ x: true }}
        rowKey="id"
        dataSource={owner.jobs}
+        onChange={handleTableChange}
        rowSelection={{
          onSelect: (record, selected, selectedRows) => {
            setSelectedJobs(selectedRows ? selectedRows.map((i) => i.id) : []);
--- a/client/src/components/owner-search-select/owner-search-select.component.jsx
+++ b/client/src/components/owner-search-select/owner-search-select.component.jsx
@@ -21,7 +21,8 @@ const OwnerSearchSelect = ({ value, onChange, onBlur, disabled }, ref) => {
    useLazyQuery(SEARCH_OWNERS_BY_ID_FOR_AUTOCOMPLETE);

  const executeSearch = (v) => {
-    callSearch(v);
+    if (v && v.variables?.search !== "" && v.variables.search.length >= 2)
+      callSearch(v);
  };
  const debouncedExecuteSearch = _.debounce(executeSearch, 500);

--- a/client/src/components/owners-list/owners-list.component.jsx
+++ b/client/src/components/owners-list/owners-list.component.jsx
@@ -106,7 +106,11 @@ export default function OwnersListComponent({
          <Input.Search
            placeholder={search.search || t("general.labels.search")}
            onSearch={(value) => {
-              search.search = value;
+              if (value?.length >= 3) {
+                search.search = value;
+              } else {
+                delete search.search;
+              }
              history.push({ search: queryString.stringify(search) });
            }}
            enterButton
--- a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
+++ b/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
@@ -113,6 +113,8 @@ export function PartsOrderListTableComponent({
                  id: pol.id,
                  line_desc: pol.line_desc,
                  quantity: pol.quantity,
+                  act_price: pol.act_price,
+                  oem_partno: pol.oem_partno,
                };
              }),
            },
--- a/client/src/components/parts-receive-modal/parts-receive-modal.component.jsx
+++ b/client/src/components/parts-receive-modal/parts-receive-modal.component.jsx
@@ -79,6 +79,20 @@ export function PartsReceiveModalComponent({ bodyshop, form }) {
                      >
                        <Input />
                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.oem_partno")}
+                        key={`${index}oem_partno`}
+                        name={[field.name, "oem_partno"]}
+                      >
+                        <Input disabled />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.act_price")}
+                        key={`${index}act_price`}
+                        name={[field.name, "act_price"]}
+                      >
+                        <Input disabled />
+                      </Form.Item>
                      <Form.Item
                        label={t("joblines.fields.location")}
                        key={`${index}location`}
--- a/client/src/components/payable-export-all-button/payable-export-all-button.component.jsx
+++ b/client/src/components/payable-export-all-button/payable-export-all-button.component.jsx
@@ -1,26 +1,39 @@
 import { useMutation } from "@apollo/client";
 import { Button, notification } from "antd";
 import axios from "axios";
+import _ from "lodash";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
+import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { auth } from "../../firebase/firebase.utils";
+import { auth, logImEXEvent } from "../../firebase/firebase.utils";
+import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { UPDATE_BILLS } from "../../graphql/bills.queries";
 import {
  selectBodyshop,
  selectCurrentUser,
 } from "../../redux/user/user.selectors";
-import { logImEXEvent } from "../../firebase/firebase.utils";
-import _ from "lodash";
-import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
-import { Link } from "react-router-dom";
+import client from "../../utils/GraphQLClient";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
  currentUser: selectCurrentUser,
 });

+function updateBillCache(items) {
+  client.cache.modify({
+    id: "ROOT_QUERY",
+    fields: {
+      bills(existingJobs = []) {
+        return existingJobs.filter(
+          (billRef) => billRef.__ref.includes(items) === false
+        );
+      },
+    },
+  });
+}
+
 export function PayableExportAll({
  bodyshop,
  currentUser,
@@ -97,7 +110,9 @@ export function PayableExportAll({
      proms.push(
        (async () => {
          const failedTransactions = groupedData[key].filter((r) => !r.success);
-
+          const successfulTransactions = groupedData[key].filter(
+            (r) => r.success
+          );
          if (failedTransactions.length > 0) {
            //Uh oh. At least one was no good.
            failedTransactions.map((ft) =>
@@ -143,7 +158,15 @@ export function PayableExportAll({

              const billUpdateResponse = await updateBill({
                variables: {
-                  billIdList: [key],
+                  billIdList: successfulTransactions.map(
+                    (st) =>
+                      st[
+                        bodyshop.accountingconfig &&
+                        bodyshop.accountingconfig.qbo
+                          ? "billid"
+                          : "id"
+                      ]
+                  ),
                  bill: {
                    exported: true,
                    exported_at: new Date(),
@@ -156,6 +179,11 @@ export function PayableExportAll({
                  key: "billsuccessexport",
                  message: t("bills.successes.exported"),
                });
+                updateBillCache(
+                  billUpdateResponse.data.update_bills.returning.map(
+                    (bill) => bill.id
+                  )
+                );
              } else {
                notification["error"]({
                  message: t("bills.errors.exporting", {
@@ -164,6 +192,26 @@ export function PayableExportAll({
                });
              }
            }
+            if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && successfulTransactions.length > 0) {
+              notification.open({
+                type: "success",
+                key: "billsuccessexport",
+                message: t("bills.successes.exported"),
+              });
+              updateBillCache([
+                ...new Set(
+                  successfulTransactions.map(
+                    (st) =>
+                      st[
+                        bodyshop.accountingconfig &&
+                        bodyshop.accountingconfig.qbo
+                          ? "billid"
+                          : "id"
+                      ]
+                  )
+                ),
+              ]);
+            }
          }
        })()
      );
@@ -172,8 +220,6 @@ export function PayableExportAll({
    await Promise.all(proms);
    if (!!completedCallback) completedCallback([]);
    if (!!loadingCallback) loadingCallback(false);
-    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
-
    setLoading(false);
  };

--- a/client/src/components/payable-export-button/payable-export-button.component.jsx
+++ b/client/src/components/payable-export-button/payable-export-button.component.jsx
@@ -4,22 +4,35 @@ import axios from "axios";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
+import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { auth } from "../../firebase/firebase.utils";
+import { auth, logImEXEvent } from "../../firebase/firebase.utils";
+import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { UPDATE_BILLS } from "../../graphql/bills.queries";
 import {
  selectBodyshop,
  selectCurrentUser,
 } from "../../redux/user/user.selectors";
-import { logImEXEvent } from "../../firebase/firebase.utils";
-import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
-import { Link } from "react-router-dom";
+import client from "../../utils/GraphQLClient";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
  currentUser: selectCurrentUser,
 });

+function updateBillCache(items) {
+  client.cache.modify({
+    id: "ROOT_QUERY",
+    fields: {
+      bills(existingJobs = []) {
+        return existingJobs.filter(
+          (billRef) => billRef.__ref.includes(items) === false
+        );
+      },
+    },
+  });
+}
+
 export function PayableExportButton({
  bodyshop,
  currentUser,
@@ -159,6 +172,11 @@ export function PayableExportButton({
            key: "billsuccessexport",
            message: t("bills.successes.exported"),
          });
+          updateBillCache(
+            billUpdateResponse.data.update_bills.returning.map(
+              (bill) => bill.id
+            )
+          );
        } else {
          notification["error"]({
            message: t("bills.errors.exporting", {
@@ -167,7 +185,25 @@ export function PayableExportButton({
          });
        }
      }
-      if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
+      if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && successfulTransactions.length > 0) {
+        notification.open({
+          type: "success",
+          key: "billsuccessexport",
+          message: t("bills.successes.exported"),
+        });
+        updateBillCache([
+          ...new Set(
+            successfulTransactions.map(
+              (st) =>
+                st[
+                  bodyshop.accountingconfig && bodyshop.accountingconfig.qbo
+                    ? "billid"
+                    : "id"
+                ]
+            )
+          ),
+        ]);
+      }

      if (setSelectedBills) {
        setSelectedBills((selectedBills) => {
--- a/client/src/components/payment-expanded-row/payment-expanded-row.component.jsx
+++ b/client/src/components/payment-expanded-row/payment-expanded-row.component.jsx
@@ -0,0 +1,186 @@
+import { useMutation, useQuery } from "@apollo/client";
+import {
+  Button,
+  Descriptions,
+  InputNumber,
+  Modal,
+  Space,
+  notification,
+} from "antd";
+import axios from "axios";
+import moment from "moment";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import {
+  GET_REFUNDABLE_AMOUNT_BY_JOBID,
+  INSERT_PAYMENT_RESPONSE,
+  QUERY_PAYMENT_RESPONSE_BY_PAYMENT_ID,
+} from "../../graphql/payment_response.queries";
+import { INSERT_NEW_PAYMENT } from "../../graphql/payments.queries";
+import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import { DateTimeFormatter } from "../../utils/DateFormatter";
+
+const { confirm } = Modal;
+
+const openNotificationWithIcon = (type, t) => {
+  notification[type]({
+    message: t("job_payments.notifications.error.title"),
+    description: t("job_payments.notifications.error.description"),
+  });
+};
+
+const PaymentExpandedRowComponent = ({ record, bodyshop }) => {
+  const [refundAmount, setRefundAmount] = useState(0);
+  const [insertPayment] = useMutation(INSERT_NEW_PAYMENT);
+  const [insertPaymentResponse] = useMutation(INSERT_PAYMENT_RESPONSE);
+  const { t } = useTranslation();
+
+  const { loading, error, data } = useQuery(
+    QUERY_PAYMENT_RESPONSE_BY_PAYMENT_ID,
+    {
+      variables: {
+        paymentid: record.id,
+        fetchPolicy: "network-only",
+        nextFetchPolicy: "network-only",
+      },
+    }
+  );
+
+  const { data: refundable_amount, refetch } = useQuery(
+    GET_REFUNDABLE_AMOUNT_BY_JOBID,
+    {
+      variables: {
+        jobid: record.jobid,
+      },
+    }
+  );
+
+  const insertPayments = async (payment_response, refund_response) => {
+    await insertPayment({
+      variables: {
+        paymentInput: {
+          amount: -refund_response.data.amount,
+          transactionid: payment_response.response.receiptelements.transid,
+          payer: record.payer,
+          type: "Refund",
+          jobid: payment_response.jobid,
+          date: moment(Date.now()),
+        },
+      },
+      update(cache, { data }) {
+        cache.modify({
+          id: cache.identify({
+            id: payment_response.jobid,
+            __typename: "jobs",
+          }),
+          fields: {
+            payments(payments) {
+              return [...data.insert_payments.returning, ...payments];
+            },
+          },
+        });
+      },
+    });
+
+    await insertPaymentResponse({
+      variables: {
+        paymentResponse: {
+          amount: -refund_response.data.amount,
+          bodyshopid: payment_response.bodyshopid,
+          paymentid: payment_response.paymentid,
+          jobid: payment_response.jobid,
+          declinereason: "Refund",
+          ext_paymentid: payment_response.ext_paymentid,
+          successful: true,
+          response: refund_response.data,
+        },
+      },
+    });
+  };
+
+  const showConfirm = (payment_response) => {
+    confirm({
+      title: "Do you want to refund payment?",
+      content:
+        "The payment will be refunded. Click OK to confirm and Cancel to dismiss.",
+      async onOk() {
+        const refundResponse = await axios.post("/intellipay/payment_refund", {
+          bodyshop,
+          amount: refundAmount,
+          paymentid: payment_response.ext_paymentid,
+        });
+
+        if (refundResponse.data.status < 0) {
+          openNotificationWithIcon("error", t);
+          return;
+        }
+
+        insertPayments(payment_response, refundResponse);
+
+        // refetch refundable amount
+        refetch();
+      },
+      onCancel() {},
+    });
+  };
+
+  if (loading) return null;
+
+  if (error) return <p>Error loading data. Please Reload</p>;
+
+  const payment_response = data.payment_response[0];
+  const max_refundable_amount =
+    refundable_amount?.payment_response_aggregate.aggregate.sum.amount;
+
+  return (
+    <div>
+      <Descriptions
+        title={t("job_payments.titles.descriptions")}
+        contentStyle={{ fontWeight: "600" }}
+        column={4}
+      >
+        <Descriptions.Item label={t("job_payments.titles.payer")}>
+          {record.payer}
+        </Descriptions.Item>
+        <Descriptions.Item label={t("job_payments.titles.payername")}>
+          {payment_response?.response?.nameOnCard ?? ""}
+        </Descriptions.Item>
+        <Descriptions.Item label={t("job_payments.titles.amount")}>
+          <CurrencyFormatter>{record.amount}</CurrencyFormatter>
+        </Descriptions.Item>
+        <Descriptions.Item label={t("job_payments.titles.dateOfPayment")}>
+          {<DateTimeFormatter>{record.created_at}</DateTimeFormatter>}
+        </Descriptions.Item>
+        <Descriptions.Item label={t("job_payments.titles.transactionid")}>
+          {record.transactionid}
+        </Descriptions.Item>
+        <Descriptions.Item label={t("job_payments.titles.paymentid")}>
+          {payment_response?.response?.paymentreferenceid ?? ""}
+        </Descriptions.Item>
+        <Descriptions.Item label={t("job_payments.titles.paymenttype")}>
+          {record.type}
+        </Descriptions.Item>
+        <Descriptions.Item label={t("job_payments.titles.paymentnum")}>
+          {record.paymentnum}
+        </Descriptions.Item>
+        {payment_response && (
+          <Descriptions.Item label={t("job_payments.titles.refundamount")}>
+            <Space>
+              <InputNumber
+                onChange={setRefundAmount}
+                max={max_refundable_amount}
+                min={0}
+              />
+
+              <Button onClick={() => showConfirm(payment_response)}>
+                {t("job_payments.buttons.refundpayment")}
+              </Button>
+            </Space>
+          </Descriptions.Item>
+        )}
+      </Descriptions>
+    </div>
+  );
+};
+
+export default PaymentExpandedRowComponent;
--- a/client/src/components/payment-export-button/payment-export-button.component.jsx
+++ b/client/src/components/payment-export-button/payment-export-button.component.jsx
@@ -13,12 +13,26 @@ import {
  selectBodyshop,
  selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import client from "../../utils/GraphQLClient";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
  currentUser: selectCurrentUser,
 });

+function updatePaymentCache(items) {
+  client.cache.modify({
+    id: "ROOT_QUERY",
+    fields: {
+      payments(existingJobs = []) {
+        return existingJobs.filter(
+          (paymentRef) => paymentRef.__ref.includes(items) === false
+        );
+      },
+    },
+  });
+}
+
 export function PaymentExportButton({
  bodyshop,
  currentUser,
@@ -157,6 +171,11 @@ export function PaymentExportButton({
            key: "paymentsuccessexport",
            message: t("payments.successes.exported"),
          });
+          updatePaymentCache(
+            paymentUpdateResponse.data.update_payments.returning.map(
+              (payment) => payment.id
+            )
+          );
        } else {
          notification["error"]({
            message: t("payments.errors.exporting", {
@@ -172,7 +191,25 @@ export function PaymentExportButton({
        });
      }
    }
-    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
+    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && successfulTransactions.length > 0) {
+      notification.open({
+        type: "success",
+        key: "paymentsuccessexport",
+        message: t("payments.successes.exported"),
+      });
+      updatePaymentCache([
+        ...new Set(
+          successfulTransactions.map(
+            (st) =>
+              st[
+                bodyshop.accountingconfig && bodyshop.accountingconfig.qbo
+                  ? "paymentid"
+                  : "id"
+              ]
+          )
+        ),
+      ]);
+    }
    if (!!loadingCallback) loadingCallback(false);
    setLoading(false);
  };
--- a/client/src/components/payments-export-all-button/payments-export-all-button.component.jsx
+++ b/client/src/components/payments-export-all-button/payments-export-all-button.component.jsx
@@ -13,11 +13,25 @@ import {
  selectBodyshop,
  selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import client from "../../utils/GraphQLClient";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
  currentUser: selectCurrentUser,
 });

+function updatePaymentCache(items) {
+  client.cache.modify({
+    id: "ROOT_QUERY",
+    fields: {
+      payments(existingJobs = []) {
+        return existingJobs.filter(
+          (paymentRef) => paymentRef.__ref.includes(items) === false
+        );
+      },
+    },
+  });
+}
+
 export function PaymentsExportAllButton({
  bodyshop,
  currentUser,
@@ -25,7 +39,7 @@ export function PaymentsExportAllButton({
  disabled,
  loadingCallback,
  completedCallback,
-  refetch
+  refetch,
 }) {
  const { t } = useTranslation();
  const [updatePayments] = useMutation(UPDATE_PAYMENTS);
@@ -84,7 +98,9 @@ export function PaymentsExportAllButton({
      proms.push(
        (async () => {
          const failedTransactions = groupedData[key].filter((r) => !r.success);
-
+          const successfulTransactions = groupedData[key].filter(
+            (r) => r.success
+          );
          if (failedTransactions.length > 0) {
            //Uh oh. At least one was no good.
            failedTransactions.map((ft) =>
@@ -130,7 +146,15 @@ export function PaymentsExportAllButton({
              });
              const paymentUpdateResponse = await updatePayments({
                variables: {
-                  paymentIdList: [key],
+                  paymentIdList: successfulTransactions.map(
+                    (st) =>
+                      st[
+                        bodyshop.accountingconfig &&
+                        bodyshop.accountingconfig.qbo
+                          ? "paymentid"
+                          : "id"
+                      ]
+                  ),
                  payment: {
                    exportedat: new Date(),
                  },
@@ -142,6 +166,11 @@ export function PaymentsExportAllButton({
                  key: "paymentsuccessexport",
                  message: t("payments.successes.exported"),
                });
+                updatePaymentCache(
+                  paymentUpdateResponse.data.update_payments.returning.map(
+                    (payment) => payment.id
+                  )
+                );
              } else {
                notification["error"]({
                  message: t("payments.errors.exporting", {
@@ -150,6 +179,26 @@ export function PaymentsExportAllButton({
                });
              }
            }
+            if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && successfulTransactions.length > 0) {
+              notification.open({
+                type: "success",
+                key: "paymentsuccessexport",
+                message: t("payments.successes.exported"),
+              });
+              updatePaymentCache([
+                ...new Set(
+                  successfulTransactions.map(
+                    (st) =>
+                      st[
+                        bodyshop.accountingconfig &&
+                        bodyshop.accountingconfig.qbo
+                          ? "paymentid"
+                          : "id"
+                      ]
+                  )
+                ),
+              ]);
+            }
          }
        })()
      );
@@ -157,7 +206,6 @@ export function PaymentsExportAllButton({
    await Promise.all(proms);
    if (!!completedCallback) completedCallback([]);
    if (!!loadingCallback) loadingCallback(false);
-    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
    setLoading(false);
  };

--- a/client/src/components/payments-generate-link/payments-generate-link.component.jsx
+++ b/client/src/components/payments-generate-link/payments-generate-link.component.jsx
@@ -0,0 +1,156 @@
+import { CopyFilled } from "@ant-design/icons";
+import { Button, Form, Popover, Space, message } from "antd";
+import axios from "axios";
+import Dinero from "dinero.js";
+import { parsePhoneNumber } from "libphonenumber-js";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import {
+  openChatByPhone,
+  setMessage,
+} from "../../redux/messaging/messaging.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
+  setMessage: (text) => dispatch(setMessage(text)),
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(PaymentsGenerateLink);
+
+export function PaymentsGenerateLink({
+  bodyshop,
+  callback,
+  job,
+  openChatByPhone,
+  setMessage,
+}) {
+  const { t } = useTranslation();
+  const [form] = Form.useForm();
+
+  const [visible, setVisible] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const [paymentLink, setPaymentLink] = useState(null);
+
+  const handleFinish = async ({ amount }) => {
+    setLoading(true);
+
+    const p = parsePhoneNumber(job.ownr_ph1, "CA");
+    setLoading(true);
+    const response = await axios.post("/intellipay/generate_payment_url", {
+      bodyshop,
+      amount: amount,
+      account: job.ro_number,
+      invoice: job.id,
+    });
+    setLoading(false);
+    setPaymentLink(response.data.shorUrl);
+
+    openChatByPhone({
+      phone_num: p.formatInternational(),
+      jobid: job.id,
+    });
+    setMessage(
+      t("payments.labels.smspaymentreminder", {
+        shopname: bodyshop.shopname,
+        amount: amount,
+        payment_link: response.data.shorUrl,
+      })
+    );
+
+    //Add in confirmation & errors.
+    if (callback) callback();
+
+    // setVisible(false);
+    setLoading(false);
+  };
+
+  const popContent = (
+    <div>
+      <Form onFinish={handleFinish} layout="vertical" form={form}>
+        <Form.Item
+          label={t("payments.fields.amount")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name="amount"
+        >
+          <CurrencyFormItemComponent />
+        </Form.Item>
+        {paymentLink && (
+          <Space direction="vertical">
+            <Space
+              style={{ cursor: "pointer" }}
+              onClick={() => {
+                navigator.clipboard.writeText(paymentLink);
+                message.success(t("general.actions.copied"));
+              }}
+            >
+              <div
+                onClick={() => {
+                  //Copy the link.
+                }}
+              >
+                {paymentLink}
+              </div>{" "}
+              <CopyFilled />
+            </Space>
+            <Button
+              onClick={() => {
+                const p = parsePhoneNumber(job.ownr_ph1, "CA");
+                openChatByPhone({
+                  phone_num: p.formatInternational(),
+                  jobid: job.id,
+                });
+                setMessage(
+                  t("payments.labels.smspaymentreminder", {
+                    shopname: bodyshop.shopname,
+                    amount: Dinero({
+                      amount: Math.round(form.getFieldValue("amount") * 100),
+                    }).toFormat(),
+                    payment_link: paymentLink,
+                  })
+                );
+              }}
+            >
+              {t("general.actions.sendbysms")}
+            </Button>
+          </Space>
+        )}
+      </Form>
+      <Space>
+        <Button type="primary" onClick={() => form.submit()}>
+          {t("general.actions.submit")}
+        </Button>
+        <Button
+          onClick={() => {
+            form.resetFields();
+            setPaymentLink(null);
+            setVisible(false);
+          }}
+        >
+          {t("general.actions.cancel")}
+        </Button>
+      </Space>
+    </div>
+  );
+
+  return (
+    <Popover content={popContent} visible={visible}>
+      <Button onClick={() => setVisible(true)} loading={loading}>
+        {t("payments.actions.generatepaymentlink")}
+      </Button>
+    </Popover>
+  );
+}
--- a/client/src/components/print-center-item/print-center-item.component.jsx
+++ b/client/src/components/print-center-item/print-center-item.component.jsx
@@ -5,11 +5,13 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { setEmailOptions } from "../../redux/email/email.actions";
 import { selectPrintCenter } from "../../redux/modals/modals.selectors";
+import { selectTechnician } from "../../redux/tech/tech.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 const mapStateToProps = createStructuredSelector({
  printCenterModal: selectPrintCenter,
  bodyshop: selectBodyshop,
+  technician: selectTechnician,
 });
 const mapDispatchToProps = (dispatch) => ({
  setEmailOptions: (e) => dispatch(setEmailOptions(e)),
@@ -22,6 +24,7 @@ export function PrintCenterItemComponent({
  id,
  bodyshop,
  disabled,
+  technician,
 }) {
  const [loading, setLoading] = useState(false);
  const { context } = printCenterModal;
@@ -44,19 +47,24 @@ export function PrintCenterItemComponent({
      <Space wrap>
        {item.title}
        <PrinterOutlined onClick={renderToNewWindow} />
-        <MailOutlined
-          onClick={() => {
-            GenerateDocument(
-              {
-                name: item.key,
-                variables: { id: id },
-              },
-              { to: context.job && context.job.ownr_ea, subject: item.subject },
-              "e",
-              id
-            );
-          }}
-        />
+        {!technician ? (
+          <MailOutlined
+            onClick={() => {
+              GenerateDocument(
+                {
+                  name: item.key,
+                  variables: { id: id },
+                },
+                {
+                  to: context.job && context.job.ownr_ea,
+                  subject: item.subject,
+                },
+                "e",
+                id
+              );
+            }}
+          />
+        ) : null}
        {loading && <Spin />}
      </Space>
    </li>
--- a/client/src/components/production-list-columns/production-list-columns.data.js
+++ b/client/src/components/production-list-columns/production-list-columns.data.js
@@ -455,8 +455,8 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
        state.sortedInfo.order,
      sorter: (a, b) =>
        alphaSort(
-          bodyshop.employees.find((e) => e.id === a.employee_body)?.first_name,
-          bodyshop.employees.find((e) => e.id === b.employee_body)?.first_name
+          bodyshop.employees?.find((e) => e.id === a.employee_body)?.first_name,
+          bodyshop.employees?.find((e) => e.id === b.employee_body)?.first_name
        ),
      render: (text, record) => (
        <ProductionListEmployeeAssignment
@@ -474,8 +474,8 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
        state.sortedInfo.order,
      sorter: (a, b) =>
        alphaSort(
-          bodyshop.employees.find((e) => e.id === a.employee_prep)?.first_name,
-          bodyshop.employees.find((e) => e.id === b.employee_prep)?.first_name
+          bodyshop.employees?.find((e) => e.id === a.employee_prep)?.first_name,
+          bodyshop.employees?.find((e) => e.id === b.employee_prep)?.first_name
        ),
      render: (text, record) => (
        <ProductionListEmployeeAssignment
@@ -492,8 +492,8 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
        state.sortedInfo.columnKey === "employee_csr" && state.sortedInfo.order,
      sorter: (a, b) =>
        alphaSort(
-          bodyshop.employees.find((e) => e.id === a.employee_csr)?.first_name,
-          bodyshop.employees.find((e) => e.id === b.employee_csr)?.first_name
+          bodyshop.employees?.find((e) => e.id === a.employee_csr)?.first_name,
+          bodyshop.employees?.find((e) => e.id === b.employee_csr)?.first_name
        ),
      render: (text, record) => (
        <ProductionListEmployeeAssignment record={record} type="employee_csr" />
@@ -508,9 +508,9 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
        state.sortedInfo.order,
      sorter: (a, b) =>
        alphaSort(
-          bodyshop.employees.find((e) => e.id === a.employee_refinish)
+          bodyshop.employees?.find((e) => e.id === a.employee_refinish)
            ?.first_name,
-          bodyshop.employees.find((e) => e.id === b.employee_refinish)
+          bodyshop.employees?.find((e) => e.id === b.employee_refinish)
            ?.first_name
        ),
      render: (text, record) => (
--- a/client/src/components/production-list-detail/production-list-detail.component.jsx
+++ b/client/src/components/production-list-detail/production-list-detail.component.jsx
@@ -1,31 +1,33 @@
+import { PrinterFilled } from "@ant-design/icons";
 import { useQuery } from "@apollo/client";
-import { Descriptions, Drawer, Space, PageHeader, Button } from "antd";
+import { Button, Descriptions, Drawer, PageHeader, Space } from "antd";
 import queryString from "query-string";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
 import { useHistory, useLocation } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
 import { QUERY_JOB_CARD_DETAILS } from "../../graphql/jobs.queries";
+import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectTechnician } from "../../redux/tech/tech.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
 import AlertComponent from "../alert/alert.component";
 import StartChatButton from "../chat-open-button/chat-open-button.component";
+import JobAtChange from "../job-at-change/job-at-change.component";
 import JobDetailCardsDocumentsComponent from "../job-detail-cards/job-detail-cards.documents.component";
 import JobDetailCardsNotesComponent from "../job-detail-cards/job-detail-cards.notes.component";
 import JobDetailCardsPartsComponent from "../job-detail-cards/job-detail-cards.parts.component";
 import JobEmployeeAssignments from "../job-employee-assignments/job-employee-assignments.container";
-import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
-import ProductionRemoveButton from "../production-remove-button/production-remove-button.component";
-import JobAtChange from "../job-at-change/job-at-change.component";
-import { PrinterFilled } from "@ant-design/icons";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { setModalContext } from "../../redux/modals/modals.actions";
 import ScoreboardAddButton from "../job-scoreboard-add-button/job-scoreboard-add-button.component";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import ProductionRemoveButton from "../production-remove-button/production-remove-button.component";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
+  technician: selectTechnician,
 });
 const mapDispatchToProps = (dispatch) => ({
  setPrintCenterContext: (context) =>
@@ -40,6 +42,7 @@ export function ProductionListDetail({
  bodyshop,
  jobs,
  setPrintCenterContext,
+  technician,
 }) {
  const search = queryString.parse(useLocation().search);
  const history = useHistory();
@@ -66,7 +69,9 @@ export function ProductionListDetail({
          title={theJob.ro_number}
          extra={
            <Space wrap>
-              <ProductionRemoveButton jobId={theJob.id} />{" "}
+              {!technician ? (
+                <ProductionRemoveButton jobId={theJob.id} />
+              ) : null}
              <Button
                onClick={() => {
                  setPrintCenterContext({
@@ -82,7 +87,9 @@ export function ProductionListDetail({
                <PrinterFilled />
                {t("jobs.actions.printCenter")}
              </Button>
-              <ScoreboardAddButton job={data ? data.jobs_by_pk : {}} />
+              {!technician ? (
+                <ScoreboardAddButton job={data ? data.jobs_by_pk : {}} />
+              ) : null}
            </Space>
          }
        />
--- a/client/src/components/production-list-table/production-list-print.component.jsx
+++ b/client/src/components/production-list-table/production-list-print.component.jsx
@@ -55,25 +55,27 @@ export function ProductionListPrint({ bodyshop }) {
          <Menu.SubMenu
            title={t("reportcenter.templates.production_by_technician_one")}
          >
-            {bodyshop.employees.map((e) => (
-              <Menu.Item
-                key={e.id}
-                onClick={async () => {
-                  setLoading(true);
-                  await GenerateDocument(
-                    {
-                      name: production_by_technician_one.key,
-                      variables: { id: e.id },
-                    },
-                    {},
-                    "p"
-                  );
-                  setLoading(false);
-                }}
-              >
-                {e.first_name} {e.last_name}
-              </Menu.Item>
-            ))}
+            {bodyshop.employees
+              .filter((e) => e.active)
+              .map((e) => (
+                <Menu.Item
+                  key={e.id}
+                  onClick={async () => {
+                    setLoading(true);
+                    await GenerateDocument(
+                      {
+                        name: production_by_technician_one.key,
+                        variables: { id: e.id },
+                      },
+                      {},
+                      "p"
+                    );
+                    setLoading(false);
+                  }}
+                >
+                  {e.first_name} {e.last_name}
+                </Menu.Item>
+              ))}
          </Menu.SubMenu>
          <Menu.SubMenu
            title={t("reportcenter.templates.production_by_category_one")}
--- a/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
+++ b/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
@@ -16,13 +16,17 @@ import { QUERY_LBR_HRS_BY_PK, UPDATE_JOBS } from "../../graphql/jobs.queries";
 import { setEmailOptions } from "../../redux/email/email.actions";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectSchedule } from "../../redux/modals/modals.selectors";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
 import { TemplateList } from "../../utils/TemplateConstants";
 import ScheduleJobModalComponent from "./schedule-job-modal.component";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
  scheduleModal: selectSchedule,
+  currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
  toggleModalVisible: () => dispatch(toggleModalVisible("schedule")),
@@ -34,6 +38,7 @@ export function ScheduleJobModalContainer({
  bodyshop,
  toggleModalVisible,
  setEmailOptions,
+  currentUser,
 }) {
  const { visible, context, actions } = scheduleModal;
  const { jobId, job, previousEvent } = context;
@@ -122,6 +127,7 @@ export function ScheduleJobModalContainer({
          end: moment(values.start).add(bodyshop.appt_length || 60, "minutes"),
          color: values.color,
          note: values.note,
+          created_by: currentUser.email,
        },
        jobId: jobId,
        altTransport: values.alt_transport,
--- a/client/src/components/schedule-manual-event/schedule-manual-event.component.jsx
+++ b/client/src/components/schedule-manual-event/schedule-manual-event.component.jsx
@@ -59,11 +59,12 @@ export function ScheduleManualEvent({ bodyshop, event }) {
          refetchQueries: ["QUERY_ALL_ACTIVE_APPOINTMENTS"],
        });
      }
+      form.resetFields();
+      setVisibility(false);
    } catch (error) {
      console.log(error);
    } finally {
      setLoading(false);
-      setVisibility(false);
    }
  };

--- a/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.container.jsx
+++ b/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.container.jsx
@@ -1,21 +1,26 @@
 import { useMutation } from "@apollo/client";
 import { Button, Card, Form, notification, Space } from "antd";
 import axios from "axios";
+import moment from "moment";
+import momenttz from "moment-timezone";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { INSERT_NEW_TIME_TICKET } from "../../graphql/timetickets.queries";
-import { selectTechnician } from "../../redux/tech/tech.selectors";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import TechClockInComponent from "./tech-job-clock-in-form.component";
-import TechJobPrintTickets from "../tech-job-print-tickets/tech-job-print-tickets.component";
-import moment from "moment";
 import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectTechnician } from "../../redux/tech/tech.selectors";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
+import TechJobPrintTickets from "../tech-job-print-tickets/tech-job-print-tickets.component";
+import TechClockInComponent from "./tech-job-clock-in-form.component";

 const mapStateToProps = createStructuredSelector({
  technician: selectTechnician,
  bodyshop: selectBodyshop,
+  currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
  setTimeTicketContext: (context) =>
@@ -25,9 +30,10 @@ export function TechClockInContainer({
  setTimeTicketContext,
  technician,
  bodyshop,
+  currentUser,
 }) {
  console.log(
-    "🚀 ~ file: tech-job-clock-in-form.container.jsx:29 ~ technician:",
+    "🚀 ~ file: tech-job-clock-in-form.container.jsx:30 ~ technician:",
    technician
  );
  const [form] = Form.useForm();
@@ -44,14 +50,20 @@ export function TechClockInContainer({
  const handleFinish = async (values) => {
    setLoading(true);
    const theTime = (await axios.post("/utils/time")).data;
-
    const result = await insertTimeTicket({
      variables: {
        timeTicketInput: [
          {
            bodyshopid: bodyshop.id,
            employeeid: technician.id,
-            date: moment(theTime).format("YYYY-MM-DD"),
+            date:
+              typeof bodyshop.timezone === "string"
+                ? momenttz.tz(theTime, bodyshop.timezone).format("YYYY-MM-DD")
+                : typeof bodyshop.timezone === "number"
+                ? moment(theTime)
+                    .format("YYYY-MM-DD")
+                    .utcOffset(bodyshop.timezone)
+                : moment(theTime).format("YYYY-MM-DD"),
            clockon: moment(theTime),
            jobid: values.jobid,
            cost_center: values.cost_center,
@@ -66,6 +78,12 @@ export function TechClockInContainer({
                      values.cost_center
                    );
                  }),
+            created_by: currentUser.email.concat(
+              " | ",
+              technician.employee_number
+                .concat(" ", technician.first_name, " ", technician.last_name)
+                .trim()
+            ),
          },
        ],
      },
@@ -100,13 +118,24 @@ export function TechClockInContainer({
                    employeeid: technician.id,
                    flat_rate: emps.flat_rate,
                  },
+                  created_by: currentUser.email.concat(
+                    " | ",
+                    technician.employee_number
+                      .concat(
+                        " ",
+                        technician.first_name,
+                        " ",
+                        technician.last_name
+                      )
+                      .trim()
+                  ),
                },
              });
            }}
          >
            {t("timetickets.actions.enter")}
          </Button>
-          <TechJobPrintTickets />
+          <TechJobPrintTickets attendacePrint={false} />
          <Button
            type="primary"
            onClick={() => form.submit()}
--- a/client/src/components/tech-job-print-tickets/tech-job-print-tickets.component.jsx
+++ b/client/src/components/tech-job-print-tickets/tech-job-print-tickets.component.jsx
@@ -1,4 +1,4 @@
-import { Button, Card, DatePicker, Form, Popover, Space } from "antd";
+import { Button, Card, DatePicker, Form, Popover, Radio, Space } from "antd";
 import moment from "moment";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -21,12 +21,13 @@ export default connect(
  mapDispatchToProps
 )(TechJobPrintTickets);

-export function TechJobPrintTickets({ technician, event }) {
+export function TechJobPrintTickets({ technician, event, attendacePrint }) {
  const { t } = useTranslation();

  const [loading, setLoading] = useState(false);
  const [form] = Form.useForm();
  const [visibility, setVisibility] = useState(false);
+  const Templates = TemplateList("report_center");

  useEffect(() => {
    if (visibility && event) {
@@ -44,7 +45,10 @@ export function TechJobPrintTickets({ technician, event }) {
    try {
      await GenerateDocument(
        {
-          name: TemplateList().timetickets_employee.key,
+          name:
+            attendacePrint === true
+              ? Templates.attendance_employee.key
+              : Templates.timetickets_employee.key,
          variables: {
            ...(start
              ? { start: moment(start).startOf("day").format("YYYY-MM-DD") }
@@ -60,9 +64,12 @@ export function TechJobPrintTickets({ technician, event }) {
        },
        {
          to: technician.email,
-          subject: TemplateList().timetickets_employee.subject,
+          subject:
+            attendacePrint === true
+              ? Templates.attendance_employee.subject
+              : Templates.timetickets_employee.subject,
        },
-        "p"
+        values.sendby // === "email" ? "e" : "p"
      );
    } catch (error) {
      console.log(error);
@@ -92,10 +99,25 @@ export function TechJobPrintTickets({ technician, event }) {
              format={"MM/DD/YYYY"}
            />
          </Form.Item>
-
+          <Form.Item dependencies={["dates"]}>
+            {() => {
+              return (
+                <Form.Item
+                  label={t("general.labels.sendby")}
+                  name="sendby"
+                  initialValue="p"
+                >
+                  <Radio.Group>
+                    <Radio value="e">{t("general.labels.email")}</Radio>
+                    <Radio value="p">{t("general.labels.print")}</Radio>
+                  </Radio.Group>
+                </Form.Item>
+              );
+            }}
+          </Form.Item>
          <Space wrap>
            <Button type="primary" onClick={() => form.submit()}>
-              {t("general.actions.print")}
+              {t("reportcenter.actions.generate")}
            </Button>
            <Button
              onClick={() => {
@@ -118,7 +140,7 @@ export function TechJobPrintTickets({ technician, event }) {
  return (
    <Popover content={overlay} visible={visibility}>
      <Button loading={loading} onClick={handleClick}>
-        {t("general.actions.print")}
+        {t("general.labels.reports")}
      </Button>
    </Popover>
  );
--- a/client/src/components/time-ticket-list/time-ticket-list.component.jsx
+++ b/client/src/components/time-ticket-list/time-ticket-list.component.jsx
@@ -9,9 +9,10 @@ import { createStructuredSelector } from "reselect";
 import {
  selectAuthLevel,
  selectBodyshop,
+  selectCurrentUser,
 } from "../../redux/user/user.selectors";
-import { onlyUnique } from "../../utils/arrayHelper";
 import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
+import { onlyUnique } from "../../utils/arrayHelper";
 import { alphaSort, dateSort } from "../../utils/sorters";
 import RbacWrapper, {
  HasRbacAccess,
@@ -20,6 +21,7 @@ import TimeTicketEnterButton from "../time-ticket-enter-button/time-ticket-enter
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
  authLevel: selectAuthLevel,
+  currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
  //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -29,6 +31,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(TimeTicketList);
 export function TimeTicketList({
  bodyshop,
  authLevel,
+  currentUser,
  disabled,
  loading,
  timetickets,
@@ -193,7 +196,15 @@ export function TimeTicketList({
        }
      },
    },
-
+    {
+      title: t("timetickets.fields.created_by"),
+      dataIndex: "created_by",
+      key: "created_by",
+      sorter: (a, b) => alphaSort(a.created_by, b.created_by),
+      sortOrder:
+        state.sortedInfo.columnKey === "created_by" && state.sortedInfo.order,
+      render: (text, record) => record.created_by,
+    },
    {
      title: t("general.labels.actions"),
      dataIndex: "actions",
@@ -254,7 +265,12 @@ export function TimeTicketList({
            (techConsole ? null : (
              <TimeTicketEnterButton
                actions={{ refetch }}
-                context={{ jobId: jobId }}
+                context={{
+                  jobId: jobId,
+                  created_by: currentUser.displayName
+                    ? currentUser.email.concat(" | ", currentUser.displayName)
+                    : currentUser.email,
+                }}
                disabled={disabled}
              >
                {t("timetickets.actions.enter")}
--- a/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
@@ -1,5 +1,5 @@
 import { useMutation, useQuery } from "@apollo/client";
-import { Button, Form, Modal, notification, PageHeader, Space } from "antd";
+import { Button, Form, Modal, PageHeader, Space, notification } from "antd";
 import moment from "moment";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -77,6 +77,7 @@ export function TimeTicketModalContainer({
                    )[0].rate
                  : null,
              bodyshopid: bodyshop.id,
+              created_by: timeTicketModal.context.created_by,
            },
          ],
        },
--- a/client/src/components/time-ticket-shift-active/time-ticket-shift-active.component.jsx
+++ b/client/src/components/time-ticket-shift-active/time-ticket-shift-active.component.jsx
@@ -4,48 +4,67 @@ import { useTranslation } from "react-i18next";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import DataLabel from "../data-label/data-label.component";
 import TechClockOffButton from "../tech-job-clock-out-button/tech-job-clock-out-button.component";
+import TechJobPrintTickets from "../tech-job-print-tickets/tech-job-print-tickets.component";

-export default function TimeTicketShiftActive({ timetickets, refetch }) {
+export default function TimeTicketShiftActive({
+  timetickets,
+  refetch,
+  isTechConsole,
+}) {
  const { t } = useTranslation();

  return (
    <div>
      {timetickets.length > 0 ? (
-        <div>
-          <Typography.Title level={2}>
-            {t("timetickets.labels.shiftalreadyclockedon")}
-          </Typography.Title>
-          <List
-            grid={{
-              gutter: 32,
-              xs: 1,
-              sm: 2,
-              md: 3,
-              lg: 4,
-              xl: 5,
-              xxl: 6,
-            }}
-            dataSource={timetickets || []}
-            renderItem={(ticket) => (
-              <List.Item>
-                <Card
-                  title={t(ticket.memo)}
-                  actions={[
-                    <TechClockOffButton
-                      jobId={ticket.jobid}
-                      timeTicketId={ticket.id}
-                      completedCallback={refetch}
-                      isShiftTicket
-                    />,
-                  ]}
-                >
-                  <DataLabel label={t("timetickets.fields.clockon")}>
-                    <DateTimeFormatter>{ticket.clockon}</DateTimeFormatter>
-                  </DataLabel>
-                </Card>
-              </List.Item>
-            )}
-          ></List>
+        <div
+          style={{
+            display: "flex",
+            justifyContent: "space-between",
+            flexDirection: "column",
+            height: "100%",
+          }}
+        >
+          <div style={{ display: "flex", justifyContent: "space-between" }}>
+            <Typography.Title level={2}>
+              {t("timetickets.labels.shiftalreadyclockedon")}
+            </Typography.Title>
+            {isTechConsole ? (
+              <TechJobPrintTickets attendacePrint={true} />
+            ) : null}
+          </div>
+          <div style={{ flexGrow: 1 }}>
+            <List
+              grid={{
+                gutter: 32,
+                xs: 1,
+                sm: 2,
+                md: 3,
+                lg: 4,
+                xl: 5,
+                xxl: 6,
+              }}
+              dataSource={timetickets || []}
+              renderItem={(ticket) => (
+                <List.Item>
+                  <Card
+                    title={t(ticket.memo)}
+                    actions={[
+                      <TechClockOffButton
+                        jobId={ticket.jobid}
+                        timeTicketId={ticket.id}
+                        completedCallback={refetch}
+                        isShiftTicket
+                      />,
+                    ]}
+                  >
+                    <DataLabel label={t("timetickets.fields.clockon")}>
+                      <DateTimeFormatter>{ticket.clockon}</DateTimeFormatter>
+                    </DataLabel>
+                  </Card>
+                </List.Item>
+              )}
+            ></List>
+          </div>
        </div>
      ) : null}
    </div>
--- a/client/src/components/time-ticket-shift-form/time-ticket-shift-form.container.jsx
+++ b/client/src/components/time-ticket-shift-form/time-ticket-shift-form.container.jsx
@@ -1,7 +1,8 @@
 import { useMutation } from "@apollo/client";
-import { Button, Form, notification } from "antd";
+import { Button, Form, Space, notification } from "antd";
 import axios from "axios";
 import moment from "moment";
+import momenttz from "moment-timezone";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -12,6 +13,7 @@ import {
  selectBodyshop,
  selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import TechJobPrintTickets from "../tech-job-print-tickets/tech-job-print-tickets.component";
 import TimeTicektShiftComponent from "./time-ticket-shift-form.component";
 const mapStateToProps = createStructuredSelector({
  currentUser: selectCurrentUser,
@@ -29,6 +31,10 @@ export function TimeTicektShiftContainer({
  isTechConsole,
  checkIfAlreadyClocked,
 }) {
+  console.log(
+    "🚀 ~ file: time-ticket-shift-form.container.jsx:28 ~ technician:",
+    technician
+  );
  const [form] = Form.useForm();
  const [insertTimeTicket] = useMutation(INSERT_NEW_TIME_TICKET);
  const { t } = useTranslation();
@@ -63,8 +69,30 @@ export function TimeTicektShiftContainer({
              employeeid: isTechConsole ? technician.id : employeeId,
              cost_center: "timetickets.labels.shift",
              clockon: theTime,
-              date: theTime,
+              date:
+                typeof bodyshop.timezone === "string"
+                  ? momenttz.tz(theTime, bodyshop.timezone).format("YYYY-MM-DD")
+                  : typeof bodyshop.timezone === "number"
+                  ? moment(theTime)
+                      .utcOffset(bodyshop.timezone)
+                      .format("YYYY-MM-DD")
+                  : moment(theTime).format("YYYY-MM-DD"),
              memo: values.memo,
+              created_by: isTechConsole
+                ? currentUser.email.concat(
+                    " | ",
+                    technician.employee_number
+                      .concat(
+                        " ",
+                        technician.first_name,
+                        " ",
+                        technician.last_name
+                      )
+                      .trim()
+                  )
+                : currentUser.displayName
+                ? currentUser.email.concat(" | ", currentUser.displayName)
+                : currentUser.email,
            },
          ],
        },
@@ -98,9 +126,14 @@ export function TimeTicektShiftContainer({
        initialValues={{ cost_center: t("timetickets.labels.shift") }}
      >
        <TimeTicektShiftComponent form={form} />
-        <Button htmlType="submit" loading={loading}>
-          {t("timetickets.actions.clockin")}
-        </Button>
+        <Space wrap>
+          <Button htmlType="submit" loading={loading} type="primary">
+            {t("timetickets.actions.clockin")}
+          </Button>
+          {isTechConsole === true ? (
+            <TechJobPrintTickets attendacePrint={true} />
+          ) : null}
+        </Space>
      </Form>
    </div>
  );
--- a/client/src/components/time-ticket-shift/time-ticket-shift.container.jsx
+++ b/client/src/components/time-ticket-shift/time-ticket-shift.container.jsx
@@ -76,6 +76,7 @@ export function TimeTicketShiftContainer({
        <TimeTicketShiftActive
          timetickets={data ? data.timetickets : []}
          refetch={refetch}
+          isTechConsole={isTechConsole}
        />
      ) : (
        <TimeTicketShiftFormContainer
--- a/client/src/components/vehicle-detail-jobs/vehicle-detail-jobs.component.jsx
+++ b/client/src/components/vehicle-detail-jobs/vehicle-detail-jobs.component.jsx
@@ -6,8 +6,9 @@ import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import VehicleDetailUpdateJobsComponent from "../vehicle-detail-update-jobs/vehicle-detail-update-jobs.component";
+import { alphaSort, statusSort } from "../../utils/sorters";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import VehicleDetailUpdateJobsComponent from "../vehicle-detail-update-jobs/vehicle-detail-update-jobs.component";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -16,6 +17,14 @@ const mapStateToProps = createStructuredSelector({
 export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
  const { t } = useTranslation();
  const [selectedJobs, setSelectedJobs] = useState([]);
+  const [state, setState] = useState({
+    sortedInfo: {},
+    filteredInfo: { text: "" },
+  });
+
+  const handleTableChange = (pagination, filters, sorter) => {
+    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+  };

  const columns = [
    {
@@ -28,6 +37,9 @@ export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
          {record.ro_number || t("general.labels.na")}
        </Link>
      ),
+      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
+      sortOrder:
+        state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
    },
    {
      title: t("jobs.fields.owner"),
@@ -43,11 +55,17 @@ export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
      title: t("jobs.fields.clm_no"),
      dataIndex: "clm_no",
      key: "clm_no",
+      sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
+      sortOrder:
+        state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
    },
    {
      title: t("jobs.fields.status"),
      dataIndex: "status",
      key: "status",
+      sorter: (a, b) => statusSort(a.status, b.status, bodyshop.md_ro_statuses.statuses),
+      sortOrder:
+        state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
    },

    {
@@ -57,6 +75,9 @@ export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
      render: (text, record) => (
        <CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
      ),
+      sorter: (a, b) => a.clm_total - b.clm_total,
+      sortOrder:
+        state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
    },
  ];

@@ -76,6 +97,7 @@ export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
        rowKey="id"
        scroll={{ x: true }}
        dataSource={vehicle.jobs}
+        onChange={handleTableChange}
        rowSelection={{
          onSelect: (record, selected, selectedRows) => {
            setSelectedJobs(selectedRows ? selectedRows.map((i) => i.id) : []);
--- a/client/src/components/vehicle-search-select/vehicle-search-select.component.jsx
+++ b/client/src/components/vehicle-search-select/vehicle-search-select.component.jsx
@@ -16,13 +16,12 @@ const VehicleSearchSelect = ({ value, onChange, onBlur, disabled }, ref) => {
    SEARCH_VEHICLES_FOR_AUTOCOMPLETE
  );

-  const [
-    callIdSearch,
-    { loading: idLoading, error: idError, data: idData },
-  ] = useLazyQuery(SEARCH_VEHICLES_BY_ID_FOR_AUTOCOMPLETE);
+  const [callIdSearch, { loading: idLoading, error: idError, data: idData }] =
+    useLazyQuery(SEARCH_VEHICLES_BY_ID_FOR_AUTOCOMPLETE);

  const executeSearch = (v) => {
-    callSearch(v);
+    if (v && v.variables?.search !== "" && v.variables.search.length >= 2)
+      callSearch(v);
  };
  const debouncedExecuteSearch = _.debounce(executeSearch, 500);

--- a/client/src/graphql/bills.queries.js
+++ b/client/src/graphql/bills.queries.js
@@ -5,6 +5,7 @@ export const INSERT_NEW_BILL = gql`
    insert_bills(objects: $bill) {
      returning {
        id
+        invoice_number
      }
    }
  }
--- a/client/src/graphql/jobs-lines.queries.js
+++ b/client/src/graphql/jobs-lines.queries.js
@@ -57,6 +57,7 @@ export const GET_LINE_TICKET_BY_PK = gql`
      actualhrs
      ciecacode
      cost_center
+      created_by
      date
      id
      jobid
@@ -218,6 +219,7 @@ export const GET_JOB_LINES_TO_ENTER_BILL = gql`
        id
        ro_number
      }
+      v_make_desc
    }
  }
 `;
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -574,7 +574,6 @@ export const GET_JOB_BY_PK = gql`
      est_co_nm
      est_ct_fn
      est_ct_ln
-
      est_ph1
      est_ea
      selling_dealer
@@ -746,8 +745,8 @@ export const GET_JOB_BY_PK = gql`
        jobid
        amount
        payer
+        paymentnum
        created_at
-        stripeid
        transactionid
        memo
        date
@@ -1243,7 +1242,7 @@ export const SEARCH_JOBS_FOR_AUTOCOMPLETE = gql`
  ) {
    search_jobs(
      args: { search: $search }
-      limit: 50
+      limit: 25
      where: {
        _and: {
          converted: { _eq: $isConverted }
--- a/client/src/graphql/owners.queries.js
+++ b/client/src/graphql/owners.queries.js
@@ -36,7 +36,7 @@ export const SEARCH_OWNERS_FOR_AUTOCOMPLETE = gql`
  query SEARCH_OWNERS_FOR_AUTOCOMPLETE($search: String) {
    search_owners(
      args: { search: $search }
-      limit: 50
+      limit: 25
      order_by: { ownr_ln: desc_nulls_last }
    ) {
      id
@@ -69,7 +69,7 @@ export const QUERY_OWNER_BY_ID = gql`
      preferred_contact
      note
      tax_number
-      jobs {
+      jobs(order_by: { date_open: desc }) {
        id
        ro_number
        clm_no
--- a/client/src/graphql/payment_response.queries.js
+++ b/client/src/graphql/payment_response.queries.js
@@ -0,0 +1,53 @@
+import { gql } from "@apollo/client";
+
+export const INSERT_PAYMENT_RESPONSE = gql`
+  mutation INSERT_PAYMENT_RESPONSE(
+    $paymentResponse: [payment_response_insert_input!]!
+  ) {
+    insert_payment_response(objects: $paymentResponse) {
+      returning {
+        id
+      }
+    }
+  }
+`;
+
+export const QUERY_PAYMENT_RESPONSE_BY_PAYMENT_ID = gql`
+  query QUERY_PAYMENT_RESPONSE_BY_PK($paymentid: uuid!) {
+    payment_response(where: { paymentid: { _eq: $paymentid } }) {
+      id
+      jobid
+      bodyshopid
+      paymentid
+      amount
+      declinereason
+      ext_paymentid
+      successful
+      response
+    }
+  }
+`;
+
+export const QUERY_RO_AND_OWNER_BY_JOB_PKS = gql`
+  query QUERY_RO_AND_OWNER_BY_JOB_PKS($jobids: [uuid!]!) {
+    jobs(where: { id: { _in: $jobids } }) {
+      ro_number
+      ownr_fn
+      ownr_ln
+      ownr_ea
+      ownr_zip
+    }
+  }
+`;
+
+export const GET_REFUNDABLE_AMOUNT_BY_JOBID = gql`
+  query GET_REFUNDABLE_AMOUNT_BY_JOBID($jobid: uuid!) {
+    payment_response_aggregate(where: { jobid: { _eq: $jobid } }) {
+      aggregate {
+        sum {
+          amount
+        }
+      }
+    }
+  }
+`;
--- 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
      }
    }
  }
--- a/client/src/graphql/timetickets.queries.js
+++ b/client/src/graphql/timetickets.queries.js
@@ -37,6 +37,7 @@ export const QUERY_TIME_TICKETS_IN_RANGE = gql`
      clockon
      cost_center
      created_at
+      created_by
      date
      id
      rate
@@ -80,6 +81,7 @@ export const QUERY_TIME_TICKETS_TECHNICIAN_IN_RANGE = gql`
      clockon
      cost_center
      created_at
+      created_by
      date
      id
      rate
@@ -112,6 +114,7 @@ export const QUERY_TIME_TICKETS_TECHNICIAN_IN_RANGE = gql`
      clockon
      cost_center
      created_at
+      created_by
      date
      id
      rate
@@ -151,6 +154,7 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
      clockon
      cost_center
      created_at
+      created_by
      date
      id
      rate
@@ -181,6 +185,7 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
      clockon
      cost_center
      created_at
+      created_by
      date
      id
      rate
@@ -210,6 +215,7 @@ export const INSERT_NEW_TIME_TICKET = gql`
    insert_timetickets(objects: $timeTicketInput) {
      returning {
        id
+        created_by
        clockon
        clockoff
        employeeid
--- a/client/src/graphql/vehicles.queries.js
+++ b/client/src/graphql/vehicles.queries.js
@@ -28,11 +28,10 @@ export const QUERY_VEHICLE_BY_ID = gql`
      updated_at
      trim_color
      notes
-      jobs {
+      jobs(order_by: { date_open: desc }) {
        id
        ro_number
        ownr_fn
-
        ownr_ln
        owner {
          id
@@ -185,7 +184,7 @@ export const SEARCH_VEHICLES_BY_ID_FOR_AUTOCOMPLETE = gql`
 `;
 export const SEARCH_VEHICLES_FOR_AUTOCOMPLETE = gql`
  query SEARCH_VEHICLES_FOR_AUTOCOMPLETE($search: String) {
-    search_vehicles(args: { search: $search }, limit: 50) {
+    search_vehicles(args: { search: $search }, limit: 25) {
      id
      v_vin
      v_model_yr
--- a/client/src/graphql/vendors.queries.js
+++ b/client/src/graphql/vendors.queries.js
@@ -104,6 +104,7 @@ export const SEARCH_VENDOR_AUTOCOMPLETE = gql`
      id
      cost_center
      active
+      favorite
    }
  }
 `;
--- a/client/src/pages/manage/manage.page.component.jsx
+++ b/client/src/pages/manage/manage.page.component.jsx
@@ -16,7 +16,7 @@ import LoadingSpinner from "../../components/loading-spinner/loading-spinner.com
 import PartnerPingComponent from "../../components/partner-ping/partner-ping.component";
 import PrintCenterModalContainer from "../../components/print-center-modal/print-center-modal.container";
 import ShopSubStatusComponent from "../../components/shop-sub-status/shop-sub-status.component";
-import TestComponent from "../../components/_test/test.component";
+import TestComponent from "../../components/_test/test.page";
 import { requestForToken } from "../../firebase/firebase.utils";
 import {
  selectBodyshop,
@@ -32,6 +32,10 @@ const ManageRootPage = lazy(() =>
 );
 const JobsPage = lazy(() => import("../jobs/jobs.page"));

+const CardPaymentModalContainer = lazy(() =>
+  import("../../components/card-payment-modal/card-payment-modal.container.")
+);
+
 const JobsDetailPage = lazy(() =>
  import("../jobs-detail/jobs-detail.page.container")
 );
@@ -196,6 +200,8 @@ export function Manage({ match, conflict, bodyshop }) {
    >
      <PaymentModalContainer />

+      <CardPaymentModalContainer />
+
      <BreadCrumbs />
      <BillEnterModalContainer />
      <JobCostingModal />
--- a/client/src/pages/tech/tech.page.component.jsx
+++ b/client/src/pages/tech/tech.page.component.jsx
@@ -1,21 +1,24 @@
 import { BackTop, Layout } from "antd";
-import React, { lazy, Suspense, useEffect } from "react";
+import React, { Suspense, lazy, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Redirect, Route, Switch } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import ErrorBoundary from "../../components/error-boundary/error-boundary.component";

+import FeatureWrapper from "../../components/feature-wrapper/feature-wrapper.component";
 import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
 import TechHeader from "../../components/tech-header/tech-header.component";
 import TechSider from "../../components/tech-sider/tech-sider.component";
-import { selectTechnician } from "../../redux/tech/tech.selectors";
-import FeatureWrapper from "../../components/feature-wrapper/feature-wrapper.component";
-import "./tech.page.styles.scss";
 import UpdateAlert from "../../components/update-alert/update-alert.component";
+import { selectTechnician } from "../../redux/tech/tech.selectors";
+import "./tech.page.styles.scss";
 const TimeTicketModalContainer = lazy(() =>
  import("../../components/time-ticket-modal/time-ticket-modal.container")
 );
+const EmailOverlayContainer = lazy(() =>
+  import("../../components/email-overlay/email-overlay.container.jsx")
+);
 const PrintCenterModalContainer = lazy(() =>
  import("../../components/print-center-modal/print-center-modal.container")
 );
@@ -69,6 +72,7 @@ export function TechPage({ technician, match }) {
            >
              <FeatureWrapper featureName="tech-console">
                <TimeTicketModalContainer />
+                <EmailOverlayContainer />
                <PrintCenterModalContainer />
                <Switch>
                  <Route
--- a/client/src/redux/messaging/messaging.reducer.js
+++ b/client/src/redux/messaging/messaging.reducer.js
@@ -6,6 +6,7 @@ const INITIAL_STATE = {
  isSending: false,
  error: null,
  message: null,
+  searchingForConversation: false,
 };

 const messagingReducer = (state = INITIAL_STATE, action) => {
@@ -17,10 +18,16 @@ const messagingReducer = (state = INITIAL_STATE, action) => {
        ...state,
        visible: !state.visible,
      };
+    case MessagingActionTypes.OPEN_CHAT_BY_PHONE:
+      return {
+        ...state,
+        searchingForConversation: true,
+      };
    case MessagingActionTypes.SET_SELECTED_CONVERSATION:
      return {
        ...state,
        visible: true,
+        searchingForConversation: false,
        selectedConversationId: action.payload,
      };
    case MessagingActionTypes.SEND_MESSAGE:
--- a/client/src/redux/messaging/messaging.sagas.js
+++ b/client/src/redux/messaging/messaging.sagas.js
@@ -4,7 +4,7 @@ import { all, call, put, select, takeLatest } from "redux-saga/effects";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import {
  CONVERSATION_ID_BY_PHONE,
-  CREATE_CONVERSATION
+  CREATE_CONVERSATION,
 } from "../../graphql/conversations.queries";
 import { INSERT_CONVERSATION_TAG } from "../../graphql/job-conversations.queries";
 import client from "../../utils/GraphQLClient";
@@ -12,7 +12,7 @@ import { selectBodyshop } from "../user/user.selectors";
 import {
  sendMessageFailure,
  sendMessageSuccess,
-  setSelectedConversation
+  setSelectedConversation,
 } from "./messaging.actions";
 import MessagingActionTypes from "./messaging.types";

@@ -79,6 +79,7 @@ export function* openChatByPhone({ payload }) {
        });
    } else {
      console.log("ERROR: Multiple conversations found. ");
+      yield put(setSelectedConversation(null));
    }
  } catch (error) {
    console.log("Error in sendMessage saga.", error);
--- a/client/src/redux/messaging/messaging.selectors.js
+++ b/client/src/redux/messaging/messaging.selectors.js
@@ -26,3 +26,8 @@ export const selectMessage = createSelector(
  [selectMessaging],
  (messaging) => messaging.message
 );
+
+export const searchingForConversation = createSelector(
+  [selectMessaging],
+  (messaging) => messaging.searchingForConversation
+);
--- a/client/src/redux/modals/modals.reducer.js
+++ b/client/src/redux/modals/modals.reducer.js
@@ -25,6 +25,7 @@ const INITIAL_STATE = {
  contractFinder: { ...baseModal },
  inventoryUpsert: { ...baseModal },
  ca_bc_eftTableConvert: { ...baseModal },
+  cardPayment: { ...baseModal },
 };

 const modalsReducer = (state = INITIAL_STATE, action) => {
--- a/client/src/redux/modals/modals.selectors.js
+++ b/client/src/redux/modals/modals.selectors.js
@@ -79,3 +79,8 @@ export const selectCaBcEtfTableConvert = createSelector(
  [selectModals],
  (modals) => modals.ca_bc_eftTableConvert
 );
+
+export const selectCardPayment = createSelector(
+  [selectModals],
+  (modals) => modals.cardPayment
+);
--- a/client/src/redux/user/user.sagas.js
+++ b/client/src/redux/user/user.sagas.js
@@ -1,15 +1,17 @@
-import Fingerprint2 from "@fingerprintjs/fingerprintjs";
+import FingerprintJS from "@fingerprintjs/fingerprintjs";
 import * as Sentry from "@sentry/browser";
 import { notification } from "antd";
+import axios from "axios";
 import { setUserId, setUserProperties } from "firebase/analytics";
 import {
  checkActionCode,
  confirmPasswordReset,
+  sendPasswordResetEmail,
  signInWithEmailAndPassword,
  signOut,
-  sendPasswordResetEmail,
 } from "firebase/auth";
-import { doc } from "firebase/firestore";
+import { doc, getDoc, setDoc } from "firebase/firestore";
+import { getToken } from "firebase/messaging";
 import i18next from "i18next";
 import LogRocket from "logrocket";
 import { all, call, delay, put, select, takeLatest } from "redux-saga/effects";
@@ -20,6 +22,7 @@ import {
  firestore,
  getCurrentUser,
  logImEXEvent,
+  messaging,
  updateCurrentUser,
 } from "../../firebase/firebase.utils";
 import {
@@ -28,6 +31,7 @@ import {
  sendPasswordResetSuccess,
  setAuthlevel,
  setInstanceConflict,
+  setInstanceId,
  setLocalFingerprint,
  signInFailure,
  signInSuccess,
@@ -39,9 +43,8 @@ import {
  validatePasswordResetSuccess,
 } from "./user.actions";
 import UserActionTypes from "./user.types";
-import axios from "axios";
-import { messaging } from "../../firebase/firebase.utils";
-import { getToken } from "firebase/messaging";
+
+const fpPromise = FingerprintJS.load();

 export function* onEmailSignInStart() {
  yield takeLatest(UserActionTypes.EMAIL_SIGN_IN_START, signInWithEmail);
@@ -148,17 +151,15 @@ export function* setInstanceIdSaga({ payload: uid }) {
  try {
    const userInstanceRef = doc(firestore, `userInstance/${uid}`);

-    const fingerprint = Fingerprint2.x64hash128(
-      (yield Fingerprint2.getPromise({})).map((c) => c.value).join(""),
-      31
-    );
-
-    yield userInstanceRef.set({
+    // Get the visitor identifier when you need it.
+    const fp = yield fpPromise;
+    const result = yield fp.get();
+    yield setDoc(userInstanceRef, {
      timestamp: new Date(),
-      fingerprint,
+      fingerprint: result.visitorId,
    });

-    yield put(setLocalFingerprint(fingerprint));
+    yield put(setLocalFingerprint(result.visitorId));
    yield delay(5 * 60 * 1000);
    if (process.env.NODE_ENV === "production") yield put(checkInstanceId(uid));
  } catch (error) {
@@ -171,11 +172,9 @@ export function* onCheckInstanceId() {
 }
 export function* checkInstanceIdSaga({ payload: uid }) {
  try {
-    const userInstanceRef = doc(firestore, `userInstance/${uid}`);
-
-    const snapshot = yield userInstanceRef.get();
+    const snapshot = yield getDoc(doc(firestore, `userInstance/${uid}`));
    let fingerprint = yield select((state) => state.user.fingerprint);
-
+    yield put(setInstanceConflict());
    if (snapshot.data().fingerprint === fingerprint) {
      yield delay(5 * 60 * 1000);
      yield put(checkInstanceId(uid));
@@ -215,7 +214,6 @@ export function* signInSuccessSaga({ payload }) {
    console.log("Error updating Crisp settings.", error);
  }

-  // if (!payload.email.includes("@imex.")) yield put(setInstanceId(payload.uid));
  setUserId(analytics, payload.email);
  setUserProperties(analytics, payload);
  yield logImEXEvent("redux_sign_in_success");
@@ -289,6 +287,14 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
          : { validemail: false }
      )
    );
+
+    if (payload.features.singleDeviceOnly) {
+      const user = yield select((state) => state.user.currentUser);
+
+      if (!(user.email.includes("@imex.") || user.email.includes("@rome.")))
+        yield put(setInstanceId(user.uid));
+    }
+
    try {
      window.$crisp.push(["set", "user:company", [payload.shopname]]);
      if (authRecord[0] && authRecord[0].user.validemail) {
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -63,7 +63,6 @@
 				"scheduledfor": "Scheduled appointment for: ",
 				"severalerrorsfound": "Several jobs have issues which may prevent accurate smart scheduling. Click to expand.",
 				"smartscheduling": "Smart Scheduling",
-				"smspaymentreminder": "",
 				"suggesteddates": "Suggested Dates"
 			},
 			"successes": {
@@ -105,7 +104,7 @@
 				"admin_jobunvoid": "ADMIN: Job has been unvoided.",
 				"billposted": "Bill with invoice number {{invoice_number}} posted.",
 				"billupdated": "Bill with invoice number {{invoice_number}} updated.",
-				"failedpayment": "",
+				"failedpayment": "Failed payment",
 				"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}}.",
@@ -491,7 +490,7 @@
 					"lam": "Mechanical",
 					"lar": "Refinish",
 					"las": "Structural",
-					"lau": "Detail",
+					"lau": "User Defined",
 					"local_tax": "Local Tax",
 					"mapa": "Paint Materials",
 					"mash": "Shop Materials",
@@ -1015,6 +1014,7 @@
 				"cancel": "Cancel",
 				"clear": "Clear",
 				"close": "Close",
+				"copied": "Copied!",
 				"copylink": "Copy Link",
 				"create": "Create",
 				"delete": "Delete",
@@ -1031,6 +1031,7 @@
 				"saveandnew": "Save and New",
 				"selectall": "Select All",
 				"send": "Send",
+				"sendbysms": "Send by SMS",
 				"senderrortosupport": "Send Error to Support",
 				"submit": "Submit",
 				"tryagain": "Try Again",
@@ -1092,6 +1093,7 @@
 				"passwordsdonotmatch": "The passwords you have entered do not match.",
 				"print": "Print",
 				"refresh": "Refresh",
+				"reports": "Reports",
 				"required": "Required",
 				"saturday": "Saturday",
 				"search": "Search...",
@@ -1191,26 +1193,28 @@
 		},
 		"job_payments": {
 			"buttons": {
-				"goback": "",
-				"proceedtopayment": "",
-				"refundpayment": ""
+				"goback": "Go Back",
+				"proceedtopayment": "Proceed to Payment",
+				"refundpayment": "Refund Payment"
 			},
 			"notifications": {
 				"error": {
-					"description": "",
-					"title": ""
+					"description": "Please try again. Make sure the refund amount does not exceeds the payment amount.",
+					"openingip": "Error connecting to IntelliPay service.",
+					"title": "Error placing refund"
 				}
 			},
 			"titles": {
-				"amount": "",
-				"dateOfPayment": "",
-				"descriptions": "",
-				"payer": "",
-				"payername": "",
-				"paymentid": "",
-				"paymenttype": "",
-				"refundamount": "",
-				"transactionid": ""
+				"amount": "Amount",
+				"dateOfPayment": "Date of Payment",
+				"descriptions": "Payment Details",
+				"payer": "Payer",
+				"payername": "Payer Name",
+				"paymentid": "Payment Reference ID",
+				"paymentnum": "Payment Number",
+				"paymenttype": "Payment Type",
+				"refundamount": "Refund Amount",
+				"transactionid": "Transaction ID"
 			}
 		},
 		"joblines": {
@@ -1926,7 +1930,7 @@
 				"customers": "Customers",
 				"dashboard": "Dashboard",
 				"enterbills": "Enter Bills",
-				"entercardpayment": "",
+				"entercardpayment": "New Card Charge",
 				"enterpayment": "Enter Payments",
 				"entertimeticket": "Enter Time Tickets",
 				"export": "Export",
@@ -1938,7 +1942,6 @@
 				"newjob": "Create New Job",
 				"owners": "Owners",
 				"parts-queue": "Parts Queue",
-				"paymentremindersms": "",
 				"phonebook": "Phonebook",
 				"productionboard": "Production Board - Visual",
 				"productionlist": "Production Board - List",
@@ -2200,9 +2203,13 @@
 			}
 		},
 		"payments": {
+			"actions": {
+				"generatepaymentlink": "Generate Payment Link"
+			},
 			"errors": {
 				"exporting": "Error exporting payment(s). {{error}}",
-				"exporting-partner": "Error exporting to partner. Please check the partner interaction log for more errors."
+				"exporting-partner": "Error exporting to partner. Please check the partner interaction log for more errors.",
+				"inserting": "Error inserting payment. {{error}}"
 			},
 			"fields": {
 				"amount": "Amount",
@@ -2229,6 +2236,7 @@
 				"markforreexport": "Mark for Re-export",
 				"new": "New Payment",
 				"signup": "Please contact support to sign up for electronic payments.",
+				"smspaymentreminder": "This is {{shopname}} reminding you about your balance of {{amount}}. To pay, click the following link {{payment_link}}.",
 				"title": "Payments",
 				"totalpayments": "Total Payments"
 			},
@@ -2411,7 +2419,7 @@
 				"jobs": {
 					"individual_job_note": "Job Note RO: {{ro_number}}",
 					"parts_order": "Parts Order PO: {{ro_number}} - {{name}}",
-					"parts_return_slip":"Parts Return PO: {{ro_number}} - {{name}}",
+					"parts_return_slip": "Parts Return PO: {{ro_number}} - {{name}}",
 					"sublet_order": "Sublet Order PO: {{ro_number}} - {{name}}"
 				}
 			},
@@ -2557,18 +2565,22 @@
 				"gsr_labor_only": "Gross Sales - Labor Only",
 				"hours_sold_detail_closed": "Hours Sold Detail - Closed",
 				"hours_sold_detail_closed_csr": "Hours Sold Detail - Closed by CSR",
+				"hours_sold_detail_closed_estimator": "Hours Sold Detail - Closed by Estimator",
 				"hours_sold_detail_closed_ins_co": "Hours Sold Detail - Closed by Source",
 				"hours_sold_detail_closed_status": "Hours Sold Detail - Closed by Status",
 				"hours_sold_detail_open": "Hours Sold Detail - Open",
 				"hours_sold_detail_open_csr": "Hours Sold Detail - Open by CSR",
+				"hours_sold_detail_open_estimator": "Hours Sold Detail - Open by Estimator",
 				"hours_sold_detail_open_ins_co": "Hours Sold Detail - Open by Source",
 				"hours_sold_detail_open_status": "Hours Sold Detail - Open by Status",
 				"hours_sold_summary_closed": "Hours Sold Summary - Closed",
 				"hours_sold_summary_closed_csr": "Hours Sold Summary - Closed by CSR",
+				"hours_sold_summary_closed_estimator": "Hours Sold Summary - Closed by Estimator",
 				"hours_sold_summary_closed_ins_co": "Hours Sold Summary - Closed by Source",
 				"hours_sold_summary_closed_status": "Hours Sold Summary - Closed by Status",
 				"hours_sold_summary_open": "Hours Sold Summary - Open",
 				"hours_sold_summary_open_csr": "Hours Sold Summary - Open CSR",
+				"hours_sold_summary_open_estimator": "Hours Sold Summary - Open Estimator",
 				"hours_sold_summary_open_ins_co": "Hours Sold Summary - Open by Source",
 				"hours_sold_summary_open_status": "Hours Sold Summary - Open by Status",
 				"job_costing_ro_csr": "Job Costing by CSR",
@@ -2585,6 +2597,7 @@
 				"open_orders_csr": "Open Orders by CSR",
 				"open_orders_estimator": "Open Orders by Estimator",
 				"open_orders_ins_co": "Open Orders by Insurance Company",
+				"open_orders_referral": "Open Orders by Referral Source",
 				"open_orders_specific_csr": "Open Orders filtered by CSR",
 				"open_orders_status": "Open Orders by Status",
 				"parts_backorder": "IOU Parts List",
@@ -2730,6 +2743,7 @@
 				"clockon": "Clocked In",
 				"committed": "",
 				"cost_center": "Cost Center",
+				"created_by": "Created By",
 				"date": "Ticket Date",
 				"efficiency": "Efficiency",
 				"employee": "Employee",
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -63,7 +63,6 @@
 				"scheduledfor": "Cita programada para:",
 				"severalerrorsfound": "",
 				"smartscheduling": "",
-				"smspaymentreminder": "",
 				"suggesteddates": ""
 			},
 			"successes": {
@@ -1015,6 +1014,7 @@
 				"cancel": "",
 				"clear": "",
 				"close": "",
+				"copied": "",
 				"copylink": "",
 				"create": "",
 				"delete": "Borrar",
@@ -1031,6 +1031,7 @@
 				"saveandnew": "",
 				"selectall": "",
 				"send": "",
+				"sendbysms": "",
 				"senderrortosupport": "",
 				"submit": "",
 				"tryagain": "",
@@ -1092,6 +1093,7 @@
 				"passwordsdonotmatch": "",
 				"print": "",
 				"refresh": "",
+				"reports": "",
 				"required": "",
 				"saturday": "",
 				"search": "Buscar...",
@@ -1198,6 +1200,7 @@
 			"notifications": {
 				"error": {
 					"description": "",
+					"openingip": "",
 					"title": ""
 				}
 			},
@@ -1208,6 +1211,7 @@
 				"payer": "",
 				"payername": "",
 				"paymentid": "",
+				"paymentnum": "",
 				"paymenttype": "",
 				"refundamount": "",
 				"transactionid": ""
@@ -1938,7 +1942,6 @@
 				"newjob": "",
 				"owners": "propietarios",
 				"parts-queue": "",
-				"paymentremindersms": "",
 				"phonebook": "",
 				"productionboard": "",
 				"productionlist": "",
@@ -2200,9 +2203,13 @@
 			}
 		},
 		"payments": {
+			"actions": {
+				"generatepaymentlink": ""
+			},
 			"errors": {
 				"exporting": "",
-				"exporting-partner": ""
+				"exporting-partner": "",
+				"inserting": ""
 			},
 			"fields": {
 				"amount": "",
@@ -2229,6 +2236,7 @@
 				"markforreexport": "",
 				"new": "",
 				"signup": "",
+				"smspaymentreminder": "",
 				"title": "",
 				"totalpayments": ""
 			},
@@ -2557,18 +2565,22 @@
 				"gsr_labor_only": "",
 				"hours_sold_detail_closed": "",
 				"hours_sold_detail_closed_csr": "",
+				"hours_sold_detail_closed_estimator": "",
 				"hours_sold_detail_closed_ins_co": "",
 				"hours_sold_detail_closed_status": "",
 				"hours_sold_detail_open": "",
 				"hours_sold_detail_open_csr": "",
+				"hours_sold_detail_open_estimator": "",
 				"hours_sold_detail_open_ins_co": "",
 				"hours_sold_detail_open_status": "",
 				"hours_sold_summary_closed": "",
 				"hours_sold_summary_closed_csr": "",
+				"hours_sold_summary_closed_estimator": "",
 				"hours_sold_summary_closed_ins_co": "",
 				"hours_sold_summary_closed_status": "",
 				"hours_sold_summary_open": "",
 				"hours_sold_summary_open_csr": "",
+				"hours_sold_summary_open_estimator": "",
 				"hours_sold_summary_open_ins_co": "",
 				"hours_sold_summary_open_status": "",
 				"job_costing_ro_csr": "",
@@ -2585,6 +2597,7 @@
 				"open_orders_csr": "",
 				"open_orders_estimator": "",
 				"open_orders_ins_co": "",
+				"open_orders_referral": "",
 				"open_orders_specific_csr": "",
 				"open_orders_status": "",
 				"parts_backorder": "",
@@ -2730,6 +2743,7 @@
 				"clockon": "",
 				"committed": "",
 				"cost_center": "",
+				"created_by": "",
 				"date": "",
 				"efficiency": "",
 				"employee": "",
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -63,7 +63,6 @@
 				"scheduledfor": "Rendez-vous prévu pour:",
 				"severalerrorsfound": "",
 				"smartscheduling": "",
-				"smspaymentreminder": "",
 				"suggesteddates": ""
 			},
 			"successes": {
@@ -1015,6 +1014,7 @@
 				"cancel": "",
 				"clear": "",
 				"close": "",
+				"copied": "",
 				"copylink": "",
 				"create": "",
 				"delete": "Effacer",
@@ -1031,6 +1031,7 @@
 				"saveandnew": "",
 				"selectall": "",
 				"send": "",
+				"sendbysms": "",
 				"senderrortosupport": "",
 				"submit": "",
 				"tryagain": "",
@@ -1092,6 +1093,7 @@
 				"passwordsdonotmatch": "",
 				"print": "",
 				"refresh": "",
+				"reports": "",
 				"required": "",
 				"saturday": "",
 				"search": "Chercher...",
@@ -1198,6 +1200,7 @@
 			"notifications": {
 				"error": {
 					"description": "",
+					"openingip": "",
 					"title": ""
 				}
 			},
@@ -1208,6 +1211,7 @@
 				"payer": "",
 				"payername": "",
 				"paymentid": "",
+				"paymentnum": "",
 				"paymenttype": "",
 				"refundamount": "",
 				"transactionid": ""
@@ -1938,7 +1942,6 @@
 				"newjob": "",
 				"owners": "Propriétaires",
 				"parts-queue": "",
-				"paymentremindersms": "",
 				"phonebook": "",
 				"productionboard": "",
 				"productionlist": "",
@@ -2200,9 +2203,13 @@
 			}
 		},
 		"payments": {
+			"actions": {
+				"generatepaymentlink": ""
+			},
 			"errors": {
 				"exporting": "",
-				"exporting-partner": ""
+				"exporting-partner": "",
+				"inserting": ""
 			},
 			"fields": {
 				"amount": "",
@@ -2229,6 +2236,7 @@
 				"markforreexport": "",
 				"new": "",
 				"signup": "",
+				"smspaymentreminder": "",
 				"title": "",
 				"totalpayments": ""
 			},
@@ -2557,18 +2565,22 @@
 				"gsr_labor_only": "",
 				"hours_sold_detail_closed": "",
 				"hours_sold_detail_closed_csr": "",
+				"hours_sold_detail_closed_estimator": "",
 				"hours_sold_detail_closed_ins_co": "",
 				"hours_sold_detail_closed_status": "",
 				"hours_sold_detail_open": "",
 				"hours_sold_detail_open_csr": "",
+				"hours_sold_detail_open_estimator": "",
 				"hours_sold_detail_open_ins_co": "",
 				"hours_sold_detail_open_status": "",
 				"hours_sold_summary_closed": "",
 				"hours_sold_summary_closed_csr": "",
+				"hours_sold_summary_closed_estimator": "",
 				"hours_sold_summary_closed_ins_co": "",
 				"hours_sold_summary_closed_status": "",
 				"hours_sold_summary_open": "",
 				"hours_sold_summary_open_csr": "",
+				"hours_sold_summary_open_estimator": "",
 				"hours_sold_summary_open_ins_co": "",
 				"hours_sold_summary_open_status": "",
 				"job_costing_ro_csr": "",
@@ -2585,6 +2597,7 @@
 				"open_orders_csr": "",
 				"open_orders_estimator": "",
 				"open_orders_ins_co": "",
+				"open_orders_referral": "",
 				"open_orders_specific_csr": "",
 				"open_orders_status": "",
 				"parts_backorder": "",
@@ -2730,6 +2743,7 @@
 				"clockon": "",
 				"committed": "",
 				"cost_center": "",
+				"created_by": "",
 				"date": "",
 				"efficiency": "",
 				"employee": "",
--- a/client/src/utils/AuditTrailMappings.js
+++ b/client/src/utils/AuditTrailMappings.js
@@ -41,7 +41,7 @@ const AuditTrailMapping = {
    i18n.t("audit_trail.messages.admin_jobmarkforreexport"),
  admin_jobmarkexported: () =>
    i18n.t("audit_trail.messages.admin_jobmarkexported"),
-
+  failedpayment: () => i18n.t("audit_trail.messages.failedpayment"),
 };

 export default AuditTrailMapping;
--- a/client/src/utils/RenderTemplate.js
+++ b/client/src/utils/RenderTemplate.js
@@ -1,15 +1,14 @@
 import { gql } from "@apollo/client";
-import { notification } from "antd";
 import jsreport from "@jsreport/browser-client";
+import { notification } from "antd";
+import axios from "axios";
 import _ from "lodash";
-import moment from "moment";
 import { auth } from "../firebase/firebase.utils";
 import { setEmailOptions } from "../redux/email/email.actions";
 import { store } from "../redux/store";
 import client from "../utils/GraphQLClient";
-import { TemplateList } from "./TemplateConstants";
 import cleanAxios from "./CleanAxios";
-import axios from "axios";
+import { TemplateList } from "./TemplateConstants";
 const server = process.env.REACT_APP_REPORTS_SERVER_URL;

 jsreport.serverUrl = server;
@@ -255,7 +254,7 @@ export async function RenderTemplates(
      headerpath: `/${bodyshop.imexshopid}/header.html`,
      footerpath: `/${bodyshop.imexshopid}/footer.html`,
      bodyshop: bodyshop,
-      offset: moment().utcOffset(),
+      offset: bodyshop.timezone,
    },
  };

--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -818,6 +818,74 @@ export const TemplateList = (type, context) => {
            },
            group: "sales",
          },
+          hours_sold_detail_closed_estimator: {
+            title: i18n.t(
+              "reportcenter.templates.hours_sold_detail_closed_estimator"
+            ),
+            description: "",
+            subject: i18n.t(
+              "reportcenter.templates.hours_sold_detail_closed_estimator"
+            ),
+            key: "hours_sold_detail_closed_estimator",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "sales",
+          },
+          hours_sold_detail_open_estimator: {
+            title: i18n.t(
+              "reportcenter.templates.hours_sold_detail_open_estimator"
+            ),
+            description: "",
+            subject: i18n.t(
+              "reportcenter.templates.hours_sold_detail_open_estimator"
+            ),
+            key: "hours_sold_detail_open_estimator",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_open"),
+            },
+            group: "sales",
+          },
+          hours_sold_summary_closed_estimator: {
+            title: i18n.t(
+              "reportcenter.templates.hours_sold_summary_closed_estimator"
+            ),
+            description: "",
+            subject: i18n.t(
+              "reportcenter.templates.hours_sold_summary_closed_estimator"
+            ),
+            key: "hours_sold_summary_closed_estimator",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "sales",
+          },
+          hours_sold_summary_open_estimator: {
+            title: i18n.t(
+              "reportcenter.templates.hours_sold_summary_open_estimator"
+            ),
+            description: "",
+            subject: i18n.t(
+              "reportcenter.templates.hours_sold_summary_open_estimator"
+            ),
+            key: "hours_sold_summary_open_estimator",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "sales",
+          },
          hours_sold_summary_open_status: {
            title: i18n.t(
              "reportcenter.templates.hours_sold_summary_open_status"
@@ -1040,7 +1108,7 @@ export const TemplateList = (type, context) => {
            disabled: false,
            rangeFilter: {
              object: i18n.t("reportcenter.labels.objects.jobs"),
-              field: i18n.t("jobs.fields.date_open"),
+              field: i18n.t("jobs.fields.date_invoiced"),
            },
            group: "jobs",
          },
@@ -1135,6 +1203,10 @@ export const TemplateList = (type, context) => {
            key: "timetickets_employee",
            idtype: "employee",
            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.timetickets"),
+              field: i18n.t("timetickets.fields.date"),
+            },
            group: "payroll",
          },
          attendance_detail: {
@@ -1430,6 +1502,19 @@ export const TemplateList = (type, context) => {
            },
            group: "jobs",
          },
+          open_orders_specific_csr: {
+            title: i18n.t("reportcenter.templates.open_orders_specific_csr"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.open_orders_specific_csr"),
+            key: "open_orders_specific_csr",
+            idtype: "employee",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_open"),
+            },
+            group: "jobs",
+          },
          open_orders_estimator: {
            title: i18n.t("reportcenter.templates.open_orders_estimator"),
            description: "",
@@ -1456,12 +1541,12 @@ export const TemplateList = (type, context) => {
            },
            group: "jobs",
          },
-          open_orders_specific_csr: {
-            title: i18n.t("reportcenter.templates.open_orders_specific_csr"),
+          open_orders_referral: {
+            title: i18n.t("reportcenter.templates.open_orders_referral"),
            description: "",
-            subject: i18n.t("reportcenter.templates.open_orders_specific_csr"),
-            key: "open_orders_specific_csr",
-            idtype: "employee",
+            subject: i18n.t("reportcenter.templates.open_orders_referral"),
+            key: "open_orders_referral",
+            //idtype: "vendor",
            disabled: false,
            rangeFilter: {
              object: i18n.t("reportcenter.labels.objects.jobs"),
--- a/client/yarn.lock
+++ b/client/yarn.lock
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -110,6 +110,7 @@
          - canceled
          - color
          - created_at
+          - created_by
          - end
          - id
          - isintake
@@ -128,6 +129,7 @@
          - canceled
          - color
          - created_at
+          - created_by
          - end
          - id
          - isintake
@@ -156,6 +158,7 @@
          - canceled
          - color
          - created_at
+          - created_by
          - end
          - id
          - isintake
@@ -3273,6 +3276,9 @@
          - ca_gst_registrant
          - cat_no
          - category
+          - cieca_pfl
+          - cieca_pfo
+          - cieca_pft
          - cieca_stl
          - cieca_ttl
          - ciecaid
@@ -3314,6 +3320,7 @@
          - date_repairstarted
          - date_scheduled
          - date_towin
+          - date_void
          - ded_amt
          - ded_note
          - ded_status
@@ -3495,7 +3502,6 @@
          - v_model_yr
          - v_vin
          - vehicleid
-          - date_void
          - voided
  select_permissions:
    - role: user
@@ -3539,6 +3545,9 @@
          - ca_gst_registrant
          - cat_no
          - category
+          - cieca_pfl
+          - cieca_pfo
+          - cieca_pft
          - cieca_stl
          - cieca_ttl
          - ciecaid
@@ -3580,6 +3589,7 @@
          - date_repairstarted
          - date_scheduled
          - date_towin
+          - date_void
          - ded_amt
          - ded_note
          - ded_status
@@ -3762,7 +3772,6 @@
          - v_model_yr
          - v_vin
          - vehicleid
-          - date_void
          - voided
        filter:
          bodyshop:
@@ -3816,6 +3825,9 @@
          - ca_gst_registrant
          - cat_no
          - category
+          - cieca_pfl
+          - cieca_pfo
+          - cieca_pft
          - cieca_stl
          - cieca_ttl
          - ciecaid
@@ -3857,6 +3869,7 @@
          - date_repairstarted
          - date_scheduled
          - date_towin
+          - date_void
          - ded_amt
          - ded_note
          - ded_status
@@ -4039,7 +4052,6 @@
          - v_model_yr
          - v_vin
          - vehicleid
-          - date_void
          - voided
        filter:
          bodyshop:
@@ -4067,12 +4079,7 @@
  event_triggers:
    - name: job_status_transition
      definition:
-        enable_manual: false
-        insert:
-          columns: '*'
-        update:
-          columns:
-            - status
+        enable_manual: true
      retry_conf:
        interval_sec: 10
        num_retries: 0
@@ -4088,23 +4095,7 @@
        version: 2
    - name: jobs_arms
      definition:
-        enable_manual: false
-        update:
-          columns:
-            - actual_delivery
-            - scheduled_delivery
-            - scheduled_completion
-            - actual_completion
-            - date_scheduled
-            - inproduction
-            - clm_total
-            - suspended
-            - job_totals
-            - converted
-            - employee_body
-            - ro_number
-            - actual_in
-            - scheduled_in
+        enable_manual: true
      retry_conf:
        interval_sec: 10
        num_retries: 0
@@ -4649,6 +4640,7 @@
                        _eq: X-Hasura-User-Id
                  - active:
                      _eq: true
+        allow_aggregations: true
  update_permissions:
    - role: user
      permission:
@@ -4726,6 +4718,7 @@
                          _eq: X-Hasura-User-Id
                    - active:
                        _eq: true
+        allow_aggregations: true
  update_permissions:
    - role: user
      permission:
@@ -5554,6 +5547,7 @@
          - committed_at
          - cost_center
          - created_at
+          - created_by
          - date
          - employeeid
          - flat_rate
@@ -5578,6 +5572,7 @@
          - committed_at
          - cost_center
          - created_at
+          - created_by
          - date
          - employeeid
          - flat_rate
@@ -5611,6 +5606,7 @@
          - committed_at
          - cost_center
          - created_at
+          - created_by
          - date
          - employeeid
          - flat_rate
--- a/hasura/migrations/1691177401095_create_index_parts_dispatch_employeeid/down.sql
+++ b/hasura/migrations/1691177401095_create_index_parts_dispatch_employeeid/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."parts_dispatch_employeeid";
--- a/hasura/migrations/1691177401095_create_index_parts_dispatch_employeeid/up.sql
+++ b/hasura/migrations/1691177401095_create_index_parts_dispatch_employeeid/up.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "parts_dispatch_employeeid" on
+  "public"."parts_dispatch" using btree ("employeeid");
--- a/hasura/migrations/1691177452060_create_index_parts_dispatch_dispatchid/down.sql
+++ b/hasura/migrations/1691177452060_create_index_parts_dispatch_dispatchid/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."parts_dispatch_dispatchid";
--- a/hasura/migrations/1691177452060_create_index_parts_dispatch_dispatchid/up.sql
+++ b/hasura/migrations/1691177452060_create_index_parts_dispatch_dispatchid/up.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "parts_dispatch_dispatchid" on
+  "public"."parts_dispatch_lines" using btree ("partsdispatchid");
--- a/hasura/migrations/1691177467690_create_index_parts_dispatch_line_accepted_at/down.sql
+++ b/hasura/migrations/1691177467690_create_index_parts_dispatch_line_accepted_at/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."parts_dispatch_line_accepted_at";
--- a/hasura/migrations/1691177467690_create_index_parts_dispatch_line_accepted_at/up.sql
+++ b/hasura/migrations/1691177467690_create_index_parts_dispatch_line_accepted_at/up.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "parts_dispatch_line_accepted_at" on
+  "public"."parts_dispatch_lines" using btree ("accepted_at");
--- a/hasura/migrations/1691614820968_alter_table_public_timetickets_add_column_created_by/down.sql
+++ b/hasura/migrations/1691614820968_alter_table_public_timetickets_add_column_created_by/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."timetickets" add column "created_by" text
+--  null;
--- a/hasura/migrations/1691614820968_alter_table_public_timetickets_add_column_created_by/up.sql
+++ b/hasura/migrations/1691614820968_alter_table_public_timetickets_add_column_created_by/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."timetickets" add column "created_by" text
+ null;
--- a/hasura/migrations/1693249238670_alter_table_public_jobs_add_column_cieca_pfl/down.sql
+++ b/hasura/migrations/1693249238670_alter_table_public_jobs_add_column_cieca_pfl/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "cieca_pfl" jsonb
+--  null default jsonb_build_object();
--- a/hasura/migrations/1693249238670_alter_table_public_jobs_add_column_cieca_pfl/up.sql
+++ b/hasura/migrations/1693249238670_alter_table_public_jobs_add_column_cieca_pfl/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "cieca_pfl" jsonb
+ null default jsonb_build_object();
--- a/hasura/migrations/1693351091138_alter_table_public_bodyshops_add_column_claimscorpid/down.sql
+++ b/hasura/migrations/1693351091138_alter_table_public_bodyshops_add_column_claimscorpid/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."bodyshops" add column "claimscorpid" text
+--  null;
--- a/hasura/migrations/1693351091138_alter_table_public_bodyshops_add_column_claimscorpid/up.sql
+++ b/hasura/migrations/1693351091138_alter_table_public_bodyshops_add_column_claimscorpid/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "claimscorpid" text
+ null;
--- a/hasura/migrations/1694457793769_alter_table_public_jobs_add_column_cieca_pft/down.sql
+++ b/hasura/migrations/1694457793769_alter_table_public_jobs_add_column_cieca_pft/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "cieca_pft" jsonb
+--  null default jsonb_build_object();
--- a/hasura/migrations/1694457793769_alter_table_public_jobs_add_column_cieca_pft/up.sql
+++ b/hasura/migrations/1694457793769_alter_table_public_jobs_add_column_cieca_pft/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "cieca_pft" jsonb
+ null default jsonb_build_object();
--- a/hasura/migrations/1695757361064_alter_table_public_jobs_add_column_cieca_pfo/down.sql
+++ b/hasura/migrations/1695757361064_alter_table_public_jobs_add_column_cieca_pfo/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "cieca_pfo" jsonb
+--  null default jsonb_build_object();
--- a/hasura/migrations/1695757361064_alter_table_public_jobs_add_column_cieca_pfo/up.sql
+++ b/hasura/migrations/1695757361064_alter_table_public_jobs_add_column_cieca_pfo/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "cieca_pfo" jsonb
+ null default jsonb_build_object();
--- a/hasura/migrations/1698709322872_alter_table_public_appointments_add_column_created_by/down.sql
+++ b/hasura/migrations/1698709322872_alter_table_public_appointments_add_column_created_by/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."appointments" add column "created_by" text
+--  null;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Patrick Fic	84f4d5956a	IO-2444 update fingerprint JS and re-enable using shop flag.	2023-11-08 12:08:21 -08:00
Allan Carr	7472285641	Merged in release/2023-11-03 (pull request #1043 ) Release/2023 11 03	2023-11-03 16:45:23 +00:00
Allan Carr	67ff9f30c6	Merged in feature/IO-1559-ClaimsCorp-Datapump (pull request #1042 ) IO-1559 Change File name as per Koyel	2023-11-01 17:28:30 +00:00
Allan Carr	a27092dbcc	IO-1559 Change File name as per Koyel	2023-11-01 10:28:10 -07:00
Allan Carr	ca41bff446	Merged in feature/IO-1559-ClaimsCorp-Datapump (pull request #1041 ) Feature/IO-1559 ClaimsCorp Datapump	2023-11-01 16:58:32 +00:00
Allan Carr	cf8280590c	IO-1559 Prettyier	2023-10-31 12:36:39 -07:00
Allan Carr	b649ca1f00	IO-1559 Additional XML Tag adjustments	2023-10-31 12:35:18 -07:00
Allan Carr	b441301007	Merged in feature/IO-2430-Open-Orders-by-Referral (pull request #1040 ) IO-2430 Open Orders by Referral	2023-10-31 00:08:53 +00:00
Allan Carr	2e93238b5c	IO-2430 Open Orders by Referral	2023-10-30 17:08:22 -07:00
Allan Carr	ce4fe84536	Merged in feature/IO-2431-Created-By-for-Appointments (pull request #1038 ) IO-2431 Created By for Appointments	2023-10-30 23:52:36 +00:00
Allan Carr	9b7c0af025	IO-2431 Created By for Appointments	2023-10-30 16:51:26 -07:00
Allan Carr	dfdaf36ed1	Merged in feature/2023-10-27 (pull request #1037 ) Feature/2023 10 27	2023-10-27 17:38:10 +00:00
Allan Carr	cc8d1b3793	Merged in feature/IO-1559-ClaimsCorp-Datapump (pull request #1035 ) IO-1559 Requested changes to tags from ClaimsCorp	2023-10-27 16:13:30 +00:00
Allan Carr	eb359d83c5	IO-1559 Requested changes to tags from ClaimsCorp	2023-10-25 17:01:03 -07:00
Allan Carr	ae13e9e36a	Merged in feature/IO-2421-Production-Note-to-Initial-Value-for-Intake (pull request #1032 ) IO-2421 Add Production Vars to the initial values on CheckList	2023-10-25 15:52:49 +00:00
Allan Carr	4a62ac2a11	IO-2421 Add Production Vars to the initial values on CheckList	2023-10-25 08:52:03 -07:00
Allan Carr	016a62b6d5	Merged in feature/IO-2420-Preferred-Vendor-for-Bills (pull request #1029 ) IO-2420 Prefered Vendor for Bill Entry	2023-10-23 19:30:25 +00:00
Allan Carr	3e226b50ab	Merged in feature/IO-2419-Thumbnail-Emailing (pull request #1030 ) IO-2419 Correct for Cloudinary to include fullsize on send	2023-10-23 19:30:11 +00:00
Allan Carr	ab84cb5ada	IO-2419 Correct for Cloudinary to include fullsize on send	2023-10-23 12:32:32 -07:00
Allan Carr	7825aa4122	IO-2420 Prefered Vendor for Bill Entry	2023-10-20 13:55:21 -07:00
Patrick Fic	8d43fbfcd9	Merged in release/2023-10-20 (pull request #1028 ) Release/2023 10 20	2023-10-20 18:51:19 +00:00
Patrick Fic	47a01628d3	Merge branch 'feature/IO-2401-duplicate-chat-creation' into release/2023-10-20	2023-10-20 08:50:52 -07:00
Patrick Fic	c008660023	Resolve error on multiple conversations found saga.	2023-10-20 08:50:31 -07:00
Patrick Fic	5b29aec14b	Resolve vehicle search select issue.	2023-10-19 15:17:22 -07:00
Allan Carr	ca6aa682f6	Merged in feature/IO-2416-Autohouse_ClaimsCorp-Query (pull request #1017 ) IO-2416 Filter out "" from ClaimsCorp and Autohouse get shop queries	2023-10-19 19:45:23 +00:00
Allan Carr	eb3786cebf	Merged in feature/IO-2419-Thumbnail-Emailing (pull request #1025 ) IO-2419 Thumbnails being emailed instead of Full Size Image	2023-10-19 19:45:11 +00:00
Allan Carr	53843e22a4	Merged in feature/IO-1559-ClaimsCorp-Datapump (pull request #1016 ) IO-1559 Add in extra required tag	2023-10-19 19:44:58 +00:00
Patrick Fic	e1693674ca	Merged in feature/IO-2418-jobline-bill-amount (pull request #1026 ) Add refetch of job when posting bill.	2023-10-19 16:34:56 +00:00
Patrick Fic	2d2190e4fa	Add refetch of job when posting bill.	2023-10-19 09:34:35 -07:00
Allan Carr	02fd8097a8	IO-2419 Thumbnails being emailed instead of Full Size Image	2023-10-19 09:30:29 -07:00
Patrick Fic	fcfbc85683	Merged in feature/IO-2418-jobline-bill-amount (pull request #1024 ) IO-2418 Adjust latest bill amount	2023-10-19 16:23:43 +00:00
Patrick Fic	802dd696f4	IO-2418 Adjust latest bill amount	2023-10-19 09:20:29 -07:00
Allan Carr	60a0222dd0	IO-2416 Filter out "" from ClaimsCorp and Autohouse get shop queries	2023-10-18 10:55:08 -07:00
Allan Carr	9114abd3ef	IO-1559 Add in extra required tag	2023-10-18 10:48:47 -07:00
Patrick Fic	f7fc0e6a6d	Merged in feature/IO-2401-duplicate-chat-creation (pull request #1013 ) IO-2401 Add prevention of duplicate chat creation by adding loading tracking.	2023-10-16 19:03:42 +00:00
Patrick Fic	ffebbe3b2a	IO-2401 Add prevention of duplicate chat creation by adding loading tracking.	2023-10-16 12:00:11 -07:00
Patrick Fic	25b8c1b1eb	Merged in feature/IO-2414-prod-list-delete (pull request #1012 ) IO-2414 add null handling in case employee records are null.	2023-10-16 18:40:50 +00:00
Patrick Fic	17f8625108	IO-2414 add null handling in case employee records are null.	2023-10-16 11:40:23 -07:00
Patrick Fic	e3c21f0373	Merge branch 'release/2023-10-20' of bitbucket.org:snaptsoft/bodyshop into release/2023-10-20	2023-10-16 10:33:47 -07:00
Patrick Fic	859ff00277	Merge remote-tracking branch 'origin/master' into release/2023-10-20	2023-10-16 10:33:32 -07:00
Patrick Fic	e7c3be5231	Merged in release/2023-09-23 (pull request #1011 ) Fix search select issues.	2023-10-16 17:24:46 +00:00
Patrick Fic	85e3c5a433	Fix search select issues.	2023-10-16 10:24:16 -07:00
Patrick Fic	d8d5cde3f1	Merged in feature/IO-2411-active-employee-filtering (pull request #1010 ) IO-2411 filter inactive employees on prod. print button	2023-10-16 16:35:44 +00:00
Patrick Fic	6efa08fee3	IO-2411 filter inactive employees on prod. print button	2023-10-16 09:34:53 -07:00
Patrick Fic	636c13373c	Merged in release/2023-09-23 (pull request #1009 ) Release/2023 09 23	2023-10-16 16:19:04 +00:00
Patrick Fic	3659fbec84	Merged in 2023-09-29 (pull request #1004 ) 2023 09 29	2023-10-13 14:53:24 +00:00
Allan Carr	05f1a9b280	IO-1559 Adjust count object to new field tag	2023-10-12 14:54:58 -07:00
Allan Carr	5884d5eba0	Merged in feature/IO-1559-ClaimsCorp-Datapump (pull request #1005 ) IO-1559 Adjust count object to new field tag	2023-10-12 21:52:54 +00:00
Allan Carr	4dd2137006	IO-1559 Change xml label as per Claimscorp	2023-10-12 11:24:24 -07:00
Allan Carr	03315836a6	Merged in feature/IO-1559-ClaimsCorp-Datapump (pull request #1002 ) IO-1559 Change xml label as per Claimscorp	2023-10-12 18:23:39 +00:00
Patrick Fic	f703ba2cf9	Disable unnecessary events for Hasura.	2023-09-29 12:36:29 -07:00
Patrick Fic	dc05e4e166	Add CIECA PFO object to job.	2023-09-26 12:58:33 -07:00
Allan Carr	612e359d4c	Merged in feature/IO-2408-Speedprint-TZ (pull request #990 ) IO-2408 Remove unneeded library	2023-09-22 18:50:13 +00:00
Allan Carr	c8fb1ce302	IO-2408 Remove unneeded library	2023-09-22 11:51:41 -07:00
Allan Carr	b29d8e1912	IO-2408 Use bodyshop.timezone instead of UTCOffset in Speedprint	2023-09-22 11:34:09 -07:00
Allan Carr	74b6c2b6b5	Merged in feature/IO-2408-Speedprint-TZ (pull request #988 ) IO-2408 Use bodyshop.timezone instead of UTCOffset in Speedprint	2023-09-22 18:33:25 +00:00
Allan Carr	fce8039dad	Merged in feature/IO-2400-Courtesy-Car-Color-All-Cars (pull request #986 ) IO-2400 Add Color column to All Courtesy Cars	2023-09-22 15:27:13 +00:00
Allan Carr	085ae141ae	Merged in feature/IO-2407-InHouse-Audit-Log (pull request #984 ) IO-2407 In House Invoice Audit Log correction for Invoice Number	2023-09-22 15:27:02 +00:00
Allan Carr	fbc9ccc018	Merged in feature/IO-2363-Labour-Allocation-Summary-Color-Coding (pull request #985 ) IO-2363 Make Summary.Difference follow Color logic	2023-09-22 15:26:47 +00:00
Allan Carr	f2ede519d7	Merged in feature/IO-2398-Hours-Sold-By-Estimator (pull request #983 ) IO-2398 Hours Sold by Estimator	2023-09-22 15:26:39 +00:00
Allan Carr	21c53473d3	IO-2400 Add Color column to All Courtesy Cars	2023-09-20 15:58:48 -07:00
Allan Carr	fbc622fa04	IO-2363 Make Summary.Difference follow Color logic	2023-09-20 14:30:53 -07:00
Allan Carr	6319fd20fa	IO-2407 In House Invoice Audit Log correction for Invoice Number	2023-09-20 12:16:03 -07:00
Allan Carr	c998e4901f	IO-2398 Hours Sold by Estimator	2023-09-18 18:25:05 -07:00
Patrick Fic	06c35a4ff8	Add additonal query limits and restrictors for performance.	2023-09-18 16:08:20 -07:00
Patrick Fic	64851047bf	Merged in release/2023-09-15 (pull request #980 ) Release/2023 09 15	2023-09-15 17:40:34 +00:00
Patrick Fic	73fac34ef4	Merge branch 'feature/intellipay' into release/2023-09-15	2023-09-15 10:38:51 -07:00
Patrick Fic	5ca34105ef	Refactor payments for intellipay.	2023-09-15 10:37:09 -07:00
Allan Carr	fcfa1a9be8	Merged in feature/IO-2395-Payment-Expansion-Formating (pull request #976 ) IO-2395 Adjust Payment Number Label	2023-09-15 16:14:16 +00:00
Allan Carr	41849644f3	IO-2395 Adjust Payment Number Label	2023-09-15 09:15:34 -07:00
Allan Carr	f36fb06dd6	Merged in feature/IO-2368-QBO-Successful-Export (pull request #972 ) IO-2368 Confirm that there are successful transaction	2023-09-15 16:04:15 +00:00
Allan Carr	af4c4a4fa3	Merged in feature/IO-2395-Payment-Expansion-Formating (pull request #973 ) IO-2395 Payment Expansion Formatting	2023-09-15 16:03:59 +00:00
Patrick Fic	d6045a9334	Merge branch 'feature/IO-2399-import-status' into release/2023-09-15	2023-09-14 11:19:05 -07:00
Patrick Fic	dcc29f23d4	Respect default import status on new creation.	2023-09-14 11:18:40 -07:00
Patrick Fic	638a9fc76b	Add CIECA PFT to job.	2023-09-11 11:45:35 -07:00
Allan Carr	53e3b3fa03	IO-2395 Payment Expansion Formatting	2023-09-11 11:15:50 -07:00
Allan Carr	56c1b6f992	IO-2368 Confirm that there are successful transaction	2023-09-11 09:07:38 -07:00
Allan Carr	22f9a7ee3d	Merged in release/2023-09-01 (pull request #971 ) Release/2023 09 01	2023-09-08 20:50:50 +00:00
Allan Carr	cfcad472fd	Merged in feature/IO-2391-IP-Address-for-Check (pull request #969 ) IO-2391 Remote IP comment out till proxy for X-Forwarded-For can be figured out from AWS Load balancer	2023-09-08 20:17:19 +00:00
Allan Carr	1a622f1b2c	IO-2391 Remote IP comment out till proxy for X-Forwarded-For can be figured out from AWS Load balancer	2023-09-08 13:18:20 -07:00
Allan Carr	87e3adf579	IO-2368 Move Cache update to function and just pass in keys array	2023-09-08 10:17:42 -07:00
Allan Carr	aa7a4ccdd0	Merged in feature/IO-2368-QBO-Successful-Export (pull request #967 ) IO-2368 Move Cache update to function and just pass in keys array	2023-09-08 17:16:50 +00:00
Allan Carr	28dc10f5a1	Merged in feature/IO-2368-QBO-Successful-Export (pull request #966 ) IO-2368 Update Cache on success	2023-09-08 00:23:57 +00:00
Allan Carr	b2d615b9c1	Merged in feature/IO-2392-Ticket-Date-UTCOffset (pull request #965 ) IO-2392 Ticket Date UTCOffset	2023-09-08 00:22:28 +00:00
Allan Carr	1e40a22762	IO-2392 Ticket Date UTCOffset	2023-09-07 17:23:08 -07:00
Allan Carr	d1407162d9	IO-2368 Update Cache on success	2023-09-07 17:21:21 -07:00
Allan Carr	7a1984d037	IO-2368 Update Cache on QBD posting success	2023-09-06 16:23:58 -07:00
Allan Carr	9bcc449f20	Merged in feature/IO-2368-QBO-Successful-Export (pull request #964 ) IO-2368 Update Cache on QBD posting success	2023-09-06 23:23:53 +00:00
Allan Carr	bc7d0ef171	IO-2391 Add IP address to Server API Check	2023-09-06 09:06:05 -07:00
Allan Carr	3e9b046476	Merged in feature/IO-2391-IP-Address-for-Check (pull request #963 ) IO-2391 Add IP address to Server API Check	2023-09-06 16:05:57 +00:00
Allan Carr	e0ccd62c82	Merged in feature/IO-1559-ClaimsCorp-Datapump (pull request #956 ) IO-1559 ClaimsCorp Datapump	2023-09-01 15:47:25 +00:00
Allan Carr	fd0970aef2	Merged in feature/IO-2365-Correct-LAU-Transation (pull request #961 ) IO-2365 LAU Translation adjust from Detail to User Defined	2023-09-01 15:47:08 +00:00
Allan Carr	b673bcae7a	IO-2365 LAU Translation adjust from Detail to User Defined	2023-09-01 08:46:52 -07:00
Allan Carr	63673548a0	IO-1559 ClaimsCorp Datapump	2023-08-29 17:51:34 -07:00
Patrick Fic	29b74a8c0e	Resolve issue when selecting lines.	2023-08-29 14:12:38 -07:00
Patrick Fic	2658626c7e	Add CIECA PFL info.	2023-08-28 12:05:36 -07:00
Allan Carr	763b199646	Merged in release/2023-08-25 (pull request #954 ) Release/2023 08 25	2023-08-25 19:49:35 +00:00
Allan Carr	17905fa844	Merged in feature/IO-2389-Add-Metadata-of-Transaction-Wip (pull request #953 ) IO-2389 Metadata to ExportLog	2023-08-25 18:05:01 +00:00
Allan Carr	74a0b78a71	IO-2389 Metadata to ExportLog	2023-08-25 11:05:16 -07:00
Allan Carr	797a423702	Merged in feature/IO-2368-QBO-Successful-Export (pull request #945 ) IO-2368 Successful Export Notification for QBO	2023-08-25 17:24:38 +00:00
Allan Carr	2fce8c9644	Merged in feature/IO-2385-Tech-Console-Attendance-Report (pull request #946 ) IO-2385 Enabled Emailing of TimeTicket & Attendance from Tech Console	2023-08-25 17:24:23 +00:00
Patrick Fic	9cd39c1c3e	Resolve manual appointment old data after submission.	2023-08-25 10:23:22 -07:00
Patrick Fic	6264a2f45c	Merge branch 'feature/intellipay' into release/2023-08-25	2023-08-23 13:54:39 -07:00
Patrick Fic	94e47d14ad	Add server side logging for intellipay.	2023-08-23 13:26:17 -07:00
Allan Carr	9319f492dd	IO-2385 Enabled Emailing of TimeTicket & Attendance from Tech Console Modify print center so that it will/wont display email option if technician is set and production board detail so that it wont display the remove from production / add to scoreboard if technician is set	2023-08-22 13:29:28 -07:00
Allan Carr	8f04c5a12c	IO-2368 Successful Export Notification for QBO	2023-08-22 09:15:10 -07:00
Allan Carr	436a41405d	Merged in release/2023-08-18 (pull request #944 ) Release/2023 08 18	2023-08-18 21:41:04 +00:00
Allan Carr	a2150009db	IO-2385 Tech Console to print Attendance Report from Shift Clock	2023-08-18 13:59:42 -07:00
Allan Carr	e1c785322f	Merged in feature/IO-2385-Tech-Console-Attendance-Report (pull request #943 ) IO-2385 Tech Console to print Attendance Report from Shift Clock	2023-08-18 20:59:23 +00:00
John Allen Delos Reyes	c1d71720ab	Merged in feature/IO-2380-parts-order-receive-modal (pull request #934 ) Feature/IO-2380 parts order receive modal Approved-by: Patrick Fic	2023-08-18 18:16:04 +00:00
Allan Carr	89ff7740e2	Merged in feature/IO-2325-Ticket-Create-By (pull request #942 ) IO-2325 Add in Created by from Action menu	2023-08-18 16:02:56 +00:00
Allan Carr	4e69fe819e	IO-2325 Add in Created by from Action menu	2023-08-18 09:03:13 -07:00
Allan Carr	a8cc3fa190	Merged in feature/IO-2384-Owner-Related-Job-Default-Sort-Order (pull request #939 ) IO-2384 Default Sort Order for Related Jobs	2023-08-17 23:19:03 +00:00
Allan Carr	10fceb7ddf	IO-2384 Extend to Vehicle Related ROs	2023-08-17 16:18:56 -07:00
Allan Carr	6c1a0cff8d	IO-2384 Default Sort Order for Related Jobs	2023-08-17 16:05:33 -07:00
Allan Carr	d92d2cca9a	Merged in feature/IO-2247-Dashboard-Components (pull request #938 ) IO-2247 Don't push manual appointments into component if they don't have a job associated.	2023-08-17 16:32:37 +00:00
Allan Carr	ea54820bc0	IO-2247 Don't push manual appointments into component if they don't have a job associated.	2023-08-17 09:32:32 -07:00
Allan Carr	62a800a2c0	Merged in feature/IO-2381-Disabled-Cancel-Appt-Button (pull request #937 ) IO-2381 Disabled Cancel Appt Button	2023-08-17 01:37:20 +00:00
Allan Carr	9c408d8bf5	IO-2381 Disabled Cancel Appt Button	2023-08-16 18:37:19 -07:00
Allan Carr	45ad09c100	Merged in feature/IO-2383-Timeticket-Employee-Rangefilter (pull request #935 ) IO-2383 TimeTicket Employee Range Filter	2023-08-17 00:25:11 +00:00
Allan Carr	dd5cafcd42	IO-2383 TimeTicket Employee Range Filter	2023-08-16 17:25:32 -07:00
Patrick Fic	eb48b56f47	Updates to SMS payments.	2023-08-16 16:14:34 -07:00
Patrick Fic	a879e99e77	Fix postback handling.	2023-08-16 15:28:05 -07:00
swtmply	ddd816e7ca	IO-2380 added translation to fields	2023-08-17 06:15:46 +08:00
swtmply	d646e5f285	IO-2380 added part number and price	2023-08-16 11:43:21 +08:00
Patrick Fic	c10517a11b	Intellipay improvements with Allan	2023-08-15 14:59:35 -07:00
Allan Carr	ba683a2e8a	Merged in release/2023-08-11 (pull request #931 ) Release/2023 08 11	2023-08-11 20:36:11 +00:00
Patrick Fic	6b66b76f84	Cleanup imports.	2023-08-11 13:13:26 -07:00
Patrick Fic	c3fe763261	Improvements to intellipay script.	2023-08-11 09:48:39 -07:00
Allan Carr	5209c12b89	Merged in feature/IO-2325-Ticket-Create-By (pull request #928 ) IO-2325 Shift Clock Created By	2023-08-11 15:36:06 +00:00
Allan Carr	bf7aa17f65	IO-2325 Shift Clock Created By	2023-08-11 08:35:57 -07:00
Allan Carr	cd6e0dcde3	Merged in feature/IO-2325-Ticket-Create-By (pull request #926 ) IO-2325 Time Ticket Creation Date	2023-08-10 19:06:58 +00:00
Allan Carr	a2822f5592	Merged in feature/IO-2376-Inactive-Employee-Login (pull request #925 ) IO-2376 Prevent Inactive Employee from logging in	2023-08-10 19:06:49 +00:00
Allan Carr	ca129fa4a0	IO-2325 Time Ticket Creation Date	2023-08-10 12:06:47 -07:00
Patrick Fic	cbe0c78553	Update to secrets retrieval.	2023-08-09 20:42:37 -07:00
Patrick Fic	2e763f1dd5	Minor updates to intellipay processing.	2023-08-09 20:14:44 -07:00
Patrick Fic	b8942c320e	Merge branch 'master' into feature/intellipay	2023-08-09 19:48:33 -07:00
Allan Carr	de92b2d47e	Merged in feature/IO-2375-Job-Costing-by-CSR-Filter-Label (pull request #924 ) IO-2375 Filter label for Job Costing by CSR correction	2023-08-09 22:26:09 +00:00
Allan Carr	5d7384aa8b	IO-2375 Filter label for Job Costing by CSR correction	2023-08-09 15:25:58 -07:00
Patrick Fic	bf18e687da	Schema updates for parts dispatch.	2023-08-04 12:36:08 -07:00
Patrick Fic	fb5c5561e9	Resolve translations issues.	2023-05-17 12:21:14 -07:00
swtmply	a5e3985745	added the logic for aws secrets manager	2023-03-27 23:21:39 +08:00
swtmply	88ee4f13e1	code cleanup and translations	2023-03-18 02:45:00 +08:00
swtmply	fa05d0b401	added refund and sms feature	2023-03-17 01:05:51 +08:00
swtmply	cf017fb80b	fixed the duplicate non-approval call from intellipay	2023-03-15 03:45:08 +08:00
swtmply	56c366e9e8	added dummy function for dynamic bodyshop	2023-03-15 03:44:33 +08:00
swtmply	07b7394fec	fixed the import path from payment response queries	2023-03-14 23:24:44 +08:00
swtmply	0617d79d19	some cleanup and translation	2023-03-14 02:37:04 +08:00
swtmply	885e9c6958	added the card payment option on actions and menu	2023-03-14 02:36:41 +08:00
swtmply	6bf5f2fe77	added expandable row in payments table	2023-03-14 02:36:22 +08:00
swtmply	a3cc5c2324	restructured card payment modal and added audit trailing	2023-03-14 02:35:56 +08:00
swtmply	a44ed3c406	removed console log and added the mutation for failed payment attempts	2023-03-06 21:49:14 +08:00
swtmply	aa5110ae13	transfered test files to separate component	2023-03-04 04:05:28 +08:00
swtmply	c8ee9ca5a7	initial intellipay implementation Co-authored-by: Patrick Fic <patrick@thinkimex.com>	2023-03-01 00:31:44 +08:00
				`@@ -0,0 +1 @@`
				`DROP INDEX IF EXISTS "public"."parts_dispatch_employeeid";`