@carlonicora/nextjs-jsonapi 6.10.0 → 6.10.1

package/messages/en.json

@@ -782,7 +782,7 @@
       },
       "proration": {
         "net_due_today": "Net Due Today",
-        "next_invoice": "Next invoice on {date} for {amount}",
+        "next_invoice": "Charged today: {amount}",
         "title": "Proration Breakdown"
       },
       "subscription": {
@@ -859,6 +859,7 @@
           "amount_off": "{amount} off",
           "card_on_file": "{brand} ending in {last4}",
           "charge_now": "Amount to charge now:",
+          "credit_now": "Credit to your account:",
           "confirm_change": "Confirm Plan Change",
           "due_now": "Amount due now:",
           "interval_monthly": "monthly",
@@ -870,7 +871,8 @@
           "percent_off": "{value}% off",
           "processing": "Processing...",
           "promotion_code": "Promotion Code",
-          "proration_description": "Your next charge will be adjusted to account for the plan change.",
+          "proration_credit_description": "The unused time becomes account credit, used on your next invoices.",
+          "proration_description": "The difference is charged today on a new invoice.",
           "proration_summary": "Proration Summary",
           "selected_plan": "Selected Plan",
           "subscribe_now": "Subscribe Now",

package/messages/it.json

@@ -782,7 +782,7 @@
       },
       "proration": {
         "net_due_today": "Netto dovuto oggi",
-        "next_invoice": "Prossima fattura il {date} di {amount}",
+        "next_invoice": "Addebito oggi: {amount}",
         "title": "Dettaglio del conguaglio"
       },
       "subscription": {
@@ -859,6 +859,7 @@
           "amount_off": "{amount} di sconto",
           "card_on_file": "{brand} che termina con {last4}",
           "charge_now": "Importo da addebitare ora:",
+          "credit_now": "Credito sul tuo account:",
           "confirm_change": "Conferma il cambio di piano",
           "due_now": "Importo dovuto ora:",
           "interval_monthly": "mensile",
@@ -870,7 +871,8 @@
           "percent_off": "{value}% di sconto",
           "processing": "Elaborazione...",
           "promotion_code": "Codice promozionale",
-          "proration_description": "Il tuo prossimo addebito verrà adeguato per tenere conto del cambio di piano.",
+          "proration_credit_description": "Il tempo non usato diventa credito sul tuo account, usato nelle prossime fatture.",
+          "proration_description": "La differenza viene addebitata oggi con una nuova fattura.",
           "proration_summary": "Riepilogo del conguaglio",
           "selected_plan": "Piano selezionato",
           "subscribe_now": "Abbonati ora",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carlonicora/nextjs-jsonapi",
-  "version": "6.10.0",
+  "version": "6.10.1",
   "description": "Next.js JSON:API client with server/client support and caching",
   "author": "Carlo Nicora",
   "license": "GPL-3.0-or-later",

package/src/features/billing/i18n-keys.ts

@@ -375,6 +375,7 @@ export const BILLING_UI_I18N_KEYS = [
   "billing.ui.wizard.review.amount_off",
   "billing.ui.wizard.review.card_on_file",
   "billing.ui.wizard.review.charge_now",
+  "billing.ui.wizard.review.credit_now",
   "billing.ui.wizard.review.confirm_change",
   "billing.ui.wizard.review.discount_carries_over",
   "billing.ui.wizard.review.due_now",
@@ -387,6 +388,7 @@ export const BILLING_UI_I18N_KEYS = [
   "billing.ui.wizard.review.percent_off",
   "billing.ui.wizard.review.processing",
   "billing.ui.wizard.review.promotion_code",
+  "billing.ui.wizard.review.proration_credit_description",
   "billing.ui.wizard.review.proration_description",
   "billing.ui.wizard.review.proration_summary",
   "billing.ui.wizard.review.selected_plan",

package/src/features/billing/stripe-subscription/components/widgets/ProrationPreview.tsx

@@ -2,7 +2,7 @@
 
 import { useTranslations } from "next-intl";
 import { ProrationPreviewInterface } from "../../../stripe-invoice/data/stripe-invoice.interface";
-import { formatCurrency, formatDate, useBillingFormatOptions } from "../../../components/utils";
+import { formatCurrency, useBillingFormatOptions } from "../../../components/utils";
 
 type ProrationPreviewProps = {
   preview: ProrationPreviewInterface;
@@ -35,7 +35,6 @@ export function ProrationPreview({ preview }: ProrationPreviewProps) {
         {preview.lineItems.length > 0 && preview.lineItems[0].period && (
           <div className="text-muted-foreground mt-2 text-xs">
             {t("billing.ui.proration.next_invoice", {
-              date: formatDate(preview.lineItems[0].period.end, fmt),
               amount: formatCurrency(preview.amountDue, preview.currency, fmt),
             })}
           </div>

package/src/features/billing/stripe-subscription/components/wizards/WizardStepReview.tsx

@@ -107,6 +107,11 @@ export function WizardStepReview({
   // Calculate discounted immediate charge for proration preview
   const discountedImmediateCharge = applyDiscount(prorationPreview?.immediateCharge, discount);
 
+  // A negative charge is a credit: Stripe keeps it on the account for the next invoices.
+  const isProrationCredit =
+    !isTrialUpgrade && (discountedImmediateCharge ?? prorationPreview?.immediateCharge ?? 0) < 0;
+  const prorationAmount = (amount: number) => (isProrationCredit ? Math.abs(amount) : amount);
+
   // Format the discount description
   const getDiscountDescription = (): string | null => {
     if (!discount) return null;
@@ -171,24 +176,30 @@ export function WizardStepReview({
               ? discountedImmediateCharge !== null
                 ? t("billing.ui.wizard.review.trial_upgrade_description_discounted")
                 : t("billing.ui.wizard.review.trial_upgrade_description")
-              : t("billing.ui.wizard.review.proration_description")}
+              : isProrationCredit
+                ? t("billing.ui.wizard.review.proration_credit_description")
+                : t("billing.ui.wizard.review.proration_description")}
           </p>
           <div className="flex justify-between text-sm">
             <span className={`${isTrialUpgrade ? "text-warning" : "text-muted-foreground"}`}>
-              {isTrialUpgrade ? t("billing.ui.wizard.review.charge_now") : t("billing.ui.wizard.review.due_now")}
+              {isTrialUpgrade
+                ? t("billing.ui.wizard.review.charge_now")
+                : isProrationCredit
+                  ? t("billing.ui.wizard.review.credit_now")
+                  : t("billing.ui.wizard.review.due_now")}
             </span>
             <span className={`font-medium ${isTrialUpgrade ? "text-warning" : "text-foreground"}`}>
               {discountedImmediateCharge !== null ? (
                 <>
                   <span className="line-through text-muted-foreground me-2">
-                    {formatCurrency(prorationPreview.immediateCharge, prorationPreview.currency, fmt)}
+                    {formatCurrency(prorationAmount(prorationPreview.immediateCharge), prorationPreview.currency, fmt)}
                   </span>
                   <span className="text-success">
-                    {formatCurrency(discountedImmediateCharge, prorationPreview.currency, fmt)}
+                    {formatCurrency(prorationAmount(discountedImmediateCharge), prorationPreview.currency, fmt)}
                   </span>
                 </>
               ) : (
-                formatCurrency(prorationPreview.immediateCharge, prorationPreview.currency, fmt)
+                formatCurrency(prorationAmount(prorationPreview.immediateCharge), prorationPreview.currency, fmt)
               )}
             </span>
           </div>