Add updates to config files to fix formatting on VS Code for Patrick's machine.

.editorconfig

@@ -1,5 +1,9 @@
 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
@@ -7,14 +11,11 @@ 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

@@ -0,0 +1,11 @@
+# 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,5 +39,13 @@
     "timetickets",
     "touchtime"
   ],
-  "eslint.workingDirectories": ["./", "./client"]
+  "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
 }

package.json

@@ -10,7 +10,8 @@
     "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": "prettier --write \"**/*.{css,js,json,jsx,scss}\"",
+    "makeitpretty": "npm run format",
+    "format": "prettier --config .prettierrc.js --ignore-path .prettierignore --write .",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "test:unit": "vitest run",

server/graphql-client/queries.js

@@ -2859,7 +2859,6 @@ exports.GET_BODYSHOP_BY_ID = `
       intellipay_config
       state
       notification_followers
-      timezone
     }
   }
 `;
@@ -2951,7 +2950,6 @@ query GET_JOBID_BY_MERCHANTID_RONUMBER($merchantID: String!, $roNumber: String!)
       id
       intellipay_config
       email
-      timezone
     }
   }
 }`;
@@ -2961,7 +2959,6 @@ query GET_BODYSHOP_BY_MERCHANTID($merchantID: String!) {
   bodyshops(where: {intellipay_merchant_id: {_eq: $merchantID}}) {
     id
     email
-    timezone
   }
 }`;
 

server/intellipay/lib/handleCommentBasedPayment.js

@@ -48,9 +48,7 @@ const handleCommentBasedPayment = async (values, decodedComment, logger, logMeta
       payer: "Customer",
       type: getPaymentType(ipMapping, values.cardtype),
       jobid: p.jobid,
-      date: moment()
+      date: moment(Date.now()),
-        .tz(bodyshop?.bodyshops_by_pk?.timezone ?? "UTC")
-        .format("YYYY-MM-DD"),
       payment_responses: {
         data: {
           amount: values.total,

server/intellipay/lib/handleInvoiceBasedPayment.js

@@ -97,9 +97,7 @@ const handleInvoiceBasedPayment = async (values, logger, logMeta, res) => {
       payer: "Customer",
       type: getPaymentType(ipMapping, values.cardtype),
       jobid: job.id,
-      date: moment()
+      date: moment(Date.now())
-        .tz(bodyshop?.timezone ?? "UTC")
-        .format("YYYY-MM-DD")
     }
   });