Compare commits

..

11 Commits

Author SHA1 Message Date
Jon Elias 2c607ef8d9 refactor: refs #8120 change prop and classes' names
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 13:16:04 +01:00
Jon Elias 802df02581 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8120-CompactSummaryPopup 2025-01-16 08:02:03 +01:00
Jon Elias d1be809b76 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8120-CompactSummaryPopup 2025-01-15 12:55:20 +01:00
Jon Elias 547e4847a7 Merge branch '8120-CompactSummaryPopup' of https://gitea.verdnatura.es/verdnatura/salix-front into 8120-CompactSummaryPopup
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 16:19:26 +01:00
Jon Elias b52956d27d refactor: refs #8120 use only defineProps 2025-01-13 16:19:24 +01:00
Jon Elias d75c48df0f Merge branch 'dev' into 8120-CompactSummaryPopup
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 10:05:42 +00:00
Jon Elias 19e8b948ae feat: refs #8120 use new prop in the requierd modules
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 11:04:41 +01:00
Jon Elias 1091a762de Merge branch '8120-CompactSummaryPopup' of https://gitea.verdnatura.es/verdnatura/salix-front into 8120-CompactSummaryPopup
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 11:01:27 +01:00
Jon Elias b48cc55f4b refactor: refs #8120 requested changes 2025-01-13 11:01:26 +01:00
Jon Elias 9cd8b2e8d6 Merge branch 'dev' into 8120-CompactSummaryPopup
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 09:23:17 +00:00
Jon Elias 2aff1d3d06 feat: refs #8120 added new style to summary popups
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 10:20:28 +01:00
45 changed files with 598 additions and 720 deletions

View File

@ -42,13 +42,10 @@ const $props = defineProps({
type: Number,
default: null,
},
uppercase: {
type: Boolean,
default: false,
},
});
const vnInputRef = ref(null);
const showPassword = ref(false);
const value = computed({
get() {
return $props.modelValue;
@ -120,10 +117,6 @@ const handleInsertMode = (e) => {
input.setSelectionRange(cursorPos + 1, cursorPos + 1);
});
};
const handleUppercase = () => {
value.value = value.value?.toUpperCase() || '';
};
</script>
<template>
@ -166,16 +159,7 @@ const handleUppercase = () => {
emit('remove');
}
"
></QIcon>
<QIcon
name="match_case"
size="xs"
v-if="!$attrs.disabled && !($attrs.readonly) && $props.uppercase"
@click="handleUppercase"
class="uppercase-icon"
/>
<slot name="append" v-if="$slots.append && !$attrs.disabled" />
<QIcon v-if="info" name="info">
<QTooltip max-width="350px">
@ -186,14 +170,3 @@ const handleUppercase = () => {
</QInput>
</div>
</template>
<i18n>
en:
inputMin: Must be more than {value}
maxLength: The value exceeds {value} characters
inputMax: Must be less than {value}
es:
inputMin: Debe ser mayor a {value}
maxLength: El valor excede los {value} carácteres
inputMax: Debe ser menor a {value}
</i18n>

View File

@ -10,6 +10,10 @@ defineProps({
type: Object,
required: true,
},
width: {
type: String,
default: 'md-width',
},
});
defineEmits([...useDialogPluginComponent.emits]);
@ -17,7 +21,19 @@ defineEmits([...useDialogPluginComponent.emits]);
const { dialogRef, onDialogHide } = useDialogPluginComponent();
</script>
<template>
<QDialog ref="dialogRef" @hide="onDialogHide" full-width>
<component :is="summary" :id="id" />
<QDialog ref="dialogRef" @hide="onDialogHide">
<component :is="summary" :id="id" :class="width" />
</QDialog>
</template>
<style lang="scss" scoped>
.md-width {
max-width: $width-md;
}
.lg-width {
max-width: $width-lg;
}
.xlg-width {
max-width: $width-xl;
}
</style>

View File

@ -1,63 +0,0 @@
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
import { createWrapper } from 'app/test/vitest/helper';
import VnInputTime from 'components/common/VnInputTime.vue';
describe('VnInputTime', () => {
let wrapper;
let vm;
beforeAll(() => {
wrapper = createWrapper(VnInputTime, {
props: {
isOutlined: true,
timeOnly: false,
},
});
vm = wrapper.vm;
wrapper = wrapper.wrapper;
});
afterEach(() => {
vi.clearAllMocks();
});
it('should return the correct data if isOutlined is true', () => {
expect(vm.isOutlined).toBe(true);
expect(vm.styleAttrs).toEqual({ dense: true, outlined: true, rounded: true });
});
it('should return the formatted data', () => {
expect(vm.dateToTime('2022-01-01T03:23:43')).toBe('03:23');
});
describe('formattedTime', () => {
it('should return the formatted time for a valid ISO date', () => {
vm.model = '2025-01-02T15:45:00';
expect(vm.formattedTime).toBe('15:45');
});
it('should handle null model value gracefully', () => {
vm.model = null;
expect(vm.formattedTime).toBe(null);
});
it('should handle time-only input correctly', async () => {
await wrapper.setProps({ timeOnly: true });
vm.formattedTime = '14:30';
expect(vm.model).toBe('14:30');
});
it('should pad short time values correctly', async () => {
await wrapper.setProps({ timeOnly: true });
vm.formattedTime = '9';
expect(vm.model).toBe('09:00');
});
it('should not update the model if the value is unchanged', () => {
vm.model = '14:30';
const previousModel = vm.model;
vm.formattedTime = '14:30';
expect(vm.model).toBe(previousModel);
});
});
});

View File

@ -37,6 +37,10 @@ const $props = defineProps({
type: Object,
default: null,
},
width: {
type: String,
default: 'md-width',
},
});
const state = useState();
@ -128,9 +132,8 @@ const toModule = computed(() =>
</QTooltip>
</QBtn></slot
>
<QBtn
@click.stop="viewSummary(entity.id, $props.summary)"
@click.stop="viewSummary(entity.id, $props.summary, $props.width)"
round
flat
dense

View File

@ -1,49 +1,38 @@
<template>
<div class="header bg-primary q-pa-sm q-mb-md">
<QSkeleton type="rect" square />
<QSkeleton type="rect" square />
</div>
<div class="row q-pa-md q-col-gutter-md q-mb-md">
<div class="col">
<QSkeleton type="rect" class="q-mb-md" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
</div>
<div class="col">
<QSkeleton type="rect" class="q-mb-md" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
</div>
<div class="col">
<QSkeleton type="rect" class="q-mb-md" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
</div>
<div class="col">
<QSkeleton type="rect" class="q-mb-md" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
</div>
<div class="col">
<QSkeleton type="rect" class="q-mb-md" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
</div>
<QSkeleton type="rect" class="q-mb-md" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="rect" class="q-mb-md" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="rect" class="q-mb-md" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="rect" class="q-mb-md" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="rect" class="q-mb-md" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
<QSkeleton type="text" square />
</div>
</template>

View File

@ -4,10 +4,10 @@ import { useQuasar } from 'quasar';
export function useSummaryDialog() {
const quasar = useQuasar();
function viewSummary(id, summary) {
function viewSummary(id, summary, width) {
quasar.dialog({
component: VnSummaryDialog,
componentProps: { id, summary },
componentProps: { id, summary, width },
});
}

View File

@ -33,6 +33,11 @@ $dark-shadow-color: black;
$layout-shadow-dark: 0 0 10px 2px #00000033, 0 0px 10px #0000003d;
$spacing-md: 16px;
$color-font-secondary: #777;
$width-xs: 400px;
$width-sm: 544px;
$width-md: 800px;
$width-lg: 1280px;
$width-xl: 1600px;
.bg-success {
background-color: $positive;
}

View File

@ -389,6 +389,80 @@ cau:
subtitle: By sending this ticket, all the data related to the error, the section, the user, etc., are already sent.
inputLabel: Explain why this error should not appear
askPrivileges: Ask for privileges
entry:
list:
newEntry: New entry
tableVisibleColumns:
created: Creation
supplierFk: Supplier
isBooked: Booked
isConfirmed: Confirmed
isOrdered: Ordered
companyFk: Company
travelFk: Travel
isExcludedFromAvailable: Inventory
invoiceAmount: Import
summary:
commission: Commission
currency: Currency
invoiceNumber: Invoice number
ordered: Ordered
booked: Booked
excludedFromAvailable: Inventory
travelReference: Reference
travelAgency: Agency
travelShipped: Shipped
travelDelivered: Delivered
travelLanded: Landed
travelReceived: Received
buys: Buys
stickers: Stickers
package: Package
packing: Pack.
grouping: Group.
buyingValue: Buying value
import: Import
pvp: PVP
basicData:
travel: Travel
currency: Currency
commission: Commission
observation: Observation
booked: Booked
excludedFromAvailable: Inventory
buys:
observations: Observations
packagingFk: Box
color: Color
printedStickers: Printed stickers
notes:
observationType: Observation type
latestBuys:
tableVisibleColumns:
image: Picture
itemFk: Item ID
weightByPiece: Weight/Piece
isActive: Active
family: Family
entryFk: Entry
freightValue: Freight value
comissionValue: Commission value
packageValue: Package value
isIgnored: Is ignored
price2: Grouping
price3: Packing
minPrice: Min
ektFk: Ekt
packingOut: Package out
landing: Landing
isExcludedFromAvailable: Es inventory
params:
toShipped: To
fromShipped: From
warehouseiNFk: Warehouse
daysOnward: Days onward
daysAgo: Days ago
warehouseInFk: Warehouse in
ticket:
params:
ticketFk: Ticket ID
@ -795,10 +869,7 @@ components:
hasMinPrice: Minimum price
# LatestBuysFilter
salesPersonFk: Buyer
supplierFk: Supplier
from: From
to: To
visible: Is visible
active: Is active
floramondo: Is floramondo
showBadDates: Show future items

View File

@ -389,6 +389,80 @@ cau:
subtitle: Al enviar este cau ya se envían todos los datos relacionados con el error, la sección, el usuario, etc
inputLabel: Explique el motivo por el que no deberia aparecer este fallo
askPrivileges: Solicitar permisos
entry:
list:
newEntry: Nueva entrada
tableVisibleColumns:
created: Creación
supplierFk: Proveedor
isBooked: Asentado
isConfirmed: Confirmado
isOrdered: Pedida
companyFk: Empresa
travelFk: Envio
isExcludedFromAvailable: Inventario
invoiceAmount: Importe
summary:
commission: Comisión
currency: Moneda
invoiceNumber: Núm. factura
ordered: Pedida
booked: Contabilizada
excludedFromAvailable: Inventario
travelReference: Referencia
travelAgency: Agencia
travelShipped: F. envio
travelWarehouseOut: Alm. salida
travelDelivered: Enviada
travelLanded: F. entrega
travelReceived: Recibida
buys: Compras
stickers: Etiquetas
package: Embalaje
packing: Pack.
grouping: Group.
buyingValue: Coste
import: Importe
pvp: PVP
basicData:
travel: Envío
currency: Moneda
observation: Observación
commission: Comisión
booked: Asentado
excludedFromAvailable: Inventario
buys:
observations: Observaciónes
packagingFk: Embalaje
color: Color
printedStickers: Etiquetas impresas
notes:
observationType: Tipo de observación
latestBuys:
tableVisibleColumns:
image: Foto
itemFk: Id Artículo
weightByPiece: Peso (gramos)/tallo
isActive: Activo
family: Familia
entryFk: Entrada
freightValue: Porte
comissionValue: Comisión
packageValue: Embalaje
isIgnored: Ignorado
price2: Grouping
price3: Packing
minPrice: Min
ektFk: Ekt
packingOut: Embalaje envíos
landing: Llegada
isExcludedFromAvailable: Es inventario
params:
toShipped: Hasta
fromShipped: Desde
warehouseInFk: Alm. entrada
daysOnward: Días adelante
daysAgo: Días atras
ticket:
params:
ticketFk: ID de ticket
@ -792,11 +866,7 @@ components:
wareHouseFk: Almacén
# LatestBuysFilter
salesPersonFk: Comprador
supplierFk: Proveedor
visible: Visible
active: Activo
from: Desde
to: Hasta
floramondo: Floramondo
showBadDates: Ver items a futuro
userPanel:

View File

@ -53,6 +53,7 @@ const debtWarning = computed(() => {
@on-fetch="setData"
:summary="$props.summary"
data-key="customer"
width="lg-width"
>
<template #menu="{ entity }">
<CustomerDescriptorMenu :customer="entity" />

View File

@ -44,7 +44,6 @@ function handleLocation(data, location) {
:required="true"
:rules="validate('client.socialName')"
clearable
uppercase="true"
v-model="data.socialName"
>
<template #append>

View File

@ -50,14 +50,6 @@ const columns = computed(() => [
isTitle: true,
create: true,
columnClass: 'expand',
attrs: {
uppercase: true,
},
columnFilter: {
attrs: {
uppercase: false,
},
},
},
{
align: 'left',

View File

@ -11,7 +11,6 @@ import VnInput from 'src/components/common/VnInput.vue';
import VnSelect from 'src/components/common/VnSelect.vue';
import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
import VnInputNumber from 'src/components/common/VnInputNumber.vue';
const { t } = useI18n();
const route = useRoute();
@ -151,22 +150,6 @@ function onAgentCreated({ id, fiscalName }, data) {
</template>
</VnSelectDialog>
</VnRow>
<VnRow>
<VnInputNumber
:label="t('Longitude')"
clearable
v-model="data.longitude"
:decimal-places="7"
:positive="false"
/>
<VnInputNumber
:label="t('Latitude')"
clearable
v-model="data.latitude"
:decimal-places="7"
:positive="false"
/>
</VnRow>
</template>
</FormModel>
</template>
@ -192,6 +175,4 @@ es:
Mobile: Movíl
Incoterms: Incoterms
Customs agent: Agente de aduanas
Longitude: Longitud
Latitude: Latitud
</i18n>

View File

@ -106,7 +106,7 @@ const { openConfirmationModal } = useVnConfirm();
:to="{
name: 'WorkerList',
query: {
table: JSON.stringify({ departmentFk: entityId }),
params: JSON.stringify({ departmentFk: entityId }),
},
}"
>

View File

@ -1,13 +1,21 @@
<script setup>
import VnCardBeta from 'components/common/VnCardBeta.vue';
import VnCard from 'components/common/VnCard.vue';
import EntryDescriptor from './EntryDescriptor.vue';
import filter from './EntryFilter.js'
import EntryFilter from '../EntryFilter.vue';
import filter from './EntryFilter.js';
</script>
<template>
<VnCardBeta
<VnCard
data-key="Entry"
base-url="Entries"
:filter="filter"
:descriptor="EntryDescriptor"
:user-filter="filter"
:filter-panel="EntryFilter"
search-data-key="EntryList"
:searchbar-props="{
url: 'Entries/filter',
label: 'Search entries',
info: 'You can search by entry reference',
}"
/>
</template>

View File

@ -61,6 +61,7 @@ const getEntryRedirectionFilter = (entry) => {
:filter="filter"
title="supplier.nickname"
data-key="Entry"
width="lg-width"
>
<template #menu="{ entity }">
<EntryDescriptorMenu :id="entity.id" />

View File

@ -40,7 +40,7 @@ const companiesOptions = ref([]);
<VnFilterPanel :data-key="props.dataKey" :search-button="true">
<template #tags="{ tag, formatFn }">
<div class="q-gutter-x-xs">
<strong>{{ t(`entryFilter.params.${tag.label}`) }}: </strong>
<strong>{{ t(`params.${tag.label}`) }}: </strong>
<span>{{ formatFn(tag.value) }}</span>
</div>
</template>
@ -49,7 +49,7 @@ const companiesOptions = ref([]);
<QItemSection>
<VnInput
v-model="params.search"
:label="t('entryFilter.params.search')"
:label="t('entryFilter.filter.search')"
is-outlined
/>
</QItemSection>
@ -58,7 +58,7 @@ const companiesOptions = ref([]);
<QItemSection>
<VnInput
v-model="params.reference"
:label="t('entryFilter.params.reference')"
:label="t('entryFilter.filter.reference')"
is-outlined
/>
</QItemSection>
@ -67,7 +67,7 @@ const companiesOptions = ref([]);
<QItemSection>
<VnInput
v-model="params.invoiceNumber"
:label="t('entryFilter.params.invoiceNumber')"
:label="t('params.invoiceNumber')"
is-outlined
/>
</QItemSection>
@ -76,7 +76,7 @@ const companiesOptions = ref([]);
<QItemSection>
<VnInput
v-model="params.travelFk"
:label="t('entryFilter.params.travelFk')"
:label="t('params.travelFk')"
is-outlined
/>
</QItemSection>
@ -84,7 +84,7 @@ const companiesOptions = ref([]);
<QItem>
<QItemSection>
<VnSelect
:label="t('entryFilter.params.companyFk')"
:label="t('params.companyFk')"
v-model="params.companyFk"
@update:model-value="searchFn()"
:options="companiesOptions"
@ -100,7 +100,7 @@ const companiesOptions = ref([]);
<QItem>
<QItemSection>
<VnSelect
:label="t('entryFilter.params.currencyFk')"
:label="t('params.currencyFk')"
v-model="params.currencyFk"
@update:model-value="searchFn()"
:options="currenciesOptions"
@ -116,7 +116,7 @@ const companiesOptions = ref([]);
<QItem>
<QItemSection>
<VnSelect
:label="t('entryFilter.params.supplierFk')"
:label="t('params.supplierFk')"
v-model="params.supplierFk"
@update:model-value="searchFn()"
url="Suppliers"
@ -148,7 +148,7 @@ const companiesOptions = ref([]);
<QItem>
<QItemSection>
<VnInputDate
:label="t('entryFilter.params.created')"
:label="t('params.created')"
v-model="params.created"
@update:model-value="searchFn()"
is-outlined
@ -158,7 +158,7 @@ const companiesOptions = ref([]);
<QItem>
<QItemSection>
<VnInputDate
:label="t('entryFilter.params.from')"
:label="t('params.from')"
v-model="params.from"
@update:model-value="searchFn()"
is-outlined
@ -168,7 +168,7 @@ const companiesOptions = ref([]);
<QItem>
<QItemSection>
<VnInputDate
:label="t('entryFilter.params.to')"
:label="t('params.to')"
v-model="params.to"
@update:model-value="searchFn()"
is-outlined
@ -178,14 +178,14 @@ const companiesOptions = ref([]);
<QItem>
<QItemSection>
<QCheckbox
:label="t('entryFilter.params.isBooked')"
:label="t('params.isBooked')"
v-model="params.isBooked"
toggle-indeterminate
/>
</QItemSection>
<QItemSection>
<QCheckbox
:label="t('entryFilter.params.isConfirmed')"
:label="t('params.isConfirmed')"
v-model="params.isConfirmed"
toggle-indeterminate
/>
@ -194,7 +194,7 @@ const companiesOptions = ref([]);
<QItem>
<QItemSection>
<QCheckbox
:label="t('entryFilter.params.isOrdered')"
:label="t('params.isOrdered')"
v-model="params.isOrdered"
toggle-indeterminate
/>
@ -202,4 +202,35 @@ const companiesOptions = ref([]);
</QItem>
</template>
</VnFilterPanel>
</template>
</template>
<i18n>
en:
params:
invoiceNumber: Invoice number
travelFk: Travel
companyFk: Company
currencyFk: Currency
supplierFk: Supplier
from: From
to: To
created: Created
isBooked: Booked
isConfirmed: Confirmed
isOrdered: Ordered
es:
params:
invoiceNumber: Núm. factura
travelFk: Envío
companyFk: Empresa
currencyFk: Moneda
supplierFk: Proveedor
from: Desde
to: Hasta
created: Fecha creación
isBooked: Asentado
isConfirmed: Confirmado
isOrdered: Pedida
</i18n>

View File

@ -102,7 +102,7 @@ const columns = [
},
{
align: 'left',
label: t('entry.latestBuys.tableVisibleColumns.weightByPiece'),
label: t('globals.weightByPiece'),
name: 'weightByPiece',
columnFilter: {
component: 'number',
@ -157,7 +157,7 @@ const columns = [
},
{
align: 'left',
label: t('entry.latestBuys.tableVisibleColumns.packageValue'),
label: t('entry.buys.packageValue'),
name: 'packageValue',
columnFilter: {
component: 'number',
@ -262,3 +262,8 @@ onUnmounted(() => (stateStore.rightDrawer = false));
:right-search="false"
/>
</template>
<i18n>
es:
Edit buy(s): Editar compra(s)
</i18n>

View File

@ -2,17 +2,17 @@
import { ref, computed } from 'vue';
import { useI18n } from 'vue-i18n';
import EntryFilter from './EntryFilter.vue';
import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
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 SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
import VnSection from 'src/components/common/VnSection.vue';
const { t } = useI18n();
const tableRef = ref();
const dataKey = 'EntryList';
const { viewSummary } = useSummaryDialog();
const entryFilter = {
@ -178,73 +178,73 @@ const columns = computed(() => [
},
]);
</script>
<template>
<VnSection
:data-key="dataKey"
:columns="columns"
prefix="entry"
<VnSearchbar
data-key="EntryList"
url="Entries/filter"
:array-data-props="{
url: 'Entries/filter',
order: 'id DESC',
userFilter: 'entryFilter',
}"
>
<template #rightMenu>
:label="t('Search entries')"
:info="t('You can search by entry reference')"
/>
<RightMenu>
<template #right-panel>
<EntryFilter data-key="EntryList" />
</template>
<template #body>
<VnTable
ref="tableRef"
:data-key="dataKey"
:create="{
urlCreate: 'Entries',
title: t('entry.list.newEntry'),
onDataSaved: ({ id }) => tableRef.redirect(id),
formInitialData: {},
}"
:columns="columns"
redirect="entry"
:right-search="false"
>
<template #column-status="{ row }">
<div class="row q-gutter-xs">
<QIcon
v-if="!!row.isExcludedFromAvailable"
name="vn:inventory"
color="primary"
>
<QTooltip>{{
t(
'entry.list.tableVisibleColumns.isExcludedFromAvailable'
)
}}</QTooltip>
</QIcon>
<QIcon v-if="!!row.isRaid" name="vn:net" color="primary">
<QTooltip>
{{
t('globals.raid', {
daysInForward: row.daysInForward,
})
}}</QTooltip
>
</QIcon>
</div>
</template>
<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>
</RightMenu>
<VnTable
ref="tableRef"
data-key="EntryList"
url="Entries/filter"
:filter="entryFilter"
:create="{
urlCreate: 'Entries',
title: t('Create entry'),
onDataSaved: ({ id }) => tableRef.redirect(id),
formInitialData: {},
}"
order="id DESC"
:columns="columns"
redirect="entry"
:right-search="false"
>
<template #column-status="{ row }">
<div class="row q-gutter-xs">
<QIcon
v-if="!!row.isExcludedFromAvailable"
name="vn:inventory"
color="primary"
>
<QTooltip>{{
t('entry.list.tableVisibleColumns.isExcludedFromAvailable')
}}</QTooltip>
</QIcon>
<QIcon v-if="!!row.isRaid" name="vn:net" color="primary">
<QTooltip>
{{
t('globals.raid', { daysInForward: row.daysInForward })
}}</QTooltip
>
</QIcon>
</div>
</template>
</VnSection>
<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>
es:
Virtual entry: Es una redada
Search entries: Buscar entradas
You can search by entry reference: Puedes buscar por referencia de la entrada
Create entry: Crear entrada
</i18n>

View File

@ -1,5 +1,5 @@
<script setup>
import { ref, computed } from 'vue';
import { ref } from 'vue';
import { useI18n } from 'vue-i18n';
import { useState } from 'src/composables/useState';
import { useQuasar } from 'quasar';
@ -19,7 +19,7 @@ const { t } = useI18n();
const quasar = useQuasar();
const state = useState();
const user = state.getUser();
const columns = computed(() => [
const columns = [
{
align: 'left',
label: 'Id',
@ -31,7 +31,7 @@ const columns = computed(() => [
{
align: 'left',
name: 'workerFk',
label: t('entryStockBought.buyer'),
label: t('Buyer'),
isTitle: true,
component: 'select',
cardVisible: true,
@ -49,7 +49,7 @@ const columns = computed(() => [
},
{
align: 'center',
label: t('entryStockBought.reserve'),
label: t('Reserve'),
name: 'reserve',
columnFilter: false,
create: true,
@ -58,7 +58,7 @@ const columns = computed(() => [
},
{
align: 'center',
label: t('entryStockBought.bought'),
label: t('Bought'),
name: 'bought',
summation: true,
cardVisible: true,
@ -66,7 +66,7 @@ const columns = computed(() => [
},
{
align: 'left',
label: t('entryStockBought.date'),
label: t('Date'),
name: 'dated',
component: 'date',
visible: false,
@ -77,7 +77,7 @@ const columns = computed(() => [
name: 'tableActions',
actions: [
{
title: t('entryStockBought.viewMoreDetails'),
title: t('View more details'),
icon: 'search',
isPrimary: true,
action: (row) => {
@ -92,7 +92,7 @@ const columns = computed(() => [
},
],
},
]);
];
const fetchDataRef = ref();
const travelDialogRef = ref(false);
@ -166,7 +166,7 @@ function round(value) {
<VnRow class="travel">
<div v-if="travel">
<span style="color: var(--vn-label-color)">
{{ t('entryStockBought.purchaseSpaces') }}:
{{ t('Purchase Spaces') }}:
</span>
<span>
{{ travel?.m3 }}
@ -177,7 +177,7 @@ function round(value) {
flat
icon="edit"
@click="openDialog()"
:title="t('entryStockBought.editTravel')"
:title="t('Edit travel')"
color="primary"
/>
</div>
@ -226,7 +226,7 @@ function round(value) {
@on-fetch="(data) => setFooter(data)"
:create="{
urlCreate: 'StockBoughts',
title: t('entryStockBought.reserveSomeSpace'),
title: t('Reserve some space'),
onDataSaved: () => tableRef.reload(),
formInitialData: {
workerFk: user.id,
@ -288,3 +288,16 @@ function round(value) {
color: $negative !important;
}
</style>
<i18n>
es:
Edit travel: Editar envío
Travel: Envíos
Purchase Spaces: Espacios de compra
Buyer: Comprador
Reserve: Reservado
Bought: Comprado
Date: Fecha
View more details: Ver más detalles
Reserve some space: Reservar espacio
This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha
</i18n>

View File

@ -123,8 +123,8 @@ const printBuys = (rowId) => {
<VnSearchbar
data-key="myEntriesList"
url="Entries/filter"
:label="t('myEntries.search')"
:info="t('myEntries.searchInfo')"
:label="t('Search entries')"
:info="t('You can search by entry reference')"
/>
<VnTable
data-key="myEntriesList"
@ -137,3 +137,7 @@ const printBuys = (rowId) => {
chip-locale="myEntries"
/>
</template>
<i18n>
You can search by entry reference: Puedes buscar por referencia de la entrada
</i18n>

View File

@ -1,92 +1,9 @@
entry:
entryList:
list:
newEntry: New entry
tableVisibleColumns:
created: Creation
supplierFk: Supplier
isBooked: Booked
isConfirmed: Confirmed
isOrdered: Ordered
companyFk: Company
travelFk: Travel
isExcludedFromAvailable: Inventory
invoiceAmount: Import
inventoryEntry: Inventory entry
summary:
commission: Commission
currency: Currency
invoiceNumber: Invoice number
ordered: Ordered
booked: Booked
excludedFromAvailable: Inventory
travelReference: Reference
travelAgency: Agency
travelShipped: Shipped
travelDelivered: Delivered
travelLanded: Landed
travelReceived: Received
buys: Buys
stickers: Stickers
package: Package
packing: Pack.
grouping: Group.
buyingValue: Buying value
import: Import
pvp: PVP
basicData:
travel: Travel
currency: Currency
commission: Commission
observation: Observation
booked: Booked
excludedFromAvailable: Inventory
buys:
observations: Observations
packagingFk: Box
color: Color
printedStickers: Printed stickers
notes:
observationType: Observation type
latestBuys:
tableVisibleColumns:
image: Picture
itemFk: Item ID
weightByPiece: Weight/Piece
isActive: Active
family: Family
entryFk: Entry
freightValue: Freight value
comissionValue: Commission value
packageValue: Package value
isIgnored: Is ignored
price2: Grouping
price3: Packing
minPrice: Min
ektFk: Ekt
packingOut: Package out
landing: Landing
isExcludedFromAvailable: Es inventory
params:
toShipped: To
fromShipped: From
daysOnward: Days onward
daysAgo: Days ago
warehouseInFk: Warehouse in
search: Search entries
searchInfo: You can search by entry reference
showEntryReport: Show entry report
entryFilter:
params:
invoiceNumber: Invoice number
travelFk: Travel
companyFk: Company
currencyFk: Currency
supplierFk: Supplier
from: From
to: To
created: Created
isBooked: Booked
isConfirmed: Confirmed
isOrdered: Ordered
filter:
search: General search
reference: Reference
myEntries:
@ -102,18 +19,5 @@ myEntries:
daysOnward: Days onward
daysAgo: Days ago
downloadCsv: Download CSV
search: Search entries
searchInfo: You can search by entry reference
entryStockBought:
travel: Travel
editTravel: Edit travel
purchaseSpaces: Purchase spaces
buyer: Buyer
reserve: Reserve
bought: Bought
date: Date
viewMoreDetails: View more details
reserveSomeSpace: Reserve some space
thisBuyerHasReservationThisDate: This buyer has already made a reservation for this date
wasteRecalc:
recalcOk: The wastes were successfully recalculated

View File

@ -1,93 +1,12 @@
entry:
Search entries: Buscar entradas
You can search by entry reference: Puedes buscar por referencia de la entrada
entryList:
list:
newEntry: Nueva entrada
tableVisibleColumns:
created: Creación
supplierFk: Proveedor
isBooked: Asentado
isConfirmed: Confirmado
isOrdered: Pedida
companyFk: Empresa
travelFk: Envio
isExcludedFromAvailable: Inventario
invoiceAmount: Importe
inventoryEntry: Es inventario
summary:
commission: Comisión
currency: Moneda
invoiceNumber: Núm. factura
ordered: Pedida
booked: Contabilizada
excludedFromAvailable: Inventario
travelReference: Referencia
travelAgency: Agencia
travelShipped: F. envio
travelWarehouseOut: Alm. salida
travelDelivered: Enviada
travelLanded: F. entrega
travelReceived: Recibida
buys: Compras
stickers: Etiquetas
package: Embalaje
packing: Pack.
grouping: Group.
buyingValue: Coste
import: Importe
pvp: PVP
basicData:
travel: Envío
currency: Moneda
observation: Observación
commission: Comisión
booked: Asentado
excludedFromAvailable: Inventario
buys:
observations: Observaciónes
packagingFk: Embalaje
color: Color
printedStickers: Etiquetas impresas
notes:
observationType: Tipo de observación
latestBuys:
tableVisibleColumns:
image: Foto
itemFk: Id Artículo
weightByPiece: Peso (gramos)/tallo
isActive: Activo
family: Familia
entryFk: Entrada
freightValue: Porte
comissionValue: Comisión
packageValue: Embalaje
isIgnored: Ignorado
price2: Grouping
price3: Packing
minPrice: Min
ektFk: Ekt
packingOut: Embalaje envíos
landing: Llegada
isExcludedFromAvailable: Es inventario
params:
toShipped: Hasta
fromShipped: Desde
warehouseInFk: Alm. entrada
daysOnward: Días adelante
daysAgo: Días atras
search: Buscar entradas
searchInfo: Puedes buscar por referencia de entrada
showEntryReport: Ver informe del pedido
entryFilter:
params:
invoiceNumber: Núm. factura
travelFk: Envío
companyFk: Empresa
currencyFk: Moneda
supplierFk: Proveedor
from: Desde
to: Hasta
created: Fecha creación
isBooked: Asentado
isConfirmed: Confirmado
isOrdered: Pedida
filter:
search: Búsqueda general
reference: Referencia
myEntries:
@ -103,18 +22,5 @@ myEntries:
daysOnward: Días adelante
daysAgo: Días atras
downloadCsv: Descargar CSV
search: Buscar entradas
searchInfo: Puedes buscar por referencia de la entrada
entryStockBought:
travel: Envío
editTravel: Editar envío
purchaseSpaces: Espacios de compra
buyer: Comprador
reserve: Reservado
bought: Comprado
date: Fecha
viewMoreDetails: Ver más detalles
reserveSomeSpace: Reservar espacio
thisBuyerHasReservationThisDate: Este comprador ya ha hecho una reserva para esta fecha
wasteRecalc:
recalcOk: Se han recalculado las mermas correctamente

View File

@ -161,13 +161,17 @@ const createInvoiceInCorrection = async () => {
:url="`InvoiceIns/${entityId}`"
:filter="filter"
title="supplierRef"
width="xlg-width"
>
<template #menu="{ entity }">
<InvoiceInDescriptorMenu :invoice="entity" />
</template>
<template #body="{ entity }">
<VnLv :label="t('invoicein.list.issued')" :value="toDate(entity.issued)" />
<VnLv :label="t('invoicein.summary.bookedDate')" :value="toDate(entity.booked)" />
<VnLv
:label="t('invoicein.summary.bookedDate')"
:value="toDate(entity.booked)"
/>
<VnLv :label="t('invoicein.list.amount')" :value="toCurrency(totalAmount)" />
<VnLv :label="t('invoicein.list.supplier')">
<template #value>

View File

@ -62,6 +62,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
:subtitle="data.subtitle"
@on-fetch="setData"
data-key="invoiceOutData"
width="lg-width"
>
<template #menu="{ entity, menuRef }">
<InvoiceOutDescriptorMenu :invoice-out-data="entity" :menu-ref="menuRef" />

View File

@ -1,7 +1,7 @@
<script setup>
import { onMounted, computed, ref, nextTick } from 'vue';
import { onMounted, computed, reactive, ref, nextTick, watch } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
import { useRoute, useRouter } from 'vue-router';
import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
@ -22,16 +22,19 @@ import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
const { t } = useI18n();
const route = useRoute();
const router = useRouter();
const state = useState();
const user = state.getUser();
const today = Date.vnNew();
today.setHours(0, 0, 0, 0);
const today = ref(Date.vnNew());
const warehousesOptions = ref([]);
const itemBalances = computed(() => arrayDataItemBalances.store.data);
const where = computed(() => arrayDataItemBalances.store.filter.where || {});
const showWhatsBeforeInventory = ref(false);
const itemBalancesRef = ref(null);
const itemsBalanceFilter = reactive({
where: { itemFk: route.params.id, warehouseFk: null, date: null },
});
const itemBalances = ref([]);
const warehouseFk = ref(null);
const _showWhatsBeforeInventory = ref(false);
const inventoriedDate = ref(null);
let arrayDataItemBalances = useArrayData('ItemBalances');
const originTypeMap = {
entry: {
@ -119,28 +122,36 @@ const columns = computed(() => [
},
]);
onMounted(async () => {
const ref = where.value;
const query = route.query;
inventoriedDate.value =
(await axios.get('Configs/findOne')).data?.inventoried || today;
if (query.warehouseFk) ref.warehouseFk = query.warehouseFk;
else if (!ref.warehouseFk && user.value) ref.warehouseFk = user.value.warehouseFk;
if (ref.date) showWhatsBeforeInventory.value = true;
ref.itemFk = route.params.id;
arrayDataItemBalances = useArrayData('ItemBalances', {
url: 'Items/getBalance',
filter: { where: ref },
});
await fetchItemBalances();
await scrollToToday();
await updateWarehouse(ref.warehouseFk);
const showWhatsBeforeInventory = computed({
get: () => _showWhatsBeforeInventory.value,
set: (val) => {
_showWhatsBeforeInventory.value = val;
if (!val) itemsBalanceFilter.where.date = null;
else itemsBalanceFilter.where.date = inventoriedDate.value ?? new Date();
},
});
const fetchItemBalances = async () => await arrayDataItemBalances.fetch({});
onMounted(async () => {
today.value.setHours(0, 0, 0, 0);
if (route.query.warehouseFk) warehouseFk.value = route.query.warehouseFk;
else if (user.value) warehouseFk.value = user.value.warehouseFk;
itemsBalanceFilter.where.warehouseFk = warehouseFk.value;
const { data } = await axios.get('Configs/findOne');
inventoriedDate.value = data.inventoried;
await fetchItemBalances();
await scrollToToday();
await updateWarehouse(warehouseFk.value);
});
watch(
() => router.currentRoute.value.params.id,
(newId) => {
itemsBalanceFilter.where.itemFk = newId;
itemBalancesRef.value.fetch();
}
);
const fetchItemBalances = async () => await itemBalancesRef.value.fetch();
const getBadgeAttrs = (_date) => {
const isSameDate = date.isSameDate(today.value, _date);
@ -167,13 +178,23 @@ const formatDateForAttribute = (dateValue) => {
};
async function updateWarehouse(warehouseFk) {
const stock = useArrayData('descriptorStock', { userParams: { warehouseFk } });
const stock = useArrayData('descriptorStock', {
userParams: {
warehouseFk,
},
});
await stock.fetch({});
stock.store.data.itemFk = route.params.id;
}
</script>
<template>
<FetchData
ref="itemBalancesRef"
url="Items/getBalance"
:filter="itemsBalanceFilter"
@on-fetch="(data) => (itemBalances = data)"
/>
<FetchData
url="Warehouses"
:filter="{ fields: ['id', 'name'], order: 'name ASC' }"
@ -186,30 +207,27 @@ async function updateWarehouse(warehouseFk) {
<VnSelect
:label="t('itemDiary.warehouse')"
:options="warehousesOptions"
v-model="where.warehouseFk"
hide-selected
option-label="name"
option-value="id"
dense
v-model="itemsBalanceFilter.where.warehouseFk"
@update:model-value="
(val) => fetchItemBalances() && updateWarehouse(val)
(value) => fetchItemBalances() && updateWarehouse(value)
"
class="q-mr-lg"
:is-clearable="false"
/>
<QCheckbox
:label="t('itemDiary.showBefore')"
v-model="showWhatsBeforeInventory"
@update:model-value="
async (val) => {
if (!val) where.date = null;
else where.date = inventoriedDate;
await fetchItemBalances();
}
"
@update:model-value="fetchItemBalances"
class="q-mr-lg"
/>
<VnInputDate
v-if="showWhatsBeforeInventory"
:label="t('itemDiary.since')"
dense
v-model="where.date"
v-model="itemsBalanceFilter.where.date"
@update:model-value="fetchItemBalances"
/>
</div>

View File

@ -36,7 +36,18 @@ const exprBuilder = (param, value) => {
}
};
let arrayData = useArrayData('ItemLastEntries');
const where = {
itemFk: route.params.id,
};
const arrayData = useArrayData('ItemLastEntries', {
url: 'Items/lastEntriesFilter',
order: ['landed DESC', 'buyFk DESC'],
exprBuilder: exprBuilder,
userFilter: {
where: where,
},
});
const itemLastEntries = ref([]);
const columns = computed(() => [
@ -150,51 +161,25 @@ const getDate = (date, type) => {
};
const updateFilter = async () => {
let landed;
if (!from.value && to.value) landed = { lte: to.value };
else if (from.value && !to.value) landed = { gte: from.value };
else if (from.value && to.value) landed = { between: [from.value, to.value] };
let filter;
if (!from.value && to.value) filter = { lte: to.value };
else if (from.value && !to.value) filter = { gte: from.value };
else if (from.value && to.value) filter = { between: [from.value, to.value] };
const userFilter = arrayData.store.userFilter.where;
userFilter.landed = filter;
arrayData.store.filter.where.landed = landed;
await fetchItemLastEntries();
};
onMounted(async () => {
const landed = arrayData.store.filter.where?.landed;
arrayData = useArrayData('ItemLastEntries', {
url: 'Items/lastEntriesFilter',
order: ['landed DESC', 'buyFk DESC'],
exprBuilder: exprBuilder,
filter: {
where: {
itemFk: route.params.id,
landed,
},
},
});
if (landed) {
const key = Object.keys(landed)[0];
switch (key) {
case 'gte':
from.value = landed.gte;
break;
case 'lte':
to.value = landed.lte;
break;
case 'between':
from.value = landed.between[0];
to.value = landed.between[1];
break;
}
} else {
const _from = Date.vnNew();
_from.setDate(_from.getDate() - 75);
from.value = getDate(_from, 'from');
const _to = Date.vnNew();
_to.setDate(_to.getDate() + 10);
to.value = getDate(_to, 'to');
}
const _from = Date.vnNew();
_from.setDate(_from.getDate() - 75);
from.value = getDate(_from, 'from');
const _to = Date.vnNew();
_to.setDate(_to.getDate() + 10);
to.value = getDate(_to, 'to');
updateFilter();

View File

@ -208,28 +208,15 @@ async function remove(item) {
async function handleConfirm() {
const result = await confirm(route.params.id);
if (result) {
const sale = await axios.get(`OrderRows`, {
params: {
filter: JSON.stringify({
where: { orderFk: route.params.id },
}),
},
});
const ticket = await axios.get(`Sales`, {
params: {
filter: JSON.stringify({
where: { id: sale.data[0].saleFk },
}),
},
});
quasar.notify({
message: t('globals.dataSaved'),
type: 'positive',
});
router.push({
name: 'TicketSale',
params: { id: ticket.data[0].ticketFk },
query: { table: JSON.stringify({ filter: { limit: 20, skip: 0 } }) },
query: {
table: JSON.stringify({ id: route.params.id }),
},
});
}
}

View File

@ -76,6 +76,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
:subtitle="data.subtitle"
data-key="routeData"
@on-fetch="setData"
width="lg-width"
>
<template #body="{ entity }">
<VnLv :label="t('Date')" :value="toDate(entity?.dated)" />

View File

@ -92,7 +92,6 @@ function handleLocation(data, location) {
<VnInput
v-model="data.name"
:label="t('supplier.fiscalData.name')"
uppercase="true"
clearable
/>
<VnInput

View File

@ -5,7 +5,6 @@ import VnTable from 'components/VnTable/VnTable.vue';
import VnSearchbar from 'components/ui/VnSearchbar.vue';
import RightMenu from 'src/components/common/RightMenu.vue';
import SupplierListFilter from './SupplierListFilter.vue';
import VnInput from 'src/components/common/VnInput.vue';
const { t } = useI18n();
const tableRef = ref();
@ -24,14 +23,9 @@ const columns = computed(() => [
align: 'left',
label: t('globals.name'),
name: 'socialName',
attrs: {
uppercase: true,
},
create: true,
columnFilter: {
name: 'search',
attrs: {
uppercase: false,
},
},
isTitle: true,
},
@ -124,18 +118,14 @@ const columns = computed(() => [
formInitialData: {},
mapper: (data) => {
data.name = data.socialName;
delete data.socialName;
return data;
},
}"
:right-search="false"
order="id ASC"
:columns="columns"
>
<template #more-create-dialog="{ data }">
<VnInput :label="t('globals.name')" v-model="data.socialName" :uppercase="true" />
</template>
</VnTable>
/>
</template>
<i18n>

View File

@ -102,6 +102,10 @@ const data = ref(useCardDescription());
function ticketFilter(ticket) {
return JSON.stringify({ clientFk: ticket.clientFk });
}
const setData = (entity) => {
data.value = useCardDescription(entity.ref, entity.id);
};
</script>
<template>
@ -111,6 +115,7 @@ function ticketFilter(ticket) {
:filter="filter"
:title="data.title"
:subtitle="data.subtitle"
@on-fetch="setData"
data-key="ticketData"
>
<template #menu="{ entity }">

View File

@ -138,11 +138,7 @@ function uppercaseStreetModel(data) {
return {
get: () => (data.street ? data.street.toUpperCase() : ''),
set: (value) => {
if (value) {
data.street = value.toUpperCase();
} else {
data.street = null;
}
data.street = value.toUpperCase();
},
};
}

View File

@ -1,123 +1,50 @@
import { RouterView } from 'vue-router';
const entryCard = {
name: 'EntryCard',
path: ':id',
component: () => import('src/pages/Entry/Card/EntryCard.vue'),
redirect: { name: 'EntrySummary' },
meta: {
menu: [
'EntryBasicData',
'EntryBuys',
'EntryNotes',
'EntryDms',
'EntryLog',
],
},
children: [
{
path: 'summary',
name: 'EntrySummary',
meta: {
title: 'summary',
icon: 'launch',
},
component: () => import('src/pages/Entry/Card/EntrySummary.vue'),
},
{
path: 'basic-data',
name: 'EntryBasicData',
meta: {
title: 'basicData',
icon: 'vn:settings',
},
component: () => import('src/pages/Entry/Card/EntryBasicData.vue'),
},
{
path: 'buys',
name: 'EntryBuys',
meta: {
title: 'buys',
icon: 'vn:lines',
},
component: () => import('src/pages/Entry/Card/EntryBuys.vue'),
},
{
path: 'buys/import',
name: 'EntryBuysImport',
component: () => import('src/pages/Entry/Card/EntryBuysImport.vue'),
},
{
path: 'notes',
name: 'EntryNotes',
meta: {
title: 'notes',
icon: 'vn:notes',
},
component: () => import('src/pages/Entry/Card/EntryNotes.vue'),
},
{
path: 'dms',
name: 'EntryDms',
meta: {
title: 'dms',
icon: 'smb_share',
},
component: () => import('src/pages/Entry/Card/EntryDms.vue'),
},
{
path: 'log',
name: 'EntryLog',
meta: {
title: 'log',
icon: 'vn:History',
},
component: () => import('src/pages/Entry/Card/EntryLog.vue'),
},
],
};
export default {
name: 'Entry',
path: '/entry',
name: 'Entry',
meta: {
title: 'entries',
icon: 'vn:entry',
moduleName: 'Entry',
keyBinding: 'e',
menu: [
},
component: RouterView,
redirect: { name: 'EntryMain' },
menus: {
main: [
'EntryList',
'MyEntries',
'EntryLatestBuys',
'EntryStockBought',
'EntryWasteRecalc',
]
],
card: ['EntryBasicData', 'EntryBuys', 'EntryNotes', 'EntryDms', 'EntryLog'],
},
component: RouterView,
redirect: { name: 'EntryMain' },
children: [
{
name: 'EntryMain',
path: '',
name: 'EntryMain',
component: () => import('src/components/common/VnModule.vue'),
redirect: { name: 'EntryIndexMain' },
redirect: { name: 'EntryList' },
children: [
{
path:'',
name: 'EntryIndexMain',
redirect: { name: 'EntryList' },
path: 'list',
name: 'EntryList',
meta: {
title: 'list',
icon: 'view_list',
},
component: () => import('src/pages/Entry/EntryList.vue'),
children: [
{
name: 'EntryList',
path: 'list',
meta: {
title: 'list',
icon: 'view_list',
},
},
entryCard,
],
},
{
path: 'my',
name: 'MyEntries',
meta: {
title: 'labeler',
icon: 'sell',
},
component: () => import('src/pages/Entry/MyEntries.vue'),
},
{
path: 'create',
@ -127,15 +54,6 @@ export default {
icon: 'add',
},
component: () => import('src/pages/Entry/EntryCreate.vue'),
},
{
path: 'my',
name: 'MyEntries',
meta: {
title: 'labeler',
icon: 'sell',
},
component: () => import('src/pages/Entry/MyEntries.vue'),
},
{
path: 'latest-buys',
@ -166,5 +84,72 @@ export default {
},
],
},
{
name: 'EntryCard',
path: ':id',
component: () => import('src/pages/Entry/Card/EntryCard.vue'),
redirect: { name: 'EntrySummary' },
children: [
{
name: 'EntrySummary',
path: 'summary',
meta: {
title: 'summary',
icon: 'launch',
},
component: () => import('src/pages/Entry/Card/EntrySummary.vue'),
},
{
path: 'basic-data',
name: 'EntryBasicData',
meta: {
title: 'basicData',
icon: 'vn:settings',
},
component: () => import('src/pages/Entry/Card/EntryBasicData.vue'),
},
{
path: 'buys',
name: 'EntryBuys',
meta: {
title: 'buys',
icon: 'vn:lines',
},
component: () => import('src/pages/Entry/Card/EntryBuys.vue'),
},
{
path: 'buys/import',
name: 'EntryBuysImport',
component: () => import('src/pages/Entry/Card/EntryBuysImport.vue'),
},
{
path: 'notes',
name: 'EntryNotes',
meta: {
title: 'notes',
icon: 'vn:notes',
},
component: () => import('src/pages/Entry/Card/EntryNotes.vue'),
},
{
path: 'dms',
name: 'EntryDms',
meta: {
title: 'dms',
icon: 'smb_share',
},
component: () => import('src/pages/Entry/Card/EntryDms.vue'),
},
{
path: 'log',
name: 'EntryLog',
meta: {
title: 'log',
icon: 'vn:History',
},
component: () => import('src/pages/Entry/Card/EntryLog.vue'),
},
],
},
],
};
};

View File

@ -1,6 +1,5 @@
/// <reference types="cypress" />
// redmine.verdnatura.es/issues/8417
describe.skip('ClaimPhoto', () => {
describe('ClaimPhoto', () => {
beforeEach(() => {
const claimId = 1;
cy.login('developer');

View File

@ -8,8 +8,8 @@ describe('EntryMy when is supplier', () => {
},
});
});
// https://redmine.verdnatura.es/issues/8418
it.skip('should open buyLabel when is supplier', () => {
it('should open buyLabel when is supplier', () => {
cy.get(
'[to="/null/3"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
).click();

View File

@ -1,6 +1,6 @@
/// <reference types="cypress" />
// https://redmine.verdnatura.es/issues/8419
describe.skip('InvoiceInCorrective', () => {
describe('InvoiceInCorrective', () => {
const createCorrective = '.q-menu > .q-list > :nth-child(6) > .q-item__section';
const rectificativeSection = '.q-drawer-container .q-list > a:nth-child(6)';
const saveDialog = '.q-card > .q-card__actions > .q-btn--standard ';

View File

@ -21,8 +21,8 @@ describe('InvoiceInList', () => {
cy.url().should('include', `/invoice-in/${id}/summary`);
});
});
// https://redmine.verdnatura.es/issues/8420
it.skip('should open the details', () => {
it('should open the details', () => {
cy.get(firstDetailBtn).click();
cy.get(summaryHeaders).eq(1).contains('Basic data');
cy.get(summaryHeaders).eq(4).contains('Vat');

View File

@ -35,8 +35,8 @@ describe('InvoiceOut summary', () => {
cy.dataCy('VnConfirm_confirm').click();
cy.checkNotification('InvoiceOut deleted');
});
// https://redmine.verdnatura.es/issues/8415
it.skip('should transfer the invoice ', () => {
it('should transfer the invoice ', () => {
cy.typeSearchbar('T1111111{enter}');
cy.dataCy('descriptor-more-opts').click();
cy.get('.q-menu > .q-list > :nth-child(1)').click();

View File

@ -15,8 +15,8 @@ describe('Item list', () => {
cy.get('.q-menu .q-item').contains('Anthurium').click();
cy.get('.q-virtual-scroll__content > :nth-child(4) > :nth-child(4)').click();
});
// https://redmine.verdnatura.es/issues/8421
it.skip('should create an item', () => {
it('should create an item', () => {
const data = {
Description: { val: `Test item` },
Type: { val: `Crisantemo`, type: 'select' },

View File

@ -18,8 +18,8 @@ describe('Item tag', () => {
+cy.dataCy('crudModelDefaultSaveBtn').click();
cy.checkNotification("The tag or priority can't be repeated for an item");
});
// https://redmine.verdnatura.es/issues/8422
it.skip('should add a new tag', () => {
it('should add a new tag', () => {
cy.get('.q-page').should('be.visible');
cy.get('.q-page-sticky > div').click();
cy.get('.q-page-sticky > div').click();

View File

@ -1,6 +1,6 @@
/// <reference types="cypress" />
// https://redmine.verdnatura.es/issues/8423
describe.skip('Ticket expedtion', () => {
describe('Ticket expedtion', () => {
const tableContent = '.q-table .q-virtual-scroll__content';
const stateTd = 'td:nth-child(9)';

View File

@ -30,8 +30,8 @@ describe('TicketList', () => {
cy.get(firstRow).find('.q-btn:first').click();
cy.get('@windowOpen').should('be.calledWithMatch', /\/ticket\/\d+\/sale/);
});
// https://redmine.verdnatura.es/issues/8424
it.skip('should open ticket summary', () => {
it('should open ticket summary', () => {
searchResults();
cy.get(firstRow).find('.q-btn:last').click();
cy.dataCy('ticketSummary').should('exist');

View File

@ -53,8 +53,7 @@ describe('VnLocation', () => {
cy.waitForElement('.q-card');
cy.get(inputLocation).click();
});
// https://redmine.verdnatura.es/issues/8436
it.skip('Show all options', function () {
it('Show all options', function () {
cy.get(locationOptions).should('have.length.at.least', 5);
});
it('input filter location as "al"', function () {

View File

@ -18,8 +18,8 @@ describe('ZoneWarehouse', () => {
cy.get(saveBtn).click();
cy.checkNotification(dataError);
});
// https://redmine.verdnatura.es/issues/8425
it.skip('should create & remove a warehouse', () => {
it('should create & remove a warehouse', () => {
cy.addBtnClick();
cy.fillInForm(data);
cy.get(saveBtn).click();