Rails 4 spree 2 3

app/assets/javascripts/backend/spree_subscribe.js

@@ -0,0 +1 @@
+//= require backend/intervals_autocomplete

app/controllers/spree/orders_controller_decorator.rb

@@ -8,16 +8,13 @@
  def check_subscriptions
  return unless params[:subscriptions] && params[:subscriptions][:active].to_s == "1"
 
- params[:products].each do |product_id,variant_id|
- add_subscription variant_id, params[:subscriptions][:interval_id]
- end if params[:products]
+ interval_id = params[:subscriptions][:interval_id]
 
- params[:variants].each do |variant_id, quantity|
- add_subscription variant_id, params[:subscriptions][:interval_id]
- end if params[:variants]
- end
+ params[:products].each { |product_id, variant_id| add_subscription(variant_id, interval_id) } if params[:products]
+ params[:variants].each { |variant_id, quantity| add_subscription(variant_id, interval_id) } if params[:variants]
 
- protected
+ add_subscription(params[:variant_id], params[:subscriptions][:interval_id]) if params[:variant_id]
+ end
 
  # DD: TODO write test for this method
  def add_subscription(variant_id, interval_id)

app/models/concerns/intervalable.rb

@@ -10,8 +10,6 @@ module Intervalable
 
  included do
 
- attr_accessible :times, :time_unit
-
  validates :times, :time_unit, :presence => true
  validates_inclusion_of :time_unit, :in => UNITS.keys
 

app/models/spree/order_decorator.rb

@@ -1,6 +1,4 @@
 Spree::Order.class_eval do
- attr_accessible :subscription_id
-
  belongs_to :subscription, :class_name => "Spree::Subscription"
 
  state_machine :initial => :cart do

app/models/spree/product_decorator.rb

@@ -1,6 +1,4 @@
 Spree::Product.class_eval do
- attr_accessible :subscribable, :subscription_interval_ids, :subscribed_price
-
  delegate_belongs_to :master, :subscribed_price
 
  has_and_belongs_to_many :subscription_intervals, :foreign_key => "product_id", :join_table => 'spree_subscription_intervals_products'

app/models/spree/subscription.rb

@@ -1,9 +1,6 @@
 require 'concerns/intervalable'
 
 class Spree::Subscription < ActiveRecord::Base
- attr_accessible :reorder_on, :user_id, :times, :time_unit, :line_item_id, :billing_address_id, :state,
- :shipping_address_id, :shipping_method_id, :payment_method_id, :source_id, :source_type
-
  include Intervalable
 
  attr_accessor :new_order
@@ -19,7 +16,14 @@ class Spree::Subscription < ActiveRecord::Base
 
  has_many :reorders, :class_name => "Spree::Order"
 
- scope :active, where(:state => 'active')
+ scope :cart, -> { where(state: 'cart') }
+ scope :active, -> { where(state: 'active') }
+ scope :inactive, -> { where(state: 'inactive') }
+ scope :cancelled, -> { where(state: 'cancelled') }
+
+ scope :current, -> { where(state: ['active', 'inactive']) }
+
+ scope :due, -> { active.where("reorder_on <= ?", Date.today) }
 
  state_machine :state, :initial => 'cart' do
  event :suspend do
@@ -35,35 +39,43 @@ class Spree::Subscription < ActiveRecord::Base
  after_transition :on => :start, :do => :set_checkout_requirements
  after_transition :on => :resume, :do => :check_reorder_date
  end
+
+ def self.reorder_due!
+ due.each(&:reorder)
+ end
 
  # DD: TODO pull out into a ReorderBuilding someday
  def reorder
- raise false unless self.state == 'active'
-
- create_reorder &&
- add_subscribed_line_item &&
- select_shipping &&
- add_payment &&
- confirm_reorder &&
- complete_reorder &&
- calculate_reorder_date!
+ raise false unless active?
+
+ result = create_reorder &&
+ select_shipping &&
+ add_payment &&
+ confirm_reorder &&
+ complete_reorder &&
+ calculate_reorder_date!
+
+ puts result ? " -> Next reorder date: #{self.reorder_on}" : " -> FAILED"
+
+ result
  end
 
  def create_reorder
+ puts "[SPREE::SUBSCRIPTION] Reordering subscription: #{id}"
+ puts " -> creating order..."
+
  self.new_order = Spree::Order.create(
-  bill_address: self.billing_address.clone,
-  ship_address: self.shipping_address.clone,
-  subscription_id: self.id,
-  email: self.user.email
- )
- self.new_order.user_id = self.user_id
+ bill_address: self.billing_address.clone,
+ ship_address: self.shipping_address.clone,
+ subscription_id: self.id,
+ email: self.user.email,
+ user_id: self.user_id
+ )
 
  # DD: make it work with spree_multi_domain
- if self.new_order.respond_to?(:store_id)
- self.new_order.store_id = self.line_item.order.store_id
- end
-
- self.new_order.next # -> address
+ self.new_order.store_id = self.line_item.order.store_id if self.new_order.respond_to?(:store_id)
+
+ add_subscribed_line_item && progress # -> delivery
  end
 
  def add_subscribed_line_item
@@ -73,39 +85,45 @@ def add_subscribed_line_item
  line_item.price = self.line_item.price
  line_item.save!
 
- self.new_order.next # -> delivery
+ result = progress # -> delivery
  end
 
  def select_shipping
+ puts " -> selecting shipping rate..."
+
  # DD: shipments are created when order state goes to "delivery"
  shipment = self.new_order.shipments.first # DD: there should be only one shipment
  rate = shipment.shipping_rates.first{|r| r.shipping_method.id == self.shipping_method.id }
  raise "No rate was found. TODO: Implement logic to select the cheapest rate." unless rate
+
  shipment.selected_shipping_rate_id = rate.id
  shipment.save
  end
 
  def add_payment
- payment = self.new_order.payments.build( :amount => self.new_order.item_total )
+ puts " -> adding payment..."
+
+ payment = self.new_order.payments.build(amount: self.new_order.outstanding_balance)
  payment.source = self.source
  payment.payment_method = self.payment_method
  payment.save!
 
- self.new_order.next # -> payment
+ progress # -> payment
  end
 
  def confirm_reorder
- self.new_order.next # -> confirm
+ progress # -> confirm
  end
 
  def complete_reorder
  self.new_order.update!
- self.new_order.next && self.new_order.save # -> complete
+ progress && self.new_order.save # -> complete
  end
 
  def calculate_reorder_date!
  self.reorder_on ||= Date.today
  self.reorder_on += self.time
+
  save
  end
 
@@ -134,9 +152,23 @@ def set_checkout_requirements
  :user_id => order.user_id
  )
  end
+
+ def new_order_state
+ self.new_order.state
+ end
+ def progress
+ current_state = new_order_state
+ result = self.new_order.next
+
+ success = !!result && current_state != new_order_state
+
+ puts " !! Order progression failed. Status still '#{new_order_state}'" unless success
+
+ success
+ end
 
  def self.reorder_states
  @reorder_states ||= state_machine.states.map(&:name) - ["cart"]
  end
-
+ 
 end

app/models/spree/subscription_interval.rb

@@ -1,8 +1,6 @@
 require 'concerns/intervalable'
 
 class Spree::SubscriptionInterval < ActiveRecord::Base
- attr_accessible :name
-
  include Intervalable
 
  has_and_belongs_to_many :products, :class_name => "Spree::Product", :join_table => 'spree_subscription_intervals_products'

app/models/spree/user_decorator.rb

@@ -1,3 +1,3 @@
 Spree.user_class.class_eval do
- has_many :subscriptions, :order => "updated_at DESC", :class_name => 'Spree::Subscription'
+ has_many :subscriptions, -> { order(updated_at: :desc) }, :class_name => 'Spree::Subscription'
 end

app/models/spree/variant_decorator.rb

@@ -1,5 +1,3 @@
 Spree::Variant.class_eval do
  delegate :subscribable?, :to => :product
-
- attr_accessible :subscribed_price
 end

app/views/spree/admin/subscriptions/index.html.erb

@@ -35,14 +35,14 @@
  </tr>
  </thead>
  <tbody>
- <% @subscriptions.each do |sub| %>
+ <% @subscriptions.current.each do |sub| %>
  <tr data-hook="admin_subscriptions_index_rows" class="state-<%= sub.state.downcase %> <%= cycle('odd', 'even') %>">
  <td class="subscription-product">
  <span class="product-name"><%= sub.line_item.variant.name %></span><br/>
  <%= sub.line_item.variant.options_text %>
  </td>
  <td class="subscription-user"><%= sub.user.id %></td>
- <td class="subscription-price"><%= money sub.line_item.price %></td>
+ <td class="subscription-price"><%= Spree::Money.new(sub.line_item.price).to_html %></td>
  <td class="subscription-interval"><%= sub.time_title %></td>
  <td class="subscription-reorder-date">
  <% if sub.active? %>

lib/generators/spree_subscribe/install/install_generator.rb

@@ -3,13 +3,13 @@ module Generators
  class InstallGenerator < Rails::Generators::Base
 
  def add_javascripts
- append_file 'app/assets/javascripts/store/all.js', "//= require store/spree_subscribe\n"
- append_file 'app/assets/javascripts/admin/all.js', "//= require admin/spree_subscribe\n"
+ append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require frontend/spree_subscribe\n"
+ append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require backend/spree_subscribe\n"
  end
 
  def add_stylesheets
- inject_into_file 'app/assets/stylesheets/store/all.css', " *= require store/spree_subscribe\n", :before => /\*\//, :verbose => true
- inject_into_file 'app/assets/stylesheets/admin/all.css', " *= require admin/spree_subscribe\n", :before => /\*\//, :verbose => true
+ inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require frontend/spree_subscribe\n", :before => /\*\//, :verbose => true
+ inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require backend/spree_subscribe\n", :before => /\*\//, :verbose => true
  end
 
  def add_migrations

lib/tasks/spree_subscribe.rake

@@ -1,9 +1,9 @@
 namespace :spree_subscribe do
 
  namespace :reorders do
- desc "Find all subscriptions that are due today and reorder their products"
+ desc "Find all subscriptions that are due on or before today and reorder their products"
  task :create => :environment do
- Spree::Subscription.where(:reorder_on => Date.today).each{|s| s.reorder }
+ Spree::Subscription.reorder_due!
  end
  end
 

spree_subscribe.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
  s.require_path = 'lib'
  s.requirements << 'none'
 
- s.add_dependency 'spree_core', '~> 2.0.3'
+ s.add_dependency 'spree_core', '~> 2.3.0'
 
  s.add_development_dependency 'capybara', '~> 2.1'
  s.add_development_dependency 'coffee-rails'