From 4aa96a9b36da5d895c7edaf73319f0db74872343 Mon Sep 17 00:00:00 2001 From: Tanya Fomina Date: Tue, 29 Oct 2024 22:32:39 +0300 Subject: [PATCH 01/18] Revert removing billing --- src/components/aside/WorkspaceInfo.vue | 4 +++- src/components/workspace/settings/Layout.vue | 8 ++++++++ src/router.ts | 16 ++++++++-------- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/components/aside/WorkspaceInfo.vue b/src/components/aside/WorkspaceInfo.vue index d05f44c0a..97869ff0a 100644 --- a/src/components/aside/WorkspaceInfo.vue +++ b/src/components/aside/WorkspaceInfo.vue @@ -29,7 +29,9 @@ --> + + {{ $t('workspaces.settings.billing.title') }} + + import(/* webpackChunkName: 'settings' */'./components/account/settings/Notifications.vue'), }, - // { - // path: 'billing', - // name: 'account-billing', - // component: () => import(/* webpackChunkName: 'settings' */'./components/account/settings/Billing.vue'), - // }, + { + path: 'billing', + name: 'account-billing', + component: () => import(/* webpackChunkName: 'settings' */'./components/account/settings/Billing.vue'), + }, ], }, /** @@ -92,7 +92,7 @@ const router = new Router({ { path: 'billing', name: 'workspace-settings-billing', - component: () => import(/* webpackChunkName: 'workspace-billing' */ './components/workspace/settings/UsedVolume.vue'), + component: () => import(/* webpackChunkName: 'workspace-billing' */ './components/workspace/settings/Billing.vue'), }, ], }, @@ -235,7 +235,7 @@ router.beforeEach((to, from, next) => { * Try to get user id */ if (store.state.user && store.state.user.data && store.state.user.data.id) { - Analytics.setUserId(store.state.user.data.id); + Analytics?.setUserId(store.state.user.data.id); } /** @@ -248,7 +248,7 @@ router.beforeEach((to, from, next) => { /** * Track event */ - Analytics.track(AnalyticsEventType.PageVisited, eventProperties); + Analytics?.track(AnalyticsEventType.PageVisited, eventProperties); } catch (e) { console.error(e); } From 35961c2c7b5999f1cf02e44bcf3bcb6cd7f7b21a Mon Sep 17 00:00:00 2001 From: Tanya Fomina Date: Sun, 10 Nov 2024 17:51:30 +0300 Subject: [PATCH 02/18] Support plan.monthlyChargeCurrency --- schema.graphql | 3 +++ src/api/fragments.ts | 1 + src/api/plans/queries.ts | 1 + .../workspace/settings/BillingOverview.vue | 16 +++++++++++++++- src/types/plan.d.ts | 5 +++++ 5 files changed, 25 insertions(+), 1 deletion(-) diff --git a/schema.graphql b/schema.graphql index c6e5b74a1..723c72e36 100644 --- a/schema.graphql +++ b/schema.graphql @@ -821,6 +821,9 @@ type Plan { """Monthly charge for plan""" monthlyCharge: Int! + """Monthly charge currency for plan""" + monthlyChargeCurrency: String! + """Events limit for plan""" eventsLimit: Int! diff --git a/src/api/fragments.ts b/src/api/fragments.ts index dedd8b1bb..622bb471d 100644 --- a/src/api/fragments.ts +++ b/src/api/fragments.ts @@ -121,6 +121,7 @@ export const WORKSPACE_PLAN = ` id name monthlyCharge + monthlyChargeCurrency eventsLimit } } diff --git a/src/api/plans/queries.ts b/src/api/plans/queries.ts index 6de855553..87f5887e9 100644 --- a/src/api/plans/queries.ts +++ b/src/api/plans/queries.ts @@ -8,6 +8,7 @@ export const QUERY_PLANS = ` id name monthlyCharge + monthlyChargeCurrency eventsLimit } } diff --git a/src/components/workspace/settings/BillingOverview.vue b/src/components/workspace/settings/BillingOverview.vue index f0b245284..a14506ac4 100644 --- a/src/components/workspace/settings/BillingOverview.vue +++ b/src/components/workspace/settings/BillingOverview.vue @@ -45,7 +45,7 @@ {{ plan.name || 'Free' }}
- {{ plan.monthlyCharge || 0 }}$/{{ $t('billing.payPeriod') }} + {{ plan.monthlyCharge || 0 }}{{planCurrencySign}}/{{ $t('billing.payPeriod') }}
@@ -217,6 +217,20 @@ export default Vue.extend({ plan(): Plan { return this.workspace.plan; }, + + /** + * Return currency sign depending on plan currency + */ + planCurrencySign(): string { + switch (this.plan.monthlyChargeCurrency) { + case 'USD': + return '$'; + case 'RUB': + return '₽'; + default: + return ''; + } + }, /** * Total number of errors since the last charge date */ diff --git a/src/types/plan.d.ts b/src/types/plan.d.ts index 768a4fbb8..100b3443a 100644 --- a/src/types/plan.d.ts +++ b/src/types/plan.d.ts @@ -17,6 +17,11 @@ export interface Plan { */ monthlyCharge: number; + /** + * Plan monthly charge currency + */ + monthlyChargeCurrency: 'USD' | 'RUB' + /** * Plan events limit */ From bd98e5eaae811938cc947a1cc1642b2805333d8c Mon Sep 17 00:00:00 2001 From: Tanya Fomina Date: Sun, 10 Nov 2024 19:30:45 +0300 Subject: [PATCH 03/18] Support business operation currency --- schema.graphql | 5 ++++- src/api/billing/queries.ts | 1 + src/components/utils/billing/History.vue | 6 +++++- src/components/workspace/settings/BillingOverview.vue | 10 ++-------- src/utils.ts | 11 +++++++++++ 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/schema.graphql b/schema.graphql index 723c72e36..99587510a 100644 --- a/schema.graphql +++ b/schema.graphql @@ -762,8 +762,11 @@ type PayloadOfWorkspacePlanPurchase { """Workspace to which the payment is debited""" workspace: Workspace! - """Amount of payment in US cents""" + """Amount of payment * 100 """ amount: Long! + + """Currency of payment""" + currency: String! } """Input for single payment""" diff --git a/src/api/billing/queries.ts b/src/api/billing/queries.ts index 94ca22037..253178ea5 100644 --- a/src/api/billing/queries.ts +++ b/src/api/billing/queries.ts @@ -28,6 +28,7 @@ export const FRAGMENT_BUSINESS_OPERATION = ` name } amount + currency } } } diff --git a/src/components/utils/billing/History.vue b/src/components/utils/billing/History.vue index 197bddd2b..f5a8db486 100644 --- a/src/components/utils/billing/History.vue +++ b/src/components/utils/billing/History.vue @@ -29,7 +29,7 @@ />
- {{ operation.payload.amount | centsToDollars }}$ + {{ getAmountString(operation.payload.amount, operation.payload.currency) }}
{{ getDescription(operation) }} @@ -57,6 +57,7 @@ import EntityImage from './../EntityImage.vue'; import { BusinessOperationType } from '@/types/business-operation-type'; import i18n from './../../../i18n'; import { BusinessOperation, PayloadOfWorkspacePlanPurchase } from '@/types/business-operation'; +import { getCurrencySign } from '@/utils'; export default Vue.extend({ name: 'BillingHistory', @@ -101,6 +102,9 @@ export default Vue.extend({ }, }, methods: { + getAmountString(amount: number, currency: string): string { + return (amount / 100) + getCurrencySign(currency); + }, /** * Get a status key to show it on the page * diff --git a/src/components/workspace/settings/BillingOverview.vue b/src/components/workspace/settings/BillingOverview.vue index a14506ac4..c91073002 100644 --- a/src/components/workspace/settings/BillingOverview.vue +++ b/src/components/workspace/settings/BillingOverview.vue @@ -129,6 +129,7 @@ import PositiveButton from '../../utils/PostivieButton.vue'; import notifier from 'codex-notifier'; import { CANCEL_SUBSCRIPTION } from '../../../store/modules/workspaces/actionTypes'; import { FETCH_PLANS } from '../../../store/modules/plans/actionTypes'; +import { getCurrencySign } from '@/utils'; /** * Const value for the whole project @@ -222,14 +223,7 @@ export default Vue.extend({ * Return currency sign depending on plan currency */ planCurrencySign(): string { - switch (this.plan.monthlyChargeCurrency) { - case 'USD': - return '$'; - case 'RUB': - return '₽'; - default: - return ''; - } + return getCurrencySign(this.plan.monthlyChargeCurrency); }, /** * Total number of errors since the last charge date diff --git a/src/utils.ts b/src/utils.ts index 082bddae5..cec7b47b8 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -2,6 +2,17 @@ import mergeWith from 'lodash.mergewith'; import cloneDeep from 'lodash.clonedeep'; import { HawkEventDailyInfo, HawkEventPayload, HawkEventRepetition } from './types/events'; +export function getCurrencySign(currency: string): string { + switch (currency) { + case 'USD': + return '$'; + case 'RUB': + return '₽'; + default: + return ''; + } +} + /** * Returns entity color from predefined list * From 10f8d448607523755450c567d737ae1db94bd87a Mon Sep 17 00:00:00 2001 From: Tanya Fomina Date: Sun, 17 Nov 2024 16:47:46 +0300 Subject: [PATCH 04/18] Hide valid until for free plan --- src/components/workspace/settings/BillingOverview.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/workspace/settings/BillingOverview.vue b/src/components/workspace/settings/BillingOverview.vue index c91073002..5d3b6e4d3 100644 --- a/src/components/workspace/settings/BillingOverview.vue +++ b/src/components/workspace/settings/BillingOverview.vue @@ -45,13 +45,13 @@ {{ plan.name || 'Free' }}
- {{ plan.monthlyCharge || 0 }}{{planCurrencySign}}/{{ $t('billing.payPeriod') }} + {{ plan.monthlyCharge || 0 }}{{ planCurrencySign }}/{{ $t('billing.payPeriod') }}
-
+
From 97f90589604965aab31814b35456d9e2c2945f15 Mon Sep 17 00:00:00 2001 From: Tanya Fomina Date: Sun, 17 Nov 2024 17:12:23 +0300 Subject: [PATCH 05/18] Fix visual problems --- .../modals/ChooseTariffPlanPopup.vue | 1 + .../modals/PaymentDetailsDialog.vue | 9 ++++--- src/components/utils/TariffPlan.vue | 25 ++++++++++++++++--- src/i18n/messages/en.json | 2 +- src/i18n/messages/ru.json | 4 +-- 5 files changed, 31 insertions(+), 10 deletions(-) diff --git a/src/components/modals/ChooseTariffPlanPopup.vue b/src/components/modals/ChooseTariffPlanPopup.vue index d3cfe1a68..5e0b18ff3 100644 --- a/src/components/modals/ChooseTariffPlanPopup.vue +++ b/src/components/modals/ChooseTariffPlanPopup.vue @@ -21,6 +21,7 @@ :name="plan.name" :limit="plan.eventsLimit" :price="plan.monthlyCharge" + :currency="plan.monthlyChargeCurrency" :selected="plan.id === selectedPlan.id" @click.native="selectPlan(plan.id)" /> diff --git a/src/components/modals/PaymentDetailsDialog.vue b/src/components/modals/PaymentDetailsDialog.vue index d98947a62..4724ddc39 100644 --- a/src/components/modals/PaymentDetailsDialog.vue +++ b/src/components/modals/PaymentDetailsDialog.vue @@ -64,7 +64,7 @@ {{ $t('common.price') }}
- {{ priceWithDollar }} + {{ price }}
@@ -194,6 +194,7 @@ import { PayWithCardInput } from '../../api/billing'; import { BusinessOperation } from '../../types/business-operation'; import { BusinessOperationStatus } from '../../types/business-operation-status'; import UiCheckboxWithLabel from '../forms/UiCheckboxWithLabel/UiCheckboxWithLabel.vue'; +import { getCurrencySign } from '@/utils'; /** * Id for the 'New card' option in select @@ -348,8 +349,8 @@ export default Vue.extend({ * * example: 100$ */ - priceWithDollar(): string { - return `${this.plan.monthlyCharge}$`; + price(): string { + return `${this.plan.monthlyCharge}${getCurrencySign(this.plan.monthlyChargeCurrency)}`; }, /** @@ -726,7 +727,7 @@ export default Vue.extend({ display: flex; &-button { - margin-right: 118px; + margin-right: auto; } &-cp-logo { diff --git a/src/components/utils/TariffPlan.vue b/src/components/utils/TariffPlan.vue index 34252f855..442b049e5 100644 --- a/src/components/utils/TariffPlan.vue +++ b/src/components/utils/TariffPlan.vue @@ -7,11 +7,11 @@ {{ name }}
- {{ limit | spacedNumber }} {{ $t('common.eventsPerMonth') }} + {{ limit | spacedNumber }} {{ $t('common.eventsPerMonth') }}
- {{ price === 0 ? $t('common.free') : `${$options.filters.spacedNumber(price)}${$t('common.dollarsPerMonth')}` }} + {{ price === 0 ? $t('common.free') : `${$options.filters.spacedNumber(price)}${$tc('common.moneyPerMonth', currencySign, { currency: currencySign })}` }}
@@ -73,6 +83,9 @@ export default { background: var(--color-bg-main); border-radius: 7px; cursor: pointer; + height: 140px; + display: flex; + flex-direction: column; &--selected { padding: 17px 22px; @@ -95,11 +108,17 @@ export default { letter-spacing: 0; } + &__limit-text { + white-space: nowrap; + } + &__footer { display: flex; align-items: center; justify-content: space-between; - margin: 30px 0 0; + margin-top: auto; + /* align-self: flex-end; */ + /* margin: 30px 0 0; */ } &__price { diff --git a/src/i18n/messages/en.json b/src/i18n/messages/en.json index 84d787e87..0ff94c011 100644 --- a/src/i18n/messages/en.json +++ b/src/i18n/messages/en.json @@ -416,7 +416,7 @@ "select": "Select", "continue": "Continue", "eventsPerMonth": "events / mo", - "dollarsPerMonth": "$ / mo", + "moneyPerMonth": "{currency} / mo", "loading": "Loading...", "months": [ "january", diff --git a/src/i18n/messages/ru.json b/src/i18n/messages/ru.json index 252d834b5..8c40687cf 100644 --- a/src/i18n/messages/ru.json +++ b/src/i18n/messages/ru.json @@ -415,8 +415,8 @@ "free": "БЕСПЛАТНО", "select": "Выбрать", "continue": "Продолжить", - "eventsPerMonth": "соб. / мес", - "dollarsPerMonth": "$ / мес", + "eventsPerMonth": "событий / мес", + "moneyPerMonth": "{currency} / мес", "loading": "Загрузка...", "months": [ "января", From f0e9ada010b27285c401a9058d52373cf64d2999 Mon Sep 17 00:00:00 2001 From: Tanya Fomina Date: Sun, 17 Nov 2024 17:20:04 +0300 Subject: [PATCH 06/18] Hide billing from menu --- src/components/workspace/settings/Layout.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/components/workspace/settings/Layout.vue b/src/components/workspace/settings/Layout.vue index 6aa77610e..75548a11e 100644 --- a/src/components/workspace/settings/Layout.vue +++ b/src/components/workspace/settings/Layout.vue @@ -41,7 +41,7 @@ @@ -119,6 +119,13 @@ export default Vue.extend({ return member ? member.isAdmin : false; }, + + /** + * Check if billing button should be visible in menu + */ + shouldShowBilling(): boolean { + return false; + } }, async created(): Promise { const workspaceId = this.$route.params.workspaceId; From 547f0f139ea07238db0006176546f7187856af80 Mon Sep 17 00:00:00 2001 From: Nikita Melnikov Date: Sat, 23 Nov 2024 00:47:03 +0800 Subject: [PATCH 07/18] fix staging --- .github/workflows/build-and-push-docker-image.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-push-docker-image.yml b/.github/workflows/build-and-push-docker-image.yml index 8663f2cd5..506ecf9ac 100644 --- a/.github/workflows/build-and-push-docker-image.yml +++ b/.github/workflows/build-and-push-docker-image.yml @@ -16,10 +16,14 @@ jobs: if: endsWith(github.ref, '/stage') uses: SpicyPizza/create-envfile@v1 with: - envkey_VUE_APP_HAWK_TOKEN: ${{ secrets.HAWK_TOKEN_STAGE }} - envkey_VUE_APP_AMPLITUDE_TOKEN: ${{ secrets.AMPLITUDE_TOKEN_STAGE }} + envkey_VUE_APP_HAWK_TOKEN: ${{ secrets.HAWK_TOKEN_PROD }} + envkey_VUE_APP_AMPLITUDE_TOKEN: ${{ secrets.AMPLITUDE_TOKEN_PROD }} envkey_VUE_APP_CLOUDPAYMENTS_PUBLIC_ID: ${{ secrets.CP_PUBLIC_ID_STAGE }} - envkey_VUE_APP_API_ENDPOINT: "https://api.stage.hawk.so" + envkey_VUE_APP_API_ENDPOINT: "https://api.hawk.so" + # envkey_VUE_APP_HAWK_TOKEN: ${{ secrets.HAWK_TOKEN_STAGE }} + # envkey_VUE_APP_AMPLITUDE_TOKEN: ${{ secrets.AMPLITUDE_TOKEN_STAGE }} + # envkey_VUE_APP_CLOUDPAYMENTS_PUBLIC_ID: ${{ secrets.CP_PUBLIC_ID_STAGE }} + # envkey_VUE_APP_API_ENDPOINT: "https://api.stage.hawk.so" - name: Make prod envfile if: endsWith(github.ref, '/prod') From fd6b02894c06e7a1064af09c5dce548126287904 Mon Sep 17 00:00:00 2001 From: Tanya Fomina Date: Sun, 1 Dec 2024 14:06:25 +0300 Subject: [PATCH 08/18] Fix link --- src/components/aside/WorkspaceInfo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/aside/WorkspaceInfo.vue b/src/components/aside/WorkspaceInfo.vue index 97869ff0a..dfdd1dccd 100644 --- a/src/components/aside/WorkspaceInfo.vue +++ b/src/components/aside/WorkspaceInfo.vue @@ -29,7 +29,7 @@ From 8e65946ba40671a4ed9b6110461c9a1997fd7a93 Mon Sep 17 00:00:00 2001 From: Tanya Fomina Date: Sun, 1 Dec 2024 15:03:25 +0300 Subject: [PATCH 09/18] Fix plans layout --- .../modals/ChooseTariffPlanPopup.vue | 14 ++++- src/components/utils/TariffPlan.vue | 55 +++++++++++++++++-- src/i18n/messages/en.json | 1 + src/i18n/messages/ru.json | 1 + 4 files changed, 64 insertions(+), 7 deletions(-) diff --git a/src/components/modals/ChooseTariffPlanPopup.vue b/src/components/modals/ChooseTariffPlanPopup.vue index 5e0b18ff3..b7279d1ec 100644 --- a/src/components/modals/ChooseTariffPlanPopup.vue +++ b/src/components/modals/ChooseTariffPlanPopup.vue @@ -14,7 +14,11 @@ class="choose-plan__description" v-html="$t('workspaces.chooseTariffPlanDialog.description', {featuresURL: '#'})" /> -
+ +
+

{{ name }} @@ -13,12 +16,14 @@
{{ price === 0 ? $t('common.free') : `${$options.filters.spacedNumber(price)}${$tc('common.moneyPerMonth', currencySign, { currency: currencySign })}` }}
+

@@ -55,17 +60,31 @@ export default { type: Number, required: true, }, + /** + * Currency for price + */ currency: { type: String, required: true }, /** - * Is plan card selected + * Is plan selected */ selected: { type: Boolean, default: false, }, + /** + * True if horizontal view enabled + */ + horizontal: { + type: Boolean, + default: false + }, + isCurrentPlan: { + type: Boolean, + default: false + } }, computed: { currencySign() { @@ -92,6 +111,34 @@ export default { border: 3px solid var(--color-indicator-medium); } + &--horizontal { + height: auto; + width: auto; + display: flex; + flex-direction: row; + align-items: center; + + &:not(:last-of-type) { + margin-bottom: 10px; + } + + .tariff-plan__name { + margin-bottom: 0; + width: 100px; + } + .tariff-plan__limit { + width: 300px; + } + + .tariff-plan__footer { + margin-left: auto; + } + + .tariff-plan__price { + margin-right: 20px + } + } + &__name { margin: 0 0 10px; color: var(--color-text-main); @@ -117,8 +164,6 @@ export default { align-items: center; justify-content: space-between; margin-top: auto; - /* align-self: flex-end; */ - /* margin: 30px 0 0; */ } &__price { diff --git a/src/i18n/messages/en.json b/src/i18n/messages/en.json index 0ff94c011..14b3122ed 100644 --- a/src/i18n/messages/en.json +++ b/src/i18n/messages/en.json @@ -414,6 +414,7 @@ "copiedNotification": "Copied!", "free": "FREE", "select": "Select", + "selected": "Selected", "continue": "Continue", "eventsPerMonth": "events / mo", "moneyPerMonth": "{currency} / mo", diff --git a/src/i18n/messages/ru.json b/src/i18n/messages/ru.json index 8c40687cf..66cfee3ec 100644 --- a/src/i18n/messages/ru.json +++ b/src/i18n/messages/ru.json @@ -414,6 +414,7 @@ "copiedNotification": "Скопировано!", "free": "БЕСПЛАТНО", "select": "Выбрать", + "selected": "Выбрано", "continue": "Продолжить", "eventsPerMonth": "событий / мес", "moneyPerMonth": "{currency} / мес", From fbad7f759441d8113697a08489c76bbd2c3a30c5 Mon Sep 17 00:00:00 2001 From: Tanya Fomina Date: Mon, 2 Dec 2024 22:54:36 +0300 Subject: [PATCH 10/18] Fix plan name width --- src/components/utils/TariffPlan.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/utils/TariffPlan.vue b/src/components/utils/TariffPlan.vue index a9d9549b5..7c42a6f22 100644 --- a/src/components/utils/TariffPlan.vue +++ b/src/components/utils/TariffPlan.vue @@ -124,7 +124,7 @@ export default { .tariff-plan__name { margin-bottom: 0; - width: 100px; + width: 150px; } .tariff-plan__limit { width: 300px; From 31106b43e99c0f2dd4e445838dc940483acb99b8 Mon Sep 17 00:00:00 2001 From: Tanya Fomina Date: Tue, 3 Dec 2024 23:17:47 +0300 Subject: [PATCH 11/18] Update text --- src/i18n/messages/en.json | 2 +- src/i18n/messages/ru.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/messages/en.json b/src/i18n/messages/en.json index 14b3122ed..7b8d8f9fc 100644 --- a/src/i18n/messages/en.json +++ b/src/i18n/messages/en.json @@ -222,7 +222,7 @@ "workspaces": { "chooseTariffPlanDialog": { "title": "Choose a plan", - "description": "All plans includes all available features. If you want a free unlimited access for non-profit products, contact us by team@hawk.so", + "description": "All plans includes all available features. If you have questions on plans, please contact us by team@hawk.so", "onSuccess": "Workspace plan has been successfully changed", "onError": "Unable to change workspace plan due to an error, please try again later", "confirmSetToFreePlanDescription": "The old plan will be canceled. Unused errors and time will not be refunded.", diff --git a/src/i18n/messages/ru.json b/src/i18n/messages/ru.json index 66cfee3ec..f9d1dd6e3 100644 --- a/src/i18n/messages/ru.json +++ b/src/i18n/messages/ru.json @@ -222,7 +222,7 @@ "workspaces": { "chooseTariffPlanDialog": { "title": "Выберите план", - "description": "Все тарифные планы включают в себя все возможности сервиса. Если вы хотите получить неограниченный доступ к сервису для некоммерческих проектов, напишите нам на team@hawk.so", + "description": "Все тарифные планы включают в себя все возможности сервиса. Если у вас возникли вопросы по тарифной сетке, напишите нам на team@hawk.so", "onSuccess": "Тарифный план был успешно изменён", "onError": "Произошла ошибка, пожалуйста попробуйте ещё раз немного позже", "confirmSetToFreePlanDescription": "Старый план будет отменён. Деньги за неиспользованные ошибки и время не будут возвращены.", From a44c17d5467491f8f9900fa46f5fb8b544312c3b Mon Sep 17 00:00:00 2001 From: Tanya Fomina Date: Tue, 3 Dec 2024 23:36:57 +0300 Subject: [PATCH 12/18] Add premium plan card --- .../modals/ChooseTariffPlanPopup.vue | 52 +++++++++++++++++++ src/i18n/messages/en.json | 6 ++- src/i18n/messages/ru.json | 6 ++- 3 files changed, 62 insertions(+), 2 deletions(-) diff --git a/src/components/modals/ChooseTariffPlanPopup.vue b/src/components/modals/ChooseTariffPlanPopup.vue index b7279d1ec..206bd292f 100644 --- a/src/components/modals/ChooseTariffPlanPopup.vue +++ b/src/components/modals/ChooseTariffPlanPopup.vue @@ -31,6 +31,30 @@ @click.native="selectPlan(plan.id)" :horizontal="plans.length > 3" /> + +
+
+ {{$t('workspaces.chooseTariffPlanDialog.premiumPlan')}} +
+ +
+ {{$t('workspaces.chooseTariffPlanDialog.premiumPlanLimit')}} +
+ +
+ {{$t('workspaces.chooseTariffPlanDialog.premiumPlanPrice')}} +
+ + + + +
diff --git a/src/i18n/messages/en.json b/src/i18n/messages/en.json index 7b8d8f9fc..0aa942874 100644 --- a/src/i18n/messages/en.json +++ b/src/i18n/messages/en.json @@ -226,7 +226,11 @@ "onSuccess": "Workspace plan has been successfully changed", "onError": "Unable to change workspace plan due to an error, please try again later", "confirmSetToFreePlanDescription": "The old plan will be canceled. Unused errors and time will not be refunded.", - "confirmSetToPaidPlanDescription": "The old plan will be canceled. Unused errors and time will not be refunded. You will need to pay for a new tariff plan." + "confirmSetToPaidPlanDescription": "The old plan will be canceled. Unused errors and time will not be refunded. You will need to pay for a new tariff plan.", + "premiumPlan": "Premium", + "premiumPlanLimit": "> 500 000 events / mo", + "premiumPlanPrice": "Individual", + "premiumPlanButtonText": "Contact us" }, "creationDialog": { "description": "Workspace will contain your projects. You’ll able to invite team members to join workspace and access projects.", diff --git a/src/i18n/messages/ru.json b/src/i18n/messages/ru.json index f9d1dd6e3..69df84e9f 100644 --- a/src/i18n/messages/ru.json +++ b/src/i18n/messages/ru.json @@ -226,7 +226,11 @@ "onSuccess": "Тарифный план был успешно изменён", "onError": "Произошла ошибка, пожалуйста попробуйте ещё раз немного позже", "confirmSetToFreePlanDescription": "Старый план будет отменён. Деньги за неиспользованные ошибки и время не будут возвращены.", - "confirmSetToPaidPlanDescription": "Старый план будет отменён. Деньги за неиспользованные ошибки и время не будут возвращены. Вам будет необходимо оплатить новый тарифный план." + "confirmSetToPaidPlanDescription": "Старый план будет отменён. Деньги за неиспользованные ошибки и время не будут возвращены. Вам будет необходимо оплатить новый тарифный план.", + "premiumPlan": "Примиум", + "premiumPlanLimit": "> 500 000 событий / мес", + "premiumPlanPrice": "Индивидуальная", + "premiumPlanButtonText": "Связаться" }, "creationDialog": { "description": "Воркспейс объединяет несколько проектов. Вы сможете добавить коллег с доступом ко всем проектам внутри воркспейса.", From 245598e7f45f6db49543abb20dfdd8b63a097626 Mon Sep 17 00:00:00 2001 From: Tanya Fomina Date: Sat, 7 Dec 2024 17:03:08 +0300 Subject: [PATCH 13/18] Fix typo --- src/i18n/messages/ru.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/messages/ru.json b/src/i18n/messages/ru.json index 69df84e9f..2f2578644 100644 --- a/src/i18n/messages/ru.json +++ b/src/i18n/messages/ru.json @@ -227,7 +227,7 @@ "onError": "Произошла ошибка, пожалуйста попробуйте ещё раз немного позже", "confirmSetToFreePlanDescription": "Старый план будет отменён. Деньги за неиспользованные ошибки и время не будут возвращены.", "confirmSetToPaidPlanDescription": "Старый план будет отменён. Деньги за неиспользованные ошибки и время не будут возвращены. Вам будет необходимо оплатить новый тарифный план.", - "premiumPlan": "Примиум", + "premiumPlan": "Премиум", "premiumPlanLimit": "> 500 000 событий / мес", "premiumPlanPrice": "Индивидуальная", "premiumPlanButtonText": "Связаться" From bb331af35aab81113cfe5957c1507565dc17fcdf Mon Sep 17 00:00:00 2001 From: Tanya Fomina Date: Sun, 8 Dec 2024 19:21:57 +0300 Subject: [PATCH 14/18] Fix notification --- src/components/modals/PaymentDetailsDialog.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/modals/PaymentDetailsDialog.vue b/src/components/modals/PaymentDetailsDialog.vue index 4724ddc39..bf64b4e96 100644 --- a/src/components/modals/PaymentDetailsDialog.vue +++ b/src/components/modals/PaymentDetailsDialog.vue @@ -550,7 +550,7 @@ export default Vue.extend({ this.$sendToHawk(e); notifier.show({ message: this.$i18n.t('billing.widget.notifications.error') as string, - style: 'success', + style: 'error', }); } }, From 3f60a02d84568df0963b67abc8d81ec76639624f Mon Sep 17 00:00:00 2001 From: Tanya Fomina Date: Wed, 11 Dec 2024 11:30:24 +0300 Subject: [PATCH 15/18] Add free plan id --- .env.sample | 3 +++ src/components/workspace/settings/BillingOverview.vue | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.env.sample b/.env.sample index 70e20539c..88c06ecca 100644 --- a/.env.sample +++ b/.env.sample @@ -13,3 +13,6 @@ VUE_APP_CLOUDPAYMENTS_PUBLIC_ID=test_api_00000000000000000000001 # Analytics token by Amplitude VUE_APP_AMPLITUDE_TOKEN= + +# Id of free plan +VUE_APP_FREE_PLAN_ID=5f47f031ff71510040f433c1 diff --git a/src/components/workspace/settings/BillingOverview.vue b/src/components/workspace/settings/BillingOverview.vue index 5d3b6e4d3..4579ac194 100644 --- a/src/components/workspace/settings/BillingOverview.vue +++ b/src/components/workspace/settings/BillingOverview.vue @@ -319,7 +319,7 @@ export default Vue.extend({ * Return true if workspace plan is `Startup` */ isFreePlan(): boolean { - return this.plan.name === 'Startup'; + return this.plan.id === process.env.VUE_APP_FREE_PLAN_ID; }, /** From f29c5153242790bebe73d758f9e153df4c72e2da Mon Sep 17 00:00:00 2001 From: Tanya Fomina Date: Wed, 11 Dec 2024 11:38:49 +0300 Subject: [PATCH 16/18] Comment out boost button --- src/components/utils/PostivieButton.vue | 1 - src/components/workspace/settings/BillingOverview.vue | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/utils/PostivieButton.vue b/src/components/utils/PostivieButton.vue index fc25fbfca..07567900d 100644 --- a/src/components/utils/PostivieButton.vue +++ b/src/components/utils/PostivieButton.vue @@ -30,7 +30,6 @@ export default Vue.extend({ .boostButton { display: flex; - width: 65px; height: 23px; margin-top: -19px; margin-left: 60px; diff --git a/src/components/workspace/settings/BillingOverview.vue b/src/components/workspace/settings/BillingOverview.vue index 4579ac194..dce3e97d4 100644 --- a/src/components/workspace/settings/BillingOverview.vue +++ b/src/components/workspace/settings/BillingOverview.vue @@ -76,10 +76,11 @@
{{ $t('billing.volume') }} - + :content="$t('billing.boost')" + /> -->
From 6418938fb094b1d81dbf4a2f23ee91717d938f1c Mon Sep 17 00:00:00 2001 From: Tanya Fomina Date: Wed, 11 Dec 2024 11:44:59 +0300 Subject: [PATCH 17/18] Fix notification text --- src/components/workspace/settings/BillingOverview.vue | 4 ++-- src/i18n/messages/en.json | 4 +++- src/i18n/messages/ru.json | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/components/workspace/settings/BillingOverview.vue b/src/components/workspace/settings/BillingOverview.vue index dce3e97d4..b9f85aa8f 100644 --- a/src/components/workspace/settings/BillingOverview.vue +++ b/src/components/workspace/settings/BillingOverview.vue @@ -383,13 +383,13 @@ export default Vue.extend({ }); notifier.show({ - message: 'Subscription successfully canceled', + message: this.$i18n.t('billing.autoProlongation.cancelSuccessMessage') as string, style: 'success', time: 5000, }); } catch { notifier.show({ - message: 'Error during subscription cancelling', + message: this.$i18n.t('billing.autoProlongation.cancelErrorMessage') as string, style: 'error', time: 5000, }); diff --git a/src/i18n/messages/en.json b/src/i18n/messages/en.json index 0aa942874..37349da0a 100644 --- a/src/i18n/messages/en.json +++ b/src/i18n/messages/en.json @@ -356,7 +356,9 @@ "description": "You are about to subscribe for auto prolongation of the current plan of the workspace. That means that when the next payment date has come, the plan price will be automatically charged from your card. Read more about {0}.", "theNextPaymentDateTitle": "The next payment date", "acceptRecurrentPaymentAgreement": "I understand and accept the recurrent payments agreement", - "allowingChargesEveryMonth": "I allow charges from my bank card every month" + "allowingChargesEveryMonth": "I allow charges from my bank card every month", + "cancelSuccessMessage": "Subscription successfully canceled", + "cancelErrorMessage": "Error during subscription cancelling" }, "cloudPaymentsWidget": { "description": "Payment for tariff \"{tariffPlanName}\" for {workspaceName} workspace for a month" diff --git a/src/i18n/messages/ru.json b/src/i18n/messages/ru.json index 2f2578644..121dbcf4a 100644 --- a/src/i18n/messages/ru.json +++ b/src/i18n/messages/ru.json @@ -356,7 +356,9 @@ "description": "Вы собираетесь подписаться на автоматическое продление текущего плана воркспейса. Это означает, что при наступлении следующей даты платежа стоимость плана будет автоматически списана с вашей карты. Подробнее читайте в {0}.", "theNextPaymentDateTitle": "Дата следующего списания", "acceptRecurrentPaymentAgreement": "Я понимаю и принимаю соглашение об автоматических платежах", - "allowingChargesEveryMonth": "Я разрешаю ежемесячные списания с моей банковской карты" + "allowingChargesEveryMonth": "Я разрешаю ежемесячные списания с моей банковской карты", + "cancelSuccessMessage": "Подписка отменена", + "cancelErrorMessage": "Ошибка при попытке отменить подписку" }, "cloudPaymentsWidget": { "description": "Оплата тарифа \"{tariffPlanName}\" для воркспейса {workspaceName} на месяц." From 77f1be17eccc9fdc3638e2be9633f22cedab4c7e Mon Sep 17 00:00:00 2001 From: Tanya Fomina Date: Tue, 7 Jan 2025 19:58:14 +0300 Subject: [PATCH 18/18] Lint --- src/components/account/settings/Layout.vue | 12 +++++----- src/components/aside/EventsLimitIndicator.vue | 16 +++++++------- .../catalog/catchers/AddCatcher.vue | 11 ++++++---- .../catalog/catchers/guides/sentry.vue | 5 ++++- src/components/event/Overview.vue | 2 +- .../event/details/DetailsAddons.vue | 2 +- .../modals/ChooseTariffPlanPopup.vue | 22 ++++++++++--------- .../project/settings/Integrations.vue | 5 ++++- src/components/utils/TariffPlan.vue | 16 +++++++------- .../workspace/settings/BillingOverview.vue | 7 ++++-- src/components/workspace/settings/Layout.vue | 16 +++++++------- .../workspace/settings/UsedVolume.vue | 21 ++++++++++++------ src/hawk.ts | 3 ++- src/utils.ts | 3 +++ 14 files changed, 83 insertions(+), 58 deletions(-) diff --git a/src/components/account/settings/Layout.vue b/src/components/account/settings/Layout.vue index c9e7719d4..92f9de92b 100644 --- a/src/components/account/settings/Layout.vue +++ b/src/components/account/settings/Layout.vue @@ -26,12 +26,12 @@ > {{ $t('settings.notifications.title') }} - - - - - - + + + + + +
diff --git a/src/components/aside/EventsLimitIndicator.vue b/src/components/aside/EventsLimitIndicator.vue index 56dd99e98..6ad56798b 100644 --- a/src/components/aside/EventsLimitIndicator.vue +++ b/src/components/aside/EventsLimitIndicator.vue @@ -3,12 +3,12 @@
{{ $t("billing.volume") }} - - - - - - + + + + + +
@@ -33,14 +33,14 @@ diff --git a/src/components/workspace/settings/BillingOverview.vue b/src/components/workspace/settings/BillingOverview.vue index b9f85aa8f..5732fd43c 100644 --- a/src/components/workspace/settings/BillingOverview.vue +++ b/src/components/workspace/settings/BillingOverview.vue @@ -51,7 +51,10 @@
-
+
@@ -147,7 +150,7 @@ export default Vue.extend({ UiButton, StatusBlock, Icon, - PositiveButton, + // PositiveButton, }, props: { workspace: { diff --git a/src/components/workspace/settings/Layout.vue b/src/components/workspace/settings/Layout.vue index 75548a11e..158f9519c 100644 --- a/src/components/workspace/settings/Layout.vue +++ b/src/components/workspace/settings/Layout.vue @@ -33,13 +33,13 @@ > {{ $t('workspaces.settings.team.title') }} - - - - - - - + + + + + + + { const workspaceId = this.$route.params.workspaceId; diff --git a/src/components/workspace/settings/UsedVolume.vue b/src/components/workspace/settings/UsedVolume.vue index f3069e3d6..d7d51b788 100644 --- a/src/components/workspace/settings/UsedVolume.vue +++ b/src/components/workspace/settings/UsedVolume.vue @@ -3,7 +3,9 @@
{{ $t('workspaces.settings.volume.title') }}
-
{{ $t('workspaces.settings.volume.description_1', {msg: plan.eventsLimit}) }}
+
+ {{ $t('workspaces.settings.volume.description_1', {msg: plan.eventsLimit}) }} +
{{ eventsCount }} / @@ -15,12 +17,17 @@ :current="eventsCount" :color=" eventsCount / (plan.eventsLimit || eventsCount) >= 0.9 - ? 'var(--color-indicator-critical)' - : 'rgba(219, 230, 255, 0.6)'" + ? 'var(--color-indicator-critical)' + : 'rgba(219, 230, 255, 0.6)'" class="events-limit-indicator__volume-progress workspace-volume__volume-progress" /> -
{{ $t('workspaces.settings.volume.description_2') }}
- +
+ {{ $t('workspaces.settings.volume.description_2') }} +
+ {{ $t('workspaces.settings.volume.emailButton') }}
@@ -28,8 +35,8 @@