spree_recurring_order 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76ffe7a472fefe7657097737d7ff66b0926226de
-  data.tar.gz: 23934df33f63bada758d01918898ed47d7ded4dc
+  metadata.gz: a0639b666316adcfcc3ef220dea2b076482f3088
+  data.tar.gz: f5a77d7601fa43f467e240edc117e9ddc1b45fa4
 SHA512:
-  metadata.gz: 002bc796fb66c3b4ffae936406329c5de2fd5a7c2cf89ce92ac74ad254576cded12d3c8145c75ba7ddd2a42603eacb5696d0fab87282e70ab609bdb2dac24266
-  data.tar.gz: 23c27260548c84e148cd9b9142e3cb94205fae67e0d49f389547459a92b1e654ad64a2a7ee492f8f91d12cd65ea31c837fe3846af68e768dae58f6e42c0cabd7
+  metadata.gz: a1142705c9e32dcc920cc1bbff77f85454e8abc159a0403856b74e965a0d85cf4bb2fdf7382920dff12cbd54f705ae6d10ef483b76c15af2a897ec9d78e0772c
+  data.tar.gz: 3b69ddc0b1332fea6f9cd05f03620660ac7a27db900ffb7d7de02398534e5cb55eb184d0036e79ab767acda3d94be98daaf2230cd07a9276500ce0dc32bec7c7

data/Gemfile

@@ -2,5 +2,6 @@ source 'https://rubygems.org'
 
 # Provides basic authentication functionality for testing parts of your engine
 gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-1-stable'
+gem 'haml'
 
 gemspec

data/app/assets/stylesheets/store/checkout.css

@@ -0,0 +1,11 @@
+form#update-cart .links button {
+  margin-left: 5px;
+}
+
+div#empty-cart .button {
+  margin: 0 5px;
+}
+
+#cart .recurring-message {
+  margin: 10px 0;
+}

data/app/models/spree/order_decorator.rb

@@ -2,4 +2,8 @@ Spree::Order.class_eval do
 
   belongs_to :recurring_order
 
+  def recurring?
+    !recurring_order.nil?
+  end
+
 end

data/app/overrides/add_message_to_checkout.rb

@@ -0,0 +1,5 @@
+Deface::Override.new(:virtual_path => "spree/orders/edit",
+                     :name => "add_message_to_checkout",
+                     :insert_before => "[data-hook='outside_cart_form']",
+                     :partial => "spree/orders/recurring_message",
+                     :disabled => false)

data/app/overrides/replace_shopping_cart_checkout.rb

@@ -0,0 +1,5 @@
+Deface::Override.new(:virtual_path => "spree/orders/edit",
+                     :name => "remove_shopping_cart_checkout",
+                     :replace => "[data-hook='cart_buttons']",
+                     :partial => "spree/orders/cart_buttons",
+                     :disabled => false)

data/app/views/spree/orders/_cart_buttons.haml

@@ -0,0 +1,12 @@
+- if @order.recurring?
+  .links.columns.sixteen.alpha.omega(data-hook="cart_buttons")
+    = order_form.text_field :coupon_code, :size => 10, :placeholder => Spree.t(:coupon_code)
+    = button_tag({:class => 'primary', :id => 'update-button'}) do
+      = Spree.t(:update)
+- else
+  .links.columns.sixteen.alpha.omega(data-hook="cart_buttons")
+    = order_form.text_field :coupon_code, :size => 10, :placeholder => Spree.t(:coupon_code)
+    = button_tag({:class => 'primary', :id => 'update-button'}) do
+      = Spree.t(:update)
+    = button_tag({:class => 'button checkout primary', :id => 'checkout-link', :name => 'checkout'}) do
+      = Spree.t(:checkout)

data/app/views/spree/orders/_recurring_message.haml

@@ -0,0 +1,2 @@
+.columns.sixteen.alpha.omega.recurring-message
+  %h5 This is a recurring order message - you must override it

data/spec/controllers/spree/orders_controller_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Spree::OrdersController do
 
-  let(:order) {double(Spree::Order)}
+  let(:order) {double(Spree::Order).as_null_object}
   let(:recurring_order) {double(Spree::RecurringOrder)}
   let(:user) { mock_model Spree::User, :last_incomplete_spree_order => nil, :has_spree_role? => true, :spree_api_key => 'fake' }
 
@@ -11,7 +11,6 @@ describe Spree::OrdersController do
     controller.stub :check_authorization
   end
 
-
   describe 'show' do
 
     before :each do

data/spec/models/spree/order_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Spree::Order do
+
+  describe 'recurring?' do
+
+    it 'should be false if order doesnt have a recurring one' do
+      order = Spree::Order.new
+      order.recurring?.should be_false
+    end
+
+    it 'should be true if order has a recurring one' do
+      order = Spree::Order.new
+      order.recurring_order = Spree::RecurringOrder.new
+      order.recurring?.should be_true
+    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.5'
+  s.version     = '2.1.6'
   s.summary     = 'Add the option to create a recurring order'
   s.description = ''
   s.required_ruby_version = '>= 2.0.0'
@@ -18,6 +18,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'spree_core', '~> 2.1.3'
 
+  s.add_runtime_dependency 'haml'
+
   s.add_development_dependency 'capybara', '~> 2.1'
   s.add_development_dependency 'coffee-rails'
   s.add_development_dependency 'database_cleaner'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_recurring_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-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.1.3
+- !ruby/object:Gem::Dependency
+  name: haml
+  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
@@ -180,17 +194,22 @@ files:
 - app/assets/javascripts/store/spree_recurring_order.js
 - app/assets/stylesheets/admin/admin.scss
 - 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_orders_controller.rb
 - app/controllers/spree/orders_controller_decorator.rb
 - app/controllers/spree/recurring_orders_controller.rb
 - app/models/spree/order_decorator.rb
 - app/models/spree/recurring_order.rb
+- app/overrides/add_message_to_checkout.rb
 - app/overrides/add_tab_to_admin_menu.rb
+- app/overrides/replace_shopping_cart_checkout.rb
 - 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
-- app/views/spree/orders/show_recurring.html.erb
+- app/views/spree/orders/_cart_buttons.haml
+- app/views/spree/orders/_recurring_message.haml
+- app/views/spree/orders/show_recurring.haml
 - app/views/spree/recurring_orders/show.html.erb
 - bin/rails
 - config/locales/en.yml
@@ -204,6 +223,7 @@ files:
 - spec/controllers/spree/admin/recurring_orders_controller_spec.rb
 - spec/controllers/spree/orders_controller_spec.rb
 - spec/controllers/spree/recurring_order_controller_spec.rb
+- spec/models/spree/order_spec.rb
 - spec/models/spree/recurring_order_spec.rb
 - spec/spec_helper.rb
 - spree_recurring_order.gemspec
@@ -235,5 +255,6 @@ test_files:
 - spec/controllers/spree/admin/recurring_orders_controller_spec.rb
 - spec/controllers/spree/orders_controller_spec.rb
 - spec/controllers/spree/recurring_order_controller_spec.rb
+- spec/models/spree/order_spec.rb
 - spec/models/spree/recurring_order_spec.rb
 - spec/spec_helper.rb