From e1e6e0dceb9e428c86efecaa63cc760039cd3f25 Mon Sep 17 00:00:00 2001 From: Arca Ege Cengiz Date: Sat, 31 Jan 2026 16:38:44 +0000 Subject: [PATCH] Double payout fix --- package-lock.json | 21 +++++++------------ package.json | 4 ++-- .../admin/ysws-review/[id]/+page.server.ts | 17 --------------- 3 files changed, 9 insertions(+), 33 deletions(-) diff --git a/package-lock.json b/package-lock.json index d7035a6..1ef6006 100644 --- a/package-lock.json +++ b/package-lock.json @@ -45,8 +45,8 @@ "eslint-plugin-svelte": "^3.12.4", "globals": "^16.4.0", "prettier": "^3.6.2", - "prettier-plugin-svelte": "^3.4.0", - "prettier-plugin-tailwindcss": "^0.6.14", + "prettier-plugin-svelte": "^3.4.1", + "prettier-plugin-tailwindcss": "^0.7.2", "svelte": "^5.39.5", "svelte-check": "^4.3.2", "tailwindcss": "^4.1.13", @@ -9205,13 +9205,13 @@ } }, "node_modules/prettier-plugin-tailwindcss": { - "version": "0.6.14", - "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.14.tgz", - "integrity": "sha512-pi2e/+ZygeIqntN+vC573BcW5Cve8zUB0SSAGxqpB4f96boZF4M3phPVoOFCeypwkpRYdi7+jQ5YJJUwrkGUAg==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.7.2.tgz", + "integrity": "sha512-LkphyK3Fw+q2HdMOoiEHWf93fNtYJwfamoKPl7UwtjFQdei/iIBoX11G6j706FzN3ymX9mPVi97qIY8328vdnA==", "dev": true, "license": "MIT", "engines": { - "node": ">=14.21.3" + "node": ">=20.19" }, "peerDependencies": { "@ianvs/prettier-plugin-sort-imports": "*", @@ -9224,14 +9224,12 @@ "prettier": "^3.0", "prettier-plugin-astro": "*", "prettier-plugin-css-order": "*", - "prettier-plugin-import-sort": "*", "prettier-plugin-jsdoc": "*", "prettier-plugin-marko": "*", "prettier-plugin-multiline-arrays": "*", "prettier-plugin-organize-attributes": "*", "prettier-plugin-organize-imports": "*", "prettier-plugin-sort-imports": "*", - "prettier-plugin-style-order": "*", "prettier-plugin-svelte": "*" }, "peerDependenciesMeta": { @@ -9262,9 +9260,6 @@ "prettier-plugin-css-order": { "optional": true }, - "prettier-plugin-import-sort": { - "optional": true - }, "prettier-plugin-jsdoc": { "optional": true }, @@ -9283,9 +9278,6 @@ "prettier-plugin-sort-imports": { "optional": true }, - "prettier-plugin-style-order": { - "optional": true - }, "prettier-plugin-svelte": { "optional": true } @@ -11053,6 +11045,7 @@ "integrity": "sha512-kTJ+jNdIllOzWuVA3NRQRvywP0T135zdCjAE2dAUY1BFbxM6fmMZV8BbskEoQ4hAODVQUfZQmyGctcwvVCKxFA==", "hasInstallScript": true, "license": "Apache-2.0", + "peer": true, "bin": { "workerd": "bin/workerd" }, diff --git a/package.json b/package.json index 7b7a994..47a066e 100644 --- a/package.json +++ b/package.json @@ -37,8 +37,8 @@ "eslint-plugin-svelte": "^3.12.4", "globals": "^16.4.0", "prettier": "^3.6.2", - "prettier-plugin-svelte": "^3.4.0", - "prettier-plugin-tailwindcss": "^0.6.14", + "prettier-plugin-svelte": "^3.4.1", + "prettier-plugin-tailwindcss": "^0.7.2", "svelte": "^5.39.5", "svelte-check": "^4.3.2", "tailwindcss": "^4.1.13", diff --git a/src/routes/dashboard/admin/ysws-review/[id]/+page.server.ts b/src/routes/dashboard/admin/ysws-review/[id]/+page.server.ts index b1e2966..2c245de 100644 --- a/src/routes/dashboard/admin/ysws-review/[id]/+page.server.ts +++ b/src/routes/dashboard/admin/ysws-review/[id]/+page.server.ts @@ -368,23 +368,6 @@ export const actions = { .where(eq(user.id, queriedProject.user.id)); } if (queriedProject.user && queriedProject.project.status === 'printed') { - const payouts = calculatePayouts( - queriedProject.timeSpent, - await getLatestPrintFilament(id), - parsedShopScoreMultiplier, - queriedProject.user.hasBasePrinter, - queriedProject.project.createdAt - ); - - await db - .update(user) - .set({ - clay: sql`${user.clay} + ${payouts.clay ?? 0}`, - brick: sql`${user.brick} + ${payouts.bricks ?? 0}`, - shopScore: sql`${user.shopScore} + ${payouts.shopScore}` - }) - .where(eq(user.id, queriedProject.user.id)); - const feedbackText = feedback ? `\n\nHere's what they said:\n${feedback}` : ''; await sendSlackDM(