diff options
author | cesartalves <cesartalvez@gmail.com> | 2021-04-16 10:54:58 -0300 |
---|---|---|
committer | cesartalves <cesartalvez@gmail.com> | 2021-04-19 12:41:58 -0300 |
commit | 394e41b77bf56fecac44165fb6af687fab01b8e0 (patch) | |
tree | 365bbd38824df2064b0d62f0efa0134bb4a548ec | |
parent | 9a9a681ea2e2d1f812267164733da40e1fd2d460 (diff) |
Fix Spree::OrdersController decoration
Move all decorators to nested library (api, core, backend, frontend) decorators folder so they don't get loaded unless the library is defined.
-rw-r--r-- | app/decorators/api/controllers/solidus_subscriptions/spree/api/line_items_controller/create_subscription_line_items.rb (renamed from app/decorators/controllers/solidus_subscriptions/spree/api/line_items_controller/create_subscription_line_items.rb) | 0 | ||||
-rw-r--r-- | app/decorators/core/models/solidus_subscriptions/spree/line_item/subscription_line_items_association.rb (renamed from app/decorators/models/solidus_subscriptions/spree/line_item/subscription_line_items_association.rb) | 0 | ||||
-rw-r--r-- | app/decorators/core/models/solidus_subscriptions/spree/order/after_create.rb (renamed from app/decorators/models/solidus_subscriptions/spree/order/after_create.rb) | 0 | ||||
-rw-r--r-- | app/decorators/core/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions.rb (renamed from app/decorators/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions.rb) | 0 | ||||
-rw-r--r-- | app/decorators/core/models/solidus_subscriptions/spree/order/installment_details_association.rb (renamed from app/decorators/models/solidus_subscriptions/spree/order/installment_details_association.rb) | 0 | ||||
-rw-r--r-- | app/decorators/core/models/solidus_subscriptions/spree/order/subscription_association.rb (renamed from app/decorators/models/solidus_subscriptions/spree/order/subscription_association.rb) | 0 | ||||
-rw-r--r-- | app/decorators/core/models/solidus_subscriptions/spree/order/subscription_line_items_association.rb (renamed from app/decorators/models/solidus_subscriptions/spree/order/subscription_line_items_association.rb) | 0 | ||||
-rw-r--r-- | app/decorators/core/models/solidus_subscriptions/spree/product/delegate_subscribable.rb (renamed from app/decorators/models/solidus_subscriptions/spree/product/delegate_subscribable.rb) | 0 | ||||
-rw-r--r-- | app/decorators/core/models/solidus_subscriptions/spree/user/have_many_subscriptions.rb (renamed from app/decorators/models/solidus_subscriptions/spree/user/have_many_subscriptions.rb) | 0 | ||||
-rw-r--r-- | app/decorators/core/models/solidus_subscriptions/spree/variant/auto_delete_from_subscriptions.rb (renamed from app/decorators/models/solidus_subscriptions/spree/variant/auto_delete_from_subscriptions.rb) | 0 | ||||
-rw-r--r-- | app/decorators/core/models/solidus_subscriptions/spree/variant/variant_pretty_name.rb (renamed from app/decorators/models/solidus_subscriptions/spree/variant/variant_pretty_name.rb) | 0 | ||||
-rw-r--r-- | app/decorators/core/models/solidus_subscriptions/spree/wallet_payment_source/report_default_change_to_subscriptions.rb (renamed from app/decorators/models/solidus_subscriptions/spree/wallet_payment_source/report_default_change_to_subscriptions.rb) | 0 | ||||
-rw-r--r-- | app/decorators/frontend/controllers/solidus_subscriptions/spree/orders_controller/create_subscription_line_items.rb (renamed from app/decorators/controllers/solidus_subscriptions/spree/orders_controller/create_subscription_line_items.rb) | 4 | ||||
-rw-r--r-- | lib/solidus_subscriptions/configuration.rb | 1 |
14 files changed, 2 insertions, 3 deletions
diff --git a/app/decorators/controllers/solidus_subscriptions/spree/api/line_items_controller/create_subscription_line_items.rb b/app/decorators/api/controllers/solidus_subscriptions/spree/api/line_items_controller/create_subscription_line_items.rb index 7872a2a..7872a2a 100644 --- a/app/decorators/controllers/solidus_subscriptions/spree/api/line_items_controller/create_subscription_line_items.rb +++ b/app/decorators/api/controllers/solidus_subscriptions/spree/api/line_items_controller/create_subscription_line_items.rb diff --git a/app/decorators/models/solidus_subscriptions/spree/line_item/subscription_line_items_association.rb b/app/decorators/core/models/solidus_subscriptions/spree/line_item/subscription_line_items_association.rb index ccb483f..ccb483f 100644 --- a/app/decorators/models/solidus_subscriptions/spree/line_item/subscription_line_items_association.rb +++ b/app/decorators/core/models/solidus_subscriptions/spree/line_item/subscription_line_items_association.rb diff --git a/app/decorators/models/solidus_subscriptions/spree/order/after_create.rb b/app/decorators/core/models/solidus_subscriptions/spree/order/after_create.rb index c67cb96..c67cb96 100644 --- a/app/decorators/models/solidus_subscriptions/spree/order/after_create.rb +++ b/app/decorators/core/models/solidus_subscriptions/spree/order/after_create.rb diff --git a/app/decorators/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions.rb b/app/decorators/core/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions.rb index 3f83b82..3f83b82 100644 --- a/app/decorators/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions.rb +++ b/app/decorators/core/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions.rb diff --git a/app/decorators/models/solidus_subscriptions/spree/order/installment_details_association.rb b/app/decorators/core/models/solidus_subscriptions/spree/order/installment_details_association.rb index a1261d4..a1261d4 100644 --- a/app/decorators/models/solidus_subscriptions/spree/order/installment_details_association.rb +++ b/app/decorators/core/models/solidus_subscriptions/spree/order/installment_details_association.rb diff --git a/app/decorators/models/solidus_subscriptions/spree/order/subscription_association.rb b/app/decorators/core/models/solidus_subscriptions/spree/order/subscription_association.rb index 81284a3..81284a3 100644 --- a/app/decorators/models/solidus_subscriptions/spree/order/subscription_association.rb +++ b/app/decorators/core/models/solidus_subscriptions/spree/order/subscription_association.rb diff --git a/app/decorators/models/solidus_subscriptions/spree/order/subscription_line_items_association.rb b/app/decorators/core/models/solidus_subscriptions/spree/order/subscription_line_items_association.rb index 3b48225..3b48225 100644 --- a/app/decorators/models/solidus_subscriptions/spree/order/subscription_line_items_association.rb +++ b/app/decorators/core/models/solidus_subscriptions/spree/order/subscription_line_items_association.rb diff --git a/app/decorators/models/solidus_subscriptions/spree/product/delegate_subscribable.rb b/app/decorators/core/models/solidus_subscriptions/spree/product/delegate_subscribable.rb index 740b9d8..740b9d8 100644 --- a/app/decorators/models/solidus_subscriptions/spree/product/delegate_subscribable.rb +++ b/app/decorators/core/models/solidus_subscriptions/spree/product/delegate_subscribable.rb diff --git a/app/decorators/models/solidus_subscriptions/spree/user/have_many_subscriptions.rb b/app/decorators/core/models/solidus_subscriptions/spree/user/have_many_subscriptions.rb index 1fb4cdf..1fb4cdf 100644 --- a/app/decorators/models/solidus_subscriptions/spree/user/have_many_subscriptions.rb +++ b/app/decorators/core/models/solidus_subscriptions/spree/user/have_many_subscriptions.rb diff --git a/app/decorators/models/solidus_subscriptions/spree/variant/auto_delete_from_subscriptions.rb b/app/decorators/core/models/solidus_subscriptions/spree/variant/auto_delete_from_subscriptions.rb index bba173e..bba173e 100644 --- a/app/decorators/models/solidus_subscriptions/spree/variant/auto_delete_from_subscriptions.rb +++ b/app/decorators/core/models/solidus_subscriptions/spree/variant/auto_delete_from_subscriptions.rb diff --git a/app/decorators/models/solidus_subscriptions/spree/variant/variant_pretty_name.rb b/app/decorators/core/models/solidus_subscriptions/spree/variant/variant_pretty_name.rb index 671dcbe..671dcbe 100644 --- a/app/decorators/models/solidus_subscriptions/spree/variant/variant_pretty_name.rb +++ b/app/decorators/core/models/solidus_subscriptions/spree/variant/variant_pretty_name.rb diff --git a/app/decorators/models/solidus_subscriptions/spree/wallet_payment_source/report_default_change_to_subscriptions.rb b/app/decorators/core/models/solidus_subscriptions/spree/wallet_payment_source/report_default_change_to_subscriptions.rb index 6ee754e..6ee754e 100644 --- a/app/decorators/models/solidus_subscriptions/spree/wallet_payment_source/report_default_change_to_subscriptions.rb +++ b/app/decorators/core/models/solidus_subscriptions/spree/wallet_payment_source/report_default_change_to_subscriptions.rb diff --git a/app/decorators/controllers/solidus_subscriptions/spree/orders_controller/create_subscription_line_items.rb b/app/decorators/frontend/controllers/solidus_subscriptions/spree/orders_controller/create_subscription_line_items.rb index 394d025..6b39b4c 100644 --- a/app/decorators/controllers/solidus_subscriptions/spree/orders_controller/create_subscription_line_items.rb +++ b/app/decorators/frontend/controllers/solidus_subscriptions/spree/orders_controller/create_subscription_line_items.rb @@ -32,6 +32,4 @@ module SolidusSubscriptions end end -if defined? Spree::Frontend - Spree::OrdersController.prepend(SolidusSubscriptions::Spree::OrdersController::CreateSubscriptionLineItems) -end +Spree::OrdersController.prepend(SolidusSubscriptions::Spree::OrdersController::CreateSubscriptionLineItems) diff --git a/lib/solidus_subscriptions/configuration.rb b/lib/solidus_subscriptions/configuration.rb index 2606272..18c7889 100644 --- a/lib/solidus_subscriptions/configuration.rb +++ b/lib/solidus_subscriptions/configuration.rb @@ -58,6 +58,7 @@ module SolidusSubscriptions :interval_length, :interval_units, :end_date, + :_destroy ] end |