From ea54b8a68a5f907321f72b47ddd939b9db8a57b8 Mon Sep 17 00:00:00 2001 From: erwin Date: Sat, 15 Jun 2024 23:11:48 +0700 Subject: [PATCH 1/2] Fix deprecation warnings, issue #294 see: https://github.com/solidusio/solidus_subscriptions/issues/294 --- lib/solidus_subscriptions/engine.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/solidus_subscriptions/engine.rb b/lib/solidus_subscriptions/engine.rb index 682ebccc..2aa4448a 100644 --- a/lib/solidus_subscriptions/engine.rb +++ b/lib/solidus_subscriptions/engine.rb @@ -41,8 +41,8 @@ class Engine < Rails::Engine ::Spree::Backend::Config.configure do |config| config.menu_items << config.class::MenuItem.new( - [:subscriptions], - 'repeat', + label: :subscriptions, + icon: 'repeat', url: :admin_subscriptions_path, condition: ->{ can?(:admin, SolidusSubscriptions::Subscription) }, match_path: '/subscriptions' From e5ecd9418b2aca8c0ad31fc934d1c644968d35e9 Mon Sep 17 00:00:00 2001 From: erwin Date: Sun, 16 Jun 2024 00:20:12 +0700 Subject: [PATCH 2/2] Copy PR#298 that isn't merged yet - Fixes Ransack changes https://github.com/solidusio/solidus_subscriptions/pull/298 --- app/models/solidus_subscriptions/installment.rb | 4 ++++ app/models/solidus_subscriptions/subscription.rb | 10 +++++++++- app/models/solidus_subscriptions/subscription_event.rb | 4 ++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/app/models/solidus_subscriptions/installment.rb b/app/models/solidus_subscriptions/installment.rb index 9477a42b..0a155984 100644 --- a/app/models/solidus_subscriptions/installment.rb +++ b/app/models/solidus_subscriptions/installment.rb @@ -131,5 +131,9 @@ def next_actionable_date (DateTime.current + SolidusSubscriptions.configuration.reprocessing_interval).beginning_of_minute end + + def self.ransackable_attributes(_auth_object = nil) + %w[actionable_date created_at id id_value subscription_id updated_at] + end end end diff --git a/app/models/solidus_subscriptions/subscription.rb b/app/models/solidus_subscriptions/subscription.rb index 3f249924..3b8d036c 100644 --- a/app/models/solidus_subscriptions/subscription.rb +++ b/app/models/solidus_subscriptions/subscription.rb @@ -135,7 +135,7 @@ def self.processing_states end after_transition to: :active, do: :advance_actionable_date - after_transition do: :emit_event_for_transition + #after_transition do: :emit_event_for_transition end # This method determines if a subscription may be canceled. Canceled @@ -432,5 +432,13 @@ def emit_events_for_update emit_event(type: 'subscription_payment_method_changed') end end + + def self.ransackable_attributes(_auth_object = nil) + %w[actionable_date billing_address_id created_at currency end_date guest_token id id_value interval_length interval_units paused payment_method_id payment_source_id payment_source_type shipping_address_id skip_count state store_id successive_skip_count updated_at user_id] + end + + def self.ransackable_associations(_auth_object = nil) + %w[billing_address events installment_details installments line_items orders payment_method payment_source shipping_address store user] + end end end diff --git a/app/models/solidus_subscriptions/subscription_event.rb b/app/models/solidus_subscriptions/subscription_event.rb index 6f81ef7e..68cb37c3 100644 --- a/app/models/solidus_subscriptions/subscription_event.rb +++ b/app/models/solidus_subscriptions/subscription_event.rb @@ -7,5 +7,9 @@ class SubscriptionEvent < ApplicationRecord after_initialize do self.details ||= {} end + + def self.ransackable_attributes(_auth_object = nil) + %w[created_at details event_type id id_value subscription_id updated_at] + end end end