IO-2598 Restrict IOU from Tech Console

Merged in feature/IO-1828-Beta-Updates-To-Test (pull request #1193 )
Feature/IO-1828 Beta Updates To Test
2024-01-19 08:47:17 -08:00 · 2024-01-18 21:48:51 +00:00 · 2024-01-18 16:35:30 -05:00 · 2024-01-18 16:22:58 -05:00 · 2024-01-18 16:16:06 -05:00 · 2024-01-18 16:07:17 -05:00
238 changed files with 38656 additions and 15634 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,13 +8,13 @@ orbs:
 jobs:
  api-deploy:
    docker:
-      - image: "cimg/base:stable"
+      - image: cimg/node:18.18.2
    steps:
      - checkout
      - eb/setup
      - run:
          command: |
-            eb init imex-online-production-api -r ca-central-1 -p "Node.js 16 running on 64bit Amazon Linux 2"
+            eb init imex-online-production-api -r ca-central-1 -p "Node.js 18 running on 64bit Amazon Linux 2"
            eb status --verbose
            eb deploy
            eb status
--- a/.gitignore
+++ b/.gitignore
@@ -117,4 +117,6 @@ logs/oAuthClient-log.log
 .node-persist/**
-/*.env.*
+/*.env.*
 .idea/*
 .idea
--- a/.npmrc
+++ b/.npmrc
@@ -0,0 +1 @@
 legacy-peer-deps=true
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -364,6 +364,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
                                    <concept_node>
                                        <name>unblock</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>viewjob</name>
                                        <definition_loaded>false</definition_loaded>
@@ -1009,27 +1030,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 +1474,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 +3592,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 +4247,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 +16228,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 +16585,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>
@@ -17671,6 +17776,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
                                    <concept_node>
                                        <name>reports</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>required</name>
                                        <definition_loaded>false</definition_loaded>
@@ -19213,6 +19339,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>
@@ -19367,6 +19514,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
                                    <concept_node>
                                        <name>paymentnum</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>paymenttype</name>
                                        <definition_loaded>false</definition_loaded>
@@ -23689,6 +23857,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>
@@ -23949,6 +24138,27 @@
                                                    </translation>
                                                </translations>
                                            </concept_node>
                                            <concept_node>
                                                <name>dms_model_override</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>dms_unsold</name>
                                                <definition_loaded>false</definition_loaded>
@@ -28469,6 +28679,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 +33110,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 +37314,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 +37385,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 +37878,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 +40963,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>
@@ -43045,6 +43344,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
                                    <concept_node>
                                        <name>hours_sold_detail_closed_estimator</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>hours_sold_detail_closed_ins_co</name>
                                        <definition_loaded>false</definition_loaded>
@@ -43129,6 +43449,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
                                    <concept_node>
                                        <name>hours_sold_detail_open_estimator</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>hours_sold_detail_open_ins_co</name>
                                        <definition_loaded>false</definition_loaded>
@@ -43213,6 +43554,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
                                    <concept_node>
                                        <name>hours_sold_summary_closed_estimator</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>hours_sold_summary_closed_ins_co</name>
                                        <definition_loaded>false</definition_loaded>
@@ -43297,6 +43659,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
                                    <concept_node>
                                        <name>hours_sold_summary_open_estimator</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>hours_sold_summary_open_ins_co</name>
                                        <definition_loaded>false</definition_loaded>
@@ -43633,6 +44016,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
                                    <concept_node>
                                        <name>open_orders_referral</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>open_orders_specific_csr</name>
                                        <definition_loaded>false</definition_loaded>
@@ -44536,6 +44940,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>
@@ -45991,6 +46416,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
                                    <concept_node>
                                        <name>created_by</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>date</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",
@@ -89,8 +89,8 @@
    "analyze": "source-map-explorer 'build/static/js/*.js'",
    "start": "craco start",
    "build": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build",
-    "build:test": "env-cmd -f .env.test yarn run build",
+    "build:test": "env-cmd -f .env.test npm run build",
-    "build-deploy:test": "yarn run build:test && s3cmd sync build/* s3://imex-online-test && echo '🚀 TESTING Deployed!'",
+    "build-deploy:test": "npm run build:test && s3cmd sync build/* s3://imex-online-test && echo '🚀 TESTING Deployed!'",
    "buildcra": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build",
    "test": "cypress open",
    "eject": "react-scripts eject",
--- a/client/src/App/App.jsx
+++ b/client/src/App/App.jsx
@@ -22,6 +22,7 @@ import {
 } from "../redux/user/user.selectors";
 import PrivateRoute from "../utils/private-route";
 import "./App.styles.scss";
 import handleBeta from "../utils/handleBeta";
 const ResetPassword = lazy(() =>
  import("../pages/reset-password/reset-password.component")
@@ -57,7 +58,6 @@ export function App({
    if (!navigator.onLine) {
      setOnline(false);
    }
    checkUserSession();
  }, [checkUserSession, setOnline]);
@@ -73,6 +73,7 @@ export function App({
  window.addEventListener("online", function (e) {
    setOnline(true);
  });
  useEffect(() => {
    if (currentUser.authorized && bodyshop) {
      client.setAttribute("imexshopid", bodyshop.imexshopid);
@@ -107,6 +108,8 @@ export function App({
      />
    );
  handleBeta();
  return (
    <Switch>
      <Suspense fallback={<LoadingSpinner message="ImEX Online" />}>
--- 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/accounting-payables-table/accounting-payables-table.component.jsx
+++ b/client/src/components/accounting-payables-table/accounting-payables-table.component.jsx
@@ -15,6 +15,7 @@ import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
 import BillMarkSelectedExported from "../payable-mark-selected-exported/payable-mark-selected-exported.component";
 import {pageLimit} from "../../utils/config";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -210,7 +211,7 @@ export function AccountingPayablesTableComponent({
      <Table
        loading={loading}
        dataSource={dataSource}
-        pagination={{ position: "top", pageSize: 50 }}
+        pagination={{ position: "top", pageSize: pageLimit }}
        columns={columns}
        rowKey="id"
        onChange={handleTableChange}
--- a/client/src/components/accounting-payments-table/accounting-payments-table.component.jsx
+++ b/client/src/components/accounting-payments-table/accounting-payments-table.component.jsx
@@ -15,6 +15,7 @@ import PaymentExportButton from "../payment-export-button/payment-export-button.
 import PaymentMarkSelectedExported from "../payment-mark-selected-exported/payment-mark-selected-exported.component";
 import PaymentsExportAllButton from "../payments-export-all-button/payments-export-all-button.component";
 import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
 import {pageLimit} from "../../utils/config";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -209,7 +210,7 @@ export function AccountingPayablesTableComponent({
      <Table
        loading={loading}
        dataSource={dataSource}
-        pagination={{ position: "top", pageSize: 50 }}
+        pagination={{ position: "top", pageSize: pageLimit }}
        columns={columns}
        rowKey="id"
        onChange={handleTableChange}
--- a/client/src/components/audit-trail-list/audit-trail-list.component.jsx
+++ b/client/src/components/audit-trail-list/audit-trail-list.component.jsx
@@ -4,6 +4,7 @@ import { alphaSort } from "../../utils/sorters";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import { useTranslation } from "react-i18next";
 import AuditTrailValuesComponent from "../audit-trail-values/audit-trail-values.component";
 import {pageLimit} from "../../utils/config";
 export default function AuditTrailListComponent({ loading, data }) {
  const [state, setState] = useState({
@@ -74,7 +75,7 @@ export default function AuditTrailListComponent({ loading, data }) {
    <Table
      {...formItemLayout}
      loading={loading}
-      pagination={{ position: "top", defaultPageSize: 25 }}
+      pagination={{ position: "top", defaultPageSize: pageLimit }}
      columns={columns}
      rowKey="id"
      dataSource={data}
--- a/client/src/components/audit-trail-list/email-audit-trail-list.component.jsx
+++ b/client/src/components/audit-trail-list/email-audit-trail-list.component.jsx
@@ -3,6 +3,7 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
 import {pageLimit} from "../../utils/config";
 export default function EmailAuditTrailListComponent({ loading, data }) {
  const [state, setState] = useState({
@@ -53,7 +54,7 @@ export default function EmailAuditTrailListComponent({ loading, data }) {
    <Table
      {...formItemLayout}
      loading={loading}
-      pagination={{ position: "top", defaultPageSize: 25 }}
+      pagination={{ position: "top", defaultPageSize: pageLimit }}
      columns={columns}
      rowKey="id"
      dataSource={data}
--- a/client/src/components/bill-detail-edit/bill-detail-edit-component.jsx
+++ b/client/src/components/bill-detail-edit/bill-detail-edit-component.jsx
@@ -10,7 +10,7 @@ import { createStructuredSelector } from "reselect";
 import {
  DELETE_BILL_LINE,
  INSERT_NEW_BILL_LINES,
-  UPDATE_BILL_LINE
+  UPDATE_BILL_LINE,
 } from "../../graphql/bill-lines.queries";
 import { QUERY_BILL_BY_PK, UPDATE_BILL } from "../../graphql/bills.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
@@ -20,6 +20,7 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import AlertComponent from "../alert/alert.component";
 import BillFormContainer from "../bill-form/bill-form.container";
 import BillMarkExportedButton from "../bill-mark-exported-button/bill-mark-exported-button.component";
 import BillPrintButton from "../bill-print-button/bill-print-button.component";
 import BillReeportButtonComponent from "../bill-reexport-button/bill-reexport-button.component";
 import JobDocumentsGallery from "../jobs-documents-gallery/jobs-documents-gallery.container";
 import JobsDocumentsLocalGallery from "../jobs-documents-local-gallery/jobs-documents-local-gallery.container";
@@ -176,7 +177,7 @@ export function BillDetailEditcontainer({
            extra={
              <Space>
                <BillDetailEditReturn data={data} />
-
+                <BillPrintButton billid={search.billid} />
                <Popconfirm
                  visible={visible}
                  onConfirm={() => form.submit()}
--- 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 }) =>
+  insertAuditTrail: ({ jobid, billid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, 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
@@ -1,6 +1,6 @@
 import Icon, { UploadOutlined } from "@ant-design/icons";
 import { useApolloClient } from "@apollo/client";
-import { MdOpenInNew } from "react-icons/md";
+import { useTreatments } from "@splitsoftware/splitio-react";
 import {
  Alert,
  Divider,
@@ -12,14 +12,17 @@ import {
  Switch,
  Upload,
 } from "antd";
 import moment from "moment";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { MdOpenInNew } from "react-icons/md";
 import { connect } from "react-redux";
 import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { CHECK_BILL_INVOICE_NUMBER } from "../../graphql/bills.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import BillFormLinesExtended from "../bill-form-lines-extended/bill-form-lines-extended.component";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
 import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
@@ -28,8 +31,6 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
 import BillFormLines from "./bill-form.lines.component";
 import { CalculateBillTotal } from "./bill-form.totals.utility";
 import { useTreatments } from "@splitsoftware/splitio-react";
 import BillFormLinesExtended from "../bill-form-lines-extended/bill-form-lines-extended.component";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -49,6 +50,7 @@ export function BillFormComponent({
  job,
  loadOutstandingReturns,
  loadInventory,
  preferredMake,
 }) {
  const { t } = useTranslation();
  const client = useApolloClient();
@@ -58,6 +60,11 @@ export function BillFormComponent({
    {},
    bodyshop.imexshopid
  );
  const { ClosingPeriod } = useTreatments(
    ["ClosingPeriod"],
    {},
    bodyshop.imexshopid
  );
  const handleVendorSelect = (props, opt) => {
    setDiscount(opt.discount);
@@ -72,6 +79,20 @@ export function BillFormComponent({
      });
  };
  const handleFederalTaxExemptSwitchToggle = (checked) => {
    // Early gate
    if (!checked) return;
    const values = form.getFieldsValue("billlines");
    // Gate bill lines
    if (!values?.billlines?.length) return;
    const billlines = values.billlines.map((b) => {
      b.applicable_taxes.federal = false;
      return b;
    });
    form.setFieldsValue({ billlines });
  };
  useEffect(() => {
    if (job) form.validateFields(["is_credit_memo"]);
  }, [job, form]);
@@ -179,6 +200,7 @@ export function BillFormComponent({
          <VendorSearchSelect
            disabled={disabled}
            options={vendorAutoCompleteOptions}
            preferredMake={preferredMake}
            onSelect={handleVendorSelect}
          />
        </Form.Item>
@@ -259,6 +281,37 @@ export function BillFormComponent({
              required: true,
              //message: t("general.validation.required"),
            },
            ({ getFieldValue }) => ({
              validator(rule, value) {
                if (
                  ClosingPeriod.treatment === "on" &&
                  bodyshop.accountingconfig.ClosingPeriod
                ) {
                  if (
                    moment(value)
                      .startOf("day")
                      .isSameOrAfter(
                        moment(
                          bodyshop.accountingconfig.ClosingPeriod[0]
                        ).startOf("day")
                      ) &&
                    moment(value)
                      .startOf("day")
                      .isSameOrBefore(
                        moment(
                          bodyshop.accountingconfig.ClosingPeriod[1]
                        ).endOf("day")
                      )
                  ) {
                    return Promise.resolve();
                  } else {
                    return Promise.reject(t("bills.validation.closingperiod"));
                  }
                } else {
                  return Promise.resolve();
                }
              },
            }),
          ]}
        >
          <FormDatePicker disabled={disabled} />
@@ -348,7 +401,16 @@ export function BillFormComponent({
        >
          <CurrencyInput min={0} />
        </Form.Item>
-        <Form.Item shouldUpdate span={15}>
+        {bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (
          <Form.Item
            span={2}
            label={t("bills.labels.federal_tax_exempt")}
            name="federal_tax_exempt"
          >
            <Switch onChange={handleFederalTaxExemptSwitchToggle} />
          </Form.Item>
        ) : null}
        <Form.Item shouldUpdate span={13}>
          {() => {
            const values = form.getFieldsValue([
              "billlines",
@@ -366,7 +428,7 @@ export function BillFormComponent({
              totals = CalculateBillTotal(values);
            if (!!totals)
              return (
-                <div>
+                <div align="right">
                  <Space wrap>
                    <Statistic
                      title={t("bills.labels.subtotal")}
--- 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 BillFormComponent from "./bill-form.component";
 import { useTreatments } from "@splitsoftware/splitio-react";
 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/bill-form/bill-form.lines.component.jsx
+++ b/client/src/components/bill-form/bill-form.lines.component.jsx
@@ -1,14 +1,15 @@
 import { DeleteFilled, DollarCircleFilled } from "@ant-design/icons";
 import { useTreatments } from "@splitsoftware/splitio-react";
 import {
-  Button, Form,
+  Button,
  Form,
  Input,
  InputNumber,
  Select,
  Space,
  Switch,
  Table,
-  Tooltip
+  Tooltip,
 } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -466,7 +467,8 @@ export function BillEnterModalLinesComponent({
          return {
            key: `${field.index}fedtax`,
            valuePropName: "checked",
-            initialValue: true,
+            initialValue:
              form.getFieldValue("federal_tax_exempt") === true ? false : true,
            name: [field.name, "applicable_taxes", "federal"],
          };
        },
--- a/client/src/components/bill-print-button/bill-print-button.component.jsx
+++ b/client/src/components/bill-print-button/bill-print-button.component.jsx
@@ -0,0 +1,38 @@
 import { Button, Space } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 export default function BillPrintButton({ billid }) {
  const { t } = useTranslation();
  const [loading, setLoading] = useState(false);
  const Templates = TemplateList("job_special");
  const submitHandler = async () => {
    setLoading(true);
    try {
      await GenerateDocument(
        {
          name: Templates.parts_invoice_label_single.key,
          variables: {
            id: billid,
          },
        },
        {},
        "p"
      );
    } catch (e) {
      console.warn("Warning: Error generating a document.");
    }
    setLoading(false);
  };
  return (
    <Space wrap>
      <Button loading={loading} onClick={submitHandler}>
        {t("bills.labels.printlabels")}
      </Button>
    </Space>
  );
 }
--- 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-conversation-title/chat-conversation-title.component.jsx
+++ b/client/src/components/chat-conversation-title/chat-conversation-title.component.jsx
@@ -4,6 +4,7 @@ import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import ChatArchiveButton from "../chat-archive-button/chat-archive-button.component";
 import ChatConversationTitleTags from "../chat-conversation-title-tags/chat-conversation-title-tags.component";
 import ChatLabelComponent from "../chat-label/chat-label.component";
 import ChatPrintButton from "../chat-print-button/chat-print-button.component";
 import ChatTagRoContainer from "../chat-tag-ro/chat-tag-ro.container";
 export default function ChatConversationTitle({ conversation }) {
@@ -13,6 +14,7 @@ export default function ChatConversationTitle({ conversation }) {
        {conversation && conversation.phone_num}
      </PhoneNumberFormatter>
      <ChatLabelComponent conversation={conversation} />
      <ChatPrintButton conversation={conversation} />
      <ChatConversationTitleTags
        jobConversations={
          (conversation && conversation.job_conversations) || []
--- 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/chat-popup/chat-popup.component.jsx
+++ b/client/src/components/chat-popup/chat-popup.component.jsx
@@ -132,7 +132,7 @@ export function ChatPopupComponent({
            onClick={() => toggleChatVisible()}
            style={{ cursor: "pointer" }}
          >
-            <MessageOutlined />
+            <MessageOutlined className="chat-popup-info-icon" />
            <strong>{t("messaging.labels.messaging")}</strong>
          </div>
        )}
--- a/client/src/components/chat-popup/chat-popup.styles.scss
+++ b/client/src/components/chat-popup/chat-popup.styles.scss
@@ -13,6 +13,9 @@
    height: 100%;
  }
 }
 .chat-popup-info-icon {
  margin-right: 5px;
 }
@media only screen and (min-width: 992px) {
  .chat-popup {
--- a/client/src/components/chat-print-button/chat-print-button.component.jsx
+++ b/client/src/components/chat-print-button/chat-print-button.component.jsx
@@ -0,0 +1,59 @@
 import { MailOutlined, PrinterOutlined } from "@ant-design/icons";
 import { Space, Spin } from "antd";
 import React, { useState } from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { setEmailOptions } from "../../redux/email/email.actions";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 const mapStateToProps = createStructuredSelector({});
 const mapDispatchToProps = (dispatch) => ({
  setEmailOptions: (e) => dispatch(setEmailOptions(e)),
 });
 export function ChatPrintButton({ conversation }) {
  const [loading, setLoading] = useState(false);
  return (
    <Space wrap>
      <PrinterOutlined
        onClick={() => {
          setLoading(true);
          GenerateDocument(
            {
              name: TemplateList("messaging").conversation_list.key,
              variables: { id: conversation.id },
            },
            {
              subject: TemplateList("messaging").conversation_list.subject,
            },
            "p",
            conversation.id
          );
          setLoading(false);
        }}
      />
      <MailOutlined
        onClick={() => {
          setLoading(true);
          GenerateDocument(
            {
              name: TemplateList("messaging").conversation_list.key,
              variables: { id: conversation.id },
            },
            {
              subject: TemplateList("messaging").conversation_list.subject,
            },
            "e",
            conversation.id
          );
          setLoading(false);
        }}
      />
      {loading && <Spin />}
    </Space>
  );
 }
 export default connect(mapStateToProps, mapDispatchToProps)(ChatPrintButton);
--- a/client/src/components/contract-cars/contract-cars.component.jsx
+++ b/client/src/components/contract-cars/contract-cars.component.jsx
@@ -35,6 +35,15 @@ export default function ContractsCarsComponent({
        state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
      render: (text, record) => <div>{t(record.status)}</div>,
    },
    {
      title: t("courtesycars.fields.readiness"),
      dataIndex: "readiness",
      key: "readiness",
      sorter: (a, b) => alphaSort(a.readiness, b.readiness),
      sortOrder:
        state.sortedInfo.columnKey === "readiness" && state.sortedInfo.order,
      render: (text, record) => t(record.readiness),
    },
    {
      title: t("courtesycars.fields.year"),
      dataIndex: "year",
--- a/client/src/components/contract-jobs/contract-jobs.component.jsx
+++ b/client/src/components/contract-jobs/contract-jobs.component.jsx
@@ -4,6 +4,7 @@ import { useTranslation } from "react-i18next";
 import { alphaSort } from "../../utils/sorters";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import {pageLimit} from "../../utils/config";
 export default function ContractsJobsComponent({
  loading,
@@ -175,7 +176,7 @@ export default function ContractsJobsComponent({
        loading={loading}
        pagination={{
          position: "top",
-          defaultPageSize: 10,
+          defaultPageSize: pageLimit,
          defaultCurrent: defaultCurrent,
        }}
        columns={columns}
--- a/client/src/components/contract-jobs/contract-jobs.container.jsx
+++ b/client/src/components/contract-jobs/contract-jobs.container.jsx
@@ -2,10 +2,10 @@ import { useQuery } from "@apollo/client";
 import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import ContractJobsComponent from "./contract-jobs.component";
 import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries";
 const mapStateToProps = createStructuredSelector({
  //currentUser: selectCurrentUser
@@ -15,6 +15,7 @@ export function ContractJobsContainer({ selectedJobState, bodyshop }) {
  const { loading, error, data } = useQuery(QUERY_ALL_ACTIVE_JOBS, {
    variables: {
      statuses: bodyshop.md_ro_statuses.active_statuses || ["Open"],
      isConverted: true,
    },
    fetchPolicy: "network-only",
    nextFetchPolicy: "network-only",
--- a/client/src/components/contracts-list/contracts-list.component.jsx
+++ b/client/src/components/contracts-list/contracts-list.component.jsx
@@ -4,15 +4,16 @@ import queryString from "query-string";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link, useHistory, useLocation } from "react-router-dom";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
 import ContractsFindModalContainer from "../contracts-find-modal/contracts-find-modal.container";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import moment from "moment";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import moment from "moment";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import {pageLimit} from "../../utils/config";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -209,7 +210,7 @@ export function ContractsList({
        }}
        pagination={{
          position: "top",
-          pageSize: 25,
+          pageSize: pageLimit,
          current: parseInt(page || 1),
          total: total,
        }}
--- a/client/src/components/courtesy-car-contract-list/courtesy-car-contract-list.component.jsx
+++ b/client/src/components/courtesy-car-contract-list/courtesy-car-contract-list.component.jsx
@@ -5,6 +5,7 @@ import { useTranslation } from "react-i18next";
 import { Link, useHistory, useLocation } from "react-router-dom";
 import { DateFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
 import {pageLimit} from "../../utils/config";
 export default function CourtesyCarContractListComponent({
  contracts,
@@ -89,7 +90,7 @@ export default function CourtesyCarContractListComponent({
        scroll={{ x: true }}
        pagination={{
          position: "top",
-          pageSize: 25,
+          pageSize: pageLimit,
          current: parseInt(page || 1),
          total: totalContracts,
        }}
--- a/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx
+++ b/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx
@@ -7,6 +7,7 @@ import { useTranslation } from "react-i18next";
 import { CHECK_CC_FLEET_NUMBER } from "../../graphql/courtesy-car.queries";
 import { DateFormatter } from "../../utils/DateFormatter";
 import CourtesyCarFuelSlider from "../courtesy-car-fuel-select/courtesy-car-fuel-select.component";
 import CourtesyCarReadiness from "../courtesy-car-readiness-select/courtesy-car-readiness-select.component";
 import CourtesyCarStatus from "../courtesy-car-status-select/courtesy-car-status-select.component";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
 //import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
@@ -34,6 +35,18 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
      {/* <FormFieldsChanged form={form} /> */}
      <LayoutFormRow header={t("courtesycars.labels.vehicle")}>
        <Form.Item
          label={t("courtesycars.fields.year")}
          name="year"
          rules={[
            {
              required: true,
              //message: t("general.validation.required"),
            },
          ]}
        >
          <Input />
        </Form.Item>
        <Form.Item
          label={t("courtesycars.fields.make")}
          name="make"
@@ -58,18 +71,6 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
        >
          <Input />
        </Form.Item>
        <Form.Item
          label={t("courtesycars.fields.year")}
          name="year"
          rules={[
            {
              required: true,
              //message: t("general.validation.required"),
            },
          ]}
        >
          <Input />
        </Form.Item>
        <Form.Item
          label={t("courtesycars.fields.plate")}
          name="plate"
@@ -118,7 +119,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
            },
          ]}
        >
-          <InputNumber precision={0} />
+          <InputNumber min={0} precision={0} />
        </Form.Item>
        <Form.Item
          label={t("courtesycars.fields.fleetnumber")}
@@ -213,49 +214,27 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
        >
          <CourtesyCarStatus />
        </Form.Item>
-        <Form.Item
+        <Form.Item label={t("courtesycars.fields.readiness")} name="readiness">
-          label={t("courtesycars.fields.nextservicekm")}
+          <CourtesyCarReadiness />
          name="nextservicekm"
          rules={[
            {
              required: true,
              //message: t("general.validation.required"),
            },
          ]}
        >
          <InputNumber />
        </Form.Item>
        <div>
          <Form.Item
-            label={t("courtesycars.fields.nextservicedate")}
+            label={t("courtesycars.fields.nextservicekm")}
-            name="nextservicedate"
+            name="nextservicekm"
            rules={[
              {
                required: true,
                //message: t("general.validation.required"),
              },
            ]}
          >
-            <FormDatePicker />
+            <InputNumber min={0} precision={0} />
          </Form.Item>
          <Form.Item
            shouldUpdate={(p, c) =>
-              p.mileage !== c.mileage ||
+              p.mileage !== c.mileage || p.nextservicekm !== c.nextservicekm
              p.nextservicedate !== c.nextservicedate ||
              p.nextservicekm !== c.nextservicekm
            }
          >
            {() => {
              const nextservicedate = form.getFieldValue("nextservicedate");
              const nextservicekm = form.getFieldValue("nextservicekm");
-
+              const mileageOver = nextservicekm
-              const mileageOver =
+                ? nextservicekm <= form.getFieldValue("mileage")
-                nextservicekm <= form.getFieldValue("mileage");
+                : false;
-
+              if (mileageOver)
              const dueForService =
                nextservicedate && moment(nextservicedate).isBefore(moment());
              if (mileageOver || dueForService)
                return (
                  <Space direction="vertical" style={{ color: "tomato" }}>
                    <span>
@@ -263,6 +242,36 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
                      {t("contracts.labels.cardueforservice")}
                    </span>
                    <span>{`${nextservicekm} km`}</span>
                  </Space>
                );
              return <></>;
            }}
          </Form.Item>
        </div>
        <div>
          <Form.Item
            label={t("courtesycars.fields.nextservicedate")}
            name="nextservicedate"
          >
            <FormDatePicker />
          </Form.Item>
          <Form.Item
            shouldUpdate={(p, c) => p.nextservicedate !== c.nextservicedate}
          >
            {() => {
              const nextservicedate = form.getFieldValue("nextservicedate");
              const dueForService =
                nextservicedate &&
                moment(nextservicedate).endOf("day").isSameOrBefore(moment());
              if (dueForService)
                return (
                  <Space direction="vertical" style={{ color: "tomato" }}>
                    <span>
                      <WarningFilled style={{ marginRight: ".3rem" }} />
                      {t("contracts.labels.cardueforservice")}
                    </span>
                    <span>
                      <DateFormatter>{nextservicedate}</DateFormatter>
                    </span>
@@ -283,12 +292,6 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
          <Form.Item
            label={t("courtesycars.fields.registrationexpires")}
            name="registrationexpires"
            rules={[
              {
                required: true,
                //message: t("general.validation.required"),
              },
            ]}
          >
            <FormDatePicker />
          </Form.Item>
@@ -300,7 +303,8 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
            {() => {
              const expires = form.getFieldValue("registrationexpires");
-              const dateover = expires && moment(expires).isBefore(moment());
+              const dateover =
                expires && moment(expires).endOf("day").isBefore(moment());
              if (dateover)
                return (
@@ -330,14 +334,13 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
            <FormDatePicker />
          </Form.Item>
          <Form.Item
-            shouldUpdate={(p, c) =>
+            shouldUpdate={(p, c) => p.insuranceexpires !== c.insuranceexpires}
              p.insuranceexpires !== c.insuranceexpires
            }
          >
            {() => {
              const expires = form.getFieldValue("insuranceexpires");
-              const dateover = expires && moment(expires).isBefore(moment());
+              const dateover =
                expires && moment(expires).endOf("day").isBefore(moment());
              if (dateover)
                return (
--- a/client/src/components/courtesy-car-fuel-select/courtesy-car-fuel-select.component.jsx
+++ b/client/src/components/courtesy-car-fuel-select/courtesy-car-fuel-select.component.jsx
@@ -34,6 +34,32 @@ const CourtesyCarFuelComponent = (props, ref) => {
      step={null}
      style={{ marginLeft: "2rem", marginRight: "2rem" }}
      {...props}
      tooltip={{
        formatter: (value) => {
          switch (value) {
            case 0:
              return t("courtesycars.labels.fuel.empty");
            case 13:
              return t("courtesycars.labels.fuel.18");
            case 25:
              return t("courtesycars.labels.fuel.14");
            case 38:
              return t("courtesycars.labels.fuel.38");
            case 50:
              return t("courtesycars.labels.fuel.12");
            case 63:
              return t("courtesycars.labels.fuel.58");
            case 75:
              return t("courtesycars.labels.fuel.34");
            case 88:
              return t("courtesycars.labels.fuel.78");
            case 100:
              return t("courtesycars.labels.fuel.full");
            default:
              return value;
          }
        },
      }}
    />
  );
 };
--- a/client/src/components/courtesy-car-readiness-select/courtesy-car-readiness-select.component.jsx
+++ b/client/src/components/courtesy-car-readiness-select/courtesy-car-readiness-select.component.jsx
@@ -0,0 +1,35 @@
 import { Select } from "antd";
 import React, { forwardRef, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 const { Option } = Select;
 const CourtesyCarReadinessComponent = ({ value, onChange }, ref) => {
  const [option, setOption] = useState(value);
  const { t } = useTranslation();
  useEffect(() => {
    if (value !== option && onChange) {
      onChange(option);
    }
  }, [value, option, onChange]);
  return (
    <Select
      allowClear
      ref={ref}
      value={option}
      style={{
        width: 100,
      }}
      onChange={setOption}
    >
      <Option value="courtesycars.readiness.ready">
        {t("courtesycars.readiness.ready")}
      </Option>
      <Option value="courtesycars.readiness.notready">
        {t("courtesycars.readiness.notready")}
      </Option>
    </Select>
  );
 };
 export default forwardRef(CourtesyCarReadinessComponent);
--- 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: {},
@@ -74,10 +74,11 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
      render: (text, record) => {
        const { nextservicedate, nextservicekm, mileage } = record;
-        const mileageOver = nextservicekm <= mileage;
+        const mileageOver = nextservicekm ? nextservicekm <= mileage : false;
        const dueForService =
-          nextservicedate && moment(nextservicedate).isBefore(moment());
+          nextservicedate &&
          moment(nextservicedate).endOf("day").isSameOrBefore(moment());
        return (
          <Space>
@@ -91,6 +92,26 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
        );
      },
    },
    {
      title: t("courtesycars.fields.readiness"),
      dataIndex: "readiness",
      key: "readiness",
      sorter: (a, b) => alphaSort(a.readiness, b.readiness),
      filters: [
        {
          text: t("courtesycars.readiness.ready"),
          value: "courtesycars.readiness.ready",
        },
        {
          text: t("courtesycars.readiness.notready"),
          value: "courtesycars.readiness.notready",
        },
      ],
      onFilter: (value, record) => value.includes(record.readiness),
      sortOrder:
        state.sortedInfo.columnKey === "readiness" && state.sortedInfo.order,
      render: (text, record) => t(record.readiness),
    },
    {
      title: t("courtesycars.fields.year"),
      dataIndex: "year",
@@ -115,6 +136,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",
@@ -123,6 +152,36 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
      sortOrder:
        state.sortedInfo.columnKey === "plate" && state.sortedInfo.order,
    },
    {
      title: t("courtesycars.fields.fuel"),
      dataIndex: "fuel",
      key: "fuel",
      sorter: (a, b) => alphaSort(a.fuel, b.fuel),
      sortOrder:
        state.sortedInfo.columnKey === "fuel" && state.sortedInfo.order,
      render: (text, record) => {
        switch (record.fuel) {
          case 100:
            return t("courtesycars.labels.fuel.full");
          case 88:
            return t("courtesycars.labels.fuel.78");
          case 63:
            return t("courtesycars.labels.fuel.58");
          case 50:
            return t("courtesycars.labels.fuel.12");
          case 38:
            return t("courtesycars.labels.fuel.34");
          case 25:
            return t("courtesycars.labels.fuel.14");
          case 13:
            return t("courtesycars.labels.fuel.18");
          case 0:
            return t("courtesycars.labels.fuel.empty");
          default:
            return record.fuel;
        }
      },
    },
    {
      title: t("courtesycars.labels.outwith"),
      dataIndex: "outwith",
@@ -166,6 +225,7 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
          (c.year || "").toLowerCase().includes(searchText.toLowerCase()) ||
          (c.make || "").toLowerCase().includes(searchText.toLowerCase()) ||
          (c.model || "").toLowerCase().includes(searchText.toLowerCase()) ||
          (c.plate || "").toLowerCase().includes(searchText.toLowerCase()) ||
          (t(c.status) || "").toLowerCase().includes(searchText.toLowerCase())
      )
    : courtesycars;
--- a/client/src/components/csi-response-list-paginated/csi-response-list-paginated.component.jsx
+++ b/client/src/components/csi-response-list-paginated/csi-response-list-paginated.component.jsx
@@ -7,6 +7,7 @@ import { Link, useHistory, useLocation } from "react-router-dom";
 import { DateFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import {pageLimit} from "../../utils/config";
 export default function CsiResponseListPaginated({
  refetch,
@@ -106,7 +107,7 @@ export default function CsiResponseListPaginated({
        loading={loading}
        pagination={{
          position: "top",
-          pageSize: 25,
+          pageSize: pageLimit,
          current: parseInt(page || 1),
          total: total,
        }}
--- a/client/src/components/dashboard-components/monthly-job-costing/monthly-job-costing.component.jsx
+++ b/client/src/components/dashboard-components/monthly-job-costing/monthly-job-costing.component.jsx
@@ -6,6 +6,7 @@ import { alphaSort } from "../../../utils/sorters";
 import LoadingSkeleton from "../../loading-skeleton/loading-skeleton.component";
 import Dinero from "dinero.js";
 import DashboardRefreshRequired from "../refresh-required.component";
 import {pageLimit} from "../../../utils/config";
 export default function DashboardMonthlyJobCosting({ data, ...cardProps }) {
  const { t } = useTranslation();
@@ -118,7 +119,7 @@ export default function DashboardMonthlyJobCosting({ data, ...cardProps }) {
        <div style={{ height: "100%" }}>
          <Table
            onChange={handleTableChange}
-            pagination={{ position: "top", defaultPageSize: 50 }}
+            pagination={{ position: "top", defaultPageSize: pageLimit }}
            columns={columns}
            scroll={{ x: true, y: "calc(100% - 4em)" }}
            rowKey="id"
--- 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
@@ -11,6 +11,7 @@ import { Link } from "react-router-dom";
 import ChatOpenButton from "../../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../../owner-name-display/owner-name-display.component";
 import DashboardRefreshRequired from "../refresh-required.component";
 import {pageLimit} from "../../../utils/config";
 export default function DashboardScheduledInToday({ data, ...cardProps }) {
  const { t } = useTranslation();
@@ -23,36 +24,40 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
  const appt = []; // Flatten Data
  data.scheduled_in_today.forEach((item) => {
-    var i = {
+    if (item.job) {
-      canceled: item.canceled,
+      var i = {
-      id: item.id,
+        canceled: item.canceled,
-      alt_transport: item.job.alt_transport,
+        id: item.id,
-      clm_no: item.job.clm_no,
+        alt_transport: item.job.alt_transport,
-      jobid: item.job.jobid,
+        clm_no: item.job.clm_no,
-      ins_co_nm: item.job.ins_co_nm,
+        jobid: item.job.jobid,
-      iouparent: item.job.iouparent,
+        ins_co_nm: item.job.ins_co_nm,
-      ownerid: item.job.ownerid,
+        iouparent: item.job.iouparent,
-      ownr_co_nm: item.job.ownr_co_nm,
+        ownerid: item.job.ownerid,
-      ownr_ea: item.job.ownr_ea,
+        ownr_co_nm: item.job.ownr_co_nm,
-      ownr_fn: item.job.ownr_fn,
+        ownr_ea: item.job.ownr_ea,
-      ownr_ln: item.job.ownr_ln,
+        ownr_fn: item.job.ownr_fn,
-      ownr_ph1: item.job.ownr_ph1,
+        ownr_ln: item.job.ownr_ln,
-      ownr_ph2: item.job.ownr_ph2,
+        ownr_ph1: item.job.ownr_ph1,
-      production_vars: item.job.production_vars,
+        ownr_ph2: item.job.ownr_ph2,
-      ro_number: item.job.ro_number,
+        production_vars: item.job.production_vars,
-      suspended: item.job.suspended,
+        ro_number: item.job.ro_number,
-      v_make_desc: item.job.v_make_desc,
+        suspended: item.job.suspended,
-      v_model_desc: item.job.v_model_desc,
+        v_make_desc: item.job.v_make_desc,
-      v_model_yr: item.job.v_model_yr,
+        v_model_desc: item.job.v_model_desc,
-      v_vin: item.job.v_vin,
+        v_model_yr: item.job.v_model_yr,
-      vehicleid: item.job.vehicleid,
+        v_vin: item.job.v_vin,
-      note: item.note,
+        vehicleid: item.job.vehicleid,
-      start: moment(item.start).format("hh:mm a"),
+        note: item.note,
-      title: item.title,
+        start: moment(item.start).format("hh:mm a"),
-    };
+        title: item.title,
-    appt.push(i);
+      };
      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,11 +187,16 @@ 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}
-          pagination={{ position: "top", defaultPageSize: 50 }}
+          pagination={{ position: "top", defaultPageSize: pageLimit }}
          columns={columns}
          scroll={{ x: true, y: "calc(100% - 2em)" }}
          rowKey="id"
--- a/client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx
+++ b/client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx
@@ -11,6 +11,7 @@ import { Link } from "react-router-dom";
 import ChatOpenButton from "../../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../../owner-name-display/owner-name-display.component";
 import DashboardRefreshRequired from "../refresh-required.component";
 import {pageLimit} from "../../../utils/config";
 export default function DashboardScheduledOutToday({ data, ...cardProps }) {
  const { t } = useTranslation();
@@ -165,7 +166,7 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
      <div style={{ height: "100%" }}>
        <Table
          onChange={handleTableChange}
-          pagination={{ position: "top", defaultPageSize: 50 }}
+          pagination={{ position: "top", defaultPageSize: pageLimit }}
          columns={columns}
          scroll={{ x: true, y: "calc(100% - 2em)" }}
          rowKey="id"
--- 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/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx
+++ b/client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx
@@ -5,6 +5,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import {pageLimit} from "../../utils/config";
 const mapStateToProps = createStructuredSelector({
  //currentUser: selectCurrentUser
@@ -117,7 +118,7 @@ export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) {
      }
    >
      <Table
-        pagination={{ position: "top", defaultPageSize: 50 }}
+        pagination={{ position: "top", defaultPageSize: pageLimit }}
        columns={columns}
        rowKey={(record) => `${record.InvoiceNumber}${record.Account}`}
        dataSource={allocationsSummary}
--- a/client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx
+++ b/client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx
@@ -6,6 +6,7 @@ import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import Dinero from "dinero.js";
 import { SyncOutlined } from "@ant-design/icons";
 import {pageLimit} from "../../utils/config";
 const mapStateToProps = createStructuredSelector({
  //currentUser: selectCurrentUser
@@ -94,7 +95,7 @@ export function DmsAllocationsSummary({ socket, bodyshop, jobId, title }) {
        <Alert type="warning" message={t("jobs.labels.dms.disablebillwip")} />
      )}
      <Table
-        pagination={{ position: "top", defaultPageSize: 50 }}
+        pagination={{ position: "top", defaultPageSize: pageLimit }}
        columns={columns}
        rowKey="center"
        dataSource={allocationsSummary}
--- a/client/src/components/dms-post-form/dms-post-form.component.jsx
+++ b/client/src/components/dms-post-form/dms-post-form.component.jsx
@@ -191,6 +191,13 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
              >
                <Switch />
              </Form.Item>
              <Form.Item
                name="dms_model_override"
                label={t("jobs.fields.dms.dms_model_override")}
                initialValue={false}
              >
                <Switch />
              </Form.Item>
            </Space>
          </div>
        )}
--- 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/form-date-picker/form-date-picker.component.jsx
+++ b/client/src/components/form-date-picker/form-date-picker.component.jsx
@@ -65,8 +65,17 @@ export function FormDatePicker({
      });
    }
-    if (_a.isValid() && onChange)
+    if (_a.isValid() && onChange) {
-      onChange(isDateOnly ? _a.format("YYYY-MM-DD") : _a);
+      if (onlyFuture) {
        if (moment().subtract(1, "day").isBefore(_a)) {
          onChange(isDateOnly ? _a.format("YYYY-MM-DD") : _a);
        } else {
          onChange(isDateOnly ? moment().format("YYYY-MM-DD") : moment());
        }
      } else {
        onChange(isDateOnly ? _a.format("YYYY-MM-DD") : _a);
      }
    }
  };
  return (
--- a/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
+++ b/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
@@ -1,9 +1,9 @@
 import React, { forwardRef } from "react";
 //import DatePicker from "react-datepicker";
 //import "react-datepicker/src/stylesheets/datepicker.scss";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
 import { TimePicker } from "antd";
 import moment from "moment";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
 //To be used as a form element only.
 const DateTimePicker = (
@@ -26,20 +26,21 @@ const DateTimePicker = (
        value={value}
        onBlur={onBlur}
        onChange={onChange}
        onlyFuture={onlyFuture}
        isDateOnly={false}
      />
      <TimePicker
-      value={value ? moment(value) : null}
+        value={value ? moment(value) : null}
-      {...(onlyFuture && {
+        {...(onlyFuture && {
-        disabledDate: (d) => moment().isAfter(d),
+          disabledDate: (d) => moment().isAfter(d),
-      })}
+        })}
-      onChange={onChange}
+        onChange={onChange}
-      showSecond={false}
+        showSecond={false}
-      minuteStep={15}
+        minuteStep={15}
-      onBlur={onBlur}
+        onBlur={onBlur}
-      format="hh:mm a"
+        format="hh:mm a"
-      {...restProps}
+        {...restProps}
      />
    </div>
  );
--- a/client/src/components/global-search/global-search-os.component.jsx
+++ b/client/src/components/global-search/global-search-os.component.jsx
@@ -54,6 +54,7 @@ export default function GlobalSearchOs() {
                        job.v_make_desc || ""
                      } ${job.v_model_desc || ""}`}</span>
                      <span>{`${job.clm_no || ""}`}</span>
                      <span>{`${job.plate_no || ""}`}</span>
                    </Space>
                  </Link>
                ),
--- 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,
@@ -14,7 +13,7 @@ import Icon, {
  FileFilled,
  //GlobalOutlined,
  HomeFilled,
-  ImportOutlined,
+  ImportOutlined, InfoCircleOutlined,
  LineChartOutlined,
  PaperClipOutlined,
  PhoneOutlined,
@@ -26,8 +25,9 @@ import Icon, {
  UnorderedListOutlined,
  UserOutlined,
 } from "@ant-design/icons";
-import { Layout, Menu } from "antd";
+import { useTreatments } from "@splitsoftware/splitio-react";
-import React from "react";
+import {Layout, Menu, Switch, Tooltip} from "antd";
 import React, {useEffect, useState} from "react";
 import { useTranslation } from "react-i18next";
 import { BsKanban } from "react-icons/bs";
 import {
@@ -52,6 +52,7 @@ import {
  selectBodyshop,
  selectCurrentUser,
 } from "../../redux/user/user.selectors";
 import {handleBeta, setBeta, checkBeta} from "../../utils/handleBeta";
 const mapStateToProps = createStructuredSelector({
  currentUser: selectCurrentUser,
@@ -70,6 +71,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 +86,7 @@ function Header({
  setPaymentContext,
  setReportCenterContext,
  recentItems,
  setCardPaymentContext,
 }) {
  const { Simple_Inventory } = useTreatments(
    ["Simple_Inventory"],
@@ -94,9 +98,26 @@ function Header({
    {},
    bodyshop && bodyshop.imexshopid
  );
  const { ImEXPay } = useTreatments(
    ["ImEXPay"],
    {},
    bodyshop && bodyshop.imexshopid
  );
  const [betaSwitch, setBetaSwitch] = useState(false);
  const { t } = useTranslation();
  useEffect(() => {
    const isBeta = checkBeta();
    setBetaSwitch(isBeta);
  }, []);
  const betaSwitchChange = (checked) => {
    setBeta(checked);
    setBetaSwitch(checked);
    handleBeta();
  }
  return (
    <Layout.Header>
      <Menu
@@ -240,6 +261,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 +287,11 @@ function Header({
            onClick={() => {
              setTimeTicketContext({
                actions: {},
-                context: {},
+                context: {
                  created_by: currentUser.displayName
                    ? currentUser.email.concat(" | ", currentUser.displayName)
                    : currentUser.email,
                },
              });
            }}
          >
@@ -405,6 +444,17 @@ function Header({
            </Menu.Item>
          ))}
        </Menu.SubMenu>
        <Menu.Item style={{marginLeft: 'auto'}} key="profile">
          <Tooltip title="A more modern ImEX Online is ready for you to try! You can switch back at any time.">
            <InfoCircleOutlined/>
            <span style={{marginRight: 8}}>Try the new ImEX Online</span>
            <Switch
                checked={betaSwitch}
                onChange={betaSwitchChange}
            />
          </Tooltip>
        </Menu.Item>
      </Menu>
    </Layout.Header>
  );
--- a/client/src/components/inventory-list/inventory-list.component.jsx
+++ b/client/src/components/inventory-list/inventory-list.component.jsx
@@ -11,6 +11,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import InventoryBillRo from "../inventory-bill-ro/inventory-bill-ro.component";
 import InventoryLineDelete from "../inventory-line-delete/inventory-line-delete.component";
 import {pageLimit} from "../../utils/config";
 const mapStateToProps = createStructuredSelector({
  //currentUser: selectCurrentUser
  bodyshop: selectBodyshop,
@@ -213,7 +214,7 @@ export function JobsList({
        loading={loading}
        pagination={{
          position: "top",
-          pageSize: 25,
+          pageSize: pageLimit,
          current: parseInt(page || 1),
          total: total,
        }}
--- a/client/src/components/inventory-list/inventory-list.container.jsx
+++ b/client/src/components/inventory-list/inventory-list.container.jsx
@@ -11,6 +11,7 @@ import {
 } from "../../redux/application/application.actions";
 import AlertComponent from "../alert/alert.component";
 import InventoryListPaginated from "./inventory-list.component";
 import {pageLimit} from "../../utils/config";
 const mapStateToProps = createStructuredSelector({
  //bodyshop: selectBodyshop,
@@ -32,8 +33,8 @@ export function InventoryList({ setBreadcrumbs, setSelectedHeader }) {
      nextFetchPolicy: "network-only",
      variables: {
        search: search || "",
-        offset: page ? (page - 1) * 25 : 0,
+        offset: page ? (page - 1) * pageLimit : 0,
-        limit: 25,
+        limit: pageLimit,
        consumedIsNull: showall === "true" ? null : true,
        order: [
          {
--- 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
@@ -4,6 +4,7 @@ import {
  Divider,
  Dropdown,
  Form,
  Input,
  Menu,
  notification,
  Popover,
@@ -29,11 +30,13 @@ 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";
+import { useMutation } from "@apollo/client";
 import { UPDATE_APPOINTMENT } from "../../graphql/appointments.queries";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -58,16 +61,44 @@ export function ScheduleEventComponent({
  const [visible, setVisible] = useState(false);
  const history = useHistory();
  const searchParams = queryString.parse(useLocation().search);
-
+  const [updateAppointment] = useMutation(UPDATE_APPOINTMENT);
  const [title, setTitle] = useState(event.title);
  const blockContent = (
-    <div>
+    <Space direction="vertical" wrap>
      <Input
        value={title}
        onChange={(e) => setTitle(e.currentTarget.value)}
        onBlur={async () => {
          await updateAppointment({
            variables: {
              appid: event.id,
              app: {
                title: title,
              },
            },
            optimisticResponse: {
              update_appointments: {
                __typename: "appointments_mutation_response",
                returning: [
                  {
                    ...event,
                    title: title,
                    __typename: "appointments",
                  },
                ],
              },
            },
          });
        }}
      />
      <Button
        onClick={() => handleCancel({ id: event.id })}
        disabled={event.arrived}
      >
-        {t("appointments.actions.cancel")}
+        {t("appointments.actions.unblock")}
      </Button>
-    </div>
+    </Space>
  );
  const popoverContent = (
@@ -208,46 +239,56 @@ export function ScheduleEventComponent({
            <Button>{t("appointments.actions.sendreminder")}</Button>
          </Dropdown>
        ) : null}
-        <Popover
+        {event.arrived ? (
          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>
+        ) : (
          <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-at-change/schedule-event.container.jsx
+++ b/client/src/components/job-at-change/schedule-event.container.jsx
@@ -2,12 +2,16 @@ import { useMutation } from "@apollo/client";
 import { notification } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { useDispatch } from "react-redux";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { CANCEL_APPOINTMENT_BY_ID } from "../../graphql/appointments.queries";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import ScheduleEventComponent from "./schedule-event.component";
 export default function ScheduleEventContainer({ bodyshop, event, refetch }) {
  const dispatch = useDispatch();
  const { t } = useTranslation();
  const [cancelAppointment] = useMutation(CANCEL_APPOINTMENT_BY_ID);
  const [updateJob] = useMutation(UPDATE_JOB);
@@ -34,16 +38,24 @@ export default function ScheduleEventContainer({ bodyshop, event, refetch }) {
      const jobUpdate = await updateJob({
        variables: {
          jobId: event.job.id,
          job: {
            date_scheduled: null,
            scheduled_in: null,
            scheduled_completion: null,
            lost_sale_reason,
            date_lost_sale: new Date(),
            status: bodyshop.md_ro_statuses.default_imported,
          },
        },
      });
      if (!jobUpdate.errors) {
        dispatch(
          insertAuditTrail({
            jobid: event.job.id,
            operation: AuditTrailMapping.appointmentcancel(lost_sale_reason),
          })
        );
      }
      if (!!jobUpdate.errors) {
        notification["error"]({
          message: t("jobs.errors.updating", {
--- 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-costing-parts-table/job-costing-parts-table.component.jsx
+++ b/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx
@@ -3,6 +3,7 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { alphaSort } from "../../utils/sorters";
 import Dinero from "dinero.js";
 import {pageLimit} from "../../utils/config";
 export default function JobCostingPartsTable({ data, summaryData }) {
  const [searchText, setSearchText] = useState("");
  const [state, setState] = useState({
@@ -98,7 +99,7 @@ export default function JobCostingPartsTable({ data, summaryData }) {
          x: "50%", //y: "40rem"
        }}
        onChange={handleTableChange}
-        pagination={{ position: "top", defaultPageSize: 50 }}
+        pagination={{ position: "top", defaultPageSize: pageLimit }}
        columns={columns}
        rowKey="id"
        dataSource={filteredData}
--- a/client/src/components/job-create-iou/job-create-iou.component.jsx
+++ b/client/src/components/job-create-iou/job-create-iou.component.jsx
@@ -7,21 +7,31 @@ import { connect } from "react-redux";
 import { useHistory } from "react-router";
 import { createStructuredSelector } from "reselect";
 import { UPDATE_JOB_LINES_IOU } from "../../graphql/jobs-lines.queries";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
 import {
  selectBodyshop,
  selectCurrentUser,
 } from "../../redux/user/user.selectors";
 import { CreateIouForJob } from "../jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
  currentUser: selectCurrentUser,
  technician: selectTechnician,
 });
 const mapDispatchToProps = (dispatch) => ({
  //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobCreateIOU);
-export function JobCreateIOU({ bodyshop, currentUser, job, selectedJobLines }) {
+export function JobCreateIOU({
  bodyshop,
  currentUser,
  job,
  selectedJobLines,
  technician,
 }) {
  const { t } = useTranslation();
  const [loading, setLoading] = useState(false);
  const client = useApolloClient();
@@ -79,13 +89,19 @@ export function JobCreateIOU({ bodyshop, currentUser, job, selectedJobLines }) {
      title={t("jobs.labels.createiouwarning")}
      onConfirm={handleCreateIou}
      disabled={
-        !selectedJobLines || selectedJobLines.length === 0 || !job.converted
+        !selectedJobLines ||
        selectedJobLines.length === 0 ||
        !job.converted ||
        technician
      }
    >
      <Button
        loading={loading}
        disabled={
-          !selectedJobLines || selectedJobLines.length === 0 || !job.converted
+          !selectedJobLines ||
          selectedJobLines.length === 0 ||
          !job.converted ||
          technician
        }
      >
        {t("jobs.actions.createiou")}
--- 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) =>
+          onSelect: (record, selected, selectedRows, nativeEvent) => {
-            setSelectedLines(selectedRows),
+            if (selected) {
              setSelectedLines((selectedLines) =>
                _.uniqBy([...selectedLines, record], "id")
              );
            } else {
              setSelectedLines((selectedLines) =>
                selectedLines.filter((l) => l.id !== record.id)
              );
            }
          },
        }}
      />
    </div>
--- a/client/src/components/job-line-location-popup/job-line-location-popup.component.jsx
+++ b/client/src/components/job-line-location-popup/job-line-location-popup.component.jsx
@@ -1,6 +1,6 @@
 import { useMutation } from "@apollo/client";
 import { notification, Select } from "antd";
 import React, { useEffect, useState } from "react";
 import { useMutation } from "@apollo/client";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -56,8 +56,10 @@ export function JobLineLocationPopup({ bodyshop, jobline, disabled }) {
        <LoadingSpinner loading={loading}>
          <Select
            autoFocus
            allowClear
            dropdownMatchSelectWidth={100}
            value={location}
            onClear={() => setLocation(null)}
            onSelect={handleChange}
            onBlur={handleSave}
          >
--- 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-admin-dates/jobs-admin-dates.component.jsx
+++ b/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx
@@ -13,6 +13,7 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import { DateTimeFormat } from "./../../utils/DateFormatter";
 const mapStateToProps = createStructuredSelector({
  //currentUser: selectCurrentUser
@@ -53,7 +54,7 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
        operation: AuditTrailMapping.admin_jobfieldchange(
          key,
          changedAuditFields[key] instanceof moment
-            ? moment(changedAuditFields[key]).format("MM/DD/YYYY hh:mm a")
+            ? DateTimeFormat(changedAuditFields[key])
            : changedAuditFields[key]
        ),
      });
@@ -179,6 +180,12 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
          <Form.Item label={t("jobs.fields.date_void")} name="date_void">
            <DateTimePicker />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.date_lost_sale")}
            name="date_lost_sale"
          >
            <DateTimePicker />
          </Form.Item>
        </LayoutFormRow>
      </Form>
--- a/client/src/components/jobs-available-table/jobs-available-supplement.estlines.util.js
+++ b/client/src/components/jobs-available-table/jobs-available-supplement.estlines.util.js
@@ -1,6 +1,6 @@
 import { GET_ALL_JOBLINES_BY_PK } from "../../graphql/jobs-lines.queries";
 import { gql } from "@apollo/client";
 import _ from "lodash";
 import { GET_ALL_JOBLINES_BY_PK } from "../../graphql/jobs-lines.queries";
 export const GetSupplementDelta = async (client, jobId, newLines) => {
  const {
@@ -50,7 +50,7 @@ export const GetSupplementDelta = async (client, jobId, newLines) => {
    .reduce((acc, value, idx) => {
      return acc + generateRemoveQuery(value, idx);
    }, "");
-  console.log(insertQueries, updateQueries, removeQueries);
+  //console.log(insertQueries, updateQueries, removeQueries);
  if ((insertQueries + updateQueries + removeQueries).trim() === "") {
    return new Promise((resolve, reject) => {
--- a/client/src/components/jobs-available-table/jobs-available-supplement.headerfields.js
+++ b/client/src/components/jobs-available-table/jobs-available-supplement.headerfields.js
@@ -114,7 +114,7 @@ const headerFields = [
  "ins_ct_ph",
  "ins_ct_phx",
  "loss_cat",
-  //ad2
+  //AD2
  "clmt_ln",
  "clmt_fn",
  "clmt_title",
@@ -219,7 +219,16 @@ const headerFields = [
  "loc_title",
  "loc_ph",
  "loc_phx",
-  "loc_ea"
+  "loc_ea",
  //VEH
  "plate_no",
  "plate_st",
  "v_vin",
  "v_model_yr",
  "v_make_desc",
  "v_model_desc",
  "v_options",
  "v_color",
 ];
 export default headerFields;
--- 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";
@@ -73,6 +73,8 @@ export function JobsAvailableContainer({
  const [selectedJob, setSelectedJob] = useState(null);
  const [selectedOwner, setSelectedOwner] = useState(null);
  const [partsQueueToggle, setPartsQueueToggle] = useState(bodyshop.md_functionality_toggles.parts_queue_toggle);
  const [insertLoading, setInsertLoading] = useState(false);
  const [insertNote] = useMutation(INSERT_NEW_NOTE);
@@ -94,6 +96,7 @@ export function JobsAvailableContainer({
    logImEXEvent("job_import_new");
    setOwnerModalVisible(false);
    setInsertLoading(true);
    const estData = replaceEmpty(estDataRaw.data.available_jobs_by_pk);
@@ -120,7 +123,7 @@ export function JobsAvailableContainer({
    let existingVehicles;
    if (estData.est_data.v_vin) {
-      //There's vehicle data, need to double check the VIN.
+      //There's vehicle data, need to double-check the VIN.
      existingVehicles = await client.query({
        query: SEARCH_VEHICLE_BY_VIN,
        variables: {
@@ -135,6 +138,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,
@@ -142,7 +146,7 @@ export function JobsAvailableContainer({
          text: t("jobs.labels.importnote"),
        },
      },
-      queued_for_parts: true,
+      queued_for_parts: partsQueueToggle,
      ...(existingVehicles && existingVehicles.data.vehicles.length > 0
        ? { vehicleid: existingVehicles.data.vehicles[0].id, vehicle: null }
        : {}),
@@ -156,46 +160,51 @@ export function JobsAvailableContainer({
      delete newJob.vehicle;
    }
-    insertNewJob({
+    try {
-      variables: {
+      const r = await insertNewJob({
-        job: newJob,
+        variables: {
-      },
+          job: newJob,
-    })
+        },
-      .then((r) => {
+      });
        if (CriticalPartsScanning.treatment === "on") {
          CriticalPartsScan(r.data.insert_jobs.returning[0].id);
        }
        notification["success"]({
          message: t("jobs.successes.created"),
          onClick: () => {
            history.push(`/manage/jobs/${r.data.insert_jobs.returning[0].id}`);
          },
        });
        //Job has been inserted. Clean up the available jobs record.
-        insertAuditTrail({
+      if (CriticalPartsScanning.treatment === "on") {
-          jobid: r.data.insert_jobs.returning[0].id,
+        CriticalPartsScan(r.data.insert_jobs.returning[0].id);
-          operation: AuditTrailMapping.jobimported(),
+      }
        });
-        deleteJob({
+      notification["success"]({
-          variables: { id: estData.id },
+        message: t("jobs.successes.created"),
-        }).then((r) => {
+        onClick: () => {
-          refetch();
+          history.push(`/manage/jobs/${r.data.insert_jobs.returning[0].id}`);
-          setInsertLoading(false);
+        },
-        });
+      });
-      })
+      //Job has been inserted. Clean up the available jobs record.
-      .catch((r) => {
+
-        //error while inserting
+      insertAuditTrail({
-        notification["error"]({
+        jobid: r.data.insert_jobs.returning[0].id,
-          message: t("jobs.errors.creating", { error: r.message }),
+        operation: AuditTrailMapping.jobimported(),
-        });
+      });
      deleteJob({
        variables: { id: estData.id },
      }).then((r) => {
        refetch();
        setInsertLoading(false);
      });
      setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
    } catch (err) {
      //error while inserting
      notification["error"]({
        message: t("jobs.errors.creating", { error: err.message }),
      });
      refetch().catch(e => {console.error(`Something went wrong in jobs available table container - ${err.message || ''}`)});
      setInsertLoading(false);
      setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
    }
  };
-  //Suplement scenario
+  //Supplement scenario
  const onJobFindModalOk = async () => {
    logImEXEvent("job_import_supplement");
@@ -247,11 +256,14 @@ export function JobsAvailableContainer({
            //   "0.00"
            // ),
            // job_totals: newTotals,
-            // queued_for_parts: true,
+            queued_for_parts: partsQueueToggle,
          },
        },
      });
-      if (CriticalPartsScanning.treatment === "on") {
+
        setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
        if (CriticalPartsScanning.treatment === "on") {
        CriticalPartsScan(updateResult.data.update_jobs.returning[0].id);
      }
      if (updateResult.errors) {
@@ -326,12 +338,14 @@ export function JobsAvailableContainer({
  const onOwnerModalCancel = () => {
    setOwnerModalVisible(false);
    setSelectedOwner(null);
    setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
  };
  const onJobModalCancel = () => {
    setJobModalVisible(false);
    modalSearchState[1]("");
    setSelectedJob(null);
    setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
  };
  const addJobAsNew = (record) => {
@@ -352,6 +366,8 @@ export function JobsAvailableContainer({
  }, [addJobAsSupp, availableJobId, clm_no]);
  if (error) return <AlertComponent type="error" message={error.message} />;
  return (
    <LoadingSpinner
      loading={insertLoading}
@@ -361,11 +377,14 @@ export function JobsAvailableContainer({
        loading={estDataRaw.loading}
        error={estDataRaw.error}
        owner={owner}
        partsQueueToggle={partsQueueToggle}
        setPartsQueueToggle={setPartsQueueToggle}
        selectedOwner={selectedOwner}
        setSelectedOwner={setSelectedOwner}
        visible={ownerModalVisible}
        onOk={onOwnerFindModalOk}
        onCancel={onOwnerModalCancel}
      />
      <JobsFindModalContainer
        loading={estDataRaw.loading}
@@ -377,6 +396,8 @@ export function JobsAvailableContainer({
        onOk={onJobFindModalOk}
        onCancel={onJobModalCancel}
        modalSearchState={modalSearchState}
        partsQueueToggle={partsQueueToggle}
        setPartsQueueToggle={setPartsQueueToggle}
      />
      <Row gutter={[16, 16]}>
        <Col span={24}>
--- 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 client from "../../utils/GraphQLClient";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { useHistory } from "react-router-dom";
 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-convert-button/jobs-convert-button.component.jsx
+++ b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
@@ -108,7 +108,7 @@ export function JobsConvertButton({
            },
          ]}
        >
-          <Select>
+          <Select showSearch>
            {bodyshop.md_ins_cos.map((s, i) => (
              <Select.Option key={i} value={s.name}>
                {s.name}
--- a/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx
+++ b/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx
@@ -145,6 +145,13 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
        <Form.Item label={t("jobs.fields.date_void")} name="date_void">
          <DateTimePicker disabled={true || jobRO} />
        </Form.Item>
        <Form.Item
          label={t("jobs.fields.date_lost_sale")}
          name="date_lost_sale"
        >
          <DateTimePicker disabled={true || jobRO} />
        </Form.Item>
      </FormRow>
    </div>
  );
--- 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
@@ -18,12 +18,14 @@ import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { CANCEL_APPOINTMENTS_BY_JOB_ID } from "../../graphql/appointments.queries";
 import { DELETE_JOB, UPDATE_JOB, VOID_JOB } from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import {
  selectBodyshop,
  selectCurrentUser,
 } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 import JobsDetailHeaderActionsAddevent from "./jobs-detail-header-actions.addevent";
 import AddToProduction from "./jobs-detail-header-actions.addtoproduction.util";
@@ -48,6 +50,10 @@ 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" })),
  insertAuditTrail: ({ jobid, operation }) =>
    dispatch(insertAuditTrail({ jobid, operation })),
 });
 export function JobsDetailHeaderActions({
@@ -61,6 +67,8 @@ export function JobsDetailHeaderActions({
  setJobCostingContext,
  jobRO,
  setTimeTicketContext,
  setCardPaymentContext,
  insertAuditTrail,
 }) {
  const { t } = useTranslation();
  const client = useApolloClient();
@@ -100,6 +108,14 @@ export function JobsDetailHeaderActions({
        },
      },
    });
    insertAuditTrail({
      jobid: job.id,
      operation: AuditTrailMapping.alertToggle(
        !!job.production_vars && !!job.production_vars.alert
          ? !job.production_vars.alert
          : true
      ),
    });
  };
  const handleSuspend = (e) => {
@@ -137,63 +153,73 @@ export function JobsDetailHeaderActions({
      <Menu.Item
        disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
      >
-        <Popover
+        {job.status !== bodyshop.md_ro_statuses.default_scheduled ? (
-          trigger="click"
+          t("menus.jobsactions.cancelallappointments")
-          disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
+        ) : (
-          content={
+          <Popover
-            <Form
+            trigger="click"
-              layout="vertical"
+            disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
-              onFinish={async ({ lost_sale_reason }) => {
+            content={
-                const jobUpdate = await cancelAllAppointments({
+              <Form
-                  variables: {
+                layout="vertical"
-                    jobid: job.id,
+                onFinish={async ({ lost_sale_reason }) => {
-                    job: {
+                  const jobUpdate = await cancelAllAppointments({
-                      date_scheduled: null,
+                    variables: {
-                      scheduled_in: null,
+                      jobid: job.id,
-                      scheduled_completion: null,
+                      job: {
-                      lost_sale_reason,
+                        date_scheduled: null,
-                      status: bodyshop.md_ro_statuses.default_imported,
+                        scheduled_in: null,
                        scheduled_completion: null,
                        lost_sale_reason,
                        date_lost_sale: new Date(),
                        status: bodyshop.md_ro_statuses.default_imported,
                      },
                    },
                  },
                });
                if (!jobUpdate.errors) {
                  notification["success"]({
                    message: t("appointments.successes.canceled"),
                  });
-                  return;
+                  if (!jobUpdate.errors) {
-                }
+                    notification["success"]({
-              }}
+                      message: t("appointments.successes.canceled"),
-            >
+                    });
-              <Form.Item
+                    insertAuditTrail({
-                name="lost_sale_reason"
+                      jobid: job.id,
-                label={t("jobs.fields.lost_sale_reason")}
+                      operation:
-                rules={[
+                        AuditTrailMapping.appointmentcancel(lost_sale_reason),
-                  {
+                    });
-                    required: true,
+                    return;
-                    //message: t("general.validation.required"),
+                  }
-                  },
+                }}
                ]}
              >
-                <Select
+                <Form.Item
-                  options={bodyshop.md_lost_sale_reasons.map((lsr) => ({
+                  name="lost_sale_reason"
-                    label: lsr,
+                  label={t("jobs.fields.lost_sale_reason")}
-                    value: lsr,
+                  rules={[
-                  }))}
+                    {
-                />
+                      required: true,
-              </Form.Item>
+                      //message: t("general.validation.required"),
-              <Button
+                    },
-                htmlType="submit"
+                  ]}
-                disabled={
+                >
-                  job.status !== bodyshop.md_ro_statuses.default_scheduled
+                  <Select
-                }
+                    options={bodyshop.md_lost_sale_reasons.map((lsr) => ({
-              >
+                      label: lsr,
-                {t("appointments.actions.cancel")}
+                      value: lsr,
-              </Button>
+                    }))}
-            </Form>
+                  />
-          }
+                </Form.Item>
-        >
+                <Button
-          {t("menus.jobsactions.cancelallappointments")}
+                  htmlType="submit"
-        </Popover>
+                  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 +265,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 +290,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-detail-header-actions/jobs-detail-header-actions.duplicate.util.js
+++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js
@@ -27,6 +27,8 @@ export default async function DuplicateJob(
  delete existingJob.id;
  delete existingJob.createdat;
  delete existingJob.updatedat;
  delete existingJob.cieca_stl;
  delete existingJob.cieca_ttl;
  const newJob = {
    ...existingJob,
@@ -81,6 +83,8 @@ export async function CreateIouForJob(
  delete existingJob.id;
  delete existingJob.createdat;
  delete existingJob.updatedat;
  delete existingJob.cieca_stl;
  delete existingJob.cieca_ttl;
  const newJob = {
    ...existingJob,
--- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
+++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
@@ -1,8 +1,8 @@
 import {
  BranchesOutlined,
  ExclamationCircleFilled,
  PauseCircleOutlined,
  WarningFilled,
  BranchesOutlined,
 } from "@ant-design/icons";
 import { Card, Col, Row, Space, Tag, Tooltip } from "antd";
 import React, { useState } from "react";
@@ -221,6 +221,14 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
              <VehicleVinDisplay>
                {`${job.v_vin || t("general.labels.na")}`}
              </VehicleVinDisplay>
              {bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (
                job.v_vin?.length !== 17 ? (
                  <WarningFilled style={{ color: "tomato", marginLeft: ".3rem" }} />
                ) : null
              ) : null}
            </DataLabel>
            <DataLabel label={t("jobs.fields.regie_number")}>
              {job.regie_number || t("general.labels.na")}
            </DataLabel>
            <DataLabel label={t("jobs.labels.relatedros")}>
              <JobsRelatedRos jobid={job.id} job={job} />
--- 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/jobs-find-modal/jobs-find-modal.component.jsx
+++ b/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx
@@ -14,6 +14,8 @@ export default function JobsFindModalComponent({
  importOptionsState,
  modalSearchState,
  jobsListRefetch,
  partsQueueToggle,
  setPartsQueueToggle,
 }) {
  const { t } = useTranslation();
  const [modalSearch, setModalSearch] = modalSearchState;
@@ -199,6 +201,12 @@ export default function JobsFindModalComponent({
      >
        {t("jobs.labels.override_header")}
      </Checkbox>
      <Checkbox
          checked={partsQueueToggle}
          onChange={(e) => setPartsQueueToggle(e.target.checked)}
      >
        {t("bodyshop.fields.md_functionality_toggles.parts_queue_toggle")}
      </Checkbox>
    </div>
  );
 }
--- a/client/src/components/jobs-find-modal/jobs-find-modal.container.jsx
+++ b/client/src/components/jobs-find-modal/jobs-find-modal.container.jsx
@@ -24,6 +24,8 @@ export default connect(
  setSelectedJob,
  importOptionsState,
  modalSearchState,
  partsQueueToggle,
  setPartsQueueToggle,
  ...modalProps
 }) {
  const { t } = useTranslation();
@@ -91,6 +93,8 @@ export default connect(
          jobsListRefetch={jobsList.refetch}
          jobsList={jobsData}
          modalSearchState={modalSearchState}
          partsQueueToggle={partsQueueToggle}
          setPartsQueueToggle={setPartsQueueToggle}
        />
      ) : null}
    </Modal>
--- a/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
+++ b/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
@@ -12,6 +12,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import StartChatButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import {pageLimit} from "../../utils/config";
 const mapStateToProps = createStructuredSelector({
  //currentUser: selectCurrentUser
  bodyshop: selectBodyshop,
@@ -33,17 +34,14 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
      title: t("jobs.fields.ro_number"),
      dataIndex: "ro_number",
      key: "ro_number",
      sorter: true, //(a, b) => alphaSort(a.ro_number, b.ro_number),
      sortOrder: sortcolumn === "ro_number" && sortorder,
      render: (text, record) => (
        <Link to={"/manage/jobs/" + record.id}>
          {record.ro_number || t("general.labels.na")}
        </Link>
      ),
    },
    {
      title: t("jobs.fields.owner"),
      dataIndex: "ownr_ln",
@@ -125,7 +123,6 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
      title: t("vehicles.fields.plate_no"),
      dataIndex: "plate_no",
      key: "plate_no",
      ellipsis: true,
      sorter: true, //(a, b) => alphaSort(a.plate_no, b.plate_no),
      sortOrder: sortcolumn === "plate_no" && sortorder,
@@ -137,7 +134,6 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
      title: t("jobs.fields.clm_no"),
      dataIndex: "clm_no",
      key: "clm_no",
      ellipsis: true,
      sorter: true, //(a, b) => alphaSort(a.clm_no, b.clm_no),
      sortOrder: sortcolumn === "clm_no" && sortorder,
@@ -259,11 +255,11 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
        pagination={
          search?.search
            ? {
-                pageSize: 25,
+                pageSize: pageLimit,
                showSizeChanger: false,
              }
            : {
-                pageSize: 25,
+                pageSize: pageLimit,
                current: parseInt(page || 1),
                total: total,
                showSizeChanger: false,
--- a/client/src/components/jobs-list/jobs-list.component.jsx
+++ b/client/src/components/jobs-list/jobs-list.component.jsx
@@ -1,8 +1,8 @@
 import {
-  SyncOutlined,
+    SyncOutlined,
-  ExclamationCircleFilled,
+    ExclamationCircleFilled,
-  PauseCircleOutlined,
+    PauseCircleOutlined,
-  BranchesOutlined,
+    BranchesOutlined,
 } from "@ant-design/icons";
 import { useQuery } from "@apollo/client";
 import { Button, Card, Grid, Input, Space, Table, Tooltip } from "antd";
@@ -22,374 +22,374 @@ import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
+    bodyshop: selectBodyshop,
 });
 export function JobsList({ bodyshop }) {
-  const searchParams = queryString.parse(useLocation().search);
+    const searchParams = queryString.parse(useLocation().search);
-  const { selected } = searchParams;
+    const { selected } = searchParams;
-  const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
+    const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
-    .filter((screen) => !!screen[1])
+        .filter((screen) => !!screen[1])
-    .slice(-1)[0];
+        .slice(-1)[0];
-  const { loading, error, data, refetch } = useQuery(QUERY_ALL_ACTIVE_JOBS, {
+    const { loading, error, data, refetch } = useQuery(QUERY_ALL_ACTIVE_JOBS, {
-    variables: {
+        variables: {
-      statuses: bodyshop.md_ro_statuses.active_statuses || ["Open", "Open*"],
+            statuses: bodyshop.md_ro_statuses.active_statuses || ["Open", "Open*"],
-    },
+        },
-    fetchPolicy: "network-only",
+        fetchPolicy: "network-only",
-    nextFetchPolicy: "network-only",
+        nextFetchPolicy: "network-only",
-  });
+    });
-  const [state, setState] = useState({
+    const [state, setState] = useState({
-    sortedInfo: {},
+        sortedInfo: {},
-    filteredInfo: { text: "" },
+        filteredInfo: { text: "" },
-  });
+    });
-  const { t } = useTranslation();
+    const { t } = useTranslation();
-  const history = useHistory();
+    const history = useHistory();
-  const [searchText, setSearchText] = useState("");
+    const [searchText, setSearchText] = useState("");
-  if (error) return <AlertComponent message={error.message} type="error" />;
+    if (error) return <AlertComponent message={error.message} type="error" />;
-  const jobs = data
+    const jobs = data
-    ? searchText === ""
+        ? searchText === ""
-      ? data.jobs
+            ? data.jobs
-      : data.jobs.filter(
+            : data.jobs.filter(
-          (j) =>
+                (j) =>
-            (j.ro_number || "")
+                    (j.ro_number || "")
-              .toString()
+                        .toString()
-              .toLowerCase()
+                        .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
+                        .includes(searchText.toLowerCase()) ||
-            (j.ownr_co_nm || "")
+                    (j.ownr_co_nm || "")
-              .toLowerCase()
+                        .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
+                        .includes(searchText.toLowerCase()) ||
-            (j.comments || "")
+                    (j.comments || "")
-              .toLowerCase()
+                        .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
+                        .includes(searchText.toLowerCase()) ||
-            (j.ownr_fn || "")
+                    (j.ownr_fn || "")
-              .toLowerCase()
+                        .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
+                        .includes(searchText.toLowerCase()) ||
-            (j.ownr_ln || "")
+                    (j.ownr_ln || "")
-              .toLowerCase()
+                        .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
+                        .includes(searchText.toLowerCase()) ||
-            (j.clm_no || "").toLowerCase().includes(searchText.toLowerCase()) ||
+                    (j.clm_no || "").toLowerCase().includes(searchText.toLowerCase()) ||
-            (j.plate_no || "")
+                    (j.plate_no || "")
-              .toLowerCase()
+                        .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
+                        .includes(searchText.toLowerCase()) ||
-            (j.v_model_desc || "")
+                    (j.v_model_desc || "")
-              .toLowerCase()
+                        .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
+                        .includes(searchText.toLowerCase()) ||
-            (j.est_ct_fn || "")
+                    (j.est_ct_fn || "")
-              .toLowerCase()
+                        .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
+                        .includes(searchText.toLowerCase()) ||
-            (j.est_ct_ln || "")
+                    (j.est_ct_ln || "")
-              .toLowerCase()
+                        .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
+                        .includes(searchText.toLowerCase()) ||
-            (j.v_make_desc || "")
+                    (j.v_make_desc || "")
-              .toLowerCase()
+                        .toLowerCase()
-              .includes(searchText.toLowerCase())
+                        .includes(searchText.toLowerCase())
-        )
+            )
-    : [];
+        : [];
-  const handleTableChange = (pagination, filters, sorter) => {
+    const handleTableChange = (pagination, filters, sorter) => {
-    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+        setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
-  };
+    };
-  const handleOnRowClick = (record) => {
+    const handleOnRowClick = (record) => {
-    if (record) {
+        if (record) {
-      if (record.id) {
+            if (record.id) {
-        history.push({
+                history.push({
-          search: queryString.stringify({
+                    search: queryString.stringify({
-            ...searchParams,
+                        ...searchParams,
-            selected: record.id,
+                        selected: record.id,
-          }),
+                    }),
-        });
+                });
-      }
+            }
-    }
+        }
-  };
+    };
-  const columns = [
+    const columns = [
-    {
+        {
-      title: t("jobs.fields.ro_number"),
+            title: t("jobs.fields.ro_number"),
-      dataIndex: "ro_number",
+            dataIndex: "ro_number",
-      key: "ro_number",
+            key: "ro_number",
-      sorter: (a, b) =>
+            sorter: (a, b) =>
-        parseInt((a.ro_number || "0").replace(/\D/g, "")) -
+                parseInt((a.ro_number || "0").replace(/\D/g, "")) -
-        parseInt((b.ro_number || "0").replace(/\D/g, "")),
+                parseInt((b.ro_number || "0").replace(/\D/g, "")),
-      sortOrder:
+            sortOrder:
-        state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
+                state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
-      render: (text, record) => (
+            render: (text, record) => (
-        <Link
+                <Link
-          to={"/manage/jobs/" + record.id}
+                    to={"/manage/jobs/" + record.id}
-          onClick={(e) => e.stopPropagation()}
+                    onClick={(e) => e.stopPropagation()}
-        >
+                >
-          <Space>
+                    <Space>
-            {record.ro_number || t("general.labels.na")}
+                        {record.ro_number || t("general.labels.na")}
-            {record.production_vars && record.production_vars.alert ? (
+                        {record.production_vars && record.production_vars.alert ? (
-              <ExclamationCircleFilled className="production-alert" />
+                            <ExclamationCircleFilled className="production-alert" />
-            ) : null}
+                        ) : null}
-            {record.suspended && (
+                        {record.suspended && (
-              <PauseCircleOutlined style={{ color: "orangered" }} />
+                            <PauseCircleOutlined style={{ color: "orangered" }} />
-            )}
+                        )}
-            {record.iouparent && (
+                        {record.iouparent && (
-              <Tooltip title={t("jobs.labels.iou")}>
+                            <Tooltip title={t("jobs.labels.iou")}>
-                <BranchesOutlined style={{ color: "orangered" }} />
+                                <BranchesOutlined style={{ color: "orangered" }} />
-              </Tooltip>
+                            </Tooltip>
-            )}
+                        )}
-          </Space>
+                    </Space>
-        </Link>
+                </Link>
-      ),
+            ),
-    },
+        },
-    {
+        {
-      title: t("jobs.fields.owner"),
+            title: t("jobs.fields.owner"),
-      dataIndex: "owner",
+            dataIndex: "owner",
-      key: "owner",
+            key: "owner",
-      ellipsis: true,
+            ellipsis: true,
-      responsive: ["md"],
+            responsive: ["md"],
-      sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
+            sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
-      sortOrder:
+            sortOrder:
-        state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
+                state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
-      render: (text, record) => {
+            render: (text, record) => {
-        return record.ownerid ? (
+                return record.ownerid ? (
-          <Link
+                    <Link
-            to={"/manage/owners/" + record.ownerid}
+                        to={"/manage/owners/" + record.ownerid}
-            onClick={(e) => e.stopPropagation()}
+                        onClick={(e) => e.stopPropagation()}
-          >
+                    >
-            <OwnerNameDisplay ownerObject={record} />
+                        <OwnerNameDisplay ownerObject={record} />
-          </Link>
+                    </Link>
-        ) : (
+                ) : (
-          <span>
+                    <span>
            <OwnerNameDisplay ownerObject={record} />
          </span>
-        );
+                );
      },
    },
    {
      title: t("jobs.fields.ownr_ph1"),
      dataIndex: "ownr_ph1",
      key: "ownr_ph1",
      ellipsis: true,
      responsive: ["md"],
      render: (text, record) => (
        <ChatOpenButton phone={record.ownr_ph1} jobid={record.id} />
      ),
    },
    {
      title: t("jobs.fields.ownr_ph2"),
      dataIndex: "ownr_ph2",
      key: "ownr_ph2",
      ellipsis: true,
      responsive: ["md"],
      render: (text, record) => (
        <ChatOpenButton phone={record.ownr_ph2} jobid={record.id} />
      ),
    },
    {
      title: t("jobs.fields.status"),
      dataIndex: "status",
      key: "status",
      ellipsis: true,
      sorter: (a, b) => alphaSort(a.status, b.status),
      sortOrder:
        state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
      filters:
        (jobs &&
          jobs
            .map((j) => j.status)
            .filter(onlyUnique)
            .map((s) => {
              return {
                text: s || "No Status*",
                value: [s],
              };
            })) ||
        [],
      onFilter: (value, record) => value.includes(record.status),
    },
    {
      title: t("jobs.fields.vehicle"),
      dataIndex: "vehicle",
      key: "vehicle",
      ellipsis: true,
      render: (text, record) => {
        return record.vehicleid ? (
          <Link
            to={"/manage/vehicles/" + record.vehicleid}
            onClick={(e) => e.stopPropagation()}
          >
            {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
              record.v_model_desc || ""
            }`}
          </Link>
        ) : (
          <span>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
            record.v_model_desc || ""
          }`}</span>
        );
      },
    },
    {
      title: t("vehicles.fields.plate_no"),
      dataIndex: "plate_no",
      key: "plate_no",
      ellipsis: true,
      responsive: ["md"],
      sorter: (a, b) => alphaSort(a.plate_no, b.plate_no),
      sortOrder:
        state.sortedInfo.columnKey === "plate_no" && state.sortedInfo.order,
    },
    {
      title: t("jobs.fields.clm_no"),
      dataIndex: "clm_no",
      key: "clm_no",
      ellipsis: true,
      responsive: ["md"],
      sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
      sortOrder:
        state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
      render: (text, record) =>
        `${record.clm_no || ""}${
          record.po_number ? ` (PO: ${record.po_number})` : ""
        }`,
    },
    {
      title: t("jobs.fields.ins_co_nm"),
      dataIndex: "ins_co_nm",
      key: "ins_co_nm",
      ellipsis: true,
      filters:
        (jobs &&
          jobs
            .map((j) => j.ins_co_nm)
            .filter(onlyUnique)
            .map((s) => {
              return {
                text: s,
                value: [s],
              };
            })) ||
        [],
      onFilter: (value, record) => value.includes(record.ins_co_nm),
      responsive: ["md"],
    },
    {
      title: t("jobs.fields.clm_total"),
      dataIndex: "clm_total",
      key: "clm_total",
      responsive: ["md"],
      ellipsis: true,
      sorter: (a, b) => a.clm_total - b.clm_total,
      sortOrder:
        state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
      render: (text, record) => (
        <CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
      ),
    },
    {
      title: t("jobs.labels.estimator"),
      dataIndex: "jobs.labels.estimator",
      key: "jobs.labels.estimator",
      ellipsis: true,
      responsive: ["xl"],
      filterSearch: true,
      filters:
        (jobs &&
          jobs
            .map((j) => `${j.est_ct_fn || ""} ${j.est_ct_ln || ""}`.trim())
            .filter(onlyUnique)
            .map((s) => {
              return {
                text: s || "N/A",
                value: [s],
              };
            })) ||
        [],
      onFilter: (value, record) =>
        value.includes(
          `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim()
        ),
      render: (text, record) =>
        `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim(),
    },
    {
      title: t("jobs.fields.comment"),
      dataIndex: "comment",
      key: "comment",
      ellipsis: true,
      responsive: ["md"],
    },
    // {
    //   title: t("jobs.fields.owner_owing"),
    //   dataIndex: "owner_owing",
    //   key: "owner_owing",
    //   responsive: ["md"],
    //   render: (text, record) => (
    //     <CurrencyFormatter>{record.owner_owing}</CurrencyFormatter>
    //   ),
    // },
  ];
  const scrollMapper = {
    xs: true,
    sm: true,
    md: true,
    lg: "100%",
    xl: "100%",
    xxl: "100%",
  };
  return (
    <Card
      title={t("titles.bc.jobs-active")}
      extra={
        <Space wrap>
          <Button onClick={() => refetch()}>
            <SyncOutlined />
          </Button>
          <Input.Search
            placeholder={t("general.labels.search")}
            onChange={(e) => {
              setSearchText(e.target.value);
            }}
            value={searchText}
            enterButton
          />
        </Space>
      }
    >
      <Table
        loading={loading}
        pagination={{ defaultPageSize: 50 }}
        columns={columns}
        rowKey="id"
        dataSource={jobs}
        scroll={{
          x: selectedBreakpoint ? scrollMapper[selectedBreakpoint[0]] : "100%",
        }}
        rowSelection={{
          onSelect: (record) => {
            handleOnRowClick(record);
          },
          selectedRowKeys: [selected],
          type: "radio",
        }}
        onChange={handleTableChange}
        onRow={(record, rowIndex) => {
          return {
            onClick: (event) => {
              handleOnRowClick(record);
            },
-          };
+        },
-        }}
+        {
-      />
+            title: t("jobs.fields.ownr_ph1"),
-    </Card>
+            dataIndex: "ownr_ph1",
-  );
+            key: "ownr_ph1",
            ellipsis: true,
            responsive: ["md"],
            render: (text, record) => (
                <ChatOpenButton phone={record.ownr_ph1} jobid={record.id} />
            ),
        },
        {
            title: t("jobs.fields.ownr_ph2"),
            dataIndex: "ownr_ph2",
            key: "ownr_ph2",
            ellipsis: true,
            responsive: ["md"],
            render: (text, record) => (
                <ChatOpenButton phone={record.ownr_ph2} jobid={record.id} />
            ),
        },
        {
            title: t("jobs.fields.status"),
            dataIndex: "status",
            key: "status",
            ellipsis: true,
            sorter: (a, b) => alphaSort(a.status, b.status),
            sortOrder:
                state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
            filters:
                (jobs &&
                    jobs
                        .map((j) => j.status)
                        .filter(onlyUnique)
                        .map((s) => {
                            return {
                                text: s || "No Status*",
                                value: [s],
                            };
                        })) ||
                [],
            onFilter: (value, record) => value.includes(record.status),
        },
        {
            title: t("jobs.fields.vehicle"),
            dataIndex: "vehicle",
            key: "vehicle",
            ellipsis: true,
            render: (text, record) => {
                return record.vehicleid ? (
                    <Link
                        to={"/manage/vehicles/" + record.vehicleid}
                        onClick={(e) => e.stopPropagation()}
                    >
                        {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
                            record.v_model_desc || ""
                        }`}
                    </Link>
                ) : (
                    <span>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
                        record.v_model_desc || ""
                    }`}</span>
                );
            },
        },
        {
            title: t("vehicles.fields.plate_no"),
            dataIndex: "plate_no",
            key: "plate_no",
            ellipsis: true,
            responsive: ["md"],
            sorter: (a, b) => alphaSort(a.plate_no, b.plate_no),
            sortOrder:
                state.sortedInfo.columnKey === "plate_no" && state.sortedInfo.order,
        },
        {
            title: t("jobs.fields.clm_no"),
            dataIndex: "clm_no",
            key: "clm_no",
            ellipsis: true,
            responsive: ["md"],
            sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
            sortOrder:
                state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
            render: (text, record) =>
                `${record.clm_no || ""}${
                    record.po_number ? ` (PO: ${record.po_number})` : ""
                }`,
        },
        {
            title: t("jobs.fields.ins_co_nm"),
            dataIndex: "ins_co_nm",
            key: "ins_co_nm",
            ellipsis: true,
            filters:
                (jobs &&
                    jobs
                        .map((j) => j.ins_co_nm)
                        .filter(onlyUnique)
                        .map((s) => {
                            return {
                                text: s,
                                value: [s],
                            };
                        })) ||
                [],
            onFilter: (value, record) => value.includes(record.ins_co_nm),
            responsive: ["md"],
        },
        {
            title: t("jobs.fields.clm_total"),
            dataIndex: "clm_total",
            key: "clm_total",
            responsive: ["md"],
            ellipsis: true,
            sorter: (a, b) => a.clm_total - b.clm_total,
            sortOrder:
                state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
            render: (text, record) => (
                <CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
            ),
        },
        {
            title: t("jobs.labels.estimator"),
            dataIndex: "jobs.labels.estimator",
            key: "jobs.labels.estimator",
            ellipsis: true,
            responsive: ["xl"],
            filterSearch: true,
            filters:
                (jobs &&
                    jobs
                        .map((j) => `${j.est_ct_fn || ""} ${j.est_ct_ln || ""}`.trim())
                        .filter(onlyUnique)
                        .map((s) => {
                            return {
                                text: s || "N/A",
                                value: [s],
                            };
                        })) ||
                [],
            onFilter: (value, record) =>
                value.includes(
                    `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim()
                ),
            render: (text, record) =>
                `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim(),
        },
        {
            title: t("jobs.fields.comment"),
            dataIndex: "comment",
            key: "comment",
            ellipsis: true,
            responsive: ["md"],
        },
        // {
        //   title: t("jobs.fields.owner_owing"),
        //   dataIndex: "owner_owing",
        //   key: "owner_owing",
        //   responsive: ["md"],
        //   render: (text, record) => (
        //     <CurrencyFormatter>{record.owner_owing}</CurrencyFormatter>
        //   ),
        // },
    ];
    const scrollMapper = {
        xs: true,
        sm: true,
        md: true,
        lg: "100%",
        xl: "100%",
        xxl: "100%",
    };
    return (
        <Card
            title={t("titles.bc.jobs-active")}
            extra={
                <Space wrap>
                    <Button onClick={() => refetch()}>
                        <SyncOutlined />
                    </Button>
                    <Input.Search
                        placeholder={t("general.labels.search")}
                        onChange={(e) => {
                            setSearchText(e.target.value);
                        }}
                        value={searchText}
                        enterButton
                    />
                </Space>
            }
        >
            <Table
                loading={loading}
                pagination={{ defaultPageSize: 50 }}
                columns={columns}
                rowKey="id"
                dataSource={jobs}
                scroll={{
                    x: selectedBreakpoint ? scrollMapper[selectedBreakpoint[0]] : "100%",
                }}
                rowSelection={{
                    onSelect: (record) => {
                        handleOnRowClick(record);
                    },
                    selectedRowKeys: [selected],
                    type: "radio",
                }}
                onChange={handleTableChange}
                onRow={(record, rowIndex) => {
                    return {
                        onClick: (event) => {
                            handleOnRowClick(record);
                        },
                    };
                }}
            />
        </Card>
    );
 }
 export default connect(mapStateToProps, null)(JobsList);
--- a/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx
+++ b/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx
@@ -1,8 +1,8 @@
 import {
  BranchesOutlined,
  ExclamationCircleFilled,
  PauseCircleOutlined,
  SyncOutlined,
  BranchesOutlined,
 } from "@ant-design/icons";
 import { useQuery } from "@apollo/client";
 import { Button, Card, Grid, Input, Space, Table, Tooltip } from "antd";
@@ -14,12 +14,13 @@ import { Link, useHistory, useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { onlyUnique } from "../../utils/arrayHelper";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { onlyUnique } from "../../utils/arrayHelper";
 import { alphaSort } from "../../utils/sorters";
 import AlertComponent from "../alert/alert.component";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import {pageLimit} from "../../utils/config";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -46,6 +47,7 @@ export function JobsReadyList({ bodyshop }) {
  const { loading, error, data, refetch } = useQuery(QUERY_ALL_ACTIVE_JOBS, {
    variables: {
      statuses: readyStatuses,
      isConverted: true,
    },
    fetchPolicy: "network-only",
    nextFetchPolicy: "network-only",
@@ -376,7 +378,7 @@ export function JobsReadyList({ bodyshop }) {
    >
      <Table
        loading={loading}
-        pagination={{ defaultPageSize: 50 }}
+        pagination={{ defaultPageSize: pageLimit }}
        columns={columns}
        rowKey="id"
        dataSource={jobs}
--- 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-find-modal/owner-find-modal.component.jsx
+++ b/client/src/components/owner-find-modal/owner-find-modal.component.jsx
@@ -8,10 +8,11 @@ export default function OwnerFindModalComponent({
  setSelectedOwner,
  ownersListLoading,
  ownersList,
  partsQueueToggle,
  setPartsQueueToggle,
 }) {
  //setSelectedOwner is used to set the record id of the owner to use for adding the job.
  const { t } = useTranslation();
  const columns = [
    {
      title: t("owners.fields.ownr_ln"),
@@ -109,6 +110,12 @@ export default function OwnerFindModalComponent({
      >
        {t("owners.labels.create_new")}
      </Checkbox>
      <Checkbox
          checked={partsQueueToggle}
          onChange={(e) => setPartsQueueToggle(e.target.checked)}
      >
        {t("bodyshop.fields.md_functionality_toggles.parts_queue_toggle")}
      </Checkbox>
    </div>
  );
 }
--- a/client/src/components/owner-find-modal/owner-find-modal.container.jsx
+++ b/client/src/components/owner-find-modal/owner-find-modal.container.jsx
@@ -14,6 +14,8 @@ export default function OwnerFindModalContainer({
  owner,
  selectedOwner,
  setSelectedOwner,
  partsQueueToggle,
  setPartsQueueToggle,
  ...modalProps
 }) {
  //use owner object to run query and find what possible owners there are.
@@ -59,6 +61,8 @@ export default function OwnerFindModalContainer({
            selectedOwner={selectedOwner}
            setSelectedOwner={setSelectedOwner}
            ownersListLoading={ownersList.loading}
            partsQueueToggle={partsQueueToggle}
            setPartsQueueToggle={setPartsQueueToggle}
            ownersList={
              ownersList.data && ownersList.data.search_owners
                ? ownersList.data.search_owners
--- 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
@@ -6,6 +6,7 @@ import { useTranslation } from "react-i18next";
 import { Link, useHistory, useLocation } from "react-router-dom";
 import PhoneFormatter from "../../utils/PhoneFormatter";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import {pageLimit} from "../../utils/config";
 export default function OwnersListComponent({
  loading,
@@ -106,7 +107,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
@@ -118,7 +123,7 @@ export default function OwnersListComponent({
        loading={loading}
        pagination={{
          position: "top",
-          pageSize: 25,
+          pageSize: pageLimit,
          current: parseInt(page || 1),
          total: total,
        }}
--- a/client/src/components/owners-list/owners-list.container.jsx
+++ b/client/src/components/owners-list/owners-list.container.jsx
@@ -5,6 +5,7 @@ import AlertComponent from "../alert/alert.component";
 import OwnersListComponent from "./owners-list.component";
 import queryString from "query-string";
 import { useLocation } from "react-router-dom";
 import {pageLimit} from "../../utils/config";
 export default function OwnersListContainer() {
  const searchParams = queryString.parse(useLocation().search);
@@ -16,8 +17,8 @@ export default function OwnersListContainer() {
      nextFetchPolicy: "network-only",
      variables: {
        search: search || "",
-        offset: page ? (page - 1) * 25 : 0,
+        offset: page ? (page - 1) * pageLimit : 0,
-        limit: 25,
+        limit: pageLimit,
        order: [
          {
            [sortcolumn || "created_at"]: sortorder
--- 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 client from "../../utils/GraphQLClient";
 import _ from "lodash";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { Link } from "react-router-dom";
 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 client from "../../utils/GraphQLClient";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { Link } from "react-router-dom";
 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/payments-list-paginated/payment-list-paginated.component.jsx
+++ b/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx
@@ -18,6 +18,7 @@ import { alphaSort } from "../../utils/sorters";
 import CaBcEtfTableModalContainer from "../ca-bc-etf-table-modal/ca-bc-etf-table-modal.container";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
 import {pageLimit} from "../../utils/config";
 const mapStateToProps = createStructuredSelector({
  //currentUser: selectCurrentUser
@@ -282,11 +283,11 @@ export function PaymentsListPaginated({
        pagination={
          search?.search
            ? {
-                pageSize: 25,
+                pageSize: pageLimit,
                showSizeChanger: false,
              }
            : {
-                pageSize: 25,
+                pageSize: pageLimit,
                current: parseInt(page || 1),
                total: total,
                showSizeChanger: false,
--- 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
+        {!technician ? (
-          onClick={() => {
+          <MailOutlined
-            GenerateDocument(
+            onClick={() => {
-              {
+              GenerateDocument(
-                name: item.key,
+                {
-                variables: { id: id },
+                  name: item.key,
-              },
+                  variables: { id: id },
-              { to: context.job && context.job.ownr_ea, subject: item.subject },
+                },
-              "e",
+                {
-              id
+                  to: context.job && context.job.ownr_ea,
-            );
+                  subject: item.subject,
-          }}
+                },
-        />
+                "e",
                id
              );
            }}
          />
        ) : null}
        {loading && <Spin />}
      </Space>
    </li>
--- a/client/src/components/production-board-kanban/production-board-kanban.component.jsx
+++ b/client/src/components/production-board-kanban/production-board-kanban.component.jsx
@@ -20,9 +20,9 @@ import ProductionBoardCard from "../production-board-kanban-card/production-boar
 import ProductionListDetailComponent from "../production-list-detail/production-list-detail.component";
 import ProductionBoardKanbanCardSettings from "./production-board-kanban.card-settings.component";
 //import "@asseinfo/react-kanban/dist/styles.css";
 import CardColorLegend from "../production-board-kanban-card/production-board-kanban-card-color-legend.component";
 import "./production-board-kanban.styles.scss";
 import { createBoardData } from "./production-board-kanban.utils.js";
 import CardColorLegend from "../production-board-kanban-card/production-board-kanban-card-color-legend.component";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
  technician: selectTechnician,
@@ -153,6 +153,18 @@ export function ProductionBoardKanbanComponent({
      0
    )
    .toFixed(1);
    const totalLAB = data
    .reduce(
      (acc, val) => acc + (val.labhrs?.aggregate?.sum?.mod_lb_hrs || 0),
      0
    )
    .toFixed(1);
  const totalLAR = data
    .reduce(
      (acc, val) => acc + (val.larhrs?.aggregate?.sum?.mod_lb_hrs || 0),
      0
    )
    .toFixed(1);
  const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
    .filter((screen) => !!screen[1])
    .slice(-1)[0];
@@ -236,6 +248,14 @@ export function ProductionBoardKanbanComponent({
              title={t("dashboard.titles.productionhours")}
              value={totalHrs}
            />
            <Statistic
              title={t("dashboard.titles.labhours")}
              value={totalLAB}
            />
            <Statistic
              title={t("dashboard.titles.larhours")}
              value={totalLAR}
            />
            <Statistic
              title={t("appointments.labels.inproduction")}
              value={data && data.length}
--- a/client/src/components/production-list-columns/production-list-columns.add.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.add.component.jsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { Button, Dropdown, Menu } from "antd";
-import dataSource from "./production-list-columns.data";
+import React from "react";
 import { useTranslation } from "react-i18next";
 import dataSource from "./production-list-columns.data";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -24,6 +24,7 @@ export function ProductionColumnsComponent({
  columnState,
  technician,
  bodyshop,
  data,
  tableState,
 }) {
  const [columns, setColumns] = columnState;
@@ -36,6 +37,7 @@ export function ProductionColumnsComponent({
        bodyshop,
        technician,
        state: tableState,
        data: data,
        activeStatuses: bodyshop.md_ro_statuses.active_statuses,
      }).filter((i) => i.key === e.key),
    ]);
@@ -46,6 +48,7 @@ export function ProductionColumnsComponent({
    technician,
    state: tableState,
    activeStatuses: bodyshop.md_ro_statuses.active_statuses,
    data: data,
  });
  const menu = (
    <Menu
--- a/Show More
+++ b/Show More