diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts index 3ad387628..8a15993fc 100644 --- a/src/lib/actions/analytics.ts +++ b/src/lib/actions/analytics.ts @@ -265,15 +265,15 @@ export enum Submit { BillingAddressCreate = 'submit_billing_address_create', BillingAddressUpdate = 'submit_billing_address_update', BillingAddressDelete = 'submit_billing_address_delete', - OrganizationPaymentSet = 'submit_organization_payment_set', - OrganizationPaymentRemove = 'submit_organization_payment_remove', - OrganizationBackupPaymentSet = 'submit_organization_backup_payment_set', + OrganizationPaymentUpdate = 'submit_organization_payment_update', + OrganizationPaymentDelete = 'submit_organization_payment_delete', OrganizationBackupPaymentUpdate = 'submit_organization_backup_payment_update', - OrganizationBackupPaymentRemove = 'submit_organization_backup_payment_remove', - OrganizationBillingAddressSet = 'submit_organization_billing_address_set', - OrganizationBillingAddressRemove = 'submit_organization_billing_address_remove', + OrganizationBackupPaymentDelete = 'submit_organization_backup_payment_delete', + OrganizationBillingAddressUpdate = 'submit_organization_billing_address_update', + OrganizationBillingAddressDelete = 'submit_organization_billing_address_delete', OrganizationUpgrade = 'submit_organization_upgrade', OrganizationDowngrade = 'submit_organization_downgrade', + OrganizationBillingTaxIdUpdate = 'submit_organization_billing_tax_id_update', SupportTicket = 'submit_support_ticket', InstallationCreate = 'submit_installation_create', InstallationDelete = 'submit_installation_delete', diff --git a/src/lib/components/labelCard.svelte b/src/lib/components/labelCard.svelte index 228a2b31f..a42eb9b15 100644 --- a/src/lib/components/labelCard.svelte +++ b/src/lib/components/labelCard.svelte @@ -1,4 +1,6 @@ diff --git a/src/routes/console/organization-[organization]/billing/paymentMethods.svelte b/src/routes/console/organization-[organization]/billing/paymentMethods.svelte index c3184ed7b..ba3ce2a9d 100644 --- a/src/routes/console/organization-[organization]/billing/paymentMethods.svelte +++ b/src/routes/console/organization-[organization]/billing/paymentMethods.svelte @@ -43,14 +43,14 @@ type: 'success', message: `A new payment method has been added to ${$organization.name}` }); - trackEvent(Submit.OrganizationPaymentSet); + trackEvent(Submit.OrganizationPaymentUpdate); invalidate(Dependencies.ORGANIZATION); } catch (error) { addNotification({ type: 'error', message: error.message }); - trackError(error, Submit.OrganizationPaymentSet); + trackError(error, Submit.OrganizationPaymentUpdate); } } @@ -70,7 +70,7 @@ type: 'error', message: error.message }); - trackError(error, Submit.OrganizationPaymentSet); + trackError(error, Submit.OrganizationPaymentUpdate); } } diff --git a/src/routes/console/organization-[organization]/billing/replaceCard.svelte b/src/routes/console/organization-[organization]/billing/replaceCard.svelte index 9f4e1e05b..c00e608ee 100644 --- a/src/routes/console/organization-[organization]/billing/replaceCard.svelte +++ b/src/routes/console/organization-[organization]/billing/replaceCard.svelte @@ -46,14 +46,14 @@ }); invalidate(Dependencies.ORGANIZATION); trackEvent( - isBackup ? Submit.OrganizationBackupPaymentRemove : Submit.OrganizationPaymentRemove + isBackup ? Submit.OrganizationBackupPaymentDelete : Submit.OrganizationPaymentDelete ); show = false; } catch (e) { error = e.message; trackError( e, - isBackup ? Submit.OrganizationBackupPaymentRemove : Submit.OrganizationPaymentRemove + isBackup ? Submit.OrganizationBackupPaymentDelete : Submit.OrganizationPaymentDelete ); } } diff --git a/src/routes/console/organization-[organization]/billing/taxId.svelte b/src/routes/console/organization-[organization]/billing/taxId.svelte new file mode 100644 index 000000000..691b5bdf9 --- /dev/null +++ b/src/routes/console/organization-[organization]/billing/taxId.svelte @@ -0,0 +1,55 @@ + + +
diff --git a/src/routes/console/wizard/cloudOrganization/step1.svelte b/src/routes/console/wizard/cloudOrganization/step1.svelte index a16c23838..2c82f6786 100644 --- a/src/routes/console/wizard/cloudOrganization/step1.svelte +++ b/src/routes/console/wizard/cloudOrganization/step1.svelte @@ -65,20 +65,26 @@{tierFree.description}
-{tierFree.description}
+Payment method
+Organization members
-{collaboratorsNumber} invited
+{collaboratorsNumber} members invited
Payment
@@ -69,8 +69,8 @@${plan.price}
-Invited members
-${plan.collaboratorPrice * collaboratorsNumber}
+Additional members ({collaboratorsNumber})
+${collaboratorPrice * collaboratorsNumber}
{/if} @@ -80,8 +80,8 @@- This amount and any extra usage fees will be charged on a recurring 30 day billing cycle - after your trial period ends on {toLocaleDate(billingPayDate.toString())}. + This amount and any additional usage fees will be charged on a recurring 30 day billing + cycle after your trial period ends on {toLocaleDate(billingPayDate.toString())}.
${plan.price}
-Invited members
-${plan.collaboratorPrice * collaboratorsNumber}
+Additional members ({collaboratorsNumber})
+${collaboratorPrice * collaboratorsNumber}
{/if} @@ -104,8 +104,8 @@- This amount and any extra usage fees will be charged on a recurring 30 day billing - cycle after your trial period ends on {toLocaleDate(billingPayDate.toString())}.