Compare commits

...

5 Commits

Author SHA1 Message Date
Dave
d96d0261ae feature/.feature/IO-3624-Shop-Config-UX-Refresh - Bump Deps 2026-03-31 16:17:52 -04:00
Dave Richer
c2d8d78e0a Merged in hotfix/2026-03-27 (pull request #3162)
Hotfix/2026 03 27
2026-03-27 19:16:16 +00:00
Dave
f89d7865fa Restore hasura metadata tables from master-AIO 2026-03-27 14:46:00 -04:00
Dave
8fd368ebb4 Revert hasura metadata tables changes 2026-03-27 14:45:01 -04:00
Dave
132fc0a20f hotfix/2026-03-27 - Missing chatter stuff. 2026-03-27 14:36:37 -04:00
4 changed files with 17 additions and 5 deletions

View File

@@ -24,6 +24,15 @@
- name: x-imex-auth
value_from_env: DATAPUMP_AUTH
comment: Project Mexico
- name: Chatter API Data Pump
webhook: '{{HASURA_API_URL}}/data/chatter-api'
schedule: 45 4 * * *
include_in_metadata: true
payload: {}
headers:
- name: x-imex-auth
value_from_env: DATAPUMP_AUTH
comment: ""
- name: Chatter Data Pump
webhook: '{{HASURA_API_URL}}/data/chatter'
schedule: 45 5 * * *

View File

@@ -51,7 +51,8 @@ awslocal ses verify-email-identity --email-address noreply@imex.online --region
# Secrets
ensure_secret_file "CHATTER_PRIVATE_KEY" "/tmp/certs/io-ftp-test.key"
ensure_secret_string "CHATTER_COMPANY_KEY_6713" "${CHATTER_COMPANY_KEY_6713:-REPLACE_ME}"
ensure_secret_string "CHATTER_COMPANY_KEY_6713" "${CHATTER_COMPANY_KEY_6713}"
ensure_secret_string "CHATTER_COMPANY_KEY_6746" "${CHATTER_COMPANY_KEY_6746}"
# Logs
ensure_log_group "development"

View File

@@ -67,7 +67,7 @@ const createLocation = async (req, res) => {
const chatterApi = await createChatterClient(DEFAULT_COMPANY_ID);
const locationIdentifier = `${DEFAULT_COMPANY_ID}-${bodyshop.id}`;
const locationIdentifier = bodyshop?.imexshopid ?? `${DEFAULT_COMPANY_ID}-${bodyshop.id}`;
const locationPayload = {
name: bodyshop.shopname,

View File

@@ -397,11 +397,13 @@ const buildRolaborFromRogog = (rogg, { payType = "Cust" } = {}) => {
jobNo: op.jobNo,
custPayTypeFlag: linePayType,
custTxblNtxblFlag: txFlag,
// <BillTimeRateHrs PayType="Cust" ***JobTotalHrs="1" BillTime="1" BillRate="1112.40" *** /> <== CHANGE THIS
// TODO THIS IS WHAT WE ARE CHANGING
bill: {
payType,
jobTotalHrs: "0",
billTime: "0",
billRate: "0"
jobTotalHrs: "1",
billTime: "1",
billRate: "1112.40"
},
amount: {
payType,