raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix timezone date parsing from Angular form fields

Browse Source
This commit is contained in:
Matt-Yorkley
2019-08-30 13:31:09 +01:00
parent a72c662b97
commit 37e50a68e4
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/spree/product_decorator.rb
View File

@@ -56,9 +56,10 @@ Spree::Product.class_eval do
ON (o_order_cycles.id = o_exchanges.order_cycle_id)")
}
scope :imported_on, lambda { |date|
import_date = date.to_datetime
joins(:variants).merge(Spree::Variant.where(import_date: import_date..import_date + 24.hours))
scope :imported_on, lambda { |import_date|
import_date = Time.zone.parse import_date if import_date.is_a? String
import_date = import_date.to_date
joins(:variants).merge(Spree::Variant.where(import_date: import_date.beginning_of_day..import_date.end_of_day))
}
scope :with_order_cycles_inner, -> {