zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-19 02:39:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

110145900-date_conflict_fixed

Browse source
This commit is contained in:
Stas 2015-12-18 16:53:55 +02:00
parent a59d61aa44
commit 5e05aee1c8
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/pricelist.rb
View file

@ -31,7 +31,7 @@ class Pricelist < ActiveRecord::Base
def pricelist_for(zone, operation, period) def pricelist_for(zone, operation, period)
lists = valid.where(category: zone, operation_category: operation, duration: period) lists = valid.where(category: zone, operation_category: operation, duration: period)
return lists.first if lists.count == 1 return lists.first if lists.count == 1
lists.where('valid_to IS NOT NULL').order(valid_from: :desc).first lists.order(valid_from: :desc).first
end end
end end
end end