@greatapps/common 1.1.677 → 1.1.678

package/src/modules/plans/types/plan.type.ts

@@ -5,7 +5,7 @@ export const PlanItemSchema = z.object({
   id_addon: z.number(),
   quantity: z.number(),
   value: z.number(),
-  value_usd: z.coerce.number().nullish(),
+  value_usd: z.number().nullish(),
 });
 
 export type PlanItem = z.infer<typeof PlanItemSchema>;
@@ -14,10 +14,13 @@ export const PlanSchema = z.object({
   id: z.number(),
   id_plan: z.number().optional(),
   name: z.string(),
-  value: z.number().default(0),
+  value: z.number().nullable().default(0),
   // Preço em USD (conta stripe_usd). Operador cadastra no backend; ausente em planos
-  // sem suporte internacional. Espelha a coluna value_usd de gapps-r3-api.
-  value_usd: z.coerce.number().nullish(),
+  // sem suporte internacional. Backend agora resolve por moeda da conta (customer),
+  // omitindo value_usd para customer requests e adicionando currency. Admin paths
+  // ainda recebem value_usd como número (sem .coerce — backend joga agora como Number).
+  value_usd: z.number().nullish(),
+  currency: z.enum(['brl', 'usd']).optional(),
   type: z.string().optional(),
   discount_semester: z.number().default(0),
   discount_annual: z.number().default(0),
@@ -60,6 +63,7 @@ export type UiPlan = {
   price: string;
   pricingByPeriod?: PlanPricingByPeriod;
   buttonVariant?: 'brand' | 'default';
+  priceUnavailable?: boolean;
   items: PlanItem[];
 };
 

package/src/modules/plans/utils/map-api-plan-to-ui.ts

@@ -82,9 +82,12 @@ function buildMainFeaturesFromItems(
 }
 
 function computePricingByPeriod(apiPlan: Plan, currency: CurrencyCode): PlanPricingByPeriod {
-  // Conta USD usa value_usd; fallback pro value (BRL) evita NaN quando o operador ainda
-  // não cadastrou o preço internacional. Os descontos por período são percentuais — aplicam igual.
-  const monthly = currency === "usd" ? (apiPlan.value_usd ?? apiPlan.value) : apiPlan.value;
+  // Backend agora resolve value por moeda da conta; mapper apenas lê.
+  // value pode ser null (ex.: conta USD, preço USD não cadastrado).
+  const monthly = apiPlan.value;
+  if (monthly == null) {
+    return { monthly: 0, semiannual: 0, annual: 0 };
+  }
   const round2 = (n: number) => Math.round(n * 100) / 100;
   return {
     monthly,
@@ -123,9 +126,12 @@ function buildUiPlan(plan: Plan, currency: CurrencyCode, translate?: TranslateFn
 
   const currencyAwareItems = plan.items.map((item) => ({
     ...item,
-    value: currency === "usd" ? (item.value_usd ?? item.value) : item.value,
+    value: item.value ?? 0,
   }));
 
+  const priceUnavailable = plan.value == null;
+  const unavailableLabel = translate ? translate("common.plans.usdNotConfigured") : "USD não configurado";
+
   return {
     planId: plan.id,
     name: plan.name,
@@ -133,9 +139,10 @@ function buildUiPlan(plan: Plan, currency: CurrencyCode, translate?: TranslateFn
     buttonVariant,
     mainFeatures: buildMainFeaturesFromItems(plan.items, translate),
     features,
-    originalPrice: formatCurrencyNumber(monthlyFinal, 2, currency),
-    price: formatCurrencyNumber(monthlyFinal, 2, currency),
+    originalPrice: priceUnavailable ? unavailableLabel : formatCurrencyNumber(monthlyFinal, 2, currency),
+    price: priceUnavailable ? unavailableLabel : formatCurrencyNumber(monthlyFinal, 2, currency),
     pricingByPeriod,
+    priceUnavailable,
     items: currencyAwareItems,
   };
 }