-
-
-
- {#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
-
- {#each headerGroup.headers as header (header.id)}
-
- {#if !header.isPlaceholder}
-
- {/if}
-
- {/each}
-
- {/each}
-
-
- {#each table.getRowModel().rows as row (row.id)}
-
- {#each row.getVisibleCells() as cell (cell.id)}
-
+
+
+
+ {#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
+
+ {#each headerGroup.headers as header (header.id)}
+
+ {#if !header.isPlaceholder}
-
- {/each}
-
- {:else}
-
-
- No hay resultados.
+ {/if}
+
+ {/each}
+
+ {/each}
+
+
+ {#each table.getRowModel().rows as row (row.id)}
+
+ {#each row.getVisibleCells() as cell (cell.id)}
+
+
-
- {/each}
-
-
- {#if hasMore}
-
-
-
- {#if loading}
-
- {:else}
-
- Desplázate para cargar más
-
- {/if}
-
+ {/each}
+
+ {:else}
+
+
+ No hay resultados.
+
+
+ {/each}
+
+
+
+
+ Total: {totalItems} registros
+
+
+
+
diff --git a/frontend/src/routes/dashboard/general_catalogs/concepts/+page.server.ts b/frontend/src/routes/dashboard/general_catalogs/concepts/+page.server.ts
index ad8d40cc..2ff02a9e 100644
--- a/frontend/src/routes/dashboard/general_catalogs/concepts/+page.server.ts
+++ b/frontend/src/routes/dashboard/general_catalogs/concepts/+page.server.ts
@@ -59,7 +59,7 @@ export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
});
const response = await authenticatedFetch(
- `v1/a76/concepts?${queryParams.toString()}`,
+ `v1/a76/concepts/?${queryParams.toString()}`,
{ method: 'GET' },
cookies,
fetch
diff --git a/frontend/src/routes/dashboard/general_catalogs/customs_broker_concepts/+page.server.ts b/frontend/src/routes/dashboard/general_catalogs/customs_broker_concepts/+page.server.ts
index 56f48a8d..e9bb5588 100644
--- a/frontend/src/routes/dashboard/general_catalogs/customs_broker_concepts/+page.server.ts
+++ b/frontend/src/routes/dashboard/general_catalogs/customs_broker_concepts/+page.server.ts
@@ -2,20 +2,25 @@ import type { PageServerLoad } from './$types';
import { getAuthTokens, authenticatedFetch } from '$lib/server/api';
export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
- await parent();
+ const parentData = await parent();
const { accessToken } = getAuthTokens(cookies);
if (!accessToken) {
- return { error: 'No authenticated', concepts: { items: [], total: 0, page: 1, page_size: 50, pages: 0 }, activeCompanyId: null };
+ return { error: 'No authenticated', concepts: { items: [], total: 0, page: 1, page_size: 50, pages: 0 } };
}
try {
const page = Number(url.searchParams.get('page')) || 1;
const pageSize = Number(url.searchParams.get('pageSize')) || 50;
- const companyId = url.searchParams.get('company_id') || cookies.get('active_company_id');
+
+ // Obtener company_id de la cookie o usar el primero disponible
+ const cookieCompanyId = cookies.get('active_company_id');
+ const companyId = cookieCompanyId
+ ? parseInt(cookieCompanyId)
+ : parentData.companies?.[0]?.id;
if (!companyId) {
- return { error: 'No company selected', concepts: { items: [], total: 0, page: 1, page_size: 50, pages: 0 }, activeCompanyId: null };
+ return { error: 'No company selected', concepts: { items: [], total: 0, page: 1, page_size: 50, pages: 0 } };
}
const filters: Record
= {};
@@ -28,22 +33,22 @@ export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
const queryParams = new URLSearchParams({
page: page.toString(),
page_size: pageSize.toString(),
- company_id: companyId,
+ company_id: companyId.toString(),
...filters
});
- const response = await authenticatedFetch(`v1/a76/customs-broker-concepts?${queryParams.toString()}`, { method: 'GET' }, cookies, fetch);
+ const response = await authenticatedFetch(`v1/a76/customs-broker-concepts/?${queryParams.toString()}`, { method: 'GET' }, cookies, fetch);
if (!response.ok) {
- return { error: 'Failed to load', concepts: { items: [], total: 0, page, page_size: pageSize, pages: 0 }, activeCompanyId: companyId };
+ return { error: 'Failed to load', concepts: { items: [], total: 0, page, page_size: pageSize, pages: 0 } };
}
const data = await response.json();
// Calculate pages if not provided by API
const pages = data.pages || Math.ceil(data.total / pageSize);
- return { concepts: { ...data, pages }, activeCompanyId: parseInt(companyId) };
+ return { concepts: { ...data, pages } };
} catch (error) {
console.error('Error loading customs broker concepts:', error);
- return { error: 'Error loading', concepts: { items: [], total: 0, page: 1, page_size: 50, pages: 0 }, activeCompanyId: null };
+ return { error: 'Error loading', concepts: { items: [], total: 0, page: 1, page_size: 50, pages: 0 } };
}
};
diff --git a/frontend/src/routes/dashboard/general_catalogs/customs_broker_concepts/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/customs_broker_concepts/+page.svelte
index 4070f937..0f19a0c1 100644
--- a/frontend/src/routes/dashboard/general_catalogs/customs_broker_concepts/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/customs_broker_concepts/+page.svelte
@@ -10,8 +10,11 @@
import { browser } from '$app/environment';
import { useShortcuts } from '$lib/hooks/use-shortcuts';
import { obtenerAtajosListaConceptosAA } from '$lib/config/shortcuts/dashboard/general_catalogs/customs_broker_concepts/list';
+ import { companyStore } from '$lib/stores/company.svelte';
let { data } = $props();
+
+ const activeCompanyId = $derived(companyStore.activeCompany?.id);
let dialogOpen = $state(false);
// Atajos
@@ -92,9 +95,11 @@
/>