spree_repeat_order 2.1.6 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23d04d79d2b954afbfe23147331f9bf51452e4e0
-  data.tar.gz: d86789bd49ffeb0f086b67f45cc5d8a1ccc097dc
+  metadata.gz: 4b0c2201cb257a1fb5b4717c31cd6b35075ee6f6
+  data.tar.gz: f77c367e1782e156d3b246409ff89736d6c988f7
 SHA512:
-  metadata.gz: c0f286aa13040aa5d4acd92704f5ffd13ac3ca4adeb5cc542b27d044e08cf48ab0ac9b961b26e5888e86afb7c64a59c2729dc199639781a0c87ce3b69bdcf040
-  data.tar.gz: 3a080db2e8c0d044ef1ede5041a805d5870c70e032d853818bd79701b54b082899a35fb01e87668312f7aa0d46cc77f406c651ba0fae971036834f14d41e45a5
+  metadata.gz: d75ede7215d5bf6d5e6f6f708416f0a607f9881bff05d50ffecbc54ac52c9b0a961346c6577c132fda2b5be0461008cb89589a36f9e50cdc8b764b2886a99d87
+  data.tar.gz: c2d46b1ec41f9de2e4114b49f9ac379e5be70eb4807655c7a312e3cd790b7a944c84f82697eef4db94e9edcfdf4def44ecd528961fc8b416dec994bfcfc0c9a6

data/app/controllers/spree/admin/repeated_orders_controller.rb

@@ -2,11 +2,14 @@ module Spree
   module Admin
     class RepeatedOrdersController < Spree::Admin::BaseController
 
+      include Spree::SpreeRepeatedOrder::ControllerHelpers::RepeatedOrder
+
       def create
         past_order = Spree::Order.find_by(number: params[:number])
         new_order = Spree::Order.new
 
         duplicate_order(past_order, new_order)
+        duplicate_address(past_order, new_order)
 
         success = true
         success = success && !past_order.completed_at.blank?
@@ -33,17 +36,10 @@ module Spree
         new_order.save
       end
 
-      def duplicate_order(past_order, new_order)
+      def duplicate_address(past_order, new_order)
         new_order.email = past_order.email
         new_order.user = past_order.user
 
-        new_line_items = []
-        past_order.line_items.each do |line_item|
-          new_line_items << line_item.dup
-        end
-
-        new_order.line_items = new_line_items
-
         new_ship_address = past_order.ship_address.dup
         new_order.ship_address = new_ship_address
         new_bill_address = past_order.bill_address.dup
@@ -55,7 +51,7 @@ module Spree
       def duplicate_extension(past_order, new_order)
         #do nothing - only here so it can be overriden
       end
-     
+
     end
   end
 end

data/app/controllers/spree/repeated_orders_controller.rb

@@ -1,6 +1,8 @@
 module Spree
   class RepeatedOrdersController < Spree::StoreController
 
+    include Spree::SpreeRepeatedOrder::ControllerHelpers::RepeatedOrder
+
     before_filter :check_authorization
 
     def create
@@ -20,15 +22,6 @@ module Spree
 
     private
 
-    def duplicate_order(past_order, new_order)
-      new_line_items = []
-      past_order.line_items.each do |line_item|
-        new_line_items << line_item.dup
-      end
-
-      new_order.line_items = new_line_items
-    end
-
     def check_authorization
       session[:access_token] ||= params[:token]
 

data/lib/spree/spree_repeated_order/controller_helpers/repeated_order.rb

@@ -0,0 +1,18 @@
+module Spree
+  module SpreeRepeatedOrder
+    module ControllerHelpers
+      module RepeatedOrder
+
+        def duplicate_order(past_order, new_order)
+          new_line_items = []
+          past_order.line_items.each do |line_item|
+            new_line_items << line_item.dup if (line_item.product && line_item.product.available? && !line_item.product.deleted?)
+          end
+
+          new_order.line_items = new_line_items
+        end
+
+      end
+    end
+  end
+end

data/spec/controllers/admin/repeated_orders_controller_spec.rb

@@ -5,6 +5,8 @@ describe Spree::Admin::RepeatedOrdersController do
   let(:user) { mock_model Spree::User, :last_incomplete_spree_order => nil, :has_spree_role? => true, :spree_api_key => 'fake' }
   let(:order_user) { mock_model(Spree::User, :last_incomplete_spree_order => nil, :has_spree_role? => true, :spree_api_key => 'fake').as_null_object }
 
+  let(:unavailable_product){ FactoryGirl.build(:product, available_on: nil)}
+
   let(:ship_address){ FactoryGirl.build(:address) }
   let(:bill_address){ FactoryGirl.build(:address) }
   let(:line_item_1){ FactoryGirl.build(:line_item) }
@@ -49,6 +51,23 @@ describe Spree::Admin::RepeatedOrdersController do
       response.should be_redirect
     end
 
+    it 'should skip items that dont exist or are not available' do
+      Spree::Order.should_receive(:find_by).with(number: 'ABC1').and_return(past_order)
+      Spree::Order.stub(:new).and_return(new_order)
+
+      line_item_1.should_receive(:product).at_least(:once).and_return nil
+      line_item_2.should_receive(:product).at_least(:once).and_return unavailable_product
+
+      line_item_1.should_not_receive(:dup)
+      line_item_2.should_not_receive(:dup)
+
+      new_order.should_receive(:line_items=).with([])
+      new_order.should_receive(:save).and_return(true)
+
+      spree_post :create, number: "ABC1"
+
+    end
+
     it 'should create order with old customer details' do
       Spree::Order.stub(:new).and_return(new_order)
 

data/spec/controllers/repeated_orders_controller_spec.rb

@@ -9,6 +9,7 @@ describe Spree::RepeatedOrdersController do
     let(:line_item_1){ FactoryGirl.build(:line_item) }
     let(:line_item_2){ FactoryGirl.build(:line_item) }
     let(:past_order){ FactoryGirl.build(:order, line_items: [line_item_1, line_item_2]) }
+    let(:unavailable_product){ FactoryGirl.build(:product, available_on: nil)}
 
     let(:new_order){ FactoryGirl.build(:order) }
     let(:line_item_clone_1){ FactoryGirl.build(:line_item) }
@@ -33,6 +34,22 @@ describe Spree::RepeatedOrdersController do
       response.should be_redirect
     end
 
+    it 'should skip items that dont exist or are not available' do
+      Spree::Order.should_receive(:find_by).with(number: 'ABC1').and_return(past_order)
+      Spree::Order.stub(:new).and_return(new_order)
+
+      line_item_1.should_receive(:product).at_least(:once).and_return nil
+      line_item_2.should_receive(:product).at_least(:once).and_return unavailable_product
+
+      line_item_1.should_not_receive(:dup)
+      line_item_2.should_not_receive(:dup)
+
+      new_order.should_receive(:line_items=).with([])
+      new_order.should_receive(:save).and_return(true)
+
+      spree_post :create, number: "ABC1"
+    end
+
     it 'should show success flash message' do
       spree_post :create, number: "ABC1"
       flash[:success].should =~ /added your past order items to the cart/

data/spree_repeat_order.gemspec

@@ -2,14 +2,13 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_repeat_order'
-  s.version     = '2.1.6'
+  s.version     = '2.1.7'
   s.summary     = 'Makes it possible to repeat an existing order with one click'
   s.description = ''
   s.required_ruby_version = '>= 2.0.0'
 
   s.author    = 'Francisco Trindade'
   s.email     = 'frank.trindade@gmail.com'
-  # s.homepage  = 'http://www.spreecommerce.com'
 
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_repeat_order
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7
 platform: ruby
 authors:
 - Francisco Trindade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -218,6 +218,7 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - lib/generators/spree_repeat_order/install/install_generator.rb
+- lib/spree/spree_repeated_order/controller_helpers/repeated_order.rb
 - lib/spree_repeat_order.rb
 - lib/spree_repeat_order/engine.rb
 - spec/controllers/admin/repeated_orders_controller_spec.rb