diff --git a/app/frontend/src/javascript/controllers/admin/invoices.js b/app/frontend/src/javascript/controllers/admin/invoices.js index b3e436405..68f0fa146 100644 --- a/app/frontend/src/javascript/controllers/admin/invoices.js +++ b/app/frontend/src/javascript/controllers/admin/invoices.js @@ -824,11 +824,12 @@ Application.Controllers.controller('InvoicesController', ['$scope', '$state', 'I * @param [concat] {boolean} if true, the result will be append to $scope.invoices instead of being affected */ const invoiceSearch = function (concat) { + const date = $scope.searchInvoice.date ? $scope.searchInvoice.date.toISOString().slice(0, 10) : null; Invoice.list({ query: { number: $scope.searchInvoice.reference, customer: $scope.searchInvoice.name, - date: $scope.searchInvoice.date, + date, order_by: $scope.orderInvoice, page: $scope.page, size: INVOICES_PER_PAGE diff --git a/app/services/invoices_service.rb b/app/services/invoices_service.rb index ac63809e6..0d0f42346 100644 --- a/app/services/invoices_service.rb +++ b/app/services/invoices_service.rb @@ -29,10 +29,9 @@ class InvoicesService ) end unless filters[:date].nil? - invoices = invoices.where( - "date_trunc('day', invoices.created_at) = :search", - search: "%#{Time.iso8601(filters[:date]).in_time_zone.to_date}%" - ) + start_at = Date.parse(filters[:date]).in_time_zone + end_at = start_at.end_of_day + invoices = invoices.where(created_at: (start_at..end_at)) end invoices