solidus_subscriptions 1.0.0.rc1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45719f0e107935ab6aa80a88c77f9a4e4724c75a6232d5b48522cbdd46fe1b13
-  data.tar.gz: 9703884d1d0f90d6eb580df7c33e74c0f90cf5809b9377c237edeef4883a8f84
+  metadata.gz: 77254a24d5d35be4a22fe74a9287f2c6ce89c8940327dbf207f93cbda65ac0c3
+  data.tar.gz: 3e9d2b8bf25c12e47581281de6e3b659eb0951452030304be5de10f78b781388
 SHA512:
-  metadata.gz: cadc2b4bd51ae07326c4a0259c16c70dcce339a672630fd5e6aa8f5e56a47b88d86ce325db6f7c4cb5d36140fef3ac51311660c7a2449b7026b6e23bbdd411ad
-  data.tar.gz: 3bbd14e0dff7851badd900cf605d25a5468822aff5ab4fb18e2707577c4db0c582db02ac594545747b66831b1a5d3e9d7cf8e8f408499cdb8c3c16a931e30473
+  metadata.gz: 5bdb4af6b9b67879b7cb487053ce43ae0cdddcdeec0f4aea0728c177b65b7f9f1f79fae7ae866512d8b1ccc5bc1fb9620eb60bb5bb1352ecfaecb8b61816003c
+  data.tar.gz: 58ca346aa4a7bda38c126444fb4de00e5692f9902f4bfc7c34e408addc03cc6fc331c161a5ee3553829d89d50204769591168ebf3232073509bc7539130a9522

data/CHANGELOG.md

@@ -1,8 +1,8 @@
 # Changelog
 
-## [v1.0.0.rc1](https://github.com/solidusio-contrib/solidus_subscriptions/tree/v1.0.0.rc1) (2021-04-02)
+## [v1.0.0](https://github.com/solidusio-contrib/solidus_subscriptions/tree/v1.0.0) (2021-05-16)
 
-[Full Changelog](https://github.com/solidusio-contrib/solidus_subscriptions/compare/a8a92654ba21b22bd3f8d07c3ae25e3604e7942a...v1.0.0.rc1)
+[Full Changelog](https://github.com/solidusio-contrib/solidus_subscriptions/compare/a8a92654ba21b22bd3f8d07c3ae25e3604e7942a...v1.0.0)
 
 **Breaking changes:**
 
@@ -80,6 +80,7 @@
 
 **Closed issues:**
 
+- Dependabot can't resolve your Ruby dependency files [\#226](https://github.com/solidusio-contrib/solidus_subscriptions/issues/226)
 - Fix sandbox generation [\#196](https://github.com/solidusio-contrib/solidus_subscriptions/issues/196)
 - Dependabot can't resolve your Ruby dependency files [\#187](https://github.com/solidusio-contrib/solidus_subscriptions/issues/187)
 - Dependabot can't resolve your Ruby dependency files [\#186](https://github.com/solidusio-contrib/solidus_subscriptions/issues/186)
@@ -111,6 +112,11 @@
 
 **Merged pull requests:**
 
+- Introduce Installment OrderCreator configuration [\#229](https://github.com/solidusio-contrib/solidus_subscriptions/pull/229) ([cesartalves](https://github.com/cesartalves))
+- Update solidus\_core requirement from \>= 2.0.0, \< 3 to \>= 2.0.0, \< 4 [\#225](https://github.com/solidusio-contrib/solidus_subscriptions/pull/225) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Fix Api Subscription Permitted LineItem Attributes [\#223](https://github.com/solidusio-contrib/solidus_subscriptions/pull/223) ([cesartalves](https://github.com/cesartalves))
+- Fix Spree::OrdersController decoration [\#221](https://github.com/solidusio-contrib/solidus_subscriptions/pull/221) ([cesartalves](https://github.com/cesartalves))
+- Reload order during finalize action [\#220](https://github.com/solidusio-contrib/solidus_subscriptions/pull/220) ([seand7565](https://github.com/seand7565))
 - Update specs to conform with rubocop [\#217](https://github.com/solidusio-contrib/solidus_subscriptions/pull/217) ([seand7565](https://github.com/seand7565))
 - Update promotion rule names on db [\#216](https://github.com/solidusio-contrib/solidus_subscriptions/pull/216) ([luca-landa](https://github.com/luca-landa))
 - Improve promotion rules names [\#215](https://github.com/solidusio-contrib/solidus_subscriptions/pull/215) ([luca-landa](https://github.com/luca-landa))

data/app/controllers/solidus_subscriptions/api/v1/subscriptions_controller.rb

@@ -78,7 +78,7 @@ module SolidusSubscriptions
         end
 
         def line_item_attributes
-          SolidusSubscriptions.configuration.subscription_line_item_attributes - [:subscribable_id] + [:id]
+          SolidusSubscriptions.configuration.subscription_line_item_attributes
         end
 
         def update_payment_attributes(attributes)

data/app/decorators/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions.rb

@@ -13,6 +13,8 @@ module SolidusSubscriptions
             SolidusSubscriptions::SubscriptionGenerator.activate(line_items)
           end
 
+          reload
+
           super
         end
       end

data/app/decorators/models/solidus_subscriptions/spree/variant/auto_delete_from_subscriptions.rb

@@ -12,9 +12,9 @@ module SolidusSubscriptions
         def remove_from_subscriptions
           SolidusSubscriptions::LineItem.where(subscribable: self).delete_all
         end
+
+        ::Spree::Variant.prepend self
       end
     end
   end
 end
-
-Spree::Variant.prepend(SolidusSubscriptions::Spree::Variant::AutoDeleteFromSubscriptions)

data/lib/generators/solidus_subscriptions/install/templates/initializer.rb

@@ -96,4 +96,17 @@ SolidusSubscriptions.configure do |config|
   # with new subscription cycles by clearing any past failed installment when a new one is created
 
   # config.clear_past_installments = true
+
+  # ==================================== Custom Order Creation =====================================
+  #
+  # This settings allows the customization of the creation of each Installment Order by means of
+  # providing a class that can be switched / inherited
+  #
+  #
+  # the order_creator_class is initialized and called on the creation of the Order for each Subscription
+  # Installment.
+  # If you want to add simple extra attributes to the Order (such as a channel), that can be done by
+  # overriding the `extra_attributes` method on a subclass
+  #
+  # config.order_creator_class = 'SolidusSubscriptions::OrderCreator'
 end

data/lib/solidus_subscriptions.rb

@@ -26,6 +26,7 @@ require 'solidus_subscriptions/dispatcher/failure_dispatcher'
 require 'solidus_subscriptions/dispatcher/out_of_stock_dispatcher'
 require 'solidus_subscriptions/dispatcher/payment_failed_dispatcher'
 require 'solidus_subscriptions/dispatcher/success_dispatcher'
+require 'solidus_subscriptions/order_creator'
 
 module SolidusSubscriptions
   class << self

data/lib/solidus_subscriptions/checkout.rb

@@ -32,14 +32,7 @@ module SolidusSubscriptions
     private
 
     def create_order
-      ::Spree::Order.create(
-        user: installment.subscription.user,
-        email: installment.subscription.user.email,
-        store: installment.subscription.store || ::Spree::Store.default,
-        subscription_order: true,
-        subscription: installment.subscription,
-        currency: installment.subscription.currency
-      )
+      SolidusSubscriptions.configuration.order_creator_class.new(installment).call
     end
 
     def populate_order(order)
@@ -61,7 +54,7 @@ module SolidusSubscriptions
           order.payments.create(
             payment_method: installment.subscription.payment_method_to_use,
             source: installment.subscription.payment_source_to_use,
-            amount: order.total,
+            amount: order.total
           )
         end
 

data/lib/solidus_subscriptions/configuration.rb

@@ -4,14 +4,14 @@ module SolidusSubscriptions
   class Configuration
     attr_accessor(
       :maximum_total_skips, :maximum_reprocessing_time, :churn_buster_account_id,
-      :churn_buster_api_key, :clear_past_installments, :processing_error_handler,
+      :churn_buster_api_key, :clear_past_installments, :processing_error_handler
     )
 
     attr_writer(
       :success_dispatcher_class, :failure_dispatcher_class, :payment_failed_dispatcher_class,
       :out_of_stock_dispatcher, :maximum_successive_skips, :reprocessing_interval,
       :minimum_cancellation_notice, :processing_queue, :subscription_line_item_attributes,
-      :subscription_attributes, :subscribable_class,
+      :subscription_attributes, :subscribable_class, :order_creator_class
     )
 
     def success_dispatcher_class
@@ -52,11 +52,12 @@ module SolidusSubscriptions
 
     def subscription_line_item_attributes
       @subscription_line_item_attributes ||= [
+        :id,
         :quantity,
         :subscribable_id,
         :interval_length,
         :interval_units,
-        :end_date,
+        :end_date
       ]
     end
 
@@ -68,7 +69,7 @@ module SolidusSubscriptions
         {
           shipping_address_attributes: Spree::PermittedAttributes.address_attributes,
           billing_address_attributes: Spree::PermittedAttributes.address_attributes
-        },
+        }
       ]
     end
 
@@ -80,5 +81,10 @@ module SolidusSubscriptions
     def churn_buster?
       churn_buster_account_id.present? && churn_buster_api_key.present?
     end
+
+    def order_creator_class
+      @order_creator_class ||= 'SolidusSubscriptions::OrderCreator'
+      @order_creator_class.constantize
+    end
   end
 end

data/lib/solidus_subscriptions/order_creator.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module SolidusSubscriptions
+  class OrderCreator
+    def initialize(installment)
+      @installment = installment
+    end
+
+    def call
+      ::Spree::Order.create(
+        user: installment.subscription.user,
+        email: installment.subscription.user.email,
+        store: installment.subscription.store || ::Spree::Store.default,
+        subscription_order: true,
+        subscription: installment.subscription,
+        currency: installment.subscription.currency,
+        **extra_attributes
+      )
+    end
+
+    private
+
+    def extra_attributes
+      {}
+    end
+
+    attr_reader :installment
+  end
+end

data/lib/solidus_subscriptions/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusSubscriptions
-  VERSION = '1.0.0.rc1'
+  VERSION = '1.0.0'
 end

data/solidus_subscriptions.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'deface'
   spec.add_dependency 'httparty', '~> 0.18'
   spec.add_dependency 'i18n'
-  spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 3']
+  spec.add_dependency 'solidus_core', '>= 2.0.0', '< 4'
   spec.add_dependency 'solidus_support', '~> 0.7'
   spec.add_dependency 'state_machines'
 

data/spec/decorators/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe SolidusSubscriptions::Spree::Order::FinalizeCreatesSubscriptions
 
     let(:order) { create :order, :with_subscription_line_items }
     let(:subscription_line_item) { order.subscription_line_items.last }
-    let(:expected_actionable_date) { Time.zone.today + subscription_line_item.interval }
+    let(:expected_actionable_date) { Time.zone.today + subscription_line_item.subscription.interval }
 
     around { |e| Timecop.freeze { e.run } }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_subscriptions
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-02 00:00:00.000000000 Z
+date: 2021-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -61,7 +61,7 @@ dependencies:
         version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,7 +71,7 @@ dependencies:
         version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: solidus_support
   requirement: !ruby/object:Gem::Requirement
@@ -241,8 +241,6 @@ files:
 - app/controllers/spree/admin/subscription_orders_controller.rb
 - app/controllers/spree/admin/subscriptions_controller.rb
 - app/controllers/spree/admin/users/subscriptions_controller.rb
-- app/decorators/controllers/solidus_subscriptions/spree/api/line_items_controller/create_subscription_line_items.rb
-- app/decorators/controllers/solidus_subscriptions/spree/orders_controller/create_subscription_line_items.rb
 - app/decorators/models/solidus_subscriptions/spree/line_item/subscription_line_items_association.rb
 - app/decorators/models/solidus_subscriptions/spree/order/after_create.rb
 - app/decorators/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions.rb
@@ -336,6 +334,8 @@ files:
 - db/migrate/20201123171026_change_actionable_date_to_date.rb
 - db/migrate/20210205140422_add_currency_to_subscription.rb
 - db/migrate/20210323165714_update_promotion_rule_names.rb
+- lib/decorators/api/controllers/solidus_subscriptions/spree/api/line_items_controller/create_subscription_line_items.rb
+- lib/decorators/frontend/controllers/solidus_subscriptions/spree/orders_controller/create_subscription_line_items.rb
 - lib/generators/solidus_subscriptions/install/install_generator.rb
 - lib/generators/solidus_subscriptions/install/templates/initializer.rb
 - lib/solidus_subscriptions.rb
@@ -353,6 +353,7 @@ files:
 - lib/solidus_subscriptions/dispatcher/payment_failed_dispatcher.rb
 - lib/solidus_subscriptions/dispatcher/success_dispatcher.rb
 - lib/solidus_subscriptions/engine.rb
+- lib/solidus_subscriptions/order_creator.rb
 - lib/solidus_subscriptions/permission_sets/default_customer.rb
 - lib/solidus_subscriptions/permission_sets/subscription_management.rb
 - lib/solidus_subscriptions/permitted_attributes.rb
@@ -438,11 +439,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.8
 signing_key:
 specification_version: 4
 summary: Add subscription support to Solidus