Merge branch 'dev' into 7889_main_shortcuts

src/components/VnTable/VnTable.vue

@@ -107,7 +107,7 @@ const orders = ref(parseOrder(routeQuery.filter?.order));
 const CrudModelRef = ref({});
 const showForm = ref(false);
 const splittedColumns = ref({ columns: [] });
-const columnsVisibilitySkiped = ref();
+const columnsVisibilitySkipped = ref();
 const createForm = ref();
 
 const tableModes = [
@@ -135,7 +135,7 @@ onMounted(() => {
             ? CARD_MODE
             : $props.defaultMode;
     stateStore.rightDrawer = true;
-    columnsVisibilitySkiped.value = [
+    columnsVisibilitySkipped.value = [
         ...splittedColumns.value.columns
             .filter((c) => c.visible == false)
             .map((c) => c.name),
@@ -380,14 +380,14 @@ defineExpose({
                             v-if="isTableMode"
                             v-model="splittedColumns.columns"
                             :table-code="tableCode ?? route.name"
-                            :skip="columnsVisibilitySkiped"
+                            :skip="columnsVisibilitySkipped"
                         />
                         <QBtnToggle
                             v-model="mode"
                             toggle-color="primary"
                             class="bg-vn-section-color"
                             dense
-                            :options="tableModes"
+                            :options="tableModes.filter((mode) => !mode.disable)"
                         />
                         <QBtn
                             v-if="$props.rightSearch"
@@ -408,6 +408,9 @@ defineExpose({
                                     class="row items-center no-wrap"
                                     style="height: 30px"
                                 >
+                                    <QTooltip v-if="col.toolTip">{{
+                                        col.toolTip
+                                    }}</QTooltip>
                                     <VnTableOrder
                                         v-model="orders[col.orderBy ?? col.name]"
                                         :name="col.orderBy ?? col.name"

src/components/ui/VnConfirm.vue

@@ -15,7 +15,7 @@ const props = defineProps({
         default: null,
     },
     message: {
-        type: String,
+        type: [String, Boolean],
         default: null,
     },
     data: {
@@ -35,7 +35,10 @@ defineEmits(['confirm', ...useDialogPluginComponent.emits]);
 const { dialogRef, onDialogOK } = useDialogPluginComponent();
 
 const title = props.title || t('Confirm');
-const message = props.message || t('Are you sure you want to continue?');
+const message =
+    props.message ||
+    (props.message !== false ? t('Are you sure you want to continue?') : false);
+
 const isLoading = ref(false);
 
 async function confirm() {
@@ -61,12 +64,12 @@ async function confirm() {
                     size="xl"
                     v-if="icon"
                 />
-                <span class="text-h6 text-grey">{{ title }}</span>
+                <span class="text-h6">{{ title }}</span>
                 <QSpace />
                 <QBtn icon="close" :disable="isLoading" flat round dense v-close-popup />
             </QCardSection>
             <QCardSection class="row items-center">
-                <span v-html="message"></span>
+                <span v-if="message !== false" v-html="message" />
                 <slot name="customHTML"></slot>
             </QCardSection>
             <QCardActions align="right">

src/composables/getDateQBadgeColor.js

@@ -7,5 +7,5 @@ export function getDateQBadgeColor(date) {
     let comparation = today - timeTicket;
 
     if (comparation == 0) return 'warning';
-    if (comparation < 0) return 'negative';
+    if (comparation < 0) return 'success';
 }

src/i18n/locale/en.yml

@@ -455,6 +455,7 @@ entry:
             travelFk: Travel
             isExcludedFromAvailable: Inventory
             isRaid: Raid
+            invoiceAmount: Import
     summary:
         commission: Commission
         currency: Currency
@@ -1123,9 +1124,12 @@ travel:
             agency: Agency
             shipped: Shipped
             landed: Landed
+            shipHour: Shipment Hour
+            landHour: Landing Hour
             warehouseIn: Warehouse in
             warehouseOut: Warehouse out
             totalEntries: Total entries
+            totalEntriesTooltip: Total entries
     summary:
         confirmed: Confirmed
         entryId: Entry Id

src/i18n/locale/es.yml

@@ -454,6 +454,7 @@ entry:
             travelFk: Envio
             isExcludedFromAvailable: Inventario
             isRaid: Redada
+            invoiceAmount: Importe
     summary:
         commission: Comisión
         currency: Moneda
@@ -1100,11 +1101,14 @@ travel:
             id: Id
             ref: Referencia
             agency: Agencia
-            shipped: Enviado
-            landed: Llegada
-            warehouseIn: Almacén de salida
-            warehouseOut: Almacén de entrada
-            totalEntries: Total de entradas
+            shipped: F.envío
+            shipHour: Hora de envío
+            landHour: Hora de llegada
+            landed: F.entrega
+            warehouseIn: Alm.salida
+            warehouseOut: Alm.entrada
+            totalEntries: ∑
+            totalEntriesTooltip: Entradas totales
     summary:
         confirmed: Confirmado
         entryId: Id entrada
@@ -1269,6 +1273,7 @@ components:
         clone: Clonar
         openCard: Ficha
         openSummary: Detalles
+        viewSummary: Vista previa
     cardDescriptor:
         mainList: Listado principal
         summary: Resumen

src/pages/Account/AccountAcls.vue

@@ -141,6 +141,7 @@ const deleteAcl = async ({ id }) => {
             formInitialData: {},
         }"
         order="id DESC"
+        :disable-option="{ card: true }"
         :columns="columns"
         default-mode="table"
         :right-search="true"

src/pages/Account/AccountAliasList.vue

@@ -21,24 +21,21 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'id',
-        label: t('id'),
+        label: t('Id'),
         isId: true,
-        field: 'id',
         cardVisible: true,
     },
     {
         align: 'left',
         name: 'alias',
-        label: t('alias'),
-        field: 'alias',
+        label: t('Alias'),
         cardVisible: true,
         create: true,
     },
     {
         align: 'left',
         name: 'description',
-        label: t('description'),
-        field: 'description',
+        label: t('Description'),
         cardVisible: true,
         create: true,
     },
@@ -69,9 +66,17 @@ const columns = computed(() => [
         }"
         order="id DESC"
         :columns="columns"
+        :disable-option="{ card: true }"
         default-mode="table"
         redirect="account/alias"
         :is-editable="true"
         :use-model="true"
     />
 </template>
+
+<i18n>
+    es:
+        Id: Id
+        Alias: Alias
+        Description: Descripción
+</i18n>

src/pages/Account/AccountList.vue

@@ -14,15 +14,23 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'id',
-        label: t('id'),
+        label: t('Id'),
         isId: true,
         field: 'id',
         cardVisible: true,
+        columnFilter: {
+            component: 'select',
+            name: 'search',
+            attrs: {
+                url: 'VnUsers/preview',
+                fields: ['id', 'name'],
+            },
+        },
     },
     {
         align: 'left',
         name: 'username',
-        label: t('nickname'),
+        label: t('Nickname'),
         isTitle: true,
         component: 'input',
         columnField: {
@@ -37,7 +45,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'name',
-        label: t('name'),
+        label: t('Name'),
         component: 'input',
         columnField: {
             component: null,
@@ -65,6 +73,7 @@ const columns = computed(() => [
                 title: t('View Summary'),
                 icon: 'preview',
                 action: (row) => viewSummary(row.id, AccountSummary),
+                isPrimary: true,
             },
         ],
     },
@@ -108,3 +117,10 @@ const exprBuilder = (param, value) => {
         :use-model="true"
     />
 </template>
+
+<i18n>
+    es:
+        Id: Id
+        Nickname: Nickname
+        Name: Nombre
+</i18n>

src/pages/Account/Card/AccountCard.vue

@@ -15,7 +15,6 @@ const { t } = useI18n();
             url: 'VnUsers/preview',
             label: t('account.search'),
             info: t('account.searchInfo'),
-            searchUrl: 'table',
         }"
     />
 </template>

src/pages/Account/Role/AccountRoles.vue

@@ -21,24 +21,30 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'id',
-        label: t('id'),
+        label: t('Id'),
         isId: true,
         columnFilter: {
             inWhere: true,
+            component: 'select',
+            name: 'search',
+            attrs: {
+                url: 'VnRoles',
+                fields: ['id', 'name'],
+            },
         },
         cardVisible: true,
     },
     {
         align: 'left',
         name: 'name',
-        label: t('name'),
+        label: t('Name'),
         cardVisible: true,
         create: true,
     },
     {
         align: 'left',
         name: 'description',
-        label: t('description'),
+        label: t('Description'),
         cardVisible: true,
         create: true,
     },
@@ -51,6 +57,7 @@ const columns = computed(() => [
                 title: t('View Summary'),
                 icon: 'preview',
                 action: (row) => viewSummary(row.id, RoleSummary),
+                isPrimary: true,
             },
         ],
     },
@@ -93,8 +100,16 @@ const exprBuilder = (param, value) => {
             },
         }"
         order="id ASC"
+        :disable-option="{ card: true }"
         :columns="columns"
         default-mode="table"
         redirect="account/role"
     />
 </template>
+
+<i18n>
+    es:
+        Id: Id
+        Description: Descripción
+        Name: Nombre
+</i18n>

src/pages/Claim/ClaimList.vue

@@ -79,7 +79,7 @@ const columns = computed(() => [
         align: 'left',
         label: t('claim.state'),
         format: ({ stateCode }) =>
-            claimFilterRef.value?.states.find(({code}) => code === stateCode)
+            claimFilterRef.value?.states.find(({ code }) => code === stateCode)
                 ?.description,
         name: 'stateCode',
         chip: {
@@ -100,7 +100,7 @@ const columns = computed(() => [
         name: 'tableActions',
         actions: [
             {
-                title: t('Client ticket list'),
+                title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
                 action: (row) => viewSummary(row.id, ClaimSummary),
             },

src/pages/Customer/CustomerList.vue

@@ -357,7 +357,7 @@ const columns = computed(() => [
                 isPrimary: true,
             },
             {
-                title: t('Client ticket list'),
+                title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
                 action: (row) => viewSummary(row.id, CustomerSummary),
             },

src/pages/Entry/EntryList.vue

@@ -7,11 +7,19 @@ import { useStateStore } from 'stores/useStateStore';
 import VnTable from 'components/VnTable/VnTable.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import { toDate } from 'src/filters';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import EntrySummary from './Card/EntrySummary.vue';
+import VnUserLink from 'components/ui/VnUserLink.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
+import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
+import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
 const tableRef = ref();
 
+const { viewSummary } = useSummaryDialog();
 const entryFilter = {
     include: [
         {
@@ -142,6 +150,12 @@ const columns = computed(() => [
         create: true,
         format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
     },
+    {
+        align: 'left',
+        label: t('entry.list.tableVisibleColumns.invoiceAmount'),
+        name: 'invoiceAmount',
+        cardVisible: true,
+    },
     {
         align: 'left',
         label: t('entry.list.tableVisibleColumns.isExcludedFromAvailable'),
@@ -168,6 +182,18 @@ const columns = computed(() => [
             inWhere: true,
         },
     },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('components.smartCard.viewSummary'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, EntrySummary),
+                isPrimary: true,
+            },
+        ],
+    },
 ]);
 onMounted(async () => {
     stateStore.rightDrawer = true;
@@ -201,7 +227,20 @@ onMounted(async () => {
         redirect="entry"
         auto-load
         :right-search="false"
-    />
+    >
+        <template #column-supplierFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.supplierName }}
+                <SupplierDescriptorProxy :id="row.supplierFk" />
+            </span>
+        </template>
+        <template #column-travelFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.travelRef }}
+                <TravelDescriptorProxy :id="row.travelFk" />
+            </span>
+        </template>
+    </VnTable>
 </template>
 
 <i18n>

src/pages/InvoiceOut/InvoiceOutList.vue

@@ -122,7 +122,7 @@ const columns = computed(() => [
         name: 'tableActions',
         actions: [
             {
-                title: t('InvoiceOutSummary'),
+                title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
                 action: (row) => viewSummary(row.id, InvoiceOutSummary),
             },
@@ -250,7 +250,7 @@ watchEffect(selectedRows);
             />
             <VnSelect
                 url="InvoiceOutSerials"
-                v-model="data.invoiceOutSerial"
+                v-model="data.serial"
                 :label="t('invoiceOutList.tableVisibleColumns.invoiceOutSerial')"
                 :options="invoiceOutSerialsOptions"
                 option-label="description"
@@ -262,7 +262,7 @@ watchEffect(selectedRows);
             />
             <VnSelect
                 url="TaxAreas"
-                v-model="data.area"
+                v-model="data.taxArea"
                 :label="t('invoiceOutList.tableVisibleColumns.taxArea')"
                 :options="taxAreasOptions"
                 option-label="code"

src/pages/Order/Card/OrderSearchbar.vue

@@ -10,7 +10,7 @@ const { t } = useI18n();
         data-key="OrderList"
         url="Orders/filter"
         :label="t('Search order')"
-        :info="t('You can search orders by reference')"
+        :info="t('Search orders by ticket id')"
     />
 </template>
 
@@ -18,5 +18,5 @@ const { t } = useI18n();
 <i18n>
 es:
     Search order: Buscar orden
-    You can search orders by reference: Puedes buscar por referencia de la orden
+    Search orders by ticket id: Buscar pedido por id ticket
 </i18n>

src/pages/Route/RouteList.vue

@@ -185,7 +185,7 @@ const columns = computed(() => [
                 action: (row) => openTicketsDialog(row?.id),
             },
             {
-                title: t('Preview'),
+                title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
                 action: (row) => viewSummary(row?.id, RouteSummary),
             },

src/pages/Ticket/Card/TicketSaleMoreActions.vue

@@ -131,7 +131,11 @@ const createClaim = () => {
             onCreateClaimAccepted
         );
     else
-        openConfirmationModal(t('Do you want to create a claim?'), onCreateClaimAccepted);
+        openConfirmationModal(
+            t('Do you want to create a claim?'),
+            false,
+            onCreateClaimAccepted
+        );
 };
 
 const onCreateClaimAccepted = async () => {

src/pages/Travel/TravelList.vue

@@ -10,6 +10,7 @@ import { computed } from 'vue';
 import TravelSummary from './Card/TravelSummary.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import { toDate } from 'src/filters';
+import { getDateQBadgeColor } from 'src/composables/getDateQBadgeColor.js';
 const { viewSummary } = useSummaryDialog();
 const router = useRouter();
 const { t } = useI18n();
@@ -46,14 +47,12 @@ const columns = computed(() => [
         name: 'id',
         label: t('travel.travelList.tableVisibleColumns.id'),
         isId: true,
-        field: 'id',
         cardVisible: true,
     },
     {
         align: 'left',
         name: 'ref',
         label: t('travel.travelList.tableVisibleColumns.ref'),
-        field: 'ref',
         component: 'input',
         columnField: {
             component: null,
@@ -65,7 +64,6 @@ const columns = computed(() => [
         align: 'left',
         name: 'agencyModeFk',
         label: t('travel.travelList.tableVisibleColumns.agency'),
-        field: 'agencyModeFk',
         component: 'select',
         attrs: {
             url: 'agencyModes',
@@ -78,37 +76,10 @@ const columns = computed(() => [
         cardVisible: true,
         create: true,
     },
-    {
-        align: 'left',
-        name: 'shipped',
-        label: t('travel.travelList.tableVisibleColumns.shipped'),
-        field: 'shipped',
-        component: 'date',
-        columnField: {
-            component: null,
-        },
-        cardVisible: true,
-        create: true,
-        format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.shipped)),
-    },
-    {
-        align: 'left',
-        name: 'landed',
-        label: t('travel.travelList.tableVisibleColumns.landed'),
-        field: 'landed',
-        component: 'date',
-        columnField: {
-            component: null,
-        },
-        cardVisible: true,
-        create: true,
-        format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.landed)),
-    },
     {
         align: 'left',
         name: 'warehouseInFk',
         label: t('travel.travelList.tableVisibleColumns.warehouseIn'),
-        field: 'warehouseInFk',
         component: 'select',
         attrs: {
             url: 'warehouses',
@@ -123,11 +94,28 @@ const columns = computed(() => [
         cardVisible: true,
         create: true,
     },
+    {
+        align: 'left',
+        name: 'shipped',
+        label: t('travel.travelList.tableVisibleColumns.shipped'),
+        component: 'date',
+        columnField: {
+            component: null,
+        },
+        cardVisible: true,
+        create: true,
+        format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.shipped)),
+    },
+    {
+        align: 'left',
+        name: 'shipmentHour',
+        label: t('travel.travelList.tableVisibleColumns.shipHour'),
+        cardVisible: true,
+    },
     {
         align: 'left',
         name: 'warehouseOutFk',
         label: t('travel.travelList.tableVisibleColumns.warehouseOut'),
-        field: 'warehouseOutFk',
         component: 'select',
         attrs: {
             url: 'warehouses',
@@ -140,12 +128,30 @@ const columns = computed(() => [
         cardVisible: true,
         create: true,
     },
+    {
+        align: 'left',
+        name: 'landed',
+        label: t('travel.travelList.tableVisibleColumns.landed'),
+        component: 'date',
+        columnField: {
+            component: null,
+        },
+        cardVisible: true,
+        create: true,
+        format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.landed)),
+    },
+    {
+        align: 'left',
+        name: 'landingHour',
+        label: t('travel.travelList.tableVisibleColumns.landHour'),
+        cardVisible: true,
+    },
     {
         align: 'left',
         name: 'totalEntries',
         label: t('travel.travelList.tableVisibleColumns.totalEntries'),
-        field: 'totalEntries',
         component: 'input',
+        toolTip: t('travel.travelList.tableVisibleColumns.totalEntriesTooltip'),
         columnField: {
             component: null,
         },
@@ -165,13 +171,15 @@ const columns = computed(() => [
             },
             {
                 title: t('Add entry'),
-                icon: 'contact_support',
+                icon: 'vn:ticket',
                 action: redirectCreateEntryView,
+                isPrimary: true,
             },
             {
-                title: t('View Summary'),
+                title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
                 action: (row) => viewSummary(row.id, TravelSummary),
+                isPrimary: true,
             },
         ],
     },
@@ -202,12 +210,43 @@ const columns = computed(() => [
         redirect="travel"
         :is-editable="false"
         :use-model="true"
+    >
+        <template #column-shipped="{ row }">
+            <QBadge
+                text-color="black"
+                v-if="getDateQBadgeColor(row.shipped)"
+                :color="getDateQBadgeColor(row.shipped)"
+            >
+                {{ toDate(row.shipped) }}
+            </QBadge>
+            <span v-else>{{ toDate(row.shipped) }}</span>
+            <QIcon
+                name="flight_takeoff"
+                size="sm"
+                :class="{ 'is-active': row.isDelivered }"
             />
+        </template>
+        <template #column-landed="{ row }">
+            <QBadge
+                text-color="black"
+                v-if="getDateQBadgeColor(row.landed)"
+                :color="getDateQBadgeColor(row.landed)"
+            >
+                {{ toDate(row.landed) }}
+            </QBadge>
+            <span v-else>{{ toDate(row.landed) }}</span>
+            <QIcon
+                name="flight_land"
+                size="sm"
+                :class="{ 'is-active': row.isReceived }"
+            />
+        </template>
+    </VnTable>
 </template>
 
 <i18n>
 en:
-    addEntry: Add entry
+    Add entry: Add entry
     searchByIdOrReference: Search by ID or reference
 
 es:
@@ -215,4 +254,12 @@ es:
     searchByIdOrReference: Buscar por ID o por referencia
     You can search by travel id or name: Buscar por envio por id o nombre
     Search travel: Buscar envio
+    Clone: Clonar
+    Add entry: Añadir Entrada
 </i18n>
+
+<style lang="scss" scoped>
+.is-active {
+    color: #c8e484;
+}
+</style>

src/pages/Worker/WorkerList.vue

@@ -77,7 +77,7 @@ const columns = computed(() => [
         name: 'tableActions',
         actions: [
             {
-                title: t('InvoiceOutSummary'),
+                title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
                 action: (row) => viewSummary(row.id, WorkerSummary),
             },