spree_delivery_options 2.2.7 → 2.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52f21254b9962301d3e30a2b21d337639a244953
-  data.tar.gz: 9a2630c0803e3bc1fd35e0b9af41061168682bb7
+  metadata.gz: 632e270bb1dff806503365bb70f806b2ebe304b4
+  data.tar.gz: 2656de02711cbcf5177606224145b6c18ca6ac2f
 SHA512:
-  metadata.gz: 64c60f96d12889e601897415f265f4b396906a7c95c0e6cd43c3eae0ec23d7b03323abe9538c7d3b356ef5ee2a40fa0186b4d93ee0dc90f7ed55554b25275e2d
-  data.tar.gz: 316e6f37b0b8893c9090ab30bd2be0e0fb99a7f69fa9e339dcdc14d9eda8988733bc56bdc479fdf5f298fc3f1cc586182543ac7b0dd2f83533a8a337680494ab
+  metadata.gz: cde0b744c696b162fbfa4fdd6f0f6e7df8c75dafac7052992ce3093ca97232ed936e6c52975fddbb3f08e9599d5bfd7f576f86d2da1aecd0585c6e5641b29d06
+  data.tar.gz: 8fdfc598b17bfd9e78857f05636023e34948e7c78e873251b288bf73b80bfff9477dc5587459659e69f4cfd343184644a1a4bf8485edd664d5a1b959c9d4b8be

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

@@ -40,7 +40,7 @@ function SpreeDeliveryOptions() {
   };
 
   this.populate_delivery_time = function(options) {
-    if (options) {
+    if (options && options.length > 0) {
       var selected_delivery_time = $('.selected-delivery-time').attr("data");
       var arLen = options.length;
       var newList = "";

data/app/models/spree/order_decorator.rb

@@ -23,8 +23,8 @@ Spree::Order.class_eval do
       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
-        self.errors[:delivery_date] << "is not available on the selected week day."
+      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)

data/lib/spree_delivery_options/configuration.rb

@@ -1,6 +1,6 @@
 module SpreeDeliveryOptions
   class Configuration < Spree::Preferences::Configuration
-    preference :delivery_cut_off_hour, :integer, default: 12
+    preference :delivery_cut_off_hour, :integer, default: 13
     preference :delivery_time_options, :string, default: {monday: ['Between 6am-8am']}.to_json
     preference :show_homepage_form, :boolean, default: true 
   end

data/spec/helpers/spree_delivery_options/base_helper_spec.rb

@@ -21,12 +21,12 @@ describe SpreeDeliveryOptions::BaseHelper do
     end
 
     it 'should return the day before if delivery date is set' do
-      SpreeDeliveryOptions::Config.delivery_cut_off_hour = 12
+      SpreeDeliveryOptions::Config.delivery_cut_off_hour = 13
       order.delivery_date = Date.parse('23/04/2014')
 
       time_now = DateTime.parse("20/03/2013")
       Timecop.freeze(time_now)
-      helper.current_order_cutoff_time.should == 'Tuesday, 22 Apr before 12pm'
+      helper.current_order_cutoff_time.should == 'Tuesday, 22 Apr before  1pm'
       Timecop.return
     end
 

data/spec/models/order_spec.rb

@@ -6,6 +6,7 @@ describe Spree::Order do
 
   before :each do
     SpreeDeliveryOptions::Config.delivery_time_options = {monday: ['Between 6-7am']}.to_json
+    SpreeDeliveryOptions::Config.delivery_cut_off_hour = 13
   end
 
   describe 'valid_delivery_instructions' do
@@ -64,7 +65,7 @@ describe Spree::Order do
     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")
+      time_now = DateTime.parse("17/11/2013 #{SpreeDeliveryOptions::Config.delivery_cut_off_hour}:14 +1100", "%d/%m/%Y %H:%M %z")
       Timecop.freeze(time_now)
 
       order.delivery_date = '18/11/2013'
@@ -74,7 +75,7 @@ describe Spree::Order do
     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")
+      time_now = DateTime.parse("17/11/2013 #{SpreeDeliveryOptions::Config.delivery_cut_off_hour}:16 +1100", "%d/%m/%Y %H:%M %z")
       Timecop.freeze(time_now)
 
       order.delivery_date = '18/11/2013'
@@ -134,17 +135,31 @@ describe Spree::Order do
 
     describe "overriding delivery day with specific date" do
 
-      before :each do
+      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
+
+        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_time?.should == false
+        order.errors[:delivery_time].should_not be_empty
+        Timecop.return
       end
 
-      it 'should not allow delivery time to be in an invalid slot for the delivery day' do
+      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")
         Timecop.freeze(time_now)
 
         order.delivery_date =  Date.parse('03/03/2014')
         order.delivery_time = 'Between 6-7am'
 
+        order.valid_delivery_date?.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

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.7'
+  s.version     = '2.2.8'
   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.7
+  version: 2.2.8
 platform: ruby
 authors:
 - Francisco Trindade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core