spree_recurring_order 2.1.8 → 2.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bb5682fa3c672ed9fbcd1fb9d8f5c331e7b0f1b
-  data.tar.gz: fff9a44ba0e5c6127a62bc3a327c5ad909ea170f
+  metadata.gz: a0aa16ab77053b1ed94b81dc7532c4a5d7c5a7de
+  data.tar.gz: 70eb179a5bf2e16ce3479d28562abbe47d62f372
 SHA512:
-  metadata.gz: 47fb2293cf7e715ef7e2d7bb30b1eb6a79781005aaf46a78a689a7aacd3197a0f387fc4d00034c3559b90a4242d6a2f5e50c25ee3b48af593810bc4b621043ad
-  data.tar.gz: 329f5369ffb7edd94ee5d27ff3575bd419039bbead3cc86dface03de3dfd554f4197f806262ce44b23634275d5298e5ae23ce60a7ed9327d4e7643fcc22b9918
+  metadata.gz: a17b1eb9833aec91732a3271bb8fd5b9088b39f1e7f1787750125ed38edb90ca08a43d05d1d6ac3862025523abaef73772817f1c236c0959aa82b72e87a1dc50
+  data.tar.gz: 0a560af713ca32907fcc47aab6b425cbb9e6706df5420ca1027fde1c406e91c1d093cd00207fb034d70924ee90cbe2443d22265c66ec1b678d69283d114c2ba0

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

@@ -0,0 +1,13 @@
+module Spree
+  module Admin
+    class RecurringEmailsController < Spree::Admin::BaseController
+
+      def create
+        order = Spree::Order.find_by(number: params[:number])
+        order.deliver_recurring_order_email
+        redirect_to(edit_admin_order_path(order))
+      end
+
+    end
+  end
+end

data/app/mailers/spree/order_mailer_decorator.rb

@@ -0,0 +1,7 @@
+Spree::OrderMailer.class_eval do
+
+  def recurring_email(order_id)
+    #do nothing - this should be overriden
+  end
+
+end

data/app/models/spree/order_decorator.rb

@@ -6,4 +6,10 @@ Spree::Order.class_eval do
     !recurring_order.nil?
   end
 
+  def deliver_recurring_order_email
+    if self.recurring?
+      Spree::OrderMailer.recurring_email(self.id).deliver
+    end
+  end
+
 end

data/app/overrides/add_send_email_button.rb

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

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

@@ -0,0 +1,2 @@
+- if @order and @order.recurring?
+  %li= button_link_to Spree.t(:send_recurring_email), spree.admin_recurring_email_path(@order.number), :method => :post, :icon => 'icon-email'

data/config/routes.rb

@@ -5,4 +5,5 @@ Spree::Core::Engine.routes.draw do
 
   get "admin/recurring_orders/", controller: 'admin/recurring_orders', action: 'index', as: 'admin_recurring_orders'
   get "admin/recurring_orders/:number", controller: 'admin/recurring_orders', action: 'show', as: 'admin_recurring_order'
+  post "admin/recurring_emails/:number", controller: 'admin/recurring_emails', action: 'create', as: 'admin_recurring_email'
 end

data/spec/controllers/spree/admin/recurring_emails_controller_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe Spree::Admin::RecurringEmailsController do
+
+  let(:user) { mock_model Spree::User, :last_incomplete_spree_order => nil, :has_spree_role? => true, :spree_api_key => 'fake' }
+
+  before :each do
+    controller.stub :spree_current_user => user
+    controller.stub :check_authorization
+  end
+
+  describe 'create' do
+
+    let(:order){ Spree::Order.new }
+
+    before :each do
+      order.stub(:number).and_return("G1234")
+      order.stub(:id).and_return("1")
+      Spree::Order.stub(:find_by).and_return(order)
+    end
+
+    it 'should send email' do
+      Spree::Order.should_receive(:find_by).with(number: "G1234").and_return(order)
+      order.should_receive(:deliver_recurring_order_email)
+
+      spree_post :create, { number: 'G1234' }
+    end
+
+    it 'should redirect order page' do
+      spree_post :create, { number: 'G1234' }
+      response.should redirect_to('/admin/orders/G1234/edit')
+    end
+
+  end
+
+end

data/spec/models/spree/order_spec.rb

@@ -17,4 +17,28 @@ describe Spree::Order do
 
   end
 
+  describe 'deliver recurring order email' do
+
+    it 'should not deliver anything if order is not recurring' do
+      order = Spree::Order.new
+      order.stub(:recurring?).and_return false
+      order.deliver_recurring_order_email
+
+      Spree::OrderMailer.should_not_receive(:recurring_email)
+    end
+
+    it 'should deliver if order is recurring' do
+      order = Spree::Order.new
+      order.stub(:id).and_return 2
+      order.stub(:recurring?).and_return true
+
+      mail = double(Object)
+      Spree::OrderMailer.should_receive(:recurring_email).with(2).and_return(mail)
+      mail.should_receive(:deliver)
+
+      order.deliver_recurring_order_email
+    end
+
+  end
+
 end

data/spree_recurring_order.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_recurring_order'
-  s.version     = '2.1.8'
+  s.version     = '2.1.9'
   s.summary     = 'Add the option to create a recurring order'
   s.description = ''
   s.required_ruby_version = '>= 2.0.0'
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'spree_core', '~> 2.1.3'
 
   s.add_runtime_dependency 'haml'
+  s.add_runtime_dependency 'delayed_job_active_record'
 
   s.add_development_dependency 'capybara', '~> 2.1'
   s.add_development_dependency 'coffee-rails'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_recurring_order
 version: !ruby/object:Gem::Version
-  version: 2.1.8
+  version: 2.1.9
 platform: ruby
 authors:
 - Francisco Trindade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-15 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: delayed_job_active_record
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -196,14 +210,18 @@ files:
 - app/assets/stylesheets/admin/spree_recurring_order.css
 - app/assets/stylesheets/store/checkout.css
 - app/assets/stylesheets/store/spree_recurring_order.css
+- app/controllers/spree/admin/recurring_emails_controller.rb
 - app/controllers/spree/admin/recurring_orders_controller.rb
 - app/controllers/spree/orders_controller_decorator.rb
 - app/controllers/spree/recurring_orders_controller.rb
+- app/mailers/spree/order_mailer_decorator.rb
 - app/models/spree/order_decorator.rb
 - app/models/spree/recurring_order.rb
 - app/overrides/add_message_to_checkout.rb
+- app/overrides/add_send_email_button.rb
 - app/overrides/add_tab_to_admin_menu.rb
 - app/overrides/replace_shopping_cart_checkout.rb
+- app/views/spree/admin/orders/_send_recurring_email_button.haml
 - app/views/spree/admin/recurring_orders/index.html.erb
 - app/views/spree/admin/recurring_orders/show.html.erb
 - app/views/spree/admin/shared/_recurring_orders_tab.html.erb
@@ -220,6 +238,7 @@ files:
 - lib/spree_recurring_order.rb
 - lib/spree_recurring_order/engine.rb
 - lib/spree_recurring_order/factories.rb
+- spec/controllers/spree/admin/recurring_emails_controller_spec.rb
 - spec/controllers/spree/admin/recurring_orders_controller_spec.rb
 - spec/controllers/spree/orders_controller_spec.rb
 - spec/controllers/spree/recurring_order_controller_spec.rb
@@ -252,6 +271,7 @@ signing_key:
 specification_version: 4
 summary: Add the option to create a recurring order
 test_files:
+- spec/controllers/spree/admin/recurring_emails_controller_spec.rb
 - spec/controllers/spree/admin/recurring_orders_controller_spec.rb
 - spec/controllers/spree/orders_controller_spec.rb
 - spec/controllers/spree/recurring_order_controller_spec.rb