@greatapps/common 1.1.741 → 1.1.743

package/src/modules/accounts/hooks/use-currency-formatter.hook.tsx

@@ -5,6 +5,7 @@ import {
   formatCurrency as formatCurrencyBase,
   formatCurrencyNumber as formatCurrencyNumberBase,
   getCurrencyForGateway,
+  getLocaleForCurrency,
   type CurrencyCode,
 } from '../../../utils/format/currency';
 
@@ -18,6 +19,7 @@ import {
  */
 export function useCurrencyFormatter(): {
   currency: CurrencyCode;
+  locale: string;
   formatCurrency: (value: string | number) => string;
   formatCurrencyNumber: (value?: number | null, decimals?: number) => string;
 } {
@@ -26,6 +28,7 @@ export function useCurrencyFormatter(): {
 
   return {
     currency,
+    locale: getLocaleForCurrency(currency),
     formatCurrency: (value) => formatCurrencyBase(value, currency),
     formatCurrencyNumber: (value, decimals = 2) => formatCurrencyNumberBase(value, decimals, currency),
   };

package/src/modules/accounts/hooks/use-required-billing-data.hook.ts

@@ -4,14 +4,14 @@ import { useCurrentAccount } from './current-account.hook';
 import { useActiveSubscription } from '../../subscriptions/hooks/find-active-subscription.hook';
 import { hasPaidSubscription } from '../../subscriptions/utils/has-paid-subscription';
 import { useManagementPermissions } from '../../auth/hooks/useManagementPermissions';
-import { hasCompleteBillingData, isInternationalAccount } from '../utils/billing-data';
+import { hasCompleteBillingData, isBrazilianBillingAccount } from '../utils/billing-data';
 
 /**
  * Contas que já pagaram mas nunca preencheram o cadastro de cobrança ficam sem
  * nota fiscal (chamado "Nota fiscal não emitida em pagamentos confirmados").
  * Este hook diz quando o preenchimento vira obrigatório — o modal que ele
  * alimenta é bloqueante, então só liga com os dados já carregados e só para
- * quem consegue resolver: owner/admin.
+ * quem consegue resolver: owner/admin de conta brasileira.
  */
 export function useRequiredBillingData() {
   const { isOwnerOrAdmin } = useManagementPermissions();
@@ -26,6 +26,7 @@ export function useRequiredBillingData() {
   const isRequired =
     !isLoading &&
     isOwnerOrAdmin &&
+    isBrazilianBillingAccount(account) &&
     hasPaidSubscription(subscription) &&
     !hasCompleteBillingData(account);
 
@@ -33,6 +34,5 @@ export function useRequiredBillingData() {
     isRequired,
     isLoading,
     account,
-    isInternational: isInternationalAccount(account),
   };
 }

package/src/modules/accounts/utils/billing-data.ts

@@ -1,14 +1,7 @@
 import type { Account } from '../types';
 
-/**
- * Gateway das contas cobradas em USD. Elas não têm CPF/CNPJ, bairro nem número —
- * mesmo critério usado no AddCardModal (`account.gateway === 'stripe_usd'`).
- */
-export const INTERNATIONAL_GATEWAY = 'stripe_usd';
-
 export type BillingDataSnapshot = Pick<
   Account,
-  | 'gateway'
   | 'financial_document'
   | 'financial_name'
   | 'financial_email'
@@ -21,38 +14,45 @@ export type BillingDataSnapshot = Pick<
   | 'country'
 >;
 
-type BillingField = keyof Omit<BillingDataSnapshot, 'gateway'>;
+type BillingField = keyof BillingDataSnapshot;
 
 /**
- * Campos exigidos em qualquer país — sem eles a nota fiscal não sai.
+ * Campos exigidos pra emitir a NF-e — sem qualquer um deles a nota não sai.
  *
  * `financial_email` NÃO entra: o backend cai no e-mail do usuário quando ele está
  * vazio (`financial_email || userDocument.email`, accounts/services.js), então a
  * nota sai do mesmo jeito. Exigi-lo aqui bloquearia 4.7k contas pagantes da wl 1
  * em vez das ~460 que de fato estão sem cadastro fiscal. O campo continua no
  * formulário, pré-preenchido — só não é critério de bloqueio.
+ *
+ * `address_complement` é opcional de verdade.
  */
-const INTERNATIONAL_BILLING_FIELDS: readonly BillingField[] = [
+const REQUIRED_BILLING_FIELDS: readonly BillingField[] = [
+  'financial_document',
   'financial_name',
   'zipcode',
   'address',
+  'address_number',
+  'neighborhood',
   'city',
   'state',
   'country',
 ];
 
-/** No Brasil a NF-e também exige documento fiscal, número e bairro. */
-const BR_BILLING_FIELDS: readonly BillingField[] = [
-  ...INTERNATIONAL_BILLING_FIELDS,
-  'financial_document',
-  'address_number',
-  'neighborhood',
-];
-
-export function isInternationalAccount(
-  account: Pick<BillingDataSnapshot, 'gateway'> | null | undefined,
+/**
+ * Conta sujeita à NF-e brasileira. Só ela entra no bloqueio: o formulário pede
+ * CPF/CNPJ e CEP de 8 dígitos, que um cliente de fora não tem como fornecer —
+ * e o modal é bloqueante, então seria tranca sem saída.
+ *
+ * País vazio conta como Brasil: é o default do cadastro e a origem da esmagadora
+ * maioria da base (155 contas pagas da wl 1 estão assim).
+ */
+export function isBrazilianBillingAccount(
+  account: Pick<BillingDataSnapshot, 'country'> | null | undefined,
 ): boolean {
-  return account?.gateway === INTERNATIONAL_GATEWAY;
+  if (!account) return false;
+  const country = account.country?.trim().toUpperCase();
+  return !country || country === 'BR';
 }
 
 function isFilled(value: string | null | undefined): boolean {
@@ -69,11 +69,7 @@ export function hasCompleteBillingData(
 ): boolean {
   if (!account) return false;
 
-  const fields = isInternationalAccount(account)
-    ? INTERNATIONAL_BILLING_FIELDS
-    : BR_BILLING_FIELDS;
-
-  for (const field of fields) {
+  for (const field of REQUIRED_BILLING_FIELDS) {
     if (!isFilled(account[field])) return false;
   }
 

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

@@ -14,6 +14,22 @@ export const PlanItemSchema = z.object({
 
 export type PlanItem = z.infer<typeof PlanItemSchema>;
 
+export const PlanPeriodPricingSchema = z.object({
+  charged: z.number(),
+  list: z.number(),
+  discount: z.number(),
+  discount_percent: z.number(),
+});
+
+export const PlanApiPricingSchema = z.object({
+  currency: z.enum(['brl', 'usd']),
+  monthly: PlanPeriodPricingSchema,
+  semester: PlanPeriodPricingSchema,
+  annual: PlanPeriodPricingSchema,
+});
+
+export type PlanApiPricing = z.infer<typeof PlanApiPricingSchema>;
+
 export const PlanSchema = z.object({
   id: z.number(),
   id_plan: z.number().optional(),
@@ -28,6 +44,7 @@ export const PlanSchema = z.object({
   type: z.string().optional(),
   discount_semester: z.number().default(0),
   discount_annual: z.number().default(0),
+  pricing: PlanApiPricingSchema.optional(),
   items: z.array(PlanItemSchema).optional().default([]),
 });
 

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

@@ -83,14 +83,22 @@ function buildMainFeaturesFromItems(
   return { pages, domains, users };
 }
 
-function computePricingByPeriod(apiPlan: Plan, currency: CurrencyCode): PlanPricingByPeriod {
-  // Backend agora resolve value por moeda da conta; mapper apenas lê.
-  // value pode ser null (ex.: conta USD, preço USD não cadastrado).
+function computePricingByPeriod(apiPlan: Plan): PlanPricingByPeriod {
   const monthly = apiPlan.value;
   if (monthly == null) {
     return { monthly: 0, semiannual: 0, annual: 0 };
   }
   const round2 = (n: number) => Math.round(n * 100) / 100;
+
+  const pricing = apiPlan.pricing;
+  if (pricing) {
+    return {
+      monthly,
+      semiannual: round2(pricing.semester.charged / 6),
+      annual: round2(pricing.annual.charged / 12),
+    };
+  }
+
   return {
     monthly,
     semiannual: round2(monthly * (1 - apiPlan.discount_semester / 100)),
@@ -102,7 +110,7 @@ function buildUiPlan(plan: Plan, currency: CurrencyCode, translate?: TranslateFn
   const popular = plan.id === 2 || plan.id_plan === 2;
   const buttonVariant = popular ? "brand" : "default";
 
-  const pricingByPeriod = computePricingByPeriod(plan, currency);
+  const pricingByPeriod = computePricingByPeriod(plan);
   const monthlyFinal = pricingByPeriod.monthly;
 
   const isStarterPlan = plan.id === STARTER_PLAN_ID || plan.id_plan === STARTER_PLAN_ID;

package/src/modules/subscriptions/constants/addons.constants.ts

@@ -1,28 +1,41 @@
-export const ADDON_IDS = {
-  DOMAINS: 1,
-  PAGES: 2,
-  PROJECTS: 3,
-  AB_TEST: 4,
-  HEATMAP: 5,
-  AI: 6,
-} as const;
-
-export type AddonKindEnum = (typeof ADDON_IDS)[keyof typeof ADDON_IDS];
-
-export interface AiCreditOption {
-  credits: number;
-  price: number;
-  priceLabel: string;
-}
-
-export const AI_CREDIT_OPTIONS: AiCreditOption[] = [
-  { credits: 0, price: 0, priceLabel: 'R$ 0,00' },
-  { credits: 250, price: 9.99, priceLabel: 'R$ 9,99' },
-  { credits: 500, price: 19.98, priceLabel: 'R$ 19,98' },
-  { credits: 1000, price: 39.96, priceLabel: 'R$ 39,96' },
-  { credits: 2500, price: 99.90, priceLabel: 'R$ 99,90' },
-  { credits: 5000, price: 199.80, priceLabel: 'R$ 199,80' },
-  { credits: 10000, price: 399.60, priceLabel: 'R$ 399,60' },
-];
-
-export const AI_CREDIT_VALUES = new Set(AI_CREDIT_OPTIONS.map((opt) => opt.credits));
+export const ADDON_IDS = {
+  DOMAINS: 1,
+  PAGES: 2,
+  PROJECTS: 3,
+  AB_TEST: 4,
+  HEATMAP: 5,
+  AI: 6,
+} as const;
+
+export type AddonKindEnum = (typeof ADDON_IDS)[keyof typeof ADDON_IDS];
+
+export interface AiCreditOption {
+  credits: number;
+  price: number;
+  priceLabel?: string;
+}
+
+export const AI_CREDIT_SIZES = [0, 250, 500, 1000, 2500, 5000, 10000] as const;
+
+export function resolveAiCreditPrice(quantity: number, perCreditPrice: number): number {
+  return Math.round(quantity * perCreditPrice * 100) / 100;
+}
+
+export function buildAiCreditOptions(perCreditPrice: number): AiCreditOption[] {
+  return AI_CREDIT_SIZES.map((credits) => ({
+    credits,
+    price: resolveAiCreditPrice(credits, perCreditPrice),
+  }));
+}
+
+export const AI_CREDIT_OPTIONS: AiCreditOption[] = [
+  { credits: 0, price: 0, priceLabel: 'R$ 0,00' },
+  { credits: 250, price: 9.99, priceLabel: 'R$ 9,99' },
+  { credits: 500, price: 19.98, priceLabel: 'R$ 19,98' },
+  { credits: 1000, price: 39.96, priceLabel: 'R$ 39,96' },
+  { credits: 2500, price: 99.90, priceLabel: 'R$ 99,90' },
+  { credits: 5000, price: 199.80, priceLabel: 'R$ 199,80' },
+  { credits: 10000, price: 399.60, priceLabel: 'R$ 399,60' },
+];
+
+export const AI_CREDIT_VALUES: ReadonlySet<number> = new Set(AI_CREDIT_SIZES);

package/src/utils/format/currency.ts

@@ -1,7 +1,5 @@
-/**
- * Moeda de exibição. Espelha getCurrencyForGateway do backend (gapps-r3-api):
- * 'stripe_usd' → USD; demais gateways → BRL.
- */
+import { isUsdGateway } from './gateway';
+
 export type CurrencyCode = 'brl' | 'usd';
 
 const CURRENCY_FORMAT: Record<CurrencyCode, { locale: string; currency: string }> = {
@@ -9,21 +7,11 @@ const CURRENCY_FORMAT: Record<CurrencyCode, { locale: string; currency: string }
   usd: { locale: 'en-US', currency: 'USD' },
 };
 
-/**
- * Deriva a moeda de exibição a partir do gateway da conta.
- * A moeda é definida pelo backend no roteamento de gateway — read-only para o usuário.
- * @param gateway - account.gateway ('stripe_usd' | 'stripe_brl' | 'vindi' | ...)
- */
 export const getCurrencyForGateway = (gateway?: string | null): CurrencyCode =>
-  gateway === 'stripe_usd' ? 'usd' : 'brl';
+  isUsdGateway(gateway) ? 'usd' : 'brl';
+
+export const getLocaleForCurrency = (currency: CurrencyCode = 'brl'): string => CURRENCY_FORMAT[currency].locale;
 
-/**
- * Formata um valor (string ou número) como moeda.
- * String: assume centavos (remove não-dígitos e divide por 100) — comportamento legado.
- * @param value - valor a formatar
- * @param currency - moeda de exibição (padrão 'brl' por retrocompatibilidade)
- * @returns String formatada (ex: "R$ 1.234,56" ou "$1,234.56")
- */
 export const formatCurrency = (value: string | number, currency: CurrencyCode = 'brl'): string => {
   const fmt = CURRENCY_FORMAT[currency];
   if (typeof value === 'number') {
@@ -41,23 +29,11 @@ export const formatCurrency = (value: string | number, currency: CurrencyCode =
   });
 };
 
-/**
- * Converte uma string de moeda para número (centavos / 100). Independente de moeda.
- * @param value - String com valor de moeda
- * @returns Número decimal
- */
 export const parseCurrencyToNumber = (value: string): number => {
   const numericValue = value.replace(/\D/g, '');
   return parseFloat(numericValue) / 100;
 };
 
-/**
- * Formata um número (opcional) como moeda.
- * @param value - Número a formatar (pode ser undefined/null → 0)
- * @param decimals - Casas decimais (padrão 2)
- * @param currency - Moeda de exibição (padrão 'brl' por retrocompatibilidade)
- * @returns String formatada (ex: "R$ 1.234,56" ou "$1,234.56")
- */
 export const formatCurrencyNumber = (value?: number | null, decimals = 2, currency: CurrencyCode = 'brl'): string => {
   const safeValue = value ?? 0;
   const fmt = CURRENCY_FORMAT[currency];

package/src/utils/format/gateway.ts

@@ -0,0 +1,22 @@
+export const USD_GATEWAY = 'stripe_usd';
+
+export type PaymentMethodKind = 'card' | 'pix' | 'boleto';
+
+export type AccountGatewayLike = { gateway?: string | null } | null | undefined;
+
+const normalizeGateway = (gateway?: string | null): string => (gateway ?? '').trim().toLowerCase();
+
+export const isUsdGateway = (gateway?: string | null): boolean => normalizeGateway(gateway) === USD_GATEWAY;
+
+export const isUsdAccount = (account: AccountGatewayLike): boolean => isUsdGateway(account?.gateway);
+
+const USD_PAYMENT_METHODS: readonly PaymentMethodKind[] = ['card'];
+const BRL_PAYMENT_METHODS: readonly PaymentMethodKind[] = ['card', 'pix', 'boleto'];
+
+export const allowedPaymentMethods = (account: AccountGatewayLike): readonly PaymentMethodKind[] =>
+  isUsdAccount(account) ? USD_PAYMENT_METHODS : BRL_PAYMENT_METHODS;
+
+export const isPaymentMethodAllowed = (account: AccountGatewayLike, method: PaymentMethodKind): boolean =>
+  allowedPaymentMethods(account).includes(method);
+
+export const canBuyStandaloneAiCredits = (account: AccountGatewayLike): boolean => !isUsdAccount(account);