ADUANASOFT/plantillas-proyectos
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix/trailers' (#387) from fix/trailers into development

Browse Source 
Reviewed-on: ADUANASOFT/anexo76#387
This commit is contained in:
acazares
2026-05-12 14:06:26 +00:00
parent 7671441d04 3a0a08fe80
commit f8356bbd5c
9 changed files with 173 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/lib/components/dashboard/invoices/edit/items/fa/state-dialog.svelte
View File

@@ -4,6 +4,7 @@
import { Input } from '$lib/components/ui/input';
import { Loader2, Search } from 'lucide-svelte';
import { statesApi, type State } from '$lib/api/dashboard/reference_data/states';
import { companyStore } from '$lib/stores/company.svelte';
import { m } from '$lib/i18n/messages';
let {
@@ -28,7 +29,8 @@
loading = true;
error = '';
try {
const response = await statesApi.list(1, 100);
const companyId = companyStore.activeCompany?.id || 1;
const response = await statesApi.list(companyId, 1, 100);
if (response.data?.items) {
items = response.data.items;
filteredItems = items;

4
frontend/src/lib/components/dashboard/shared/modals/state-selector-dialog.svelte
View File

@@ -5,6 +5,7 @@
import * as Table from '$lib/components/ui/table';
import { Search, Loader2, MapPin } from 'lucide-svelte';
import { statesApi, type State } from '$lib/api/dashboard/reference_data/states';
import { companyStore } from '$lib/stores/company.svelte';
import { toast } from 'svelte-sonner';
// --- PROPS ---
@@ -102,7 +103,8 @@
// Note: statesApi.list takes page, pageSize, and searchTerm?
// Wait, let me check statesApi.list signature again.
// It only takes page and pageSize! I need to check if it supports search.
const response = await statesApi.list(page, pageSize);
const companyId = companyStore.activeCompany?.id || 1;
const response = await statesApi.list(companyId, page, pageSize);
if (response.error) {
toast.error(`Error: ${response.error}`);

68
frontend/src/lib/components/dashboard/transportation/trailers/create-edit-dialog.svelte
View File

@@ -11,6 +11,7 @@
import { companyStore } from '$lib/stores/company.svelte';
import { browser } from '$app/environment';
import { onMount, onDestroy } from 'svelte';
import { getTrailerTypeDescription } from '$lib/i18n/trailer-types';
let {
open = $bindable(false),
@@ -53,7 +54,7 @@
];
const countryM3 = $derived(
countries.find((c) => c.ame_key === formData.country)?.m3_key ?? null
countries.find((c) => c.ame_key === formData.country || c.m3_key === formData.country)?.m3_key ?? null
);
const statesFiltered = $derived(
@@ -74,19 +75,31 @@
};
}
async function loadReferenceData() {
async function loadReferenceData(companyId: number) {
if (!browser) return;
refsLoading = true;
try {
const [tt, cc, ss] = await Promise.all([
trailerTypesApi.list(1, 100),
countriesApi.list(1, 100),
statesApi.list(1, 100)
const [tt, cc] = await Promise.all([
trailerTypesApi.list(companyId, 1, 100),
countriesApi.list(companyId, 1, 100)
]);
if (tt.data?.items) trailerTypes = tt.data.items;
if (cc.data?.items) countries = cc.data.items;
if (ss.data?.items) states = ss.data.items;
} catch {
if (tt.data?.items) trailerTypes = [...tt.data.items];
if (cc.data?.items) countries = [...cc.data.items];
// Si ya tenemos país, cargar sus estados
if (formData.country) {
const cM3 = countries.find(c => c.ame_key === formData.country || c.m3_key === formData.country)?.m3_key;
if (cM3) {
const ss = await statesApi.list(companyId, 1, 100, undefined, cM3);
if (ss.data?.items) states = [...ss.data.items];
}
} else {
// Cargar algunos estados por defecto (opcional)
const ss = await statesApi.list(companyId, 1, 100);
if (ss.data?.items) states = [...ss.data.items];
}
} catch (e) {
console.error('Error loading reference data:', e);
trailerTypes = [];
countries = [];
states = [];
@@ -95,18 +108,43 @@
}
}
// Efecto para recargar estados cuando cambia el país
$effect(() => {
const companyId = companyStore.activeCompany?.id;
if (!browser || !companyId || !formData.country) return;
const cM3 = countries.find(c => c.ame_key === formData.country || c.m3_key === formData.country)?.m3_key;
if (cM3) {
void statesApi.list(companyId, 1, 100, undefined, cM3).then(res => {
if (res.data?.items) {
states = [...res.data.items];
}
});
}
});
$effect(() => {
if (!open) {
error = null;
loading = false;
return;
}
const companyId = companyStore.activeCompany?.id;
if (!companyId) return;
if (item) {
formData = { ...item };
formData = {
...item,
state: item.state ?? '',
country: item.country ?? '',
trailer_type_key: item.trailer_type_key ?? ''
};
} else {
formData = emptyTrailerForm();
}
void loadReferenceData();
void loadReferenceData(companyId);
});
async function handleSubmit() {
@@ -222,7 +260,7 @@
{refsLoading
? 'Cargando tipos...'
: formData.trailer_type_key
? `${formData.trailer_type_key} — ${trailerTypes.find((t) => t.trailer_type_key === formData.trailer_type_key)?.description ?? ''}`
? `${formData.trailer_type_key} — ${getTrailerTypeDescription(formData.trailer_type_key, trailerTypes.find((t) => t.trailer_type_key === formData.trailer_type_key)?.description ?? '')}`
: '— Sin tipo (opcional) —'}
</Select.Trigger>
<Select.Content>
@@ -231,7 +269,9 @@
<Select.Item value={t.trailer_type_key} label={t.trailer_type_key}>
{t.trailer_type_key}
{#if t.description}
<span class="text-muted-foreground"> — {t.description}</span>
<span class="text-muted-foreground">
— {getTrailerTypeDescription(t.trailer_type_key, t.description)}</span
>
{/if}
</Select.Item>
{/each}

5
frontend/src/lib/components/dashboard/transportation/transporters/create-edit-dialog.svelte
View File

@@ -66,11 +66,12 @@
async function loadReferenceData() {
if (!browser) return;
const companyId = companyStore.activeCompany?.id || 1;
refsLoading = true;
try {
const [cc, ss] = await Promise.all([
countriesApi.list(1, 100),
statesApi.list(1, 100)
countriesApi.list(companyId, 1, 100),
statesApi.list(companyId, 1, 100)
]);
if (cc.data?.items) countries = cc.data.items;
if (ss.data?.items) states = ss.data.items;

33
frontend/src/lib/components/dashboard/transportation/vehicles/create-edit-dialog.svelte
View File

@@ -90,16 +90,26 @@
refsLoading = true;
const cid = companyStore.activeCompany.id;
try {
const [tr, tt, cc, ss] = await Promise.all([
const [tr, tt, cc] = await Promise.all([
transportersApi.list(cid, { page: 1, page_size: 100 }),
transportTypesApi.list(cid, 1, 100),
countriesApi.list(1, 100),
statesApi.list(1, 100)
countriesApi.list(cid, 1, 100)
]);
if (tr.data?.items) transporters = tr.data.items;
if (tt.data?.items) transportTypes = tt.data.items;
if (cc.data?.items) countries = cc.data.items;
if (ss.data?.items) states = ss.data.items;
// Si ya tenemos país, cargar sus estados
if (formData.country) {
const cM3 = countries.find(c => c.ame_key === formData.country)?.m3_key;
if (cM3) {
const ss = await statesApi.list(cid, 1, 100, undefined, cM3);
if (ss.data?.items) states = ss.data.items;
}
} else {
const ss = await statesApi.list(cid, 1, 100);
if (ss.data?.items) states = ss.data.items;
}
} catch {
transporters = [];
transportTypes = [];
@@ -110,6 +120,21 @@
}
}
// Efecto para recargar estados cuando cambia el país
$effect(() => {
const cid = companyStore.activeCompany?.id;
if (!browser || !cid || !formData.country) return;
const cM3 = countries.find(c => c.ame_key === formData.country)?.m3_key;
if (cM3) {
void statesApi.list(cid, 1, 100, undefined, cM3).then(res => {
if (res.data?.items) {
states = res.data.items;
}
});
}
});
function emptyVehicleForm(): Vehicle {
return {
vehicle_key: '',