verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

Merge pull request 'change applyFilters' (!1636) from hotfix-filterScopeDays into test
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #1636
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
Carlos Satorres 2023-06-26 11:12:33 +00:00
parent ecf742959c 878e9c4fe9
commit 15e39b5fec
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e2e/paths/10-travel/03_descriptor.spec.js
View File

@ -9,7 +9,7 @@ describe('Travel descriptor path', () => {
browser = await getBrowser(); browser = await getBrowser();
page = browser.page; page = browser.page;
await page.loginAndModule('buyer', 'travel'); await page.loginAndModule('buyer', 'travel');
await page.write(selectors.travelIndex.generalSearchFilter, '1'); await page.write(selectors.travelIndex.generalSearchFilter, '3');
await page.keyboard.press('Enter'); await page.keyboard.press('Enter');
await page.waitForState('travel.card.summary'); await page.waitForState('travel.card.summary');
}); });
@ -23,7 +23,7 @@ describe('Travel descriptor path', () => {
await page.waitForState('travel.index'); await page.waitForState('travel.index');
const result = await page.countElement(selectors.travelIndex.anySearchResult); const result = await page.countElement(selectors.travelIndex.anySearchResult);
expect(result).toBeGreaterThanOrEqual(7); expect(result).toBeGreaterThanOrEqual(1);
}); });
it('should navigate to the first search result', async() => { it('should navigate to the first search result', async() => {

10
modules/travel/front/search-panel/index.js
View File

@ -37,6 +37,16 @@ class Controller extends SearchPanel {
} }
applyFilters(param) { applyFilters(param) {
if (typeof this.filter.scopeDays === 'number') {
const shippedFrom = Date.vnNew();
shippedFrom.setHours(0, 0, 0, 0);
const shippedTo = new Date(shippedFrom.getTime());
shippedTo.setDate(shippedTo.getDate() + this.filter.scopeDays);
shippedTo.setHours(23, 59, 59, 999);
Object.assign(this.filter, {shippedFrom, shippedTo});
}
this.model.applyFilter({}, this.filter) this.model.applyFilter({}, this.filter)
.then(() => { .then(() => {
if (param && this.model._orgData.length === 1) if (param && this.model._orgData.length === 1)