From cc30ea658ef2ccc06f57de3e720357a2bfa4516a Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Thu, 19 Sep 2024 12:07:24 -0700 Subject: [PATCH 1/4] Hasura index removal. --- .../1726768560738_drop_index_courtesycars_idx_fleet/down.sql | 2 ++ .../1726768560738_drop_index_courtesycars_idx_fleet/up.sql | 1 + .../1726768733548_drop_index_idx_jobs_ownrfn/down.sql | 2 ++ .../migrations/1726768733548_drop_index_idx_jobs_ownrfn/up.sql | 1 + .../1726768747444_drop_index_idx_jobs_ownrln/down.sql | 2 ++ .../migrations/1726768747444_drop_index_idx_jobs_ownrln/up.sql | 1 + .../1726768755516_drop_index_jobs_idx_iouparent/down.sql | 2 ++ .../1726768755516_drop_index_jobs_idx_iouparent/up.sql | 1 + .../1726768776395_drop_index_idx_jobs_ronumber/down.sql | 2 ++ .../1726768776395_drop_index_idx_jobs_ronumber/up.sql | 1 + .../migrations/1726768781889_drop_index_idx_jobs_clmno/down.sql | 2 ++ .../migrations/1726768781889_drop_index_idx_jobs_clmno/up.sql | 1 + .../1726768808135_drop_index_idx_jobs_vmodeldesc/down.sql | 2 ++ .../1726768808135_drop_index_idx_jobs_vmodeldesc/up.sql | 1 + .../1726768818475_drop_index_idx_jobs_vmakedesc/down.sql | 2 ++ .../1726768818475_drop_index_idx_jobs_vmakedesc/up.sql | 1 + .../1726768826203_drop_index_idx_jobs_plateno/down.sql | 2 ++ .../migrations/1726768826203_drop_index_idx_jobs_plateno/up.sql | 1 + 18 files changed, 27 insertions(+) create mode 100644 hasura/migrations/1726768560738_drop_index_courtesycars_idx_fleet/down.sql create mode 100644 hasura/migrations/1726768560738_drop_index_courtesycars_idx_fleet/up.sql create mode 100644 hasura/migrations/1726768733548_drop_index_idx_jobs_ownrfn/down.sql create mode 100644 hasura/migrations/1726768733548_drop_index_idx_jobs_ownrfn/up.sql create mode 100644 hasura/migrations/1726768747444_drop_index_idx_jobs_ownrln/down.sql create mode 100644 hasura/migrations/1726768747444_drop_index_idx_jobs_ownrln/up.sql create mode 100644 hasura/migrations/1726768755516_drop_index_jobs_idx_iouparent/down.sql create mode 100644 hasura/migrations/1726768755516_drop_index_jobs_idx_iouparent/up.sql create mode 100644 hasura/migrations/1726768776395_drop_index_idx_jobs_ronumber/down.sql create mode 100644 hasura/migrations/1726768776395_drop_index_idx_jobs_ronumber/up.sql create mode 100644 hasura/migrations/1726768781889_drop_index_idx_jobs_clmno/down.sql create mode 100644 hasura/migrations/1726768781889_drop_index_idx_jobs_clmno/up.sql create mode 100644 hasura/migrations/1726768808135_drop_index_idx_jobs_vmodeldesc/down.sql create mode 100644 hasura/migrations/1726768808135_drop_index_idx_jobs_vmodeldesc/up.sql create mode 100644 hasura/migrations/1726768818475_drop_index_idx_jobs_vmakedesc/down.sql create mode 100644 hasura/migrations/1726768818475_drop_index_idx_jobs_vmakedesc/up.sql create mode 100644 hasura/migrations/1726768826203_drop_index_idx_jobs_plateno/down.sql create mode 100644 hasura/migrations/1726768826203_drop_index_idx_jobs_plateno/up.sql diff --git a/hasura/migrations/1726768560738_drop_index_courtesycars_idx_fleet/down.sql b/hasura/migrations/1726768560738_drop_index_courtesycars_idx_fleet/down.sql new file mode 100644 index 000000000..0716812f8 --- /dev/null +++ b/hasura/migrations/1726768560738_drop_index_courtesycars_idx_fleet/down.sql @@ -0,0 +1,2 @@ +CREATE INDEX "courtesycars_idx_fleet" on + "public"."courtesycars" using btree ("fleetnumber"); diff --git a/hasura/migrations/1726768560738_drop_index_courtesycars_idx_fleet/up.sql b/hasura/migrations/1726768560738_drop_index_courtesycars_idx_fleet/up.sql new file mode 100644 index 000000000..9a23b8690 --- /dev/null +++ b/hasura/migrations/1726768560738_drop_index_courtesycars_idx_fleet/up.sql @@ -0,0 +1 @@ +DROP INDEX IF EXISTS "public"."courtesycars_idx_fleet"; diff --git a/hasura/migrations/1726768733548_drop_index_idx_jobs_ownrfn/down.sql b/hasura/migrations/1726768733548_drop_index_idx_jobs_ownrfn/down.sql new file mode 100644 index 000000000..81e52f24a --- /dev/null +++ b/hasura/migrations/1726768733548_drop_index_idx_jobs_ownrfn/down.sql @@ -0,0 +1,2 @@ +CREATE INDEX "idx_jobs_ownrfn" on + "public"."jobs" using gin ("ownr_fn"); diff --git a/hasura/migrations/1726768733548_drop_index_idx_jobs_ownrfn/up.sql b/hasura/migrations/1726768733548_drop_index_idx_jobs_ownrfn/up.sql new file mode 100644 index 000000000..9d362a787 --- /dev/null +++ b/hasura/migrations/1726768733548_drop_index_idx_jobs_ownrfn/up.sql @@ -0,0 +1 @@ +DROP INDEX IF EXISTS "public"."idx_jobs_ownrfn"; diff --git a/hasura/migrations/1726768747444_drop_index_idx_jobs_ownrln/down.sql b/hasura/migrations/1726768747444_drop_index_idx_jobs_ownrln/down.sql new file mode 100644 index 000000000..a0bdd4596 --- /dev/null +++ b/hasura/migrations/1726768747444_drop_index_idx_jobs_ownrln/down.sql @@ -0,0 +1,2 @@ +CREATE INDEX "idx_jobs_ownrln" on + "public"."jobs" using gin ("ownr_ln"); diff --git a/hasura/migrations/1726768747444_drop_index_idx_jobs_ownrln/up.sql b/hasura/migrations/1726768747444_drop_index_idx_jobs_ownrln/up.sql new file mode 100644 index 000000000..2a37d05c2 --- /dev/null +++ b/hasura/migrations/1726768747444_drop_index_idx_jobs_ownrln/up.sql @@ -0,0 +1 @@ +DROP INDEX IF EXISTS "public"."idx_jobs_ownrln"; diff --git a/hasura/migrations/1726768755516_drop_index_jobs_idx_iouparent/down.sql b/hasura/migrations/1726768755516_drop_index_jobs_idx_iouparent/down.sql new file mode 100644 index 000000000..8f0d5986f --- /dev/null +++ b/hasura/migrations/1726768755516_drop_index_jobs_idx_iouparent/down.sql @@ -0,0 +1,2 @@ +CREATE INDEX "jobs_idx_iouparent" on + "public"."jobs" using btree ("iouparent"); diff --git a/hasura/migrations/1726768755516_drop_index_jobs_idx_iouparent/up.sql b/hasura/migrations/1726768755516_drop_index_jobs_idx_iouparent/up.sql new file mode 100644 index 000000000..f0b2c7068 --- /dev/null +++ b/hasura/migrations/1726768755516_drop_index_jobs_idx_iouparent/up.sql @@ -0,0 +1 @@ +DROP INDEX IF EXISTS "public"."jobs_idx_iouparent"; diff --git a/hasura/migrations/1726768776395_drop_index_idx_jobs_ronumber/down.sql b/hasura/migrations/1726768776395_drop_index_idx_jobs_ronumber/down.sql new file mode 100644 index 000000000..bbcb35060 --- /dev/null +++ b/hasura/migrations/1726768776395_drop_index_idx_jobs_ronumber/down.sql @@ -0,0 +1,2 @@ +CREATE INDEX "idx_jobs_ronumber" on + "public"."jobs" using gin ("ro_number"); diff --git a/hasura/migrations/1726768776395_drop_index_idx_jobs_ronumber/up.sql b/hasura/migrations/1726768776395_drop_index_idx_jobs_ronumber/up.sql new file mode 100644 index 000000000..62b19c60b --- /dev/null +++ b/hasura/migrations/1726768776395_drop_index_idx_jobs_ronumber/up.sql @@ -0,0 +1 @@ +DROP INDEX IF EXISTS "public"."idx_jobs_ronumber"; diff --git a/hasura/migrations/1726768781889_drop_index_idx_jobs_clmno/down.sql b/hasura/migrations/1726768781889_drop_index_idx_jobs_clmno/down.sql new file mode 100644 index 000000000..043f2e639 --- /dev/null +++ b/hasura/migrations/1726768781889_drop_index_idx_jobs_clmno/down.sql @@ -0,0 +1,2 @@ +CREATE INDEX "idx_jobs_clmno" on + "public"."jobs" using gin ("clm_no"); diff --git a/hasura/migrations/1726768781889_drop_index_idx_jobs_clmno/up.sql b/hasura/migrations/1726768781889_drop_index_idx_jobs_clmno/up.sql new file mode 100644 index 000000000..b2a68ac13 --- /dev/null +++ b/hasura/migrations/1726768781889_drop_index_idx_jobs_clmno/up.sql @@ -0,0 +1 @@ +DROP INDEX IF EXISTS "public"."idx_jobs_clmno"; diff --git a/hasura/migrations/1726768808135_drop_index_idx_jobs_vmodeldesc/down.sql b/hasura/migrations/1726768808135_drop_index_idx_jobs_vmodeldesc/down.sql new file mode 100644 index 000000000..4ced5c891 --- /dev/null +++ b/hasura/migrations/1726768808135_drop_index_idx_jobs_vmodeldesc/down.sql @@ -0,0 +1,2 @@ +CREATE INDEX "idx_jobs_vmodeldesc" on + "public"."jobs" using gin ("v_model_desc"); diff --git a/hasura/migrations/1726768808135_drop_index_idx_jobs_vmodeldesc/up.sql b/hasura/migrations/1726768808135_drop_index_idx_jobs_vmodeldesc/up.sql new file mode 100644 index 000000000..fd2b28d83 --- /dev/null +++ b/hasura/migrations/1726768808135_drop_index_idx_jobs_vmodeldesc/up.sql @@ -0,0 +1 @@ +DROP INDEX IF EXISTS "public"."idx_jobs_vmodeldesc"; diff --git a/hasura/migrations/1726768818475_drop_index_idx_jobs_vmakedesc/down.sql b/hasura/migrations/1726768818475_drop_index_idx_jobs_vmakedesc/down.sql new file mode 100644 index 000000000..4f896b75e --- /dev/null +++ b/hasura/migrations/1726768818475_drop_index_idx_jobs_vmakedesc/down.sql @@ -0,0 +1,2 @@ +CREATE INDEX "idx_jobs_vmakedesc" on + "public"."jobs" using gin ("v_make_desc"); diff --git a/hasura/migrations/1726768818475_drop_index_idx_jobs_vmakedesc/up.sql b/hasura/migrations/1726768818475_drop_index_idx_jobs_vmakedesc/up.sql new file mode 100644 index 000000000..cd34c044a --- /dev/null +++ b/hasura/migrations/1726768818475_drop_index_idx_jobs_vmakedesc/up.sql @@ -0,0 +1 @@ +DROP INDEX IF EXISTS "public"."idx_jobs_vmakedesc"; diff --git a/hasura/migrations/1726768826203_drop_index_idx_jobs_plateno/down.sql b/hasura/migrations/1726768826203_drop_index_idx_jobs_plateno/down.sql new file mode 100644 index 000000000..85248ec4f --- /dev/null +++ b/hasura/migrations/1726768826203_drop_index_idx_jobs_plateno/down.sql @@ -0,0 +1,2 @@ +CREATE INDEX "idx_jobs_plateno" on + "public"."jobs" using gin ("plate_no"); diff --git a/hasura/migrations/1726768826203_drop_index_idx_jobs_plateno/up.sql b/hasura/migrations/1726768826203_drop_index_idx_jobs_plateno/up.sql new file mode 100644 index 000000000..a1a9b22f8 --- /dev/null +++ b/hasura/migrations/1726768826203_drop_index_idx_jobs_plateno/up.sql @@ -0,0 +1 @@ +DROP INDEX IF EXISTS "public"."idx_jobs_plateno"; From 4c0a1960ad10b3d050830798e20fb981a30910ee Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Fri, 20 Sep 2024 09:37:09 -0700 Subject: [PATCH 2/4] IO-2928 Remove Tax Code Ref if QBO US in Canada Signed-off-by: Allan Carr --- server/accounting/qbo/qbo-payables.js | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/server/accounting/qbo/qbo-payables.js b/server/accounting/qbo/qbo-payables.js index 1d16b0daf..30f5b1f62 100644 --- a/server/accounting/qbo/qbo-payables.js +++ b/server/accounting/qbo/qbo-payables.js @@ -194,7 +194,9 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop) bodyshop.md_responsibility_centers.sales_tax_codes, classes, taxCodes, - bodyshop.md_responsibility_centers.costs + bodyshop.md_responsibility_centers.costs, + bodyshop.accountingconfig, + bodyshop.region_config ) ); @@ -298,17 +300,29 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop) // }, // ], -const generateBillLine = (billLine, accounts, jobClass, ioSalesTaxCodes, classes, taxCodes, costCenters) => { +const generateBillLine = ( + billLine, + accounts, + jobClass, + ioSalesTaxCodes, + classes, + taxCodes, + costCenters, + accountingconfig, + region_config +) => { const account = costCenters.find((c) => c.name === billLine.cost_center); - return { DetailType: "AccountBasedExpenseLineDetail", AccountBasedExpenseLineDetail: { ...(jobClass ? { ClassRef: { value: classes[jobClass] } } : {}), - TaxCodeRef: { - value: taxCodes[findTaxCode(billLine.applicable_taxes, ioSalesTaxCodes)] - }, + TaxCodeRef: + accountingconfig.qbo && accountingconfig.qbo_usa && region_config.includes("CA_") + ? {} + : { + value: taxCodes[findTaxCode(billLine.applicable_taxes, ioSalesTaxCodes)] + }, AccountRef: { value: accounts[account.accountname] } From bece3278f450701dcb01fdd8e529bc2801ad620f Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Fri, 20 Sep 2024 09:50:08 -0700 Subject: [PATCH 3/4] IO-2949 change fetch policy on client to resolve issue. --- client/src/redux/messaging/messaging.sagas.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/src/redux/messaging/messaging.sagas.js b/client/src/redux/messaging/messaging.sagas.js index 16a1fd274..86757a427 100644 --- a/client/src/redux/messaging/messaging.sagas.js +++ b/client/src/redux/messaging/messaging.sagas.js @@ -36,7 +36,8 @@ export function* openChatByPhone({ payload }) { data: { conversations } } = yield client.query({ query: CONVERSATION_ID_BY_PHONE, - variables: { phone: p.number } + variables: { phone: p.number }, + fetchPolicy: 'no-cache' }); if (conversations.length === 0) { From 8ad39fe8557cc996a1fbb92a92bd9e97d2604c2a Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Fri, 20 Sep 2024 09:59:03 -0700 Subject: [PATCH 4/4] Add Git SHA date to ioevent. --- client/src/firebase/firebase.utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/firebase/firebase.utils.js b/client/src/firebase/firebase.utils.js index 4d3d65ca4..358182e6b 100644 --- a/client/src/firebase/firebase.utils.js +++ b/client/src/firebase/firebase.utils.js @@ -87,7 +87,7 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => { operationName: eventName, variables: additionalParams, dbevent: false, - env: "master" + env: `master-AIO|${import.meta.env.VITE_APP_GIT_SHA_DATE}` }); // console.log( // "%c[Analytics]",