+
Reporte de Inventario
-
+
-
+
-
+
+
-
-
-
+
+
{tableData.length > 0 && (
-
+
+
+
)}
);
diff --git a/src/app/(dashboard)/reports/sales/page.tsx b/src/app/(dashboard)/reports/sales/page.tsx
index 093fa5f..0322f1f 100644
--- a/src/app/(dashboard)/reports/sales/page.tsx
+++ b/src/app/(dashboard)/reports/sales/page.tsx
@@ -16,6 +16,8 @@ import {
CityResponse,
BranchResponse,
} from '@pharmatech/sdk';
+import { formatPrice } from '@/lib/utils/priceFormatter';
+import Button from '@/components/Button';
const COUNTRY_ID = '1238bc2a-45a5-47e4-9cc1-68d573089ca1';
@@ -38,8 +40,7 @@ export default function ReportPreviewPage() {
(async () => {
try {
- const profile = await api.user.getProfile(user.sub, token);
- setUserName(`${profile.firstName} ${profile.lastName}`);
+ setUserName(user.name);
const stateResponse = await api.state.findAll({
page: 1,
@@ -110,8 +111,18 @@ export default function ReportPreviewPage() {
{ key: 'discount', label: 'Descuento' },
{ key: 'total', label: 'Total' },
];
-
- const formatCurrency = (n: number) => `$${n.toFixed(2)}`;
+ const tableData = useMemo(() => {
+ return reportData?.items.map((item) => {
+ return {
+ ...item,
+ orderId: `#${String(item.orderId).slice(0, 4)}`,
+ subtotal: Number(formatPrice(item.subtotal)),
+ discount: Number(formatPrice(item.discount)),
+ date: new Date(item.date).toLocaleDateString('es-VE'),
+ total: Number(formatPrice(item.total)),
+ };
+ });
+ }, [reportData]);
const handleDownload = async () => {
if (!reportData || !startDate || !endDate) return;
@@ -121,13 +132,13 @@ export default function ReportPreviewPage() {
const totals = [
{
label: 'Subtotal General',
- value: formatCurrency(reportData.totals.subtotal),
+ value: formatPrice(reportData.totals.subtotal),
},
{
label: 'Descuento Total',
- value: formatCurrency(reportData.totals.discount),
+ value: formatPrice(reportData.totals.discount),
},
- { label: 'Total Final', value: formatCurrency(reportData.totals.total) },
+ { label: 'Total Final', value: formatPrice(reportData.totals.total) },
];
const blob = await pdf(
@@ -137,15 +148,7 @@ export default function ReportPreviewPage() {
userName={userName}
printDate={printDate}
columns={columns}
- data={reportData.items.map((item) => {
- const dateObj = new Date(item.date);
- const formattedDate = dateObj.toLocaleDateString('es-VE');
- return {
- ...item,
- orderId: `#${String(item.orderId).slice(0, 4)}`,
- date: formattedDate,
- };
- })}
+ data={tableData!}
totals={totals}
/>,
).toBlob();
@@ -154,25 +157,31 @@ export default function ReportPreviewPage() {
};
return (
-
+
Reporte de Ventas
{/* Filtros de fecha */}
-
+
-
+
{/* Filtros de ubicación */}
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
+
);
diff --git a/src/app/(dashboard)/upload-files/page.tsx b/src/app/(dashboard)/upload-files/page.tsx
index ed69162..5f0f6b5 100644
--- a/src/app/(dashboard)/upload-files/page.tsx
+++ b/src/app/(dashboard)/upload-files/page.tsx
@@ -4,8 +4,10 @@ import CsvUploader from '@/components/FileHelper/UploadCsv';
export default function InventoryPage() {
return (
-
-
Gestión de Inventario
+
+
+ Gestión de Inventario
+
);
diff --git a/src/app/(dashboard)/users/[id]/edit/page.tsx b/src/app/(dashboard)/users/[id]/edit/page.tsx
index 5c9c095..d613b5d 100644
--- a/src/app/(dashboard)/users/[id]/edit/page.tsx
+++ b/src/app/(dashboard)/users/[id]/edit/page.tsx
@@ -15,6 +15,7 @@ import Input from '@/components/Input/Input';
import Dropdown from '@/components/Dropdown';
import RadioButton from '@/components/RadioButton';
import { FontSizes } from '@/styles/styles';
+import { convertSlashDateToIso } from '@/lib/utils/useFormatDate';
const roleLabels: Record
= {
[UserRole.ADMIN]: 'Administrador',
@@ -23,13 +24,6 @@ const roleLabels: Record = {
[UserRole.DELIVERY]: 'Delivery',
};
-const formatDate = (dateStr: string): string => {
- const parts = dateStr.split('/');
- if (parts.length !== 3) return dateStr;
- const [day, month, year] = parts;
- return `${year}-${month.padStart(2, '0')}-${day.padStart(2, '0')}`;
-};
-
export default function EditUserPage() {
const params = useParams();
const id = params?.id && typeof params.id === 'string' ? params.id : '';
@@ -96,25 +90,25 @@ export default function EditUserPage() {
const genero = gender === UserGender.MALE ? 'hombre' : 'mujer';
const result = registerSchema.safeParse({
- nombre: firstName,
- apellido: lastName,
+ firstName: firstName,
+ lastName: lastName,
email,
- cedula: documentId,
- telefono: phoneNumber,
- fechaNacimiento: birthDate ? formatDate(birthDate) : null,
- genero,
+ documentId: documentId,
+ phoneNumber: phoneNumber,
+ birthDate: birthDate ? convertSlashDateToIso(birthDate) : null,
+ gender: genero,
});
if (!result.success) {
const fieldErrors = result.error.flatten().fieldErrors;
setErrors({
- firstName: fieldErrors.nombre?.[0] || '',
- lastName: fieldErrors.apellido?.[0] || '',
+ firstName: fieldErrors.firstName?.[0] || '',
+ lastName: fieldErrors.lastName?.[0] || '',
email: fieldErrors.email?.[0] || '',
- documentId: fieldErrors.cedula?.[0] || '',
- phoneNumber: fieldErrors.telefono?.[0] || '',
- birthDate: fieldErrors.fechaNacimiento?.[0] || '',
- gender: fieldErrors.genero?.[0] || '',
+ documentId: fieldErrors.documentId?.[0] || '',
+ phoneNumber: fieldErrors.phoneNumber?.[0] || '',
+ birthDate: fieldErrors.birthDate?.[0] || '',
+ gender: fieldErrors.gender?.[0] || '',
});
toast.error('Por favor, revisa los errores en el formulario');
return;
@@ -132,7 +126,7 @@ export default function EditUserPage() {
firstName: firstName ?? undefined,
lastName: lastName ?? undefined,
phoneNumber: phoneNumber ?? undefined,
- birthDate: birthDate ? formatDate(birthDate) : undefined,
+ birthDate: birthDate ? convertSlashDateToIso(birthDate) : undefined,
gender,
role: role ?? undefined,
};
@@ -206,7 +200,6 @@ export default function EditUserPage() {
helperText={errors.firstName}
helperTextColor={Colors.semanticDanger}
borderSize="1px"
- borderColor={Colors.stroke}
/>
@@ -219,7 +212,6 @@ export default function EditUserPage() {
helperText={errors.documentId}
helperTextColor={Colors.semanticDanger}
borderSize="1px"
- borderColor={Colors.stroke}
readViewOnly
/>
@@ -233,7 +225,6 @@ export default function EditUserPage() {
onChange={(e) => setBirthDate(e.target.value)}
helperText={errors.birthDate}
helperTextColor={Colors.semanticDanger}
- borderColor={Colors.stroke}
borderSize="1px"
/>
@@ -247,7 +238,6 @@ export default function EditUserPage() {
onChange={(e) => setPhoneNumber(e.target.value)}
helperText={errors.phoneNumber}
helperTextColor={Colors.semanticDanger}
- borderColor={Colors.stroke}
borderSize="1px"
/>
@@ -264,7 +254,6 @@ export default function EditUserPage() {
onChange={(e) => setLastName(e.target.value)}
helperText={errors.lastName}
helperTextColor={Colors.semanticDanger}
- borderColor={Colors.stroke}
borderSize="1px"
/>
@@ -330,7 +319,6 @@ export default function EditUserPage() {
onChange={(e) => setEmail(e.target.value)}
helperText={errors.email}
helperTextColor={Colors.semanticDanger}
- borderColor={Colors.stroke}
borderSize="1px"
readViewOnly
/>
diff --git a/src/app/(dashboard)/users/[id]/page.tsx b/src/app/(dashboard)/users/[id]/page.tsx
index 9c6ec3f..f43d390 100644
--- a/src/app/(dashboard)/users/[id]/page.tsx
+++ b/src/app/(dashboard)/users/[id]/page.tsx
@@ -14,6 +14,7 @@ import { useAuth } from '@/context/AuthContext';
import Loading from '../../loading';
import { UserList, UserRole } from '@pharmatech/sdk';
import Input from '@/components/Input/Input';
+import { formatDateSafe } from '@/lib/utils/useFormatDate';
const roleLabels = {
[UserRole.ADMIN]: 'Administrador',
@@ -79,9 +80,8 @@ export default function UserDetailsPage() {
const handleCancel = () => setShowModal(false);
const formattedBirthDate = user?.profile?.birthDate
- ? new Date(user.profile.birthDate).toLocaleDateString('es-ES')
+ ? formatDateSafe(user.profile.birthDate)
: '';
-
const displayGender =
user?.profile?.gender === 'm'
? 'Masculino'
diff --git a/src/app/(dashboard)/users/new/page.tsx b/src/app/(dashboard)/users/new/page.tsx
index 9aa5309..2b85050 100644
--- a/src/app/(dashboard)/users/new/page.tsx
+++ b/src/app/(dashboard)/users/new/page.tsx
@@ -14,6 +14,7 @@ import { registerSchema } from '@/lib/validations/registerSchema';
import { REDIRECTION_TIMEOUT } from '@/lib/utils/contants';
import { UserGender, UserRole } from '@pharmatech/sdk';
import Input from '@/components/Input/Input';
+import { convertSlashDateToIso } from '@/lib/utils/useFormatDate';
// Mapeo para mostrar etiquetas en el dropdown y obtener el valor que espera la API
const roleMapping: Record
= {
@@ -23,14 +24,6 @@ const roleMapping: Record = {
Delivery: UserRole.DELIVERY,
};
-// Función para convertir fecha de "DD/MM/YYYY" a "YYYY-MM-DD"
-const formatDate = (dateStr: string): string => {
- const parts = dateStr.split('/');
- if (parts.length !== 3) return dateStr;
- const [day, month, year] = parts;
- return `${year}-${month.padStart(2, '0')}-${day.padStart(2, '0')}`;
-};
-
function getErrorMessage(error: unknown): string {
if (typeof error === 'object' && error !== null && 'messages' in error) {
const errorObj = error as Record;
@@ -88,25 +81,25 @@ export default function NewUserPage() {
// Prepara los datos para la validación usando el schema
const result = registerSchema.safeParse({
- nombre: firstName,
- apellido: lastName,
+ firstName: firstName,
+ lastName: lastName,
email,
- cedula: documentId,
- telefono: phoneNumber,
- fechaNacimiento: formatDate(birthDate), // Se espera formato yyyy-mm-dd
- genero,
+ documentId: documentId,
+ phoneNumber: phoneNumber,
+ birthDate: convertSlashDateToIso(birthDate), // Se espera formato yyyy-mm-dd
+ gender: genero,
});
if (!result.success) {
const { fieldErrors } = result.error.flatten();
setErrors({
- firstName: fieldErrors.nombre?.[0] || '',
- lastName: fieldErrors.apellido?.[0] || '',
+ firstName: fieldErrors.firstName?.[0] || '',
+ lastName: fieldErrors.lastName?.[0] || '',
email: fieldErrors.email?.[0] || '',
- documentId: fieldErrors.cedula?.[0] || '',
- phoneNumber: fieldErrors.telefono?.[0] || '',
- birthDate: fieldErrors.fechaNacimiento?.[0] || '',
- gender: fieldErrors.genero?.[0] || '',
+ documentId: fieldErrors.documentId?.[0] || '',
+ phoneNumber: fieldErrors.phoneNumber?.[0] || '',
+ birthDate: fieldErrors.birthDate?.[0] || '',
+ gender: fieldErrors.gender?.[0] || '',
});
toast.error('Por favor, revisa los errores en el formulario');
return;
@@ -127,7 +120,7 @@ export default function NewUserPage() {
}
const mappedRole = roleMapping[role] || UserRole.CUSTOMER;
- const formattedBirthDate = formatDate(birthDate);
+ const formattedBirthDate = convertSlashDateToIso(birthDate);
const payload = {
firstName,
@@ -209,7 +202,6 @@ export default function NewUserPage() {
helperText={errors.firstName}
helperTextColor={Colors.semanticDanger}
borderSize="1px"
- borderColor="#E7E7E6"
/>
@@ -222,7 +214,6 @@ export default function NewUserPage() {
helperText={errors.lastName}
helperTextColor={Colors.semanticDanger}
borderSize="1px"
- borderColor="#E7E7E6"
/>
@@ -237,7 +228,6 @@ export default function NewUserPage() {
helperText={errors.documentId}
helperTextColor={Colors.semanticDanger}
borderSize="1px"
- borderColor="#E7E7E6"
/>
@@ -302,7 +292,6 @@ export default function NewUserPage() {
helperText={errors.phoneNumber}
helperTextColor={Colors.semanticDanger}
borderSize="1px"
- borderColor="#E7E7E6"
/>
@@ -315,7 +304,6 @@ export default function NewUserPage() {
helperText={errors.email}
helperTextColor={Colors.semanticDanger}
borderSize="1px"
- borderColor="#E7E7E6"
/>