diff --git a/Jenkinsfile b/Jenkinsfile
index 71a7aa25f..c5424ee27 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -125,7 +125,7 @@ pipeline {
always {
sh "docker-compose ${env.COMPOSE_PARAMS} down -v"
junit(
- testResults: 'junit/e2e.xml',
+ testResults: 'junit/e2e-*.xml',
allowEmptyResults: true
)
}
diff --git a/cypress.config.js b/cypress.config.js
index dfe963a12..5cf075e2a 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -6,7 +6,7 @@ if (process.env.CI) {
urlHost = 'front';
reporter = 'junit';
reporterOptions = {
- mochaFile: 'junit/e2e.xml',
+ mochaFile: 'junit/e2e-[hash].xml',
toConsole: false,
};
} else {
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index c1e541abb..d768c0256 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -310,8 +310,14 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
if (evt?.shiftKey && added) {
const rowIndex = selectedRows[0].$index;
const selectedIndexes = new Set(selected.value.map((row) => row.$index));
- for (const row of rows) {
- if (row.$index == rowIndex) break;
+ const minIndex = selectedIndexes.size
+ ? Math.min(...selectedIndexes, rowIndex)
+ : 0;
+ const maxIndex = Math.max(...selectedIndexes, rowIndex);
+
+ for (let i = minIndex; i <= maxIndex; i++) {
+ const row = rows[i];
+ if (row.$index == rowIndex) continue;
if (!selectedIndexes.has(row.$index)) {
selected.value.push(row);
selectedIndexes.add(row.$index);
diff --git a/src/components/VnTable/__tests__/VnTable.spec.js b/src/components/VnTable/__tests__/VnTable.spec.js
index 74ba06987..e5e38a63c 100644
--- a/src/components/VnTable/__tests__/VnTable.spec.js
+++ b/src/components/VnTable/__tests__/VnTable.spec.js
@@ -27,30 +27,58 @@ describe('VnTable', () => {
beforeEach(() => (vm.selected = []));
describe('handleSelection()', () => {
- const rows = [{ $index: 0 }, { $index: 1 }, { $index: 2 }];
- const selectedRows = [{ $index: 1 }];
- it('should add rows to selected when shift key is pressed and rows are added except last one', () => {
+ const rows = [
+ { $index: 0 },
+ { $index: 1 },
+ { $index: 2 },
+ { $index: 3 },
+ { $index: 4 },
+ ];
+
+ it('should add rows to selected when shift key is pressed and rows are added in ascending order', () => {
+ const selectedRows = [{ $index: 1 }];
vm.handleSelection(
{ evt: { shiftKey: true }, added: true, rows: selectedRows },
- rows
+ rows,
);
expect(vm.selected).toEqual([{ $index: 0 }]);
});
+ it('should add rows to selected when shift key is pressed and rows are added in descending order', () => {
+ const selectedRows = [{ $index: 3 }];
+ vm.handleSelection(
+ { evt: { shiftKey: true }, added: true, rows: selectedRows },
+ rows,
+ );
+ expect(vm.selected).toEqual([{ $index: 0 }, { $index: 1 }, { $index: 2 }]);
+ });
+
it('should not add rows to selected when shift key is not pressed', () => {
+ const selectedRows = [{ $index: 1 }];
vm.handleSelection(
{ evt: { shiftKey: false }, added: true, rows: selectedRows },
- rows
+ rows,
);
expect(vm.selected).toEqual([]);
});
it('should not add rows to selected when rows are not added', () => {
+ const selectedRows = [{ $index: 1 }];
vm.handleSelection(
{ evt: { shiftKey: true }, added: false, rows: selectedRows },
- rows
+ rows,
);
expect(vm.selected).toEqual([]);
});
+
+ it('should add all rows between the smallest and largest selected indexes', () => {
+ vm.selected = [{ $index: 1 }, { $index: 3 }];
+ const selectedRows = [{ $index: 4 }];
+ vm.handleSelection(
+ { evt: { shiftKey: true }, added: true, rows: selectedRows },
+ rows,
+ );
+ expect(vm.selected).toEqual([{ $index: 1 }, { $index: 3 }, { $index: 2 }]);
+ });
});
});
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 30e4135e2..8607d9694 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -204,8 +204,9 @@ async function search() {
}
:deep(.q-field--focused) {
- .q-icon {
- color: black;
+ .q-icon,
+ .q-placeholder {
+ color: var(--vn-black-text-color);
}
}
diff --git a/src/pages/Entry/EntryBuysTableDialog.vue b/src/pages/Entry/EntryBuysTableDialog.vue
index 86a9b018f..7a6c4ac43 100644
--- a/src/pages/Entry/EntryBuysTableDialog.vue
+++ b/src/pages/Entry/EntryBuysTableDialog.vue
@@ -65,7 +65,7 @@ const entriesTableColumns = computed(() => [
]);
function downloadCSV(rows) {
- const headers = ['id', 'itemFk', 'name', 'stickers', 'packing', 'comment'];
+ const headers = ['id', 'itemFk', 'name', 'stickers', 'packing', 'grouping', 'comment'];
const csvRows = rows.map((row) => {
const buy = row;
@@ -77,6 +77,7 @@ function downloadCSV(rows) {
item.name || '',
buy.stickers,
buy.packing,
+ buy.grouping,
item.comment || '',
].join(',');
});
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index a4c58ef4b..84e07a293 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -120,22 +120,9 @@ const updateStock = async () => {
-
-
-
-
+
+
+
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index e3864af73..cc16af72c 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -203,7 +203,7 @@ const updateQuantity = async (sale) => {
sale.isNew = false;
await axios.post(`Sales/${id}/updateQuantity`, { quantity });
notify('globals.dataSaved', 'positive');
- tableRef.value.reload();
+ resetChanges();
} catch (e) {
const { quantity } = tableRef.value.CrudModelRef.originalData.find(
(s) => s.id === sale.id,
@@ -247,7 +247,7 @@ const updateConcept = async (sale) => {
const data = { newConcept: sale.concept };
await axios.post(`Sales/${sale.id}/updateConcept`, data);
notify('globals.dataSaved', 'positive');
- tableRef.value.reload();
+ resetChanges();
};
const DEFAULT_EDIT = {
@@ -298,7 +298,7 @@ const updatePrice = async (sale, newPrice) => {
sale.price = newPrice;
edit.value = { ...DEFAULT_EDIT };
notify('globals.dataSaved', 'positive');
- tableRef.value.reload();
+ resetChanges();
};
const changeDiscount = async (sale) => {
@@ -330,7 +330,7 @@ const updateDiscount = async (sales, newDiscount = null) => {
};
await axios.post(`Tickets/${route.params.id}/updateDiscount`, params);
notify('globals.dataSaved', 'positive');
- tableRef.value.reload();
+ resetChanges();
};
const getNewPrice = computed(() => {
@@ -398,7 +398,7 @@ const removeSales = async () => {
await axios.post('Sales/deleteSales', params);
removeSelectedSales();
notify('globals.dataSaved', 'positive');
- window.location.reload();
+ resetChanges();
};
const setTransferParams = async () => {
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 78bebc297..60e80a6be 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -251,7 +251,7 @@ const fetchAvailableAgencies = async (formData) => {
const { options, agency } = response;
if (options) agenciesOptions.value = options;
- if (agency) formData.agencyModeId = agency;
+ if (agency) formData.agencyModeId = agency.agencyModeFk;
};
const fetchClient = async (formData) => {