Installment OrderCreator configuration: keep extra attributes inside the OrderCreator class and remove it from the configuration.

4 files changed, 19 insertions, 18 deletions

diff --git a/lib/generators/solidus_subscriptions/install/templates/initializer.rb b/lib/generators/solidus_subscriptions/install/templates/initializer.rb
index 0abefc9..de1d081 100644
--- a/lib/generators/solidus_subscriptions/install/templates/initializer.rb
+++ b/lib/generators/solidus_subscriptions/install/templates/initializer.rb
@@ -99,15 +99,14 @@ SolidusSubscriptions.configure do |config|
 
   # ==================================== Custom Order Creation =====================================
   #
-  # This settings allows the customization of the creation of each Installment Order and / or
-  # adding additional attributes to the Order
+  # This settings allows the customization of the creation of each Installment Order by means of
+  # providing a class that can be switched / inherited
   #
-  # config.order_creation_class = 'SolidusSubscriptions::OrderCreator'
   #
-  # this class is initialized and called on the creation of the Order for each Subscription Installment
-  # along with a customizable hash of extra attributes that can also be configured, like below:
-  # config.order_creation_extra_attributes = { channel: 'subscriptions' }
+  # 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_creation_extra_attributes = { }
+  # config.order_creator_class = 'SolidusSubscriptions::OrderCreator'
 end
diff --git a/lib/solidus_subscriptions/checkout.rb b/lib/solidus_subscriptions/checkout.rb
index 15f1a26..7bed823 100644
--- a/lib/solidus_subscriptions/checkout.rb
+++ b/lib/solidus_subscriptions/checkout.rb
@@ -32,8 +32,7 @@ module SolidusSubscriptions
     private
 
     def create_order
-      extra_attributes = SolidusSubscriptions.configuration.order_creation_extra_attributes
-      SolidusSubscriptions.configuration.order_creation_class.new(installment, extra_attributes).call
+      SolidusSubscriptions.configuration.order_creator_class.new(installment).call
     end
 
     def populate_order(order)
diff --git a/lib/solidus_subscriptions/configuration.rb b/lib/solidus_subscriptions/configuration.rb
index 5b9aed9..9d6c3d2 100644
--- a/lib/solidus_subscriptions/configuration.rb
+++ b/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, :order_creation_extra_attributes
+      :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, :order_creation_class
+      :subscription_attributes, :subscribable_class, :order_creator_class
     )
 
     def success_dispatcher_class
@@ -82,9 +82,9 @@ module SolidusSubscriptions
       churn_buster_account_id.present? && churn_buster_api_key.present?
     end
 
-    def order_creation_class
-      @order_creation_class ||= 'SolidusSubscriptions::OrderCreator'
-      @order_creation_class.constantize
+    def order_creator_class
+      @order_creator_class ||= 'SolidusSubscriptions::OrderCreator'
+      @order_creator_class.constantize
     end
   end
 end
diff --git a/lib/solidus_subscriptions/order_creator.rb b/lib/solidus_subscriptions/order_creator.rb
index 97b858a..edb68e4 100644
--- a/lib/solidus_subscriptions/order_creator.rb
+++ b/lib/solidus_subscriptions/order_creator.rb
@@ -2,9 +2,8 @@
 
 module SolidusSubscriptions
   class OrderCreator
-    def initialize(installment, extra_attributes)
+    def initialize(installment)
       @installment = installment
-      @extra_attributes = (extra_attributes || {}).symbolize_keys
     end
 
     def call
@@ -21,6 +20,10 @@ module SolidusSubscriptions
 
     protected
 
-    attr_reader :installment, :extra_attributes
+    def extra_attributes
+      {}
+    end
+
+    attr_reader :installment
   end
 end