@greatapps/common 1.1.763 → 1.1.765

package/src/components/modals/billing/RequiredBillingDataModal.tsx

@@ -21,6 +21,7 @@ import { useViaCep } from '../../../modules/accounts/hooks/useViaCep';
 import { useUpdateBillingData } from '../../../modules/accounts/hooks/useAccountManagement';
 import { useRequiredBillingData } from '../../../modules/accounts/hooks/use-required-billing-data.hook';
 import { COUNTRIES } from '../../../utils/countries';
+import { readGeoCountry } from '../../../utils/geo-country';
 import { BR_STATE_OPTIONS } from '../../../utils/constants/br-states';
 import { formatCNPJ, formatCPF, formatPostalCode } from '../../../utils/format/masks';
 import { isValidCNPJ, isValidCPF } from '../../../utils/validators/common';
@@ -48,46 +49,48 @@ const COUNTRY_OPTIONS = COUNTRIES.map((country: { iso: string; name: string }) =
   label: country.name,
 }));
 
-function buildBillingDataSchema(translate: TranslateFn) {
-  const requiredText = z
-    .string()
-    .trim()
-    .min(1, translate('common.billing.requiredData.requiredField'));
+const BR_REQUIRED_ADDRESS_FIELDS: readonly (keyof BillingDataFormValues)[] = [
+  'street',
+  'streetNumber',
+  'neighborhood',
+  'city',
+  'state',
+];
 
+function buildBillingDataSchema(translate: TranslateFn) {
   const base = z.object({
     personType: z.enum(['pf', 'pj']),
     document: z.string().trim(),
-    financialName: requiredText,
+    financialName: z
+      .string()
+      .trim()
+      .min(1, translate('common.billing.requiredData.requiredField')),
     financialEmail: z
       .string()
       .trim()
       .min(1, translate('common.billing.requiredData.requiredField'))
       .email(translate('common.billing.requiredData.invalidEmail')),
-    cep: requiredText,
-    street: requiredText,
+    cep: z.string().trim(),
+    street: z.string().trim(),
     streetNumber: z.string().trim(),
     complement: z.string().trim().optional(),
     neighborhood: z.string().trim(),
-    city: requiredText,
-    state: requiredText,
-    country: requiredText,
+    city: z.string().trim(),
+    state: z.string().trim(),
+    country: z.string().trim().min(1, translate('common.billing.requiredData.requiredField')),
   });
 
   return base.superRefine((data, ctx) => {
-    if (!data.streetNumber) {
-      ctx.addIssue({
-        code: 'custom',
-        path: ['streetNumber'],
-        message: translate('common.billing.requiredData.requiredField'),
-      });
-    }
-
-    if (!data.neighborhood) {
-      ctx.addIssue({
-        code: 'custom',
-        path: ['neighborhood'],
-        message: translate('common.billing.requiredData.requiredField'),
-      });
+    if (data.country !== 'BR') return;
+
+    for (const field of BR_REQUIRED_ADDRESS_FIELDS) {
+      if (!data[field]) {
+        ctx.addIssue({
+          code: 'custom',
+          path: [field],
+          message: translate('common.billing.requiredData.requiredField'),
+        });
+      }
     }
 
     if (data.cep.replace(/\D/g, '').length !== 8) {
@@ -180,6 +183,7 @@ function RequiredBillingDataModalContent() {
 
   const personType = watch('personType');
   const isCompany = personType === 'pj';
+  const isBrazil = watch('country') === 'BR';
 
   useEffect(() => {
     if (!account || isPrefilled.current) return;
@@ -198,7 +202,7 @@ function RequiredBillingDataModalContent() {
       neighborhood: account.neighborhood ?? '',
       city: account.city ?? '',
       state: account.state ?? '',
-      country: account.country || 'BR',
+      country: account.country || readGeoCountry() || 'BR',
     });
   }, [account, reset, user?.email]);
 
@@ -235,20 +239,27 @@ function RequiredBillingDataModalContent() {
   };
 
   async function onSubmit(data: BillingDataFormValues) {
-    const payload: UpdateBillingDataRequest = {
-      financial_document_type: data.personType === 'pf' ? 1 : 2,
-      financial_document: data.document,
-      financial_name: data.financialName,
-      financial_email: data.financialEmail,
-      zipcode: data.cep,
-      address: data.street,
-      address_number: data.streetNumber,
-      address_complement: data.complement ?? '',
-      neighborhood: data.neighborhood,
-      city: data.city,
-      state: data.state,
-      country: data.country,
-    };
+    const payload: UpdateBillingDataRequest =
+      data.country === 'BR'
+        ? {
+            financial_document_type: data.personType === 'pf' ? 1 : 2,
+            financial_document: data.document,
+            financial_name: data.financialName,
+            financial_email: data.financialEmail,
+            zipcode: data.cep,
+            address: data.street,
+            address_number: data.streetNumber,
+            address_complement: data.complement ?? '',
+            neighborhood: data.neighborhood,
+            city: data.city,
+            state: data.state,
+            country: data.country,
+          }
+        : {
+            financial_name: data.financialName,
+            financial_email: data.financialEmail,
+            country: data.country,
+          };
 
     try {
       await updateBillingData(payload);
@@ -296,7 +307,9 @@ function RequiredBillingDataModalContent() {
               {translate('common.billing.requiredData.title')}
             </DialogTitle>
             <span className="paragraph-small-regular text-zinc-600">
-              {translate('common.billing.requiredData.description')}
+              {isBrazil
+                ? translate('common.billing.requiredData.description')
+                : translate('common.billing.requiredData.descriptionInternational')}
             </span>
           </div>
         </DialogHeader>
@@ -308,7 +321,26 @@ function RequiredBillingDataModalContent() {
         >
           <div className="flex flex-col gap-6 p-4 lg:p-5 flex-1 overflow-y-auto">
             <div className="flex flex-col gap-5">
-              <div className="flex gap-4">
+              <Controller
+                name="country"
+                control={control}
+                render={({ field }) => (
+                  <SelectField
+                    label={translate('common.billing.requiredData.country')}
+                    placeholder={translate('common.billing.requiredData.select')}
+                    value={field.value || undefined}
+                    onChange={(value) =>
+                      setValue('country', String(value), { shouldValidate: true })
+                    }
+                    options={COUNTRY_OPTIONS}
+                    error={!!errors.country}
+                    errorMessage={errors.country?.message}
+                  />
+                )}
+              />
+
+              {isBrazil && (
+                <div className="flex gap-4">
                   <Controller
                     name="personType"
                     control={control}
@@ -347,11 +379,12 @@ function RequiredBillingDataModalContent() {
                       })}
                     />
                   </div>
-              </div>
+                </div>
+              )}
 
               <FormField
                 label={
-                  isCompany
+                  isBrazil && isCompany
                     ? translate('common.billing.requiredData.companyName')
                     : translate('common.billing.requiredData.fullName')
                 }
@@ -371,113 +404,99 @@ function RequiredBillingDataModalContent() {
               />
             </div>
 
-            <div className="h-px bg-zinc-200" />
+            {isBrazil && (
+              <>
+                <div className="h-px bg-zinc-200" />
 
-            <div className="flex flex-col gap-5">
-              <span className="paragraph-small-semibold text-zinc-950">
-                {translate('common.billing.requiredData.addressHeading')}
-              </span>
+                <div className="flex flex-col gap-5">
+                  <span className="paragraph-small-semibold text-zinc-950">
+                    {translate('common.billing.requiredData.addressHeading')}
+                  </span>
 
-              <FormField
-                label={translate('common.billing.requiredData.cep')}
-                placeholder="_____-___"
-                error={!!errors.cep}
-                errorMessage={errors.cep?.message}
-                {...register('cep', {
-                  onChange: (event) => handleCepChange(event.target.value),
-                })}
-              />
-
-              <div className="flex gap-4">
-                <div className="flex-[3]">
                   <FormField
-                    label={translate('common.billing.requiredData.street')}
-                    placeholder={translate('common.billing.requiredData.typeHere')}
-                    error={!!errors.street}
-                    errorMessage={errors.street?.message}
-                    {...register('street')}
+                    label={translate('common.billing.requiredData.cep')}
+                    placeholder="_____-___"
+                    error={!!errors.cep}
+                    errorMessage={errors.cep?.message}
+                    {...register('cep', {
+                      onChange: (event) => handleCepChange(event.target.value),
+                    })}
                   />
-                </div>
-                <div className="flex-1">
-                  <FormField
-                    label={translate('common.billing.requiredData.streetNumber')}
-                    placeholder="000"
-                    error={!!errors.streetNumber}
-                    errorMessage={errors.streetNumber?.message}
-                    {...register('streetNumber')}
-                  />
-                </div>
-              </div>
 
-              <div className="flex gap-4">
-                <div className="flex-1">
-                  <FormField
-                    label={translate('common.billing.requiredData.neighborhood')}
-                    placeholder={translate('common.billing.requiredData.typeHere')}
-                    error={!!errors.neighborhood}
-                    errorMessage={errors.neighborhood?.message}
-                    {...register('neighborhood')}
-                  />
-                </div>
-                <div className="flex-1">
-                  <FormField
-                    label={translate('common.billing.requiredData.complement')}
-                    optional
-                    placeholder={translate('common.billing.requiredData.typeHere')}
-                    {...register('complement')}
-                  />
-                </div>
-              </div>
+                  <div className="flex gap-4">
+                    <div className="flex-[3]">
+                      <FormField
+                        label={translate('common.billing.requiredData.street')}
+                        placeholder={translate('common.billing.requiredData.typeHere')}
+                        error={!!errors.street}
+                        errorMessage={errors.street?.message}
+                        {...register('street')}
+                      />
+                    </div>
+                    <div className="flex-1">
+                      <FormField
+                        label={translate('common.billing.requiredData.streetNumber')}
+                        placeholder="000"
+                        error={!!errors.streetNumber}
+                        errorMessage={errors.streetNumber?.message}
+                        {...register('streetNumber')}
+                      />
+                    </div>
+                  </div>
 
-              <div className="flex gap-4">
-                <div className="flex-1">
-                  <FormField
-                    label={translate('common.billing.requiredData.city')}
-                    placeholder={translate('common.billing.requiredData.typeHere')}
-                    error={!!errors.city}
-                    errorMessage={errors.city?.message}
-                    {...register('city')}
-                  />
-                </div>
-                <div className="flex-1">
-                  <Controller
-                      name="state"
-                      control={control}
-                      render={({ field }) => (
-                        <SelectField
-                          label={translate('common.billing.requiredData.state')}
-                          placeholder={translate('common.billing.requiredData.select')}
-                          value={field.value || undefined}
-                          onChange={(value) =>
-                            setValue('state', value as string, { shouldValidate: true })
-                          }
-                          options={BR_STATE_OPTIONS}
-                          error={!!errors.state}
-                          errorMessage={errors.state?.message}
-                        />
-                      )}
-                  />
-                </div>
-              </div>
+                  <div className="flex gap-4">
+                    <div className="flex-1">
+                      <FormField
+                        label={translate('common.billing.requiredData.neighborhood')}
+                        placeholder={translate('common.billing.requiredData.typeHere')}
+                        error={!!errors.neighborhood}
+                        errorMessage={errors.neighborhood?.message}
+                        {...register('neighborhood')}
+                      />
+                    </div>
+                    <div className="flex-1">
+                      <FormField
+                        label={translate('common.billing.requiredData.complement')}
+                        optional
+                        placeholder={translate('common.billing.requiredData.typeHere')}
+                        {...register('complement')}
+                      />
+                    </div>
+                  </div>
 
-              <Controller
-                name="country"
-                control={control}
-                render={({ field }) => (
-                  <SelectField
-                    label={translate('common.billing.requiredData.country')}
-                    placeholder={translate('common.billing.requiredData.select')}
-                    value={field.value || undefined}
-                    onChange={(value) =>
-                      setValue('country', value as string, { shouldValidate: true })
-                    }
-                    options={COUNTRY_OPTIONS}
-                    error={!!errors.country}
-                    errorMessage={errors.country?.message}
-                  />
-                )}
-              />
-            </div>
+                  <div className="flex gap-4">
+                    <div className="flex-1">
+                      <FormField
+                        label={translate('common.billing.requiredData.city')}
+                        placeholder={translate('common.billing.requiredData.typeHere')}
+                        error={!!errors.city}
+                        errorMessage={errors.city?.message}
+                        {...register('city')}
+                      />
+                    </div>
+                    <div className="flex-1">
+                      <Controller
+                        name="state"
+                        control={control}
+                        render={({ field }) => (
+                          <SelectField
+                            label={translate('common.billing.requiredData.state')}
+                            placeholder={translate('common.billing.requiredData.select')}
+                            value={field.value || undefined}
+                            onChange={(value) =>
+                              setValue('state', String(value), { shouldValidate: true })
+                            }
+                            options={BR_STATE_OPTIONS}
+                            error={!!errors.state}
+                            errorMessage={errors.state?.message}
+                          />
+                        )}
+                      />
+                    </div>
+                  </div>
+                </div>
+              </>
+            )}
           </div>
 
           <div className="flex items-center justify-end p-4 lg:p-5 border-t border-zinc-200 shrink-0">

package/src/i18n/messages/en-us.ts

@@ -354,6 +354,8 @@ const messages = {
       title: 'Complete your billing information',
       description:
         'We need this information to issue the invoice for your payments. Filling it in is required to keep using the platform.',
+      descriptionInternational:
+        'Since your billing address is outside Brazil, we only need your name and email for your payment receipts.',
       addressHeading: 'Billing address',
       select: 'Select',
       typeHere: 'Type here',

package/src/i18n/messages/es-es.ts

@@ -355,6 +355,8 @@ const messages = {
       title: 'Completa tus datos de facturación',
       description:
         'Necesitamos esta información para emitir la factura de tus pagos. Completarla es obligatorio para seguir usando la plataforma.',
+      descriptionInternational:
+        'Como tu facturación es fuera de Brasil, solo necesitamos tu nombre y correo para los recibos de tus pagos.',
       addressHeading: 'Dirección de facturación',
       select: 'Selecciona',
       typeHere: 'Escribe aquí',

package/src/i18n/messages/pt-br.ts

@@ -367,6 +367,8 @@ const messages = {
       title: 'Complete seus dados de cobrança',
       description:
         'Precisamos dessas informações para emitir a nota fiscal dos seus pagamentos. O preenchimento é obrigatório para continuar usando a plataforma.',
+      descriptionInternational:
+        'Como sua cobrança é fora do Brasil, precisamos apenas do nome e do e-mail para os recibos dos seus pagamentos.',
       addressHeading: 'Endereço de cobrança',
       select: 'Selecione',
       typeHere: 'Digite aqui',

package/src/index.ts

@@ -224,6 +224,9 @@ export {
 export { SUBSCRIPTION_GRACE_PERIOD_DAYS } from "./modules/subscriptions/constants/subscription.constants";
 export { getSubscriptionCancellationState } from "./modules/subscriptions/utils/get-subscription-cancellation-state";
 export type { SubscriptionCancellationState } from "./modules/subscriptions/utils/get-subscription-cancellation-state";
+export { getScheduledPlanItems } from "./modules/subscriptions/utils/get-scheduled-plan-items";
+export { isLimitedByScheduledDowngrade } from "./modules/subscriptions/utils/is-limited-by-scheduled-downgrade";
+export type { ScheduledPlanItem } from "./modules/subscriptions/utils/get-scheduled-plan-items";
 export {
   ACCOUNT_FREEZE_AFTER_DAYS,
   FREEZE_WARNING_DAYS_BEFORE,

package/src/middlewares/chain.ts

@@ -1,6 +1,16 @@
 import { NextRequest, NextResponse } from 'next/server';
 
 import { MiddlewareConfig } from './types';
+import { GEO_COUNTRY_COOKIE, GEO_UNKNOWN_COUNTRIES } from '../utils/geo-country';
+
+function publishGeoCountry(request: NextRequest, response: NextResponse): void {
+  const country = request.headers.get('cf-ipcountry')?.toUpperCase();
+
+  if (!country || GEO_UNKNOWN_COUNTRIES.includes(country)) return;
+  if (request.cookies.get(GEO_COUNTRY_COOKIE)?.value === country) return;
+
+  response.cookies.set(GEO_COUNTRY_COOKIE, country, { path: '/', sameSite: 'lax' });
+}
 
 function shouldProcessPath(pathname: string, config: MiddlewareConfig): boolean {
   const { excludePaths, includePaths } = config;
@@ -40,6 +50,9 @@ export function createMiddlewareChain(middlewares: MiddlewareConfig[]) {
       }
     }
 
-    return NextResponse.next();
+    const response = NextResponse.next();
+    publishGeoCountry(request, response);
+
+    return response;
   };
 }

package/src/modules/auth/utils/assert-subscription-addon.ts

@@ -3,6 +3,9 @@ import "server-only";
 import { ApiError } from "../../../infra/api/types";
 import { listSubscriptionsAction } from "../../subscriptions/actions/list-subscriptions.action";
 import type { AddonKindEnum } from "../../subscriptions/constants/addons.constants";
+import { getScheduledPlanItems } from "../../subscriptions/utils/get-scheduled-plan-items";
+
+export const ADDON_SCHEDULED_FOR_REMOVAL = "ADDON_SCHEDULED_FOR_REMOVAL";
 
 export async function assertSubscriptionAddon(
   addonId: AddonKindEnum,
@@ -39,4 +42,13 @@ export async function assertSubscriptionAddon(
       403,
     );
   }
+
+  const scheduledItems = getScheduledPlanItems(subscription);
+  if (scheduledItems && !scheduledItems.some((item) => item.id_addon === addonId)) {
+    throw new ApiError(
+      `O plano agendado para o próximo ciclo não inclui ${addonLabel}. Cancele o downgrade agendado para voltar a usar este recurso.`,
+      ADDON_SCHEDULED_FOR_REMOVAL,
+      403,
+    );
+  }
 }

package/src/modules/plans/hooks/use-has-plan-addon.hook.ts

@@ -2,13 +2,16 @@
 
 import type { AddonKindEnum } from '../../subscriptions/constants/addons.constants';
 import { useActiveSubscription } from '../../subscriptions/hooks/find-active-subscription.hook';
+import { getScheduledPlanItems } from '../../subscriptions/utils/get-scheduled-plan-items';
 
 export function useHasPlanAddon(addonId: AddonKindEnum) {
   const { data: subscriptionData, isLoading: isLoadingSubscription } = useActiveSubscription();
   const activeSubscription = subscriptionData?.data?.[0] ?? null;
 
   const hasAddon = !!activeSubscription?.items?.find((i) => i.id_addon === addonId);
-  const isLoading = isLoadingSubscription;
 
-  return { hasAddon, isLoading };
+  const scheduledItems = getScheduledPlanItems(activeSubscription);
+  const keepsAddon = !scheduledItems || scheduledItems.some((i) => i.id_addon === addonId);
+
+  return { hasAddon: hasAddon && keepsAddon, isLoading: isLoadingSubscription };
 }

package/src/modules/subscriptions/types/subscription.type.ts

@@ -85,6 +85,7 @@ export const SubscriptionSchema = z.object({
       is_plan_base: z.boolean(),
       is_ai_credit: z.boolean(),
     })),
+    new_limits: z.record(z.string(), z.number()).nullable().optional(),
     new_discounts: z.array(z.unknown()),
     changes: z.array(z.object({
       type: z.string(),

package/src/modules/subscriptions/utils/get-scheduled-plan-items.ts

@@ -0,0 +1,15 @@
+import type { Subscription, SubscriptionItem } from "../types/subscription.type";
+
+export type ScheduledPlanItem = Pick<SubscriptionItem, "id_addon" | "quantity">;
+
+export function getScheduledPlanItems(
+  subscription: Pick<Subscription, "pending_change"> | undefined | null,
+): ScheduledPlanItem[] | null {
+  const newLimits = subscription?.pending_change?.new_limits;
+  if (!newLimits || Object.keys(newLimits).length === 0) return null;
+
+  return Object.entries(newLimits).map(([idAddon, quantity]) => ({
+    id_addon: Number(idAddon),
+    quantity,
+  }));
+}

package/src/modules/subscriptions/utils/is-limited-by-scheduled-downgrade.ts

@@ -0,0 +1,24 @@
+import type { Subscription } from "../types/subscription.type";
+import { ADDON_IDS, type AddonKindEnum } from "../constants/addons.constants";
+
+export function isLimitedByScheduledDowngrade(
+  subscription: Subscription | undefined | null,
+  addonId: AddonKindEnum,
+): boolean {
+  const newLimits = subscription?.pending_change?.new_limits;
+  if (!newLimits || Object.keys(newLimits).length === 0) return false;
+
+  const scheduled = newLimits[String(addonId)];
+  if (scheduled == null) return true;
+
+  const current = (subscription?.items ?? [])
+    .filter((item) => item.id_addon === addonId)
+    .reduce((sum, item) => sum + (item.quantity ?? 0), 0);
+
+  if (addonId === ADDON_IDS.DOMAINS) return scheduled < current;
+
+  if (scheduled === 0) return false;
+  if (current === 0) return true;
+
+  return scheduled < current;
+}

package/src/server.ts

@@ -10,6 +10,7 @@ export { revalidateWhitelabelAction } from './modules/whitelabel/actions/revalid
 export { assertManagementPermission } from './modules/auth/utils/assert-management-permission';
 export { assertManagementSubscription } from './modules/auth/utils/assert-management-subscription';
 export { assertSubscriptionAddon } from './modules/auth/utils/assert-subscription-addon';
+export { ADDON_SCHEDULED_FOR_REMOVAL } from './modules/auth/utils/assert-subscription-addon';
 export { assertPaidSubscription } from './modules/auth/utils/assert-paid-subscription';
 export { assertAccountNotFrozen } from './modules/auth/utils/assert-account-not-frozen';
 export { subscriptionsService } from './modules/subscriptions/services/subscriptions.service';

package/src/utils/geo-country.ts

@@ -0,0 +1,15 @@
+import { COUNTRIES } from './countries';
+
+export const GEO_COUNTRY_COOKIE = 'gs-geo-country';
+
+export const GEO_UNKNOWN_COUNTRIES = ['XX', 'T1'];
+
+export function readGeoCountry(): string | null {
+  if (typeof document === 'undefined') return null;
+
+  const match = new RegExp(`(?:^|;\\s*)${GEO_COUNTRY_COOKIE}=([^;]+)`).exec(document.cookie);
+  if (!match) return null;
+
+  const iso = match[1].toUpperCase();
+  return COUNTRIES.some((country: { iso: string }) => country.iso === iso) ? iso : null;
+}