diff --git a/frontend/src/lib/components/dashboard/invoices/edit/items/fa/main-data.svelte b/frontend/src/lib/components/dashboard/invoices/edit/items/fa/main-data.svelte
index 83a1ba37..dc253760 100644
--- a/frontend/src/lib/components/dashboard/invoices/edit/items/fa/main-data.svelte
+++ b/frontend/src/lib/components/dashboard/invoices/edit/items/fa/main-data.svelte
@@ -6,6 +6,7 @@
import UnitOfMeasureDialog from './unit-of-measure-dialog.svelte';
import CountryDialog from './country-dialog.svelte';
import TariffFractionDialog from './tariff-fraction-dialog.svelte';
+ import ClassDialog from './class-dialog.svelte';
import type { LineItem, LineQuantities, LineFinancials, LineCustoms } from '$lib/api/dashboard/a76/items';
let {
@@ -20,12 +21,26 @@
customs: LineCustoms;
} = $props();
+ let showClassDialog = $state(false);
let showUnitDialog = $state(false);
let showCountryDialog = $state(false);
let showFractionDialog = $state(false);
+ // Initialize from existing data
+ $effect(() => {
+ if (lineItem.class_code) {
+ // Do nothing, it's already set
+ }
+ });
+
+ function handleClassSelect(classItem: any) {
+ lineItem.class_id = classItem.id;
+ // Store the code in the lineItem for display
+ (lineItem as any).class_code = classItem.class_code;
+ }
+
function handleUnitSelect(unit: any) {
- lineItem.unit_of_measure = unit.code;
+ lineItem.unit_of_measure = unit.id;
}
function handleCountrySelect(country: any) {
@@ -37,6 +52,7 @@
}
+
-
-
+
+
+
+
+
+ {#if (lineItem as any).class_code}
+
Código: {(lineItem as any).class_code}
+ {/if}
@@ -60,7 +95,7 @@
-
+
diff --git a/frontend/src/lib/components/dashboard/invoices/edit/items/fa/tab-identifiers.svelte b/frontend/src/lib/components/dashboard/invoices/edit/items/fa/tab-identifiers.svelte
index 31542f67..dd5d1e5e 100644
--- a/frontend/src/lib/components/dashboard/invoices/edit/items/fa/tab-identifiers.svelte
+++ b/frontend/src/lib/components/dashboard/invoices/edit/items/fa/tab-identifiers.svelte
@@ -18,6 +18,7 @@
diff --git a/frontend/src/lib/components/dashboard/invoices/edit/items/items-tab-form.svelte b/frontend/src/lib/components/dashboard/invoices/edit/items/items-tab-form.svelte
index d354044a..dd017cfe 100644
--- a/frontend/src/lib/components/dashboard/invoices/edit/items/items-tab-form.svelte
+++ b/frontend/src/lib/components/dashboard/invoices/edit/items/items-tab-form.svelte
@@ -83,6 +83,8 @@
if (response.data) {
items = response.data.items || [];
currentPage = 1;
+ // Wait for derived state to update before loading items
+ await new Promise(resolve => setTimeout(resolve, 0));
loadMoreItems();
}
} catch (error: any) {
@@ -150,6 +152,8 @@
tax_payment: false,
payment_method: undefined,
igi_amount: undefined,
+ is_military_mcia: false,
+ wildcard_field: undefined,
// Nested relations
financial: {
unit_cost_usd: undefined,
@@ -191,6 +195,10 @@
brand: undefined,
model: undefined,
has_serial: false,
+ eighth_rule_fraction: undefined,
+ eighth_rule_line: undefined,
+ consider_a31: false,
+ machinery_location: undefined,
},
reference: {
serie_id: undefined,
@@ -263,18 +271,61 @@
showDeleteDialog = true;
}
+ // Helper function to check if an object has any meaningful values
+ function hasValues(obj: any): boolean {
+ if (!obj || typeof obj !== 'object') return false;
+ return Object.values(obj).some(val =>
+ val !== undefined && val !== null && val !== '' &&
+ !(typeof val === 'object' && !hasValues(val))
+ );
+ }
+
+ // Clean nested data before sending to API
+ function cleanLineData(line: any) {
+ const cleaned: any = { ...line };
+
+ // Helper function to convert to number or undefined
+ const toNumberOrUndefined = (value: any): number | undefined => {
+ if (value === undefined || value === null || value === '') {
+ return undefined;
+ }
+ const numValue = Number(value);
+ return (!isNaN(numValue) && isFinite(numValue)) ? numValue : undefined;
+ };
+
+ // Convert integer fields
+ cleaned.part_number_id = toNumberOrUndefined(cleaned.part_number_id);
+ cleaned.component_part_number_id = toNumberOrUndefined(cleaned.component_part_number_id);
+ cleaned.class_id = toNumberOrUndefined(cleaned.class_id);
+ cleaned.unit_of_measure = toNumberOrUndefined(cleaned.unit_of_measure);
+ cleaned.alternate_unit = toNumberOrUndefined(cleaned.alternate_unit);
+
+ // Remove empty nested objects
+ if (!hasValues(cleaned.financial)) delete cleaned.financial;
+ if (!hasValues(cleaned.quantity)) delete cleaned.quantity;
+ if (!hasValues(cleaned.customs)) delete cleaned.customs;
+ if (!hasValues(cleaned.description)) delete cleaned.description;
+ if (!hasValues(cleaned.reference)) delete cleaned.reference;
+ if (!hasValues(cleaned.fa_data)) delete cleaned.fa_data;
+
+ return cleaned;
+ }
+
async function saveNewItem() {
if (!invoice?.id || !activeCompanyId) return;
isSaving = true;
try {
+ // Clean lines data before sending
+ const cleanedLines = (editingItem.lines || []).map(cleanLineData);
+
const response = await itemsApi.create(activeCompanyId, {
invoice_id: invoice.id,
reference_number: editingItem.reference_number,
order: editingItem.order,
warehouse: editingItem.warehouse,
location: editingItem.location,
- lines: editingItem.lines || []
+ lines: cleanedLines
});
// Recargar items
@@ -300,12 +351,15 @@
isSaving = true;
try {
+ // Clean lines data before sending
+ const cleanedLines = (editingItem.lines || []).map(cleanLineData);
+
await itemsApi.update(selectedItem.id, activeCompanyId, {
reference_number: editingItem.reference_number,
order: editingItem.order,
warehouse: editingItem.warehouse,
location: editingItem.location,
- lines: editingItem.lines || []
+ lines: cleanedLines
});
// Recargar items
diff --git a/frontend/src/lib/components/dashboard/invoices/edit/save-invoice.ts b/frontend/src/lib/components/dashboard/invoices/edit/save-invoice.ts
index 9660f5b3..0cab46f7 100644
--- a/frontend/src/lib/components/dashboard/invoices/edit/save-invoice.ts
+++ b/frontend/src/lib/components/dashboard/invoices/edit/save-invoice.ts
@@ -158,7 +158,7 @@ function buildInvoicePayload(formData: FormDataSet): CreateInvoiceData | UpdateI
}
// Logistics
- payload.logistics = buildLogisticsData(generalFormData, observationFormData);
+ payload.logistics = buildLogisticsData(generalFormData, observationFormData, continuationFormData);
// Eliminar campos undefined para no enviarlos
Object.keys(payload).forEach(key => {
@@ -220,13 +220,30 @@ function buildFinancialsData(generalFormData: any, observationFormData: any, oth
};
}
-function buildLogisticsData(generalFormData: any, observationFormData: any) {
- // Retornar logistics como objeto único
+function buildLogisticsData(generalFormData: any, observationFormData: any, continuationFormData: any) {
+ // Retornar logistics como objeto único con datos de continuación
return {
carrier_id: generalFormData?.carrier_id || null,
transport_type: generalFormData?.transport_type || 'none',
driver_name: generalFormData?.driver_name || null,
- vehicle_num: generalFormData?.transport_num || null,
+ vehicle_num: generalFormData?.transport_num || continuationFormData?.numero_tipo_transporte || null,
incoterm: observationFormData?.incoterm || null,
+ // Campos de continuación mapeados a logistics
+ transport_num: continuationFormData?.numero_tipo_transporte || null,
+ is_rail: continuationFormData?.es_ferrocarril === 'si' ? true : false,
+ bill_number: continuationFormData?.numero_bl || null,
+ guide_number: continuationFormData?.cantidad_guias_embarque ? String(continuationFormData.cantidad_guias_embarque) : null,
+ destination_location: continuationFormData?.destino_origen || null,
+ origin_location: continuationFormData?.puerto_entrada || null,
+ // Checkboxes de continuación
+ equipment_reviewed: continuationFormData?.fue_revisado_equipo || false,
+ is_subdivision: continuationFormData?.sub_division || false,
+ acts_as_cd: continuationFormData?.funge_como_cd || false,
+ pedimento_arrived: continuationFormData?.llego_pedimento || false,
+ // Semáforos de continuación
+ green_light_mx: continuationFormData?.semaforo_verde_aduana_mexicana || false,
+ green_light_us: continuationFormData?.semaforo_verde_aduana_americana || false,
+ red_light_mx: continuationFormData?.semaforo_rojo_aduana_mexicana || false,
+ red_light_us: continuationFormData?.semaforo_rojo_aduana_americana || false,
};
}
diff --git a/frontend/src/routes/api-sveltekit/classes/+server.ts b/frontend/src/routes/api-sveltekit/classes/+server.ts
new file mode 100644
index 00000000..3fc38241
--- /dev/null
+++ b/frontend/src/routes/api-sveltekit/classes/+server.ts
@@ -0,0 +1,91 @@
+import type { RequestHandler } from './$types';
+
+export const GET: RequestHandler = async ({ cookies, url }) => {
+ const token = cookies.get('access_token');
+
+ // Obtener company_id de la cookie
+ const companyId = cookies.get('active_company_id');
+
+ if (!companyId) {
+ return new Response(
+ JSON.stringify({ error: 'No company selected' }),
+ {
+ status: 400,
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }
+ );
+ }
+
+ // Configurar la URL de la API usando las variables de entorno
+ let apiUrl = process.env.INTERNAL_API_URL;
+ if (!apiUrl) {
+ apiUrl = process.env.VITE_API_URL;
+ // Reemplazar 'localhost' con 'backend' para llamadas desde el servidor (SSR)
+ apiUrl = apiUrl?.replace('localhost', 'backend').replace('127.0.0.1', 'backend');
+ }
+
+ // Normalizar la URL
+ const baseUrl = apiUrl?.endsWith('/') ? apiUrl : `${apiUrl}/`;
+
+ // Get query parameters and add company_id
+ const searchParams = new URLSearchParams(url.search);
+ searchParams.set('company_id', companyId);
+ const queryString = searchParams.toString();
+
+ try {
+ const fetchUrl = `${baseUrl}v1/a76/classes?${queryString}`;
+ console.log('Fetching classes from:', fetchUrl);
+
+ const response = await fetch(
+ fetchUrl,
+ {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ Authorization: `Bearer ${token}`
+ }
+ }
+ );
+
+ if (!response.ok) {
+ const errorText = await response.text();
+ console.error('Error response from backend:', errorText);
+ return new Response(
+ JSON.stringify({
+ error: 'Failed to fetch classes',
+ details: errorText
+ }),
+ {
+ status: response.status,
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }
+ );
+ }
+
+ const data = await response.json();
+ return new Response(JSON.stringify(data), {
+ status: 200,
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ });
+ } catch (error) {
+ console.error('Error in classes API route:', error);
+ return new Response(
+ JSON.stringify({
+ error: 'Internal server error',
+ message: error instanceof Error ? error.message : 'Unknown error'
+ }),
+ {
+ status: 500,
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }
+ );
+ }
+};