spree_repeat_order 2.1.7 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b0c2201cb257a1fb5b4717c31cd6b35075ee6f6
-  data.tar.gz: f77c367e1782e156d3b246409ff89736d6c988f7
+  metadata.gz: 57184e323e58d8638e9bdaa9a19b70cff0bf56cc
+  data.tar.gz: c03f7fcf6042f94310e9b4adf7b8e7ae556aef6a
 SHA512:
-  metadata.gz: d75ede7215d5bf6d5e6f6f708416f0a607f9881bff05d50ffecbc54ac52c9b0a961346c6577c132fda2b5be0461008cb89589a36f9e50cdc8b764b2886a99d87
-  data.tar.gz: c2d46b1ec41f9de2e4114b49f9ac379e5be70eb4807655c7a312e3cd790b7a944c84f82697eef4db94e9edcfdf4def44ecd528961fc8b416dec994bfcfc0c9a6
+  metadata.gz: 03d37c679d485b77231ad435d46a6d3819307b4d5575d0c197788c3ea4e6cc447d65b2a1a8e9b2b2590eb63d0d22db97466706e0f5e6bf7e44a3f3e6f7446b08
+  data.tar.gz: 1f6c9ab54b52050e975c974e3ac049d55f49b053408a9601d44883adb0624497e4d0de205db35c0df9153f6095cb61f754cb028cc2ed53c4fee5e0f6541878d4

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

@@ -13,7 +13,8 @@ module Spree
 
         success = true
         success = success && !past_order.completed_at.blank?
-        success = success && new_order.save
+        success = success && new_order.generate_order_number #forcing number generation since we are skipping validation
+        success = success && new_order.save(validate: false)
         success = success && merge_with_current_order(new_order)
 
         if success
@@ -21,7 +22,7 @@ module Spree
           redirect_to(admin_orders_path)
         else
           flash[:error] = 'Oops.. something went wrong and the order could not be duplicated'
-          redirect_to(admin_order_path(past_order.number))
+          redirect_to(edit_admin_order_path(past_order.number))
         end
 
       end
@@ -33,7 +34,7 @@ module Spree
 
         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
+        new_order.save(validate: false)
       end
 
       def duplicate_address(past_order, new_order)

data/spec/controllers/admin/repeated_orders_controller_spec.rb

@@ -51,6 +51,17 @@ describe Spree::Admin::RepeatedOrdersController do
       response.should be_redirect
     end
 
+    it 'should skip validation and force number generation' do
+      Spree::Order.should_receive(:find_by).with(number: 'ABC1').and_return(past_order)
+      Spree::Order.stub(:new).and_return(new_order)
+
+      new_order.should_receive(:generate_order_number).and_return(true)
+      new_order.should_receive(:save).with(validate: false).and_return(true)
+
+      spree_post :create, number: "ABC1"
+      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)
@@ -85,7 +96,7 @@ describe Spree::Admin::RepeatedOrdersController do
       past_order.stub(:completed_at).and_return nil
 
       spree_post :create, number: "ABC1"
-      response.should redirect_to('/admin/orders/ABC1')
+      response.should redirect_to('/admin/orders/ABC1/edit')
     end
 
     describe 'merging with current order' do

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.7'
+  s.version     = '2.1.8'
   s.summary     = 'Makes it possible to repeat an existing order with one click'
   s.description = ''
   s.required_ruby_version = '>= 2.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_repeat_order
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.8
 platform: ruby
 authors:
 - Francisco Trindade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core