solidus_subscriptions-alpha 0.0.3 → 0.0.4

data/app/decorators/spree/orders/subscription_line_items_association.rb

@@ -1,15 +1,15 @@
-# Spree::Orders may contain many subscription_line_items. When the order is
-# finalized these subscription_line_items are converted into subscritpions.
-# The order needs to be able to get a list of associated subscription_line_items
-# to be able to populate the full subscriptions.
-module Spree
-  module Orders
-    module SubscriptionLineItemsAssociation
-      def self.prepended(base)
-        base.has_many :subscription_line_items, through: :line_items
-      end
-    end
-  end
-end
-
-Spree::Order.prepend Spree::Orders::SubscriptionLineItemsAssociation
+# Spree::Orders may contain many subscription_line_items. When the order is
+# finalized these subscription_line_items are converted into subscritpions.
+# The order needs to be able to get a list of associated subscription_line_items
+# to be able to populate the full subscriptions.
+module Spree
+  module Orders
+    module SubscriptionLineItemsAssociation
+      def self.prepended(base)
+        base.has_many :subscription_line_items, through: :line_items
+      end
+    end
+  end
+end
+
+Spree::Order.prepend Spree::Orders::SubscriptionLineItemsAssociation

data/app/decorators/spree/products/subscribable_decorator.rb

@@ -1,11 +1,11 @@
-module Spree
-  module Products
-    module Subscribable
-      def self.prepended(klass)
-        klass.delegate :"subscribable", :"subscribable=", to: :find_or_build_master
-      end
-    end
-  end
-end
-
-Spree::Product.prepend Spree::Products::Subscribable
+module Spree
+  module Products
+    module Subscribable
+      def self.prepended(klass)
+        klass.delegate :"subscribable", :"subscribable=", to: :find_or_build_master
+      end
+    end
+  end
+end
+
+Spree::Product.prepend Spree::Products::Subscribable

data/app/decorators/spree/users/have_many_subscriptions.rb

@@ -1,18 +1,18 @@
-# Spree::Users maintain a list of the subscriptions associated with them
-module Spree
-  module Users
-    module HaveManySubscritptions
-      def self.prepended(base)
-        base.has_many(
-          :subscriptions,
-          class_name: 'SolidusSubscriptions::Subscription',
-          foreign_key: 'user_id'
-        )
-
-        base.accepts_nested_attributes_for :subscriptions
-      end
-    end
-  end
-end
-
-Spree.user_class.prepend(Spree::Users::HaveManySubscritptions)
+# Spree::Users maintain a list of the subscriptions associated with them
+module Spree
+  module Users
+    module HaveManySubscritptions
+      def self.prepended(base)
+        base.has_many(
+          :subscriptions,
+          class_name: 'SolidusSubscriptions::Subscription',
+          foreign_key: 'user_id'
+        )
+
+        base.accepts_nested_attributes_for :subscriptions
+      end
+    end
+  end
+end
+
+Spree.user_class.prepend(Spree::Users::HaveManySubscritptions)

data/app/decorators/spree/variant_pretty_name.rb

@@ -1,13 +1,13 @@
-module Spree
-  module Variants
-    module VariantPrettyName
-      def pretty_name
-        name = product.name
-        name += " - #{options_text}" if options_text.present?
-        name
-      end
-    end
-  end
-end
-
-Spree::Variant.prepend Spree::Variants::VariantPrettyName
+module Spree
+  module Variants
+    module VariantPrettyName
+      def pretty_name
+        name = product.name
+        name += " - #{options_text}" if options_text.present?
+        name
+      end
+    end
+  end
+end
+
+Spree::Variant.prepend Spree::Variants::VariantPrettyName

data/app/jobs/solidus_subscriptions/process_installments_job.rb

@@ -1,22 +1,22 @@
-# This job is responsible for creating a consolidated installment from a
-# list of installments and processing it.
-
-module SolidusSubscriptions
-  class ProcessInstallmentsJob < ActiveJob::Base
-     queue_as Config.processing_queue
-
-     # Process a collection of installments
-     #
-     # @param installment_ids [Array<Integer>] The ids of the
-     #   installments to be processed together and fulfilled by the same order
-     #
-     # @return [Spree::Order] The order which fulfills the list of installments
-     def perform(installment_ids)
-       return if installment_ids.empty?
-
-       installments = SolidusSubscriptions::Installment.where(id: installment_ids).
-         includes(subscription: [:line_items, :user])
-       Checkout.new(installments).process
-     end
-  end
-end
+# This job is responsible for creating a consolidated installment from a
+# list of installments and processing it.
+
+module SolidusSubscriptions
+  class ProcessInstallmentsJob < ActiveJob::Base
+     queue_as Config.processing_queue
+
+     # Process a collection of installments
+     #
+     # @param installment_ids [Array<Integer>] The ids of the
+     #   installments to be processed together and fulfilled by the same order
+     #
+     # @return [Spree::Order] The order which fulfills the list of installments
+     def perform(installment_ids)
+       return if installment_ids.empty?
+
+       installments = SolidusSubscriptions::Installment.where(id: installment_ids).
+         includes(subscription: [:line_items, :user])
+       Checkout.new(installments).process
+     end
+  end
+end

data/app/models/solidus_subscriptions/checkout.rb

@@ -1,141 +1,141 @@
-# This class takes a collection of installments and populates a new spree
-# order with the correct contents based on the subscriptions associated to the
-# intallments. This is to group together subscriptions being
-# processed on the same day for a specific user
-module SolidusSubscriptions
-  class Checkout
-    # @return [Array<Installment>] The collection of installments to be used
-    #   when generating a new order
-    attr_reader :installments
-
-    delegate :user, to: :subscription
-
-    # Get a new instance of a Checkout
-    #
-    # @param installments [Array<Installment>] The collection of installments
-    # to be used when generating a new order
-    def initialize(installments)
-      @installments = installments
-      raise UserMismatchError.new(installments) if different_owners?
-    end
-
-    # Generate a new Spree::Order based on the information associated to the
-    # installments
-    #
-    # @return [Spree::Order]
-    def process
-      populate
-
-      # Installments are removed and set for future processing if they are
-      # out of stock. If there are no line items left there is nothing to do
-      return if installments.empty?
-
-      if checkout
-        Config.success_dispatcher_class.new(installments, order).dispatch
-        return order
-      end
-
-      # A new order will only have 1 payment that we created
-      if order.payments.any?(&:failed?)
-        Config.payment_failed_dispatcher_class.new(installments, order).dispatch
-        installments.clear
-        nil
-      end
-    ensure
-      # Any installments that failed to be processed will be reprocessed
-      unfulfilled_installments = installments.select(&:unfulfilled?)
-      if unfulfilled_installments.any?
-        Config.failure_dispatcher_class.
-          new(unfulfilled_installments, order).dispatch
-      end
-    end
-
-    # The order fulfilling the consolidated installment
-    #
-    # @return [Spree::Order]
-    def order
-      @order ||= Spree::Order.create(
-        user: user,
-        email: user.email,
-        store: subscription.store || Spree::Store.default,
-        subscription_order: true
-      )
-    end
-
-    private
-
-    def checkout
-      order.update!
-      apply_promotions
-
-      order.checkout_steps.count.times do
-        order.ship_address = ship_address if order.state == "address"
-        create_payment if order.state == "payment"
-        order.next! if order.next_transition.present?
-      end
-
-      # Do this as a separate "quiet" transition so that it returns true or
-      # false rather than raising a failed transition error
-      order.complete
-    end
-
-    def populate
-      unfulfilled_installments = []
-
-      order_line_items = installments.flat_map do |installment|
-        line_items = installment.line_item_builder.spree_line_items
-
-        unfulfilled_installments.push(installment) if line_items.empty?
-
-        line_items
-      end
-
-      # Remove installments which had no stock from the active list
-      # They will be reprocessed later
-      @installments -= unfulfilled_installments
-      if unfulfilled_installments.any?
-        Config.out_of_stock_dispatcher_class.new(unfulfilled_installments).dispatch
-      end
-
-      return if installments.empty?
-      order_builder.add_line_items(order_line_items)
-    end
-
-    def order_builder
-      @order_builder ||= OrderBuilder.new(order)
-    end
-
-    def subscription
-      installments.first.subscription
-    end
-
-    def ship_address
-      subscription.shipping_address || user.ship_address
-    end
-
-    def active_card
-      if SolidusSupport.solidus_gem_version <  Gem::Version.new("2.2.0")
-        user.credit_cards.default.last
-      else
-        user.wallet.default_wallet_payment_source.payment_source
-      end
-    end
-
-    def create_payment
-      order.payments.create(
-        source: active_card,
-        amount: order.total,
-        payment_method: Config.default_gateway
-      )
-    end
-
-    def apply_promotions
-      Spree::PromotionHandler::Cart.new(order).activate
-      order.updater.update # reload totals
-    end
-
-    def different_owners?
-      installments.map { |i| i.subscription.user }.uniq.length > 1
-    end
-  end
-end
+# This class takes a collection of installments and populates a new spree
+# order with the correct contents based on the subscriptions associated to the
+# intallments. This is to group together subscriptions being
+# processed on the same day for a specific user
+module SolidusSubscriptions
+  class Checkout
+    # @return [Array<Installment>] The collection of installments to be used
+    #   when generating a new order
+    attr_reader :installments
+
+    delegate :user, to: :subscription
+
+    # Get a new instance of a Checkout
+    #
+    # @param installments [Array<Installment>] The collection of installments
+    # to be used when generating a new order
+    def initialize(installments)
+      @installments = installments
+      raise UserMismatchError.new(installments) if different_owners?
+    end
+
+    # Generate a new Spree::Order based on the information associated to the
+    # installments
+    #
+    # @return [Spree::Order]
+    def process
+      populate
+
+      # Installments are removed and set for future processing if they are
+      # out of stock. If there are no line items left there is nothing to do
+      return if installments.empty?
+
+      if checkout
+        Config.success_dispatcher_class.new(installments, order).dispatch
+        return order
+      end
+
+      # A new order will only have 1 payment that we created
+      if order.payments.any?(&:failed?)
+        Config.payment_failed_dispatcher_class.new(installments, order).dispatch
+        installments.clear
+        nil
+      end
+    ensure
+      # Any installments that failed to be processed will be reprocessed
+      unfulfilled_installments = installments.select(&:unfulfilled?)
+      if unfulfilled_installments.any?
+        Config.failure_dispatcher_class.
+          new(unfulfilled_installments, order).dispatch
+      end
+    end
+
+    # The order fulfilling the consolidated installment
+    #
+    # @return [Spree::Order]
+    def order
+      @order ||= Spree::Order.create(
+        user: user,
+        email: user.email,
+        store: subscription.store || Spree::Store.default,
+        subscription_order: true
+      )
+    end
+
+    private
+
+    def checkout
+      order.update!
+      apply_promotions
+
+      order.checkout_steps.count.times do
+        order.ship_address = ship_address if order.state == "address"
+        create_payment if order.state == "payment"
+        order.next! if order.next_transition.present?
+      end
+
+      # Do this as a separate "quiet" transition so that it returns true or
+      # false rather than raising a failed transition error
+      order.complete
+    end
+
+    def populate
+      unfulfilled_installments = []
+
+      order_line_items = installments.flat_map do |installment|
+        line_items = installment.line_item_builder.spree_line_items
+
+        unfulfilled_installments.push(installment) if line_items.empty?
+
+        line_items
+      end
+
+      # Remove installments which had no stock from the active list
+      # They will be reprocessed later
+      @installments -= unfulfilled_installments
+      if unfulfilled_installments.any?
+        Config.out_of_stock_dispatcher_class.new(unfulfilled_installments).dispatch
+      end
+
+      return if installments.empty?
+      order_builder.add_line_items(order_line_items)
+    end
+
+    def order_builder
+      @order_builder ||= OrderBuilder.new(order)
+    end
+
+    def subscription
+      installments.first.subscription
+    end
+
+    def ship_address
+      subscription.shipping_address || user.ship_address
+    end
+
+    def active_card
+      if SolidusSupport.solidus_gem_version <  Gem::Version.new("2.2.0")
+        user.credit_cards.default.last
+      else
+        user.wallet.default_wallet_payment_source.payment_source
+      end
+    end
+
+    def create_payment
+      order.payments.create(
+        source: active_card,
+        amount: order.total,
+        payment_method: Config.default_gateway
+      )
+    end
+
+    def apply_promotions
+      Spree::PromotionHandler::Cart.new(order).activate
+      order.updater.update # reload totals
+    end
+
+    def different_owners?
+      installments.map { |i| i.subscription.user }.uniq.length > 1
+    end
+  end
+end