Merge branch 'develop'

Author: tobihagemann

assets/js/const.template.js

@@ -6,8 +6,10 @@ const PADDLE_TOKEN = '{{ .Site.Params.paddleToken }}';
 const PADDLE_VENDOR_ID = {{ .Site.Params.paddleVendorId }};
 const PADDLE_DESKTOP_PRICE_IDS = {{ .Site.Params.paddleDesktopPriceIds | jsonify }};
 const PADDLE_ANDROID_PRICE_ID = '{{ .Site.Params.paddleAndroidPriceId }}';
-const PADDLE_HUB_SELF_HOSTED_SUBSCRIPTION_PLAN_ID = {{ .Site.Params.paddleHubSelfHostedSubscriptionPlanId }};
-const PADDLE_HUB_MANAGED_SUBSCRIPTION_PLAN_ID = {{ .Site.Params.paddleHubManagedSubscriptionPlanId }};
+const PADDLE_HUB_SELF_HOSTED_YEARLY_PLAN_ID = {{ .Site.Params.paddleHubSelfHostedYearlyPlanId }};
+const PADDLE_HUB_SELF_HOSTED_MONTHLY_PLAN_ID = {{ .Site.Params.paddleHubSelfHostedMonthlyPlanId }};
+const PADDLE_HUB_MANAGED_YEARLY_PLAN_ID = {{ .Site.Params.paddleHubManagedYearlyPlanId }};
+const PADDLE_HUB_MANAGED_MONTHLY_PLAN_ID = {{ .Site.Params.paddleHubManagedMonthlyPlanId }};
 const PADDLE_PRICES_URL = '{{ .Site.Params.paddlePricesUrl }}';
 const PADDLE_DISCOUNT_ID = '{{ .Site.Params.paddleDiscountId }}';
 const PADDLE_DISCOUNT_CODE = '{{ .Site.Params.paddleDiscountCode }}';

assets/js/hubpricing.js

@@ -11,7 +11,7 @@ class HubPricing {
       url: PADDLE_PRICES_URL,
       dataType: 'jsonp',
       data: {
-        product_ids: `${PADDLE_HUB_SELF_HOSTED_SUBSCRIPTION_PLAN_ID},${PADDLE_HUB_MANAGED_SUBSCRIPTION_PLAN_ID}`
+        product_ids: `${PADDLE_HUB_SELF_HOSTED_YEARLY_PLAN_ID},${PADDLE_HUB_MANAGED_YEARLY_PLAN_ID}`
       },
     }).done(data => {
       this._data.selfHostedMonthlyPrice = {

assets/js/hubsubscription.js

@@ -161,56 +161,63 @@ class HubSubscription {
   loadPrice(continueHandler) {
     this._subscriptionData.inProgress = true;
     this._subscriptionData.errorMessage = '';
-    let product_id;
-    if (this._subscriptionData.customBilling?.managed) {
-      product_id = PADDLE_HUB_MANAGED_SUBSCRIPTION_PLAN_ID;
-    } else {
-      product_id = PADDLE_HUB_SELF_HOSTED_SUBSCRIPTION_PLAN_ID;
-    }
+    let isManaged = this._subscriptionData.customBilling?.managed;
+    let yearlyPlanId = isManaged ? PADDLE_HUB_MANAGED_YEARLY_PLAN_ID : PADDLE_HUB_SELF_HOSTED_YEARLY_PLAN_ID;
+    let monthlyPlanId = isManaged ? PADDLE_HUB_MANAGED_MONTHLY_PLAN_ID : PADDLE_HUB_SELF_HOSTED_MONTHLY_PLAN_ID;
     $.ajax({
       url: PADDLE_PRICES_URL,
       dataType: 'jsonp',
       data: {
-        product_ids: product_id
+        product_ids: yearlyPlanId + ',' + monthlyPlanId
       },
     }).done(data => {
-      this.onLoadPriceSucceeded(data);
+      this.onLoadPriceSucceeded(data, yearlyPlanId, monthlyPlanId);
       continueHandler();
     }).fail(xhr => {
       this.onLoadPriceFailed(xhr.responseJSON?.message || 'Loading price failed.');
     });
   }
 
-  onLoadPriceSucceeded(data) {
-    let product = data.response.products[0];
-    let currency = product.currency;
-    let netAmount;
-    let recurringNetAmount;
-    let grossAmount;
-    let recurringGrossAmount;
-    if (this._subscriptionData.customBilling?.override?.prices) {
-      netAmount = this.getAmount(this._subscriptionData.customBilling.override.prices, currency) / 12;
-      recurringNetAmount = this.getAmount(this._subscriptionData.customBilling.override.recurring_prices, currency) / 12;
-      let taxRate = product.subscription.price.gross / product.subscription.price.net;
-      grossAmount = netAmount * taxRate;
-      recurringGrossAmount = recurringNetAmount * taxRate;
-    } else {
-      netAmount = product.subscription.price.net / 12;
-      recurringNetAmount = netAmount;
-      grossAmount = product.subscription.price.gross / 12;
-      recurringGrossAmount = grossAmount;
-    }
-    this._subscriptionData.monthlyPrice = {
-      netAmount: netAmount,
-      recurringNetAmount: recurringNetAmount,
-      grossAmount: grossAmount,
-      recurringGrossAmount: recurringGrossAmount,
+  onLoadPriceSucceeded(data, yearlyPlanId, monthlyPlanId) {
+    let products = data.response.products;
+    let yearlyProduct = products.find(p => p.product_id == yearlyPlanId);
+    let monthlyProduct = products.find(p => p.product_id == monthlyPlanId);
+    let yearlyPrice = yearlyProduct.subscription.price;
+    let monthlyPrice = monthlyProduct.subscription.price;
+    let currency = yearlyProduct.currency;
+    this._subscriptionData.yearlyPlanPrice = this.calculateYearlyPlanPrice(yearlyPrice, currency);
+    this._subscriptionData.monthlyPlanPrice = {
+      netAmount: monthlyPrice.net,
+      recurringNetAmount: monthlyPrice.net,
+      grossAmount: monthlyPrice.gross,
+      recurringGrossAmount: monthlyPrice.gross,
       currency: currency
     };
+    this._subscriptionData.savingsPercent = Math.round((1 - yearlyPrice.net / (monthlyPrice.net * 12)) * 100);
     this._subscriptionData.errorMessage = '';
     this._subscriptionData.inProgress = false;
   }
 
+  calculateYearlyPlanPrice(yearlyPrice, currency) {
+    let taxRate = yearlyPrice.gross / yearlyPrice.net;
+    let customBillingOverride = this._subscriptionData.customBilling?.override;
+    let customPriceAmount = customBillingOverride?.prices
+      ? this.getAmount(customBillingOverride.prices, currency)
+      : null;
+    let netAmount = (customPriceAmount ?? yearlyPrice.net) / 12;
+    let customRecurringAmount = customBillingOverride?.recurring_prices
+      ? this.getAmount(customBillingOverride.recurring_prices, currency)
+      : null;
+    let recurringNetAmount = customRecurringAmount ? customRecurringAmount / 12 : netAmount;
+    return {
+      netAmount: netAmount,
+      recurringNetAmount: recurringNetAmount,
+      grossAmount: netAmount * taxRate,
+      recurringGrossAmount: recurringNetAmount * taxRate,
+      currency: currency
+    };
+  }
+
   getAmount(prices, currency) {
     let regex = new RegExp(`^${currency}:`);
     let price = prices.find(price => regex.test(price));
@@ -231,11 +238,15 @@ class HubSubscription {
 
     this._subscriptionData.inProgress = true;
     this._subscriptionData.errorMessage = '';
-    if (this._subscriptionData.customBilling?.managed) {
-      this.customCheckout(PADDLE_HUB_MANAGED_SUBSCRIPTION_PLAN_ID, locale);
+    let isManaged = this._subscriptionData.customBilling?.managed;
+    let isMonthly = this._subscriptionData.billingInterval === 'monthly';
+    let planId;
+    if (isManaged) {
+      planId = isMonthly ? PADDLE_HUB_MANAGED_MONTHLY_PLAN_ID : PADDLE_HUB_MANAGED_YEARLY_PLAN_ID;
     } else {
-      this.customCheckout(PADDLE_HUB_SELF_HOSTED_SUBSCRIPTION_PLAN_ID, locale);
+      planId = isMonthly ? PADDLE_HUB_SELF_HOSTED_MONTHLY_PLAN_ID : PADDLE_HUB_SELF_HOSTED_YEARLY_PLAN_ID;
     }
+    this.customCheckout(planId, locale);
   }
 
   customCheckout(productId, locale) {

config/development/params.yaml

@@ -14,8 +14,10 @@ paddleDesktopPriceIds:
   - pri_01jb24e3z1zkzsq5yrhm5252bd
 paddleAndroidPriceId: pri_01jb24ewyc6fbhnzt26jdj9qp1
 paddleVendorId: 1385
-paddleHubSelfHostedSubscriptionPlanId: 23141
-paddleHubManagedSubscriptionPlanId: 42235
+paddleHubSelfHostedYearlyPlanId: 23141
+paddleHubSelfHostedMonthlyPlanId: 82378
+paddleHubManagedYearlyPlanId: 42235
+paddleHubManagedMonthlyPlanId: 82379
 paddlePricesUrl: https://sandbox-checkout.paddle.com/api/2.0/prices
 paddleDiscountId: dsc_01kba2drz2yg4v6h3d5f2687tw
 paddleDiscountCode: WINTER2025

config/production/params.yaml

@@ -14,8 +14,10 @@ paddleDesktopPriceIds:
   - pri_01jb23wh9vjqdskxyz96zhc4yk
 paddleAndroidPriceId: pri_01jb2432chrz583xtxb029g40m
 paddleVendorId: 39223
-paddleHubSelfHostedSubscriptionPlanId: 770132
-paddleHubManagedSubscriptionPlanId: 807339
+paddleHubSelfHostedYearlyPlanId: 770132
+paddleHubSelfHostedMonthlyPlanId: 914172
+paddleHubManagedYearlyPlanId: 807339
+paddleHubManagedMonthlyPlanId: 914173
 paddlePricesUrl: https://checkout.paddle.com/api/2.0/prices
 paddleDiscountId: dsc_01kba2vjmspm92sx2jhq4s2082
 paddleDiscountCode: WINTER2025

config/staging/params.yaml

@@ -14,8 +14,10 @@ paddleDesktopPriceIds:
   - pri_01jb24e3z1zkzsq5yrhm5252bd
 paddleAndroidPriceId: pri_01jb24ewyc6fbhnzt26jdj9qp1
 paddleVendorId: 1385
-paddleHubSelfHostedSubscriptionPlanId: 23141
-paddleHubManagedSubscriptionPlanId: 42235
+paddleHubSelfHostedYearlyPlanId: 23141
+paddleHubSelfHostedMonthlyPlanId: 82378
+paddleHubManagedYearlyPlanId: 42235
+paddleHubManagedMonthlyPlanId: 82379
 paddlePricesUrl: https://sandbox-checkout.paddle.com/api/2.0/prices
 paddleDiscountId: dsc_01kba2drz2yg4v6h3d5f2687tw
 paddleDiscountCode: WINTER2025

data/de/pricing_teams_faq.yaml

@@ -1,7 +1,7 @@
 - Question: "Wie werden die Sitze berechnet?"
   Answer: "Nur Nutzer, die Zugang zu Tresoren haben, werden auf die Anzahl der Sitze angerechnet. Du kannst zum Beispiel 10 Sitze kaufen und trotzdem deine Keycloak-Instanz mit einem Active Directory mit Tausenden von Nutzern verbinden. Jeder Nutzer mit Tresorzugang belegt einen Sitz, unabhängig von seiner Anzahl von Geräten."
 - Question: "Wie wird die Abonnementgebühr für kostenpflichtige Pläne berechnet?"
-  Answer: "Du zahlst eine jährliche Gebühr für jeden Sitz. Diese Gebühr gilt auch, wenn du ungenutzte Sitze hast."
+  Answer: "Du kannst zwischen monatlicher oder jährlicher Abrechnung wählen. Bei jährlicher Abrechnung sparst du im Vergleich zur monatlichen Zahlung. Die Gebühr gilt für jeden Sitz, auch wenn einige Sitze ungenutzt sind. Wenn du deinen Abrechnungszeitraum nach dem Abschluss ändern möchtest, [kontaktiere bitte unser Vertriebsteam](/de/contact-sales/)."
 - Question: "Kann ich während der Laufzeit weitere Sitze hinzufügen?"
   Answer: "Ja, du kannst jederzeit weitere Sitze hinzufügen. Du kannst auch Sitze reduzieren, wenn du sie nicht mehr benötigst. Änderungen werden entweder sofort anteilig verrechnet oder im Folgejahr abgezogen."
 - Question: "Sind in den kostenpflichtigen Plänen 5 freie Sitze enthalten?"

data/en/pricing_teams_faq.yaml

@@ -1,7 +1,7 @@
 - Question: "How are seats calculated?"
   Answer: "Only users who are granted access to vaults count towards the seats limit. For example, you can buy 10 seats and still connect your Keycloak instance to an Active Directory with thousands of users. Each user with vault access occupies one seat, regardless of their number of devices."
 - Question: "How is the subscription fee calculated for paid plans?"
-  Answer: "You will be charged a yearly fee for each seat. This fee applies even if you have unused seats."
+  Answer: "You can choose between monthly or yearly billing. With yearly billing, you save compared to paying monthly. The fee applies to each seat, even if some seats are unused. If you need to change your billing interval after subscribing, please [contact our sales team](/contact-sales/)."
 - Question: "Can I add more seats during the current billing cycle?"
   Answer: "Yes, you can add more seats at any time. You can also reduce seats if you no longer need them. Changes are either prorated immediately or deducted in the following year."
 - Question: "Do the paid plans include 5 free seats?"

i18n/de.yaml

@@ -585,6 +585,14 @@
   translation: "Standard"
 - id: hub_billing_checkout_standard_description
   translation: "pro Sitz, pro Monat, jährlich abgerechnet"
+- id: hub_billing_checkout_standard_description_monthly
+  translation: "pro Sitz, monatlich abgerechnet"
+- id: hub_billing_monthly
+  translation: "Monatlich"
+- id: hub_billing_yearly
+  translation: "Jährlich"
+- id: hub_billing_save
+  translation: "Spare"
 
 - id: hub_billing_checkout_standard_hubid
   translation: "Hub-ID"

i18n/en.yaml

@@ -585,6 +585,14 @@
   translation: "Standard"
 - id: hub_billing_checkout_standard_description
   translation: "per seat, per month, billed yearly"
+- id: hub_billing_checkout_standard_description_monthly
+  translation: "per seat, billed monthly"
+- id: hub_billing_monthly
+  translation: "Monthly"
+- id: hub_billing_yearly
+  translation: "Yearly"
+- id: hub_billing_save
+  translation: "Save"
 
 - id: hub_billing_checkout_standard_hubid
   translation: "Hub ID"