spree_delivery_options 2.1.15 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2eb54e36ae6b539d55955a467ef7e86ffb8af66
-  data.tar.gz: 61f422e99c631a7aa68b5dccd6cdde06630b86e5
+  metadata.gz: b19936a62b8807116a557c91212c3d2b0ec4cdc2
+  data.tar.gz: 5bc39846c2a6cdd32fe656807b1752ed6f3cd479
 SHA512:
-  metadata.gz: b83c9fd7738ded9a7dcfc8c0408845a3f8ba943a2edf6a6ccad71748bb63dd7281d437f23d8f78f3f4a2065343f8ca9c979133cd7f3a1c03822bcae9aeb955b6
-  data.tar.gz: 6f9e9e7b63c452b54168636945b3a2206fa539f4470f062ec8e1f74852700fd4785e9b11da2dda48e94b492d9f65f8f42784f54a73a77a4d4bc91e9642235fd4
+  metadata.gz: af672b3f1e226c927e773dfc2c01c063102ab080e0072149c97ee2f482ce1d4e35027336f886d16e681e76c52f7dc735a7739407bc7458e08f29815521016e13
+  data.tar.gz: e4ea617a6d6e621577cf8bf2d01068f8e314cc616df90491a09835f504178a8f8e7327d478125b816843d70214fae0104a211a60605f3aec03b690dde2d7d145

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

@@ -0,0 +1,43 @@
+function SpreeDeliveryOptionsForm() {
+
+  var that = this;
+
+  this.initializeForm = function() {
+     var formUrl = $('#delivery-options-form').attr('action');
+
+     $("#delivery-options-form input[type='submit']").click(function(event){
+       event.preventDefault();
+
+       var formData = $('#delivery-options-form').serialize();
+       $.post(
+         formUrl,
+         formData,
+         function(data) {
+           if (data.delivery_date !== null) {
+             location.reload();
+           } else {
+             that.showErrorMessage("Please enter a valid date.");
+           }
+         }).fail(function(data){
+           if (data.responseJSON.errors.delivery_date !== undefined) {
+             that.showErrorMessage(data.responseJSON.errors.delivery_date[0]);
+           } else if (data.responseJSON.errors.delivery_time !== undefined) {
+             that.showErrorMessage(data.responseJSON.errors.delivery_time[0]);
+           } else {
+             that.showErrorMessage("We could not update the delivery date. Please try at checkout.");
+           }
+         });
+     });
+  };
+
+  this.showErrorMessage = function(message) {
+    $('#delivery-options-homepage .error').html("<h5>" + message + "</h5>");
+    $('#delivery-options-homepage .error').show();
+  };
+
+}
+
+$(document).ready(function() {
+  var deliveryOptionsForm = new SpreeDeliveryOptionsForm();
+  deliveryOptionsForm.initializeForm();
+});

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

@@ -3,7 +3,10 @@ function SpreeDeliveryOptions() {
   var that = this;
 
   this.initializeDatePicker = function() {
-     $('#order_delivery_date').datepicker({dateFormat: "dd/mm/yy"});
+     $('#order_delivery_date').datepicker({
+       dateFormat: "dd/mm/yy",
+       minDate: 1 
+     });
   };
 
   this.initializeDeliveryTimeSelect = function() {
@@ -41,11 +44,11 @@ function SpreeDeliveryOptions() {
       var arLen = options.length;
       var newList = "";
       for ( var i=0, len=arLen; i<len; ++i ){
-        newList = newList + '<option>' + options[i]+'</option>';
+        newList = newList + "<option value='" + options[i] + "'>" + options[i]+'</option>';
       }
       $('#order_delivery_time').html(newList);
     } else {
-      $('#order_delivery_time').html("<option>No deliveries available on this date</option>");
+      $('#order_delivery_time').html("<option>Not available</option>");
     }
   };
 

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

@@ -1,3 +1,4 @@
 //= require jquery
 //= require store/delivery_time_options
+//= require store/delivery_options_form
 //= require store/jquery-ui-1.10.4.custom

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

@@ -0,0 +1,40 @@
+#delivery-options-homepage {
+  background-color: #ccc;
+  padding: 10px;
+  margin-bottom: 10px;
+
+  .row {
+    margin-bottom: 0;
+  }
+
+  .success {
+    p {
+      margin: 0;
+      padding: 5px 0;
+    }
+  }
+
+  .error h5 {
+    color: red;
+  }
+
+  .field {
+
+    display: block;
+    margin-bottom: 5px;
+
+    label {
+      margin-right: 5px;
+    }
+
+    input[type='text'], select {
+      width: 120px;
+    }
+
+    input[type='submit'] {
+      margin-top: 5px;
+      width: 200px;
+    }
+
+  }
+}

data/app/assets/stylesheets/store/spree_delivery_options.css

@@ -1,5 +1,6 @@
 /*
  *= require store/spree_frontend
  *= require store/delivery_checkout
+ *= require store/delivery_options_homepage
  *= require store/jquery-ui-1.10.4.custom.css
  */

data/app/controllers/spree/taxons_controller_decorator.rb

@@ -0,0 +1,3 @@
+Spree::TaxonsController.class_eval do
+  helper 'spree_delivery_options/base' 
+end

data/app/helpers/spree_delivery_options/base_helper.rb

@@ -1,6 +1,14 @@
 module SpreeDeliveryOptions
   module BaseHelper
 
+    def current_order_cutoff_time
+      return nil unless (current_order && current_order.delivery_date)
+      
+      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
+
     def next_delivery_slot
       delivery_options = JSON.parse(SpreeDeliveryOptions::Config.delivery_time_options)
 
@@ -13,9 +21,9 @@ module SpreeDeliveryOptions
     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)
+      cutoff_time = Time.zone.now.change(hour: SpreeDeliveryOptions::Config.delivery_cut_off_hour)
 
-      current_day = Time.now > cutoff_time ? (Date.today + 2.days) : Date.tomorrow
+      current_day = Time.zone.now > cutoff_time ? (Date.current + 2.days) : (Date.current + 1.day)
       next_available_day = nil
       counter = 0
 

data/app/models/spree/order_decorator.rb

@@ -2,6 +2,9 @@ Spree::Order.class_eval do
   require 'date'
   require 'spree/order/checkout'
 
+  validate :valid_delivery_date?
+  validate :valid_delivery_time?
+
   def valid_delivery_instructions?
     if self.delivery_instructions && self.delivery_instructions.length > 500
       self.errors[:delivery_instructions] << 'cannot be longer than 500 charachters'
@@ -10,20 +13,22 @@ Spree::Order.class_eval do
     true
   end
 
-  def valid_delivery_date?
-
+  def delivery_date_present?
     self.errors[:delivery_date] << 'cannot be blank' unless self.delivery_date
+    self.errors[:delivery_date].empty? ? true : false
+  end
 
+  def valid_delivery_date?
     if self.delivery_date
-      self.errors[:delivery_date] << 'cannot be today or in the past' if self.delivery_date <= Date.today
+      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."
       end
 
-      cutoff_time = Time.now.change(hour: SpreeDeliveryOptions::Config.delivery_cut_off_hour)
-      if self.delivery_date == Date.tomorrow && Time.now > (cutoff_time + 15.minutes)
+      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
@@ -31,6 +36,11 @@ Spree::Order.class_eval do
     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
 
@@ -64,6 +74,10 @@ Spree::PermittedAttributes.checkout_attributes << :delivery_time
 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?
 

data/app/overrides/add_delivery_options_to_taxon.rb

@@ -0,0 +1,5 @@
+Deface::Override.new(:virtual_path => "spree/taxons/show",
+                     :name => "add_delivery_options_to_taxon",
+                     :insert_before => "h1.taxon-title",
+                     :partial => "spree/taxons/delivery_options",
+                     :disabled => false)

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

@@ -0,0 +1,29 @@
+#delivery-options-homepage
+  - order = current_order(true)
+  - if order.delivery_date? && order.delivery_time
+    .row.success
+      .columns.sixteen.alpha.omega
+        %h5
+          = "Thanks! Your order is scheduled for #{order.delivery_date.strftime('%A, %d %b')} from #{order.delivery_time}."
+          = " You just need to complete it by #{current_order_cutoff_time}"
+        %p
+          You can still change it at the checkout if needed.
+  - else
+    .row.form
+      .columns.seven.alpha
+        %h3 Want to know when you're getting your groceries?
+        %h5 Choose your delivery time and get it sorted now
+      .columns.four
+        = form_for order, {url: api_order_url(order), html: {id: 'delivery-options-form'}} do |form|
+          = hidden_field_tag 'order_token', order.token
+          .field
+            = form.label :delivery_date, "Delivery Date"
+            = form.text_field :delivery_date, value: (l(order.delivery_date) rescue l(Date.current))
+          .field
+            = form.label :delivery_time, "Delivery Time"
+            = form.select :delivery_time, JSON.parse(SpreeDeliveryOptions::Config.delivery_time_options)["monday"]
+          .field
+            = form.submit "Set Delivery Time"
+          .delivery-time-options{data: SpreeDeliveryOptions::Config.delivery_time_options}
+      .columns.four.omega
+        .error.hide

data/spec/helpers/spree_delivery_options/base_helper_spec.rb

@@ -2,6 +2,36 @@ require 'spec_helper'
 
 describe SpreeDeliveryOptions::BaseHelper do
 
+  describe 'current order cutoff time' do
+
+    let(:order){FactoryGirl.build(:order)}
+
+    before :each do
+      helper.stub(:current_order).and_return(order)
+    end
+    
+    it 'should return nil if there is no current order' do
+      helper.stub(:current_order).and_return(nil)
+      helper.current_order_cutoff_time.should be_nil
+    end
+
+    it 'should return nil if there 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 = 12
+      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'
+      Timecop.return
+    end
+
+  end
+
   describe 'next delivery slot' do
 
     it 'should return first slot for tomorrow if its before cutoff time' do

data/spec/models/order_spec.rb

@@ -8,7 +8,7 @@ describe Spree::Order do
     SpreeDeliveryOptions::Config.delivery_time_options = {monday: ['Between 6-7am']}.to_json
   end
 
-  describe 'delivery instructions' do
+  describe 'valid_delivery_instructions' do
 
     it 'should accept nil delivery instructions' do
       order.delivery_instructions = nil
@@ -36,100 +36,101 @@ describe Spree::Order do
 
   end
 
-  describe "delivery options" do
+  describe "delivery_date_present" 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 date' do
+      order.delivery_date_present?.should == false
+      order.errors[:delivery_date].should_not be_empty
+    end
 
-      it 'should require delivery time' do
-        order.delivery_date = Date.today
+  end
 
-        order.valid_delivery_time?.should == false
-        order.errors[:delivery_time].should_not be_empty
-      end
+  describe "valid_delivery_date" do
 
-      it 'should require a valid option for delivery time' do
-        order.delivery_date = Date.today
+    before :each do
+      SpreeDeliveryOptions::Config.delivery_time_options = {monday: ['Between 6-7am']}.to_json
+    end
 
-        order.delivery_time = 'crazy times!'
-        order.valid_delivery_time?.should == false
-        order.errors[:delivery_time].should_not be_empty
-      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.errors[:delivery_date].should_not be_empty
     end
 
-    describe "validating the cut off hour" do
+    it 'should not be valid if delivery date is today' do
+      order.delivery_date = Date.today
+      order.valid_delivery_date?.should == false
+      order.errors[:delivery_date].should_not be_empty
+    end
 
-      before :each do
-        SpreeDeliveryOptions::Config.delivery_time_options = {monday: ['Between 6-7am']}.to_json
-      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")
+      Timecop.freeze(time_now)
 
-      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.errors[:delivery_date].should_not be_empty
-      end
+      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 today' do
-        order.delivery_date = Date.today
-        order.valid_delivery_date?.should == false
-        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 + 15 min' do
+      time_now = DateTime.parse("17/11/2013 #{SpreeDeliveryOptions::Config.delivery_cut_off_hour}:16 +1100")
+      Timecop.freeze(time_now)
 
-      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 == false
+      order.errors[:delivery_date].should_not be_empty
+      Timecop.return
+    end
 
-        order.delivery_date = '18/11/2013'
-        order.valid_delivery_date?.should == true
-        order.errors[:delivery_date].should 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("17/11/2013 #{SpreeDeliveryOptions::Config.delivery_cut_off_hour-1}:59 +1100")
+      Timecop.freeze(time_now)
 
-      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'
+      order.valid_delivery_date?
+      order.errors[:delivery_date].should be_empty
+      Timecop.return
+    end
 
-        order.delivery_date = '18/11/2013'
-        order.valid_delivery_date?.should == false
-        order.errors[:delivery_date].should_not be_empty
-        Timecop.return
-      end
+  end
 
-      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)
+  describe 'delivery_time_present' do
 
-        order.delivery_date = '18/11/2013'
-        order.valid_delivery_date?
-        order.errors[:delivery_date].should be_empty
-        Timecop.return
-      end
+    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
 
-    describe "validating the week day" do
+  end
+
+  describe 'valid_delivery_time' do
 
-      before :each do
-        SpreeDeliveryOptions::Config.delivery_time_options = {monday: ['Between 6-7am']}.to_json
-      end
+    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
-      end
+    it 'should require a valid option for delivery time' do
+      order.delivery_date = Date.today
 
-      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
+      order.delivery_time = 'crazy times!'
+      order.valid_delivery_time?.should == false
+      order.errors[:delivery_time].should_not be_empty
+    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
+    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
 
     describe "overriding delivery day with specific date" do
@@ -178,5 +179,4 @@ describe Spree::Order do
 
   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.15'
+  s.version     = '2.2.0'
   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.15
+  version: 2.2.0
 platform: ruby
 authors:
 - Francisco Trindade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -221,6 +221,7 @@ files:
 - app/assets/images/store/ui-icons_ffffff_256x240.png
 - app/assets/javascripts/admin/delivery_time_options.js
 - app/assets/javascripts/admin/spree_delivery_options.js
+- app/assets/javascripts/store/delivery_options_form.js
 - app/assets/javascripts/store/delivery_time_options.js
 - app/assets/javascripts/store/jquery-ui-1.10.4.custom.js
 - app/assets/javascripts/store/spree_delivery_options.js
@@ -228,14 +229,17 @@ files:
 - app/assets/stylesheets/admin/order_details.scss
 - app/assets/stylesheets/admin/spree_delivery_options.css
 - app/assets/stylesheets/store/delivery_checkout.scss
+- app/assets/stylesheets/store/delivery_options_homepage.scss
 - 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/controllers/spree/taxons_controller_decorator.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
+- app/overrides/add_delivery_options_to_taxon.rb
 - app/overrides/admin_order_information.rb
 - app/overrides/admin_orders_delivery_date_column.rb
 - app/overrides/admin_orders_delivery_date_filter.rb
@@ -250,6 +254,7 @@ files:
 - app/views/spree/admin/shared/_delivery_options_link.haml
 - app/views/spree/checkout/_delivery_date.haml
 - app/views/spree/orders/_order_delivery_date_details.html.erb
+- app/views/spree/taxons/_delivery_options.haml
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20130415025010_add_delivery_date_to_orders.rb