spree_delivery_options 2.1.14 → 2.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70decd42b26f74b7a0a7d84043020dbe632df58d
-  data.tar.gz: e17addd9a179aa381bd5bfd427f88dbda6321708
+  metadata.gz: c2eb54e36ae6b539d55955a467ef7e86ffb8af66
+  data.tar.gz: 61f422e99c631a7aa68b5dccd6cdde06630b86e5
 SHA512:
-  metadata.gz: c31efcc66ff517e21b6c7357551171040bbe451b2079c72d9cd0a3629f1adf216dcc210c8aa9713be8a3397e6dd38791cc8d8346423c2aa6183c8399efdc7a2b
-  data.tar.gz: 7eb69bacd16dbafe1aad5fcca17ce831967462a16f236daec2ba496422fd68f179d2d606fe568356395f0852c0a03831b61ab76aefd71f9c33f37ef2fcc45797
+  metadata.gz: b83c9fd7738ded9a7dcfc8c0408845a3f8ba943a2edf6a6ccad71748bb63dd7281d437f23d8f78f3f4a2065343f8ca9c979133cd7f3a1c03822bcae9aeb955b6
+  data.tar.gz: 6f9e9e7b63c452b54168636945b3a2206fa539f4470f062ec8e1f74852700fd4785e9b11da2dda48e94b492d9f65f8f42784f54a73a77a4d4bc91e9642235fd4

data/app/helpers/spree/application_helper_decorator.rb

@@ -0,0 +1,3 @@
+ApplicationHelper.class_eval do
+  include SpreeDeliveryOptions::BaseHelper
+end

data/app/helpers/spree_delivery_options/base_helper.rb

@@ -0,0 +1,34 @@
+module SpreeDeliveryOptions
+  module BaseHelper
+
+    def next_delivery_slot
+      delivery_options = JSON.parse(SpreeDeliveryOptions::Config.delivery_time_options)
+
+      delivery_day = next_delivery_day
+      return "" unless delivery_day
+
+      "#{delivery_day.strftime('%A').titleize} between #{delivery_options[delivery_day.strftime('%A').downcase].first}"
+    end
+
+    def next_delivery_day
+      delivery_options = JSON.parse(SpreeDeliveryOptions::Config.delivery_time_options)
+
+      cutoff_time = Time.now.change(hour: SpreeDeliveryOptions::Config.delivery_cut_off_hour)
+
+      current_day = Time.now > cutoff_time ? (Date.today + 2.days) : Date.tomorrow
+      next_available_day = nil
+      counter = 0
+
+      until next_available_day || counter > 7 do
+        if delivery_options[current_day.strftime('%A').downcase]
+          next_available_day = current_day
+        else
+          current_day = current_day + 1.day
+          counter = counter + 1
+        end
+      end
+      next_available_day
+    end
+
+  end
+end

data/lib/spree_delivery_options/engine.rb

@@ -21,6 +21,9 @@ module SpreeDeliveryOptions
       Dir.glob(File.join(File.dirname(__FILE__), '../../app/controllers/**/*.rb')) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
       end
+      Dir.glob(File.join(File.dirname(__FILE__), '../../app/helpers/**.rb')) do |c|
+        Rails.configuration.cache_classes ? require(c) : load(c)
+      end
       Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*decorator*.rb')) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
       end

data/spec/helpers/spree_delivery_options/base_helper_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe SpreeDeliveryOptions::BaseHelper do
+
+  describe 'next delivery slot' do
+
+    it 'should return first slot for tomorrow if its before cutoff time' do
+      SpreeDeliveryOptions::Config.delivery_time_options = {monday: ['6am-7am', '7am-9am'], tuesday: ['9am-12pm']}.to_json
+      time_now = DateTime.parse("10/03/2014 #{SpreeDeliveryOptions::Config.delivery_cut_off_hour-1}:00 +1100")
+      Timecop.freeze(time_now)
+
+      helper.next_delivery_slot.should == 'Tuesday between 9am-12pm'
+      Timecop.return
+    end
+
+    it 'should return the day after tomorrow morning if its after cutoff time' do
+      SpreeDeliveryOptions::Config.delivery_time_options = {monday: ['6am-7am', '7am-9am'], tuesday: ['9am-12pm'], wednesday: ['9am-12pm']}.to_json
+      time_now = DateTime.parse("10/03/2014 #{SpreeDeliveryOptions::Config.delivery_cut_off_hour+1}:00 +1100")
+      Timecop.freeze(time_now)
+
+      helper.next_delivery_slot.should == 'Wednesday between 9am-12pm'
+      Timecop.return
+    end
+
+    it 'should skip day if deliveries are not available' do
+      SpreeDeliveryOptions::Config.delivery_time_options = {monday: ['6am-7am', '7am-9am'], tuesday: ['9am-12pm'], wednesday: ['9am-12pm']}.to_json
+      time_now = DateTime.parse("13/03/2014 #{SpreeDeliveryOptions::Config.delivery_cut_off_hour+1}:00 +1100")
+      Timecop.freeze(time_now)
+
+      helper.next_delivery_slot.should == 'Monday between 6am-7am'
+      Timecop.return
+    end
+
+    it 'should return nil if no delivery times are avaialble' do
+      SpreeDeliveryOptions::Config.delivery_time_options = {}.to_json
+      time_now = DateTime.parse("13/03/2014 #{SpreeDeliveryOptions::Config.delivery_cut_off_hour+1}:00 +1100")
+      Timecop.freeze(time_now)
+
+      helper.next_delivery_slot.should == ''
+      Timecop.return
+    end
+
+  end
+
+end

data/spree_delivery_options.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_delivery_options'
-  s.version     = '2.1.14'
+  s.version     = '2.1.15'
   s.summary     = 'Adds delivery date and time during checkout'
   s.description = ''
   s.required_ruby_version = '>= 2.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_delivery_options
 version: !ruby/object:Gem::Version
-  version: 2.1.14
+  version: 2.1.15
 platform: ruby
 authors:
 - Francisco Trindade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -231,6 +231,8 @@ files:
 - app/assets/stylesheets/store/jquery-ui-1.10.4.custom.css
 - app/assets/stylesheets/store/spree_delivery_options.css
 - app/controllers/spree/admin/orders/delivery_options_controller.rb
+- app/helpers/spree/application_helper_decorator.rb
+- app/helpers/spree_delivery_options/base_helper.rb
 - app/models/spree/order_decorator.rb
 - app/overrides/add_delivery_info_to_order_details.rb
 - app/overrides/add_delivery_options_link_order_page.rb
@@ -259,6 +261,7 @@ files:
 - lib/spree_delivery_options/engine.rb
 - script/rails
 - spec/controllers/spree/admin/orders/delivery_options_controller_spec.rb
+- spec/helpers/spree_delivery_options/base_helper_spec.rb
 - spec/models/order_spec.rb
 - spec/spec_helper.rb
 - spree_delivery_options.gemspec
@@ -288,5 +291,6 @@ specification_version: 4
 summary: Adds delivery date and time during checkout
 test_files:
 - spec/controllers/spree/admin/orders/delivery_options_controller_spec.rb
+- spec/helpers/spree_delivery_options/base_helper_spec.rb
 - spec/models/order_spec.rb
 - spec/spec_helper.rb