spree_repeat_order 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3d4d51d740fa6fb8b573e04c12d276d0b662b55
-  data.tar.gz: 361d8c16bd20ec99e20a339f3da83636e22af948
+  metadata.gz: 1815b7096b2cd1a23e03de1c5303c3cb60e9bfa3
+  data.tar.gz: 1e349b1cbbc4309cb1325bacf54f3bb13cbcf299
 SHA512:
-  metadata.gz: 970bc0cae22f10bf717161111f2ee334d7a6afd357a03e79165b3b61557aa2d2869dbb9a53afb7a8364d47bd194fba3b17053ce32a4c088a7cef7fb5d953d96f
-  data.tar.gz: 8743a2a38956a776584b53bca928f24c22336d66198f724d1697285f95dd98ef62d529e9b94cfe2b629eac2d86047b7b0c25161bd82b3a8614dc3952aeda5013
+  metadata.gz: 9f2e01ca1f2f9109e5b1f41feb5c111198a1bdc58c9dc478afd8c3a61428c672e396420eacad092dc048c66efa83b07b69388e989e5bfbcfca9d5dead55d6af3
+  data.tar.gz: 6622583e85f00b6de6d61db5924633ceafcbc34e1856ccd53d93ed331d840effb15bda9698fa1ddc13fef69e9412a83caaa2f904d7e94217547f9c0098e4c04a

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
+gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-1-stable'
+
 gemspec

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

@@ -0,0 +1,39 @@
+module Spree
+  module Admin
+    class RepeatedOrdersController < Spree::Admin::BaseController
+
+      def create
+        past_order = Spree::Order.find_by(number: params[:number])
+        new_order = Spree::Order.new
+
+        duplicate_order(past_order, new_order)
+
+        if past_order.completed_at && new_order.save
+          flash[:success] = "The order has been duplicated. The new order id is #{new_order.number}"
+          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))
+        end
+
+      end
+
+      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
+
+        new_ship_address = past_order.ship_address.dup
+        new_order.ship_address = new_ship_address
+        new_bill_address = past_order.bill_address.dup
+        new_order.bill_address = new_bill_address
+      end
+     
+    end
+  end
+end

data/app/overrides/repeat_order_button.rb

@@ -0,0 +1,5 @@
+Deface::Override.new(:virtual_path => "spree/admin/shared/_content_header",
+                     :name => "repeat_order_button",
+                     :insert_top => "[data-hook='toolbar']>ul",
+                     :partial => "spree/admin/orders/repeat_button",
+                     :disabled => false)

data/app/views/spree/admin/orders/_repeat_button.haml

@@ -0,0 +1,2 @@
+- if @order and @order.completed_at?
+  %li= button_link_to Spree.t(:repeat_order), spree.admin_repeat_order_path(@order.number), :method => :post, :icon => 'icon-copy'

data/config/routes.rb

@@ -1,5 +1,6 @@
 Spree::Core::Engine.routes.draw do
 
   post '/orders/:number/repeated_order' => 'repeated_orders#create', as: :repeat_order
+  post '/admin/orders/:number/repeated_order/' => 'admin/repeated_orders#create', as: :admin_repeat_order
 
 end

data/spec/controllers/admin/repeated_orders_controller_spec.rb

@@ -0,0 +1,96 @@
+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(:ship_address){ FactoryGirl.build(:address) }
+  let(:bill_address){ FactoryGirl.build(:address) }
+  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],
+    ship_address: ship_address,
+    bill_address: bill_address,
+    completed_at: Date.yesterday,
+    number: 'ABC1'
+  }) }
+
+  let(:new_order){ double(Spree::Order).as_null_object }
+  let(:new_bill_address){ Spree::Address.new }
+  let(:new_ship_address){ Spree::Address.new }
+  let(:line_item_clone_1){ Spree::LineItem.new }
+  let(:line_item_clone_2){ Spree::LineItem.new }
+
+  before :each do
+    controller.stub :spree_current_user => user
+    controller.stub :check_authorization
+  end
+
+  describe 'create' do
+
+    before :each do
+      Spree::Order.stub(:find_by).and_return(past_order)
+    end
+
+    it 'should create new order with old order items' 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(:dup).and_return(line_item_clone_1)
+      line_item_2.should_receive(:dup).and_return(line_item_clone_2)
+
+      new_order.should_receive(:line_items=).with([line_item_clone_1, line_item_clone_2])
+      new_order.should_receive(:save).and_return(true)
+
+      spree_post :create, number: "ABC1"
+      response.should be_redirect
+    end
+
+    it 'should create order with old customer details' do
+      Spree::Order.stub(:new).and_return(new_order)
+
+      ship_address.should_receive(:dup).and_return(new_ship_address)
+      bill_address.should_receive(:dup).and_return(new_bill_address)
+
+      new_order.should_receive(:ship_address=).with(new_ship_address)
+      new_order.should_receive(:bill_address=).with(new_bill_address)
+
+      spree_post :create, number: "ABC1"
+    end
+
+    it 'should fail if original order is not complete' do
+      past_order.stub(:completed_at).and_return nil
+
+      spree_post :create, number: "ABC1"
+      response.should redirect_to('/admin/orders/ABC1')
+    end
+
+  end
+
+  describe 'integration' do
+
+    before :each do
+      controller.stub :spree_current_user => user
+      controller.stub :check_authorization
+    end
+
+    it 'should create new order with same line items' do
+      ship_address = FactoryGirl.create(:address)
+      bill_address = FactoryGirl.create(:address)
+      past_order = FactoryGirl.create(:order, ship_address: ship_address, bill_address: bill_address)
+      line_item = FactoryGirl.create(:line_item, order: past_order)
+
+      spree_post :create, number: past_order.number
+
+      last_order = Spree::Order.last
+      last_order.line_items.count.should == 1
+    end
+
+    it 'should save order in delivery state'
+
+  end
+
+
+
+end

data/spec/controllers/repeated_orders_controller_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 describe Spree::RepeatedOrdersController do
 
+  let(:user) { mock_model Spree::User, :last_incomplete_spree_order => nil, :has_spree_role? => true, :spree_api_key => 'fake' }
+
   describe "create" do
 
     let(:line_item_1){ FactoryGirl.build(:line_item) }
@@ -15,10 +17,12 @@ describe Spree::RepeatedOrdersController do
     before :each do
       Spree::Order.stub(:find_by).and_return(past_order)
       controller.stub(:current_order).and_return(new_order)
+      controller.stub :spree_current_user => user
+      controller.stub :check_authorization
     end
 
     it 'should create new order with same line items' do
-      controller.should_receive(:current_order).and_return(new_order)
+      controller.should_receive(:current_order).at_least(:once).and_return(new_order)
       line_item_1.should_receive(:dup).and_return(line_item_clone_1)
       line_item_2.should_receive(:dup).and_return(line_item_clone_2)
 
@@ -44,6 +48,11 @@ describe Spree::RepeatedOrdersController do
 
   describe "integration" do
 
+    before :each do
+      controller.stub :spree_current_user => user
+      controller.stub :check_authorization
+    end
+
     it 'should create new order with same line items' do
       past_order = FactoryGirl.create(:order)
       line_item = FactoryGirl.create(:line_item, order: past_order)

data/spec/spec_helper.rb

@@ -29,9 +29,6 @@ require 'spree/testing_support/controller_requests'
 require 'spree/testing_support/authorization_helpers'
 require 'spree/testing_support/url_helpers'
 
-# Requires factories defined in lib/spree_repeat_order/factories.rb
-require 'spree_repeat_order/factories'
-
 RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
 

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.3'
+  s.version     = '2.1.4'
   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.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Francisco Trindade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-22 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -208,8 +208,11 @@ files:
 - app/assets/javascripts/store/spree_repeat_order.js
 - app/assets/stylesheets/admin/spree_repeat_order.css
 - app/assets/stylesheets/store/spree_repeat_order.css
+- app/controllers/spree/admin/repeated_orders_controller.rb
 - app/controllers/spree/repeated_orders_controller.rb
 - app/overrides/my_account_table.rb
+- app/overrides/repeat_order_button.rb
+- app/views/spree/admin/orders/_repeat_button.haml
 - app/views/spree/users/_my_account_table.haml
 - bin/rails
 - config/locales/en.yml
@@ -217,7 +220,7 @@ files:
 - lib/generators/spree_repeat_order/install/install_generator.rb
 - lib/spree_repeat_order.rb
 - lib/spree_repeat_order/engine.rb
-- lib/spree_repeat_order/factories.rb
+- spec/controllers/admin/repeated_orders_controller_spec.rb
 - spec/controllers/repeated_orders_controller_spec.rb
 - spec/spec_helper.rb
 - spree_repeat_order.gemspec
@@ -246,5 +249,6 @@ signing_key:
 specification_version: 4
 summary: Makes it possible to repeat an existing order with one click
 test_files:
+- spec/controllers/admin/repeated_orders_controller_spec.rb
 - spec/controllers/repeated_orders_controller_spec.rb
 - spec/spec_helper.rb

data/lib/spree_repeat_order/factories.rb

@@ -1,6 +0,0 @@
-FactoryGirl.define do
-  # Define your Spree extensions Factories within this file to enable applications, and other extensions to use and override them.
-  #
-  # Example adding this to your spec_helper will load these Factories for use:
-  # require 'spree_repeat_order/factories'
-end