spree_delivery_options 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7197ed6715f25f01dc179ffe8f18e8821752ab8c
-  data.tar.gz: 719ea6457afe6019b8c2fa812ed9f03375d2de8a
+  metadata.gz: 0ec4e7709318e9c786e6d425f7cac16cc655d25e
+  data.tar.gz: 1433b6e96caf18a0c9e3664ae836865d063d28f0
 SHA512:
-  metadata.gz: 9956697e69ff2ec222d1cbdf8a7e044acce5bec06791f5abee21b5c72f56bd298cbedfd0e003bffda023660e23f05a1aeb801328539528b0b4197860aac26965
-  data.tar.gz: 4518f7274d4cdde0b14cfbb575a710596600c48885b5f1d6952887f1a0121265315c1cc492a13a62c762e7514dbd28ad2962b0c9ca50202f9dc3dbc00c8c61ff
+  metadata.gz: 7ceb6777c09c92c3963aba5047910f9a5cf7cf6ca2abb12cdd5fa38688a9fa686fc3de653417ec2f4a25253362967061a911bc93f4f46e61b1e3472094cee7f6
+  data.tar.gz: b0e4a50a520b747b2b05b256d217593d5881c69ce331b9f21d692de7bf8cb7af1425cbe37b4994edd37a68c88f448a3e497d53565fe0f7646dcdbdbe47d284f3

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

@@ -9,7 +9,7 @@ module Spree
 
         def update
           @order = Order.find_by(number: params[:order_id])
-          if @order.update_attributes(delivery_options_params) && @order.next
+          if update_delivery_options(@order) && @order.next
             flash[:success] = Spree.t('delivery_options_updated')
           end
 
@@ -18,6 +18,15 @@ module Spree
 
         private
 
+        def update_delivery_options(order)
+          order_params = delivery_options_params
+          if order_params[:delivery_date]
+            @order.delivery_date = order_params.delete(:delivery_date)
+            @order.save(validate: false)
+          end
+          @order.update_attributes(order_params)
+        end
+
         def delivery_options_params
           params.require(:order).permit(:delivery_date, :delivery_time, :delivery_instructions)
         end

data/app/models/spree/order_decorator.rb

@@ -19,7 +19,7 @@ Spree::Order.class_eval do
   end
 
   def valid_delivery_date?
-    if self.delivery_date
+    if self.delivery_date && self.delivery_date_changed?
       self.errors[:delivery_date] << 'cannot be today or in the past' if self.delivery_date <= Date.current
 
       options = delivery_time_options(self.delivery_date)

data/app/views/spree/admin/shared/_admin_order_information_delivery_date.html.erb

@@ -1,6 +1,6 @@
 <dt><%= t(:delivery_date) %>:</dt>
 <% if @order.delivery_date != nil %>
-  <dd id='delivery_date'><%= @order.delivery_date %></dd>
+  <dd id='delivery_date'><%= l(@order.delivery_date) %></dd>
 <% else %>
   <dd id='delivery_date'>Unknown</dd>
 <% end %>

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

@@ -26,18 +26,19 @@ describe Spree::Admin::Orders::DeliveryOptionsController do
     before :each do
       Spree::Order.stub(:find_by).and_return(order)
       order.stub(:update_attributes).and_return(true)
+      order.stub(:save)
     end
 
-    it 'should update order' do
-      order.should_receive(:update_attributes).with({"delivery_date" => tomorrow})
-
+    it 'should update delivery date and skip validation' do
+      order.should_receive(:delivery_date=).with(tomorrow)
+      order.should_receive(:save).with(validate: false)
       spree_post :update, order: {delivery_date: tomorrow}
     end
 
-    it 'should call next if update is successful' do
-      order.should_receive(:update_attributes).with({"delivery_date" => tomorrow}).and_return(true)
+    it 'should update other attributes and call next if update is successful' do
+      order.should_receive(:update_attributes).with({"delivery_time" => '7:30am to 9am'}).and_return(true)
       order.should_receive(:next)
-      spree_post :update, order: {delivery_date: tomorrow}
+      spree_post :update, order: {delivery_date: tomorrow, delivery_time: '7:30am to 9am'}
     end
 
     it 'should render edit when successful' do
@@ -46,14 +47,14 @@ describe Spree::Admin::Orders::DeliveryOptionsController do
     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}
+      order.should_receive(:update_attributes).with({"delivery_time" => '7:30am to 9am'}).and_return false
+      spree_post :update, order: {delivery_date: tomorrow, delivery_time: '7:30am to 9am'}
       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'}
+      order.should_receive(:update_attributes).with({"delivery_time" => '7:30am to 9am'})
+      spree_post :update, order: {delivery_date: tomorrow, delivery_time: '7:30am to 9am', crazy: 'blah'}
     end
 
   end

data/spec/models/order_spec.rb

@@ -51,7 +51,6 @@ describe Spree::Order do
       SpreeDeliveryOptions::Config.delivery_time_options = {monday: ['Between 6-7am']}.to_json
     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

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