IO-3395 Postback Payment Date

Signed-off-by: Allan Carr <allan@imexsystems.ca>

.editorconfig

@@ -1,9 +1,5 @@
 root = true
 
-# NOTE: Keep only EditorConfig properties that Prettier actually respects.
-# Style choices (quotes, bracket spacing, print width, etc.) live in `.prettierrc.js`.
-# Removing pseudo/unsupported keys (quote_type, bracketSpacing, max_line_length) that
-# previously caused editor vs CLI confusion.
 [*]
 charset = utf-8
 indent_style = space
@@ -11,11 +7,14 @@ indent_size = 2
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = false
+quote_type = single
+max_line_length = 100
+bracketSpacing = false
 
 [*.md]
 trim_trailing_whitespace = false
 
-[*\.yml]
+[*.yml]
 indent_size = 2
 
 [*.json]

.prettierignore

@@ -1,11 +0,0 @@
-# Folders & files to skip during formatting
-node_modules
-build
-dist
-dev-dist
-coverage
-logs
-*.log
-# Generated / compiled assets
-client/dev-dist
-client/dist

.vscode/settings.json

@@ -39,13 +39,5 @@
     "timetickets",
     "touchtime"
   ],
-  "eslint.workingDirectories": ["./", "./client"],
-  // Formatting alignment: ensure VS Code uses project Prettier config
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "editor.formatOnSave": true,
-  "[javascript]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  // Disable eslint's fixAll on save if it causes style churn; turn back on once stylistic rules removed or using eslint-config-prettier
-  "prettier.useEditorConfig": true
+  "eslint.workingDirectories": ["./", "./client"]
 }

package.json

@@ -10,8 +10,7 @@
     "setup": "rm -rf node_modules && npm i && cd client && rm -rf node_modules && npm i",
     "setup:win": "rimraf node_modules && npm i && cd client && rimraf node_modules && npm i",
     "start": "node server.js",
-    "makeitpretty": "npm run format",
-    "format": "prettier --config .prettierrc.js --ignore-path .prettierignore --write .",
+    "makeitpretty": "prettier --write \"**/*.{css,js,json,jsx,scss}\"",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "test:unit": "vitest run",

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
   }
 }`;
 

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()),
+      date: moment()
+        .tz(bodyshop?.bodyshops_by_pk?.timezone ?? "UTC")
+        .format("YYYY-MM-DD"),
       payment_responses: {
         data: {
           amount: values.total,

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())
+      date: moment()
+        .tz(bodyshop?.timezone ?? "UTC")
+        .format("YYYY-MM-DD")
     }
   });