diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index fb80a7175..fdf2e52ee 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -804,7 +804,7 @@ watch(
evt.target.blur()"
@clear="selectFilter('date', 'from')"
@@ -1059,9 +1059,9 @@ en:
Deletes: Deletes
Accesses: Accesses
Users:
- User: Usuario
- All: Todo
- System: Sistema
+ User: User
+ All: All
+ System: System
properties:
id: ID
claimFk: Claim ID
diff --git a/src/components/common/VnSummaryDialog.vue b/src/components/common/VnSummaryDialog.vue
index 08fc8870d..5da941a27 100644
--- a/src/components/common/VnSummaryDialog.vue
+++ b/src/components/common/VnSummaryDialog.vue
@@ -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();
-
-
+
+
+
+
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index cf217555a..43dc15e9b 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -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(() =>
-
{
@on-fetch="setData"
:summary="$props.summary"
data-key="customer"
+ width="lg-width"
>
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index 9a154c357..dafc58394 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -61,6 +61,7 @@ const getEntryRedirectionFilter = (entry) => {
:filter="filter"
title="supplier.nickname"
data-key="Entry"
+ width="lg-width"
>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index 90aa50af7..498e67303 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -268,7 +268,7 @@ function deleteFile(dmsFk) {
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
import InvoiceInDescriptor from './InvoiceInDescriptor.vue';
-import InvoiceInFilter from '../InvoiceInFilter.vue';
-import InvoiceInSearchbar from '../InvoiceInSearchbar.vue';
-import { onBeforeRouteUpdate } from 'vue-router';
-import { setRectificative } from '../composables/setRectificative';
const filter = {
include: [
@@ -39,20 +35,13 @@ const filter = {
},
],
};
-
-onBeforeRouteUpdate(async (to) => await setRectificative(to));
+
-
-
-
-
-
+ :user-filter="filter"
+ />
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index 9fa3bcbcb..da7bd4426 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -105,7 +105,7 @@ async function setInvoiceCorrection(id) {
if (correctingData[0]) invoiceInCorrection.corrected = correctingData[0].correctedFk;
invoiceInCorrection.correcting = correctedData.map(
- (corrected) => corrected.correctingFk
+ (corrected) => corrected.correctingFk,
);
}
@@ -117,18 +117,19 @@ async function setInvoiceCorrection(id) {
:url="`InvoiceIns/${entityId}`"
:filter="filter"
title="supplierRef"
+ width="xlg-width"
>
-
+
-
-
+
+
{{ entity?.supplier?.nickname }}
@@ -145,7 +146,7 @@ async function setInvoiceCorrection(id) {
color="primary"
:to="routes.getSupplier(entity.supplierFk)"
>
- {{ t('invoicein.list.supplier') }}
+ {{ t('globals.supplier') }}
- {{ t('Entry') }}
+ {{ t('globals.entry') }}
- {{ t('InvoiceOut.card.ticketList') }}
+ {{ t('globals.ticketList') }}
- {{ t('invoicein.descriptorMenu.toBook') }}
+ {{ t('invoiceIn.descriptorMenu.toBook') }}
@@ -197,7 +197,7 @@ const createInvoiceInCorrection = async () => {
@click="triggerMenu('unbook')"
>
- {{ t('invoicein.descriptorMenu.toUnbook') }}
+ {{ t('invoiceIn.descriptorMenu.toUnbook') }}
{
clickable
@click="triggerMenu('delete')"
>
- {{ t('invoicein.descriptorMenu.deleteInvoice') }}
+ {{ t('invoiceIn.descriptorMenu.deleteInvoice') }}
- {{ t('invoicein.descriptorMenu.cloneInvoice') }}
+ {{ t('invoiceIn.descriptorMenu.cloneInvoice') }}
{{
- t('invoicein.descriptorMenu.showAgriculturalPdf')
+ t('invoiceIn.descriptorMenu.showAgriculturalPdf')
}}
{{ t('invoicein.descriptorMenu.sendAgriculturalPdf') }}...{{ t('invoiceIn.descriptorMenu.sendAgriculturalPdf') }}...
{
@click="triggerMenu('correct')"
>
{{ t('invoicein.descriptorMenu.createCorrective') }}...{{ t('invoiceIn.descriptorMenu.createCorrective') }}...
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index eca0c7af1..e546638f2 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -27,14 +27,14 @@ const intrastatTotals = ref({ amount: 0, net: 0, stems: 0 });
const vatColumns = ref([
{
name: 'expense',
- label: 'invoicein.summary.expense',
+ label: 'invoiceIn.summary.expense',
field: (row) => row.expenseFk,
sortable: true,
align: 'left',
},
{
name: 'landed',
- label: 'invoicein.summary.taxableBase',
+ label: 'invoiceIn.summary.taxableBase',
field: (row) => row.taxableBase,
format: (value) => toCurrency(value),
sortable: true,
@@ -42,7 +42,7 @@ const vatColumns = ref([
},
{
name: 'vat',
- label: 'invoicein.summary.sageVat',
+ label: 'invoiceIn.summary.sageVat',
field: (row) => {
if (row.taxTypeSage) return `#${row.taxTypeSage.id} : ${row.taxTypeSage.vat}`;
},
@@ -52,7 +52,7 @@ const vatColumns = ref([
},
{
name: 'transaction',
- label: 'invoicein.summary.sageTransaction',
+ label: 'invoiceIn.summary.sageTransaction',
field: (row) => {
if (row.transactionTypeSage)
return `#${row.transactionTypeSage.id} : ${row.transactionTypeSage?.transaction}`;
@@ -63,7 +63,7 @@ const vatColumns = ref([
},
{
name: 'rate',
- label: 'invoicein.summary.rate',
+ label: 'invoiceIn.summary.rate',
field: (row) => taxRate(row.taxableBase, row.taxTypeSage?.rate),
format: (value) => toCurrency(value),
sortable: true,
@@ -71,7 +71,7 @@ const vatColumns = ref([
},
{
name: 'currency',
- label: 'invoicein.summary.currency',
+ label: 'invoiceIn.summary.currency',
field: (row) => row.foreignValue,
format: (val) => val && toCurrency(val, currency.value),
sortable: true,
@@ -82,21 +82,21 @@ const vatColumns = ref([
const dueDayColumns = ref([
{
name: 'date',
- label: 'invoicein.summary.dueDay',
+ label: 'invoiceIn.summary.dueDay',
field: (row) => toDate(row.dueDated),
sortable: true,
align: 'left',
},
{
name: 'bank',
- label: 'invoicein.summary.bank',
+ label: 'invoiceIn.summary.bank',
field: (row) => row.bank.bank,
sortable: true,
align: 'left',
},
{
name: 'amount',
- label: 'invoicein.list.amount',
+ label: 'invoiceIn.list.amount',
field: (row) => row.amount,
format: (value) => toCurrency(value),
sortable: true,
@@ -104,7 +104,7 @@ const dueDayColumns = ref([
},
{
name: 'landed',
- label: 'invoicein.summary.foreignValue',
+ label: 'invoiceIn.summary.foreignValue',
field: (row) => row.foreignValue,
format: (val) => val && toCurrency(val, currency.value),
sortable: true,
@@ -115,7 +115,7 @@ const dueDayColumns = ref([
const intrastatColumns = ref([
{
name: 'code',
- label: 'invoicein.summary.code',
+ label: 'invoiceIn.summary.code',
field: (row) => {
return `${row.intrastat.id}: ${row.intrastat?.description}`;
},
@@ -124,21 +124,21 @@ const intrastatColumns = ref([
},
{
name: 'amount',
- label: 'invoicein.list.amount',
+ label: 'invoiceIn.list.amount',
field: (row) => toCurrency(row.amount),
sortable: true,
align: 'left',
},
{
name: 'net',
- label: 'invoicein.summary.net',
+ label: 'invoiceIn.summary.net',
field: (row) => row.net,
sortable: true,
align: 'left',
},
{
name: 'stems',
- label: 'invoicein.summary.stems',
+ label: 'invoiceIn.summary.stems',
field: (row) => row.stems,
format: (value) => value,
sortable: true,
@@ -146,7 +146,7 @@ const intrastatColumns = ref([
},
{
name: 'landed',
- label: 'invoicein.summary.country',
+ label: 'invoiceIn.summary.country',
field: (row) => row.country?.code,
format: (value) => value,
sortable: true,
@@ -214,7 +214,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
/>
@@ -225,14 +225,14 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
-
+
`#/invoice-in/${entityId.value}/${param}`;
@@ -272,18 +272,18 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
/>
-
+
@@ -294,11 +294,11 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
-
+
`#/invoice-in/${entityId.value}/${param}`;
:color="amountsNotMatch ? 'negative' : 'transparent'"
:title="
amountsNotMatch
- ? t('invoicein.summary.noMatch')
- : t('invoicein.summary.dueTotal')
+ ? t('invoiceIn.summary.noMatch')
+ : t('invoiceIn.summary.dueTotal')
"
>
{{ toCurrency(entity.totals.totalDueDay) }}
@@ -318,7 +318,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
-
+
`#/invoice-in/${entityId.value}/${param}`;
-
+
@@ -404,7 +404,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
{
@@ -97,10 +97,10 @@ const redirectToInvoiceInBasicData = (__, { id }) => {
map-options
hide-selected
:required="true"
- :rules="validate('invoicein.companyFk')"
+ :rules="validate('invoiceIn.companyFk')"
/>
diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index 31a611936..43b91c93f 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -164,7 +164,7 @@ function handleDaysAgo(params, daysAgo) {
[
{
align: 'left',
name: 'isBooked',
- label: t('invoicein.isBooked'),
+ label: t('invoiceIn.isBooked'),
columnFilter: false,
},
{
@@ -41,7 +41,7 @@ const cols = computed(() => [
{
align: 'left',
name: 'supplierFk',
- label: t('invoicein.list.supplier'),
+ label: t('invoiceIn.list.supplier'),
columnFilter: {
component: 'select',
attrs: {
@@ -55,16 +55,16 @@ const cols = computed(() => [
{
align: 'left',
name: 'supplierRef',
- label: t('invoicein.list.supplierRef'),
+ label: t('invoiceIn.list.supplierRef'),
},
{
align: 'left',
name: 'serial',
- label: t('invoicein.serial'),
+ label: t('invoiceIn.serial'),
},
{
align: 'left',
- label: t('invoicein.list.issued'),
+ label: t('invoiceIn.list.issued'),
name: 'issued',
component: null,
columnFilter: {
@@ -74,7 +74,7 @@ const cols = computed(() => [
},
{
align: 'left',
- label: t('invoicein.list.dueDated'),
+ label: t('invoiceIn.list.dueDated'),
name: 'dueDated',
component: null,
columnFilter: {
@@ -86,12 +86,12 @@ const cols = computed(() => [
{
align: 'left',
name: 'awbCode',
- label: t('invoicein.list.awb'),
+ label: t('invoiceIn.list.awb'),
},
{
align: 'left',
name: 'amount',
- label: t('invoicein.list.amount'),
+ label: t('invoiceIn.list.amount'),
format: ({ amount }) => toCurrency(amount),
cardVisible: true,
},
@@ -130,71 +130,84 @@ const cols = computed(() => [
},
]);
+
(companies = data)" auto-load />
-
-
-
-
-
-
-
-
-
- {{ row.supplierName }}
-
-
+
+
-
-
+
-
-
-
- {{ scope.opt?.nickname }}
- #{{ scope.opt?.id }}, {{ scope.opt?.name }}
-
-
+
+
+ {{ row.supplierName }}
+
+
-
-
-
-
+
+
+
+
+
+ {{ scope.opt?.nickname }}
+
+ #{{ scope.opt?.id }}, {{ scope.opt?.name }}
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/src/pages/InvoiceIn/InvoiceInSearchbar.vue b/src/pages/InvoiceIn/InvoiceInSearchbar.vue
deleted file mode 100644
index f2731b005..000000000
--- a/src/pages/InvoiceIn/InvoiceInSearchbar.vue
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-es:
- Search invoice: Buscar factura recibida
- Search invoices in by id or supplier fiscal name: Buscar facturas recibidas por id o por nombre fiscal del proveedor
-
diff --git a/src/pages/InvoiceIn/locale/en.yml b/src/pages/InvoiceIn/locale/en.yml
index 94db50066..6b21b316b 100644
--- a/src/pages/InvoiceIn/locale/en.yml
+++ b/src/pages/InvoiceIn/locale/en.yml
@@ -1,4 +1,6 @@
-invoicein:
+invoiceIn:
+ search: Search invoice
+ searchInfo: Search incoming invoices by ID or supplier fiscal name
serial: Serial
isBooked: Is booked
list:
diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml
index bcb9c0551..3f27c895c 100644
--- a/src/pages/InvoiceIn/locale/es.yml
+++ b/src/pages/InvoiceIn/locale/es.yml
@@ -1,4 +1,6 @@
-invoicein:
+invoiceIn:
+ search: Buscar factura recibida
+ searchInfo: Buscar facturas recibidas por ID o nombre fiscal del proveedor
serial: Serie
isBooked: Contabilizada
list:
@@ -63,6 +65,7 @@ invoicein:
params:
search: Id o nombre proveedor
correctedFk: Rectificada
+ isBooked: Contabilizada
account: Cuenta contable
correctingFk: Rectificativa
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
index 2b60948dd..209f1531e 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
@@ -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"
>
diff --git a/src/pages/Route/Card/RouteDescriptor.vue b/src/pages/Route/Card/RouteDescriptor.vue
index fa621843e..14d966362 100644
--- a/src/pages/Route/Card/RouteDescriptor.vue
+++ b/src/pages/Route/Card/RouteDescriptor.vue
@@ -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"
>
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 9f7684b93..c9849d631 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -16,6 +16,10 @@ const $props = defineProps({
required: false,
default: null,
},
+ summary: {
+ type: Object,
+ default: null,
+ },
});
const route = useRoute();
@@ -102,6 +106,10 @@ const data = ref(useCardDescription());
function ticketFilter(ticket) {
return JSON.stringify({ clientFk: ticket.clientFk });
}
+
+const setData = (entity) => {
+ data.value = useCardDescription(entity.ref, entity.id);
+};
@@ -111,7 +119,10 @@ function ticketFilter(ticket) {
:filter="filter"
:title="data.title"
:subtitle="data.subtitle"
+ @on-fetch="setData"
+ :summary="$props.summary"
data-key="ticketData"
+ width="lg-width"
>
@@ -157,7 +168,7 @@ function ticketFilter(ticket) {
-
+
-
+
$props.id || route.params.id);
-const summaryRef = ref();
-const ticket = computed(() => summaryRef.value?.entity);
+const summary = ref();
+const ticket = computed(() => summary.value?.entity);
const editableStates = ref([]);
const ticketUrl = ref();
const grafanaUrl = 'https://grafana.verdnatura.es';
@@ -76,26 +74,27 @@ async function changeState(value) {
};
await axios.post(`Tickets/state`, formData);
notify('globals.dataSaved', 'positive');
- summaryRef.value?.fetch();
+ summary.value?.fetch();
descriptorData.fetch({});
}
function toTicketUrl(section) {
return '#/ticket/' + entityId.value + '/' + section;
}
+
+onMounted(async () => {
+ const filter = { fields: ['code', 'name', 'id', 'alertLevel'] };
+ const params = { filter: JSON.stringify(filter) };
+ editableStates.value = (await axios.get('States/editableStates', { params }))?.data;
+});
- (editableStates = data)"
- />
-
+
diff --git a/src/router/modules/invoiceIn.js b/src/router/modules/invoiceIn.js
index 788b27d37..fe70a1056 100644
--- a/src/router/modules/invoiceIn.js
+++ b/src/router/modules/invoiceIn.js
@@ -1,18 +1,12 @@
import { RouterView } from 'vue-router';
-import { setRectificative } from 'src/pages/InvoiceIn/composables/setRectificative';
-export default {
- path: '/invoice-in',
- name: 'InvoiceIn',
+
+const invoiceInCard = {
+ name: 'InvoiceInCard',
+ path: ':id',
+ component: () => import('src/pages/InvoiceIn/Card/InvoiceInCard.vue'),
+ redirect: { name: 'InvoiceInSummary' },
meta: {
- title: 'invoiceIns',
- icon: 'vn:invoice-in',
- moduleName: 'InvoiceIn',
- },
- component: RouterView,
- redirect: { name: 'InvoiceInMain' },
- menus: {
- main: ['InvoiceInList', 'InvoiceInSerial'],
- card: [
+ menu: [
'InvoiceInBasicData',
'InvoiceInVat',
'InvoiceInDueDay',
@@ -23,29 +17,109 @@ export default {
},
children: [
{
- path: '',
+ path: 'summary',
+ name: 'InvoiceInSummary',
+ meta: {
+ title: 'summary',
+ icon: 'view_list',
+ },
+ component: () => import('src/pages/InvoiceIn/Card/InvoiceInSummary.vue'),
+ },
+ {
+ name: 'InvoiceInBasicData',
+ path: 'basic-data',
+ meta: {
+ title: 'basicData',
+ icon: 'vn:settings',
+ },
+ component: () =>
+ import('src/pages/InvoiceIn/Card/InvoiceInBasicData.vue'),
+ },
+ {
+ name: 'InvoiceInVat',
+ path: 'vat',
+ meta: {
+ title: 'vat',
+ icon: 'vn:tax',
+ },
+ component: () => import('src/pages/InvoiceIn/Card/InvoiceInVat.vue'),
+ },
+ {
+ name: 'InvoiceInDueDay',
+ path: 'due-day',
+ meta: {
+ title: 'dueDay',
+ icon: 'vn:calendar',
+ },
+ component: () =>
+ import('src/pages/InvoiceIn/Card/InvoiceInDueDay.vue'),
+ },
+ {
+ name: 'InvoiceInIntrastat',
+ path: 'intrastat',
+ meta: {
+ title: 'intrastat',
+ icon: 'vn:lines',
+ },
+ component: () =>
+ import('src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue'),
+ },
+ {
+ name: 'InvoiceInCorrective',
+ path: 'corrective',
+ meta: {
+ title: 'corrective',
+ icon: 'attachment',
+ },
+ component: () =>
+ import('src/pages/InvoiceIn/Card/InvoiceInCorrective.vue'),
+ },
+ {
+ name: 'InvoiceInLog',
+ path: 'log',
+ meta: {
+ title: 'log',
+ icon: 'history',
+ },
+ component: () => import('src/pages/InvoiceIn/Card/InvoiceInLog.vue'),
+ },
+ ],
+};
+
+export default {
+ name: 'InvoiceIn',
+ path: '/invoice-in',
+ meta: {
+ title: 'invoiceIns',
+ icon: 'vn:invoice-in',
+ moduleName: 'InvoiceIn',
+ menu: ['InvoiceInList', 'InvoiceInSerial'],
+ },
+ component: RouterView,
+ redirect: { name: 'InvoiceInMain' },
+ children: [
+ {
name: 'InvoiceInMain',
+ path: '',
component: () => import('src/components/common/VnModule.vue'),
- redirect: { name: 'InvoiceInList' },
+ redirect: { name: 'InvoiceInIndexMain' },
children: [
{
- path: 'list',
- name: 'InvoiceInList',
- meta: {
- title: 'list',
- icon: 'view_list',
- },
+ path: '',
+ name: 'InvoiceInIndexMain',
+ redirect: { name: 'InvoiceInList' },
component: () => import('src/pages/InvoiceIn/InvoiceInList.vue'),
- },
- {
- path: 'serial',
- name: 'InvoiceInSerial',
- meta: {
- title: 'serial',
- icon: 'view_list',
- },
- component: () =>
- import('src/pages/InvoiceIn/Serial/InvoiceInSerial.vue'),
+ children: [
+ {
+ name: 'InvoiceInList',
+ path: 'list',
+ meta: {
+ title: 'list',
+ icon: 'view_list',
+ },
+ },
+ invoiceInCard,
+ ],
},
{
path: 'create',
@@ -56,87 +130,16 @@ export default {
},
component: () => import('src/pages/InvoiceIn/InvoiceInCreate.vue'),
},
- ],
- },
- {
- name: 'InvoiceInCard',
- path: ':id',
- component: () => import('src/pages/InvoiceIn/Card/InvoiceInCard.vue'),
- redirect: { name: 'InvoiceInSummary' },
- beforeEnter: async (to, from, next) => {
- await setRectificative(to);
- next();
- },
- children: [
{
- name: 'InvoiceInSummary',
- path: 'summary',
+ path: 'serial',
+ name: 'InvoiceInSerial',
meta: {
- title: 'summary',
+ title: 'serial',
icon: 'view_list',
},
- component: () =>
- import('src/pages/InvoiceIn/Card/InvoiceInSummary.vue'),
- },
- {
- name: 'InvoiceInBasicData',
- path: 'basic-data',
- meta: {
- title: 'basicData',
- icon: 'vn:settings',
- },
- component: () =>
- import('src/pages/InvoiceIn/Card/InvoiceInBasicData.vue'),
- },
- {
- name: 'InvoiceInVat',
- path: 'vat',
- meta: {
- title: 'vat',
- icon: 'vn:tax',
- },
- component: () => import('src/pages/InvoiceIn/Card/InvoiceInVat.vue'),
- },
- {
- name: 'InvoiceInDueDay',
- path: 'due-day',
- meta: {
- title: 'dueDay',
- icon: 'vn:calendar',
- },
- component: () =>
- import('src/pages/InvoiceIn/Card/InvoiceInDueDay.vue'),
- },
- {
- name: 'InvoiceInIntrastat',
- path: 'intrastat',
- meta: {
- title: 'intrastat',
- icon: 'vn:lines',
- },
- component: () =>
- import('src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue'),
- },
- {
- name: 'InvoiceInLog',
- path: 'log',
- meta: {
- title: 'log',
- icon: 'history',
- },
- component: () => import('src/pages/InvoiceIn/Card/InvoiceInLog.vue'),
- },
- {
- name: 'InvoiceInCorrective',
- path: 'corrective',
- meta: {
- title: 'corrective',
- icon: 'attachment',
- },
- component: () =>
- import('src/pages/InvoiceIn/Card/InvoiceInCorrective.vue'),
+ component: () => import('src/pages/InvoiceIn/Serial/InvoiceInSerial.vue'),
},
],
},
],
-};
+};
\ No newline at end of file
diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index 3337287c4..2984a4ee4 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -30,14 +30,15 @@ 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');
+ cy.get('.summaryHeader').should('exist');
+ cy.get('.summaryBody').should('exist');
});
- it.skip('Client list create new client', () => {
+ it('Client list create new client', () => {
cy.dataCy('vnTableCreateBtn').should('exist');
cy.dataCy('vnTableCreateBtn').click();
const data = {
@@ -45,9 +46,9 @@ describe('TicketList', () => {
Warehouse: { val: 'Warehouse One', type: 'select' },
Address: { val: 'employee', type: 'select' },
Landed: { val: '01-01-2024', type: 'date' },
+ Agency: { val: 'Other agency', type: 'select' },
};
cy.fillInForm(data);
- cy.dataCy('Agency_select').click();
cy.dataCy('FormModelPopup_save').click();
cy.checkNotification('Data created');
cy.url().should('match', /\/ticket\/\d+\/summary/);
diff --git a/test/cypress/integration/ticket/ticketNotes.spec.js b/test/cypress/integration/ticket/ticketNotes.spec.js
index ef196c783..5b44f9e1f 100644
--- a/test/cypress/integration/ticket/ticketNotes.spec.js
+++ b/test/cypress/integration/ticket/ticketNotes.spec.js
@@ -1,5 +1,5 @@
///
-describe('TicketRequest', () => {
+describe('TicketNotes', () => {
beforeEach(() => {
cy.login('developer');
cy.viewport(1920, 1080);
@@ -13,7 +13,7 @@ describe('TicketRequest', () => {
cy.selectOption('[data-cy="ticketNotesObservationType"]:last', 'Weight');
cy.dataCy('ticketNotesDescription').should('exist');
cy.get('[data-cy="ticketNotesDescription"]:last').type(
- 'This is a note description'
+ 'This is a note description',
);
cy.dataCy('crudModelDefaultSaveBtn').click();
cy.checkNotification('Data saved');
diff --git a/test/cypress/integration/ticket/ticketRequest.spec.js b/test/cypress/integration/ticket/ticketRequest.spec.js
index 5a0ae636f..b9dc509ef 100644
--- a/test/cypress/integration/ticket/ticketRequest.spec.js
+++ b/test/cypress/integration/ticket/ticketRequest.spec.js
@@ -6,7 +6,7 @@ describe('TicketRequest', () => {
cy.visit('/#/ticket/31/request');
});
- it.skip('Creates a new request', () => {
+ it('Creates a new request', () => {
cy.dataCy('vnTableCreateBtn').should('exist');
cy.dataCy('vnTableCreateBtn').click();
const data = {