@goweekdays/core 2.11.11 → 2.11.12

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @goweekdays/core
 
+## 2.11.12
+
+### Patch Changes
+
+- ab6a66f: Update dependencies
+
 ## 2.11.11
 
 ### Patch Changes

package/dist/index.js

@@ -6020,7 +6020,7 @@ var schemaSubscriptionTransaction = import_joi22.default.object({
     "promo-expired",
     "promo-updated"
   ).required(),
-  description: import_joi22.default.string().max(255).optional().allow("", null),
+  description: import_joi22.default.string().optional().allow("", null),
   createdBy: import_joi22.default.string().hex().length(24).required(),
   createdByName: import_joi22.default.string().optional().allow("", null)
 });
@@ -8425,13 +8425,42 @@ function useSubscriptionService() {
       case "fixed":
         return Math.min(seats, limit) * (promo.fixedRate ?? 0) + Math.max(seats - limit, 0) * planPrice;
       case "flat":
-        return (promo.flatRate ?? 0) + Math.max(seats - limit, 0) * planPrice;
+        return (promo.flatRate ?? 0) + Math.max(0, seats - limit) * planPrice;
       case "volume":
         return promo.tiers?.length ? calculateVolumeTierAmount(promo.tiers, 1, seats, planPrice) : planPrice * seats;
       default:
         return planPrice * seats;
     }
   }
+  function computeAdditionalSeatAmount(additionalSeats, planPrice, promo, paidSeats) {
+    if (additionalSeats <= 0)
+      return 0;
+    if (!promo) {
+      return additionalSeats * planPrice;
+    }
+    const limit = promo.seats && promo.seats > 0 ? promo.seats : Infinity;
+    switch (promo.type) {
+      case "flat": {
+        const chargeableSeats = Math.max(0, paidSeats + additionalSeats - limit) - Math.max(0, paidSeats - limit);
+        return chargeableSeats * planPrice;
+      }
+      case "fixed": {
+        const promoSeatsLeft = Math.max(0, limit - paidSeats);
+        const promoSeats = Math.min(additionalSeats, promoSeatsLeft);
+        const normalSeats = additionalSeats - promoSeats;
+        return promoSeats * (promo.fixedRate ?? 0) + normalSeats * planPrice;
+      }
+      case "volume":
+        return promo.tiers?.length ? calculateVolumeTierAmount(
+          promo.tiers,
+          paidSeats + 1,
+          additionalSeats,
+          planPrice
+        ) : additionalSeats * planPrice;
+      default:
+        return additionalSeats * planPrice;
+    }
+  }
   function computeProration(subscription, seats, plan, promo) {
     const additionalSeats = Math.max(0, seats - subscription.paidSeats);
     if (additionalSeats === 0)
@@ -8445,10 +8474,11 @@ function useSubscriptionService() {
     const cycleDays = plan.billingCycle === "yearly" ? 365 : 30;
     if (daysRemaining === 0)
       return 0;
-    const additionalAmount = computeMonthlyAmount(
+    const additionalAmount = computeAdditionalSeatAmount(
       additionalSeats,
       plan.price,
-      promo
+      promo,
+      subscription.paidSeats
     );
     return additionalAmount / cycleDays * daysRemaining;
   }
@@ -8464,7 +8494,6 @@ function useSubscriptionService() {
     const isNew = !existingSubscription;
     const isPromoChange = !!existingSubscription && value.promoCode !== void 0 && value.promoCode !== existingSubscription.promoCode;
     const isSeatIncrease = !!existingSubscription && value.seats > existingSubscription.seats;
-    const isSeatDecrease = !!existingSubscription && value.seats < existingSubscription.seats;
     if (isPromoChange && isSeatIncrease) {
       throw new import_utils44.BadRequestError(
         "Cannot change promo code while increasing seats. Perform actions separately."
@@ -8733,6 +8762,9 @@ function useSubscriptionService() {
       if (subscription.promoCode) {
         await updatePromoUsageStatusByOrgId(value.org, "inactive", session);
       }
+      let description = `Promo code updated to ${value.promoCode ?? "none"}. At the time of update, ${(0, import_utils44.formatNumber)(subscription.paidSeats, {
+        decimalPlaces: 0
+      })} seat(s) were already included in the subscription.`;
       if (promo && promo._id) {
         await addPromoUsage(
           {
@@ -8742,11 +8774,44 @@ function useSubscriptionService() {
           },
           session
         );
+        const additionalDescription = `${promo.seats ? `Seats beyond ${(0, import_utils44.formatNumber)(promo.seats, {
+          decimalPlaces: 0
+        })} are charged at the standard rate.` : ""}`;
+        if (promo.type === "flat") {
+          description += ` ${(0, import_utils44.formatNumber)(promo.flatRate ?? 0, {
+            currency,
+            useSymbol: true
+          })} ${promo.seats ? `limited to ${(0, import_utils44.formatNumber)(promo.seats, {
+            decimalPlaces: 0
+          })} seat(s)` : " for all seats"}. ${additionalDescription}`;
+        }
+        if (promo.type === "fixed") {
+          description += ` ${(0, import_utils44.formatNumber)(promo.fixedRate ?? 0, {
+            currency,
+            useSymbol: true
+          })} per seat${promo.seats ? `, limited to ${(0, import_utils44.formatNumber)(promo.seats, {
+            decimalPlaces: 0
+          })} seat(s)` : ""}. ${additionalDescription}`;
+        }
+        if (promo.type === "volume") {
+          if (promo.tiers && promo.tiers.length > 0) {
+            const tierDescriptions = promo.tiers.map((tier) => {
+              const maxSeatsDesc = tier.maxSeats === 0 ? "and above" : `to ${(0, import_utils44.formatNumber)(tier.maxSeats, { decimalPlaces: 0 })}`;
+              return `${(0, import_utils44.formatNumber)(tier.minSeats, {
+                decimalPlaces: 0
+              })} ${maxSeatsDesc} ${(0, import_utils44.formatNumber)(tier.rate, {
+                currency,
+                useSymbol: true
+              })} per seat`;
+            }).join(", ");
+            description += ` Volume tiers, ${tierDescriptions}.`;
+          }
+        }
       }
       await addTransaction(
         {
           type: "promo-updated",
-          description: `Updated promo code to ${value.promoCode || "none"}.`,
+          description,
           amount: 0,
           currency,
           subscription: subscription._id?.toString() ?? "",