spree_delivery_options 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90430005aee2f9194697cdebfdb46ccd1015f8c5
-  data.tar.gz: 67bc5085c228035dea01d91680eb9ebf44775ace
+  metadata.gz: ffa0c34813e0e8d339119ca8a2fd0fd9452f7432
+  data.tar.gz: 797b69f00b0950d2846e4f0996190f74c7956a54
 SHA512:
-  metadata.gz: 9f5d66a7bec717d37b60e798b10c0c2597d343741aea9fa9946d4e751a9551922c9444b178a088c1401ae3ec0bb2b09531b9789b34eaaa8fd726b9de19cb43de
-  data.tar.gz: e5058ee418577d59dff2ccc5e9361edbf32a89a242a124dc90491b6b817b0798b098bb3710c03da74ceb7221c43e6a95aa749d3b02d5b80153161d29f2e5769d
+  metadata.gz: 4e16f085274d39bb8b177cf77ca0cc98a0f627f3420e7e505a8401c4f6938640c618067733a97fe22774a49f2cb2384a7c8ae3f44a20a71d8927caf77049d5e9
+  data.tar.gz: 0fdfeb40e6644e8af809fc5df803288240dfbf12a5c3b4b70e8f9fa5790597bc4451d6ea8ffdf1ebfecf2896a565a9e2eb10c87f14229d5ab715e50d0b8e5369

data/app/assets/stylesheets/admin/order_details.scss

@@ -0,0 +1,10 @@
+#delivery-info {
+  table th, table td {
+    text-align: center;
+  }
+  .delivery-instructions {
+    label {
+      display: block;
+    }
+  }
+}

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

@@ -0,0 +1,3 @@
+/*
+ *= require admin/order_details
+ */

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

@@ -1,7 +1,7 @@
 @import 'store/variables';
 
 #shipping_method {
-  .stock-delivery-date-title {
+  .stock-delivery-date-title, .stock-delivery-instructions-title {
     background-color: lighten($body_text_color, 70);
     text-align: center;
     text-transform: uppercase;
@@ -9,3 +9,18 @@
     font-size :11px;
    }
 }
+
+#delivery_date, #delivery_instructions {
+  .field {
+    margin: 20px 0;
+
+    label {
+      margin-right: 20px;
+    }
+  }
+}
+
+#delivery_instructions textarea {
+  width: 100%;
+  min-height: 100px;
+}

data/app/models/spree/order_decorator.rb

@@ -2,6 +2,14 @@ Spree::Order.class_eval do
   require 'date'
   require 'spree/order/checkout'
 
+  def valid_delivery_instructions?
+    if self.delivery_instructions.length > 500
+      self.errors[:delivery_instructions] << 'cannot be longer than 500 charachters'
+      return false
+    end
+    true
+  end
+
   def valid_delivery_date?
     self.errors[:delivery_date] << 'cannot be blank' unless self.delivery_date
 
@@ -32,7 +40,9 @@ end
 
 Spree::PermittedAttributes.checkout_attributes << :delivery_date
 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 => :valid_delivery_date?
 Spree::Order.state_machine.before_transition :to => :payment, :do => :valid_delivery_time?
 

data/app/overrides/add_delivery_info_to_order_details.rb

@@ -0,0 +1,5 @@
+Deface::Override.new(:virtual_path => "spree/admin/orders/_form",
+                     :name => "add_delivery_info_to_order_details",
+                     :insert_bottom => "[data-hook='admin_order_form_fields']",
+                     :partial => "spree/admin/orders/delivery_info",
+                     :disabled => false)

data/app/views/spree/admin/orders/_delivery_info.haml

@@ -0,0 +1,17 @@
+%fieldset#delivery-info.no-border-bottom
+  %legend= Spree.t(:delivery_info)
+  %table
+    %thead
+      %th= Spree.t(:date)
+      %th= Spree.t(:time)
+    %tbody
+      %td= @order.delivery_date
+      %td= @order.delivery_time
+  .delivery-instructions
+    %label= Spree.t(:delivery_instructions)
+    %span
+      - if @order.delivery_instructions.nil?
+        No instructions provided
+      - else
+        = @order.delivery_instructions
+

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

@@ -0,0 +1,14 @@
+%h5.stock-delivery-date-title
+  Delivery Date
+#delivery_date
+  .field
+    = form.label :delivery_date, "Delivery Date"
+    = form.date_select :delivery_date
+  .field
+    = form.label :delivery_time, "Delivery Time"
+    = form.select :delivery_time, JSON.parse(SpreeDeliveryOptions::Config.delivery_time_options).values, {}
+%h5.stock-delivery-instructions-title
+  Delivery Instructions/Comments
+#delivery_instructions
+  .field
+    = form.text_area :delivery_instructions

data/db/migrate/20140109003355_add_delivery_instructions.rb

@@ -0,0 +1,5 @@
+class AddDeliveryInstructions < ActiveRecord::Migration
+  def change
+    add_column :spree_orders, :delivery_instructions, :text
+  end
+end

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

@@ -7,6 +7,7 @@ module SpreeDeliveryOptions
 
       def add_stylesheets
         inject_into_file 'app/assets/stylesheets/store/all.css', " *= require store/spree_delivery_options\n", :before => /\*\//, :verbose => true
+        inject_into_file 'app/assets/stylesheets/admin/all.css', " *= require admin/spree_delivery_options\n", :before => /\*\//, :verbose => true
       end
 
       def add_migrations

data/spec/models/order_spec.rb

@@ -79,6 +79,22 @@ describe Spree::Order do
 
     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
+
 
   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.3'
+  s.version     = '2.1.4'
   s.summary     = 'Adds delivery date and time during checkout'
   s.description = ''
   s.required_ruby_version = '>= 2.0.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_delivery_options
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Francisco Trindade
@@ -191,9 +191,12 @@ files:
 - README.md
 - Rakefile
 - Versionfile
+- 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/spree_delivery_options.css
 - app/models/spree/order_decorator.rb
+- app/overrides/add_delivery_info_to_order_details.rb
 - app/overrides/admin_order_information.rb
 - app/overrides/admin_orders_delivery_date_column.rb
 - app/overrides/admin_orders_delivery_date_filter.rb
@@ -202,13 +205,15 @@ files:
 - app/views/spree/admin/orders/_delivery_date_cell.html.erb
 - app/views/spree/admin/orders/_delivery_date_filter.html.erb
 - app/views/spree/admin/orders/_delivery_date_header.html.erb
+- app/views/spree/admin/orders/_delivery_info.haml
 - app/views/spree/admin/shared/_admin_order_information_delivery_date.html.erb
-- app/views/spree/checkout/_delivery_date.html.erb
+- app/views/spree/checkout/_delivery_date.haml
 - app/views/spree/orders/_order_delivery_date_details.html.erb
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20130415025010_add_delivery_date_to_orders.rb
 - db/migrate/20131206053316_add_delivery_time_to_orders.rb
+- db/migrate/20140109003355_add_delivery_instructions.rb
 - lib/generators/spree_delivery_options/install/install_generator.rb
 - lib/spree_delivery_options.rb
 - lib/spree_delivery_options/configuration.rb

data/app/views/spree/checkout/_delivery_date.html.erb

@@ -1,7 +0,0 @@
-<h5 class="stock-delivery-date-title">Delivery Date</h5>
-<p id="delivery_date">
-  <%= form.label :delivery_date, "Delivery Date" %><br />
-  <%= form.date_select :delivery_date, default: Date.yesterday %><br />
-  <%= form.label :delivery_time, "Delivery Time" %><br />
-  <%= form.select :delivery_time, JSON.parse(SpreeDeliveryOptions::Config.delivery_time_options).values, {}
-</p>