From 0520cee7af4880b6976d1310e6948e6e61374fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D1=82=D1=83=D0=B0=D0=BD?= Date: Fri, 27 Feb 2026 17:30:42 +0300 Subject: [PATCH 1/8] chore: add cloudPaymentsPublicId to composePayment --- src/resolvers/billingNew.ts | 2 ++ src/typeDefs/billing.ts | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/src/resolvers/billingNew.ts b/src/resolvers/billingNew.ts index 64e1537f..ee973d22 100644 --- a/src/resolvers/billingNew.ts +++ b/src/resolvers/billingNew.ts @@ -86,6 +86,7 @@ export default { currency: string; checksum: string; nextPaymentDate: Date; + cloudPaymentsPublicId: string; }> { const { workspaceId, tariffPlanId, shouldSaveCard } = input; @@ -178,6 +179,7 @@ debug: ${Boolean(workspace.isDebug)}` currency: 'RUB', checksum, nextPaymentDate, + cloudPaymentsPublicId: process.env.CLOUDPAYMENTS_PUBLIC_ID || '', }; }, }, diff --git a/src/typeDefs/billing.ts b/src/typeDefs/billing.ts index f277fbca..d9b67442 100644 --- a/src/typeDefs/billing.ts +++ b/src/typeDefs/billing.ts @@ -270,6 +270,11 @@ type ComposePaymentResponse { Next payment date (recurrent start) """ nextPaymentDate: DateTime! + + """ + CloudPayments public id (merchant identifier for widget) + """ + cloudPaymentsPublicId: String! } From 0cdb6610584b0df68f251ea9f58cf2490f6dc534 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 27 Feb 2026 14:31:54 +0000 Subject: [PATCH 2/8] Bump version up to 1.4.8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3ab0a13c..8d8b9bca 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hawk.api", - "version": "1.4.7", + "version": "1.4.8", "main": "index.ts", "license": "BUSL-1.1", "scripts": { From 4bd5f58b900f7f7bdbca5f6d9b96e639d0f27f2b Mon Sep 17 00:00:00 2001 From: quangtuanitmo18 Date: Sat, 28 Feb 2026 22:24:24 +0300 Subject: [PATCH 3/8] fix: disable free plan reset --- src/resolvers/workspace.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resolvers/workspace.js b/src/resolvers/workspace.js index 2333099d..5d793599 100644 --- a/src/resolvers/workspace.js +++ b/src/resolvers/workspace.js @@ -436,7 +436,7 @@ module.exports = { const defaultPlan = await factories.plansFactory.getDefaultPlan(); - if (workspaceModel.tariffPlanId === defaultPlan.id) { + if (workspaceModel.tariffPlanId.toString() === defaultPlan._id.toString()) { throw new UserInputError('You already use default plan'); } From 56d21270800413551007e8498d5bf14f4c756be8 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 28 Feb 2026 19:26:24 +0000 Subject: [PATCH 4/8] Bump version up to 1.4.8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3ab0a13c..8d8b9bca 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hawk.api", - "version": "1.4.7", + "version": "1.4.8", "main": "index.ts", "license": "BUSL-1.1", "scripts": { From 35b19dcaad5866d6b3f2916d930478a7d614c7b5 Mon Sep 17 00:00:00 2001 From: quangtuanitmo18 Date: Sat, 28 Feb 2026 23:01:57 +0300 Subject: [PATCH 5/8] chore: add comment --- src/resolvers/workspace.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/resolvers/workspace.js b/src/resolvers/workspace.js index 5d793599..f7d480d8 100644 --- a/src/resolvers/workspace.js +++ b/src/resolvers/workspace.js @@ -436,6 +436,8 @@ module.exports = { const defaultPlan = await factories.plansFactory.getDefaultPlan(); + + // Prevent re-applying the free plan if workspace is already on it. if (workspaceModel.tariffPlanId.toString() === defaultPlan._id.toString()) { throw new UserInputError('You already use default plan'); } From a86a9372d161d30dd55f2e107a9cc2e61668cb38 Mon Sep 17 00:00:00 2001 From: quangtuanitmo18 Date: Sat, 28 Feb 2026 23:04:56 +0300 Subject: [PATCH 6/8] fix: fix eslint --- src/resolvers/workspace.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/resolvers/workspace.js b/src/resolvers/workspace.js index f7d480d8..83ef92ae 100644 --- a/src/resolvers/workspace.js +++ b/src/resolvers/workspace.js @@ -436,7 +436,6 @@ module.exports = { const defaultPlan = await factories.plansFactory.getDefaultPlan(); - // Prevent re-applying the free plan if workspace is already on it. if (workspaceModel.tariffPlanId.toString() === defaultPlan._id.toString()) { throw new UserInputError('You already use default plan'); From 39ee1624e2972874f284ded330025f77531d98d8 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 2 Mar 2026 14:44:03 +0000 Subject: [PATCH 7/8] Bump version up to 1.4.9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8d8b9bca..68211463 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hawk.api", - "version": "1.4.8", + "version": "1.4.9", "main": "index.ts", "license": "BUSL-1.1", "scripts": { From 4e718ac234a54be00f5908d1dda17d96f74538e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D1=82=D1=83=D0=B0=D0=BD?= Date: Mon, 2 Mar 2026 18:29:43 +0300 Subject: [PATCH 8/8] minor change --- src/typeDefs/billing.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/typeDefs/billing.ts b/src/typeDefs/billing.ts index d9b67442..7cf9197b 100644 --- a/src/typeDefs/billing.ts +++ b/src/typeDefs/billing.ts @@ -272,7 +272,7 @@ type ComposePaymentResponse { nextPaymentDate: DateTime! """ - CloudPayments public id (merchant identifier for widget) + CloudPayments public id (merchant identifier for payment widget) """ cloudPaymentsPublicId: String! }