diff --git a/apps/web/src/settings/settings-layout.tsx b/apps/web/src/settings/settings-layout.tsx index 8507a49c..637d5a39 100644 --- a/apps/web/src/settings/settings-layout.tsx +++ b/apps/web/src/settings/settings-layout.tsx @@ -24,13 +24,13 @@ export const SettingsLayout = ({ sections }: SettingsLayoutProps) => { return ( - - - + + +
- + ); }; diff --git a/modules/catalogs/src/web/settings/payment-methods/ui/pages/payment-methods-settings-page.tsx b/modules/catalogs/src/web/settings/payment-methods/ui/pages/payment-methods-settings-page.tsx index 325d1f2c..04d181a0 100644 --- a/modules/catalogs/src/web/settings/payment-methods/ui/pages/payment-methods-settings-page.tsx +++ b/modules/catalogs/src/web/settings/payment-methods/ui/pages/payment-methods-settings-page.tsx @@ -1,5 +1,5 @@ import { PageErrorState } from "@erp/core/components"; -import { RdxBadge, RdxPageContainer } from "@repo/rdx-ui/components"; +import { RdxBadge } from "@repo/rdx-ui/components"; import { Button, Card, @@ -30,27 +30,23 @@ export const PaymentMethodsSettingsPage = () => { if (ctrl.pageError) { return ( - -
- -
- + ); } diff --git a/modules/catalogs/src/web/settings/payment-terms/ui/pages/payment-terms-settings-page.tsx b/modules/catalogs/src/web/settings/payment-terms/ui/pages/payment-terms-settings-page.tsx index 3c5b0ab9..064aacb2 100644 --- a/modules/catalogs/src/web/settings/payment-terms/ui/pages/payment-terms-settings-page.tsx +++ b/modules/catalogs/src/web/settings/payment-terms/ui/pages/payment-terms-settings-page.tsx @@ -1,5 +1,4 @@ import { PageErrorState } from "@erp/core/components"; -import { RdxPageContainer } from "@repo/rdx-ui/components"; import { Button, Card, @@ -38,27 +37,23 @@ export const PaymentTermsSettingsPage = () => { if (ctrl.pageError) { return ( - -
- -
- + ); } diff --git a/modules/catalogs/src/web/settings/tax-regimes/ui/pages/tax-regimes-settings-page.tsx b/modules/catalogs/src/web/settings/tax-regimes/ui/pages/tax-regimes-settings-page.tsx index b48ea0fe..3ca150bf 100644 --- a/modules/catalogs/src/web/settings/tax-regimes/ui/pages/tax-regimes-settings-page.tsx +++ b/modules/catalogs/src/web/settings/tax-regimes/ui/pages/tax-regimes-settings-page.tsx @@ -1,5 +1,5 @@ import { PageErrorState } from "@erp/core/components"; -import { RdxBadge, RdxPageContainer } from "@repo/rdx-ui/components"; +import { RdxBadge } from "@repo/rdx-ui/components"; import { Button, Card, CardContent, CardHeader } from "@repo/shadcn-ui/components"; import { cn } from "@repo/shadcn-ui/lib/utils"; import { CircleIcon, LandmarkIcon, PlusIcon } from "lucide-react"; @@ -23,27 +23,23 @@ export const TaxRegimesSettingsPage = () => { if (ctrl.pageError) { return ( - -
- -
- + ); } diff --git a/modules/customer-invoices/src/web/issued-invoices/list/ui/components/issued-invoices-status-segmented-filter.tsx b/modules/customer-invoices/src/web/issued-invoices/list/ui/components/issued-invoices-status-segmented-filter.tsx index 0d1f9439..f5a3974b 100644 --- a/modules/customer-invoices/src/web/issued-invoices/list/ui/components/issued-invoices-status-segmented-filter.tsx +++ b/modules/customer-invoices/src/web/issued-invoices/list/ui/components/issued-invoices-status-segmented-filter.tsx @@ -127,7 +127,8 @@ export const IssuedInvoicesStatusSegmentedFilter = ({ }: IssuedInvoicesStatusSegmentedFilterProps) => { const { t } = useTranslation(); - const handleValueChange = (nextValue: string) => { + const handleValueChange = (nextValues: string[]) => { + const nextValue = nextValues[0]; if (!(nextValue && isIssuedInvoiceStatusFilter(nextValue)) || nextValue === value) { return; } @@ -138,21 +139,22 @@ export const IssuedInvoicesStatusSegmentedFilter = ({ return ( {ISSUED_INVOICE_STATUS_FILTER_OPTIONS.map((option) => ( - {option.icon ? : null} + {option.icon ? : null} {t( `catalog.issued_invoices.status.${option.value.toLowerCase()}.label`, diff --git a/modules/customer-invoices/src/web/issued-invoices/list/ui/pages/list-issued-invoices-page.tsx b/modules/customer-invoices/src/web/issued-invoices/list/ui/pages/list-issued-invoices-page.tsx index 57767ab3..f0f1e27b 100644 --- a/modules/customer-invoices/src/web/issued-invoices/list/ui/pages/list-issued-invoices-page.tsx +++ b/modules/customer-invoices/src/web/issued-invoices/list/ui/pages/list-issued-invoices-page.tsx @@ -3,6 +3,7 @@ import { useReturnToNavigation } from "@erp/core/hooks"; import { LogoVerifactu, RdxPageContainer, + RdxPageContent, RdxPageFrame, RdxPageHeader, } from "@repo/rdx-ui/components"; @@ -65,34 +66,36 @@ export const ListIssuedInvoicesPage = () => { return ( - navigate("/"), - } - } - reference={pageError.reference} - secondaryAction={ - pageError.canRetry - ? { - label: t("pages.issued_invoices.list.actions.go_home"), - onClick: () => navigate("/"), - } - : undefined - } - title={pageError.title} - variant={pageError.variant} - /> + + navigate("/"), + } + } + reference={pageError.reference} + secondaryAction={ + pageError.canRetry + ? { + label: t("pages.issued_invoices.list.actions.go_home"), + onClick: () => navigate("/"), + } + : undefined + } + title={pageError.title} + variant={pageError.variant} + /> + ); @@ -100,78 +103,80 @@ export const ListIssuedInvoicesPage = () => { return ( - - navigate("/issued-invoices/create")} - > - - {t("pages.issued_invoices.create.title")} - - } - description={t("pages.issued_invoices.list.description")} - title={t("pages.issued_invoices.list.title")} - /> - -
- {hasRefreshError && refreshError ? ( - - ) : null} - - -
- ¡Atención! - - Las facturas de esta pantalla son de solo lectura. Se generan automáticamente al - emitir una proforma aprobada y no se pueden modificar ni eliminar. Solo puedes - descargar el PDF de cada factura. - -
- - - - -
-
- -
-
- - -
+ + + navigate("/issued-invoices/create")} + > + + {t("pages.issued_invoices.create.title")} + } + description={t("pages.issued_invoices.list.description")} + title={t("pages.issued_invoices.list.title")} /> - {listCtrl.data.totalItems === 0 ? : null} - +
+ {hasRefreshError && refreshError ? ( + + ) : null} + + +
+ ¡Atención! + + Las facturas de esta pantalla son de solo lectura. Se generan automáticamente al + emitir una proforma aprobada y no se pueden modificar ni eliminar. Solo puedes + descargar el PDF de cada factura. + +
+ + + + +
+
+ +
+
+ + +
+ } + /> + + {listCtrl.data.totalItems === 0 ? : null} + + ); diff --git a/modules/customer-invoices/src/web/proformas/list/ui/pages/list-proformas-page.tsx b/modules/customer-invoices/src/web/proformas/list/ui/pages/list-proformas-page.tsx index c0daf201..ee8b2594 100644 --- a/modules/customer-invoices/src/web/proformas/list/ui/pages/list-proformas-page.tsx +++ b/modules/customer-invoices/src/web/proformas/list/ui/pages/list-proformas-page.tsx @@ -1,6 +1,11 @@ import { PageErrorState, SimpleSearchInput } from "@erp/core/components"; import { useDataSource, useReturnToNavigation } from "@erp/core/hooks"; -import { type DataTableMeta, RdxPageContainer } from "@repo/rdx-ui/components"; +import { + type DataTableMeta, + RdxPageContainer, + RdxPageContent, + RdxPageFrame, +} from "@repo/rdx-ui/components"; import { showErrorToast, showSuccessToast } from "@repo/rdx-ui/helpers"; import { Button, @@ -458,30 +463,32 @@ const ScopedListProformasPage = ({ scope }: ScopedListProformasPageProps) => { if (pageError) { return ( - -
- -
- + + + + + + + ); } diff --git a/modules/customer-invoices/src/web/proformas/list/ui/pages/scoped-list-proformas-page-view.tsx b/modules/customer-invoices/src/web/proformas/list/ui/pages/scoped-list-proformas-page-view.tsx index 8d695aa7..2fa346b2 100644 --- a/modules/customer-invoices/src/web/proformas/list/ui/pages/scoped-list-proformas-page-view.tsx +++ b/modules/customer-invoices/src/web/proformas/list/ui/pages/scoped-list-proformas-page-view.tsx @@ -46,9 +46,9 @@ export const ScopedListProformasPageView = ({ {content} - - {dialogs} + + {dialogs} ); }; diff --git a/modules/customer-invoices/src/web/recurring-proformas/list/list-recurring-proformas-page.tsx b/modules/customer-invoices/src/web/recurring-proformas/list/list-recurring-proformas-page.tsx index 2f4af814..313ef021 100644 --- a/modules/customer-invoices/src/web/recurring-proformas/list/list-recurring-proformas-page.tsx +++ b/modules/customer-invoices/src/web/recurring-proformas/list/list-recurring-proformas-page.tsx @@ -4,6 +4,8 @@ import { DataTableColumnHeader, RdxBadge, RdxPageContainer, + RdxPageContent, + RdxPageFrame, type RdxRowAction, RdxRowActions, SkeletonDataTable, @@ -267,20 +269,22 @@ export const ListRecurringProformasPage = () => { if (hasBlockingError && pageError) { return ( - -
- -
- + + + + + + + ); } diff --git a/modules/customers/src/web/list/ui/pages/list-customers-page-view.tsx b/modules/customers/src/web/list/ui/pages/list-customers-page-view.tsx index 1231d113..572c374f 100644 --- a/modules/customers/src/web/list/ui/pages/list-customers-page-view.tsx +++ b/modules/customers/src/web/list/ui/pages/list-customers-page-view.tsx @@ -46,9 +46,9 @@ export const ListCustomersPageView = ({ {content} - - {dialogs} + + {dialogs} ); }; diff --git a/modules/customers/src/web/list/ui/pages/list-customers-page.tsx b/modules/customers/src/web/list/ui/pages/list-customers-page.tsx index 054ef8df..0b78cb4a 100644 --- a/modules/customers/src/web/list/ui/pages/list-customers-page.tsx +++ b/modules/customers/src/web/list/ui/pages/list-customers-page.tsx @@ -1,6 +1,6 @@ import { PageErrorState, SimpleSearchInput } from "@erp/core/components"; import { useReturnToNavigation } from "@erp/core/hooks"; -import { RdxPageContainer, RdxPageFrame } from "@repo/rdx-ui/components"; +import { RdxPageContainer, RdxPageContent, RdxPageFrame } from "@repo/rdx-ui/components"; import { Button, ResizableHandle, @@ -93,24 +93,26 @@ export const ListCustomersPage = () => { return ( - + + + ); diff --git a/modules/suppliers/src/web/list/ui/suppliers-list-page.tsx b/modules/suppliers/src/web/list/ui/suppliers-list-page.tsx index 10ae0658..e847f3bf 100644 --- a/modules/suppliers/src/web/list/ui/suppliers-list-page.tsx +++ b/modules/suppliers/src/web/list/ui/suppliers-list-page.tsx @@ -39,17 +39,19 @@ export const SuppliersListPage = () => { return ( - { - await controller.refetch(); - }, - }} - title={t("list.error.title")} - variant="unknown" - /> + + { + await controller.refetch(); + }, + }} + title={t("list.error.title")} + variant="unknown" + /> + );