spree_delivery_options 2.1.9 → 2.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a35f137ad18021a487ebfa104d4417b00e8258f
-  data.tar.gz: e4d9ac7f0118a8bfc6fc307f1a4e871d1b64b017
+  metadata.gz: 000257197aa4e88e1516c66905ca43adc002d988
+  data.tar.gz: b5913ede5baedf31a6a47dae371eb5bf6a8b473a
 SHA512:
-  metadata.gz: 6f61d50ed2351274dada0a0f33409ab53c11304748304241d7a5e3608c5babefc7a7e13a589b5c3268aa81fbd6f856d64dfda20d0c78e1bf918c96a152565740
-  data.tar.gz: ba6331dbf36caf919d5bb65313fa3c9e69df156489daecd8bbd7b743c08d2b9044d3de7acd0caf6e7c383d9b166134aefb58729fc6845642722b1e756f17d0bb
+  metadata.gz: e874be45553226c30884289810d0d03826cbfe2e5eaea382c14cd02fc3d6daf77b89b136eba270a0d635664d779deef728ade7944e8b78715da97d1328c5fc64
+  data.tar.gz: 1797709d7fe53097b81a8b256a70fb3cb975f2cd6c5287e216f0220529b3991d5b73b5b6c1f53f6fb86f01e18757134c91008577d8f55738837fed8fb2973849

data/Gemfile

@@ -1,6 +1,7 @@
 source 'http://rubygems.org'
 
 # Provides basic authentication functionality for testing parts of your engine
-# gem 'spree_auth_devise', :git => "git://github.com/spree/spree_auth_devise"
+gem 'spree_auth_devise', :git => "git://github.com/spree/spree_auth_devise", :branch => '2-1-stable'
+gem 'haml'
 
 gemspec

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

@@ -0,0 +1,56 @@
+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'];
+
+      var dateParts = []
+      if ($('#order_delivery_date').val().indexOf('/') !== -1) {
+        dateParts = $('#order_delivery_date').val().split('/')
+      } 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);
+    }
+  };
+
+  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 ){
+        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 {
+      $('#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/admin/spree_delivery_options.js

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

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

@@ -0,0 +1,15 @@
+#delivery-options-form {
+  .field {
+    label {
+      display: block;
+    }
+
+    textarea {
+      min-height: 100px;
+    }
+  }
+
+  .delivery-time-options {
+    display: none;
+  }
+}

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

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

data/app/controllers/spree/admin/orders/delivery_options_controller.rb

@@ -0,0 +1,25 @@
+module Spree
+  module Admin
+    module Orders
+      class DeliveryOptionsController < Spree::Admin::BaseController
+
+        def edit
+          @order = Order.find_by(number: params[:order_id])
+        end
+
+        def update
+          @order = Order.find_by(number: params[:order_id])
+          @order.update_attributes(delivery_options_params)
+          render :edit
+        end
+
+        private
+
+        def delivery_options_params
+          params.require(:order).permit(:delivery_date, :delivery_time, :delivery_instructions)
+        end
+
+      end
+    end
+  end
+end

data/app/models/spree/order_decorator.rb

@@ -3,7 +3,7 @@ Spree::Order.class_eval do
   require 'spree/order/checkout'
 
   def valid_delivery_instructions?
-    if self.delivery_instructions.length > 500
+    if self.delivery_instructions && self.delivery_instructions.length > 500
       self.errors[:delivery_instructions] << 'cannot be longer than 500 charachters'
       return false
     end

data/app/overrides/add_delivery_options_link_order_page.rb

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

data/app/views/spree/admin/orders/delivery_options/edit.haml

@@ -0,0 +1,35 @@
+= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Delivery Options' }
+
+= csrf_meta_tags
+
+- content_for :page_title do
+  %i.icon-arrow-right= Spree.t(:delivery_options)
+
+- content_for :page_actions do
+  %li= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'icon-arrow-left'
+
+= render :partial => 'spree/shared/error_messages', :locals => { :target => @order }
+
+#delivery-options-form
+  .delivery-time-options{data: SpreeDeliveryOptions::Config.delivery_time_options}
+
+  = form_for @order, :url => admin_order_delivery_options_url(@order) do |f|
+    %fieldset(data-hook="admin_delivery_options_form_fields" class="no-border-top")
+      %fieldset(class="index no-border-bottom")
+        %legend(align="center")= Spree.t(:delivery_options)
+        %div(data-hook="delivery_options_fields" class="row")
+          .alpha.twelve.columns
+            .field
+              = f.label :delivery_date, "Delivery Date"
+              = f.text_field :delivery_date, class: "datepicker"
+            .field
+              - selected_delivery_day = (@order.delivery_date || Date.today).strftime('%A').downcase
+              .selected-delivery-time{data: @order.delivery_time}
+              = f.label :delivery_time, "Delivery Time"
+              = f.select :delivery_time, JSON.parse(SpreeDeliveryOptions::Config.delivery_time_options)[selected_delivery_day]
+            .field
+              = f.label :delivery_instructions, "Delivery Instructions"
+              = f.text_area :delivery_instructions, class: 'fullwidth'
+
+            .form-buttons.filter-actions.actions
+              = button Spree.t('actions.update'), 'icon-refresh'

data/app/views/spree/admin/shared/_delivery_options_link.haml

@@ -0,0 +1,3 @@
+- if can? :update, @order && checkout_steps.include?("delivery") %>
+  %li(class="#{'active' if current == 'Delivery Options'}")
+    = link_to_with_icon 'icon-truck', Spree.t(:delivery_options), admin_order_delivery_options_url(@order)

data/config/routes.rb

@@ -1,3 +1,6 @@
 Spree::Core::Engine.routes.draw do
-  # Add your extension routes here
+
+  get "admin/orders/:order_id/delivery_options/", controller: 'admin/orders/delivery_options', action: 'edit', as: 'admin_order_delivery_options'
+  patch "admin/orders/:order_id/delivery_options/", controller: 'admin/orders/delivery_options', action: 'update'
+
 end

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

@@ -2,8 +2,9 @@ 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"
+        append_file 'app/assets/javascripts/admin/all.js', "//= require admin/spree_delivery_options\n"
       end
 
       def add_stylesheets

data/lib/spree_delivery_options/engine.rb

@@ -1,6 +1,7 @@
 module SpreeDeliveryOptions
   class Engine < Rails::Engine
     require 'spree/core'
+
     isolate_namespace Spree
 
     initializer "spree.spree_delivery_options.preferences", :after => "spree.environment" do |app|
@@ -17,7 +18,10 @@ module SpreeDeliveryOptions
     end
 
     def self.activate
-      Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
+      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/**/*decorator*.rb')) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
       end
     end

data/lib/spree_delivery_options.rb

@@ -1,2 +1,4 @@
 require 'spree_core'
+require 'spree_frontend'
+require 'spree_backend'
 require 'spree_delivery_options/engine'

data/spec/controllers/spree/admin/orders/delivery_options_controller_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe Spree::Admin::Orders::DeliveryOptionsController do
+
+  let(:user) { mock_model Spree::User, :last_incomplete_spree_order => nil, :has_spree_role? => true, :spree_api_key => 'fake' }
+
+  before :each do
+    controller.stub :spree_current_user => user
+    controller.stub :check_authorization
+  end
+
+  describe 'edit' do
+
+    it 'should render edit' do
+      spree_get :edit
+      response.should render_template(:edit)
+    end
+
+  end
+
+  describe 'update' do
+
+    let(:order){Spree::Order.new}
+    let(:tomorrow){Date.tomorrow.strftime("%d/%m/%Y")}
+
+    before :each do
+      Spree::Order.stub(:find_by).and_return(order)
+      order.stub(:update_attributes).and_return(true)
+    end
+
+    it 'should update order' do
+      order.should_receive(:update_attributes).with({"delivery_date" => tomorrow})
+
+      spree_post :update, order: {delivery_date: tomorrow}
+    end
+
+    it 'should render edit when successful' do
+      spree_post :update, order: {delivery_date: tomorrow}
+      response.should render_template(:edit)
+    end
+
+    it 'should render edit when unsuccessful' do
+      order.should_receive(:update_attributes).with({"delivery_date" => tomorrow}).and_return false
+      spree_post :update, order: {delivery_date: tomorrow}
+      response.should render_template(:edit)
+    end
+
+    it 'should not allow to update invalid attributes' do
+      order.should_receive(:update_attributes).with({"delivery_date" => tomorrow})
+      spree_post :update, order: {delivery_date: tomorrow, crazy: 'blah'}
+    end
+
+  end
+
+end

data/spec/models/order_spec.rb

@@ -10,6 +10,18 @@ describe Spree::Order do
 
   describe 'delivery instructions' do
 
+    it 'should accept nil delivery instructions' do
+      order.delivery_instructions = nil
+      order.valid_delivery_instructions?.should be_true
+      order.errors[:delivery_instructions].should be_empty
+    end
+
+    it 'should accept empty delivery instructions' do
+      order.delivery_instructions = ""
+      order.valid_delivery_instructions?.should be_true
+      order.errors[:delivery_instructions].should be_empty
+    end
+
     it 'should accept valid delivery instructions' do
       order.delivery_instructions = "This is awesome"
       order.valid_delivery_instructions?.should be_true

data/spec/spec_helper.rb

@@ -40,6 +40,7 @@ RSpec.configure do |config|
   # visit spree.admin_path
   # current_path.should eql(spree.products_path)
   config.include Spree::TestingSupport::UrlHelpers
+  config.include Spree::TestingSupport::ControllerRequests
 
   # == Mock Framework
   #

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.9'
+  s.version     = '2.1.10'
   s.summary     = 'Adds delivery date and time during checkout'
   s.description = ''
   s.required_ruby_version = '>= 2.0.0'
@@ -17,6 +17,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'spree_core', '~> 2.1.3'
 
+  s.add_runtime_dependency 'haml'
+
   s.add_development_dependency 'capybara', '~> 2.1'
   s.add_development_dependency 'coffee-rails'
   s.add_development_dependency 'database_cleaner'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_delivery_options
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.1.10
 platform: ruby
 authors:
 - Francisco Trindade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.1.3
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -205,16 +219,21 @@ files:
 - app/assets/images/store/ui-icons_666666_256x240.png
 - app/assets/images/store/ui-icons_ff0084_256x240.png
 - 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_time_options.js
 - app/assets/javascripts/store/jquery-ui-1.10.4.custom.js
 - app/assets/javascripts/store/spree_delivery_options.js
+- 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/store/delivery_checkout.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/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/admin_order_information.rb
 - app/overrides/admin_orders_delivery_date_column.rb
 - app/overrides/admin_orders_delivery_date_filter.rb
@@ -224,7 +243,9 @@ files:
 - 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/orders/delivery_options/edit.haml
 - app/views/spree/admin/shared/_admin_order_information_delivery_date.html.erb
+- 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
 - config/locales/en.yml
@@ -237,6 +258,7 @@ files:
 - lib/spree_delivery_options/configuration.rb
 - lib/spree_delivery_options/engine.rb
 - script/rails
+- spec/controllers/spree/admin/orders/delivery_options_controller_spec.rb
 - spec/models/order_spec.rb
 - spec/spec_helper.rb
 - spree_delivery_options.gemspec
@@ -265,5 +287,6 @@ signing_key:
 specification_version: 4
 summary: Adds delivery date and time during checkout
 test_files:
+- spec/controllers/spree/admin/orders/delivery_options_controller_spec.rb
 - spec/models/order_spec.rb
 - spec/spec_helper.rb