IO-2921 Chatter Final mods and Cron Trigger

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
Merge branch 'release/2024-11-22' into feature/IO-2921-CARSTAR-Canada-Chatter-Integration
2024-11-22 10:55:19 -08:00 · 2024-11-21 15:09:46 -08:00 · 2024-11-21 14:40:36 -08:00 · 2024-11-20 18:58:31 +00:00 · 2024-11-20 10:57:59 -08:00 · 2024-11-20 10:56:02 -08:00
36 changed files with 11845 additions and 11242 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,5 +8,35 @@
      "pattern": "**/IMEX.xml",
      "systemId": "logs/IMEX.xsd"
    }
  ],
  "cSpell.words": [
    "antd",
    "appointmentconfirmation",
    "appt",
    "autohouse",
    "autohouseid",
    "billlines",
    "bodyshop",
    "bodyshopid",
    "bodyshops",
    "CIECA",
    "claimscorp",
    "claimscorpid",
    "Dinero",
    "driveable",
    "IMEX",
    "imexshopid",
    "jobid",
    "joblines",
    "Kaizen",
    "labhrs",
    "larhrs",
    "mixdata",
    "ownr",
    "promanager",
    "shopname",
    "smartscheduling",
    "timetickets",
    "touchtime"
  ]
 }
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -11156,6 +11156,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
                                    <concept_node>
                                        <name>imexpay</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>insurancecos</name>
                                        <definition_loaded>false</definition_loaded>
@@ -11198,27 +11219,6 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
                                    <concept_node>
                                        <name>intellipay</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>intellipay_cash_discount</name>
                                        <definition_loaded>false</definition_loaded>
@@ -11747,6 +11747,48 @@
                                                    </translation>
                                                </translations>
                                            </concept_node>
                                            <concept_node>
                                                <name>ttl_adjustment</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>ttl_tax_adjustment</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>
@@ -11775,6 +11817,27 @@
                                            </concept_node>
                                        </children>
                                    </folder_node>
                                    <concept_node>
                                        <name>romepay</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>scheduling</name>
                                        <definition_loaded>false</definition_loaded>
@@ -36253,6 +36316,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
                                    <concept_node>
                                        <name>total_cust_payable_cash_discount</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>total_repairs</name>
                                        <definition_loaded>false</definition_loaded>
@@ -48360,6 +48444,27 @@
                                                    </translation>
                                                </translations>
                                            </concept_node>
                                            <concept_node>
                                                <name>tasks_in_view</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>tasks_on_board</name>
                                                <definition_loaded>false</definition_loaded>
@@ -48402,6 +48507,27 @@
                                                    </translation>
                                                </translations>
                                            </concept_node>
                                            <concept_node>
                                                <name>total_amount_in_view</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>total_amount_on_board</name>
                                                <definition_loaded>false</definition_loaded>
@@ -48444,6 +48570,27 @@
                                                    </translation>
                                                </translations>
                                            </concept_node>
                                            <concept_node>
                                                <name>total_hours_in_view</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>total_hours_on_board</name>
                                                <definition_loaded>false</definition_loaded>
@@ -48465,6 +48612,27 @@
                                                    </translation>
                                                </translations>
                                            </concept_node>
                                            <concept_node>
                                                <name>total_jobs_in_view</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>total_jobs_on_board</name>
                                                <definition_loaded>false</definition_loaded>
@@ -48507,6 +48675,27 @@
                                                    </translation>
                                                </translations>
                                            </concept_node>
                                            <concept_node>
                                                <name>total_lab_in_view</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>total_lab_on_board</name>
                                                <definition_loaded>false</definition_loaded>
@@ -48549,6 +48738,27 @@
                                                    </translation>
                                                </translations>
                                            </concept_node>
                                            <concept_node>
                                                <name>total_lar_in_view</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>total_lar_on_board</name>
                                                <definition_loaded>false</definition_loaded>
@@ -48724,6 +48934,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
                                    <concept_node>
                                        <name>tasks_in_view</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>tasks_on_board</name>
                                        <definition_loaded>false</definition_loaded>
@@ -48766,6 +48997,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
                                    <concept_node>
                                        <name>total_amount_in_view</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>total_amount_on_board</name>
                                        <definition_loaded>false</definition_loaded>
@@ -48808,6 +49060,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
                                    <concept_node>
                                        <name>total_hours_in_view</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>total_hours_on_board</name>
                                        <definition_loaded>false</definition_loaded>
@@ -48829,6 +49102,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
                                    <concept_node>
                                        <name>total_jobs_in_view</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>total_jobs_on_board</name>
                                        <definition_loaded>false</definition_loaded>
@@ -48871,6 +49165,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
                                    <concept_node>
                                        <name>total_lab_in_view</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>total_lab_on_board</name>
                                        <definition_loaded>false</definition_loaded>
@@ -48913,6 +49228,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
                                    <concept_node>
                                        <name>total_lar_in_view</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>total_lar_on_board</name>
                                        <definition_loaded>false</definition_loaded>
@@ -51761,6 +52097,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
                                    <concept_node>
                                        <name>production_not_production_status</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>production_over_time</name>
                                        <definition_loaded>false</definition_loaded>
@@ -54225,6 +54582,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>description</name>
                                        <definition_loaded>false</definition_loaded>
@@ -54487,6 +54865,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
                                    <concept_node>
                                        <name>related_items</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>remind_at</name>
                                        <definition_loaded>false</definition_loaded>
--- a/certs/id_rsa.key
+++ b/certs/id_rsa.key
--- a/certs/io-ftp-test.key
+++ b/certs/io-ftp-test.key
@@ -0,0 +1,12 @@
 -----BEGIN OPENSSH PRIVATE KEY-----
 b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAArAAAABNlY2RzYS
 1zaGEyLW5pc3RwNTIxAAAACG5pc3RwNTIxAAAAhQQBYJnAujo17diR0fM2Ze1d1Ft6XHm5
 U31pXdFEN+rGC4SoYTdZE8q3relxMS5GwwBOvgvVUuayfid2XS8ls/CMDiMBJAYqEK4CRY
 PbbPB7lLnMWsF7muFhvs+SIpPQC+vtDwM2TKlxF0Y8p+iVRpvCADoggsSze7skmJWKmMTt
 8jEdEOcAAAEQIyXsOSMl7DkAAAATZWNkc2Etc2hhMi1uaXN0cDUyMQAAAAhuaXN0cDUyMQ
 AAAIUEAWCZwLo6Ne3YkdHzNmXtXdRbelx5uVN9aV3RRDfqxguEqGE3WRPKt63pcTEuRsMA
 Tr4L1VLmsn4ndl0vJbPwjA4jASQGKhCuAkWD22zwe5S5zFrBe5rhYb7PkiKT0Avr7Q8DNk
 ypcRdGPKfolUabwgA6IILEs3u7JJiVipjE7fIxHRDnAAAAQUO5dO9G7i0bxGTP0zV3eIwv
 5g0NhrQJfW/bMHS6XWwaxdpr+QZ+DbBJVzZPwYC0wLMW4bJAf+kjqUnj4wGocoTeAAAAD2
 lvLWZ0cC10ZXN0LWtleQECAwQ=
 -----END OPENSSH PRIVATE KEY-----
--- a/certs/io-ftp-test.key.pub
+++ b/certs/io-ftp-test.key.pub
@@ -0,0 +1 @@
 ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAFgmcC6OjXt2JHR8zZl7V3UW3pceblTfWld0UQ36sYLhKhhN1kTyret6XExLkbDAE6+C9VS5rJ+J3ZdLyWz8IwOIwEkBioQrgJFg9ts8HuUucxawXua4WG+z5Iik9AL6+0PAzZMqXEXRjyn6JVGm8IAOiCCxLN7uySYlYqYxO3yMR0Q5w== io-ftp-test-key
--- a/certs/io-ftp-test.ppk
+++ b/certs/io-ftp-test.ppk
@@ -0,0 +1,12 @@
 PuTTY-User-Key-File-3: ecdsa-sha2-nistp521
 Encryption: none
 Comment: io-ftp-test-key
 Public-Lines: 4
 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAFgmcC6OjXt
 2JHR8zZl7V3UW3pceblTfWld0UQ36sYLhKhhN1kTyret6XExLkbDAE6+C9VS5rJ+
 J3ZdLyWz8IwOIwEkBioQrgJFg9ts8HuUucxawXua4WG+z5Iik9AL6+0PAzZMqXEX
 Rjyn6JVGm8IAOiCCxLN7uySYlYqYxO3yMR0Q5w==
 Private-Lines: 2
 AAAAQUO5dO9G7i0bxGTP0zV3eIwv5g0NhrQJfW/bMHS6XWwaxdpr+QZ+DbBJVzZP
 wYC0wLMW4bJAf+kjqUnj4wGocoTe
 Private-MAC: d67001d47e13c43dc8bdb9c68a25356a96c1c4a6714f3c5a1836fca646b78b54
--- 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,4 +1,4 @@
-import { DatePicker } from "antd";
+import { DatePicker, Space, TimePicker } from "antd";
 import PropTypes from "prop-types";
 import React, { useCallback, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -20,6 +20,7 @@ const DateTimePicker = ({
  onlyFuture,
  onlyToday,
  isDateOnly = false,
  isSeparatedTime = false,
  bodyshop,
  ...restProps
 }) => {
@@ -87,24 +88,57 @@ const DateTimePicker = ({
  return (
    <div onKeyDown={handleKeyDown} id={id} style={{ width: "100%" }}>
-      <DatePicker
+      {isSeparatedTime && (
-        showTime={
+        <Space direction="vertical" style={{ width: "100%" }}>
-          isDateOnly
+          <DatePicker
-            ? false
+            showTime={false}
-            : {
+            format="MM/DD/YYYY"
-                format: "hh:mm a",
+            value={value ? dayjs(value) : null}
-                minuteStep: 15,
+            onChange={handleChange}
-                defaultValue: dayjs(dayjs(), "HH:mm:ss")
+            placeholder={t("general.labels.date")}
-              }
+            onBlur={handleBlur}
-        }
+            disabledDate={handleDisabledDate}
-        format={isDateOnly ? "MM/DD/YYYY" : "MM/DD/YYYY hh:mm a"}
+            isDateOnly={true}
-        value={value ? dayjs(value) : null}
+            {...restProps}
-        onChange={handleChange}
+          />
-        placeholder={isDateOnly ? t("general.labels.date") : t("general.labels.datetime")}
+          {value && (
-        onBlur={onBlur || handleBlur}
+            <TimePicker
-        disabledDate={handleDisabledDate}
+              format="hh:mm a"
-        {...restProps}
+              minuteStep={15}
-      />
+              defaultOpenValue={dayjs(value)
                .hour(dayjs().hour())
                .minute(Math.floor(dayjs().minute() / 15) * 15)
                .second(0)}
              onChange={(value) => {
                handleChange(value);
                onBlur();
              }}
              placeholder={t("general.labels.time")}
              {...restProps}
            />
          )}
        </Space>
      )}
      {!isSeparatedTime && (
        <DatePicker
          showTime={
            isDateOnly
              ? false
              : {
                  format: "hh:mm a",
                  minuteStep: 15,
                  defaultValue: dayjs(dayjs(), "HH:mm:ss")
                }
          }
          format={isDateOnly ? "MM/DD/YYYY" : "MM/DD/YYYY hh:mm a"}
          value={value ? dayjs(value) : null}
          onChange={handleChange}
          placeholder={isDateOnly ? t("general.labels.date") : t("general.labels.datetime")}
          onBlur={onBlur || handleBlur}
          disabledDate={handleDisabledDate}
          {...restProps}
        />
      )}
    </div>
  );
 };
@@ -116,7 +150,8 @@ DateTimePicker.propTypes = {
  id: PropTypes.string,
  onlyFuture: PropTypes.bool,
  onlyToday: PropTypes.bool,
-  isDateOnly: PropTypes.bool
+  isDateOnly: PropTypes.bool,
  isSeparatedTime: PropTypes.bool
 };
 export default connect(mapStateToProps, null)(DateTimePicker);
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -118,8 +118,7 @@ export function JobLinesComponent({
          ...(record.critical ? { boxShadow: " -.5em 0 0 #FFC107" } : {})
        }
      }),
-      sortOrder: state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order,
+      sortOrder: state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order
      ellipsis: true
    },
    {
      title: t("joblines.fields.oem_partno"),
--- a/client/src/components/job-line-note-popup/job-line-note-popup.component.jsx
+++ b/client/src/components/job-line-note-popup/job-line-note-popup.component.jsx
@@ -45,7 +45,8 @@ export default function JobLineNotePopup({ jobline, disabled }) {
  if (editing)
    return (
      <div>
-        <Input
+        <Input.TextArea
          autoSize
          autoFocus
          suffix={loading ? <LoadingSpinner /> : null}
          value={note}
--- a/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
+++ b/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
@@ -1,10 +1,10 @@
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { Form, Input, InputNumber, Modal, Select, Switch } from "antd";
 import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import InputCurrency from "../form-items-formatted/currency-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import JoblinesPreset from "../job-lines-preset-button/job-lines-preset-button.component";
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -61,7 +61,7 @@ export function JobLinesUpsertModalComponent({ bodyshop, open, jobLine, handleCa
            ]}
            name="line_desc"
          >
-            <Input />
+            <Input.TextArea autoSize />
          </Form.Item>
          <JoblinesPreset form={form} />
        </LayoutFormRow>
--- a/client/src/components/job-totals-table/job-totals.table.totals.component.jsx
+++ b/client/src/components/job-totals-table/job-totals.table.totals.component.jsx
@@ -141,14 +141,16 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
        key: t("jobs.fields.ded_amt"),
        total: job.job_totals.totals.custPayable.deductible
      },
-      ...(InstanceRenderManager({
+      ...InstanceRenderManager({
-        imex: [{
+        imex: [
-          key: t("jobs.fields.federal_tax_payable"),
+          {
-          total: job.job_totals.totals.custPayable.federal_tax
+            key: t("jobs.fields.federal_tax_payable"),
-        }],
+            total: job.job_totals.totals.custPayable.federal_tax
          }
        ],
        rome: [],
        promanager: "USE_ROME"
-      })),
+      }),
      {
        key: t("jobs.fields.other_amount_payable"),
        total: job.job_totals.totals.custPayable.other_customer_amount
@@ -158,11 +160,32 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
        total: job.job_totals.totals.custPayable.dep_taxes
      },
-      {
+      ...(bodyshop.intellipay_config?.enable_cash_discount
-        key: t("jobs.labels.total_cust_payable"),
+        ? [
-        total: job.job_totals.totals.custPayable.total,
+            {
-        bold: true
+              key: t("jobs.labels.total_cust_payable_cash_discount"),
-      },
+              total: job.job_totals.totals.custPayable.total,
              bold: true
            },
            {
              key: t("jobs.labels.total_cust_payable"),
              total: Dinero(job.job_totals.totals.custPayable.total)
                .add(
                  Dinero(job.job_totals.totals.custPayable.total).percentage(
                    bodyshop.intellipay_config?.cash_discount_percentage || 0
                  )
                )
                .toJSON(),
              bold: true
            }
          ]
        : [
            {
              key: t("jobs.labels.total_cust_payable"),
              total: job.job_totals.totals.custPayable.total,
              bold: true
            }
          ]),
      {
        key: t("jobs.labels.net_repairs"),
        total: job.job_totals.totals.net_repairs,
--- a/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
+++ b/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
@@ -5,6 +5,7 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import FormItemEmail from "../form-items-formatted/email-form-item.component";
 import FormItemPhone, { PhoneItemFormatterValidation } from "../form-items-formatted/phone-form-item.component";
@@ -12,7 +13,6 @@ import Car from "../job-damage-visual/job-damage-visual.component";
 import JobsDetailChangeEstimator from "../jobs-detail-change-estimator/jobs-detail-change-estimator.component";
 import JobsDetailChangeFileHandler from "../jobs-detail-change-filehandler/jobs-detail-change-filehandler.component";
 import FormRow from "../layout-form-row/layout-form-row.component";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
 const mapStateToProps = createStructuredSelector({
  jobRO: selectJobReadOnly,
@@ -185,6 +185,9 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
            <Form.Item label={t("jobs.fields.towin")} name="towin" valuePropName="checked">
              <Switch disabled={jobRO} />
            </Form.Item>
            <Form.Item label={t("jobs.fields.tlos_ind")} name="tlos_ind" valuePropName="checked">
              <Switch disabled={jobRO} />
            </Form.Item>
          </FormRow>
        </Col>
        <Col {...lossColDamage}>
--- a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
+++ b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
@@ -1,6 +1,5 @@
 import { Button, Col, Form, Input, Row, Select, Space, Switch, Typography } from "antd";
 import axios from "axios";
 import dayjs from "../../utils/day";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -8,13 +7,14 @@ import { createStructuredSelector } from "reselect";
 import { calculateScheduleLoad } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { DateFormatter } from "../../utils/DateFormatter";
 import dayjs from "../../utils/day";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
 import EmailInput from "../form-items-formatted/email-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import ScheduleDayViewContainer from "../schedule-day-view/schedule-day-view.container";
 import ScheduleExistingAppointmentsList from "../schedule-existing-appointments-list/schedule-existing-appointments-list.component";
 import "./schedule-job-modal.scss";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -84,7 +84,7 @@ export function ScheduleJobModalComponent({
              }
            ]}
          >
-            <DateTimePicker onBlur={handleDateBlur} onlyFuture />
+            <DateTimePicker onBlur={handleDateBlur} onlyFuture isSeparatedTime />
          </Form.Item>
          <Form.Item
            name="scheduled_completion"
--- a/client/src/components/shop-info/shop-info.component.jsx
+++ b/client/src/components/shop-info/shop-info.component.jsx
@@ -142,7 +142,7 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
      rome: [
        {
          key: "intellipay",
-          label: t("bodyshop.labels.intellipay"),
+          label: InstanceRenderManager({ rome: t("bodyshop.labels.romepay"), imex: t("bodyshop.labels.imexpay") }),
          children: <ShopInfoIntellipay form={form} />
        }
      ],
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -676,7 +676,7 @@ export function ShopInfoGeneral({ form, bodyshop }) {
                          }
                        ]}
                      >
-                        <Input.TextArea rows={3} />
+                        <Input.TextArea autoSize />
                      </Form.Item>
                      <Space wrap>
                        <DeleteFilled
@@ -737,7 +737,7 @@ export function ShopInfoGeneral({ form, bodyshop }) {
                          }
                        ]}
                      >
-                        <Input.TextArea rows={3} />
+                        <Input.TextArea autoSize />
                      </Form.Item>
                      <Space wrap>
                        <DeleteFilled
@@ -1187,7 +1187,7 @@ export function ShopInfoGeneral({ form, bodyshop }) {
                        key={`${index}line_desc`}
                        name={[field.name, "line_desc"]}
                      >
-                        <Input />
+                        <Input.TextArea autoSize />
                      </Form.Item>
                      <Form.Item
                        label={t("joblines.fields.mod_lbr_ty")}
@@ -1330,7 +1330,7 @@ export function ShopInfoGeneral({ form, bodyshop }) {
                          }
                        ]}
                      >
-                        <Input />
+                        <Input.TextArea autoSize />
                      </Form.Item>
                      <Space wrap>
--- a/client/src/components/shop-info/shop-intellipay-config.component.jsx
+++ b/client/src/components/shop-info/shop-intellipay-config.component.jsx
@@ -39,14 +39,13 @@ export function ShopInfoIntellipay({ bodyshop, form }) {
        </Form.Item>
        <Form.Item
          label={t("bodyshop.fields.intellipay_config.cash_discount_percentage")}
          valuePropName="checked"
          dependencies={[["intellipay_config", "enable_cash_discount"]]}
          name={["intellipay_config", "cash_discount_percentage"]}
          rules={[
            ({ getFieldsValue }) => ({ required: form.getFieldValue(["intellipay_config", "enable_cash_discount"]) })
          ]}
        >
-          <InputNumber min={0} max={100} precision={1} suffix='%'/>
+          <InputNumber min={0} max={100} precision={1} suffix="%" />
        </Form.Item>
      </LayoutFormRow>
    </>
--- a/client/src/firebase/firebase.utils.js
+++ b/client/src/firebase/firebase.utils.js
@@ -81,14 +81,14 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
    user: (state.user && state.user.currentUser && state.user.currentUser.email) || null,
    ...additionalParams
  };
-  axios.post("/ioevent", {
+  // axios.post("/ioevent", {
-    useremail: (state.user && state.user.currentUser && state.user.currentUser.email) || null,
+  //   useremail: (state.user && state.user.currentUser && state.user.currentUser.email) || null,
-    bodyshopid: (state.user && state.user.bodyshop && state.user.bodyshop.id) || null,
+  //   bodyshopid: (state.user && state.user.bodyshop && state.user.bodyshop.id) || null,
-    operationName: eventName,
+  //   operationName: eventName,
-    variables: additionalParams,
+  //   variables: additionalParams,
-    dbevent: false,
+  //   dbevent: false,
-    env: `master-AIO|${import.meta.env.VITE_APP_GIT_SHA_DATE}`
+  //   env: `master-AIO|${import.meta.env.VITE_APP_GIT_SHA_DATE}`
-  });
+  // });
  // console.log(
  //   "%c[Analytics]",
  //   "background-color: green ;font-weight:bold;",
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -692,6 +692,7 @@ export const GET_JOB_BY_PK = gql`
      tax_str_rt
      tax_sub_rt
      tax_tow_rt
      tlos_ind
      towin
      towing_payable
      unit_number
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
--- a/docker-build.ps1
+++ b/docker-build.ps1
@@ -0,0 +1,14 @@
 # Stop and remove all containers, images, and networks from the Compose file
 docker compose down --rmi all
 # Prune all unused Docker objects including volumes
 docker system prune --all --volumes --force
 # Prune unused build cache
 docker builder prune --all --force
 # Prune all unused volumes
 docker volume prune --all --force
 # Rebuild and start the containers
 docker compose up --build
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -0,0 +1,16 @@
 #!/bin/bash
 # Stop and remove all containers, images, and networks from the Compose file
 docker compose down --rmi all
 # Prune all unused Docker objects including volumes
 docker system prune --all --volumes --force
 # Prune unused build cache
 docker builder prune --all --force
 # Prune all unused volumes
 docker volume prune --all --force
 # Rebuild and start the containers
 docker compose up --build
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -114,8 +114,8 @@ services:
      "
        aws --endpoint-url=http://localstack:4566 ses verify-domain-identity --domain imex.online --region ca-central-1
        aws --endpoint-url=http://localstack:4566 ses verify-email-identity --email-address noreply@imex.online --region ca-central-1
-        aws --endpoint-url=http://localstack:4566 secretsmanager create-secret --name CHATTER_PRIVATE_KEY --secret-string file:///tmp/certs/id_rsa
+        aws --endpoint-url=http://localstack:4566 secretsmanager create-secret --name CHATTER_PRIVATE_KEY --secret-string file:///tmp/certs/io-ftp-test.key
-        aws --endpoint-url=http://localstack:4566 logs create-log-group --log-group-name development --region ca-central-1     
+        aws --endpoint-url=http://localstack:4566 logs create-log-group --log-group-name development --region ca-central-1
        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket imex-large-log --create-bucket-configuration LocationConstraint=ca-central-1
      "
  # Node App: The Main IMEX API
@@ -169,7 +169,7 @@ services:
 #      - redis-insight-data:/db
 # ##Optional Container for SFTP/SSH Server for testing
-#   ssh-sftp-server:
+#   ssh-sftp-server: 
 #     image: atmoz/sftp:alpine  # Using an image with SFTP support
 #     container_name: ssh-sftp-server
 #     hostname: ssh-sftp-server
@@ -178,9 +178,10 @@ services:
 #     ports:
 #       - "2222:22"  # Expose port 22 for SSH/SFTP (mapped to 2222 on the host)
 #     volumes:
-#       - ./certs/id_rsa.pub:/home/user/.ssh/keys/id_rsa.pub:ro  # Mount the SSH public key
+#       - ./certs/io-ftp-test.key.pub:/home/user/.ssh/keys/io-ftp-test.key.pub:ro  # Mount the SSH public key as authorized_keys
 #       - ./upload:/home/user/upload  # Mount a local directory for SFTP uploads
 #     environment:
 #       # - SFTP_USERS=user::1000::upload
 #       - SFTP_USERS=user:password:1000::upload
 #     command: >
 #       /bin/sh -c "
--- a/hasura/metadata/cron_triggers.yaml
+++ b/hasura/metadata/cron_triggers.yaml
@@ -6,6 +6,15 @@
  headers:
    - name: x-imex-auth
      value_from_env: DATAPUMP_AUTH
 - name: Chatter Data Pump
  webhook: '{{HASURA_API_URL}}/data/chatter'
  schedule: 45 5 * * *
  include_in_metadata: true
  payload: {}
  headers:
    - name: x-imex-auth
      value_from_env: DATAPUMP_AUTH
  comment: ""
 - name: Claimscorp Data Pump
  webhook: '{{HASURA_API_URL}}/data/cc'
  schedule: 30 6 * * *
--- a/hasura/migrations/1731471670370_run_sql_migration/down.sql
+++ b/hasura/migrations/1731471670370_run_sql_migration/down.sql
@@ -0,0 +1,10 @@
 -- Could not auto-generate a down migration.
 -- Please write an appropriate down migration for the SQL below:
 -- CREATE INDEX jobs_search_gin_ro_number ON jobs USING GIN ((ro_number) gin_trgm_ops);
 --   CREATE INDEX jobs_search_gin_ownrfn ON jobs USING GIN ((ownr_fn) gin_trgm_ops);
 --   CREATE INDEX jobs_search_gin_clm_no ON jobs USING GIN ((clm_no) gin_trgm_ops);
 --   CREATE INDEX jobs_search_gin_plate_no ON jobs USING GIN ((plate_no) gin_trgm_ops);
 --   CREATE INDEX jobs_search_gin_v_make_desc ON jobs USING GIN (( v_make_desc) gin_trgm_ops);
 --   CREATE INDEX jobs_search_gin_v_model_desc ON jobs USING GIN (( v_model_desc) gin_trgm_ops);
 --   CREATE INDEX jobs_search_gin_ownr_ln ON jobs USING GIN (( ownr_ln) gin_trgm_ops);
 --   CREATE INDEX jobs_search_gin_ownr_co_nm ON jobs USING GIN (( ownr_co_nm) gin_trgm_ops);
--- a/hasura/migrations/1731471670370_run_sql_migration/up.sql
+++ b/hasura/migrations/1731471670370_run_sql_migration/up.sql
@@ -0,0 +1,8 @@
 CREATE INDEX jobs_search_gin_ro_number ON jobs USING GIN ((ro_number) gin_trgm_ops);
  CREATE INDEX jobs_search_gin_ownrfn ON jobs USING GIN ((ownr_fn) gin_trgm_ops);
  CREATE INDEX jobs_search_gin_clm_no ON jobs USING GIN ((clm_no) gin_trgm_ops);
  CREATE INDEX jobs_search_gin_plate_no ON jobs USING GIN ((plate_no) gin_trgm_ops);
  CREATE INDEX jobs_search_gin_v_make_desc ON jobs USING GIN (( v_make_desc) gin_trgm_ops);
  CREATE INDEX jobs_search_gin_v_model_desc ON jobs USING GIN (( v_model_desc) gin_trgm_ops);
  CREATE INDEX jobs_search_gin_ownr_ln ON jobs USING GIN (( ownr_ln) gin_trgm_ops);
  CREATE INDEX jobs_search_gin_ownr_co_nm ON jobs USING GIN (( ownr_co_nm) gin_trgm_ops);
--- a/package-lock.json
+++ b/package-lock.json
@@ -54,7 +54,7 @@
        "soap": "^1.1.5",
        "socket.io": "^4.8.0",
        "socket.io-adapter": "^2.5.5",
-        "ssh2-sftp-client": "^10.0.3",
+        "ssh2-sftp-client": "^11.0.0",
        "twilio": "^4.23.0",
        "uuid": "^10.0.0",
        "winston": "^3.15.0",
@@ -8740,16 +8740,17 @@
      }
    },
    "node_modules/ssh2-sftp-client": {
-      "version": "10.0.3",
+      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/ssh2-sftp-client/-/ssh2-sftp-client-10.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/ssh2-sftp-client/-/ssh2-sftp-client-11.0.0.tgz",
-      "integrity": "sha512-Wlhasz/OCgrlqC8IlBZhF19Uw/X/dHI8ug4sFQybPE+0sDztvgvDf7Om6o7LbRLe68E7XkFZf3qMnqAvqn1vkQ==",
+      "integrity": "sha512-lOjgNYtioYquhtgyHwPryFNhllkuENjvCKkUXo18w/Q4UpEffCnEUBfiOTlwFdKIhG1rhrOGnA6DeKPSF2CP6w==",
      "license": "Apache-2.0",
      "dependencies": {
        "concat-stream": "^2.0.0",
        "promise-retry": "^2.0.1",
        "ssh2": "^1.15.0"
      },
      "engines": {
-        "node": ">=16.20.2"
+        "node": ">=18.20.4"
      },
      "funding": {
        "type": "individual",
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
    "soap": "^1.1.5",
    "socket.io": "^4.8.0",
    "socket.io-adapter": "^2.5.5",
-    "ssh2-sftp-client": "^10.0.3",
+    "ssh2-sftp-client": "^11.0.0",
    "twilio": "^4.23.0",
    "uuid": "^10.0.0",
    "winston": "^3.15.0",
--- a/server/accounting/qbo/qbo-payments.js
+++ b/server/accounting/qbo/qbo-payments.js
@@ -219,6 +219,11 @@ async function InsertPayment(oauthClient, qbo_realmId, req, payment, parentRef,
    PaymentMethodRef: {
      value: paymentMethods[payment.type]
    },
    PrivateNote: payment.memo
      ? payment.memo.length > 4000
        ? payment.memo.substring(0, 4000).trim()
        : payment.memo.trim()
      : "",
    PaymentRefNum: payment.transactionid,
    ...(invoices && invoices.length === 1 && invoices[0]
      ? {
--- a/server/data/autohouse.js
+++ b/server/data/autohouse.js
@@ -25,7 +25,9 @@ const ftpSetup = {
  port: process.env.AUTOHOUSE_PORT,
  username: process.env.AUTOHOUSE_USER,
  password: process.env.AUTOHOUSE_PASSWORD,
-  debug: (message, ...data) => logger.log(message, "DEBUG", "api", null, data),
+  debug: process.env.NODE_ENV !== "production" 
    ? (message, ...data) => logger.log(message, "DEBUG", "api", null, data)
    : () => {},
  algorithms: {
    serverHostKey: ["ssh-rsa", "ssh-dss", "rsa-sha2-256", "rsa-sha2-512", "ecdsa-sha2-nistp256", "ecdsa-sha2-nistp384"]
  }
@@ -47,7 +49,11 @@ exports.default = async (req, res) => {
  }
  // Send immediate response and continue processing.
-  res.status(200).send();
+  res.status(202).json({
    success: true,
    message: "Processing request ...",
    timestamp: new Date().toISOString()
  });
  try {
    logger.log("autohouse-start", "DEBUG", "api", null, null);
@@ -146,7 +152,7 @@ async function processBatch(batch, start, end) {
      allErrors.push({
        bodyshopid: bodyshop.id,
        imexshopid: bodyshop.imexshopid,
-        autuhouseid: bodyshop.autuhouseid,
+        autohouseid: bodyshop.autohouseid,
        fatal: true,
        errors: [error.toString()]
      });
@@ -154,7 +160,7 @@ async function processBatch(batch, start, end) {
      allErrors.push({
        bodyshopid: bodyshop.id,
        imexshopid: bodyshop.imexshopid,
-        autuhouseid: bodyshop.autuhouseid,
+        autohouseid: bodyshop.autohouseid,
        errors: erroredJobs.map((ej) => ({
          ro_number: ej.job?.ro_number,
          jobid: ej.job?.id,
@@ -176,9 +182,8 @@ async function uploadViaSFTP(allxmlsToUpload) {
    for (const xmlObj of allxmlsToUpload) {
      try {
        logger.log("autohouse-sftp-upload", "DEBUG", "api", null, { filename: xmlObj.filename });
        xmlObj.result = await sftp.put(Buffer.from(xmlObj.xml), `${xmlObj.filename}`);
-        logger.log("autohouse-sftp-upload-result", "DEBUG", "api", null, {
+        logger.log("autohouse-sftp-upload", "DEBUG", "api", null, {
          filename: xmlObj.filename,
          result: xmlObj.result
        });
@@ -609,10 +614,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
    };
    return ret;
  } catch (error) {
-    logger.log("autohouse-job-calculate-error", "ERROR", "api", null, {
+    logger.log("autohouse-job-calculate-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
      error
    });
    errorCallback({ jobid: job.id, ro_number: job.ro_number, error });
  }
 };
--- a/server/data/chatter.js
+++ b/server/data/chatter.js
@@ -17,15 +17,15 @@ const ftpSetup = {
  port: process.env.CHATTER_PORT,
  username: process.env.CHATTER_USER,
  privateKey: null,
-  debug: (message, ...data) => logger.log(message, "DEBUG", "api", null, data),
+  debug:
    process.env.NODE_ENV !== "production"
      ? (message, ...data) => logger.log(message, "DEBUG", "api", null, data)
      : () => {},
  algorithms: {
    serverHostKey: ["ssh-rsa", "ssh-dss", "rsa-sha2-256", "rsa-sha2-512", "ecdsa-sha2-nistp256", "ecdsa-sha2-nistp384"]
  }
 };
 const allcsvsToUpload = [];
 const allErrors = [];
 exports.default = async (req, res) => {
  // Only process if in production environment.
  if (process.env.NODE_ENV !== "production") {
@@ -39,16 +39,21 @@ exports.default = async (req, res) => {
  }
  // Send immediate response and continue processing.
-  res.status(200).send();
+  res.status(202).json({
    success: true,
    message: "Processing request ...",
    timestamp: new Date().toISOString()
  });
  try {
    logger.log("chatter-start", "DEBUG", "api", null, null);
    const allChatterObjects = [];
    const allErrors = [];
    const { bodyshops } = await client.request(queries.GET_CHATTER_SHOPS); //Query for the List of Bodyshop Clients.
    const specificShopIds = req.body.bodyshopIds; // ['uuid];
    const { start, end, skipUpload } = req.body; //YYYY-MM-DD
    const batchSize = 10;
    const shopsToProcess =
      specificShopIds?.length > 0 ? bodyshops.filter((shop) => specificShopIds.includes(shop.id)) : bodyshops;
    logger.log("chatter-shopsToProcess-generated", "DEBUG", "api", null, null);
@@ -58,29 +63,24 @@ exports.default = async (req, res) => {
      return;
    }
-    const batchPromises = [];
+    await processBatch(shopsToProcess, start, end, allChatterObjects, allErrors);
-    for (let i = 0; i < shopsToProcess.length; i += batchSize) {
+
-      const batch = shopsToProcess.slice(i, i + batchSize);
+    const csvToUpload = {
-      const batchPromise = (async () => {
+      count: allChatterObjects.length,
-        await processBatch(batch, start, end);
+      csv: converter.json2csv(allChatterObjects, { emptyFieldValue: "" }),
-        if (skipUpload) {
+      filename: `IMEX_ONLINE_solicitation_${moment().format("YYYYMMDD")}.csv`
-          for (const csvObj of allcsvsToUpload) {
+    };
-            await fs.promises.writeFile(`./logs/${csvObj.filename}`, csvObj.csv);
+
-          }
+    if (skipUpload) {
-        } else {
+      await fs.promises.writeFile(`./logs/${csvToUpload.filename}`, csvToUpload.csv);
-          await uploadViaSFTP(allcsvsToUpload);
+    } else {
-        }
+      await uploadViaSFTP(csvToUpload);
      })();
      batchPromises.push(batchPromise);
    }
-    await Promise.all(batchPromises);
+
    await sendServerEmail({
      subject: `Chatter Report ${moment().format("MM-DD-YY")}`,
-      text: `Errors:\n${JSON.stringify(allErrors, null, 2)}\n\nUploaded:\n${JSON.stringify(
+      text: `Errors:\n${JSON.stringify(allErrors, null, 2)}\n\n
-        allcsvsToUpload.map((x) => ({ filename: x.filename, count: x.count, result: x.result })),
+      Uploaded:\n${JSON.stringify({ filename: csvToUpload.filename, count: csvToUpload.count, result: csvToUpload.result }, null, 2)}`
        null,
        2
      )}`
    });
    logger.log("chatter-end", "DEBUG", "api", null, null);
@@ -89,8 +89,8 @@ exports.default = async (req, res) => {
  }
 };
-async function processBatch(batch, start, end) {
+async function processBatch(shopsToProcess, start, end, allChatterObjects, allErrors) {
-  for (const bodyshop of batch) {
+  for (const bodyshop of shopsToProcess) {
    try {
      logger.log("chatter-start-shop-extract", "DEBUG", "api", bodyshop.id, {
        shopname: bodyshop.shopname
@@ -109,18 +109,11 @@ async function processBatch(batch, start, end) {
          lastname: j.ownr_co_nm ? j.ownr_co_nm : j.ownr_ln,
          transaction_id: j.ro_number,
          email: j.ownr_ea,
-          phone_number: j.ownr_ph1
+          phone_number: j.ownr_ph1,
          transaction_time: (j.actual_delivery && moment(j.actual_delivery).tz(bodyshop.timezone).format("YYYYMMDD-HHmm")) || ""
        };
      });
-
+      allChatterObjects.push(...chatterObject);
      const ret = converter.json2csv(chatterObject, { emptyFieldValue: "" });
      allcsvsToUpload.push({
        count: chatterObject.length,
        csv: ret,
        filename: `${bodyshop.shopname}_solicitation_${moment().format("YYYYMMDD")}.csv`
      });
      logger.log("chatter-end-shop-extract", "DEBUG", "api", bodyshop.id, {
        shopname: bodyshop.shopname
      });
@@ -162,7 +155,7 @@ async function getPrivateKey() {
  }
 }
-async function uploadViaSFTP(allcsvsToUpload) {
+async function uploadViaSFTP(csvToUpload) {
  const sftp = new Client();
  sftp.on("error", (errors) =>
    logger.log("chatter-sftp-connection-error", "ERROR", "api", null, { error: errors.message, stack: errors.stack })
@@ -174,22 +167,19 @@ async function uploadViaSFTP(allcsvsToUpload) {
    //Connect to the FTP and upload all.
    await sftp.connect({ ...ftpSetup, privateKey });
-    for (const csvObj of allcsvsToUpload) {
+    try {
-      try {
+      csvToUpload.result = await sftp.put(Buffer.from(csvToUpload.csv), `${csvToUpload.filename}`);
-        logger.log("chatter-sftp-upload", "DEBUG", "api", null, { filename: csvObj.filename });
+      logger.log("chatter-sftp-upload", "DEBUG", "api", null, {
-        csvObj.result = await sftp.put(Buffer.from(csvObj.csv), `${csvObj.filename}`);
+        filename: csvToUpload.filename,
-        logger.log("chatter-sftp-upload-result", "DEBUG", "api", null, {
+        result: csvToUpload.result
-          filename: csvObj.filename,
+      });
-          result: csvObj.result
+    } catch (error) {
-        });
+      logger.log("chatter-sftp-upload-error", "ERROR", "api", null, {
-      } catch (error) {
+        filename: csvToUpload.filename,
-        logger.log("chatter-sftp-upload-error", "ERROR", "api", null, {
+        error: csvToUpload.message,
-          filename: csvObj.filename,
+        stack: csvToUpload.stack
-          error: error.message,
+      });
-          stack: error.stack
+      throw error;
        });
        throw error;
      }
    }
  } catch (error) {
    logger.log("chatter-sftp-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
--- a/server/data/claimscorp.js
+++ b/server/data/claimscorp.js
@@ -24,176 +24,188 @@ const ftpSetup = {
  port: process.env.CLAIMSCORP_PORT,
  username: process.env.CLAIMSCORP_USER,
  password: process.env.CLAIMSCORP_PASSWORD,
-  debug: (message, ...data) => logger.log(message, "DEBUG", "api", null, data),
+  debug: process.env.NODE_ENV !== "production" 
    ? (message, ...data) => logger.log(message, "DEBUG", "api", null, data)
    : () => {},
  algorithms: {
-    serverHostKey: ["ssh-rsa", "ssh-dss"]
+    serverHostKey: ["ssh-rsa", "ssh-dss", "rsa-sha2-256", "rsa-sha2-512", "ecdsa-sha2-nistp256", "ecdsa-sha2-nistp384"]
  }
 };
 const allxmlsToUpload = [];
 const allErrors = [];
 exports.default = async (req, res) => {
  // Only process if in production environment.
  if (process.env.NODE_ENV !== "production") {
    res.sendStatus(403);
    return;
  }
-
+  // Only process if the appropriate token is provided.
  //Query for the List of Bodyshop Clients.
  logger.log("claimscorp-start", "DEBUG", "api", null, null);
  const { bodyshops } = await client.request(queries.GET_CLAIMSCORP_SHOPS);
  const specificShopIds = req.body.bodyshopIds; // ['uuid]
  const { start, end, skipUpload } = req.body; //YYYY-MM-DD
  if (req.headers["x-imex-auth"] !== process.env.AUTOHOUSE_AUTH_TOKEN) {
    res.sendStatus(401);
    return;
  }
-  const allxmlsToUpload = [];
+
-  const allErrors = [];
+  // Send immediate response and continue processing.
  res.status(202).json({
    success: true,
    message: "Processing request ...",
    timestamp: new Date().toISOString()
  });
  try {
-    for (const bodyshop of specificShopIds ? bodyshops.filter((b) => specificShopIds.includes(b.id)) : bodyshops) {
+    logger.log("claimscorp-start", "DEBUG", "api", null, null);
    const { bodyshops } = await client.request(queries.GET_CLAIMSCORP_SHOPS); //Query for the List of Bodyshop Clients.
    const specificShopIds = req.body.bodyshopIds; // ['uuid];
    const { start, end, skipUpload } = req.body; //YYYY-MM-DD
    const batchSize = 10;
    const shopsToProcess =
      specificShopIds?.length > 0 ? bodyshops.filter((shop) => specificShopIds.includes(shop.id)) : bodyshops;
    logger.log("claimscorp-shopsToProcess-generated", "DEBUG", "api", null, null);
    if (shopsToProcess.length === 0) {
      logger.log("claimscorp-shopsToProcess-empty", "DEBUG", "api", null, null);
      return;
    }
    const batchPromises = [];
    for (let i = 0; i < shopsToProcess.length; i += batchSize) {
      const batch = shopsToProcess.slice(i, i + batchSize);
      const batchPromise = (async () => {
        await processBatch(batch, start, end);
        if (skipUpload) {
          for (const xmlObj of allxmlsToUpload) {
            fs.writeFileSync(`./logs/${xmlObj.filename}`, xmlObj.xml);
          }
        } else {
          await uploadViaSFTP(allxmlsToUpload);
        }
      })();
      batchPromises.push(batchPromise);
    }
    await Promise.all(batchPromises);
    await sendServerEmail({
      subject: `ClaimsCorp Report ${moment().format("MM-DD-YY")}`,
      text: `Errors:\n${JSON.stringify(allErrors, null, 2)}\n\nUploaded:\n${JSON.stringify(
        allxmlsToUpload.map((x) => ({ filename: x.filename, count: x.count, result: x.result })),
        null,
        2
      )}`
    });
    logger.log("claimscorp-end", "DEBUG", "api", null, null);
  } catch (error) {
    logger.log("claimscorp-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
  }
 };
 async function processBatch(batch, start, end) {
  for (const bodyshop of batch) {
    const erroredJobs = [];
    try {
      logger.log("claimscorp-start-shop-extract", "DEBUG", "api", bodyshop.id, {
        shopname: bodyshop.shopname
      });
      const erroredJobs = [];
      try {
        const { jobs, bodyshops_by_pk } = await client.request(queries.CLAIMSCORP_QUERY, {
          bodyshopid: bodyshop.id,
          start: start ? moment(start).startOf("day") : moment().subtract(5, "days").startOf("day"),
          ...(end && { end: moment(end).endOf("day") })
        });
-        const claimsCorpObject = {
+      const { jobs, bodyshops_by_pk } = await client.request(queries.CLAIMSCORP_QUERY, {
-          DataFeed: {
+        bodyshopid: bodyshop.id,
-            ShopInfo: {
+        start: start ? moment(start).startOf("day") : moment().subtract(5, "days").startOf("day"),
-              ShopID: bodyshops_by_pk.claimscorpid,
+        ...(end && { end: moment(end).endOf("day") })
              ShopName: bodyshops_by_pk.shopname,
              RO: jobs.map((j) =>
                CreateRepairOrderTag({ ...j, bodyshop: bodyshops_by_pk }, function ({ job, error }) {
                  erroredJobs.push({ job: job, error: error.toString() });
                })
              )
            }
          }
        };
        if (erroredJobs.length > 0) {
          logger.log("claimscorp-failed-jobs", "ERROR", "api", bodyshop.id, {
            count: erroredJobs.length,
            jobs: JSON.stringify(erroredJobs.map((j) => j.job.ro_number))
          });
        }
        var ret = builder
          .create(
            {
              // version: "1.0",
              // encoding: "UTF-8",
              //keepNullNodes: true,
            },
            claimsCorpObject
          )
          .end({ allowEmptyTags: true });
        allxmlsToUpload.push({
          count: claimsCorpObject.DataFeed.ShopInfo.RO.length,
          xml: ret,
          filename: `${bodyshop.claimscorpid}-${moment().format("YYYYMMDDTHHMMss")}.xml`
        });
        logger.log("claimscorp-end-shop-extract", "DEBUG", "api", bodyshop.id, {
          shopname: bodyshop.shopname
        });
      } catch (error) {
        //Error at the shop level.
        logger.log("claimscorp-error-shop", "ERROR", "api", bodyshop.id, {
          ...error
        });
        allErrors.push({
          bodyshopid: bodyshop.id,
          imexshopid: bodyshop.imexshopid,
          claimscorpid: bodyshop.claimscorpid,
          fatal: true,
          errors: [error.toString()]
        });
      } finally {
        allErrors.push({
          bodyshopid: bodyshop.id,
          imexshopid: bodyshop.imexshopid,
          claimscorpid: bodyshop.claimscorpid,
          errors: erroredJobs.map((ej) => ({
            ro_number: ej.job?.ro_number,
            jobid: ej.job?.id,
            error: ej.error
          }))
        });
      }
    }
    if (skipUpload) {
      for (const xmlObj of allxmlsToUpload) {
        fs.writeFileSync(`./logs/${xmlObj.filename}`, xmlObj.xml);
      }
      res.json(allxmlsToUpload);
      sendServerEmail({
        subject: `ClaimsCorp Report ${moment().format("MM-DD-YY")}`,
        text: `Errors: ${allErrors.map((e) => JSON.stringify(e, null, 2))}
      Uploaded: ${JSON.stringify(
        allxmlsToUpload.map((x) => ({ filename: x.filename, count: x.count })),
        null,
        2
      )}
      `
      });
      return;
    }
-    let sftp = new Client();
+      const claimsCorpObject = {
-    sftp.on("error", (errors) =>
+        DataFeed: {
-      logger.log("claimscorp-sftp-error", "ERROR", "api", null, {
+          ShopInfo: {
-        ...errors
+            ShopID: bodyshops_by_pk.claimscorpid,
-      })
+            ShopName: bodyshops_by_pk.shopname,
-    );
+            RO: jobs.map((j) =>
-    try {
+              CreateRepairOrderTag({ ...j, bodyshop: bodyshops_by_pk }, function ({ job, error }) {
-      //Connect to the FTP and upload all.
+                erroredJobs.push({ job: job, error: error.toString() });
              })
            )
          }
        }
      };
-      await sftp.connect(ftpSetup);
+      if (erroredJobs.length > 0) {
-
+        logger.log("claimscorp-failed-jobs", "ERROR", "api", bodyshop.id, {
-      for (const xmlObj of allxmlsToUpload) {
+          count: erroredJobs.length,
-        logger.log("claimscorp-sftp-upload", "DEBUG", "api", null, {
+          jobs: JSON.stringify(erroredJobs.map((j) => j.job.ro_number))
          filename: xmlObj.filename
        });
        const uploadResult = await sftp.put(Buffer.from(xmlObj.xml), `/${xmlObj.filename}`);
        logger.log("claimscorp-sftp-upload-result", "DEBUG", "api", null, {
          uploadResult
        });
      }
-      //***TODO  Change filing naming when creating the cron job. IM_ShopInternalName_DDMMYYYY_HHMMSS.xml
+      const ret = builder.create({}, claimsCorpObject).end({ allowEmptyTags: true });
      allxmlsToUpload.push({
        count: claimsCorpObject.DataFeed.ShopInfo.RO.length,
        xml: ret,
        filename: `${bodyshop.claimscorpid}-${moment().format("YYYYMMDDTHHMMss")}.xml`
      });
      logger.log("claimscorp-end-shop-extract", "DEBUG", "api", bodyshop.id, {
        shopname: bodyshop.shopname
      });
    } catch (error) {
-      logger.log("claimscorp-sftp-error", "ERROR", "api", null, {
+      //Error at the shop level.
-        ...error
+      logger.log("claimscorp-error-shop", "ERROR", "api", bodyshop.id, { error: error.message, stack: error.stack });
      allErrors.push({
        bodyshopid: bodyshop.id,
        imexshopid: bodyshop.imexshopid,
        claimscorpid: bodyshop.claimscorpid,
        fatal: true,
        errors: [error.toString()]
      });
    } finally {
-      sftp.end();
+      allErrors.push({
        bodyshopid: bodyshop.id,
        imexshopid: bodyshop.imexshopid,
        claimscorpid: bodyshop.claimscorpid,
        errors: erroredJobs.map((ej) => ({
          ro_number: ej.job?.ro_number,
          jobid: ej.job?.id,
          error: ej.error
        }))
      });
    }
    sendServerEmail({
      subject: `ClaimsCorp Report ${moment().format("MM-DD-YY")}`,
      text: `Errors: ${allErrors.map((e) => JSON.stringify(e, null, 2))}
      Uploaded: ${JSON.stringify(
        allxmlsToUpload.map((x) => ({ filename: x.filename, count: x.count })),
        null,
        2
      )}
      `
    });
    res.sendStatus(200);
  } catch (error) {
    res.status(200).json(error);
  }
-};
+}
 async function uploadViaSFTP(allxmlsToUpload) {
  const sftp = new Client();
  sftp.on("error", (errors) =>
    logger.log("claimscorp-sftp-connection-error", "ERROR", "api", null, { error: errors.message, stack: errors.stack })
  );
  try {
    //Connect to the FTP and upload all.
    await sftp.connect(ftpSetup);
    for (const xmlObj of allxmlsToUpload) {
      try {
        xmlObj.result = await sftp.put(Buffer.from(xmlObj.xml), `${xmlObj.filename}`);
        logger.log("claimscorp-sftp-upload", "DEBUG", "api", null, {
          filename: xmlObj.filename,
          result: xmlObj.result
        });
      } catch (error) {
        logger.log("claimscorp-sftp-upload-error", "ERROR", "api", null, {
          filename: xmlObj.filename,
          error: error.message,
          stack: error.stack
        });
        throw error;
      }
    }
  } catch (error) {
    logger.log("claimscorp-sftp-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
    throw error;
  } finally {
    sftp.end();
  }
 }
 const CreateRepairOrderTag = (job, errorCallback) => {
  //Level 2
@@ -445,10 +457,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
    };
    return ret;
  } catch (error) {
-    logger.log("claimscorp-job-calculate-error", "ERROR", "api", null, {
+    logger.log("claimscorp-job-calculate-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
      error
    });
    errorCallback({ jobid: job.id, ro_number: job.ro_number, error });
  }
 };
--- a/server/data/kaizen.js
+++ b/server/data/kaizen.js
@@ -16,187 +16,194 @@ const { sendServerEmail } = require("../email/sendemail");
 const DineroFormat = "0,0.00";
 const DateFormat = "MM/DD/YYYY";
-const repairOpCodes = ["OP4", "OP9", "OP10"];
+const kaizenShopsIDs = ["SUMMIT", "STRATHMORE", "SUNRIDGE", "SHAW"];
 const replaceOpCodes = ["OP2", "OP5", "OP11", "OP12"];
 const ftpSetup = {
  host: process.env.KAIZEN_HOST,
  port: process.env.KAIZEN_PORT,
  username: process.env.KAIZEN_USER,
  password: process.env.KAIZEN_PASSWORD,
-  debug: (message, ...data) => logger.log(message, "DEBUG", "api", null, data),
+  debug: process.env.NODE_ENV !== "production" 
    ? (message, ...data) => logger.log(message, "DEBUG", "api", null, data)
    : () => {},
  algorithms: {
    serverHostKey: ["ssh-rsa", "ssh-dss", "rsa-sha2-256", "rsa-sha2-512", "ecdsa-sha2-nistp256", "ecdsa-sha2-nistp384"]
  }
 };
 const allxmlsToUpload = [];
 const allErrors = [];
 exports.default = async (req, res) => {
  // Only process if in production environment.
  if (process.env.NODE_ENV !== "production") {
    res.sendStatus(403);
    return;
  }
-
+  // Only process if the appropriate token is provided.
  //Query for the List of Bodyshop Clients.
  logger.log("kaizen-start", "DEBUG", "api", null, null);
  const kaizenShopsIDs = ["SUMMIT", "STRATHMORE", "SUNRIDGE", "SHAW"];
  const { bodyshops } = await client.request(queries.GET_KAIZEN_SHOPS, {
    imexshopid: kaizenShopsIDs
  });
  const specificShopIds = req.body.bodyshopIds; // ['uuid]
  const { start, end, skipUpload } = req.body; //YYYY-MM-DD
  if (req.headers["x-imex-auth"] !== process.env.AUTOHOUSE_AUTH_TOKEN) {
    res.sendStatus(401);
    return;
  }
-  const allxmlsToUpload = [];
+
-  const allErrors = [];
+  // Send immediate response and continue processing.
  res.status(202).json({
    success: true,
    message: "Processing request ...",
    timestamp: new Date().toISOString()
  });
  try {
-    for (const bodyshop of specificShopIds ? bodyshops.filter((b) => specificShopIds.includes(b.id)) : bodyshops) {
+    logger.log("kaizen-start", "DEBUG", "api", null, null);
    const { bodyshops } = await client.request(queries.GET_KAIZEN_SHOPS, { imexshopid: kaizenShopsIDs }); //Query for the List of Bodyshop Clients.
    const specificShopIds = req.body.bodyshopIds; // ['uuid];
    const { start, end, skipUpload } = req.body; //YYYY-MM-DD
    const batchSize = 10;
    const shopsToProcess =
      specificShopIds?.length > 0 ? bodyshops.filter((shop) => specificShopIds.includes(shop.id)) : bodyshops;
    logger.log("kaizen-shopsToProcess-generated", "DEBUG", "api", null, null);
    if (shopsToProcess.length === 0) {
      logger.log("kaizen-shopsToProcess-empty", "DEBUG", "api", null, null);
      return;
    }
    const batchPromises = [];
    for (let i = 0; i < shopsToProcess.length; i += batchSize) {
      const batch = shopsToProcess.slice(i, i + batchSize);
      const batchPromise = (async () => {
        await processBatch(batch, start, end);
        if (skipUpload) {
          for (const xmlObj of allxmlsToUpload) {
            fs.writeFileSync(`./logs/${xmlObj.filename}`, xmlObj.xml);
          }
        } else {
          await uploadViaSFTP(allxmlsToUpload);
        }
      })();
      batchPromises.push(batchPromise);
    }
    await Promise.all(batchPromises);
    await sendServerEmail({
      subject: `Kaizen Report ${moment().format("MM-DD-YY")}`,
      text: `Errors:\n${JSON.stringify(allErrors, null, 2)}\n\nUploaded:\n${JSON.stringify(
        allxmlsToUpload.map((x) => ({ filename: x.filename, count: x.count, result: x.result })),
        null,
        2
      )}`
    });
    logger.log("kaizen-end", "DEBUG", "api", null, null);
  } catch (error) {
    logger.log("kaizen-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
  }
 };
 async function processBatch(batch, start, end) {
  for (const bodyshop of batch) {
    const erroredJobs = [];
    try {
      logger.log("kaizen-start-shop-extract", "DEBUG", "api", bodyshop.id, {
        shopname: bodyshop.shopname
      });
      const erroredJobs = [];
      try {
        const { jobs, bodyshops_by_pk } = await client.request(queries.KAIZEN_QUERY, {
          bodyshopid: bodyshop.id,
          start: start ? moment(start).startOf("day") : moment().subtract(5, "days").startOf("day"),
          ...(end && { end: moment(end).endOf("day") })
        });
-        const kaizenObject = {
+      const { jobs, bodyshops_by_pk } = await client.request(queries.KAIZEN_QUERY, {
-          DataFeed: {
+        bodyshopid: bodyshop.id,
-            ShopInfo: {
+        start: start ? moment(start).startOf("day") : moment().subtract(5, "days").startOf("day"),
-              ShopName: bodyshops_by_pk.shopname,
+        ...(end && { end: moment(end).endOf("day") })
              Jobs: jobs.map((j) =>
                CreateRepairOrderTag({ ...j, bodyshop: bodyshops_by_pk }, function ({ job, error }) {
                  erroredJobs.push({ job: job, error: error.toString() });
                })
              )
            }
          }
        };
        if (erroredJobs.length > 0) {
          logger.log("kaizen-failed-jobs", "ERROR", "api", bodyshop.id, {
            count: erroredJobs.length,
            jobs: JSON.stringify(erroredJobs.map((j) => j.job.ro_number))
          });
        }
        var ret = builder
          .create(
            {
              // version: "1.0",
              // encoding: "UTF-8",
              //keepNullNodes: true,
            },
            kaizenObject
          )
          .end({ allowEmptyTags: true });
        allxmlsToUpload.push({
          count: kaizenObject.DataFeed.ShopInfo.Jobs.length,
          xml: ret,
          filename: `${bodyshop.shopname}-${moment().format("YYYYMMDDTHHMMss")}.xml`
        });
        logger.log("kaizen-end-shop-extract", "DEBUG", "api", bodyshop.id, {
          shopname: bodyshop.shopname
        });
      } catch (error) {
        //Error at the shop level.
        logger.log("kaizen-error-shop", "ERROR", "api", bodyshop.id, {
          ...error
        });
        allErrors.push({
          bodyshopid: bodyshop.id,
          imexshopid: bodyshop.imexshopid,
          shopname: bodyshop.shopname,
          fatal: true,
          errors: [error.toString()]
        });
      } finally {
        allErrors.push({
          bodyshopid: bodyshop.id,
          imexshopid: bodyshop.imexshopid,
          shopname: bodyshop.shopname,
          errors: erroredJobs.map((ej) => ({
            ro_number: ej.job?.ro_number,
            jobid: ej.job?.id,
            error: ej.error
          }))
        });
      }
    }
    if (skipUpload) {
      for (const xmlObj of allxmlsToUpload) {
        fs.writeFileSync(`./logs/${xmlObj.filename}`, xmlObj.xml);
      }
      res.json(allxmlsToUpload);
      sendServerEmail({
        subject: `Kaizen Report ${moment().format("MM-DD-YY")}`,
        text: `Errors: ${allErrors.map((e) => JSON.stringify(e, null, 2))}
      Uploaded: ${JSON.stringify(
        allxmlsToUpload.map((x) => ({ filename: x.filename, count: x.count })),
        null,
        2
      )}
      `
      });
      return;
    }
-    let sftp = new Client();
+      const kaizenObject = {
-    sftp.on("error", (errors) =>
+        DataFeed: {
-      logger.log("kaizen-sftp-error", "ERROR", "api", null, {
+          ShopInfo: {
-        ...errors
+            ShopName: bodyshops_by_pk.shopname,
-      })
+            Jobs: jobs.map((j) =>
-    );
+              CreateRepairOrderTag({ ...j, bodyshop: bodyshops_by_pk }, function ({ job, error }) {
-    try {
+                erroredJobs.push({ job: job, error: error.toString() });
-      //Connect to the FTP and upload all.
+              })
            )
          }
        }
      };
-      await sftp.connect(ftpSetup);
+      if (erroredJobs.length > 0) {
-
+        logger.log("kaizen-failed-jobs", "ERROR", "api", bodyshop.id, {
-      for (const xmlObj of allxmlsToUpload) {
+          count: erroredJobs.length,
-        logger.log("kaizen-sftp-upload", "DEBUG", "api", null, {
+          jobs: JSON.stringify(erroredJobs.map((j) => j.job.ro_number))
          filename: xmlObj.filename
        });
        const uploadResult = await sftp.put(Buffer.from(xmlObj.xml), `/${xmlObj.filename}`);
        logger.log("kaizen-sftp-upload-result", "DEBUG", "api", null, {
          uploadResult
        });
      }
-      //***TODO  Change filing naming when creating the cron job. IM_ShopInternalName_DDMMYYYY_HHMMSS.xml
+      const ret = builder.create({}, kaizenObject).end({ allowEmptyTags: true });
      allxmlsToUpload.push({
        count: kaizenObject.DataFeed.ShopInfo.Jobs.length,
        xml: ret,
        filename: `${bodyshop.shopname}-${moment().format("YYYYMMDDTHHMMss")}.xml`
      });
      logger.log("kaizen-end-shop-extract", "DEBUG", "api", bodyshop.id, {
        shopname: bodyshop.shopname
      });
    } catch (error) {
-      logger.log("kaizen-sftp-error", "ERROR", "api", null, {
+      //Error at the shop level.
-        ...error
+      logger.log("kaizen-error-shop", "ERROR", "api", bodyshop.id, { error: error.message, stack: error.stack });
      allErrors.push({
        bodyshopid: bodyshop.id,
        imexshopid: bodyshop.imexshopid,
        shopname: bodyshop.shopname,
        fatal: true,
        errors: [error.toString()]
      });
    } finally {
-      sftp.end();
+      allErrors.push({
        bodyshopid: bodyshop.id,
        imexshopid: bodyshop.imexshopid,
        shopname: bodyshop.shopname,
        errors: erroredJobs.map((ej) => ({
          ro_number: ej.job?.ro_number,
          jobid: ej.job?.id,
          error: ej.error
        }))
      });
    }
    sendServerEmail({
      subject: `Kaizen Report ${moment().format("MM-DD-YY")}`,
      text: `Errors: ${allErrors.map((e) => JSON.stringify(e, null, 2))}
      Uploaded: ${JSON.stringify(
        allxmlsToUpload.map((x) => ({ filename: x.filename, count: x.count })),
        null,
        2
      )}
      `
    });
    res.sendStatus(200);
  } catch (error) {
    res.status(200).json(error);
  }
-};
+}
 async function uploadViaSFTP(allxmlsToUpload) {
  const sftp = new Client();
  sftp.on("error", (errors) =>
    logger.log("kaizen-sftp-connection-error", "ERROR", "api", null, { error: errors.message, stack: errors.stack })
  );
  try {
    //Connect to the FTP and upload all.
    await sftp.connect(ftpSetup);
    for (const xmlObj of allxmlsToUpload) {
      try {
        xmlObj.result = await sftp.put(Buffer.from(xmlObj.xml), `${xmlObj.filename}`);
        logger.log("kaizen-sftp-upload", "DEBUG", "api", null, {
          filename: xmlObj.filename,
          result: xmlObj.result
        });
      } catch (error) {
        logger.log("kaizen-sftp-upload-error", "ERROR", "api", null, {
          filename: xmlObj.filename,
          error: error.message,
          stack: error.stack
        });
        throw error;
      }
    }
  } catch (error) {
    logger.log("kaizen-sftp-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
    throw error;
  } finally {
    sftp.end();
  }
 }
 const CreateRepairOrderTag = (job, errorCallback) => {
  //Level 2
@@ -420,10 +427,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
    };
    return ret;
  } catch (error) {
-    logger.log("kaizen-job-calculate-error", "ERROR", "api", null, {
+    logger.log("kaizen-job-calculate-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
      error
    });
    errorCallback({ jobid: job.id, ro_number: job.ro_number, error });
  }
 };
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -840,6 +840,7 @@ exports.CHATTER_QUERY = `query CHATTER_EXPORT($start: timestamptz, $bodyshopid:
    timezone
  }
  jobs(where: {_and: [{converted: {_eq: true}}, {actual_delivery: {_gt: $start}}, {actual_delivery: {_lte: $end}}, {shopid: {_eq: $bodyshopid}}, {_or: [{ownr_ph1: {_is_null: false}}, {ownr_ea: {_is_null: false}}]}]}) {
    actual_delivery
    id
    created_at
    ro_number
--- a/server/utils/s3.js
+++ b/server/utils/s3.js
@@ -95,14 +95,14 @@ const createS3Client = () => {
      throw error;
    }
  };
  return {
    uploadFileToS3,
    downloadFileFromS3,
    listFilesInS3Bucket,
    deleteFileFromS3,
    copyFileInS3,
-    fileExistsInS3
+    fileExistsInS3,
    ...s3Client
  };
 };
Author	SHA1	Message	Date
Allan Carr	91de311351	IO-2921 Chatter Final mods and Cron Trigger Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-11-22 10:55:19 -08:00
Allan Carr	1a6e8bc5ba	Merge branch 'release/2024-11-22' into feature/IO-2921-CARSTAR-Canada-Chatter-Integration Signed-off-by: Allan Carr <allan.carr@thinkimex.com> # Conflicts: # server/data/chatter.js	2024-11-21 15:09:46 -08:00
Allan Carr	dd4ba8a467	IO-2921 Chatter Datapump Adjustment Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-11-21 14:40:36 -08:00
Allan Carr	80b66fd7e8	Merged in feature/IO-2921-CARSTAR-Canada-Chatter-Integration (pull request #1940 ) IO-2921 Chatter modifications as per Dave Bourbeau @ Chatter Approved-by: Dave Richer	2024-11-20 18:58:31 +00:00
Allan Carr	45ac56e0bc	IO-2921 Chatter modifications as per Dave Bourbeau @ Chatter Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-11-20 10:57:59 -08:00
Allan Carr	1ff1de8739	Merge branch 'master-AIO' into feature/IO-2921-CARSTAR-Canada-Chatter-Integration Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-11-20 10:56:02 -08:00
Allan Carr	ea1cc23ee7	Merged in feature/IO-3027-Datapumps-Refactor (pull request #1937 ) IO-3027 Turn Off SFTP Logging for Production ENV Approved-by: Dave Richer	2024-11-18 21:37:17 +00:00
Allan Carr	7cbabf8697	IO-3027 Turn Off SFTP Logging for Production ENV Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-11-18 12:02:08 -08:00
Allan Carr	289a666b6d	Merged in release/2024-11-15 (pull request #1935 ) IO-3030 Null Check memo	2024-11-18 16:48:26 +00:00
Allan Carr	b8836c7ae1	Merged in feature/IO-3030-QBO-Payment-Private-Note (pull request #1934 ) IO-3030 Null Check memo	2024-11-18 16:40:15 +00:00
Allan Carr	eca31c5618	IO-3030 Null Check memo Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-11-18 08:42:52 -08:00
Allan Carr	7fdbedefce	Merged in release/2024-11-15 (pull request #1933 ) IO-3031 Appointment Schedule View Day	2024-11-16 01:40:16 +00:00
Allan Carr	7140b8d585	Merged in feature/IO-3031-Appointment-Schedule-View-Day (pull request #1931 ) IO-3031 Appointment Schedule View Day	2024-11-16 01:33:29 +00:00
Allan Carr	5eed8d9809	IO-3031 Appointment Schedule View Day Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-11-15 17:35:49 -08:00
Dave Richer	57fe5b4c46	Merged in release/2024-11-15 (pull request #1930 ) Release/2024 11 15 into master-AIO IO-2920, IO-3027, IO-3028, IO-3029, IO-3030, IO-3031, IO-3033	2024-11-15 23:59:53 +00:00
Allan Carr	f266ee1cfe	Merged in feature/IO-3028-Word-Wrap-Line-Description (pull request #1928 ) IO-3028 Adjust to TextArea with autoSize	2024-11-15 20:54:44 +00:00
Allan Carr	9550de5131	IO-3028 Adjust to TextArea with autoSize Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-11-15 12:57:08 -08:00
Patrick Fic	1f76ff882c	Remove IO Event Logging.	2024-11-15 11:03:10 -08:00
Patrick Fic	749f73a272	Merged in feature/IO-2920-cash-discounting (pull request #1927 ) IO-2920 Update config & totals for discount.	2024-11-15 18:58:54 +00:00
Patrick Fic	9c1774c417	Merge branch 'release/2024-11-15' into feature/IO-2920-cash-discounting	2024-11-15 10:58:22 -08:00
Allan Carr	26b3a43ce5	Merge branch 'feature/IO-3027-Datapumps-Refactor' into release/2024-11-15 Signed-off-by: Allan Carr <allan.carr@thinkimex.com> # Conflicts: # .vscode/settings.json	2024-11-15 10:05:08 -08:00
Allan Carr	78678dd3dc	IO-3027 Datapumps Refactor Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-11-15 10:04:03 -08:00
Allan Carr	9dc4546b2e	Merged in feature/IO-3033-Total-Loss-Indicator (pull request #1925 ) IO-3033 Total Loss Indicator Approved-by: Dave Richer	2024-11-15 17:47:56 +00:00
Allan Carr	95aa0e45a6	IO-3033 Total Loss Indicator Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-11-14 16:47:35 -08:00
Allan Carr	ce9a77efcf	IO-3027 Datapumps Refactor Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-11-14 16:15:17 -08:00
Dave Richer	e9e1e820a7	release/2024-11-15 - Expose S3 client through createS3Client Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-11-14 11:57:40 -08:00
Allan Carr	b027a4e618	IO-3031 Adjust prop Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-11-14 11:52:47 -08:00
Allan Carr	c7fc75aa5c	Merged in feature/IO-3031-Appointment-Schedule-View-Day (pull request #1922 ) IO-3031 View Day when Scheduling Approved-by: Dave Richer	2024-11-14 19:50:34 +00:00
Allan Carr	98d2372daf	Merged in feature/IO-3030-QBO-Payment-Private-Note (pull request #1920 ) IO-3030 QBO Payment Private Note Approved-by: Dave Richer	2024-11-14 19:40:20 +00:00
Allan Carr	bf51380167	IO-3031 View Day when Scheduling Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-11-14 11:19:09 -08:00
Dave Richer	1ec827097f	Merged in feature/IO-3029-Enhanced-Logging-File-Based (pull request #1921 ) feature/IO-3029-Enhanced-Logging-File-Based: Adjust XML and JSON log to always upload	2024-11-14 18:55:57 +00:00
Allan Carr	ff7dd7d3ea	IO-3030 QBO Payment Private Note Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-11-14 10:37:08 -08:00
Dave Richer	8cc4f88fa7	Merged in feature/IO-3029-Enhanced-Logging-File-Based (pull request #1918 ) feature/IO-3029-Enhanced-Logging-File-Based: Final Enhancements	2024-11-14 16:36:13 +00:00
Dave Richer	7e6ab3a5ff	Merged in feature/IO-3029-Enhanced-Logging-File-Based (pull request #1916 ) feature/IO-3029-Enhanced-Logging-File-Based: Update Stream Key name	2024-11-14 04:14:54 +00:00
Dave Richer	34f876f838	Merged in feature/IO-3029-Enhanced-Logging-File-Based (pull request #1914 ) feature/IO-3029-Enhanced-Logging-File-Based: Add File based S3 Logging.	2024-11-14 03:57:24 +00:00
Allan Carr	2f3eccf3d8	Merged in feature/IO-3028-Word-Wrap-Line-Description (pull request #1912 ) IO-3028 Extend to Notes	2024-11-13 18:50:32 +00:00
Allan Carr	2b3e64d607	IO-3028 Extend to Notes Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-11-13 10:49:47 -08:00
Allan Carr	05b20505bb	Merged in feature/IO-3028-Word-Wrap-Line-Description (pull request #1910 ) IO-3028 Word Wrap Line Description Approved-by: Dave Richer	2024-11-13 18:17:34 +00:00
Allan Carr	bddeae945c	IO-3028 Word Wrap Line Description Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-11-13 10:06:01 -08:00
Patrick Fic	5b267f03b9	Add additional GIN indexes for db.	2024-11-12 20:21:43 -08:00
Patrick Fic	9aab47d8f8	IO-2920 Update config & totals for discount.	2024-11-05 16:37:21 -08:00
Patrick Fic	f2f84e2da8	Merge branch 'master-AIO' into feature/IO-2920-cash-discounting	2024-11-05 16:00:47 -08:00
		`@@ -0,0 +1 @@`
							`ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAFgmcC6OjXt2JHR8zZl7V3UW3pceblTfWld0UQ36sYLhKhhN1kTyret6XExLkbDAE6+C9VS5rJ+J3ZdLyWz8IwOIwEkBioQrgJFg9ts8HuUucxawXua4WG+z5Iik9AL6+0PAzZMqXEXRjyn6JVGm8IAOiCCxLN7uySYlYqYxO3yMR0Q5w== io-ftp-test-key`