diff --git a/src/utils/date.ts b/src/utils/date.ts index fa04e16a..7ebb478f 100644 --- a/src/utils/date.ts +++ b/src/utils/date.ts @@ -41,11 +41,14 @@ export default { const date = this.getBaseDate(dateTime); // Get day, month and year - const mm = (`0${date.getMonth() + 1}`).slice(-2); // Current month const dd = (`0${date.getDate()}`).slice(-2); // Current day + const mm = (`0${date.getMonth() + 1}`).slice(-2); // Current month const yyyy = date.getFullYear(); // Year switch (format) { + case 'dd/mm/yyyy': + return `${dd}/${mm}/${yyyy}`; + case 'mm/dd/yyyy': return `${mm}/${dd}/${yyyy}`; diff --git a/src/versions/develop/pages/BO/catalog/discounts/index.ts b/src/versions/develop/pages/BO/catalog/discounts/index.ts index 4d570b7a..a3c58719 100644 --- a/src/versions/develop/pages/BO/catalog/discounts/index.ts +++ b/src/versions/develop/pages/BO/catalog/discounts/index.ts @@ -346,7 +346,24 @@ class BOCartRulesPage extends BOBasePage implements BOCartRulesPageInterface { switch (filterType) { case 'input': - await this.setValue(page, this.filterColumn(filterBy), value); + if (['date_from', 'date_to'].includes(filterBy)) { + let filterByColumn: string = filterBy; + filterByColumn = filterBy === 'date_from' ? 'date_to[0]' : filterByColumn; + filterByColumn = filterByColumn === 'date_to' ? 'date_to[1]' : filterByColumn; + + await page.evaluate((args: {inputSelector: string, inputValue: string}) => { + const inputElement = document.querySelector(args.inputSelector); + + if (inputElement) { + (inputElement as HTMLInputElement).value = args.inputValue; + } + }, { + inputSelector: this.filterColumn(filterByColumn), + inputValue: value, + }); + } else { + await this.setValue(page, this.filterColumn(filterBy), value); + } await this.clickAndWaitForURL(page, this.filterSearchButton); break;