spree_delivery_options 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffa0c34813e0e8d339119ca8a2fd0fd9452f7432
-  data.tar.gz: 797b69f00b0950d2846e4f0996190f74c7956a54
+  metadata.gz: 2687fc3ca83448a1dbbe09f2d3f1b699c0ccf466
+  data.tar.gz: 4da57adfa9deadb80c321ada0d0c4369c0bef9a5
 SHA512:
-  metadata.gz: 4e16f085274d39bb8b177cf77ca0cc98a0f627f3420e7e505a8401c4f6938640c618067733a97fe22774a49f2cb2384a7c8ae3f44a20a71d8927caf77049d5e9
-  data.tar.gz: 0fdfeb40e6644e8af809fc5df803288240dfbf12a5c3b4b70e8f9fa5790597bc4451d6ea8ffdf1ebfecf2896a565a9e2eb10c87f14229d5ab715e50d0b8e5369
+  metadata.gz: 3800bdad3b2642aa0136e29a7c90b1bb1687d2b46c3ba0440803b922d29d7093a84be3ba1f7204683c8cc34025f8f50401e255bb7ce5a7baba80a44ac27a5b76
+  data.tar.gz: 0d82f9a28fef33050f4ae2227da85d646fd26d7b630e922aa0416748a7a5666644946642b917e516aaae836c1d6758915b91db1776e6b208f22484f9c9d64615

data/README.md

@@ -43,11 +43,11 @@ 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 = {      
-          pre_dawn: "Before 6am",        
-          early_morning: "Between 6am-8am"
+        delivery_time_options = {
+          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       
+      end
 

data/app/assets/javascripts/store/delivery_time_options.js

@@ -0,0 +1,44 @@
+function SpreeDeliveryOptions() {
+
+  var that = this;
+
+  this.initializeDeliveryTimeSelect = function() {
+    this.update_delivery_time_options();
+
+    $('#order_delivery_date').change(function(event){
+      that.update_delivery_time_options();
+    });
+  };
+
+  this.update_delivery_time_options = function() {
+    delivery_time_options = $.parseJSON($('.delivery-time-options').attr("data"));
+
+    if (delivery_time_options){
+      weekdays = ['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday'];
+      day_index = new Date($('#order_delivery_date').val()).getDay();
+      weekday = weekdays[day_index];
+
+      day_options = delivery_time_options[weekday];
+      this.populate_delivery_time(day_options);
+    }
+  };
+
+  this.populate_delivery_time = function(options) {
+    if (options) {
+      var arLen = options.length;
+      var newList = "";
+      for ( var i=0, len=arLen; i<len; ++i ){
+        newList = newList + '<option>' + options[i]+'</option>';
+      }
+      $('#order_delivery_time').html(newList);
+    } else {
+      $('#order_delivery_time').html("<option>No deliveries available on this date</option>");
+    }
+  };
+
+}
+
+$(document).ready(function() {
+  var deliveryOptions = new SpreeDeliveryOptions();
+  deliveryOptions.initializeDeliveryTimeSelect();
+});

data/app/assets/javascripts/store/spree_delivery_options.js

@@ -0,0 +1,2 @@
+//= require jquery
+//= require store/delivery_time_options

data/app/assets/stylesheets/store/delivery_checkout.scss

@@ -18,6 +18,10 @@
       margin-right: 20px;
     }
   }
+
+  .delivery-time-options {
+    display: none;
+  }
 }
 
 #delivery_instructions textarea {

data/app/models/spree/order_decorator.rb

@@ -11,11 +11,17 @@ Spree::Order.class_eval do
   end
 
   def valid_delivery_date?
+
     self.errors[:delivery_date] << 'cannot be blank' unless self.delivery_date
 
     if self.delivery_date
       self.errors[:delivery_date] << 'cannot be today or in the past' if self.delivery_date <= Date.today
 
+      options = week_day_options(self.delivery_date)
+      unless options
+        self.errors[:delivery_date] << "is not available on the selected week day."
+      end
+
       cutoff_time = Time.now.change(hour: SpreeDeliveryOptions::Config.delivery_cut_off_hour)
       if self.delivery_date == Date.tomorrow && Time.now > cutoff_time
         self.errors[:delivery_date] << "cannot be tomorrow if the order is created after #{SpreeDeliveryOptions::Config.delivery_cut_off_hour}"
@@ -26,16 +32,28 @@ Spree::Order.class_eval do
   end
 
   def valid_delivery_time?
+    return unless self.delivery_date
+
     self.errors[:delivery_time] << 'cannot be blank' unless self.delivery_time
 
     if self.delivery_time
-      delivery_time_options = JSON.parse(SpreeDeliveryOptions::Config.delivery_time_options)
-      self.errors[:delivery_time] << 'is invalid' unless delivery_time_options.values.include?(self.delivery_time)
+      self.errors[:delivery_time] << 'is invalid' unless (week_day_options(self.delivery_date) && week_day_options(self.delivery_date).include?(self.delivery_time))
     end
 
     self.errors[:delivery_time].empty? ? true : false
   end
 
+  private
+
+  def week_day_options(date)
+    week_day = date.strftime("%A")
+    delivery_options[week_day.downcase]
+  end
+
+  def delivery_options
+    @delivery_options ||= JSON.parse(SpreeDeliveryOptions::Config.delivery_time_options)
+  end
+
 end
 
 Spree::PermittedAttributes.checkout_attributes << :delivery_date

data/app/views/spree/checkout/_delivery_date.haml

@@ -3,10 +3,13 @@
 #delivery_date
   .field
     = form.label :delivery_date, "Delivery Date"
-    = form.date_select :delivery_date
+    = form.date_field :delivery_date
   .field
     = form.label :delivery_time, "Delivery Time"
-    = form.select :delivery_time, JSON.parse(SpreeDeliveryOptions::Config.delivery_time_options).values, {}
+    = form.select :delivery_time, JSON.parse(SpreeDeliveryOptions::Config.delivery_time_options)["monday"]
+
+  .delivery-time-options{data: SpreeDeliveryOptions::Config.delivery_time_options}
+
 %h5.stock-delivery-instructions-title
   Delivery Instructions/Comments
 #delivery_instructions

data/lib/generators/spree_delivery_options/install/install_generator.rb

@@ -2,7 +2,8 @@ module SpreeDeliveryOptions
   module Generators
     class InstallGenerator < Rails::Generators::Base
 
-      def add_javascripts
+      def add_javascripts 
+        append_file 'app/assets/javascripts/store/all.js', "//= require store/spree_delivery_options\n"
       end
 
       def add_stylesheets

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_time_options, :string, default: {early_morning: 'Between 6am-8am'}.to_json
+    preference :delivery_time_options, :string, default: {monday: ['Between 6am-8am']}.to_json
   end
 end

data/spec/models/order_spec.rb

@@ -4,15 +4,58 @@ describe Spree::Order do
 
   let(:order){Spree::Order.new}
 
-  describe "validations" do
+  before :each do
+    SpreeDeliveryOptions::Config.delivery_time_options = {monday: ['Between 6-7am']}.to_json
+  end
+
+  describe 'delivery instructions' do
+
+    it 'should accept valid delivery instructions' do
+      order.delivery_instructions = "This is awesome"
+      order.valid_delivery_instructions?.should be_true
+      order.errors[:delivery_instructions].should be_empty
+    end
+
+    it 'should not accept delivery instructions that are too long' do
+      order.delivery_instructions = "A" * 501
+      order.valid_delivery_instructions?.should be_false
+      order.errors[:delivery_instructions].should_not be_empty
+    end
+
+  end
+
+  describe "delivery options" do
 
-    describe 'delivery date' do
+    describe "basic validations" do
 
       it 'should require delivery date' do
         order.valid_delivery_date?.should == false
         order.errors[:delivery_date].should_not be_empty
       end
 
+      it 'should require delivery time' do
+        order.delivery_date = Date.today
+
+        order.valid_delivery_time?.should == false
+        order.errors[:delivery_time].should_not be_empty
+      end
+
+      it 'should require a valid option for delivery time' do
+        order.delivery_date = Date.today
+
+        order.delivery_time = 'crazy times!'
+        order.valid_delivery_time?.should == false
+        order.errors[:delivery_time].should_not be_empty
+      end
+
+    end
+
+    describe "validating the cut off hour" do
+
+      before :each do
+        SpreeDeliveryOptions::Config.delivery_time_options = {monday: ['Between 6-7am']}.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
@@ -26,76 +69,72 @@ describe Spree::Order do
       end
 
       it 'should not be valid if delivery date is tomorrow and it is past the cutoff time' do
-        time_now = DateTime.parse("20/11/2013 #{SpreeDeliveryOptions::Config.delivery_cut_off_hour}:01 +1100")
+        time_now = DateTime.parse("17/11/2013 #{SpreeDeliveryOptions::Config.delivery_cut_off_hour}:01 +1100")
         Timecop.freeze(time_now)
 
-        order.delivery_date = '21/11/2013'
+        order.delivery_date = '18/11/2013'
         order.valid_delivery_date?.should == false
         order.errors[:delivery_date].should_not be_empty
         Timecop.return
       end
 
       it 'should be valid if delivery date is tomorrow but is before the cutoff time' do
-        time_now = DateTime.parse("20/11/2013 #{SpreeDeliveryOptions::Config.delivery_cut_off_hour-1}:59 +1100")
+        time_now = DateTime.parse("17/11/2013 #{SpreeDeliveryOptions::Config.delivery_cut_off_hour-1}:59 +1100")
         Timecop.freeze(time_now)
 
-        order.delivery_date = '21/11/2013'
+        order.delivery_date = '18/11/2013'
         order.valid_delivery_date?
         order.errors[:delivery_date].should be_empty
         Timecop.return
       end
 
-      it 'should be valid if delivery date is after tomorrow' do
-        time_now = DateTime.parse("20/11/2013 #{SpreeDeliveryOptions::Config.delivery_cut_off_hour+1}:30 +1100")
-        Timecop.freeze(time_now)
+    end
 
-        order.delivery_date = '22/11/2013'
-        order.valid_delivery_date?
+    describe "validating the week day" do
+
+      before :each do
+        SpreeDeliveryOptions::Config.delivery_time_options = {monday: ['Between 6-7am']}.to_json
+      end
+
+      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.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
 
     end
 
-    describe 'delivery time' do
+    describe "validating delivery time in specific week day" do
 
-      it 'should accept valid delivery time' do
-        delivery_time_options = JSON.parse(SpreeDeliveryOptions::Config.delivery_time_options)
-        order.delivery_time = delivery_time_options["early_morning"]
-        order.valid_delivery_time?
-        order.errors[:delivery_time].should be_empty
+      before :each do
+        SpreeDeliveryOptions::Config.delivery_time_options = {monday: ['Between 6-7am'], saturday: ['Between 9-12am']}.to_json
       end
 
-      it 'should require delivery time' do
-        order.valid_delivery_time?.should == false
-        order.errors[:delivery_time].should_not be_empty
-      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)
+        order.delivery_time = 'Between 6-7am'
 
-      it 'should require a valid option for delivery time' do
-        order.delivery_time = 'crazy times!'
         order.valid_delivery_time?.should == false
         order.errors[:delivery_time].should_not be_empty
       end
 
-    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'
 
-    describe 'delivery instructions' do
-
-      it 'should accept valid delivery instructions' do
-        order.delivery_instructions = "This is awesome"
-        order.valid_delivery_instructions?.should be_true
-        order.errors[:delivery_instructions].should be_empty
-      end
-
-      it 'should not accept delivery instructions that are too long' do
-        order.delivery_instructions = "A" * 501
-        order.valid_delivery_instructions?.should be_false
-        order.errors[:delivery_instructions].should_not be_empty
+        order.valid_delivery_time?.should == true
+        order.errors[:delivery_time].should be_empty
       end
 
     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.4'
+  s.version     = '2.1.5'
   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.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Francisco Trindade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -191,6 +191,8 @@ files:
 - README.md
 - Rakefile
 - Versionfile
+- app/assets/javascripts/store/delivery_time_options.js
+- app/assets/javascripts/store/spree_delivery_options.js
 - app/assets/stylesheets/admin/order_details.scss
 - app/assets/stylesheets/admin/spree_delivery_options.css
 - app/assets/stylesheets/store/delivery_checkout.scss