spree_delivery_options 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b19936a62b8807116a557c91212c3d2b0ec4cdc2
-  data.tar.gz: 5bc39846c2a6cdd32fe656807b1752ed6f3cd479
+  metadata.gz: 871fae6de43052706a38f68451b18932e6b387d9
+  data.tar.gz: 6e000b0a681393c7a9c724518f99a6bd12fe8ae6
 SHA512:
-  metadata.gz: af672b3f1e226c927e773dfc2c01c063102ab080e0072149c97ee2f482ce1d4e35027336f886d16e681e76c52f7dc735a7739407bc7458e08f29815521016e13
-  data.tar.gz: e4ea617a6d6e621577cf8bf2d01068f8e314cc616df90491a09835f504178a8f8e7327d478125b816843d70214fae0104a211a60605f3aec03b690dde2d7d145
+  metadata.gz: e0914c7916ae6e827a7754e345aeee590786aab72efa103812fc339e586167057f567b6c3c14e32c338a14b1b443998112fb78375b0f72b26550385a01cf7b12
+  data.tar.gz: 22339ae439aa6d1085c748798b40671203ba2b51d150c53e7a63b24ad2622ee3dcd9eff2ad9fffd562617cd34f1106128a949f519b54e8be32e53e8a8c3968ab

data/README.md

@@ -18,6 +18,7 @@ Features
 * Allows admin to filter orders by delivery date and time (date range).
 * Allows admin to sort orders by delivery date and time.
 * Adds delivery date column to orders index page table.
+* Adds delivery options banner to taxons page (configurable)
 
 
 Installation

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

@@ -41,10 +41,15 @@ function SpreeDeliveryOptions() {
 
   this.populate_delivery_time = function(options) {
     if (options) {
+      var selected_delivery_time = $('.selected-delivery-time').attr("data");
       var arLen = options.length;
       var newList = "";
       for ( var i=0, len=arLen; i<len; ++i ){
-        newList = newList + "<option value='" + options[i] + "'>" + options[i]+'</option>';
+        if (options[i] == selected_delivery_time) {
+          newList = newList + '<option selected=true value="' + options[i] + '">' + options[i]+'</option>';
+        } else {
+          newList = newList + "<option value='" + options[i] + "'>" + options[i]+'</option>';
+        }
       }
       $('#order_delivery_time').html(newList);
     } else {

data/app/assets/stylesheets/guides/responsive.scss

@@ -0,0 +1,2 @@
+$break-phone: 768px;
+$break-tablet: 992px;

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

@@ -17,6 +17,10 @@
     label {
       margin-right: 20px;
     }
+
+    input[type='text'], select {
+      width: 130px;
+    }
   }
 
   .delivery-time-options {

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

@@ -1,3 +1,5 @@
+@import 'guides/responsive';
+
 #delivery-options-homepage {
   background-color: #ccc;
   padding: 10px;
@@ -38,3 +40,11 @@
 
   }
 }
+
+@media screen and (max-width: $break-phone) {
+
+  #delivery-options-homepage {
+    display: none;
+  }
+
+}

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

@@ -3,10 +3,11 @@
 #delivery_date
   .field
     = form.label :delivery_date, "Delivery Date"
-    = form.text_field :delivery_date
+    = form.text_field :delivery_date, value: (l(@order.delivery_date) rescue l(Date.current))
   .field
+    .selected-delivery-time{data: @order.delivery_time}
     = form.label :delivery_time, "Delivery Time"
-    = form.select :delivery_time, JSON.parse(SpreeDeliveryOptions::Config.delivery_time_options)["monday"]
+    = form.select :delivery_time, JSON.parse(SpreeDeliveryOptions::Config.delivery_time_options)["monday"] 
 
   .delivery-time-options{data: SpreeDeliveryOptions::Config.delivery_time_options}
 

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

@@ -1,29 +1,30 @@
-#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
+- if SpreeDeliveryOptions::Config.show_homepage_form
+  #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/lib/spree_delivery_options/configuration.rb

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

data/lib/spree_delivery_options/engine.rb

@@ -18,9 +18,6 @@ module SpreeDeliveryOptions
     end
 
     def self.activate
-      Dir.glob(File.join(File.dirname(__FILE__), '../../app/controllers/**/*.rb')) do |c|
-        Rails.configuration.cache_classes ? require(c) : load(c)
-      end
       Dir.glob(File.join(File.dirname(__FILE__), '../../app/helpers/**.rb')) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
       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.0'
+  s.version     = '2.2.1'
   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.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Francisco Trindade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -228,6 +228,7 @@ files:
 - app/assets/stylesheets/admin/delivery_options_form.scss
 - app/assets/stylesheets/admin/order_details.scss
 - app/assets/stylesheets/admin/spree_delivery_options.css
+- app/assets/stylesheets/guides/responsive.scss
 - 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