Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,16 @@
</sw-highlight-text>
</template>
</sw-entity-single-select>
<sw-datepicker
:label="$tc('frosh-mail-archive.list.sidebar.filters.dateFrom')"
v-model:value="filter.dateFrom"
dateType="date"
></sw-datepicker>
<sw-datepicker
:label="$tc('frosh-mail-archive.list.sidebar.filters.dateTo')"
v-model:value="filter.dateTo"
dateType="date"
></sw-datepicker>
<sw-button
variant="ghost"
@click="resetFilter"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ Component.register('frosh-mail-archive-index', {
transportState: null,
customerId: null,
term: null,
dateFrom: null,
dateTo: null,
},
selectedItems: {},
};
Expand Down Expand Up @@ -151,6 +153,21 @@ Component.register('frosh-mail-archive-index', {
criteria.setTerm(this.filter.term);
}

if (this.filter.dateFrom) {
criteria.addFilter(
Criteria.range('createdAt', { gte: this.filter.dateFrom })
);
}

if (this.filter.dateTo) {
// Add one day to include the entire "to" date
const dateTo = new Date(this.filter.dateTo);
dateTo.setDate(dateTo.getDate() + 1);
criteria.addFilter(
Criteria.range('createdAt', { lt: dateTo.toISOString() })
);
}

criteria.addSorting(Criteria.sort('createdAt', 'DESC'));

return this.mailArchiveRepository
Expand Down Expand Up @@ -219,8 +236,11 @@ Component.register('frosh-mail-archive-index', {
resetFilter() {
this.filter = {
salesChannelId: null,
transportState: null,
customerId: null,
term: null,
dateFrom: null,
dateTo: null,
};
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
"salesChannel": "Verkaufskanal",
"transportStateLabel": "Status",
"transportStatePlaceholder": "Status auswählen",
"dateFrom": "Datum von",
"dateTo": "Datum bis",
"resetFilter": "Filter zurücksetzen"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
"salesChannel": "Sales Channel",
"transportStateLabel": "State",
"transportStatePlaceholder": "Select state",
"dateFrom": "Date from",
"dateTo": "Date to",
"resetFilter": "Reset filter"
}
}
Expand Down