Merge branch 'branch-PR-2' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into branch-PR-2

2024-01-04 18:13:46 -03:00 · 2024-01-04 18:13:46 -03:00 · 073a8f5c70
parent e8fa564bc2 c832ee6ecc
commit 073a8f5c70
6 changed files with 448 additions and 466 deletions
--- a/src/pages/Customer/Defaulter/CustomerBalanceDueTotal.vue
+++ b/src/pages/Customer/Defaulter/CustomerBalanceDueTotal.vue
@ -14,8 +14,8 @@ const { t } = useI18n();
 </script>

 <template>
-    <div class="card_balance">
-        <h6 class="title_balance">{{ t('Total') }}</h6>
+    <div class="card_balance q-px-md q-py-sm q-my-sm">
+        <h6 class="title_balance text-center">{{ t('Total') }}</h6>
        <div class="row">
            <p class="key_balance">{{ t('Balance due') }}:&ensp;</p>
            <b class="value_balance">
@ -28,21 +28,18 @@ const { t } = useI18n();
 <style lang="scss">
 .card_balance {
    border: 1px solid black;
-    margin: 7px;
-    padding: 5px 7px;
 }
 .title_balance {
-    color: white;
+    color: var(--vn-text);
    margin-top: 0;
    margin-bottom: 0;
-    text-align: center;
 }
 .key_balance {
-    color: grey;
+    color: var(--vn-label);
    margin-bottom: 0;
 }
 .value_balance {
-    color: white;
+    color: var(--vn-text);
    margin-bottom: 0;
 }
 </style>
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@ -38,27 +38,27 @@ onBeforeMount(async () => {
 const rows = computed(() => arrayData.value.store.data);

 const selected = ref([]);
-const worderId = ref(0);
+const workerId = ref(0);
 const customerId = ref(0);

 const tableColumnComponents = {
    client: {
        component: QBtn,
        props: () => ({ flat: true, color: 'blue' }),
-        event: (prop) => selectClientId(prop.row.clientFk),
+        event: ({ row }) => selectCustomerId(row.clientFk),
    },
    isWorker: {
        component: QCheckbox,
-        props: (prop) => ({
+        props: ({ value }) => ({
            disable: true,
-            'model-value': Boolean(prop.value),
+            'model-value': Boolean(value),
        }),
        event: () => {},
    },
    salesperson: {
        component: QBtn,
        props: () => ({ flat: true, color: 'blue' }),
-        event: (prop) => selectSalespersonId(prop.row.salesPersonFk),
+        event: ({ row }) => selectWorkerId(row.salesPersonFk),
    },
    country: {
        component: 'span',
@ -78,7 +78,7 @@ const tableColumnComponents = {
    author: {
        component: QBtn,
        props: () => ({ flat: true, color: 'blue' }),
-        event: (prop) => selectAuthorId(prop.row.workerFk),
+        event: ({ row }) => selectWorkerId(row.workerFk),
    },
    lastObservation: {
        component: 'span',
@ -102,90 +102,83 @@ const tableColumnComponents = {
    },
 };

-const columns = computed(() => {
-    return [
-        {
-            align: 'left',
-            field: 'clientName',
-            label: t('Client'),
-            name: 'client',
-        },
-        {
-            align: 'left',
-            field: 'isWorker',
-            label: t('Is worker'),
-            name: 'isWorker',
-        },
-        {
-            align: 'left',
-            field: 'salesPersonName',
-            label: t('Salesperson'),
-            name: 'salesperson',
-        },
-        {
-            align: 'left',
-            field: 'country',
-            label: t('Country'),
-            name: 'country',
-        },
-        {
-            align: 'left',
-            field: 'payMethod',
-            label: t('P. Method'),
-            name: 'paymentMethod',
-        },
-        {
-            align: 'left',
-            field: (row) => toCurrency(row.amount),
-            label: t('Balance D.'),
-            name: 'balance',
-        },
-        {
-            align: 'left',
-            field: 'workerName',
-            label: t('Author'),
-            name: 'author',
-        },
-        {
-            align: 'left',
-            field: 'observation',
-            label: t('Last observation'),
-            name: 'lastObservation',
-        },
-        {
-            align: 'left',
-            field: (row) => toDate(row.created),
-            label: t('L. O. Date'),
-            name: 'date',
-        },
-        {
-            align: 'left',
-            field: (row) => toCurrency(row.creditInsurance),
-            label: t('Credit I.'),
-            name: 'credit',
-        },
-        {
-            align: 'left',
-            field: (row) => toDate(row.defaulterSinced),
-            label: t('From'),
-            name: 'from',
-        },
-    ];
-});
+const columns = computed(() => [
+    {
+        align: 'left',
+        field: 'clientName',
+        label: t('Client'),
+        name: 'client',
+    },
+    {
+        align: 'left',
+        field: 'isWorker',
+        label: t('Is worker'),
+        name: 'isWorker',
+    },
+    {
+        align: 'left',
+        field: 'salesPersonName',
+        label: t('Salesperson'),
+        name: 'salesperson',
+    },
+    {
+        align: 'left',
+        field: 'country',
+        label: t('Country'),
+        name: 'country',
+    },
+    {
+        align: 'left',
+        field: 'payMethod',
+        label: t('P. Method'),
+        name: 'paymentMethod',
+    },
+    {
+        align: 'left',
+        field: ({ amount }) => toCurrency(amount),
+        label: t('Balance D.'),
+        name: 'balance',
+    },
+    {
+        align: 'left',
+        field: 'workerName',
+        label: t('Author'),
+        name: 'author',
+    },
+    {
+        align: 'left',
+        field: 'observation',
+        label: t('Last observation'),
+        name: 'lastObservation',
+    },
+    {
+        align: 'left',
+        field: ({ created }) => toDate(created),
+        label: t('L. O. Date'),
+        name: 'date',
+    },
+    {
+        align: 'left',
+        field: ({ creditInsurance }) => toCurrency(creditInsurance),
+        label: t('Credit I.'),
+        name: 'credit',
+    },
+    {
+        align: 'left',
+        field: ({ defaulterSinced }) => toDate(defaulterSinced),
+        label: t('From'),
+        name: 'from',
+    },
+]);

-const selectClientId = (id) => {
-    worderId.value = 0;
+const selectCustomerId = (id) => {
+    workerId.value = 0;
    customerId.value = id;
 };

-const selectSalespersonId = (id) => {
+const selectWorkerId = (id) => {
    customerId.value = 0;
-    worderId.value = id;
-};
-
-const selectAuthorId = (id) => {
-    customerId.value = 0;
-    worderId.value = id;
+    workerId.value = id;
 };
 </script>

@ -226,7 +219,7 @@ const selectAuthorId = (id) => {
                        >
                            {{ props.value }}

-                            <WorkerDescriptorProxy v-if="worderId" :id="worderId" />
+                            <WorkerDescriptorProxy v-if="workerId" :id="workerId" />
                            <CustomerDescriptorProxy v-else :id="customerId" />
                        </component>
                    </QTr>
--- a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
@ -262,215 +262,213 @@ const tableColumnComponents = {
    },
 };

-const columns = computed(() => {
-    return [
-        {
-            align: 'left',
-            field: '',
-            label: '',
-            name: 'customerStatus',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'id',
-            label: t('customer.extendedList.tableVisibleColumns.id'),
-            name: 'id',
-        },
-        {
-            align: 'left',
-            field: 'name',
-            label: t('customer.extendedList.tableVisibleColumns.name'),
-            name: 'name',
-        },
-        {
-            align: 'left',
-            field: 'fi',
-            label: t('customer.extendedList.tableVisibleColumns.fi'),
-            name: 'fi',
-        },
-        {
-            align: 'left',
-            field: 'salesPerson',
-            label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
-            name: 'salesPersonFk',
-        },
-        {
-            align: 'left',
-            field: 'credit',
-            label: t('customer.extendedList.tableVisibleColumns.credit'),
-            name: 'credit',
-        },
-        {
-            align: 'left',
-            field: 'creditInsurance',
-            label: t('customer.extendedList.tableVisibleColumns.creditInsurance'),
-            name: 'creditInsurance',
-        },
-        {
-            align: 'left',
-            field: 'phone',
-            label: t('customer.extendedList.tableVisibleColumns.phone'),
-            name: 'phone',
-        },
-        {
-            align: 'left',
-            field: 'mobile',
-            label: t('customer.extendedList.tableVisibleColumns.mobile'),
-            name: 'mobile',
-        },
-        {
-            align: 'left',
-            field: 'street',
-            label: t('customer.extendedList.tableVisibleColumns.street'),
-            name: 'street',
-        },
-        {
-            align: 'left',
-            field: 'country',
-            label: t('customer.extendedList.tableVisibleColumns.countryFk'),
-            name: 'countryFk',
-        },
-        {
-            align: 'left',
-            field: 'province',
-            label: t('customer.extendedList.tableVisibleColumns.provinceFk'),
-            name: 'provinceFk',
-        },
-        {
-            align: 'left',
-            field: 'city',
-            label: t('customer.extendedList.tableVisibleColumns.city'),
-            name: 'city',
-        },
-        {
-            align: 'left',
-            field: 'postcode',
-            label: t('customer.extendedList.tableVisibleColumns.postcode'),
-            name: 'postcode',
-        },
-        {
-            align: 'left',
-            field: 'email',
-            label: t('customer.extendedList.tableVisibleColumns.email'),
-            name: 'email',
-        },
-        {
-            align: 'left',
-            field: 'created',
-            label: t('customer.extendedList.tableVisibleColumns.created'),
-            name: 'created',
-            format: (value) => toDate(value),
-        },
-        {
-            align: 'left',
-            field: 'businessType',
-            label: t('customer.extendedList.tableVisibleColumns.businessTypeFk'),
-            name: 'businessTypeFk',
-        },
-        {
-            align: 'left',
-            field: 'payMethod',
-            label: t('customer.extendedList.tableVisibleColumns.payMethodFk'),
-            name: 'payMethodFk',
-        },
-        {
-            align: 'left',
-            field: 'sageTaxType',
-            label: t('customer.extendedList.tableVisibleColumns.sageTaxTypeFk'),
-            name: 'sageTaxTypeFk',
-        },
-        {
-            align: 'left',
-            field: 'sageTransactionType',
-            label: t('customer.extendedList.tableVisibleColumns.sageTransactionTypeFk'),
-            name: 'sageTransactionTypeFk',
-        },
-        {
-            align: 'left',
-            field: 'isActive',
-            label: t('customer.extendedList.tableVisibleColumns.isActive'),
-            name: 'isActive',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'isVies',
-            label: t('customer.extendedList.tableVisibleColumns.isVies'),
-            name: 'isVies',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'isTaxDataChecked',
-            label: t('customer.extendedList.tableVisibleColumns.isTaxDataChecked'),
-            name: 'isTaxDataChecked',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'isEqualizated',
-            label: t('customer.extendedList.tableVisibleColumns.isEqualizated'),
-            name: 'isEqualizated',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'isFreezed',
-            label: t('customer.extendedList.tableVisibleColumns.isFreezed'),
-            name: 'isFreezed',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'hasToInvoice',
-            label: t('customer.extendedList.tableVisibleColumns.hasToInvoice'),
-            name: 'hasToInvoice',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'hasToInvoiceByAddress',
-            label: t('customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'),
-            name: 'hasToInvoiceByAddress',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'isToBeMailed',
-            label: t('customer.extendedList.tableVisibleColumns.isToBeMailed'),
-            name: 'isToBeMailed',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'hasLcr',
-            label: t('customer.extendedList.tableVisibleColumns.hasLcr'),
-            name: 'hasLcr',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'hasCoreVnl',
-            label: t('customer.extendedList.tableVisibleColumns.hasCoreVnl'),
-            name: 'hasCoreVnl',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'hasSepaVnl',
-            label: t('customer.extendedList.tableVisibleColumns.hasSepaVnl'),
-            name: 'hasSepaVnl',
-            format: () => ' ',
-        },
-        {
-            align: 'right',
-            field: 'actions',
-            label: '',
-            name: 'actions',
-        },
-    ];
-});
+const columns = computed(() => [
+    {
+        align: 'left',
+        field: '',
+        label: '',
+        name: 'customerStatus',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'id',
+        label: t('customer.extendedList.tableVisibleColumns.id'),
+        name: 'id',
+    },
+    {
+        align: 'left',
+        field: 'name',
+        label: t('customer.extendedList.tableVisibleColumns.name'),
+        name: 'name',
+    },
+    {
+        align: 'left',
+        field: 'fi',
+        label: t('customer.extendedList.tableVisibleColumns.fi'),
+        name: 'fi',
+    },
+    {
+        align: 'left',
+        field: 'salesPerson',
+        label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
+        name: 'salesPersonFk',
+    },
+    {
+        align: 'left',
+        field: 'credit',
+        label: t('customer.extendedList.tableVisibleColumns.credit'),
+        name: 'credit',
+    },
+    {
+        align: 'left',
+        field: 'creditInsurance',
+        label: t('customer.extendedList.tableVisibleColumns.creditInsurance'),
+        name: 'creditInsurance',
+    },
+    {
+        align: 'left',
+        field: 'phone',
+        label: t('customer.extendedList.tableVisibleColumns.phone'),
+        name: 'phone',
+    },
+    {
+        align: 'left',
+        field: 'mobile',
+        label: t('customer.extendedList.tableVisibleColumns.mobile'),
+        name: 'mobile',
+    },
+    {
+        align: 'left',
+        field: 'street',
+        label: t('customer.extendedList.tableVisibleColumns.street'),
+        name: 'street',
+    },
+    {
+        align: 'left',
+        field: 'country',
+        label: t('customer.extendedList.tableVisibleColumns.countryFk'),
+        name: 'countryFk',
+    },
+    {
+        align: 'left',
+        field: 'province',
+        label: t('customer.extendedList.tableVisibleColumns.provinceFk'),
+        name: 'provinceFk',
+    },
+    {
+        align: 'left',
+        field: 'city',
+        label: t('customer.extendedList.tableVisibleColumns.city'),
+        name: 'city',
+    },
+    {
+        align: 'left',
+        field: 'postcode',
+        label: t('customer.extendedList.tableVisibleColumns.postcode'),
+        name: 'postcode',
+    },
+    {
+        align: 'left',
+        field: 'email',
+        label: t('customer.extendedList.tableVisibleColumns.email'),
+        name: 'email',
+    },
+    {
+        align: 'left',
+        field: 'created',
+        label: t('customer.extendedList.tableVisibleColumns.created'),
+        name: 'created',
+        format: (value) => toDate(value),
+    },
+    {
+        align: 'left',
+        field: 'businessType',
+        label: t('customer.extendedList.tableVisibleColumns.businessTypeFk'),
+        name: 'businessTypeFk',
+    },
+    {
+        align: 'left',
+        field: 'payMethod',
+        label: t('customer.extendedList.tableVisibleColumns.payMethodFk'),
+        name: 'payMethodFk',
+    },
+    {
+        align: 'left',
+        field: 'sageTaxType',
+        label: t('customer.extendedList.tableVisibleColumns.sageTaxTypeFk'),
+        name: 'sageTaxTypeFk',
+    },
+    {
+        align: 'left',
+        field: 'sageTransactionType',
+        label: t('customer.extendedList.tableVisibleColumns.sageTransactionTypeFk'),
+        name: 'sageTransactionTypeFk',
+    },
+    {
+        align: 'left',
+        field: 'isActive',
+        label: t('customer.extendedList.tableVisibleColumns.isActive'),
+        name: 'isActive',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'isVies',
+        label: t('customer.extendedList.tableVisibleColumns.isVies'),
+        name: 'isVies',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'isTaxDataChecked',
+        label: t('customer.extendedList.tableVisibleColumns.isTaxDataChecked'),
+        name: 'isTaxDataChecked',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'isEqualizated',
+        label: t('customer.extendedList.tableVisibleColumns.isEqualizated'),
+        name: 'isEqualizated',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'isFreezed',
+        label: t('customer.extendedList.tableVisibleColumns.isFreezed'),
+        name: 'isFreezed',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'hasToInvoice',
+        label: t('customer.extendedList.tableVisibleColumns.hasToInvoice'),
+        name: 'hasToInvoice',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'hasToInvoiceByAddress',
+        label: t('customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'),
+        name: 'hasToInvoiceByAddress',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'isToBeMailed',
+        label: t('customer.extendedList.tableVisibleColumns.isToBeMailed'),
+        name: 'isToBeMailed',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'hasLcr',
+        label: t('customer.extendedList.tableVisibleColumns.hasLcr'),
+        name: 'hasLcr',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'hasCoreVnl',
+        label: t('customer.extendedList.tableVisibleColumns.hasCoreVnl'),
+        name: 'hasCoreVnl',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'hasSepaVnl',
+        label: t('customer.extendedList.tableVisibleColumns.hasSepaVnl'),
+        name: 'hasSepaVnl',
+        format: () => ' ',
+    },
+    {
+        align: 'right',
+        field: 'actions',
+        label: '',
+        name: 'actions',
+    },
+]);

 const stopEventPropagation = (event, col) => {
    if (!['id', 'salesPersonFk'].includes(col.name)) return;
--- a/src/pages/Customer/Notifications/CustomerNotifications.vue
+++ b/src/pages/Customer/Notifications/CustomerNotifications.vue
@ -57,40 +57,38 @@ const tableColumnComponents = {
    },
 };

-const columns = computed(() => {
-    return [
-        {
-            align: 'left',
-            field: 'id',
-            label: t('Identifier'),
-            name: 'id',
-        },
-        {
-            align: 'left',
-            field: 'socialName',
-            label: t('Social name'),
-            name: 'socialName',
-        },
-        {
-            align: 'left',
-            field: 'city',
-            label: t('City'),
-            name: 'city',
-        },
-        {
-            align: 'left',
-            field: 'phone',
-            label: t('Phone'),
-            name: 'phone',
-        },
-        {
-            align: 'left',
-            field: 'email',
-            label: t('Email'),
-            name: 'email',
-        },
-    ];
-});
+const columns = computed(() => [
+    {
+        align: 'left',
+        field: 'id',
+        label: t('Identifier'),
+        name: 'id',
+    },
+    {
+        align: 'left',
+        field: 'socialName',
+        label: t('Social name'),
+        name: 'socialName',
+    },
+    {
+        align: 'left',
+        field: 'city',
+        label: t('City'),
+        name: 'city',
+    },
+    {
+        align: 'left',
+        field: 'phone',
+        label: t('Phone'),
+        name: 'phone',
+    },
+    {
+        align: 'left',
+        field: 'email',
+        label: t('Email'),
+        name: 'email',
+    },
+]);

 const selectCustomerId = (id) => {
    selectedCustomerId.value = id;
--- a/src/pages/InvoiceOut/InvoiceOutGlobal.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
@ -49,30 +49,28 @@ const tableColumnComponents = {
    },
 };

-const columns = computed(() => {
-    return [
-        { label: 'Id', field: 'clientId', name: 'clientId', align: 'left' },
-        {
-            label: t('invoiceOut.globalInvoices.table.client'),
-            field: 'clientName',
-            name: 'clientName',
-            align: 'left',
-        },
-        {
-            label: t('invoiceOut.globalInvoices.table.addressId'),
-            field: 'id',
-            name: 'id',
-            align: 'left',
-        },
-        {
-            label: t('invoiceOut.globalInvoices.table.streetAddress'),
-            field: 'nickname',
-            name: 'nickname',
-            align: 'left',
-        },
-        { label: 'Error', field: 'message', name: 'message', align: 'left' },
-    ];
-});
+const columns = computed(() => [
+    { label: 'Id', field: 'clientId', name: 'clientId', align: 'left' },
+    {
+        label: t('invoiceOut.globalInvoices.table.client'),
+        field: 'clientName',
+        name: 'clientName',
+        align: 'left',
+    },
+    {
+        label: t('invoiceOut.globalInvoices.table.addressId'),
+        field: 'id',
+        name: 'id',
+        align: 'left',
+    },
+    {
+        label: t('invoiceOut.globalInvoices.table.streetAddress'),
+        field: 'nickname',
+        name: 'nickname',
+        align: 'left',
+    },
+    { label: 'Error', field: 'message', name: 'message', align: 'left' },
+]);

 const rows = computed(() => {
    if (!errors && !errors.length > 0) return [];
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@ -103,111 +103,109 @@ const tableColumnComponents = {
    },
 };

-const columns = computed(() => {
-    return [
-        {
-            label: 'id',
-            field: 'id',
-            name: 'id',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('supplier.pageTitles.supplier'),
-            field: 'cargoSupplierNickname',
-            name: 'cargoSupplierNickname',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('globals.agency'),
-            field: 'agencyModeName',
-            name: 'agencyModeName',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('globals.amount'),
-            name: 'invoiceAmount',
-            field: 'entries',
-            align: 'left',
-            showValue: true,
-            format: (value) =>
-                toCurrency(
-                    value
-                        ? value.reduce((sum, entry) => {
-                              return sum + (entry.invoiceAmount || 0);
-                          }, 0)
-                        : 0
-                ),
-        },
-        {
-            label: t('globals.reference'),
-            field: 'ref',
-            name: 'ref',
-            align: 'left',
-            showValue: false,
-        },
-        {
-            label: t('globals.packages'),
-            field: 'stickers',
-            name: 'stickers',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('kg'),
-            field: 'kg',
-            name: 'kg',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('physicKg'),
-            field: 'loadedKg',
-            name: 'loadedKg',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: 'KG Vol.',
-            field: 'volumeKg',
-            name: 'volumeKg',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('globals.wareHouseOut'),
-            field: 'warehouseOutName',
-            name: 'warehouseOutName',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('shipped'),
-            field: 'shipped',
-            name: 'shipped',
-            align: 'left',
-            format: (value) => toDate(value.substring(0, 10)),
-            showValue: true,
-        },
-        {
-            label: t('globals.wareHouseIn'),
-            field: 'warehouseInName',
-            name: 'warehouseInName',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('landed'),
-            field: 'landed',
-            name: 'landed',
-            align: 'left',
-            format: (value) => toDate(value.substring(0, 10)),
-            showValue: true,
-        },
-    ];
-});
+const columns = computed(() => [
+    {
+        label: 'id',
+        field: 'id',
+        name: 'id',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('supplier.pageTitles.supplier'),
+        field: 'cargoSupplierNickname',
+        name: 'cargoSupplierNickname',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('globals.agency'),
+        field: 'agencyModeName',
+        name: 'agencyModeName',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('globals.amount'),
+        name: 'invoiceAmount',
+        field: 'entries',
+        align: 'left',
+        showValue: true,
+        format: (value) =>
+            toCurrency(
+                value
+                    ? value.reduce((sum, entry) => {
+                          return sum + (entry.invoiceAmount || 0);
+                      }, 0)
+                    : 0
+            ),
+    },
+    {
+        label: t('globals.reference'),
+        field: 'ref',
+        name: 'ref',
+        align: 'left',
+        showValue: false,
+    },
+    {
+        label: t('globals.packages'),
+        field: 'stickers',
+        name: 'stickers',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('kg'),
+        field: 'kg',
+        name: 'kg',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('physicKg'),
+        field: 'loadedKg',
+        name: 'loadedKg',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: 'KG Vol.',
+        field: 'volumeKg',
+        name: 'volumeKg',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('globals.wareHouseOut'),
+        field: 'warehouseOutName',
+        name: 'warehouseOutName',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('shipped'),
+        field: 'shipped',
+        name: 'shipped',
+        align: 'left',
+        format: (value) => toDate(value.substring(0, 10)),
+        showValue: true,
+    },
+    {
+        label: t('globals.wareHouseIn'),
+        field: 'warehouseInName',
+        name: 'warehouseInName',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('landed'),
+        field: 'landed',
+        name: 'landed',
+        align: 'left',
+        format: (value) => toDate(value.substring(0, 10)),
+        showValue: true,
+    },
+]);

 async function getData() {
    await arrayData.fetch({ append: false });