spree_delivery_options 2.2.8 → 2.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 632e270bb1dff806503365bb70f806b2ebe304b4
-  data.tar.gz: 2656de02711cbcf5177606224145b6c18ca6ac2f
+  metadata.gz: 4f5a03d996f7cadc0ca14c68db26a316930675b2
+  data.tar.gz: 937419643b561f2e352ffe2f4d77d00528722f85
 SHA512:
-  metadata.gz: cde0b744c696b162fbfa4fdd6f0f6e7df8c75dafac7052992ce3093ca97232ed936e6c52975fddbb3f08e9599d5bfd7f576f86d2da1aecd0585c6e5641b29d06
-  data.tar.gz: 8fdfc598b17bfd9e78857f05636023e34948e7c78e873251b288bf73b80bfff9477dc5587459659e69f4cfd343184644a1a4bf8485edd664d5a1b959c9d4b8be
+  metadata.gz: 98a2fb5a4c6423a9f8757fbb068e0192bf77fa3c0470f797c6872d1ee29628673f7d1c906cd3cd8e953b13a654f7bb5ebd074b93f639b3a900841f12b19e7cf2
+  data.tar.gz: cb798df4efe3417f322e4a4eb89c1d93ad01f520d849832b0a2506f6df34019586e74c437a84cb6396e7dc61c3ca87cd87eaa983b1a21f1c4bb6dad06d947fb3

data/README.md

@@ -44,17 +44,25 @@ Configuration
 Both the delivery cut off hour and the delivery time options can be configured in your application.rb file
 
      config.after_initialize do
-        delivery_time_options = {
-          monday: ["Before 6am", "9-12 am"],
-          tuesday: ["Before 6am", "9-12 am"]
-        }.to_json
+        delivery_time_options = [
+          { 13:00 =>
+            {
+              monday: ["Before 6am", "9-12 am"],
+              tuesday: ["Before 6am", "9-12 am"]
+            }
+          }
+        ].to_json
         SpreeDeliveryOptions::Config.delivery_time_options = delivery_time_options
-        SpreeDeliveryOptions::Config.delivery_cut_off_hour = 12
       end
 
 The delivery options for any weekday can be overriden by specifying a date in dd/mm/yyyy format (i.e. for different times in public holidays). 
 
-        delivery_time_options = {
-          '02/02/2014' => ["Before 6am", "9-12 am"],
-          tuesday: ["Before 6am", "9-12 am"]
-        }.to_json
+      delivery_time_options = [
+        { 13:00 =>
+          {
+            "12/02/2014"  => ["9-12am"],
+            monday: ["Before 6am", "9-12 am"],
+            tuesday: ["Before 6am", "9-12 am"]
+          }
+        }
+      ].to_json

data/app/assets/javascripts/spree/backend/delivery_time_options.js

@@ -12,20 +12,35 @@ function SpreeDeliveryOptions() {
     }
   };
 
+  this.parseDeliveryOptions = function(deliveryDate) {
+    var deliveryTimeGroups = $.parseJSON($('.delivery-time-options').attr("data"));
+    var result;
+    var baselineTime = "00:01";
+
+    $.each(deliveryTimeGroups[0], function(index, value) {
+      if (baselineTime < index)
+        {
+          result = value;
+          return false;
+        }
+    });
+    return result;
+  };
+
   this.update_delivery_time_options = function() {
-    var deliveryTimeOptions = $.parseJSON($('.delivery-time-options').attr("data"));
+    var dateParts = []
+    if ($('#order_delivery_date').val().indexOf('/') !== -1) {
+      dateParts = $('#order_delivery_date').val().split('/')
+    } else {
+      dateParts = $('#order_delivery_date').val().split('-')
+    }
+    var deliveryDate = this.convertDateFormat(dateParts);
+    var deliveryTimeOptions = this.parseDeliveryOptions(deliveryDate);
 
     if (deliveryTimeOptions){
       weekdays = ['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday'];
 
-      var dateParts = []
-      if ($('#order_delivery_date').val().indexOf('/') !== -1) {
-        dateParts = $('#order_delivery_date').val().split('/')
-      } else {
-        dateParts = $('#order_delivery_date').val().split('-')
-      }
 
-      var deliveryDate = this.convertDateFormat(dateParts);
       var dayOptions = [];
       if (deliveryTimeOptions[deliveryDate]) {
         dayOptions = deliveryTimeOptions[deliveryDate];

data/app/assets/javascripts/spree/backend/spree_delivery_options.js

@@ -1,2 +1,3 @@
 //= require jquery
+//= require moment_js/moment.min
 //= require spree/backend/delivery_time_options

data/app/assets/javascripts/spree/frontend/delivery_time_options.js

@@ -17,14 +17,35 @@ function SpreeDeliveryOptions() {
     });
   };
 
+  this.parseDeliveryOptions = function(deliveryDate) {
+    var deliveryTimeGroups = $.parseJSON($('.delivery-time-options').attr("data"));
+    var result;
+
+    var baselineTime = moment().format('H:mm');
+
+    var tomorrow = moment().add('days', 1);
+    if (moment(deliveryDate, "DD-MM-YYYY").isAfter(tomorrow)) {
+      baselineTime = "00:01";
+    }
+
+    $.each(deliveryTimeGroups[0], function(index, value) {
+      if (baselineTime < index)
+        {
+          result = value;
+          return false;
+        }
+    });
+    return result;
+  };
+
   this.update_delivery_time_options = function() {
-    deliveryTimeOptions = $.parseJSON($('.delivery-time-options').attr("data"));
+    var deliveryDate = $('#order_delivery_date').val();
+    var deliveryTimeOptions = this.parseDeliveryOptions(deliveryDate);
 
-    if (deliveryTimeOptions){
+    if (deliveryTimeOptions) {
       weekdays = ['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday'];
-      
+
       var dayOptions = [];
-      var deliveryDate = $('#order_delivery_date').val();
 
       if (deliveryTimeOptions[deliveryDate]) {
         dayOptions = deliveryTimeOptions[deliveryDate];

data/app/assets/javascripts/spree/frontend/spree_delivery_options.js

@@ -1,4 +1,5 @@
 //= require jquery
+//= require moment_js/moment.min
 //= require spree/frontend/delivery_time_options
 //= require spree/frontend/delivery_options_form
 //= require spree/frontend/jquery-ui-1.10.4.custom

data/app/helpers/spree_delivery_options/base_helper.rb

@@ -1,41 +1,40 @@
 module SpreeDeliveryOptions
   module BaseHelper
 
+    include ::SpreeDeliveryOptions::DeliveryOptionsService
+
     def current_order_cutoff_time
-      return nil unless (current_order && current_order.delivery_date)
+      return nil unless (current_order && current_order.delivery_date && current_order.delivery_time)
       
-      cutoff_time = Time.zone.now.change(hour: SpreeDeliveryOptions::Config.delivery_cut_off_hour)
       cutoff_date = current_order.delivery_date - 1.day
-      "#{cutoff_date.strftime('%A, %d %b')} before #{cutoff_time.strftime("%l%P")}"
-    end
+      all_delivery_options = all_delivery_options_for_date(current_order.delivery_date)
 
-    def next_delivery_slot
-      delivery_options = JSON.parse(SpreeDeliveryOptions::Config.delivery_time_options)
+      possible_cutoff_times = all_delivery_options.select{ |opt| 
+        opt.values.flatten.include?(current_order.delivery_time)
+      }.map{ |opt| opt.keys}.flatten rescue nil
 
-      delivery_day = next_delivery_day
-      return "" unless delivery_day
+      return nil if possible_cutoff_times.empty?
 
-      "#{delivery_day.strftime('%A').titleize} between #{delivery_options[delivery_day.strftime('%A').downcase].first}"
+      cutoff_time = DateTime.strptime(possible_cutoff_times.sort.last, "%H:%M").strftime("%l%P").strip
+      "#{cutoff_date.strftime('%A, %d %b')} before #{cutoff_time}"
     end
 
-    def next_delivery_day
-      delivery_options = JSON.parse(SpreeDeliveryOptions::Config.delivery_time_options)
+    def next_delivery_slot
+      current_time_string = Time.zone.now.strftime("%H:%M")
+      possible_delivery_day = Date.current + 1.day
 
-      cutoff_time = Time.zone.now.change(hour: SpreeDeliveryOptions::Config.delivery_cut_off_hour)
+      next_delivery_slot_for(possible_delivery_day, current_time_string)
+    end
 
-      current_day = Time.zone.now > cutoff_time ? (Date.current + 2.days) : (Date.current + 1.day)
-      next_available_day = nil
-      counter = 0
+    def next_delivery_slot_for(delivery_date, time_string, counter=0)
+      return "" if counter == 7 #break after cycling through the week
 
-      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
+      possible_delivery_options = delivery_options_for_date_and_time(delivery_date, time_string)
+      unless possible_delivery_options.empty?
+        return "#{delivery_date.strftime('%A').titleize} between #{possible_delivery_options.first}"
       end
-      next_available_day
+      
+      next_delivery_slot_for(delivery_date + 1.day, "00:01", counter + 1)
     end
 
   end

data/app/models/spree/order_decorator.rb

@@ -2,8 +2,9 @@ Spree::Order.class_eval do
   require 'date'
   require 'spree/order/checkout'
 
-  validate :valid_delivery_date?
-  validate :valid_delivery_time?
+  include SpreeDeliveryOptions::DeliveryOptionsService
+
+  validate :valid_delivery_options?
 
   def valid_delivery_instructions?
     if self.delivery_instructions && self.delivery_instructions.length > 500
@@ -18,53 +19,24 @@ Spree::Order.class_eval do
     self.errors[:delivery_date].empty? ? true : false
   end
 
-  def valid_delivery_date?
-    if self.delivery_date && self.delivery_date_changed?
-      self.errors[:delivery_date] << 'cannot be today or in the past' if self.delivery_date <= Date.current
-
-      options = delivery_time_options(self.delivery_date)
-      unless options && !options.empty?
-        self.errors[:delivery_date] << "is not available on the selected date."
-      end
-
-      cutoff_time = Time.zone.now.change(hour: SpreeDeliveryOptions::Config.delivery_cut_off_hour)
-      if self.delivery_date == (Date.current + 1.day) && Time.zone.now > (cutoff_time + 15.minutes)
-        self.errors[:delivery_date] << "cannot be tomorrow if the order is created after 1pm"
-      end
-    end
-
-    self.errors[:delivery_date].empty? ? true : false
-  end
-
   def delivery_time_present?
     self.errors[:delivery_time] << 'cannot be blank' unless self.delivery_time
     self.errors[:delivery_time].empty? ? true : false
   end
 
-  def valid_delivery_time?
-    return unless self.delivery_date
-
-    self.errors[:delivery_time] << 'cannot be blank' unless self.delivery_time
+  def valid_delivery_options?
+    if (self.delivery_date && self.delivery_date_changed?) && (self.delivery_time && self.delivery_time_changed?)
+      self.errors[:delivery_date] << 'cannot be today or in the past' if self.delivery_date <= Date.current
 
-    if self.delivery_time
-      self.errors[:delivery_time] << 'is invalid' unless (delivery_time_options(self.delivery_date) && delivery_time_options(self.delivery_date).include?(self.delivery_time))
+      options = current_delivery_options_for_date(self.delivery_date)
+      if options && !options.empty?
+        self.errors[:delivery_time] << 'is invalid' unless options.include?(self.delivery_time)
+      else
+        self.errors[:delivery_date] << "is not available on the selected date."
+      end
     end
 
-    self.errors[:delivery_time].empty? ? true : false
-  end
-
-  private
-
-  def delivery_time_options(date)
-    date_string = date.strftime("%d/%m/%Y")
-    return delivery_options[date_string] if delivery_options[date_string]
-
-    week_day = date.strftime("%A")
-    delivery_options[week_day.downcase]
-  end
-
-  def delivery_options
-    @delivery_options ||= JSON.parse(SpreeDeliveryOptions::Config.delivery_time_options)
+    (self.errors[:delivery_date].empty? && self.errors[:delivery_time].empty?) ? true : false
   end
 
 end
@@ -76,8 +48,5 @@ Spree::PermittedAttributes.checkout_attributes << :delivery_instructions
 Spree::Order.state_machine.before_transition :to => :payment, :do => :valid_delivery_instructions?
 
 Spree::Order.state_machine.before_transition :to => :payment, :do => :delivery_date_present?
-Spree::Order.state_machine.before_transition :to => :payment, :do => :valid_delivery_date?
-
 Spree::Order.state_machine.before_transition :to => :payment, :do => :delivery_time_present?
-Spree::Order.state_machine.before_transition :to => :payment, :do => :valid_delivery_time?
-
+Spree::Order.state_machine.before_transition :to => :payment, :do => :valid_delivery_options?

data/app/views/spree/admin/orders/delivery_options/edit.haml

@@ -23,10 +23,10 @@
               = f.label :delivery_date, "Delivery Date"
               = f.text_field :delivery_date, class: "datepicker"
             .field
-              - delivery_options = JSON.parse(SpreeDeliveryOptions::Config.delivery_time_options)[(@order.delivery_date || Date.today).strftime('%A').downcase]
+              - delivery_options = JSON.parse(SpreeDeliveryOptions::Config.delivery_time_options)
               .selected-delivery-time{data: @order.delivery_time}
-              = f.label :delivery_time, "Delivery Time"
-              = f.select :delivery_time, delivery_options || ""
+                = f.label :delivery_time, "Delivery Time"
+              = f.select :delivery_time, [] 
             .field
               = f.label :delivery_instructions, "Delivery Instructions"
               = f.text_area :delivery_instructions, class: 'fullwidth'

data/app/views/spree/shared/_delivery_options.haml

@@ -22,7 +22,7 @@
               = form.text_field :delivery_date, value: (l(order.delivery_date) rescue l(Date.current + 1))
             .field
               = form.label :delivery_time, "Delivery Time"
-              = form.select :delivery_time, JSON.parse(SpreeDeliveryOptions::Config.delivery_time_options)["monday"]
+              = form.select :delivery_time, current_delivery_options_for_date(Date.tomorrow)
             .field
               = form.submit "Set Delivery Time"
             .delivery-time-options{data: SpreeDeliveryOptions::Config.delivery_time_options}

data/lib/spree_delivery_options/configuration.rb

@@ -1,7 +1,7 @@
 module SpreeDeliveryOptions
   class Configuration < Spree::Preferences::Configuration
-    preference :delivery_cut_off_hour, :integer, default: 13
-    preference :delivery_time_options, :string, default: {monday: ['Between 6am-8am']}.to_json
+    preference :delivery_cut_off_time, :string, default: [{cutoff_time: "13:15", id: :morning}, {cutoff_time: "23:59", id: :evening}].to_json
+    preference :delivery_time_options, :string, default: {morning: {monday: ['Between 6-7am']}, evening: {monday: ['6pm to 7:30pm']}}.to_json
     preference :show_homepage_form, :boolean, default: true 
   end
 end

data/lib/spree_delivery_options/delivery_options_service.rb

@@ -0,0 +1,49 @@
+module SpreeDeliveryOptions
+  module DeliveryOptionsService
+
+    private
+
+    def current_delivery_options_for_date(delivery_date)
+      if delivery_date > (Date.current + 1.day)
+        delivery_options_for_date_and_time(delivery_date, "00:01")
+      else
+        delivery_options_for_date_and_time(delivery_date, Time.zone.now.strftime("%H:%M"))
+      end
+    end
+
+    def delivery_options_for_date_and_time(delivery_date, time_string)
+      current_delivery_options = delivery_options_for_time(time_string)
+
+      date_string = delivery_date.strftime("%d/%m/%Y")
+      return current_delivery_options[date_string] if current_delivery_options[date_string]
+
+      week_day = delivery_date.strftime("%A")
+      current_delivery_options[week_day.downcase] || []
+    end
+
+    def all_delivery_options_for_date(delivery_date)
+      all_options = [] 
+      date_string = delivery_date.strftime("%d/%m/%Y")
+      week_day = delivery_date.strftime("%A").downcase
+
+      delivery_groups.each do |cutoff_time, options|
+        if options[date_string]
+          all_options << {cutoff_time => options[date_string]}
+        elsif options[week_day]
+          all_options << {cutoff_time => options[week_day]}
+        end
+      end
+      all_options
+    end
+
+    def delivery_options_for_time(order_time_string)
+      delivery_groups.each{|cutoff_time, options| return options if order_time_string < cutoff_time}
+      {}
+    end
+
+    def delivery_groups
+      @delivery_groups = JSON.parse(SpreeDeliveryOptions::Config.delivery_time_options)[0] || []
+    end
+
+  end
+end

data/spec/helpers/spree_delivery_options/base_helper_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe SpreeDeliveryOptions::BaseHelper do
 
+
   describe 'current order cutoff time' do
 
     let(:order){FactoryGirl.build(:order)}
@@ -15,18 +16,56 @@ describe SpreeDeliveryOptions::BaseHelper do
       helper.current_order_cutoff_time.should be_nil
     end
 
-    it 'should return nil if there current order has no delivery date' do
+    it 'should return nil if current order has no delivery date' do
       order.delivery_date = nil
       helper.current_order_cutoff_time.should be_nil
     end
 
-    it 'should return the day before if delivery date is set' do
-      SpreeDeliveryOptions::Config.delivery_cut_off_hour = 13
+    it 'should return nil if current order has no delivery time' do
+      order.delivery_date = Date.parse('23/04/2014')
+      order.delivery_time = nil
+      helper.current_order_cutoff_time.should be_nil
+    end
+
+    it 'should return nil if delivery time is invalid' do
       order.delivery_date = Date.parse('23/04/2014')
+      order.delivery_time = "crazy!"
+      helper.current_order_cutoff_time.should be_nil
+    end
+
+    it 'should return the correct delivery group cut off time depending on the delivery time' do
+      SpreeDeliveryOptions::Config.delivery_time_options = [{"13:15" => {monday: ['6am to 7:30am']}, "20:00" => {monday: ['6pm to 7:30pm']}}].to_json
+
+      order.delivery_date = Date.parse('21/04/2014')
+      order.delivery_time = '6pm to 7:30pm'
+
+      time_now = DateTime.parse("18/03/2013")
+      Timecop.freeze(time_now)
+      helper.current_order_cutoff_time.should == 'Sunday, 20 Apr before 8pm'
+      Timecop.return
+    end
+
+    it 'should consider overrides when establishing the cutoff time' do
+      SpreeDeliveryOptions::Config.delivery_time_options = [{"13:15" => {monday: ['6pm to 7:30pm']}, "20:00" => {"21/04/2014" => ["9am to 12am"], monday: ['6pm to 7:30pm']}}].to_json
+
+      order.delivery_date = Date.parse('21/04/2014')
+      order.delivery_time = '6pm to 7:30pm'
+
+      time_now = DateTime.parse("18/03/2013")
+      Timecop.freeze(time_now)
+      helper.current_order_cutoff_time.should == 'Sunday, 20 Apr before 1pm'
+      Timecop.return
+    end
+
+    it 'should return the latest one if time is in both' do
+      SpreeDeliveryOptions::Config.delivery_time_options = [{"13:15" => {monday: ['6pm to 7:30pm']}, "20:00" => {monday: ['6pm to 7:30pm']}}].to_json
 
-      time_now = DateTime.parse("20/03/2013")
+      order.delivery_date = Date.parse('21/04/2014')
+      order.delivery_time = '6pm to 7:30pm'
+
+      time_now = DateTime.parse("18/03/2013")
       Timecop.freeze(time_now)
-      helper.current_order_cutoff_time.should == 'Tuesday, 22 Apr before  1pm'
+      helper.current_order_cutoff_time.should == 'Sunday, 20 Apr before 8pm'
       Timecop.return
     end
 
@@ -34,36 +73,65 @@ 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)
+    before :each do
+      SpreeDeliveryOptions::Config.delivery_time_options = [{
+        "13:15" => {tuesday: ['6am to 7:30am'], wednesday: ['6am to 7:30am'], thursday: []},
+        "20:00" => {tuesday: ['6pm to 7:30pm']}
+      }].to_json
+    end
 
-      helper.next_delivery_slot.should == 'Tuesday between 9am-12pm'
+    after :each do
       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")
+    it 'should return first slot for tomorrow morning if its before cutoff time' do
+      time_now = DateTime.parse("10/03/2014 12:00 +1100")
       Timecop.freeze(time_now)
 
-      helper.next_delivery_slot.should == 'Wednesday between 9am-12pm'
-      Timecop.return
+      helper.next_delivery_slot.should == 'Tuesday between 6am to 7:30am'
+    end
+
+    it 'should return first slot for tomorrow evening if its before evening cutoff time' do
+      time_now = DateTime.parse("10/03/2014 14:00 +1100")
+      Timecop.freeze(time_now)
+
+      helper.next_delivery_slot.should == 'Tuesday between 6pm to 7:30pm'
+    end
+
+    it 'should consider overrides when getting cutoff time' do
+      SpreeDeliveryOptions::Config.delivery_time_options = [{
+        "13:15" => {tuesday: ['6am to 7:30am'], wednesday: ['6am to 7:30am'], thursday: []},
+        "20:00" => {"11/03/2014" => ['9am to 12am'], tuesday: ['6pm to 7:30pm']}
+      }].to_json
+
+      time_now = DateTime.parse("10/03/2014 14:00 +1100")
+      Timecop.freeze(time_now)
+
+      helper.next_delivery_slot.should == 'Tuesday between 9am to 12am'
+    end
+
+    it 'should return the day after tomorrow morning if its after evening cutoff time' do
+      time_now = DateTime.parse("10/03/2014 20:01 +1100")
+      Timecop.freeze(time_now)
+
+      helper.next_delivery_slot.should == 'Wednesday between 6am to 7:30am'
     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")
+      SpreeDeliveryOptions::Config.delivery_time_options = [{
+        "13:15" => {monday: ['6am to 7:30am'], tuesday: ['6am to 7:30am'], wednesday: ['6am to 7:30am'], thursday: []},
+        "20:00" => {"11/03/2014" => ['9am to 12am'], tuesday: ['6pm to 7:30pm']}
+      }].to_json
+
+      time_now = DateTime.parse("02/05/2014 14:00 +1100")
       Timecop.freeze(time_now)
 
-      helper.next_delivery_slot.should == 'Monday between 6am-7am'
-      Timecop.return
+      helper.next_delivery_slot.should == 'Monday between 6am to 7:30am'
     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")
+    it 'should return nil if no delivery times are available' do
+      SpreeDeliveryOptions::Config.delivery_time_options = [].to_json
+      time_now = DateTime.parse("13/03/2014 12:00 +1100")
       Timecop.freeze(time_now)
 
       helper.next_delivery_slot.should == ''

data/spec/models/order_spec.rb

@@ -5,8 +5,8 @@ describe Spree::Order do
   let(:order){Spree::Order.new}
 
   before :each do
-    SpreeDeliveryOptions::Config.delivery_time_options = {monday: ['Between 6-7am']}.to_json
-    SpreeDeliveryOptions::Config.delivery_cut_off_hour = 13
+    SpreeDeliveryOptions::Config.delivery_time_options = [{monday: ['Between 6-7am']}].to_json
+    SpreeDeliveryOptions::Config.delivery_cut_off_time = "13:15"
   end
 
   describe 'valid_delivery_instructions' do
@@ -46,147 +46,179 @@ describe Spree::Order do
 
   end
 
-  describe "valid_delivery_date" do
+  describe 'delivery_time_present' do
+
+    it 'should require delivery time' do
+      order.delivery_date = Date.today
+
+      order.delivery_time_present?.should == false
+      order.errors[:delivery_time].should_not be_empty
+    end
+
+  end
+
+  describe "valid_delivery_options?" do
 
     before :each do
-      SpreeDeliveryOptions::Config.delivery_time_options = {monday: ['Between 6-7am']}.to_json
+      SpreeDeliveryOptions::Config.delivery_time_options = [{"13:15" => {monday: ['Between 6-7am'], tuesday: ['Between 6-7am'], wednesday: ['Between 6-7am']}, "20:00" => {monday: ['6pm to 7:30pm']}}].to_json
     end
 
     it 'should not be valid if delivery date is in the past' do
       order.delivery_date = Date.yesterday
-      order.valid_delivery_date?.should == false
+      order.delivery_time = 'Between 6-7am'
+      order.valid_delivery_options?.should == false
       order.errors[:delivery_date].should_not be_empty
     end
 
     it 'should not be valid if delivery date is today' do
       order.delivery_date = Date.today
-      order.valid_delivery_date?.should == false
+      order.delivery_time = 'Between 6-7am'
+      order.valid_delivery_options?.should == false
       order.errors[:delivery_date].should_not be_empty
     end
 
-    it 'should be valid if delivery date is tomorrow and it is past the cutoff time by less than 15 min' do
-      time_now = DateTime.parse("17/11/2013 #{SpreeDeliveryOptions::Config.delivery_cut_off_hour}:14 +1100", "%d/%m/%Y %H:%M %z")
+    it 'should be valid if delivery date is tomorrow morning and it is before the morning cutoff time' do
+      time_now = DateTime.parse("17/11/2013 13:14 +1100", "%d/%m/%Y %H:%M %z")
       Timecop.freeze(time_now)
 
       order.delivery_date = '18/11/2013'
-      order.valid_delivery_date?.should == true
+      order.delivery_time = 'Between 6-7am'
+
+      order.valid_delivery_options?.should == true
       order.errors[:delivery_date].should be_empty
       Timecop.return
     end
 
-    it 'should not be valid if delivery date is tomorrow and it is past the cutoff time + 15 min' do
-      time_now = DateTime.parse("17/11/2013 #{SpreeDeliveryOptions::Config.delivery_cut_off_hour}:16 +1100", "%d/%m/%Y %H:%M %z")
+    it 'should be valid if delivery date is tomorrow evening and it is before the evening cutoff time' do
+      time_now = DateTime.parse("17/11/2013 19:14 +1100", "%d/%m/%Y %H:%M %z")
       Timecop.freeze(time_now)
 
       order.delivery_date = '18/11/2013'
-      order.valid_delivery_date?.should == false
-      order.errors[:delivery_date].should_not be_empty
-      Timecop.return
-    end
+      order.delivery_time = '6pm to 7:30pm'
 
-    it 'should be valid if delivery date is tomorrow but is before the cutoff time' do
-      time_now = DateTime.parse("17/11/2013 #{SpreeDeliveryOptions::Config.delivery_cut_off_hour-1}:59 +1100")
-      Timecop.freeze(time_now)
-
-      order.delivery_date = '18/11/2013'
-      order.valid_delivery_date?
+      order.valid_delivery_options?.should == true
       order.errors[:delivery_date].should be_empty
       Timecop.return
     end
 
-  end
-
-  describe 'delivery_time_present' do
+    it 'should not be valid if delivery date is tomorrow morning but is after the morning cutoff time' do
+      time_now = DateTime.parse("17/11/2013 13:16 +1100", "%d/%m/%Y %H:%M %z")
+      Timecop.freeze(time_now)
 
-    it 'should require delivery time' do
-      order.delivery_date = Date.today
+      order.delivery_date = '18/11/2013'
+      order.delivery_time = 'Between 6-7am'
 
-      order.delivery_time_present?.should == false
+      order.valid_delivery_options?.should == false
       order.errors[:delivery_time].should_not be_empty
+      Timecop.return
     end
 
-  end
+    it 'should not be valid if delivery date is tomorrow evening and it is after the evening cutoff time' do
+      time_now = DateTime.parse("17/11/2013 20:01 +1100", "%d/%m/%Y %H:%M %z")
+      Timecop.freeze(time_now)
 
-  describe 'valid_delivery_time' do
+      order.delivery_date = '18/11/2013'
+      order.delivery_time = '6pm to 7:30pm'
 
-    before :each do
-      SpreeDeliveryOptions::Config.delivery_time_options = {monday: ['Between 6-7am']}.to_json
+      order.valid_delivery_options?.should == false
+      order.errors[:delivery_date].should_not be_empty
+      Timecop.return
     end
 
-    it 'should require a valid option for delivery time' do
-      order.delivery_date = Date.today
+    it 'should be valid if delivery date is after tomorrow morning even when its after the morning cutoff time' do
+      time_now = DateTime.parse("17/11/2013 19:14 +1100", "%d/%m/%Y %H:%M %z")
+      Timecop.freeze(time_now)
 
-      order.delivery_time = 'crazy times!'
-      order.valid_delivery_time?.should == false
-      order.errors[:delivery_time].should_not be_empty
-    end
+      order.delivery_date = '19/11/2013'
+      order.delivery_time = 'Between 6-7am'
 
-    it 'should allow delivery time to be in a valid delivery day' do
-      order.delivery_date =  DateTime.now.next_week.next_day(0)
-      order.valid_delivery_date?#.should == true
+      order.valid_delivery_options?.should == true
       order.errors[:delivery_date].should be_empty
+      Timecop.return
     end
 
-    it 'should not allow delivery time to be in a non delivery day' do
-      order.delivery_date =  DateTime.now.next_week.next_day(1)
-      order.valid_delivery_date?.should == false
-      order.errors[:delivery_date].should_not be_empty
-    end
+    context 'delivery time' do
 
-    describe "overriding delivery day with specific date" do
+      before :each do
+        SpreeDeliveryOptions::Config.delivery_time_options = [{"13:15" => {monday: ['Between 6-7am']}, "20:00" => {monday: ['6pm to 7:30pm']}}].to_json
+      end
 
-      it 'should not allow delivery time to be in an invalid slot for the delivery day' do
-        SpreeDeliveryOptions::Config.delivery_time_options = {monday: ['Between 6-7am'], '03/03/2014' => ['Between 9-12am']}.to_json
+      it 'should require a valid option for delivery time' do
+        order.delivery_date = Date.today
 
-        time_now = DateTime.parse("01/03/2014")
+        order.delivery_time = 'crazy times!'
+        order.valid_delivery_options?.should == false
+        order.errors[:delivery_date].should_not be_empty
+      end
+
+      it 'should allow valid delivery time' do
+        time_now = DateTime.parse("05/04/2014 10:00 +1100", "%d/%m/%Y %H:%M %z")
         Timecop.freeze(time_now)
 
-        order.delivery_date =  Date.parse('03/03/2014')
+        order.delivery_date = Date.parse('07/04/2014')
         order.delivery_time = 'Between 6-7am'
+        
+        order.valid_delivery_options?.should == true
+        Timecop.return
+      end
 
-        order.valid_delivery_time?.should == false
+      it 'should not allow invalid delivery time for the date' do
+        time_now = DateTime.parse("05/04/2014 10:00 +1100", "%d/%m/%Y %H:%M %z")
+        Timecop.freeze(time_now)
+
+        order.delivery_date = Date.parse('07/04/2014')
+        order.delivery_time = '6am to 7:30am'
+
+        order.valid_delivery_options?.should == false
         order.errors[:delivery_time].should_not be_empty
         Timecop.return
       end
 
-      it 'should not allow delivery time to be in date with empty options' do
-        SpreeDeliveryOptions::Config.delivery_time_options = {monday: ['Between 6-7am'], '03/03/2014' => []}.to_json
-
-        time_now = DateTime.parse("01/03/2014")
+      it 'should not allow date that has no delivery slots' do
+        time_now = DateTime.parse("05/04/2014 10:00 +1100", "%d/%m/%Y %H:%M %z")
         Timecop.freeze(time_now)
 
-        order.delivery_date =  Date.parse('03/03/2014')
+        order.delivery_date = Date.parse('08/04/2014')
         order.delivery_time = 'Between 6-7am'
-
-        order.valid_delivery_date?.should == false
+        
+        order.valid_delivery_options?.should == false
         order.errors[:delivery_date].should_not be_empty
-        order.valid_delivery_time?.should == false
-        order.errors[:delivery_time].should_not be_empty
         Timecop.return
       end
 
     end
 
-    describe "validating delivery time in specific week day" do
+    context "overriding delivery day with specific date" do
 
       before :each do
-        SpreeDeliveryOptions::Config.delivery_time_options = {monday: ['Between 6-7am'], saturday: ['Between 9-12am']}.to_json
       end
 
       it 'should not allow delivery time to be in an invalid slot for the delivery day' do
-        order.delivery_date =  DateTime.now.next_week.next_day(5)
+        SpreeDeliveryOptions::Config.delivery_time_options = [{"13:15" => {monday: ['Between 6-7am'], '03/03/2014' => ['Between 9-12am']}, "20:00" => {monday: ['6pm to 7:30pm']}}].to_json
+
+        time_now = DateTime.parse("01/03/2014 10:00 +1100", "%d/%m/%Y %H:%M %z")
+        Timecop.freeze(time_now)
+
+        order.delivery_date =  Date.parse('03/03/2014')
         order.delivery_time = 'Between 6-7am'
 
-        order.valid_delivery_time?.should == false
+        order.valid_delivery_options?.should == false
         order.errors[:delivery_time].should_not be_empty
+        Timecop.return
       end
 
-      it 'should allow delivery time to be in an valid slot for the delivery day' do
-        order.delivery_date =  DateTime.now.next_week.next_day(5)
-        order.delivery_time = 'Between 9-12am'
+      it 'should not allow delivery time to be in date with empty options' do
+        SpreeDeliveryOptions::Config.delivery_time_options = [{"13:15" => {monday: ['Between 6-7am'], '03/03/2014' => []}, "20:00" => {monday: ['6pm to 7:30pm']}}].to_json
 
-        order.valid_delivery_time?.should == true
-        order.errors[:delivery_time].should be_empty
+        time_now = DateTime.parse("01/03/2014")
+        Timecop.freeze(time_now)
+
+        order.delivery_date =  Date.parse('03/03/2014')
+        order.delivery_time = 'Between 6-7am'
+
+        order.valid_delivery_options?.should == false
+        order.errors[:delivery_date].should_not be_empty
+        Timecop.return
       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.2.8'
+  s.version     = '2.2.10'
   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.2.8
+  version: 2.2.10
 platform: ruby
 authors:
 - Francisco Trindade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -294,13 +294,13 @@ files:
 - lib/generators/spree_delivery_options/install/install_generator.rb
 - lib/spree_delivery_options.rb
 - lib/spree_delivery_options/configuration.rb
+- lib/spree_delivery_options/delivery_options_service.rb
 - 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-2.2.6.gem
 - spree_delivery_options.gemspec
 homepage: 
 licenses: []