spree_delivery_options 2.1.13 → 2.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96f62bf3f5c41b394f42579a8290cef63b846cd8
-  data.tar.gz: 1534e023208ded8a3327237703493e59cdef33e3
+  metadata.gz: 70decd42b26f74b7a0a7d84043020dbe632df58d
+  data.tar.gz: e17addd9a179aa381bd5bfd427f88dbda6321708
 SHA512:
-  metadata.gz: 8cd00a4b89819be097cb7aa450e947b2a6bfdb471ef34c7588f93458dcf1cda15a92fdf27e40a75617c3b0343af244a6fa280b724c165820d7697a70eaf5ffb0
-  data.tar.gz: a515e680c0543f933bc374758367662e37edfdbdbf3d3df75dfa1c56099fbea68dee269ccc9648d21e1bc91f194f385cc4b2ff6ad1c217f499683029c537504b
+  metadata.gz: c31efcc66ff517e21b6c7357551171040bbe451b2079c72d9cd0a3629f1adf216dcc210c8aa9713be8a3397e6dd38791cc8d8346423c2aa6183c8399efdc7a2b
+  data.tar.gz: 7eb69bacd16dbafe1aad5fcca17ce831967462a16f236daec2ba496422fd68f179d2d606fe568356395f0852c0a03831b61ab76aefd71f9c33f37ef2fcc45797

data/README.md

@@ -51,3 +51,9 @@ Both the delivery cut off hour and the delivery time options can be configured i
         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

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

@@ -13,9 +13,9 @@ function SpreeDeliveryOptions() {
   };
 
   this.update_delivery_time_options = function() {
-    delivery_time_options = $.parseJSON($('.delivery-time-options').attr("data"));
+    var deliveryTimeOptions = $.parseJSON($('.delivery-time-options').attr("data"));
 
-    if (delivery_time_options){
+    if (deliveryTimeOptions){
       weekdays = ['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday'];
 
       var dateParts = []
@@ -24,12 +24,28 @@ function SpreeDeliveryOptions() {
       } else {
         dateParts = $('#order_delivery_date').val().split('-')
       }
-      day_index = new Date(dateParts[0], dateParts[1]-1, dateParts[2]).getDay();
-      weekday = weekdays[day_index];
 
-      day_options = delivery_time_options[weekday];
-      this.populate_delivery_time(day_options);
+      var deliveryDate = this.convertDateFormat(dateParts);
+      var dayOptions = [];
+      if (deliveryTimeOptions[deliveryDate]) {
+        dayOptions = deliveryTimeOptions[deliveryDate];
+      } else {
+        dayIndex = new Date(dateParts[0], dateParts[1]-1, dateParts[2]).getDay();
+        weekday = weekdays[dayIndex];
+        dayOptions = deliveryTimeOptions[weekday];
+      }
+      this.populate_delivery_time(dayOptions);
+    }
+  };
+
+  this.convertDateFormat = function(dateParts) {
+    var day = dateParts[2];
+    var month = parseInt(dateParts[1]);
+    if (month < 10) {
+      month = '0' + month;
     }
+    var year = dateParts[0];
+    return '' + day + '/' + month + '/' + year;
   };
 
   this.populate_delivery_time = function(options) {

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

@@ -15,16 +15,24 @@ function SpreeDeliveryOptions() {
   };
 
   this.update_delivery_time_options = function() {
-    delivery_time_options = $.parseJSON($('.delivery-time-options').attr("data"));
+    deliveryTimeOptions = $.parseJSON($('.delivery-time-options').attr("data"));
 
-    if (delivery_time_options){
+    if (deliveryTimeOptions){
       weekdays = ['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday'];
-      var dateParts = $('#order_delivery_date').val().split('/')
-      day_index = new Date(dateParts[2], dateParts[1]-1, dateParts[0]).getDay();
-      weekday = weekdays[day_index];
-
-      day_options = delivery_time_options[weekday];
-      this.populate_delivery_time(day_options);
+      
+      var dayOptions = [];
+      var deliveryDate = $('#order_delivery_date').val();
+
+      if (deliveryTimeOptions[deliveryDate]) {
+        dayOptions = deliveryTimeOptions[deliveryDate];
+      } else {
+        var dateParts = deliveryDate.split('/')
+        var dayIndex = new Date(dateParts[2], dateParts[1]-1, dateParts[0]).getDay();
+        weekday = weekdays[dayIndex];
+
+        dayOptions = deliveryTimeOptions[weekday];
+      }
+      this.populate_delivery_time(dayOptions);
     }
   };
 

data/app/models/spree/order_decorator.rb

@@ -17,13 +17,13 @@ Spree::Order.class_eval do
     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)
+      options = delivery_time_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
+      if self.delivery_date == Date.tomorrow && Time.now > (cutoff_time + 15.minutes)
         self.errors[:delivery_date] << "cannot be tomorrow if the order is created after 1pm"
       end
     end
@@ -37,7 +37,7 @@ Spree::Order.class_eval do
     self.errors[:delivery_time] << 'cannot be blank' unless self.delivery_time
 
     if 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))
+      self.errors[:delivery_time] << 'is invalid' unless (delivery_time_options(self.delivery_date) && delivery_time_options(self.delivery_date).include?(self.delivery_time))
     end
 
     self.errors[:delivery_time].empty? ? true : false
@@ -45,7 +45,10 @@ Spree::Order.class_eval do
 
   private
 
-  def week_day_options(date)
+  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

data/spec/models/order_spec.rb

@@ -80,8 +80,18 @@ describe Spree::Order do
         order.errors[:delivery_date].should_not be_empty
       end
 
-      it 'should not be valid if delivery date is tomorrow and it is past the cutoff time' do
-        time_now = DateTime.parse("17/11/2013 #{SpreeDeliveryOptions::Config.delivery_cut_off_hour}:01 +1100")
+      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")
+        Timecop.freeze(time_now)
+
+        order.delivery_date = '18/11/2013'
+        order.valid_delivery_date?.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")
         Timecop.freeze(time_now)
 
         order.delivery_date = '18/11/2013'
@@ -122,6 +132,26 @@ describe Spree::Order do
 
     end
 
+    describe "overriding delivery day with specific date" do
+
+      before :each do
+        SpreeDeliveryOptions::Config.delivery_time_options = {monday: ['Between 6-7am'], '03/03/2014' => ['Between 9-12am']}.to_json
+      end
+
+      it 'should not allow delivery time to be in an invalid slot for the delivery day' do
+        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
+
+    end
+
     describe "validating delivery time in specific week day" do
 
       before :each do

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