spree_repeat_order 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4272177e4ab193ae6d44bbe06734a7a64ef71720
-  data.tar.gz: a4d9315577742e88f62b8171297552dd61ba2a48
+  metadata.gz: 23d04d79d2b954afbfe23147331f9bf51452e4e0
+  data.tar.gz: d86789bd49ffeb0f086b67f45cc5d8a1ccc097dc
 SHA512:
-  metadata.gz: ac636e5983be435046974a61e8722bed2c6761a295f669fcac6ec29daaa5cc279cdea570942696ef610e5ac9fab7672f3aba3819ca30a371aac4ab20930a7211
-  data.tar.gz: e1fc4334270edbd24cb02a32d22c7c4bf8988b5eaa1e8c54f0c0ef8d22cd4aa1d0f4abd37ba992b4990a3e8d1b36fbf678122714e937d7e2064a122d55e9cd52
+  metadata.gz: c0f286aa13040aa5d4acd92704f5ffd13ac3ca4adeb5cc542b27d044e08cf48ab0ac9b961b26e5888e86afb7c64a59c2729dc199639781a0c87ce3b69bdcf040
+  data.tar.gz: 3a080db2e8c0d044ef1ede5041a805d5870c70e032d853818bd79701b54b082899a35fb01e87668312f7aa0d46cc77f406c651ba0fae971036834f14d41e45a5

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

@@ -11,8 +11,7 @@ module Spree
         success = true
         success = success && !past_order.completed_at.blank?
         success = success && new_order.save
-        success = success && new_order.next #ADDRESS
-        success = success && new_order.next #DELIVERY
+        success = success && merge_with_current_order(new_order)
 
         if success
           flash[:success] = "The order has been duplicated. The new order id is #{new_order.number}"
@@ -26,8 +25,17 @@ module Spree
 
       private
 
+      def merge_with_current_order(new_order)
+        user = new_order.user
+
+        user_last_incomplete_order = user.last_incomplete_spree_order
+        new_order.merge!(user_last_incomplete_order, user) if user_last_incomplete_order
+        new_order.save
+      end
+
       def duplicate_order(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|
@@ -40,6 +48,12 @@ module Spree
         new_order.ship_address = new_ship_address
         new_bill_address = past_order.bill_address.dup
         new_order.bill_address = new_bill_address
+
+        duplicate_extension(past_order, new_order)
+      end
+
+      def duplicate_extension(past_order, new_order)
+        #do nothing - only here so it can be overriden
       end
      
     end

data/lib/spree_repeat_order/engine.rb

@@ -1,6 +1,8 @@
 module SpreeRepeatOrder
   class Engine < Rails::Engine
+
     require 'spree/core'
+
     isolate_namespace Spree
     engine_name 'spree_repeat_order'
 

data/spec/controllers/admin/repeated_orders_controller_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 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(:ship_address){ FactoryGirl.build(:address) }
   let(:bill_address){ FactoryGirl.build(:address) }
@@ -13,7 +14,8 @@ describe Spree::Admin::RepeatedOrdersController do
     ship_address: ship_address,
     bill_address: bill_address,
     completed_at: Date.yesterday,
-    number: 'ABC1'
+    number: 'ABC1',
+    user: order_user
   }) }
 
   let(:new_order){ double(Spree::Order).as_null_object }
@@ -53,6 +55,7 @@ describe Spree::Admin::RepeatedOrdersController do
       ship_address.should_receive(:dup).and_return(new_ship_address)
       bill_address.should_receive(:dup).and_return(new_bill_address)
 
+      new_order.should_receive(:user=).with(order_user)
       new_order.should_receive(:ship_address=).with(new_ship_address)
       new_order.should_receive(:bill_address=).with(new_bill_address)
 
@@ -66,6 +69,32 @@ describe Spree::Admin::RepeatedOrdersController do
       response.should redirect_to('/admin/orders/ABC1')
     end
 
+    describe 'merging with current order' do
+
+      before :each do
+        @new_order = Spree::Order.new
+        @new_order.stub(:merge!)
+        Spree::Order.stub(:new).and_return(@new_order)
+      end
+
+      it 'should merge last incomplete order with new order' do
+        incomplete_order = double(Spree::Order)
+        order_user.stub(:last_incomplete_spree_order).and_return(incomplete_order)
+        @new_order.should_receive(:merge!).with(incomplete_order, order_user)
+         
+        spree_post :create, number: "ABC1"
+      end
+
+      it 'should not merge if user doesnt have a last incomplete order' do
+        order_user.stub(:last_incomplete_spree_order).and_return(nil)
+        @new_order.should_not_receive(:merge!)
+         
+        spree_post :create, number: "ABC1"
+      end
+
+
+    end
+
   end
 
   describe 'integration' do
@@ -76,6 +105,7 @@ describe Spree::Admin::RepeatedOrdersController do
     end
 
     it 'should create new order with same line items' do
+      user = FactoryGirl.create(:user)
       ship_address = FactoryGirl.create(:address)
       bill_address = FactoryGirl.create(:address)
       past_order = FactoryGirl.create(:completed_order_with_totals, ship_address: ship_address, bill_address: bill_address)
@@ -85,7 +115,7 @@ describe Spree::Admin::RepeatedOrdersController do
 
       last_order = Spree::Order.last
       last_order.line_items.count.should == past_order.line_items.count
-      last_order.state.should == 'delivery'
+      last_order.state.should == 'cart'
       last_order.ship_address.firstname = past_order.ship_address.firstname
       last_order.bill_address.firstname = past_order.bill_address.firstname
     end

data/spree_repeat_order.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_repeat_order'
-  s.version     = '2.1.5'
+  s.version     = '2.1.6'
   s.summary     = 'Makes it possible to repeat an existing order with one click'
   s.description = ''
   s.required_ruby_version = '>= 2.0.0'
@@ -16,9 +16,9 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'spree_core', '~> 2.1.3'
-  s.add_dependency 'spree_frontend', '~> 2.1.3'
-  s.add_dependency 'spree_backend', '~> 2.1.3'
+  s.add_dependency 'spree_core', '~> 2.1.4'
+  s.add_dependency 'spree_frontend', '~> 2.1.4'
+  s.add_dependency 'spree_backend', '~> 2.1.4'
 
   s.add_development_dependency 'capybara', '~> 2.1'
   s.add_development_dependency 'coffee-rails'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_repeat_order
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - Francisco Trindade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 2.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: spree_frontend
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 2.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: spree_backend
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 2.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement