V2

.ruby-version

@@ -1 +1 @@
-2.2.3
+2.3.1

.travis.yml

@@ -0,0 +1,16 @@
+language: ruby
+
+rvm:
+  - 2.3.1
+
+script:
+  - bundle exec rake
+
+before_install:
+  - "phantomjs --version"
+  - "export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH"
+  - "phantomjs --version"
+  - "if [ $(phantomjs --version) != '2.1.1' ]; then rm -rf $PWD/travis_phantomjs; mkdir -p $PWD/travis_phantomjs; fi"
+  - "if [ $(phantomjs --version) != '2.1.1' ]; then wget https://assets.membergetmember.co/software/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2; fi"
+  - "if [ $(phantomjs --version) != '2.1.1' ]; then tar -xvf $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs; fi"
+  - "phantomjs --version"

Gemfile

@@ -1,11 +1,13 @@
 source 'http://rubygems.org'
 
-gem 'solidus', github: 'solidusio/solidus', branch: 'master'
+gem 'rake', '< 11.0'
+gem 'solidus', github: 'solidusio/solidus', branch: 'v1.4'
 # Provides basic authentication functionality for testing parts of your engine
 gem 'solidus_auth_devise', github: 'solidusio/solidus_auth_devise', branch: 'master'
 gem 'active_model_serializers', '~> 0.8.3'
 gem 'stripe'
 gem 'slim-rails'
+gem 'deface'
 
 group :test do
   gem 'factory_girl', '4.5.0'
@@ -17,6 +19,10 @@ group :test do
   gem 'guard-rspec', require: false
   gem 'simplecov', require: false
   gem 'selenium-webdriver'
+  gem 'poltergeist'
+  gem 'capybara-screenshot'
+  gem 'vcr'
+  gem 'webmock'
 end
 
 group :development do

app/assets/javascripts/spree/backend/spree_subscriptions.js.coffee → app/assets/javascripts/spree/backend/solidus_subscriptions.js.coffee

@@ -11,7 +11,6 @@ $(document).ready ->
     subscription_item_id = save.data('subscription-item-id')
     quantity = parseInt(save.parents('tr').find('input.subscription_item_quantity').val())
 
-    toggleItemEdit()
     adjustSubscriptionItem(subscription_item_id, quantity)
     false
 
@@ -21,7 +20,6 @@ $(document).ready ->
       del = $(this);
       subscription_item_id = del.data('subscription-item-id');
 
-      toggleItemEdit()
       deleteSubscriptionItem(subscription_item_id)
 
   # handle adding
@@ -30,16 +28,16 @@ $(document).ready ->
     variant = _.find(window.variants, (variant) ->
       variant.id == variant_id
     )
-
+    variantLineItemTemplate = HandlebarsTemplates["variants/line_items_autocomplete_stock"];
     $('#stock_details').html variantLineItemTemplate(variant: variant)
     $('#stock_details').show()
     $('button.add_variant').click addSubscriptionVariant
-    # Add some tips
-    $('.with-tip').powerTip
-      smartPlacement: true
-      fadeInTime: 50
-      fadeOutTime: 50
-      intentPollInterval: 300
+
+  # handle the tabs
+  $('.subscription.tabs li > a').click ->
+    targetTab = $(this).data('target')
+    $('.subscription.tab-container > div').hide()
+    $('div#' + targetTab).show()
 
 
 toggleSubscriptionItemEdit = ->
@@ -66,9 +64,11 @@ adjustSubscriptionItem = (subscription_item_id, quantity) ->
         quantity: quantity
       token: Spree.api_key
   ).done (msg) ->
-    show_flash 'success', 'Successfully updated the quantity.'
-    $('.subscription-item-qty-show').text(quantity)
-    $('a.edit-subscription-item').trigger 'click'
+    show_flash 'success', 'Successfully updated the item quantity.'
+    findSubscriptionItemRow(subscription_item_id)
+      .find('.subscription-item-qty-show').text(quantity)
+    findSubscriptionItemRow(subscription_item_id)
+      .find('a.edit-subscription-item').trigger 'click'
 
 deleteSubscriptionItem = (subscription_item_id) ->
   url = Spree.pathFor('api/subscriptions/' + subscription_id + '/subscription_items/' + subscription_item_id)
@@ -101,4 +101,7 @@ adjustSubscriptionItems = (subscription_id, variant_id, quantity) ->
       subscription_item:
         variant_id: variant_id
         quantity: quantity
-      token: Spree.api_key).done (msg) ->
+      token: Spree.api_key).done (msg) ->
+
+findSubscriptionItemRow = (subscription_item_id) ->
+  $('tr#subscription-item-' + subscription_item_id)

app/assets/stylesheets/spree/backend/solidus_subscriptions.css

@@ -0,0 +1,5 @@
+/* css for spree_subscription gem specific */
+
+.tab-container > div:not(:first-child) {
+  display: none;
+}

app/controllers/spree/admin/subscriptions_controller.rb

@@ -14,8 +14,9 @@ def new
 
           # build subscription addresses
           user = order.user
-          @subscription.build_ship_address(order.ship_address.dup.attributes.merge({user_id: user.id}))
-          @subscription.build_bill_address(order.bill_address.dup.attributes.merge({user_id: user.id}))
+          non_existing_attributes = Spree::Address.attribute_names - Spree::SubscriptionAddress.dup.attribute_names
+          @subscription.build_ship_address(order.ship_address.dup.attributes.except(*non_existing_attributes).merge({user_id: user.id}))
+          @subscription.build_bill_address(order.bill_address.dup.attributes.except(*non_existing_attributes).merge({user_id: user.id}))
 
           # build items
           build_subscription_items(@subscription, order)
@@ -38,15 +39,9 @@ def create
       end
 
       def renew
-        before_failure_count = @object.failure_count
-        ::GenerateSubscriptionOrder.new(@object).call
+        SubscriptionRenewalJob.perform_later @subscription.id
+        flash[:success] = flash_message_for(@object, :being_renewed)
 
-        # check if the failure count has increase, that means we have an error
-        if  @object.failure_count > before_failure_count
-          flash[:error] = flash_message_for(@object, :error_renew)
-        else
-          flash[:success] = flash_message_for(@object, :successfully_renewed)
-        end
         respond_with(@object) do |format|
           format.html { redirect_to location_after_save }
         end
@@ -96,7 +91,13 @@ def credit_card
       end
 
       def failures
-        @subscriptions = Spree::Subscription.active.where('failure_count > 0').order('created_at desc')
+        params[:q] = { 
+          combinator: 'and',
+          state_in: ['active', 'renewing'],
+          failure_count_gt: 0,
+          s: 'last_renewal_at desc'
+        }
+        @subscriptions = collection
       end
 
       def adjust_sku
@@ -142,11 +143,12 @@ def require_order_id
         def build_subscription_from_order(order)
           attrs = {
             user_id: order.user.id,
+            email: order.email,
             state: 'active',
             interval: order.subscription_interval,
-            credit_card_id: order.credit_card_id_if_available
+            credit_card_id: order.credit_card_id_if_available,
           }
-          order.build_subscription(attrs)
+          order.subscriptions.build(attrs)
         end
 
         def build_subscription_items(subscription, order)

app/controllers/spree/api/subscriptions_controller.rb

@@ -3,12 +3,10 @@ module Api
     class SubscriptionsController < Spree::Api::BaseController
       before_action :find_subscription, except: [:index]
 
-      def self.prepended(base)
-        base.prepend_after_action :deliver_cancellation_email, only: [:cancel]
-        base.prepend_after_action :deliver_pause_email, only: [:pause]
-        # need to touch user so the address list is updated
-        base.prepend_after_action :touch_user, only: [:update_address, :create_address, :select_address]
-      end
+      after_action :deliver_cancellation_email, only: [:cancel]
+      after_action :deliver_pause_email, only: [:pause]
+      # need to touch user so the address list is updated
+      after_action :touch_user, only: [:update_address, :create_address, :select_address]
 
       def index
         render json: current_api_user.subscriptions,
@@ -32,6 +30,12 @@ def update
         end
       end
 
+      def renew
+        SubscriptionRenewalJob.perform_later @subscription.id
+
+        render_subscription
+      end
+
       def skip_next_order
         @subscription.skip_next_order
 
@@ -100,7 +104,7 @@ def select_address
       # create a new credit card
       # then assign it to the subscription
       def create_credit_card
-        order = @subscription.last_order
+        order = @subscription.last_completed_order
         credit_card = nil
         begin
           ::Spree::CreditCard.transaction do
@@ -165,7 +169,7 @@ def permitted_address_params
       end
 
       def permitted_subscription_attributes
-        [:interval, :credit_card_id, :email]
+        [:interval, :credit_card_id, :email, :next_renewal_at]
       end
     end
   end

app/jobs/create_subscription_job.rb

@@ -36,8 +36,12 @@ def eligible_line_items(order)
   end
 
   def create_subscription_addresses(order, subscription, user)
-    subscription.create_ship_address!(order.ship_address.dup.attributes.merge({user_id: user.id}))
-    subscription.create_bill_address!(order.bill_address.dup.attributes.merge({user_id: user.id}))
+    non_existing_attributes = Spree::Address.attribute_names - Spree::SubscriptionAddress.dup.attribute_names
+    order_ship_address = order.ship_address.dup.attributes.except(*non_existing_attributes)
+    order_bill_address = order.bill_address.dup.attributes.except(*non_existing_attributes)
+
+    subscription.create_ship_address!(order_ship_address.merge({user_id: user.id}))
+    subscription.create_bill_address!(order_bill_address.merge({user_id: user.id}))
   end
 
   def create_subscription_items(eligible_line_items, subscription, interval)

app/jobs/subscription_renewal_job.rb

@@ -0,0 +1,19 @@
+class SubscriptionRenewalJob < ActiveJob::Base
+  queue_as :default
+
+  def perform(subscription_id)
+    subscription = Spree::Subscription.find(subscription_id)
+    subscription.renew!
+
+    before_failure_count = subscription.failure_count
+    ::GenerateSubscriptionOrder.new(subscription).call
+
+    # check if the failure count has increase, that means we have an error
+    if subscription.failure_count > before_failure_count
+      failed_order = subscription.orders.reorder('created_at desc').first
+      log = SubscriptionLog.find_by_order_id(failed_order.id)
+    else
+      subscription.renewed!
+    end
+  end
+end

app/mailers/spree/subscription_mailer.rb

@@ -28,7 +28,7 @@ def pause(subscription)
     def set_default_variables(subject, campaign)
       @subject = subject
       @campaign = campaign
-      @order = @subscription.last_order
+      @order = @subscription.last_completed_order
       @to_address = @order.email
       @from_addess = from_address
     end

app/models/concerns/subscription_state_machine.rb

@@ -0,0 +1,44 @@
+module SubscriptionStateMachine
+  extend ActiveSupport::Concern
+  included do
+    class << self
+      def active
+        with_states %w(active renewing)
+      end
+    end
+
+    state_machine initial: :active do
+      event(:renew) { transition %i(active renewing) => :renewing }
+      event(:renewed) { transition renewing: :active }
+
+      after_transition any => :renewing, do: :mark_last_renewal!
+      after_transition renewing: :active, do: :adjust_next_renewal!
+
+
+      event :cancel do
+        transition all => :cancelled
+      end
+      event(:pause) { transition active: :paused }
+      event(:resume) { transition paused: :active }
+
+      after_transition on: :cancel do |subscription|
+        subscription.update_attributes(cancelled_at: Time.now)
+      end
+
+      after_transition on: :pause do |subscription|
+        subscription.update_attributes(pause_at: Time.now, resume_at: nil)
+      end
+
+      after_transition on: :resume do |subscription, transition|
+        resume_at = transition.args.first || Time.now
+        subscription.update_attributes(resume_at: resume_at)
+        # if resume is set at a future date, do not unpause
+        if resume_at.to_date > Date.today
+          subscription.update_attributes(state: 'paused')
+        else
+          subscription.update_attributes(pause_at: nil)
+        end
+      end
+    end
+  end
+end

app/models/spree/order_decorator.rb

@@ -17,9 +17,8 @@ def line_item_interval_match(line_item, options)
       line_item.interval == options[:interval]
     end
 
-
     def subscription_interval
-      subscription ? subscription.interval : 4
+      subscription ? subscription.interval : 1
     end
 
     def subscription_products

app/models/spree/order_subscription.rb

@@ -0,0 +1,7 @@
+module Spree
+  class OrderSubscription < Spree::Base
+    self.table_name = :spree_orders_subscriptions
+    belongs_to :order
+    belongs_to :subscription
+  end
+end