Permalink
Browse files

Changed 'and' to '&&'

  • Loading branch information...
1 parent 4554a1b commit 7d1e8a1fafb7b90dd5fc2bd10d0b38dc41b7d9ea Dave Rooney committed Mar 15, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/active_shipping/shipping/carriers/fedex.rb
@@ -305,7 +305,7 @@ def delivery_range_from(transit_time, max_transit_time, delivery_timestamp, opti
delivery_range = [delivery_timestamp, delivery_timestamp]
#if there's no delivery timestamp but we do have a transit time, use it
- if delivery_timestamp.blank? and transit_time.present?
+ if delivery_timestamp.blank? && transit_time.present?
transit_range = parse_transit_times([transit_time,max_transit_time.presence || transit_time])
delivery_range = transit_range.map{|days| business_days_from(ship_date(options[:turn_around_time]), days)}
end

0 comments on commit 7d1e8a1

Please sign in to comment.