From 4f6db827e7faa275e29c68a5bbfa7b356f72a5be Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Mon, 6 Oct 2025 17:50:19 -0700 Subject: [PATCH 1/3] IO-3395 Postback Payment Date Signed-off-by: Allan Carr --- server/graphql-client/queries.js | 3 +++ server/intellipay/lib/handleCommentBasedPayment.js | 2 +- server/intellipay/lib/handleInvoiceBasedPayment.js | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/server/graphql-client/queries.js b/server/graphql-client/queries.js index 9a3bb1d6e..e5a79fd25 100644 --- a/server/graphql-client/queries.js +++ b/server/graphql-client/queries.js @@ -2859,6 +2859,7 @@ exports.GET_BODYSHOP_BY_ID = ` intellipay_config state notification_followers + timezone } } `; @@ -2950,6 +2951,7 @@ query GET_JOBID_BY_MERCHANTID_RONUMBER($merchantID: String!, $roNumber: String!) id intellipay_config email + timezone } } }`; @@ -2959,6 +2961,7 @@ query GET_BODYSHOP_BY_MERCHANTID($merchantID: String!) { bodyshops(where: {intellipay_merchant_id: {_eq: $merchantID}}) { id email + timezone } }`; diff --git a/server/intellipay/lib/handleCommentBasedPayment.js b/server/intellipay/lib/handleCommentBasedPayment.js index 535e92ab8..af862c7a1 100644 --- a/server/intellipay/lib/handleCommentBasedPayment.js +++ b/server/intellipay/lib/handleCommentBasedPayment.js @@ -48,7 +48,7 @@ const handleCommentBasedPayment = async (values, decodedComment, logger, logMeta payer: "Customer", type: getPaymentType(ipMapping, values.cardtype), jobid: p.jobid, - date: moment(Date.now()), + date: moment(Date.now()).tz(bodyshop.bodyshops_by_pk.timezone || "UTC"), payment_responses: { data: { amount: values.total, diff --git a/server/intellipay/lib/handleInvoiceBasedPayment.js b/server/intellipay/lib/handleInvoiceBasedPayment.js index d5fc97b9c..aca480d5f 100644 --- a/server/intellipay/lib/handleInvoiceBasedPayment.js +++ b/server/intellipay/lib/handleInvoiceBasedPayment.js @@ -97,7 +97,7 @@ const handleInvoiceBasedPayment = async (values, logger, logMeta, res) => { payer: "Customer", type: getPaymentType(ipMapping, values.cardtype), jobid: job.id, - date: moment(Date.now()) + date: moment(Date.now()).tz(bodyshop.timezone || "UTC") } }); From bdd5056c9a1efb1540f814599504c484a23291d0 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Mon, 6 Oct 2025 21:35:31 -0700 Subject: [PATCH 2/3] IO-3395 Postback Payment Date Signed-off-by: Allan Carr --- server/intellipay/lib/handleCommentBasedPayment.js | 4 +++- server/intellipay/lib/handleInvoiceBasedPayment.js | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/server/intellipay/lib/handleCommentBasedPayment.js b/server/intellipay/lib/handleCommentBasedPayment.js index af862c7a1..b6f503d33 100644 --- a/server/intellipay/lib/handleCommentBasedPayment.js +++ b/server/intellipay/lib/handleCommentBasedPayment.js @@ -48,7 +48,9 @@ const handleCommentBasedPayment = async (values, decodedComment, logger, logMeta payer: "Customer", type: getPaymentType(ipMapping, values.cardtype), jobid: p.jobid, - date: moment(Date.now()).tz(bodyshop.bodyshops_by_pk.timezone || "UTC"), + date: moment() + .tz(bodyshop.bodyshops_by_pk.timezone || "UTC") + .format("YYYY-MM-DD"), payment_responses: { data: { amount: values.total, diff --git a/server/intellipay/lib/handleInvoiceBasedPayment.js b/server/intellipay/lib/handleInvoiceBasedPayment.js index aca480d5f..2279a9da5 100644 --- a/server/intellipay/lib/handleInvoiceBasedPayment.js +++ b/server/intellipay/lib/handleInvoiceBasedPayment.js @@ -97,7 +97,9 @@ const handleInvoiceBasedPayment = async (values, logger, logMeta, res) => { payer: "Customer", type: getPaymentType(ipMapping, values.cardtype), jobid: job.id, - date: moment(Date.now()).tz(bodyshop.timezone || "UTC") + date: moment() + .tz(bodyshop.timezone || "UTC") + .format("YYYY-MM-DD") } }); From f19b9cb8e1740e7ee004bb531175f0f38ff5d95f Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Tue, 7 Oct 2025 10:59:10 -0700 Subject: [PATCH 3/3] IO-3395 Postback Payment Date Signed-off-by: Allan Carr --- server/intellipay/lib/handleCommentBasedPayment.js | 2 +- server/intellipay/lib/handleInvoiceBasedPayment.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/intellipay/lib/handleCommentBasedPayment.js b/server/intellipay/lib/handleCommentBasedPayment.js index b6f503d33..fd2ff3ef8 100644 --- a/server/intellipay/lib/handleCommentBasedPayment.js +++ b/server/intellipay/lib/handleCommentBasedPayment.js @@ -49,7 +49,7 @@ const handleCommentBasedPayment = async (values, decodedComment, logger, logMeta type: getPaymentType(ipMapping, values.cardtype), jobid: p.jobid, date: moment() - .tz(bodyshop.bodyshops_by_pk.timezone || "UTC") + .tz(bodyshop?.bodyshops_by_pk?.timezone ?? "UTC") .format("YYYY-MM-DD"), payment_responses: { data: { diff --git a/server/intellipay/lib/handleInvoiceBasedPayment.js b/server/intellipay/lib/handleInvoiceBasedPayment.js index 2279a9da5..34a1a5e8d 100644 --- a/server/intellipay/lib/handleInvoiceBasedPayment.js +++ b/server/intellipay/lib/handleInvoiceBasedPayment.js @@ -98,7 +98,7 @@ const handleInvoiceBasedPayment = async (values, logger, logMeta, res) => { type: getPaymentType(ipMapping, values.cardtype), jobid: job.id, date: moment() - .tz(bodyshop.timezone || "UTC") + .tz(bodyshop?.timezone ?? "UTC") .format("YYYY-MM-DD") } });