-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-const { t } = useI18n();
-const props = defineProps({
- usesMana: {
- type: Boolean,
- required: true,
- },
- manaCode: {
- type: String,
- required: true,
- },
- manaVal: {
- type: String,
- default: 'mana',
- },
- manaLabel: {
- type: String,
- default: 'Promotion mana',
- },
- manaClaimVal: {
- type: String,
- default: 'manaClaim',
- },
- claimLabel: {
- type: String,
- default: 'Claim mana',
- },
-});
-
-const manaCode = ref(props.manaCode);
-
-
-
-
-
-
-
-
-
- es:
- Promotion mana: Maná promoción
- Claim mana: Maná reclamación
-
diff --git a/src/components/ui/__tests__/CardSummary.spec.js b/src/components/ui/__tests__/CardSummary.spec.js
index ff6f60697..16b903eba 100644
--- a/src/components/ui/__tests__/CardSummary.spec.js
+++ b/src/components/ui/__tests__/CardSummary.spec.js
@@ -23,10 +23,15 @@ describe('CardSummary', () => {
beforeEach(() => {
wrapper = createWrapper(CardSummary, {
+ global: {
+ mocks: {
+ validate: vi.fn(),
+ },
+ },
propsData: {
dataKey: 'cardSummaryKey',
url: 'cardSummaryUrl',
- filter: 'cardFilter',
+ filter: { key: 'cardFilter' },
},
});
vm = wrapper.vm;
@@ -50,7 +55,7 @@ describe('CardSummary', () => {
it('should set correct props to the store', () => {
expect(vm.store.url).toEqual('cardSummaryUrl');
- expect(vm.store.filter).toEqual('cardFilter');
+ expect(vm.store.filter).toEqual({ key: 'cardFilter' });
});
it('should respond to prop changes and refetch data', async () => {
diff --git a/src/components/ui/__tests__/VnSearchbar.spec.js b/src/components/ui/__tests__/VnSearchbar.spec.js
index 25649194d..64014e8d8 100644
--- a/src/components/ui/__tests__/VnSearchbar.spec.js
+++ b/src/components/ui/__tests__/VnSearchbar.spec.js
@@ -7,7 +7,7 @@ describe('VnSearchbar', () => {
let wrapper;
let applyFilterSpy;
const searchText = 'Bolas de madera';
- const userParams = {staticKey: 'staticValue'};
+ const userParams = { staticKey: 'staticValue' };
beforeEach(async () => {
wrapper = createWrapper(VnSearchbar, {
@@ -23,8 +23,9 @@ describe('VnSearchbar', () => {
vm.searchText = searchText;
vm.arrayData.store.userParams = userParams;
- applyFilterSpy = vi.spyOn(vm.arrayData, 'applyFilter').mockImplementation(() => {});
-
+ applyFilterSpy = vi
+ .spyOn(vm.arrayData, 'applyFilter')
+ .mockImplementation(() => {});
});
afterEach(() => {
@@ -32,7 +33,9 @@ describe('VnSearchbar', () => {
});
it('search resets pagination and applies filter', async () => {
- const resetPaginationSpy = vi.spyOn(vm.arrayData, 'resetPagination').mockImplementation(() => {});
+ const resetPaginationSpy = vi
+ .spyOn(vm.arrayData, 'resetPagination')
+ .mockImplementation(() => {});
await vm.search();
expect(resetPaginationSpy).toHaveBeenCalled();
@@ -48,7 +51,7 @@ describe('VnSearchbar', () => {
expect(applyFilterSpy).toHaveBeenCalledWith({
params: { staticKey: 'staticValue', search: searchText },
- filter: {skip: 0},
+ filter: { skip: 0 },
});
});
@@ -68,4 +71,4 @@ describe('VnSearchbar', () => {
});
expect(vm.to.query.searchParam).toBe(expectedQuery);
});
-});
\ No newline at end of file
+});
diff --git a/src/components/ui/__tests__/VnSms.spec.js b/src/components/ui/__tests__/VnSms.spec.js
index 4f4fd7d49..b71d8ccb0 100644
--- a/src/components/ui/__tests__/VnSms.spec.js
+++ b/src/components/ui/__tests__/VnSms.spec.js
@@ -1,5 +1,4 @@
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
-import axios from 'axios';
import { createWrapper } from 'app/test/vitest/helper';
import VnSms from 'src/components/ui/VnSms.vue';
@@ -12,6 +11,9 @@ describe('VnSms', () => {
stubs: ['VnPaginate'],
mocks: {},
},
+ propsData: {
+ url: 'SmsUrl',
+ },
}).vm;
});
diff --git a/src/composables/__tests__/useArrayData.spec.js b/src/composables/__tests__/useArrayData.spec.js
index a3fbbdd5d..74be8ccff 100644
--- a/src/composables/__tests__/useArrayData.spec.js
+++ b/src/composables/__tests__/useArrayData.spec.js
@@ -4,6 +4,8 @@ import { useArrayData } from 'composables/useArrayData';
import { useRouter } from 'vue-router';
import * as vueRouter from 'vue-router';
import { setActivePinia, createPinia } from 'pinia';
+import { defineComponent, h } from 'vue';
+import { mount } from '@vue/test-utils';
describe('useArrayData', () => {
const filter = '{"limit":20,"skip":0}';
@@ -43,7 +45,7 @@ describe('useArrayData', () => {
it('should fetch and replace url with new params', async () => {
vi.spyOn(axios, 'get').mockResolvedValueOnce({ data: [] });
- const arrayData = useArrayData('ArrayData', {
+ const arrayData = mountArrayData('ArrayData', {
url: 'mockUrl',
searchUrl: 'params',
});
@@ -72,7 +74,7 @@ describe('useArrayData', () => {
data: [{ id: 1 }],
});
- const arrayData = useArrayData('ArrayData', {
+ const arrayData = mountArrayData('ArrayData', {
url: 'mockUrl',
navigate: {},
});
@@ -94,7 +96,7 @@ describe('useArrayData', () => {
],
});
- const arrayData = useArrayData('ArrayData', {
+ const arrayData = mountArrayData('ArrayData', {
url: 'mockUrl',
oneRecord: true,
});
@@ -107,3 +109,17 @@ describe('useArrayData', () => {
});
});
});
+
+function mountArrayData(...args) {
+ let arrayData;
+
+ const TestComponent = defineComponent({
+ setup() {
+ arrayData = useArrayData(...args);
+ return () => h('div');
+ },
+ });
+
+ const asd = mount(TestComponent);
+ return arrayData;
+}
diff --git a/src/composables/__tests__/useSession.spec.js b/src/composables/__tests__/useSession.spec.js
index e86847b70..eb390e096 100644
--- a/src/composables/__tests__/useSession.spec.js
+++ b/src/composables/__tests__/useSession.spec.js
@@ -64,88 +64,84 @@ describe('session', () => {
});
});
- describe(
- 'login',
- () => {
- const expectedUser = {
- id: 999,
- name: `T'Challa`,
- nickname: 'Black Panther',
- lang: 'en',
- userConfig: {
- darkMode: false,
+ describe('login', () => {
+ const expectedUser = {
+ id: 999,
+ name: `T'Challa`,
+ nickname: 'Black Panther',
+ lang: 'en',
+ userConfig: {
+ darkMode: false,
+ },
+ worker: { department: { departmentFk: 155 } },
+ };
+ const rolesData = [
+ {
+ role: {
+ name: 'salesPerson',
},
- worker: { department: { departmentFk: 155 } },
- };
- const rolesData = [
- {
- role: {
- name: 'salesPerson',
- },
+ },
+ {
+ role: {
+ name: 'admin',
},
- {
- role: {
- name: 'admin',
- },
- },
- ];
- beforeEach(() => {
- vi.spyOn(axios, 'get').mockImplementation((url) => {
- if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
- return Promise.resolve({
- data: { roles: rolesData, user: expectedUser },
- });
+ },
+ ];
+ beforeEach(() => {
+ vi.spyOn(axios, 'get').mockImplementation((url) => {
+ if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
+ return Promise.resolve({
+ data: { roles: rolesData, user: expectedUser },
});
});
+ });
- it('should fetch the user roles and then set token in the sessionStorage', async () => {
- const expectedRoles = ['salesPerson', 'admin'];
- const expectedToken = 'mySessionToken';
- const expectedTokenMultimedia = 'mySessionTokenMultimedia';
- const keepLogin = false;
+ it('should fetch the user roles and then set token in the sessionStorage', async () => {
+ const expectedRoles = ['salesPerson', 'admin'];
+ const expectedToken = 'mySessionToken';
+ const expectedTokenMultimedia = 'mySessionTokenMultimedia';
+ const keepLogin = false;
- await session.login({
- token: expectedToken,
- tokenMultimedia: expectedTokenMultimedia,
- keepLogin,
- });
-
- const roles = state.getRoles();
- const localToken = localStorage.getItem('token');
- const sessionToken = sessionStorage.getItem('token');
-
- expect(roles.value).toEqual(expectedRoles);
- expect(localToken).toBeNull();
- expect(sessionToken).toEqual(expectedToken);
-
- await session.destroy(); // this clears token and user for any other test
+ await session.login({
+ token: expectedToken,
+ tokenMultimedia: expectedTokenMultimedia,
+ keepLogin,
});
- it('should fetch the user roles and then set token in the localStorage', async () => {
- const expectedRoles = ['salesPerson', 'admin'];
- const expectedToken = 'myLocalToken';
- const expectedTokenMultimedia = 'myLocalTokenMultimedia';
- const keepLogin = true;
+ const roles = state.getRoles();
+ const localToken = localStorage.getItem('token');
+ const sessionToken = sessionStorage.getItem('token');
- await session.login({
- token: expectedToken,
- tokenMultimedia: expectedTokenMultimedia,
- keepLogin,
- });
+ expect(roles.value).toEqual(expectedRoles);
+ expect(localToken).toBeNull();
+ expect(sessionToken).toEqual(expectedToken);
- const roles = state.getRoles();
- const localToken = localStorage.getItem('token');
- const sessionToken = sessionStorage.getItem('token');
+ await session.destroy(); // this clears token and user for any other test
+ });
- expect(roles.value).toEqual(expectedRoles);
- expect(localToken).toEqual(expectedToken);
- expect(sessionToken).toBeNull();
+ it('should fetch the user roles and then set token in the localStorage', async () => {
+ const expectedRoles = ['salesPerson', 'admin'];
+ const expectedToken = 'myLocalToken';
+ const expectedTokenMultimedia = 'myLocalTokenMultimedia';
+ const keepLogin = true;
- await session.destroy(); // this clears token and user for any other test
+ await session.login({
+ token: expectedToken,
+ tokenMultimedia: expectedTokenMultimedia,
+ keepLogin,
});
- },
- {},
- );
+
+ const roles = state.getRoles();
+ const localToken = localStorage.getItem('token');
+ const sessionToken = sessionStorage.getItem('token');
+
+ expect(roles.value).toEqual(expectedRoles);
+ expect(localToken).toEqual(expectedToken);
+ expect(sessionToken).toBeNull();
+
+ await session.destroy(); // this clears token and user for any other test
+ });
+ });
describe('RenewToken', () => {
const expectedToken = 'myToken';
diff --git a/src/composables/getValueFromPath.js b/src/composables/getValueFromPath.js
new file mode 100644
index 000000000..2c94379cc
--- /dev/null
+++ b/src/composables/getValueFromPath.js
@@ -0,0 +1,11 @@
+export function getValueFromPath(root, path) {
+ if (!root || !path) return;
+ const keys = path.toString().split('.');
+ let current = root;
+
+ for (const key of keys) {
+ if (current[key] === undefined) return undefined;
+ else current = current[key];
+ }
+ return current;
+}
\ No newline at end of file
diff --git a/src/composables/updateMinPriceBeforeSave.js b/src/composables/updateMinPriceBeforeSave.js
new file mode 100644
index 000000000..d2895eeff
--- /dev/null
+++ b/src/composables/updateMinPriceBeforeSave.js
@@ -0,0 +1,51 @@
+import axios from 'axios';
+
+export async function beforeSave(data, getChanges, modelOrigin) {
+ try {
+ const changes = data.updates;
+ if (!changes) return data;
+ const patchPromises = [];
+
+ for (const change of changes) {
+ let patchData = {};
+
+ if ('hasMinPrice' in change.data) {
+ patchData.hasMinPrice = change.data?.hasMinPrice;
+ delete change.data.hasMinPrice;
+ }
+ if ('minPrice' in change.data) {
+ patchData.minPrice = change.data?.minPrice;
+ delete change.data.minPrice;
+ }
+
+ if (Object.keys(patchData).length > 0) {
+ const promise = axios
+ .get(`${modelOrigin}/findOne`, {
+ params: {
+ filter: {
+ fields: ['itemFk'],
+ where: { id: change.where.id },
+ },
+ },
+ })
+ .then((row) => {
+ return axios.patch(`Items/${row.data.itemFk}`, patchData);
+ })
+ .catch((error) => {
+ console.error('Error processing change: ', change, error);
+ });
+
+ patchPromises.push(promise);
+ }
+ }
+
+ await Promise.all(patchPromises);
+
+ data.updates = changes.filter((change) => Object.keys(change.data).length > 0);
+
+ return data;
+ } catch (error) {
+ console.error('Error in beforeSave:', error);
+ throw error;
+ }
+}
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 2e880a16d..9828b35ae 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -1,4 +1,4 @@
-import { onMounted, computed } from 'vue';
+import { onMounted, computed, ref } from 'vue';
import { useRouter, useRoute } from 'vue-router';
import axios from 'axios';
import { useArrayDataStore } from 'stores/useArrayDataStore';
@@ -346,7 +346,7 @@ export function useArrayData(key, userOptions) {
}
const totalRows = computed(() => (store.data && store.data.length) || 0);
- const isLoading = computed(() => store.isLoading || false);
+ const isLoading = ref(store.isLoading || false);
return {
fetch,
diff --git a/src/composables/useValidator.js b/src/composables/useValidator.js
index 7a7032608..ae6c47d91 100644
--- a/src/composables/useValidator.js
+++ b/src/composables/useValidator.js
@@ -78,7 +78,8 @@ export function useValidator() {
if (min >= 0)
if (Math.floor(value) < min) return t('inputMin', { value: min });
},
- custom: (value) => validation.bindedFunction(value) || 'Invalid value',
+ custom: (value) =>
+ eval(`(${validation.bindedFunction})`)(value) || 'Invalid value',
};
};
diff --git a/src/css/app.scss b/src/css/app.scss
index b299973d1..dd5dbe247 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -340,3 +340,6 @@ input::-webkit-inner-spin-button {
.containerShrinked {
width: 70%;
}
+.q-item__section--main ~ .q-item__section--side {
+ padding-inline: 0;
+}
diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss
index 45d18af7e..c443c5826 100644
--- a/src/css/quasar.variables.scss
+++ b/src/css/quasar.variables.scss
@@ -18,6 +18,7 @@ $positive: #c8e484;
$negative: #fb5252;
$info: #84d0e2;
$warning: #f4b974;
+$neutral: #b0b0b0;
// Pendiente de cuadrar con la base de datos
$success: $positive;
$alert: $negative;
@@ -51,3 +52,6 @@ $width-xl: 1600px;
.bg-alert {
background-color: $negative;
}
+.bg-neutral {
+ background-color: $neutral;
+}
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 7bcf90793..3c1c80954 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -6,6 +6,7 @@ globals:
quantity: Quantity
entity: Entity
preview: Preview
+ scrollToTop: Go up
user: User
details: Details
collapseMenu: Collapse lateral menu
@@ -19,6 +20,7 @@ globals:
logOut: Log out
date: Date
dataSaved: Data saved
+ openDetail: Open detail
dataDeleted: Data deleted
delete: Delete
search: Search
@@ -160,6 +162,9 @@ globals:
department: Department
noData: No data available
vehicle: Vehicle
+ selectDocumentId: Select document id
+ document: Document
+ import: Import from existing
pageTitles:
logIn: Login
addressEdit: Update address
@@ -341,6 +346,7 @@ globals:
parking: Parking
vehicleList: Vehicles
vehicle: Vehicle
+ entryPreAccount: Pre-account
unsavedPopup:
title: Unsaved changes will be lost
subtitle: Are you sure exit without saving?
@@ -877,6 +883,11 @@ components:
active: Is active
floramondo: Is floramondo
showBadDates: Show future items
+ name: Nombre
+ rate2: Grouping price
+ rate3: Packing price
+ minPrice: Min. Price
+ itemFk: Item id
userPanel:
copyToken: Token copied to clipboard
settings: Settings
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index b2512193d..518985831 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -6,6 +6,7 @@ globals:
quantity: Cantidad
entity: Entidad
preview: Vista previa
+ scrollToTop: Ir arriba
user: Usuario
details: Detalles
collapseMenu: Contraer menú lateral
@@ -20,10 +21,11 @@ globals:
date: Fecha
dataSaved: Datos guardados
dataDeleted: Datos eliminados
+ dataCreated: Datos creados
+ openDetail: Ver detalle
delete: Eliminar
search: Buscar
changes: Cambios
- dataCreated: Datos creados
add: Añadir
create: Crear
edit: Modificar
@@ -164,6 +166,9 @@ globals:
noData: Datos no disponibles
department: Departamento
vehicle: Vehículo
+ selectDocumentId: Seleccione el id de gestión documental
+ document: Documento
+ import: Importar desde existente
pageTitles:
logIn: Inicio de sesión
addressEdit: Modificar consignatario
@@ -344,6 +349,7 @@ globals:
parking: Parking
vehicleList: Vehículos
vehicle: Vehículo
+ entryPreAccount: Precontabilizar
unsavedPopup:
title: Los cambios que no haya guardado se perderán
subtitle: ¿Seguro que quiere salir sin guardar?
@@ -961,6 +967,11 @@ components:
to: Hasta
floramondo: Floramondo
showBadDates: Ver items a futuro
+ name: Nombre
+ rate2: Precio grouping
+ rate3: Precio packing
+ minPrice: Precio mínimo
+ itemFk: Id item
userPanel:
copyToken: Token copiado al portapapeles
settings: Configuración
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index 76ede81ed..3728a18c0 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -28,14 +28,8 @@ const entityId = computed(() => {
return $props.id || route.params.id;
});
-const STATE_COLOR = {
- pending: 'warning',
- incomplete: 'info',
- resolved: 'positive',
- canceled: 'negative',
-};
-function stateColor(code) {
- return STATE_COLOR[code];
+function stateColor(entity) {
+ return entity?.claimState?.classColor;
}
onMounted(async () => {
@@ -57,9 +51,8 @@ onMounted(async () => {
{{ entity.claimState.description }}
diff --git a/src/pages/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue
index 7c948bb2f..4331b026d 100644
--- a/src/pages/Claim/Card/ClaimLines.vue
+++ b/src/pages/Claim/Card/ClaimLines.vue
@@ -123,8 +123,8 @@ async function fetchMana() {
async function updateDiscount({ saleFk, discount, canceller }) {
const body = { salesIds: [saleFk], newDiscount: discount };
- const claimId = claim.value.ticketFk;
- const query = `Tickets/${claimId}/updateDiscount`;
+ const ticketFk = claim.value.ticketFk;
+ const query = `Tickets/${ticketFk}/updateDiscount`;
await axios.post(query, body, {
signal: canceller.signal,
diff --git a/src/pages/Claim/Card/ClaimPhoto.vue b/src/pages/Claim/Card/ClaimPhoto.vue
index 4ced7e862..f02038afe 100644
--- a/src/pages/Claim/Card/ClaimPhoto.vue
+++ b/src/pages/Claim/Card/ClaimPhoto.vue
@@ -23,7 +23,7 @@ const claimDms = ref([
]);
const client = ref({});
const inputFile = ref();
-const files = ref({});
+const files = ref([]);
const spinnerRef = ref();
const claimDmsRef = ref();
const dmsType = ref({});
@@ -255,9 +255,8 @@ function onDrag() {
icon="add"
color="primary"
>
- state.code === code);
+ return claimState?.classColor;
}
const developmentColumns = ref([
@@ -188,7 +182,7 @@ function claimUrl(section) {
@@ -346,17 +340,18 @@ function claimUrl(section) {
- {{
- t(col.value)
- }}
- {{
- t(col.value)
- }}
-
+
+ {{
+ dashIfEmpty(col.field(props.row))
+ }}
+
+
+
+ {{ dashIfEmpty(col.field(props.row)) }}
+
diff --git a/src/pages/Claim/Card/ClaimSummaryAction.vue b/src/pages/Claim/Card/ClaimSummaryAction.vue
index 577ac2a65..be3b9e896 100644
--- a/src/pages/Claim/Card/ClaimSummaryAction.vue
+++ b/src/pages/Claim/Card/ClaimSummaryAction.vue
@@ -88,13 +88,13 @@ const columns = [
auto-load
>
-
+
{{ row.itemFk }}
-
+
{{ row.ticketFk }}
diff --git a/src/pages/Claim/Card/__tests__/ClaimLines.spec.js b/src/pages/Claim/Card/__tests__/ClaimLines.spec.js
index d975fb514..1ed5cccab 100644
--- a/src/pages/Claim/Card/__tests__/ClaimLines.spec.js
+++ b/src/pages/Claim/Card/__tests__/ClaimLines.spec.js
@@ -52,7 +52,7 @@ describe('ClaimLines', () => {
expectedData,
{
signal: canceller.signal,
- }
+ },
);
});
});
@@ -69,7 +69,7 @@ describe('ClaimLines', () => {
expect.objectContaining({
message: 'Discount updated',
type: 'positive',
- })
+ }),
);
});
});
diff --git a/src/pages/Claim/Card/__tests__/ClaimLinesImport.spec.js b/src/pages/Claim/Card/__tests__/ClaimLinesImport.spec.js
index 2a5176d0a..cec4b1681 100644
--- a/src/pages/Claim/Card/__tests__/ClaimLinesImport.spec.js
+++ b/src/pages/Claim/Card/__tests__/ClaimLinesImport.spec.js
@@ -14,6 +14,9 @@ describe('ClaimLinesImport', () => {
fetch: vi.fn(),
},
},
+ propsData: {
+ ticketId: 1,
+ },
}).vm;
});
@@ -40,7 +43,7 @@ describe('ClaimLinesImport', () => {
expect.objectContaining({
message: 'Lines added to claim',
type: 'positive',
- })
+ }),
);
expect(vm.canceller).toEqual(null);
});
diff --git a/src/pages/Claim/Card/__tests__/ClaimPhoto.spec.js b/src/pages/Claim/Card/__tests__/ClaimPhoto.spec.js
index b14338b5c..bf3548af3 100644
--- a/src/pages/Claim/Card/__tests__/ClaimPhoto.spec.js
+++ b/src/pages/Claim/Card/__tests__/ClaimPhoto.spec.js
@@ -41,10 +41,10 @@ describe('ClaimPhoto', () => {
await vm.deleteDms({ index: 0 });
expect(axios.post).toHaveBeenCalledWith(
- `ClaimDms/${claimMock.claimDms[0].dmsFk}/removeFile`
+ `ClaimDms/${claimMock.claimDms[0].dmsFk}/removeFile`,
);
expect(vm.quasar.notify).toHaveBeenCalledWith(
- expect.objectContaining({ type: 'positive' })
+ expect.objectContaining({ type: 'positive' }),
);
});
});
@@ -63,7 +63,7 @@ describe('ClaimPhoto', () => {
data: { index: 1 },
promise: vm.deleteDms,
},
- })
+ }),
);
});
});
@@ -102,10 +102,10 @@ describe('ClaimPhoto', () => {
new FormData(),
expect.objectContaining({
params: expect.objectContaining({ hasFile: false }),
- })
+ }),
);
expect(vm.quasar.notify).toHaveBeenCalledWith(
- expect.objectContaining({ type: 'positive' })
+ expect.objectContaining({ type: 'positive' }),
);
expect(vm.claimDmsRef.fetch).toHaveBeenCalledOnce();
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index e0d9928f9..d6a77bafe 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -101,7 +101,10 @@ const columns = computed(() => [
name: 'stateCode',
chip: {
condition: () => true,
- color: ({ stateCode }) => STATE_COLOR[stateCode] ?? 'bg-grey',
+ color: ({ stateCode }) => {
+ const state = states.value?.find(({ code }) => code === stateCode);
+ return `bg-${state.classColor}`;
+ },
},
columnFilter: {
name: 'claimStateFk',
@@ -131,12 +134,6 @@ const columns = computed(() => [
],
},
]);
-
-const STATE_COLOR = {
- pending: 'bg-warning',
- loses: 'bg-negative',
- resolved: 'bg-positive',
-};
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 4855fadc0..13c337ab0 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -131,6 +131,7 @@ const columns = computed(() => [
name: 'isConciliate',
label: t('Conciliated'),
cardVisible: true,
+ component: 'checkbox',
},
{
align: 'left',
diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index cc894d01e..e4b6f8365 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -9,6 +9,7 @@ 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 CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
+import VnInputBic from 'src/components/common/VnInputBic.vue';
const { t } = useI18n();
const route = useRoute();
@@ -17,7 +18,7 @@ const bankEntitiesRef = ref(null);
const filter = {
fields: ['id', 'bic', 'name'],
- order: 'bic ASC'
+ order: 'bic ASC',
};
const getBankEntities = (data, formData) => {
@@ -43,13 +44,11 @@ const getBankEntities = (data, formData) => {
-
-
-
- {{ t('components.iban_tooltip') }}
-
-
-
+
{
:label="t('globals.campaign')"
:filled="true"
class="q-px-sm q-pt-none fit"
- :option-label="(opt) => t(opt.code)"
+ :option-label="(opt) => t(opt.code ?? '')"
:fields="['id', 'code', 'dated', 'scopeDays']"
@update:model-value="(data) => updateDateParams(data, params)"
dense
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index c7461f890..8b4e025a2 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -39,7 +39,7 @@ const route = useRoute();
const { t } = useI18n();
const entityId = computed(() => {
- return $props.id || route.params.id;
+ return Number($props.id || route.params.id);
});
const data = ref(useCardDescription());
diff --git a/src/pages/Customer/Card/CustomerDescriptorProxy.vue b/src/pages/Customer/Card/CustomerDescriptorProxy.vue
index 9f67d02ec..f1e4b42b8 100644
--- a/src/pages/Customer/Card/CustomerDescriptorProxy.vue
+++ b/src/pages/Customer/Card/CustomerDescriptorProxy.vue
@@ -11,7 +11,7 @@ const $props = defineProps({
-
+
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 93909eb9c..f4efd03b6 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -79,14 +79,14 @@ async function acceptPropagate({ isEqualizated }) {
observe-form-changes
@on-data-saved="checkEtChanges"
>
-
+
@@ -112,6 +112,7 @@ async function acceptPropagate({ isEqualizated }) {
v-model="data.sageTaxTypeFk"
data-cy="sageTaxTypeFk"
:required="data.isTaxDataChecked"
+ :rules="[(val) => validations.required(data.isTaxDataChecked, val)]"
/>
diff --git a/src/pages/Customer/Card/CustomerSamples.vue b/src/pages/Customer/Card/CustomerSamples.vue
index 19a7f8759..44fab8e72 100644
--- a/src/pages/Customer/Card/CustomerSamples.vue
+++ b/src/pages/Customer/Card/CustomerSamples.vue
@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
import { QBtn, useQuasar } from 'quasar';
-
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
import { toDateTimeFormat } from 'src/filters/date';
import VnTable from 'src/components/VnTable/VnTable.vue';
@@ -34,7 +33,7 @@ const columns = computed(() => [
},
{
align: 'left',
- format: (row) => row.type.description,
+ format: (row) => row?.type?.description,
label: t('Description'),
name: 'description',
},
@@ -74,12 +73,11 @@ const tableRef = ref();
$props.id || route.params.id);
+const entityId = computed(() => Number($props.id || route.params.id));
const customer = computed(() => summary.value.entity);
const summary = ref();
const defaulterAmount = computed(() => customer.value.defaulters[0]?.amount);
@@ -181,11 +181,11 @@ const sumRisk = ({ clientRisks }) => {
@@ -208,7 +208,8 @@ const sumRisk = ({ clientRisks }) => {
:text="t('customer.summary.consignee')"
/>
{
/>
{
/>
@@ -289,7 +292,7 @@ const sumRisk = ({ clientRisks }) => {
@@ -318,8 +321,9 @@ const sumRisk = ({ clientRisks }) => {
/>
diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index c30b11528..48538aa2a 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -72,7 +72,7 @@ const exprBuilder = (param, value) => {
option-value="id"
option-label="name"
url="Departments"
- no-one="true"
+ :no-one="true"
/>
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index b721a6ad9..f5e7485a2 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -111,14 +111,11 @@ const columns = computed(() => [
component: 'number',
},
columnField: {
- component: null,
- after: {
- component: markRaw(VnLinkPhone),
- attrs: ({ model }) => {
- return {
- 'phone-number': model,
- };
- },
+ component: markRaw(VnLinkPhone),
+ attrs: ({ model }) => {
+ return {
+ 'phone-number': model,
+ };
},
},
},
diff --git a/src/pages/Customer/Payments/__tests__/CustomerPayments.spec.js b/src/pages/Customer/Payments/__tests__/CustomerPayments.spec.js
index a9c845cec..238545050 100644
--- a/src/pages/Customer/Payments/__tests__/CustomerPayments.spec.js
+++ b/src/pages/Customer/Payments/__tests__/CustomerPayments.spec.js
@@ -32,7 +32,7 @@ describe('CustomerPayments', () => {
expect.objectContaining({
message: 'Payment confirmed',
type: 'positive',
- })
+ }),
);
});
});
diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index 1294a5d25..dfa944748 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -41,7 +41,6 @@ const sampleType = ref({ hasPreview: false });
const initialData = reactive({});
const entityId = computed(() => route.params.id);
const customer = computed(() => useArrayData('Customer').store?.data);
-const filterEmailUsers = { where: { userFk: user.value.id } };
const filterClientsAddresses = {
include: [
{ relation: 'province', scope: { fields: ['name'] } },
@@ -73,7 +72,7 @@ onBeforeMount(async () => {
const setEmailUser = (data) => {
optionsEmailUsers.value = data;
- initialData.replyTo = data[0]?.email;
+ initialData.replyTo = data[0]?.notificationEmail;
};
const setClientsAddresses = (data) => {
@@ -182,10 +181,12 @@ const toCustomerSamples = () => {
0) {
- const promise = axios
- .get('Buys/findOne', {
- params: {
- filter: {
- fields: ['itemFk'],
- where: { id: change.where.id },
- },
- },
- })
- .then((buy) => {
- return axios.patch(`Items/${buy.data.itemFk}`, patchData);
- })
- .catch((error) => {
- console.error('Error processing change: ', change, error);
- });
-
- patchPromises.push(promise);
- }
- }
-
- await Promise.all(patchPromises);
-
- data.updates = changes.filter((change) => Object.keys(change.data).length > 0);
-
- return data;
- } catch (error) {
- console.error('Error in beforeSave:', error);
- throw error;
- }
-}
-
function invertQuantitySign(rows, sign) {
for (const row of rows) {
if (sign > 0) row.quantity = Math.abs(row.quantity);
@@ -697,7 +648,7 @@ onMounted(() => {
:right-search="false"
:row-click="false"
:columns="columns"
- :beforeSaveFn="beforeSave"
+ :beforeSaveFn="(data, getChanges) => beforeSave(data, getChanges, 'Buys')"
class="buyList"
:table-height="$props.tableHeight ?? '84vh'"
auto-load
@@ -787,7 +738,7 @@ onMounted(() => {
{{ footer?.amount }} /
{{ footer?.checkedAmount }}
-
+
{
await setBuyUltimate(value, data);
}
"
- :required="true"
+ required
+ :rules="[(val) => validations.required(true, val)]"
data-cy="itemFk-create-popup"
sort-by="nickname DESC"
>
diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
new file mode 100644
index 000000000..cda2ffd5e
--- /dev/null
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -0,0 +1,477 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('entry.preAccount.btn') }}
+
+
+
+
+
+ {{ row.id }}
+
+
+
+
+
+
+
+
+ {{ row.gestDocFk }}
+
+
+
+
+ {{ row.supplier }}
+
+
+
+
+
+ {{ row.invoiceInFk }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+en:
+ IntraCommunity: Intra-community
+ NonCommunity: Non-community
+ CanaryIslands: Canary Islands
+es:
+ IntraCommunity: Intracomunitaria
+ NonCommunity: Extracomunitaria
+ CanaryIsland: Islas Canarias
+ National: Nacional
+
diff --git a/src/pages/Entry/__tests__/EntryPreAccount.spec.js b/src/pages/Entry/__tests__/EntryPreAccount.spec.js
new file mode 100644
index 000000000..0140a5f1e
--- /dev/null
+++ b/src/pages/Entry/__tests__/EntryPreAccount.spec.js
@@ -0,0 +1,63 @@
+import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+import EntryPreAccount from '../EntryPreAccount.vue';
+import axios from 'axios';
+
+describe('EntryPreAccount', () => {
+ let wrapper;
+ let vm;
+
+ beforeAll(() => {
+ vi.spyOn(axios, 'get').mockImplementation((url) => {
+ if (url == 'EntryConfigs/findOne')
+ return { data: { maxDays: 90, defaultDays: 30 } };
+ return { data: [] };
+ });
+ wrapper = createWrapper(EntryPreAccount);
+ vm = wrapper.vm;
+ });
+
+ afterEach(() => {
+ vi.clearAllMocks();
+ });
+
+ describe('filterByDaysAgo()', () => {
+ it('should set daysAgo to defaultDays if no value is provided', () => {
+ vm.filterByDaysAgo();
+ expect(vm.daysAgo).toBe(vm.defaultDays);
+ expect(vm.arrayData.store.userParams.daysAgo).toBe(vm.defaultDays);
+ });
+
+ it('should set daysAgo to maxDays if the value exceeds maxDays', () => {
+ vm.filterByDaysAgo(500);
+ expect(vm.daysAgo).toBe(vm.maxDays);
+ expect(vm.arrayData.store.userParams.daysAgo).toBe(vm.maxDays);
+ });
+
+ it('should set daysAgo to the provided value if it is valid', () => {
+ vm.filterByDaysAgo(30);
+ expect(vm.daysAgo).toBe(30);
+ expect(vm.arrayData.store.userParams.daysAgo).toBe(30);
+ });
+ });
+
+ describe('Dialog behavior when adding a new row', () => {
+ it('should open the dialog if the new row has invoiceInFk', async () => {
+ const dialogSpy = vi.spyOn(vm.quasar, 'dialog');
+ const selectedRows = [{ id: 1, invoiceInFk: 123 }];
+ vm.selectedRows = selectedRows;
+ await vm.$nextTick();
+ expect(dialogSpy).toHaveBeenCalledWith({
+ component: vm.VnConfirm,
+ componentProps: { title: vm.t('entry.preAccount.hasInvoice') },
+ });
+ });
+
+ it('should not open the dialog if the new row does not have invoiceInFk', async () => {
+ const dialogSpy = vi.spyOn(vm.quasar, 'dialog');
+ vm.selectedRows = [{ id: 1, invoiceInFk: null }];
+ await vm.$nextTick();
+ expect(dialogSpy).not.toHaveBeenCalled();
+ });
+ });
+});
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 0bc92a5ea..3c0f078fe 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -118,6 +118,33 @@ entry:
searchInfo: You can search by entry reference
descriptorMenu:
showEntryReport: Show entry report
+ preAccount:
+ gestDocFk: Gestdoc
+ dmsType: Gestdoc type
+ invoiceNumber: Entry ref.
+ reference: Gestdoc ref.
+ shipped: Shipped
+ landed: Landed
+ id: Entry
+ invoiceInFk: Invoice in
+ supplierFk: Supplier
+ country: Country
+ description: Entry type
+ payDem: Payment term
+ isBooked: B
+ isReceived: R
+ entryType: Entry type
+ isAgricultural: Agricultural
+ fiscalCode: Account type
+ daysAgo: Max 365 days
+ search: Search
+ searchInfo: You can search by supplier name or nickname
+ btn: Pre-account
+ hasInvoice: This entry has already an invoice in
+ success: It has been successfully pre-accounted
+ dialog:
+ title: Pre-account entries
+ message: Do you want the invoice to inherit the entry document?
entryFilter:
params:
isExcludedFromAvailable: Excluded from available
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 2c80299bc..0addbca94 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -69,6 +69,33 @@ entry:
observationType: Tipo de observación
search: Buscar entradas
searchInfo: Puedes buscar por referencia de entrada
+ preAccount:
+ gestDocFk: Gestdoc
+ dmsType: Tipo gestdoc
+ invoiceNumber: Ref. Entrada
+ reference: Ref. GestDoc
+ shipped: F. envío
+ landed: F. llegada
+ id: Entrada
+ invoiceInFk: Recibida
+ supplierFk: Proveedor
+ country: País
+ description: Tipo de Entrada
+ payDem: Plazo de pago
+ isBooked: C
+ isReceived: R
+ entryType: Tipo de entrada
+ isAgricultural: Agricultural
+ fiscalCode: Tipo de cuenta
+ daysAgo: Máximo 365 días
+ search: Buscar
+ searchInfo: Puedes buscar por nombre o alias de proveedor
+ btn: Precontabilizar
+ hasInvoice: Esta entrada ya tiene una f. recibida
+ success: Se ha precontabilizado correctamente
+ dialog:
+ title: Precontabilizar entradas
+ message: ¿Desea que la factura herede el documento de la entrada?
params:
entryFk: Entrada
observationTypeFk: Tipo de observación
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue
index e9ca762ed..2c8cab84f 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue
@@ -5,7 +5,7 @@ import InvoiceInSummary from './InvoiceInSummary.vue';
const $props = defineProps({
id: {
type: Number,
- required: true,
+ default: null,
},
});
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index 53433c56b..6d6dd2f51 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -164,6 +164,7 @@ onMounted(async () => {
unelevated
filled
dense
+ data-cy="formSubmitBtn"
/>
{
filled
dense
@click="getStatus = 'stopping'"
+ data-cy="formStopBtn"
/>
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 3390ef33a..c87428a94 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -79,6 +79,30 @@ const columns = computed(() => [
inWhere: true,
},
},
+ {
+ align: 'left',
+ name: 'issued',
+ label: t('invoiceOut.summary.issued'),
+ component: 'date',
+ format: (row) => toDate(row.issued),
+ columnField: { component: null },
+ },
+ {
+ align: 'left',
+ name: 'created',
+ label: t('globals.created'),
+ component: 'date',
+ columnField: { component: null },
+ format: (row) => toDate(row.created),
+ },
+ {
+ align: 'left',
+ name: 'dued',
+ label: t('invoiceOut.summary.expirationDate'),
+ component: 'date',
+ columnField: { component: null },
+ format: (row) => toDate(row.dued),
+ },
{
align: 'left',
name: 'clientFk',
@@ -132,22 +156,6 @@ const columns = computed(() => [
cardVisible: true,
format: (row) => toCurrency(row.amount),
},
- {
- align: 'left',
- name: 'created',
- label: t('globals.created'),
- component: 'date',
- columnField: { component: null },
- format: (row) => toDate(row.created),
- },
- {
- align: 'left',
- name: 'dued',
- label: t('invoiceOut.summary.dued'),
- component: 'date',
- columnField: { component: null },
- format: (row) => toDate(row.dued),
- },
{
align: 'left',
name: 'customsAgentFk',
diff --git a/src/pages/Item/Card/ItemDescriptorProxy.vue b/src/pages/Item/Card/ItemDescriptorProxy.vue
index f686e8221..6e1f6d71f 100644
--- a/src/pages/Item/Card/ItemDescriptorProxy.vue
+++ b/src/pages/Item/Card/ItemDescriptorProxy.vue
@@ -22,7 +22,7 @@ const $props = defineProps({
});
-
+
{
:default-remove="false"
:user-filter="{
fields: ['id', 'itemFk', 'tagFk', 'value', 'priority'],
- where: { itemFk: route.params.id },
include: {
relation: 'tag',
scope: {
@@ -97,6 +96,7 @@ const insertTag = (rows) => {
},
},
}"
+ :filter="{ where: { itemFk: route.params.id } }"
order="priority"
auto-load
@on-fetch="onItemTagsFetched"
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index fdfa1d3d1..eb156ce9f 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -1,574 +1,386 @@
-
-
+
-
-
+
+
+
{{ t('Edit fixed price(s)') }}
-
-
-
+
+
-
-
+
+
-
- {{ scope }}
-
+
+
+ {{ row.name }}
+
+
+ {{ row.subName }}
+
-
-
+
+
+
+ {{ toDate(row?.started) }}
+
+
+
+
+
+
+ {{ toDate(row?.ended) }}
+
+
+
+
- #{{ scope.opt?.id }}
- {{ scope.opt?.name }}
+
+ {{ scope.opt.name }}
+
+ #{{ scope.opt.id }}
-
-
- {{ row.name }}
-
- {{ row.subName }}
-
-
-
-
-
-
- €
-
-
-
-
-
-
- €
-
-
-
-
-
-
-
-
- €
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
- {{ t('globals.delete') }}
-
-
+
+
+
+
+ {{ scope.opt.name }}
+
+ #{{ scope.opt.id }}
+
+
+
+
-
-
-
+
@@ -623,8 +435,17 @@ tbody tr.highlight .q-td {
color: var(--vn-label-color);
}
+
+
+
es:
Add fixed price: Añadir precio fijado
Edit fixed price(s): Editar precio(s) fijado(s)
+ Create fixed price: Crear precio fijado
+ Clone fixed price: Clonar precio fijado
diff --git a/src/pages/Item/ItemFixedPriceFilter.vue b/src/pages/Item/ItemFixedPriceFilter.vue
index d68b966c6..9c11a2e69 100644
--- a/src/pages/Item/ItemFixedPriceFilter.vue
+++ b/src/pages/Item/ItemFixedPriceFilter.vue
@@ -29,6 +29,7 @@ const props = defineProps({
dense
filled
use-input
+ :use-like="false"
@update:model-value="searchFn()"
sort-by="nickname ASC"
/>
@@ -50,21 +51,19 @@ const props = defineProps({
/>
-
+
-
-
diff --git a/src/pages/Item/ItemListFilter.vue b/src/pages/Item/ItemListFilter.vue
index f4500d5fa..ab9b91d06 100644
--- a/src/pages/Item/ItemListFilter.vue
+++ b/src/pages/Item/ItemListFilter.vue
@@ -7,7 +7,7 @@ import FetchData from 'components/FetchData.vue';
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
import VnSelect from 'src/components/common/VnSelect.vue';
import VnInput from 'src/components/common/VnInput.vue';
-import { QCheckbox } from 'quasar';
+import VnCheckbox from 'src/components/common/VnCheckbox.vue';
import { useArrayData } from 'composables/useArrayData';
import { useValidator } from 'src/composables/useValidator';
@@ -250,10 +250,9 @@ onMounted(async () => {
-
-
- {{ t('params.tags') }}
-
+
+ {{ t('params.tags') }}
+
{
color="primary"
@click="tagValues.push({})"
/>
-
+
{
>
{
/>
-
-
- {{ t('More fields') }}
-
+ {{ t('More fields') }}
-
-
+ />
+
{
/>
- {
@keydown.enter="applyFieldFilters(params, searchFn)"
/>
-
+
diff --git a/src/components/EditTableCellValueForm.vue b/src/pages/Item/components/EditFixedPriceForm.vue
similarity index 81%
rename from src/components/EditTableCellValueForm.vue
rename to src/pages/Item/components/EditFixedPriceForm.vue
index 172866191..9c6a63893 100644
--- a/src/components/EditTableCellValueForm.vue
+++ b/src/pages/Item/components/EditFixedPriceForm.vue
@@ -8,11 +8,6 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
import VnRow from 'components/ui/VnRow.vue';
import { QCheckbox } from 'quasar';
-import axios from 'axios';
-import useNotify from 'src/composables/useNotify.js';
-
-const emit = defineEmits(['onDataSaved']);
-
const $props = defineProps({
rows: {
type: Array,
@@ -26,10 +21,14 @@ const $props = defineProps({
type: String,
default: '',
},
+ beforeSave: {
+ type: Function,
+ default: () => {},
+ },
});
const { t } = useI18n();
-const { notify } = useNotify();
+const emit = defineEmits(['onDataSaved']);
const inputs = {
input: markRaw(VnInput),
@@ -44,24 +43,13 @@ const selectedField = ref(null);
const closeButton = ref(null);
const isLoading = ref(false);
-const onDataSaved = () => {
- notify('globals.dataSaved', 'positive');
- emit('onDataSaved');
- closeForm();
-};
-
const onSubmit = async () => {
isLoading.value = true;
- const rowsToEdit = $props.rows.map((row) => ({ id: row.id, itemFk: row.itemFk }));
- const payload = {
- field: selectedField.value.field,
- newValue: newValue.value,
- lines: rowsToEdit,
- };
-
- await axios.post($props.editUrl, payload);
- onDataSaved();
- isLoading.value = false;
+ $props.rows.forEach((row) => {
+ row[selectedField.value.name] = newValue.value;
+ });
+ emit('onDataSaved', $props.rows);
+ closeForm();
};
const closeForm = () => {
@@ -78,21 +66,24 @@ const closeForm = () => {
{{ t('Edit') }}
{{ ` ${rows.length} ` }}
{{ t('buy(s)') }}
-
+
@@ -140,6 +131,15 @@ const closeForm = () => {
}
+
+
es:
Edit: Editar
diff --git a/src/pages/Item/components/ItemProposal.vue b/src/pages/Item/components/ItemProposal.vue
index d2dbea7b3..bd0fdc0c2 100644
--- a/src/pages/Item/components/ItemProposal.vue
+++ b/src/pages/Item/components/ItemProposal.vue
@@ -6,10 +6,12 @@ import { toCurrency } from 'filters/index';
import VnStockValueDisplay from 'src/components/ui/VnStockValueDisplay.vue';
import VnTable from 'src/components/VnTable/VnTable.vue';
import axios from 'axios';
-import notifyResults from 'src/utils/notifyResults';
+import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
import FetchData from 'components/FetchData.vue';
+import { useState } from 'src/composables/useState';
const MATCH = 'match';
+const { notifyResults } = displayResults();
const { t } = useI18n();
const $props = defineProps({
@@ -18,14 +20,20 @@ const $props = defineProps({
required: true,
default: () => {},
},
+ filter: {
+ type: Object,
+ required: true,
+ default: () => {},
+ },
replaceAction: {
type: Boolean,
- required: false,
+ required: true,
default: false,
},
+
sales: {
type: Array,
- required: false,
+ required: true,
default: () => [],
},
});
@@ -36,6 +44,8 @@ const proposalTableRef = ref(null);
const sale = computed(() => $props.sales[0]);
const saleFk = computed(() => sale.value.saleFk);
const filter = computed(() => ({
+ where: $props.filter,
+
itemFk: $props.itemLack.itemFk,
sales: saleFk.value,
}));
@@ -228,11 +238,15 @@ async function handleTicketConfig(data) {
url="TicketConfigs"
:filter="{ fields: ['lackAlertPrice'] }"
@on-fetch="handleTicketConfig"
- auto-load
+ >
+
import ItemProposal from './ItemProposal.vue';
import { useDialogPluginComponent } from 'quasar';
-
const $props = defineProps({
itemLack: {
type: Object,
required: true,
default: () => {},
},
+ filter: {
+ type: Object,
+ required: true,
+ default: () => {},
+ },
replaceAction: {
type: Boolean,
required: false,
@@ -31,7 +35,7 @@ defineExpose({ show: () => dialogRef.value.show(), hide: () => dialogRef.value.h
- {{ $t('Item proposal') }}
+ {{ $t('itemProposal') }}
diff --git a/src/pages/Item/components/__tests__/EditFixedPriceForm.spec.js b/src/pages/Item/components/__tests__/EditFixedPriceForm.spec.js
new file mode 100644
index 000000000..6ac8f372d
--- /dev/null
+++ b/src/pages/Item/components/__tests__/EditFixedPriceForm.spec.js
@@ -0,0 +1,46 @@
+import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+import EditFixedPriceForm from 'src/pages/Item/components/EditFixedPriceForm.vue';
+
+describe('EditFixedPriceForm.vue', () => {
+ let wrapper;
+ let vm;
+
+ const mockRows = [
+ { id: 1, itemFk: 101 },
+ { id: 2, itemFk: 102 },
+ ];
+
+ const mockFieldsOptions = [
+ {
+ name: 'price',
+ label: 'Price',
+ component: 'input',
+ attrs: { type: 'number' },
+ },
+ ];
+
+ beforeEach(() => {
+ wrapper = createWrapper(EditFixedPriceForm, {
+ props: {
+ rows: JSON.parse(JSON.stringify(mockRows)),
+ fieldsOptions: mockFieldsOptions,
+ },
+ });
+ wrapper = wrapper.wrapper;
+ vm = wrapper.vm;
+ });
+
+ afterEach(() => {
+ vi.clearAllMocks();
+ });
+
+ it('should emit "onDataSaved" with updated rows on submit', async () => {
+ vm.selectedField = mockFieldsOptions[0];
+ vm.newValue = 199.99;
+
+ await vm.onSubmit();
+
+ expect(wrapper.emitted('onDataSaved')).toBeTruthy();
+ });
+});
diff --git a/src/pages/Item/composables/cloneItem.js b/src/pages/Item/composables/cloneItem.js
index 2421c0808..4e19661ca 100644
--- a/src/pages/Item/composables/cloneItem.js
+++ b/src/pages/Item/composables/cloneItem.js
@@ -11,26 +11,19 @@ export function cloneItem() {
const router = useRouter();
const cloneItem = async (entityId) => {
const { id } = entityId;
- try {
- const { data } = await axios.post(`Items/${id ?? entityId}/clone`);
- router.push({ name: 'ItemTags', params: { id: data.id } });
- } catch (err) {
- console.error('Error cloning item');
- }
+ const { data } = await axios.post(`Items/${id ?? entityId}/clone`);
+ router.push({ name: 'ItemTags', params: { id: data.id } });
};
const openCloneDialog = async (entityId) => {
- quasar
- .dialog({
- component: VnConfirm,
- componentProps: {
- title: t('item.descriptor.clone.title'),
- message: t('item.descriptor.clone.subTitle'),
- },
- })
- .onOk(async () => {
- await cloneItem(entityId);
- });
+ quasar.dialog({
+ component: VnConfirm,
+ componentProps: {
+ title: t('item.descriptor.clone.title'),
+ message: t('item.descriptor.clone.subTitle'),
+ promise: () => cloneItem(entityId),
+ },
+ });
};
return { openCloneDialog };
}
diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml
index ff8df26d4..017f6b11f 100644
--- a/src/pages/Item/locale/en.yml
+++ b/src/pages/Item/locale/en.yml
@@ -167,6 +167,8 @@ item:
started: Started
ended: Ended
warehouse: Warehouse
+ MP: MP
+ itemName: Item
create:
name: Name
tag: Tag
diff --git a/src/pages/Item/locale/es.yml b/src/pages/Item/locale/es.yml
index 7b768d0cb..a06695fe9 100644
--- a/src/pages/Item/locale/es.yml
+++ b/src/pages/Item/locale/es.yml
@@ -173,6 +173,8 @@ item:
started: Inicio
ended: Fin
warehouse: Almacén
+ MP: PM
+ itemName: Nombre
create:
name: Nombre
tag: Etiqueta
diff --git a/src/pages/Monitor/MonitorClientsActions.vue b/src/pages/Monitor/MonitorClientsActions.vue
index 821773bbf..a6ac3ab0b 100644
--- a/src/pages/Monitor/MonitorClientsActions.vue
+++ b/src/pages/Monitor/MonitorClientsActions.vue
@@ -8,14 +8,14 @@ import VnRow from 'src/components/ui/VnRow.vue';
class="q-pa-md"
:style="{ 'flex-direction': $q.screen.lt.lg ? 'column' : 'row', gap: '0px' }"
>
-
+
-
+
useOpenURL(`#/order/${id}/summary`);
-
-
- {{ toDateFormat(row.date_send) }}
-
-
+
diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
index 1cadd4cb4..1bc194a5c 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
@@ -9,6 +9,7 @@ import VnInput from 'src/components/common/VnInput.vue';
import VnInputNumber from 'src/components/common/VnInputNumber.vue';
import FetchData from 'src/components/FetchData.vue';
import { dateRange } from 'src/filters';
+import VnCheckbox from 'src/components/common/VnCheckbox.vue';
defineProps({ dataKey: { type: String, required: true } });
const { t, te } = useI18n();
@@ -209,7 +210,7 @@ const getLocale = (label) => {
- {
- {
-
import { ref, computed, onMounted } from 'vue';
import { useI18n } from 'vue-i18n';
-import FetchData from 'components/FetchData.vue';
import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
@@ -168,9 +167,11 @@ const columns = computed(() => [
component: 'select',
name: 'provinceFk',
attrs: {
- options: provinceOpts.value,
- 'option-value': 'id',
- 'option-label': 'name',
+ url: 'Provinces',
+ fields: ['id', 'name'],
+ sortBy: ['name ASC'],
+ optionValue: 'id',
+ optionLabel: 'name',
dense: true,
},
},
@@ -183,9 +184,11 @@ const columns = computed(() => [
component: 'select',
name: 'stateFk',
attrs: {
- options: stateOpts.value,
- 'option-value': 'id',
- 'option-label': 'name',
+ sortBy: ['name ASC'],
+ url: 'States',
+ fields: ['id', 'name'],
+ optionValue: 'id',
+ optionLabel: 'name',
dense: true,
},
},
@@ -212,9 +215,12 @@ const columns = computed(() => [
component: 'select',
name: 'zoneFk',
attrs: {
- options: zoneOpts.value,
- 'option-value': 'id',
- 'option-label': 'name',
+ url: 'Zones',
+ fields: ['id', 'name'],
+ sortBy: ['name ASC'],
+
+ optionValue: 'id',
+ optionLabel: 'name',
dense: true,
},
},
@@ -225,11 +231,12 @@ const columns = computed(() => [
align: 'left',
columnFilter: {
component: 'select',
- url: 'PayMethods',
attrs: {
- options: PayMethodOpts.value,
- optionValue: 'id',
+ url: 'PayMethods',
+ fields: ['id', 'name'],
+ sortBy: ['id ASC'],
optionLabel: 'name',
+ optionValue: 'id',
dense: true,
},
},
@@ -254,7 +261,9 @@ const columns = computed(() => [
columnFilter: {
component: 'select',
attrs: {
- options: DepartmentOpts.value,
+ url: 'Departments',
+ fields: ['id', 'name'],
+ sortBy: ['id ASC'],
dense: true,
},
},
@@ -265,11 +274,12 @@ const columns = computed(() => [
align: 'left',
columnFilter: {
component: 'select',
- url: 'ItemPackingTypes',
attrs: {
- options: ItemPackingTypeOpts.value,
- 'option-value': 'code',
- 'option-label': 'code',
+ url: 'ItemPackingTypes',
+ fields: ['code'],
+ sortBy: ['code ASC'],
+ optionValue: 'code',
+ optionCode: 'code',
dense: true,
},
},
@@ -324,60 +334,6 @@ const totalPriceColor = (ticket) => {
const openTab = (id) => useOpenURL(`#/ticket/${id}/sale`);
-
-
-
-
-
-
diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index dbb66c0ec..df39fff3c 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -120,7 +120,6 @@ watch(
:data-key="dataKey"
:tag-value="tagValue"
:tags="tags"
- :initial-catalog-params="catalogParams"
:arrayData
/>
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index ee66bb57e..434dbb038 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -27,7 +27,7 @@ const getTotalRef = ref();
const total = ref(0);
const entityId = computed(() => {
- return $props.id || route.params.id;
+ return Number($props.id || route.params.id);
});
const orderTotal = computed(() => state.get('orderTotal') ?? 0);
diff --git a/src/pages/Order/Card/OrderLines.vue b/src/pages/Order/Card/OrderLines.vue
index 1b864de6f..231efbcd9 100644
--- a/src/pages/Order/Card/OrderLines.vue
+++ b/src/pages/Order/Card/OrderLines.vue
@@ -295,13 +295,11 @@ watch(
:user-filter="lineFilter"
>
-
-
-
+
@@ -361,12 +359,6 @@ watch(
}
}
-.image-wrapper {
- height: 50px;
- width: 50px;
- margin-left: 30%;
-}
-
.header {
color: $primary;
font-weight: bold;
diff --git a/src/pages/Route/Card/RouteSummary.vue b/src/pages/Route/Card/RouteSummary.vue
index 86bdbb5c5..7e345d69a 100644
--- a/src/pages/Route/Card/RouteSummary.vue
+++ b/src/pages/Route/Card/RouteSummary.vue
@@ -233,10 +233,10 @@ const ticketColumns = ref([
-
-
+
+
- {{ value }}
+ {{ row.clientFk }}
diff --git a/src/pages/Route/RouteTickets.vue b/src/pages/Route/RouteTickets.vue
index 5e28bb689..1b9545905 100644
--- a/src/pages/Route/RouteTickets.vue
+++ b/src/pages/Route/RouteTickets.vue
@@ -141,7 +141,7 @@ const setOrderedPriority = async () => {
};
const sortRoutes = async () => {
- await axios.patch(`Routes/${route.params?.id}/guessPriority/`);
+ await axios.patch(`Routes/${route.params?.id}/optimizePriority`);
refreshKey.value++;
};
diff --git a/src/pages/Route/Vehicle/Card/VehicleDmsImportForm.vue b/src/pages/Route/Vehicle/Card/VehicleDmsImportForm.vue
new file mode 100644
index 000000000..ade3e6dc5
--- /dev/null
+++ b/src/pages/Route/Vehicle/Card/VehicleDmsImportForm.vue
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/Route/Vehicle/VehicleDms.vue b/src/pages/Route/Vehicle/VehicleDms.vue
new file mode 100644
index 000000000..61f608d6c
--- /dev/null
+++ b/src/pages/Route/Vehicle/VehicleDms.vue
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+ {{ t('globals.import') }}
+
+
+
+
diff --git a/src/pages/Route/Vehicle/locale/en.yml b/src/pages/Route/Vehicle/locale/en.yml
index c92022f9d..af6f78fd1 100644
--- a/src/pages/Route/Vehicle/locale/en.yml
+++ b/src/pages/Route/Vehicle/locale/en.yml
@@ -18,3 +18,5 @@ vehicle:
params:
vehicleTypeFk: Type
vehicleStateFk: State
+ errors:
+ documentIdEmpty: The document identifier can't be empty
diff --git a/src/pages/Route/Vehicle/locale/es.yml b/src/pages/Route/Vehicle/locale/es.yml
index c878f97ac..9fd0d3e91 100644
--- a/src/pages/Route/Vehicle/locale/es.yml
+++ b/src/pages/Route/Vehicle/locale/es.yml
@@ -18,3 +18,5 @@ vehicle:
params:
vehicleTypeFk: Tipo
vehicleStateFk: Estado
+ errors:
+ documentIdEmpty: El número de documento no puede estar vacío
diff --git a/src/pages/Shelving/Parking/ParkingList.vue b/src/pages/Shelving/Parking/ParkingList.vue
index 7c5058a74..eb5be5747 100644
--- a/src/pages/Shelving/Parking/ParkingList.vue
+++ b/src/pages/Shelving/Parking/ParkingList.vue
@@ -80,7 +80,7 @@ const columns = computed(() => [
{
{
- const needle = val.toLowerCase();
- filteredBankEntitiesOptions.value = bankEntitiesOptions.value.filter(
- (bank) =>
- bank.bic.toLowerCase().startsWith(needle) ||
- bank.name.toLowerCase().includes(needle),
- );
- });
+function bankEntityFilter(val) {
+ const needle = val.toLowerCase();
+ filteredBankEntitiesOptions.value = bankEntitiesOptions.value.filter(
+ (bank) =>
+ bank.bic.toLowerCase().startsWith(needle) ||
+ bank.name.toLowerCase().includes(needle),
+ );
}
@@ -82,7 +80,8 @@ function bankEntityFilter(val, update) {
url="BankEntities"
@on-fetch="
(data) => {
- (bankEntitiesOptions = data), (filteredBankEntitiesOptions = data);
+ bankEntitiesOptions = data;
+ filteredBankEntitiesOptions = data;
}
"
auto-load
@@ -135,10 +134,8 @@ function bankEntityFilter(val, update) {
:label="t('worker.create.bankEntity')"
v-model="row.bankEntityFk"
:options="filteredBankEntitiesOptions"
- :default-filter="false"
- @filter="(val, update) => bankEntityFilter(val, update)"
+ :filter-fn="bankEntityFilter"
option-label="bic"
- option-value="id"
hide-selected
:required="true"
:roles-allowed-to-create="['financial']"
diff --git a/src/pages/Supplier/Card/SupplierDescriptorProxy.vue b/src/pages/Supplier/Card/SupplierDescriptorProxy.vue
index 6311939b8..e4d1d9a13 100644
--- a/src/pages/Supplier/Card/SupplierDescriptorProxy.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptorProxy.vue
@@ -5,7 +5,7 @@ import SupplierSummary from './SupplierSummary.vue';
const $props = defineProps({
id: {
type: Number,
- required: true,
+ default: null,
},
});
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index 4293bd41a..2feb0e39a 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -11,10 +11,10 @@ import VnSelect from 'src/components/common/VnSelect.vue';
import VnLocation from 'src/components/common/VnLocation.vue';
import VnAccountNumber from 'src/components/common/VnAccountNumber.vue';
import VnCheckbox from 'src/components/common/VnCheckbox.vue';
-
+import { useArrayData } from 'src/composables/useArrayData';
const route = useRoute();
const { t } = useI18n();
-
+const arrayData = useArrayData('Supplier');
const sageTaxTypesOptions = ref([]);
const sageWithholdingsOptions = ref([]);
const sageTransactionTypesOptions = ref([]);
@@ -89,6 +89,7 @@ function handleLocation(data, location) {
}"
auto-load
:clear-store-on-unmount="false"
+ @on-data-saved="arrayData.fetch({})"
>
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicData.vue b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
index 055c9a0ff..83c621b20 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
@@ -91,7 +91,7 @@ const totalPrice = computed(() => {
const totalNewPrice = computed(() => {
return rows.value.reduce(
(acc, item) => acc + item.component.newPrice * item.quantity,
- 0
+ 0,
);
});
@@ -210,18 +210,18 @@ onMounted(async () => {
flat
>
-
-
+
+
{{ row.itemFk }}
-
+
{{ row.item.name }}
-
+
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
index 76191b099..a58c934f8 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
@@ -101,7 +101,7 @@ const onNextStep = async () => {
t('basicData.negativesConfirmMessage'),
submitWithNegatives,
);
- else submit();
+ else await submit();
}
};
diff --git a/src/pages/Ticket/Card/TicketCreateTracking.vue b/src/pages/Ticket/Card/TicketCreateTracking.vue
deleted file mode 100644
index 5c1e916f2..000000000
--- a/src/pages/Ticket/Card/TicketCreateTracking.vue
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- es:
- Create tracking: Crear estado
-
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 96920231c..c6c6e6c6b 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -46,7 +46,7 @@ async function getClaims() {
originalTicket.value = data[0]?.originalTicketFk;
}
async function getProblems() {
- const { data } = await axios.get(`Tickets/${entityId.value}/getTicketProblems`);
+ const { data } = await axios.get(`Tickets/getTicketProblems`, {params: { ids: [entityId.value] }});
if (!data) return;
problems.value = data[0];
}
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index f7389b592..30024fb26 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -28,6 +28,7 @@ const props = defineProps({
onMounted(() => {
restoreTicket();
+ hasDocuware();
});
watch(
diff --git a/src/pages/Ticket/Card/TicketDescriptorProxy.vue b/src/pages/Ticket/Card/TicketDescriptorProxy.vue
index 583ba35e7..8b872733d 100644
--- a/src/pages/Ticket/Card/TicketDescriptorProxy.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorProxy.vue
@@ -1,7 +1,6 @@
-
+
diff --git a/src/pages/Ticket/Card/TicketDmsImportForm.vue b/src/pages/Ticket/Card/TicketDmsImportForm.vue
index 4b6b9c6cd..04cb3d75e 100644
--- a/src/pages/Ticket/Card/TicketDmsImportForm.vue
+++ b/src/pages/Ticket/Card/TicketDmsImportForm.vue
@@ -34,7 +34,7 @@ const importDms = async () => {
dmsId.value = null;
emit('onDataSaved');
} catch (e) {
- throw new Error(e.message);
+ throw e;
}
};
@@ -49,7 +49,7 @@ const importDms = async () => {
@@ -70,7 +70,6 @@ const importDms = async () => {
es:
- Select document id: Introduzca id de gestion documental
Document: Documento
The document indentifier can't be empty: El número de documento no puede estar vacío
diff --git a/src/pages/Ticket/Card/TicketEditMana.vue b/src/pages/Ticket/Card/TicketEditMana.vue
index 266c82ccd..f8a72caf3 100644
--- a/src/pages/Ticket/Card/TicketEditMana.vue
+++ b/src/pages/Ticket/Card/TicketEditMana.vue
@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
import { computed, ref } from 'vue';
import { useRoute } from 'vue-router';
import { toCurrency } from 'src/filters';
-import VnUsesMana from 'components/ui/VnUsesMana.vue';
const $props = defineProps({
newPrice: {
@@ -15,23 +14,36 @@ const $props = defineProps({
type: Object,
default: null,
},
+ componentId: {
+ type: Number,
+ default: null,
+ },
});
+const emit = defineEmits(['save', 'cancel', 'update:componentId']);
+
const route = useRoute();
const mana = ref(null);
-const usesMana = ref(false);
-
-const emit = defineEmits(['save', 'cancel']);
+const usesMana = ref([]);
const { t } = useI18n();
const QPopupProxyRef = ref(null);
-const manaCode = ref($props.manaCode);
+
+const componentId = computed({
+ get: () => $props.componentId,
+ set: (val) => emit('update:componentId', val),
+});
const save = (sale = $props.sale) => {
emit('save', sale);
QPopupProxyRef.value.hide();
};
+const cancel = () => {
+ emit('cancel');
+ QPopupProxyRef.value.hide();
+};
+
const getMana = async () => {
const { data } = await axios.get(`Tickets/${route.params.id}/getDepartmentMana`);
mana.value = data;
@@ -39,15 +51,12 @@ const getMana = async () => {
};
const getUsesMana = async () => {
- const { data } = await axios.get('Sales/usesMana');
+ const { data } = await axios.get('Sales/getComponents');
usesMana.value = data;
};
-const cancel = () => {
- emit('cancel');
- QPopupProxyRef.value.hide();
-};
const hasMana = computed(() => typeof mana.value === 'number');
+
defineExpose({ save });
@@ -59,17 +68,29 @@ defineExpose({ save });
>
-
+
+
+
-
-
+
+
+
+
{{ t('New price') }}
-
- {{ toCurrency($props.newPrice) }}
-
+ {{ toCurrency(newPrice) }}
@@ -77,7 +98,6 @@ defineExpose({ save });
@@ -86,7 +106,6 @@ defineExpose({ save });
-
-
-es:
- New price: Nuevo precio
-
diff --git a/src/pages/Ticket/Card/TicketNotes.vue b/src/pages/Ticket/Card/TicketNotes.vue
index feb88bf84..a3e25d63e 100644
--- a/src/pages/Ticket/Card/TicketNotes.vue
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@@ -38,7 +38,9 @@ function handleDelete(row) {
ticketNotesCrudRef.value.remove([row]);
}
-async function handleSave() {
+async function handleSave(e) {
+ if (e.shiftKey && e.key === 'Enter') return;
+ e.preventDefault();
if (!isSaving.value) {
isSaving.value = true;
await ticketNotesCrudRef.value?.saveChanges();
@@ -70,7 +72,7 @@ async function handleSave() {
store.data?.ticketState?.state?.code);
const transfer = ref({
lastActiveTickets: [],
@@ -99,6 +99,7 @@ const columns = computed(() => [
align: 'left',
label: t('globals.quantity'),
name: 'quantity',
+ class: 'shrink',
format: (row) => toCurrency(row.quantity),
},
{
@@ -186,7 +187,7 @@ const getRowUpdateInputEvents = (sale) => {
};
const resetChanges = async () => {
- arrayData.fetch({ append: false });
+ await arrayData.fetch({ append: false });
tableRef.value.CrudModelRef.hasChanges = false;
await tableRef.value.reload();
@@ -307,14 +308,15 @@ const changePrice = async (sale) => {
if (newPrice != null && newPrice != sale.price) {
if (await isSalePrepared(sale)) {
await confirmUpdate(() => updatePrice(sale, newPrice));
- } else updatePrice(sale, newPrice);
+ } else await updatePrice(sale, newPrice);
}
};
const updatePrice = async (sale, newPrice) => {
try {
- await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
- sale.price = newPrice;
- edit.value = { ...DEFAULT_EDIT };
+ await axios.post(`Sales/${sale.id}/updatePrice`, {
+ newPrice: newPrice,
+ componentId: componentId.value,
+ });
notify('globals.dataSaved', 'positive');
resetChanges();
} catch (e) {
@@ -326,28 +328,31 @@ const changeDiscount = async (sale) => {
const newDiscount = edit.value.discount;
if (newDiscount != null && newDiscount != sale.discount) {
if (await isSalePrepared(sale))
- await confirmUpdate(() => updateDiscount([sale], newDiscount));
- else await updateDiscount([sale], newDiscount);
+ await confirmUpdate(() =>
+ updateDiscount([sale], newDiscount, componentId.value),
+ );
+ else await updateDiscount([sale], newDiscount, componentId.value);
}
};
-const updateDiscounts = async (sales, newDiscount) => {
+const updateDiscounts = async (sales, newDiscount, componentId) => {
const salesTracking = await fetchSalesTracking();
const someSaleIsPrepared = salesTracking.some((sale) =>
matchSale(salesTracking, sale),
);
- if (someSaleIsPrepared) await confirmUpdate(() => updateDiscount(sales, newDiscount));
- else updateDiscount(sales, newDiscount);
+ if (someSaleIsPrepared)
+ await confirmUpdate(() => updateDiscount(sales, newDiscount, componentId));
+ else updateDiscount(sales, newDiscount, componentId);
};
-const updateDiscount = async (sales, newDiscount = 0) => {
+const updateDiscount = async (sales, newDiscount, componentId) => {
try {
const salesIds = sales.map(({ id }) => id);
const params = {
salesIds,
- newDiscount,
- manaCode: manaCode.value,
+ newDiscount: newDiscount ?? 0,
+ componentId,
};
await axios.post(`Tickets/${route.params.id}/updateDiscount`, params);
notify('globals.dataSaved', 'positive');
@@ -768,6 +773,7 @@ watch(
v-model="row.itemFk"
:use-like="false"
@update:model-value="changeItem(row)"
+ autofocus
>
@@ -791,7 +797,7 @@ watch(
{{ row?.item?.subName.toUpperCase() }}
-
+
{
});
if (newDiscount.value != null && hasChanges)
- emit('updateDiscounts', props.sales, newDiscount.value);
+ emit('updateDiscounts', props.sales, newDiscount.value, componentId.value);
btnDropdownRef.value.hide();
};
@@ -206,6 +207,7 @@ const createRefund = async (withWarehouse) => {
ref="editManaProxyRef"
:sale="row"
@save="changeMultipleDiscount"
+ v-model:component-id="componentId"
>
{
const tickets = Array.isArray($props.ticket) ? $props.ticket : [$props.ticket];
- await split(tickets, splitDate.value);
- emit('ticketTransfered', tickets);
+ const results = await split(tickets, splitDate.value);
+ notifyResults(results, 'ticketFk');
+ emit('ticketTransferred', tickets);
};
-
+
diff --git a/src/pages/Ticket/Card/TicketTracking.vue b/src/pages/Ticket/Card/TicketTracking.vue
index 00610de44..06171366d 100644
--- a/src/pages/Ticket/Card/TicketTracking.vue
+++ b/src/pages/Ticket/Card/TicketTracking.vue
@@ -1,27 +1,23 @@
-
-
-
-
-
-
-
- {{ row.user?.name }}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
- {{ t('tracking.addState') }}
-
-
-
+
+
+
+
+ {{ row.user.name }}
+
+
+
+
+
+ es:
+ Create tracking: Crear estado
+
diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue
index ffa964c92..c096dee21 100644
--- a/src/pages/Ticket/Card/TicketTransfer.vue
+++ b/src/pages/Ticket/Card/TicketTransfer.vue
@@ -5,7 +5,7 @@ import VnInput from 'src/components/common/VnInput.vue';
import TicketTransferForm from './TicketTransferForm.vue';
import { toDateFormat } from 'src/filters/date.js';
-const emit = defineEmits(['ticketTransfered']);
+const emit = defineEmits(['ticketTransferred']);
const $props = defineProps({
mana: {
diff --git a/src/pages/Ticket/Card/TicketTransferProxy.vue b/src/pages/Ticket/Card/TicketTransferProxy.vue
index 7d5d82f85..af3b13990 100644
--- a/src/pages/Ticket/Card/TicketTransferProxy.vue
+++ b/src/pages/Ticket/Card/TicketTransferProxy.vue
@@ -1,8 +1,8 @@
-
+
route.params.id);
@@ -84,6 +85,7 @@ function reloadData() {
initialData.value.deviceProductionFk = null;
initialData.value.simFk = null;
tableRef.value.reload();
+ getAvailablePdaRef.value.fetch();
}
async function fetchDocuware() {
@@ -135,6 +137,7 @@ async function deallocatePDA(deviceProductionFk) {
);
delete tableRef.value.CrudModelRef.formData[index];
notify(t('PDA deallocated'), 'positive');
+ await getAvailablePdaRef.value.fetch();
}
function isSigned(row) {
@@ -144,6 +147,7 @@ function isSigned(row) {
- {{ t('worker.pda.download') }}
+ {{ t('globals.downloadPdf') }}
@@ -307,4 +311,5 @@ es:
This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario
Are you sure you want to send it?: ¿Seguro que quieres enviarlo?
Sign PDA: Firmar PDA
+ PDF sended to signed: PDF enviado para firmar
diff --git a/src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue b/src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue
index c793e9319..de3b5d585 100644
--- a/src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue
+++ b/src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue
@@ -11,7 +11,7 @@ const $props = defineProps({
-
+
!val && delete data.payMethodFk
"
/>
-
-
-
- {{
- t('components.iban_tooltip')
- }}
-
-
-
+ @update-bic="
+ (bankEntityFk) => (data.bankEntityFk = bankEntityFk)
+ "
+ />
diff --git a/src/pages/Zone/Card/ZoneDescriptor.vue b/src/pages/Zone/Card/ZoneDescriptor.vue
index f2bcc1247..a6ec86355 100644
--- a/src/pages/Zone/Card/ZoneDescriptor.vue
+++ b/src/pages/Zone/Card/ZoneDescriptor.vue
@@ -27,7 +27,7 @@ const entityId = computed(() => {
-
+
diff --git a/src/pages/Zone/Card/ZoneDescriptorProxy.vue b/src/pages/Zone/Card/ZoneDescriptorProxy.vue
index 27102ac07..a16d231e6 100644
--- a/src/pages/Zone/Card/ZoneDescriptorProxy.vue
+++ b/src/pages/Zone/Card/ZoneDescriptorProxy.vue
@@ -11,7 +11,7 @@ const $props = defineProps({
-
+
diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
index 582a8bbad..89a6e02f8 100644
--- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@@ -68,7 +68,7 @@ const arrayData = useArrayData('ZoneEvents');
const exclusionGeoCreate = async () => {
const params = {
zoneFk: parseInt(route.params.id),
- date: dated,
+ date: dated.value,
geoIds: tickedNodes.value,
};
await axios.post('Zones/exclusionGeo', params);
@@ -101,9 +101,17 @@ const exclusionCreate = async () => {
const existsEvent = data.events.find(
(event) => toDateFormat(event.dated) === toDateFormat(dated.value),
);
+ const existsGeoEvent = data.geoExclusions.find(
+ (event) => toDateFormat(event.dated) === toDateFormat(dated.value),
+ );
if (existsEvent) {
await axios.delete(`Zones/${existsEvent?.zoneFk}/events/${existsEvent?.id}`);
}
+ if (existsGeoEvent) {
+ await axios.delete(
+ `Zones/${existsGeoEvent?.zoneFk}/exclusions/${existsGeoEvent?.zoneExclusionFk}`,
+ );
+ }
if (isNew.value || props.event?.type) await axios.post(`${url}`, [body]);
else await axios.put(`${url}/${props.event?.id}`, body);
@@ -122,8 +130,21 @@ const onSubmit = async () => {
const deleteEvent = async () => {
if (!props.event) return;
- const exclusionId = props.event?.zoneExclusionFk || props.event?.id;
- await axios.delete(`Zones/${route.params.id}/exclusions/${exclusionId}`);
+ if (!props.event.created) {
+ const filter = {
+ where: {
+ dated: dated.value,
+ },
+ };
+ const params = { filter: JSON.stringify(filter) };
+ const { data: res } = await axios.get(`Zones/${route.params.id}/exclusions`, {
+ params,
+ });
+ if (res) await axios.delete(`Zones/${route.params.id}/exclusions/${res[0].id}`);
+ } else {
+ const exclusionId = props.event?.zoneExclusionFk || props.event?.id;
+ await axios.delete(`Zones/${route.params.id}/exclusions/${exclusionId}`);
+ }
await refetchEvents();
};
@@ -135,7 +156,7 @@ const refetchEvents = async () => {
};
onMounted(() => {
- if (props.event) {
+ if (props.event && props.event.dated) {
dated.value = props.event?.dated;
excludeType.value =
props.eventType === 'geoExclusion' ? 'specificLocations' : 'all';
diff --git a/src/pages/Zone/Card/ZoneEventInclusionForm.vue b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
index 8b02c2d84..fad51765c 100644
--- a/src/pages/Zone/Card/ZoneEventInclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
@@ -56,6 +56,7 @@ const isNew = computed(() => props.isNewMode);
const eventInclusionFormData = ref({ wdays: [] });
const dated = ref(props.date || Date.vnNew());
const _inclusionType = ref('indefinitely');
+const hasDeletedEvent = ref(false);
const inclusionType = computed({
get: () => _inclusionType.value,
set: (val) => {
@@ -84,7 +85,7 @@ const createEvent = async () => {
}
const zoneIds = props.zoneIds?.length ? props.zoneIds : [route.params.id];
- for (const id of zoneIds) {
+ for (const zoneId of zoneIds) {
let today = eventInclusionFormData.value.dated
? moment(eventInclusionFormData.value.dated)
: moment(dated.value);
@@ -92,7 +93,7 @@ const createEvent = async () => {
const { data } = await axios.get(`Zones/getEventsFiltered`, {
params: {
- zoneFk: id,
+ zoneFk: zoneId,
started: today,
ended: lastDay,
},
@@ -106,15 +107,19 @@ const createEvent = async () => {
await axios.delete(
`Zones/${existsExclusion?.zoneFk}/exclusions/${existsExclusion?.id}`,
);
+ await refetchEvents();
+ hasDeletedEvent.value = true;
}
- if (isNew.value)
- await axios.post(`Zones/${id}/events`, eventInclusionFormData.value);
+ delete eventInclusionFormData.value.id;
+ if (isNew.value || hasDeletedEvent.value)
+ await axios.post(`Zones/${zoneId}/events`, eventInclusionFormData.value);
else
await axios.put(
- `Zones/${id}/events/${props.event?.id}`,
+ `Zones/${zoneId}/events/${props.event?.id}`,
eventInclusionFormData.value,
);
+ hasDeletedEvent.value = false;
}
quasar.notify({
message: t('globals.dataSaved'),
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index 8d7c4a165..355eb900e 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -93,6 +93,7 @@ const columns = computed(() => [
optionLabel: 'name',
optionValue: 'id',
},
+ columnClass: 'expand',
},
{
align: 'left',
@@ -247,74 +248,70 @@ const closeEventForm = () => {
-
-
-
-
- {{ dashIfEmpty(formatRow(row)) }}
-
-
-
-
-
-
-
-
-
-
-
-
-