Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Ability to set a custom `Spree::Base` class (#12254)

Damian Legawiecedde97ce72bb
diff --git a/api/app/models/spree/oauth_access_grant.rb b/api/app/models/spree/oauth_access_grant.rb
index 5921f75a14..7c98b5306d 100644
--- a/api/app/models/spree/oauth_access_grant.rb
+++ b/api/app/models/spree/oauth_access_grant.rb
@@ -1,5 +1,5 @@
module Spree
- class OauthAccessGrant < Base
+ class OauthAccessGrant < Spree.base_class
include ::Doorkeeper::Orm::ActiveRecord::Mixins::AccessGrant
self.table_name = 'spree_oauth_access_grants'
diff --git a/api/app/models/spree/oauth_access_token.rb b/api/app/models/spree/oauth_access_token.rb
index 1f6d590a75..4370c254bf 100644
--- a/api/app/models/spree/oauth_access_token.rb
+++ b/api/app/models/spree/oauth_access_token.rb
@@ -1,5 +1,5 @@
module Spree
- class OauthAccessToken < Base
+ class OauthAccessToken < Spree.base_class
include ::Doorkeeper::Orm::ActiveRecord::Mixins::AccessToken
self.table_name = 'spree_oauth_access_tokens'
diff --git a/api/app/models/spree/oauth_application.rb b/api/app/models/spree/oauth_application.rb
index 438014b6f4..7775bd3938 100644
--- a/api/app/models/spree/oauth_application.rb
+++ b/api/app/models/spree/oauth_application.rb
@@ -1,5 +1,5 @@
module Spree
- class OauthApplication < Base
+ class OauthApplication < Spree.base_class
include ::Doorkeeper::Orm::ActiveRecord::Mixins::Application
self.table_name = 'spree_oauth_applications'
diff --git a/api/app/models/spree/order/webhooks.rb b/api/app/models/spree/order/webhooks.rb
index 2037bb3da4..6093b5911c 100644
--- a/api/app/models/spree/order/webhooks.rb
+++ b/api/app/models/spree/order/webhooks.rb
@@ -1,5 +1,5 @@
module Spree
- class Order < Spree::Base
+ class Order < Spree.base_class
module Webhooks
extend ActiveSupport::Concern
include Spree::Webhooks::HasWebhooks
diff --git a/api/app/models/spree/payment/webhooks.rb b/api/app/models/spree/payment/webhooks.rb
index 108538b75e..733988aad7 100644
--- a/api/app/models/spree/payment/webhooks.rb
+++ b/api/app/models/spree/payment/webhooks.rb
@@ -1,5 +1,5 @@
module Spree
- class Payment < Spree::Base
+ class Payment < Spree.base_class
module Webhooks
extend ActiveSupport::Concern
include Spree::Webhooks::HasWebhooks
diff --git a/api/app/models/spree/product/webhooks.rb b/api/app/models/spree/product/webhooks.rb
index 162af7c5a3..0ed07d80c8 100644
--- a/api/app/models/spree/product/webhooks.rb
+++ b/api/app/models/spree/product/webhooks.rb
@@ -1,5 +1,5 @@
module Spree
- class Product < Spree::Base
+ class Product < Spree.base_class
module Webhooks
extend ActiveSupport::Concern
include Spree::Webhooks::HasWebhooks
diff --git a/api/app/models/spree/shipment/webhooks.rb b/api/app/models/spree/shipment/webhooks.rb
index 043ef65e74..febd1bff83 100644
--- a/api/app/models/spree/shipment/webhooks.rb
+++ b/api/app/models/spree/shipment/webhooks.rb
@@ -1,5 +1,5 @@
module Spree
- class Shipment < Spree::Base
+ class Shipment < Spree.base_class
module Webhooks
extend ActiveSupport::Concern
include Spree::Webhooks::HasWebhooks
diff --git a/api/app/models/spree/stock_item/webhooks.rb b/api/app/models/spree/stock_item/webhooks.rb
index 1e97c24ce3..6bf8d3e166 100644
--- a/api/app/models/spree/stock_item/webhooks.rb
+++ b/api/app/models/spree/stock_item/webhooks.rb
@@ -1,5 +1,5 @@
module Spree
- class StockItem < Spree::Base
+ class StockItem < Spree.base_class
module Webhooks
extend ActiveSupport::Concern
include Spree::Webhooks::HasWebhooks
diff --git a/api/app/models/spree/stock_movement/webhooks.rb b/api/app/models/spree/stock_movement/webhooks.rb
index 016f270f1b..bcc65c4b4d 100644
--- a/api/app/models/spree/stock_movement/webhooks.rb
+++ b/api/app/models/spree/stock_movement/webhooks.rb
@@ -1,5 +1,5 @@
module Spree
- class StockMovement < Spree::Base
+ class StockMovement < Spree.base_class
module Webhooks
extend ActiveSupport::Concern
include Spree::Webhooks::HasWebhooks
diff --git a/api/app/models/spree/variant/webhooks.rb b/api/app/models/spree/variant/webhooks.rb
index 0d4ed40119..2cfadda400 100644
--- a/api/app/models/spree/variant/webhooks.rb
+++ b/api/app/models/spree/variant/webhooks.rb
@@ -1,5 +1,5 @@
module Spree
- class Variant < Spree::Base
+ class Variant < Spree.base_class
module Webhooks
extend ActiveSupport::Concern
include Spree::Webhooks::HasWebhooks
diff --git a/api/app/models/spree/webhooks/base.rb b/api/app/models/spree/webhooks/base.rb
index 8c42ffd3e4..97527fc316 100644
--- a/api/app/models/spree/webhooks/base.rb
+++ b/api/app/models/spree/webhooks/base.rb
@@ -4,7 +4,7 @@ module Spree
'spree_webhooks_'
end
- class Base < Spree::Base
+ class Base < Spree.base_class
self.abstract_class = true
end
end
diff --git a/core/app/models/spree/address.rb b/core/app/models/spree/address.rb
index 87e9b8f115..8a0a5474aa 100644
--- a/core/app/models/spree/address.rb
+++ b/core/app/models/spree/address.rb
@@ -1,5 +1,5 @@
module Spree
- class Address < Spree::Base
+ class Address < Spree.base_class
require 'validates_zipcode'
include Spree::Metadata
diff --git a/core/app/models/spree/adjustment.rb b/core/app/models/spree/adjustment.rb
index b61a940f45..0adc28298a 100644
--- a/core/app/models/spree/adjustment.rb
+++ b/core/app/models/spree/adjustment.rb
@@ -21,7 +21,7 @@
# total. This allows an adjustment to be preserved if it becomes ineligible so
# it might be reinstated.
module Spree
- class Adjustment < Spree::Base
+ class Adjustment < Spree.base_class
with_options polymorphic: true do
belongs_to :adjustable, touch: true
belongs_to :source
diff --git a/core/app/models/spree/asset.rb b/core/app/models/spree/asset.rb
index 8c6c5c7a0f..6f64f1479f 100644
--- a/core/app/models/spree/asset.rb
+++ b/core/app/models/spree/asset.rb
@@ -1,5 +1,5 @@
module Spree
- class Asset < Spree::Base
+ class Asset < Spree.base_class
include Support::ActiveStorage
include Spree::Metadata
if defined?(Spree::Webhooks::HasWebhooks)
diff --git a/core/app/models/spree/asset/support/active_storage.rb b/core/app/models/spree/asset/support/active_storage.rb
index 619a1f7b7d..c206571f9b 100644
--- a/core/app/models/spree/asset/support/active_storage.rb
+++ b/core/app/models/spree/asset/support/active_storage.rb
@@ -1,5 +1,5 @@
module Spree
- class Asset < Spree::Base
+ class Asset < Spree.base_class
module Support
module ActiveStorage
extend ActiveSupport::Concern
diff --git a/core/app/models/spree/base.rb b/core/app/models/spree/base.rb
index 9bf9c767b2..0492cdec57 100644
--- a/core/app/models/spree/base.rb
+++ b/core/app/models/spree/base.rb
@@ -56,7 +56,7 @@ class Spree::Base < ApplicationRecord
end
def self.json_api_columns
- column_names.reject { |c| c.match(/_id$|id|preferences|(.*)password|(.*)token|(.*)api_key/) }
+ column_names.reject { |c| c.match(/_id$|id|preferences|(.*)password|(.*)token|(.*)api_key|^original_(.*)/) }
end
def self.json_api_permitted_attributes
@@ -72,4 +72,13 @@ class Spree::Base < ApplicationRecord
def self.json_api_type
to_s.demodulize.underscore
end
+
+ def self.to_tom_select_json
+ pluck(:name, :id).map do |name, id|
+ {
+ id: id,
+ name: name
+ }
+ end.as_json
+ end
end
diff --git a/core/app/models/spree/calculator.rb b/core/app/models/spree/calculator.rb
index bf0da2275c..5153de05dd 100644
--- a/core/app/models/spree/calculator.rb
+++ b/core/app/models/spree/calculator.rb
@@ -1,5 +1,5 @@
module Spree
- class Calculator < Spree::Base
+ class Calculator < Spree.base_class
acts_as_paranoid
belongs_to :calculable, polymorphic: true, optional: true, inverse_of: :calculator
diff --git a/core/app/models/spree/classification.rb b/core/app/models/spree/classification.rb
index 3588c9705c..b96f083991 100644
--- a/core/app/models/spree/classification.rb
+++ b/core/app/models/spree/classification.rb
@@ -1,5 +1,5 @@
module Spree
- class Classification < Spree::Base
+ class Classification < Spree.base_class
self.table_name = 'spree_products_taxons'
acts_as_list scope: :taxon
diff --git a/core/app/models/spree/country.rb b/core/app/models/spree/country.rb
index 198f41d8bb..f5d7941479 100644
--- a/core/app/models/spree/country.rb
+++ b/core/app/models/spree/country.rb
@@ -1,5 +1,5 @@
module Spree
- class Country < Spree::Base
+ class Country < Spree.base_class
has_many :addresses, dependent: :restrict_with_error
has_many :states,
-> { order name: :asc },
diff --git a/core/app/models/spree/coupon_code.rb b/core/app/models/spree/coupon_code.rb
index 74055f82a5..606db7ccae 100644
--- a/core/app/models/spree/coupon_code.rb
+++ b/core/app/models/spree/coupon_code.rb
@@ -1,5 +1,5 @@
module Spree
- class CouponCode < Spree::Base
+ class CouponCode < Spree.base_class
include Spree::Security::CouponCodes if defined?(Spree::Security::CouponCodes)
enum state: %i(unused used)
diff --git a/core/app/models/spree/credit_card.rb b/core/app/models/spree/credit_card.rb
index b58579752d..f90ebd2ac9 100644
--- a/core/app/models/spree/credit_card.rb
+++ b/core/app/models/spree/credit_card.rb
@@ -1,5 +1,5 @@
module Spree
- class CreditCard < Spree::Base
+ class CreditCard < Spree.base_class
include ActiveMerchant::Billing::CreditCardMethods
include Spree::Metadata
if defined?(Spree::Webhooks::HasWebhooks)
diff --git a/core/app/models/spree/customer_return.rb b/core/app/models/spree/customer_return.rb
index 68f3d21cd8..39af2def89 100644
--- a/core/app/models/spree/customer_return.rb
+++ b/core/app/models/spree/customer_return.rb
@@ -1,5 +1,5 @@
module Spree
- class CustomerReturn < Spree::Base
+ class CustomerReturn < Spree.base_class
include Spree::Core::NumberGenerator.new(prefix: 'CR', length: 9)
include Spree::NumberIdentifier
include Spree::Metadata
diff --git a/core/app/models/spree/digital.rb b/core/app/models/spree/digital.rb
index 60439a1892..2deac3208b 100644
--- a/core/app/models/spree/digital.rb
+++ b/core/app/models/spree/digital.rb
@@ -1,5 +1,5 @@
module Spree
- class Digital < Spree::Base
+ class Digital < Spree.base_class
belongs_to :variant
has_many :digital_links, dependent: :destroy
diff --git a/core/app/models/spree/digital_link.rb b/core/app/models/spree/digital_link.rb
index c03cfc937c..47bf76badd 100644
--- a/core/app/models/spree/digital_link.rb
+++ b/core/app/models/spree/digital_link.rb
@@ -1,5 +1,5 @@
module Spree
- class DigitalLink < Spree::Base
+ class DigitalLink < Spree.base_class
if Rails::VERSION::STRING >= '7.1.0'
has_secure_token on: :save
else
diff --git a/core/app/models/spree/inventory_unit.rb b/core/app/models/spree/inventory_unit.rb
index 946d293194..1a85b227c1 100644
--- a/core/app/models/spree/inventory_unit.rb
+++ b/core/app/models/spree/inventory_unit.rb
@@ -1,5 +1,5 @@
module Spree
- class InventoryUnit < Spree::Base
+ class InventoryUnit < Spree.base_class
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/legacy_user.rb b/core/app/models/spree/legacy_user.rb
index 320956e8d0..fe8e63f0a9 100644
--- a/core/app/models/spree/legacy_user.rb
+++ b/core/app/models/spree/legacy_user.rb
@@ -1,6 +1,6 @@
# Default implementation of User. This class is intended to be modified by extensions (ex. spree_auth_devise)
module Spree
- class LegacyUser < Spree::Base
+ class LegacyUser < Spree.base_class
include Spree::UserAddress
include Spree::UserPaymentSource
include Spree::UserMethods
diff --git a/core/app/models/spree/line_item.rb b/core/app/models/spree/line_item.rb
index aedf2ba106..98ec3cd58a 100644
--- a/core/app/models/spree/line_item.rb
+++ b/core/app/models/spree/line_item.rb
@@ -1,5 +1,5 @@
module Spree
- class LineItem < Spree::Base
+ class LineItem < Spree.base_class
include Spree::Metadata
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
diff --git a/core/app/models/spree/log_entry.rb b/core/app/models/spree/log_entry.rb
index e310255332..ab41db7c8b 100644
--- a/core/app/models/spree/log_entry.rb
+++ b/core/app/models/spree/log_entry.rb
@@ -1,5 +1,5 @@
module Spree
- class LogEntry < Spree::Base
+ class LogEntry < Spree.base_class
if defined?(Spree::Security::LogEntries)
include Spree::Security::LogEntries
end
diff --git a/core/app/models/spree/menu.rb b/core/app/models/spree/menu.rb
index f4711911dc..dc6e03de90 100644
--- a/core/app/models/spree/menu.rb
+++ b/core/app/models/spree/menu.rb
@@ -1,5 +1,5 @@
module Spree
- class Menu < Spree::Base
+ class Menu < Spree.base_class
include Spree::SingleStoreResource
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
diff --git a/core/app/models/spree/menu_item.rb b/core/app/models/spree/menu_item.rb
index a74ce0691d..df293ed8a3 100644
--- a/core/app/models/spree/menu_item.rb
+++ b/core/app/models/spree/menu_item.rb
@@ -1,5 +1,5 @@
module Spree
- class MenuItem < Spree::Base
+ class MenuItem < Spree.base_class
include Spree::DisplayLink
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
diff --git a/core/app/models/spree/option_type.rb b/core/app/models/spree/option_type.rb
index db3f86f32c..c6ee3a2879 100644
--- a/core/app/models/spree/option_type.rb
+++ b/core/app/models/spree/option_type.rb
@@ -1,5 +1,5 @@
module Spree
- class OptionType < Spree::Base
+ class OptionType < Spree.base_class
COLOR_NAMES = %w[color colour].freeze
include Spree::ParameterizableName
diff --git a/core/app/models/spree/option_type_prototype.rb b/core/app/models/spree/option_type_prototype.rb
index f5d0ce9745..8f280cdac4 100644
--- a/core/app/models/spree/option_type_prototype.rb
+++ b/core/app/models/spree/option_type_prototype.rb
@@ -1,5 +1,5 @@
module Spree
- class OptionTypePrototype < Spree::Base
+ class OptionTypePrototype < Spree.base_class
belongs_to :option_type, class_name: 'Spree::OptionType'
belongs_to :prototype, class_name: 'Spree::Prototype'
diff --git a/core/app/models/spree/option_value.rb b/core/app/models/spree/option_value.rb
index bda381c88a..e1428bc245 100644
--- a/core/app/models/spree/option_value.rb
+++ b/core/app/models/spree/option_value.rb
@@ -1,5 +1,5 @@
module Spree
- class OptionValue < Spree::Base
+ class OptionValue < Spree.base_class
include Spree::ParameterizableName
include Spree::Metadata
include Spree::TranslatableResource
diff --git a/core/app/models/spree/option_value_variant.rb b/core/app/models/spree/option_value_variant.rb
index 36e55d22b1..b52420a9ae 100644
--- a/core/app/models/spree/option_value_variant.rb
+++ b/core/app/models/spree/option_value_variant.rb
@@ -1,5 +1,5 @@
module Spree
- class OptionValueVariant < Spree::Base
+ class OptionValueVariant < Spree.base_class
belongs_to :option_value, class_name: 'Spree::OptionValue'
belongs_to :variant, touch: true, class_name: 'Spree::Variant'
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rb
index cb0309a9ff..f5a58ea210 100644
--- a/core/app/models/spree/order.rb
+++ b/core/app/models/spree/order.rb
@@ -6,7 +6,7 @@ require_dependency 'spree/order/store_credit'
require_dependency 'spree/order/emails'
module Spree
- class Order < Spree::Base
+ class Order < Spree.base_class
PAYMENT_STATES = %w(balance_due credit_owed failed paid void)
SHIPMENT_STATES = %w(backorder canceled partial pending ready shipped)
LINE_ITEM_REMOVABLE_STATES = %w(cart address delivery payment confirm resumed)
@@ -87,20 +87,10 @@ module Spree
acts_as_taggable_on :tags
acts_as_taggable_tenant :store_id
- if Spree.user_class
- belongs_to :user, class_name: "::#{Spree.user_class}", optional: true
- else
- belongs_to :user, optional: true
- end
- if Spree.admin_user_class
- belongs_to :created_by, class_name: "::#{Spree.admin_user_class}", optional: true
- belongs_to :approver, class_name: "::#{Spree.admin_user_class}", optional: true
- belongs_to :canceler, class_name: "::#{Spree.admin_user_class}", optional: true
- else
- belongs_to :created_by, optional: true
- belongs_to :approver, optional: true
- belongs_to :canceler, optional: true
- end
+ belongs_to :user, class_name: "::#{Spree.user_class}", optional: true
+ belongs_to :created_by, class_name: "::#{Spree.admin_user_class}", optional: true
+ belongs_to :approver, class_name: "::#{Spree.admin_user_class}", optional: true
+ belongs_to :canceler, class_name: "::#{Spree.admin_user_class}", optional: true
belongs_to :bill_address, foreign_key: :bill_address_id, class_name: 'Spree::Address',
optional: true, dependent: :destroy
diff --git a/core/app/models/spree/order/address_book.rb b/core/app/models/spree/order/address_book.rb
index dfd9ac604c..b03e28a832 100644
--- a/core/app/models/spree/order/address_book.rb
+++ b/core/app/models/spree/order/address_book.rb
@@ -1,5 +1,5 @@
module Spree
- class Order < Spree::Base
+ class Order < Spree.base_class
module AddressBook
def clone_shipping_address
self.bill_address_id = ship_address_id if ship_address_id
diff --git a/core/app/models/spree/order/checkout.rb b/core/app/models/spree/order/checkout.rb
index 46a6b6734a..bb467f8dff 100644
--- a/core/app/models/spree/order/checkout.rb
+++ b/core/app/models/spree/order/checkout.rb
@@ -1,5 +1,5 @@
module Spree
- class Order < Spree::Base
+ class Order < Spree.base_class
module Checkout
def self.included(klass)
klass.class_eval do
diff --git a/core/app/models/spree/order/currency_updater.rb b/core/app/models/spree/order/currency_updater.rb
index 28ac445f1f..5ba1469021 100644
--- a/core/app/models/spree/order/currency_updater.rb
+++ b/core/app/models/spree/order/currency_updater.rb
@@ -1,5 +1,5 @@
module Spree
- class Order < Spree::Base
+ class Order < Spree.base_class
module CurrencyUpdater
extend ActiveSupport::Concern # FIXME: this module is not required to be a concern
diff --git a/core/app/models/spree/order/digital.rb b/core/app/models/spree/order/digital.rb
index 29db74afef..8467463edf 100644
--- a/core/app/models/spree/order/digital.rb
+++ b/core/app/models/spree/order/digital.rb
@@ -1,5 +1,5 @@
module Spree
- class Order < Spree::Base
+ class Order < Spree.base_class
module Digital
def digital?
if line_items.empty?
diff --git a/core/app/models/spree/order/emails.rb b/core/app/models/spree/order/emails.rb
index 344f570d7d..02eef8419f 100644
--- a/core/app/models/spree/order/emails.rb
+++ b/core/app/models/spree/order/emails.rb
@@ -1,5 +1,5 @@
module Spree
- class Order < Spree::Base
+ class Order < Spree.base_class
module Emails
extend ActiveSupport::Concern
diff --git a/core/app/models/spree/order/payments.rb b/core/app/models/spree/order/payments.rb
index 0ffe3cef10..11731cf90e 100644
--- a/core/app/models/spree/order/payments.rb
+++ b/core/app/models/spree/order/payments.rb
@@ -1,5 +1,5 @@
module Spree
- class Order < Spree::Base
+ class Order < Spree.base_class
module Payments
extend ActiveSupport::Concern # FIXME: this module is not required to be a concern
included do
diff --git a/core/app/models/spree/order/store_credit.rb b/core/app/models/spree/order/store_credit.rb
index c857c4a46c..a76a5c2608 100644
--- a/core/app/models/spree/order/store_credit.rb
+++ b/core/app/models/spree/order/store_credit.rb
@@ -1,5 +1,5 @@
module Spree
- class Order < Spree::Base
+ class Order < Spree.base_class
module StoreCredit
def add_store_credit_payments(amount = nil)
Spree::Dependencies.checkout_add_store_credit_service.constantize.call(order: self, amount: amount)
diff --git a/core/app/models/spree/order/webhooks.rb b/core/app/models/spree/order/webhooks.rb
index 5bfee711eb..552f590fc2 100644
--- a/core/app/models/spree/order/webhooks.rb
+++ b/core/app/models/spree/order/webhooks.rb
@@ -1,5 +1,5 @@
module Spree
- class Order < Spree::Base
+ class Order < Spree.base_class
module Webhooks
extend ActiveSupport::Concern
diff --git a/core/app/models/spree/order_promotion.rb b/core/app/models/spree/order_promotion.rb
index 618ec26472..0373f2ec69 100644
--- a/core/app/models/spree/order_promotion.rb
+++ b/core/app/models/spree/order_promotion.rb
@@ -1,5 +1,5 @@
module Spree
- class OrderPromotion < Spree::Base
+ class OrderPromotion < Spree.base_class
belongs_to :order, class_name: 'Spree::Order'
belongs_to :promotion, class_name: 'Spree::Promotion'
diff --git a/core/app/models/spree/payment.rb b/core/app/models/spree/payment.rb
index a40a4c0b1e..556cbb8717 100644
--- a/core/app/models/spree/payment.rb
+++ b/core/app/models/spree/payment.rb
@@ -1,7 +1,7 @@
require_dependency 'spree/payment/processing'
module Spree
- class Payment < Spree::Base
+ class Payment < Spree.base_class
include Spree::Core::NumberGenerator.new(prefix: 'P', letters: true, length: 7)
include Spree::NumberIdentifier
include Spree::NumberAsParam
diff --git a/core/app/models/spree/payment/gateway_options.rb b/core/app/models/spree/payment/gateway_options.rb
index dd4a3d8b29..b864a05661 100644
--- a/core/app/models/spree/payment/gateway_options.rb
+++ b/core/app/models/spree/payment/gateway_options.rb
@@ -1,5 +1,5 @@
module Spree
- class Payment < Spree::Base
+ class Payment < Spree.base_class
class GatewayOptions
def initialize(payment)
@payment = payment
diff --git a/core/app/models/spree/payment/processing.rb b/core/app/models/spree/payment/processing.rb
index 23ad3d32d1..3a13707dd3 100644
--- a/core/app/models/spree/payment/processing.rb
+++ b/core/app/models/spree/payment/processing.rb
@@ -1,7 +1,7 @@
require_dependency 'spree/payment/gateway_options'
module Spree
- class Payment < Spree::Base
+ class Payment < Spree.base_class
module Processing
extend ActiveSupport::Concern
included do
diff --git a/core/app/models/spree/payment/webhooks.rb b/core/app/models/spree/payment/webhooks.rb
index ac512ef5a4..56e8f9a51c 100644
--- a/core/app/models/spree/payment/webhooks.rb
+++ b/core/app/models/spree/payment/webhooks.rb
@@ -1,5 +1,5 @@
module Spree
- class Payment < Spree::Base
+ class Payment < Spree.base_class
module Webhooks
extend ActiveSupport::Concern
diff --git a/core/app/models/spree/payment_capture_event.rb b/core/app/models/spree/payment_capture_event.rb
index df67ffc123..c32aadb9aa 100644
--- a/core/app/models/spree/payment_capture_event.rb
+++ b/core/app/models/spree/payment_capture_event.rb
@@ -1,5 +1,5 @@
module Spree
- class PaymentCaptureEvent < Spree::Base
+ class PaymentCaptureEvent < Spree.base_class
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/payment_method.rb b/core/app/models/spree/payment_method.rb
index 609d99fa71..3fcbcf78b2 100644
--- a/core/app/models/spree/payment_method.rb
+++ b/core/app/models/spree/payment_method.rb
@@ -1,5 +1,5 @@
module Spree
- class PaymentMethod < Spree::Base
+ class PaymentMethod < Spree.base_class
acts_as_paranoid
acts_as_list
diff --git a/core/app/models/spree/payment_source.rb b/core/app/models/spree/payment_source.rb
index 400073e811..58b747c4d2 100644
--- a/core/app/models/spree/payment_source.rb
+++ b/core/app/models/spree/payment_source.rb
@@ -1,5 +1,5 @@
module Spree
- class PaymentSource < Spree::Base
+ class PaymentSource < Spree.base_class
include Spree::Metadata
belongs_to :payment_method, class_name: 'Spree::PaymentMethod'
diff --git a/core/app/models/spree/preference.rb b/core/app/models/spree/preference.rb
index 2db88afcd6..5d32482608 100644
--- a/core/app/models/spree/preference.rb
+++ b/core/app/models/spree/preference.rb
@@ -1,4 +1,4 @@
-class Spree::Preference < Spree::Base
+class Spree::Preference < Spree.base_class
if Rails::VERSION::STRING >= '7.1.0'
serialize :value, coder: YAML
else
diff --git a/core/app/models/spree/price.rb b/core/app/models/spree/price.rb
index 34d9094431..6f78e166a8 100644
--- a/core/app/models/spree/price.rb
+++ b/core/app/models/spree/price.rb
@@ -1,5 +1,5 @@
module Spree
- class Price < Spree::Base
+ class Price < Spree.base_class
include Spree::VatPriceCalculation
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
diff --git a/core/app/models/spree/product.rb b/core/app/models/spree/product.rb
index 39ddc1a081..8e0f8536a3 100644
--- a/core/app/models/spree/product.rb
+++ b/core/app/models/spree/product.rb
@@ -19,7 +19,7 @@
#
module Spree
- class Product < Spree::Base
+ class Product < Spree.base_class
extend FriendlyId
include Spree::ProductScopes
include Spree::MultiStoreResource
diff --git a/core/app/models/spree/product/webhooks.rb b/core/app/models/spree/product/webhooks.rb
index bbf2124c28..86a12b71bf 100644
--- a/core/app/models/spree/product/webhooks.rb
+++ b/core/app/models/spree/product/webhooks.rb
@@ -1,5 +1,5 @@
module Spree
- class Product < Spree::Base
+ class Product < Spree.base_class
module Webhooks
def send_product_activated_webhook
# Implement your logic here
diff --git a/core/app/models/spree/product_option_type.rb b/core/app/models/spree/product_option_type.rb
index 899aac4828..b917720c5d 100644
--- a/core/app/models/spree/product_option_type.rb
+++ b/core/app/models/spree/product_option_type.rb
@@ -1,5 +1,5 @@
module Spree
- class ProductOptionType < Spree::Base
+ class ProductOptionType < Spree.base_class
with_options inverse_of: :product_option_types do
belongs_to :product, class_name: 'Spree::Product'
belongs_to :option_type, class_name: 'Spree::OptionType'
diff --git a/core/app/models/spree/product_promotion_rule.rb b/core/app/models/spree/product_promotion_rule.rb
index 4f11412485..0f833ba46d 100644
--- a/core/app/models/spree/product_promotion_rule.rb
+++ b/core/app/models/spree/product_promotion_rule.rb
@@ -1,5 +1,5 @@
module Spree
- class ProductPromotionRule < Spree::Base
+ class ProductPromotionRule < Spree.base_class
belongs_to :product, class_name: 'Spree::Product'
belongs_to :promotion_rule, class_name: 'Spree::PromotionRule'
diff --git a/core/app/models/spree/product_property.rb b/core/app/models/spree/product_property.rb
index 81494a36ef..ba5f03559f 100644
--- a/core/app/models/spree/product_property.rb
+++ b/core/app/models/spree/product_property.rb
@@ -1,5 +1,5 @@
module Spree
- class ProductProperty < Spree::Base
+ class ProductProperty < Spree.base_class
include Spree::FilterParam
include Spree::TranslatableResource
diff --git a/core/app/models/spree/promotion.rb b/core/app/models/spree/promotion.rb
index eb8513e2c4..bdc090b0fc 100644
--- a/core/app/models/spree/promotion.rb
+++ b/core/app/models/spree/promotion.rb
@@ -1,5 +1,5 @@
module Spree
- class Promotion < Spree::Base
+ class Promotion < Spree.base_class
include Spree::MultiStoreResource
include Spree::Metadata
if defined?(Spree::Webhooks::HasWebhooks)
diff --git a/core/app/models/spree/promotion_action.rb b/core/app/models/spree/promotion_action.rb
index 34fc2b1d6a..3e141a3ff1 100644
--- a/core/app/models/spree/promotion_action.rb
+++ b/core/app/models/spree/promotion_action.rb
@@ -1,7 +1,7 @@
## Base class for all types of promotion action.
# PromotionActions perform the necessary tasks when a promotion is activated by an event and determined to be eligible.
module Spree
- class PromotionAction < Spree::Base
+ class PromotionAction < Spree.base_class
acts_as_paranoid
belongs_to :promotion, class_name: 'Spree::Promotion'
diff --git a/core/app/models/spree/promotion_action_line_item.rb b/core/app/models/spree/promotion_action_line_item.rb
index 796fdd4fb1..69ba28a003 100644
--- a/core/app/models/spree/promotion_action_line_item.rb
+++ b/core/app/models/spree/promotion_action_line_item.rb
@@ -1,5 +1,5 @@
module Spree
- class PromotionActionLineItem < Spree::Base
+ class PromotionActionLineItem < Spree.base_class
belongs_to :promotion_action, class_name: 'Spree::Promotion::Actions::CreateLineItems'
belongs_to :variant, class_name: 'Spree::Variant'
diff --git a/core/app/models/spree/promotion_category.rb b/core/app/models/spree/promotion_category.rb
index e3de06cf66..66ca2c2de3 100644
--- a/core/app/models/spree/promotion_category.rb
+++ b/core/app/models/spree/promotion_category.rb
@@ -1,5 +1,5 @@
module Spree
- class PromotionCategory < Spree::Base
+ class PromotionCategory < Spree.base_class
validates :name, presence: true
has_many :promotions
end
diff --git a/core/app/models/spree/promotion_rule.rb b/core/app/models/spree/promotion_rule.rb
index 7ee316528e..1fd1931069 100644
--- a/core/app/models/spree/promotion_rule.rb
+++ b/core/app/models/spree/promotion_rule.rb
@@ -1,6 +1,6 @@
# Base class for all promotion rules
module Spree
- class PromotionRule < Spree::Base
+ class PromotionRule < Spree.base_class
belongs_to :promotion, class_name: 'Spree::Promotion', inverse_of: :promotion_rules
delegate :stores, to: :promotion
diff --git a/core/app/models/spree/promotion_rule_taxon.rb b/core/app/models/spree/promotion_rule_taxon.rb
index 733a42ca25..be4e686ecd 100644
--- a/core/app/models/spree/promotion_rule_taxon.rb
+++ b/core/app/models/spree/promotion_rule_taxon.rb
@@ -1,5 +1,5 @@
module Spree
- class PromotionRuleTaxon < Spree::Base
+ class PromotionRuleTaxon < Spree.base_class
belongs_to :promotion_rule, class_name: 'Spree::PromotionRule'
belongs_to :taxon, class_name: 'Spree::Taxon'
diff --git a/core/app/models/spree/promotion_rule_user.rb b/core/app/models/spree/promotion_rule_user.rb
index 5793a36c42..9bb8bf9d5b 100644
--- a/core/app/models/spree/promotion_rule_user.rb
+++ b/core/app/models/spree/promotion_rule_user.rb
@@ -1,5 +1,5 @@
module Spree
- class PromotionRuleUser < Spree::Base
+ class PromotionRuleUser < Spree.base_class
belongs_to :promotion_rule, class_name: 'Spree::PromotionRule'
belongs_to :user, class_name: "::#{Spree.user_class}"
diff --git a/core/app/models/spree/property.rb b/core/app/models/spree/property.rb
index 70fce5b865..ec8b70e3b8 100644
--- a/core/app/models/spree/property.rb
+++ b/core/app/models/spree/property.rb
@@ -1,5 +1,5 @@
module Spree
- class Property < Spree::Base
+ class Property < Spree.base_class
include Spree::FilterParam
include Spree::Metadata
include Spree::ParameterizableName
diff --git a/core/app/models/spree/property_prototype.rb b/core/app/models/spree/property_prototype.rb
index ae40982bed..20f2c6bdd9 100644
--- a/core/app/models/spree/property_prototype.rb
+++ b/core/app/models/spree/property_prototype.rb
@@ -1,5 +1,5 @@
module Spree
- class PropertyPrototype < Spree::Base
+ class PropertyPrototype < Spree.base_class
belongs_to :prototype, class_name: 'Spree::Prototype'
belongs_to :property, class_name: 'Spree::Property'
diff --git a/core/app/models/spree/prototype.rb b/core/app/models/spree/prototype.rb
index 0fc4b2d409..39f45767ed 100644
--- a/core/app/models/spree/prototype.rb
+++ b/core/app/models/spree/prototype.rb
@@ -1,5 +1,5 @@
module Spree
- class Prototype < Spree::Base
+ class Prototype < Spree.base_class
include Spree::Metadata
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
diff --git a/core/app/models/spree/prototype_taxon.rb b/core/app/models/spree/prototype_taxon.rb
index b2e1389642..f302bc6b9d 100644
--- a/core/app/models/spree/prototype_taxon.rb
+++ b/core/app/models/spree/prototype_taxon.rb
@@ -1,5 +1,5 @@
module Spree
- class PrototypeTaxon < Spree::Base
+ class PrototypeTaxon < Spree.base_class
belongs_to :taxon, class_name: 'Spree::Taxon'
belongs_to :prototype, class_name: 'Spree::Prototype'
diff --git a/core/app/models/spree/refund.rb b/core/app/models/spree/refund.rb
index acaaafaf6b..1f69783490 100644
--- a/core/app/models/spree/refund.rb
+++ b/core/app/models/spree/refund.rb
@@ -1,5 +1,5 @@
module Spree
- class Refund < Spree::Base
+ class Refund < Spree.base_class
include Spree::Metadata
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
diff --git a/core/app/models/spree/refund_reason.rb b/core/app/models/spree/refund_reason.rb
index 854dfa04a5..198b6b0744 100644
--- a/core/app/models/spree/refund_reason.rb
+++ b/core/app/models/spree/refund_reason.rb
@@ -1,5 +1,5 @@
module Spree
- class RefundReason < Spree::Base
+ class RefundReason < Spree.base_class
include Spree::NamedType
RETURN_PROCESSING_REASON = 'Return processing'
diff --git a/core/app/models/spree/reimbursement.rb b/core/app/models/spree/reimbursement.rb
index 05efdbf34f..1fd3abff91 100644
--- a/core/app/models/spree/reimbursement.rb
+++ b/core/app/models/spree/reimbursement.rb
@@ -1,5 +1,5 @@
module Spree
- class Reimbursement < Spree::Base
+ class Reimbursement < Spree.base_class
include Spree::Core::NumberGenerator.new(prefix: 'RI', length: 9)
include Spree::NumberIdentifier
if defined?(Spree::Webhooks::HasWebhooks)
diff --git a/core/app/models/spree/reimbursement/credit.rb b/core/app/models/spree/reimbursement/credit.rb
index bcc25ead4d..c1509dde42 100644
--- a/core/app/models/spree/reimbursement/credit.rb
+++ b/core/app/models/spree/reimbursement/credit.rb
@@ -1,5 +1,5 @@
module Spree
- class Reimbursement::Credit < Spree::Base
+ class Reimbursement::Credit < Spree.base_class
class_attribute :default_creditable_class
self.default_creditable_class = nil
diff --git a/core/app/models/spree/reimbursement/emails.rb b/core/app/models/spree/reimbursement/emails.rb
index 7cf4a6ae39..d01b9ecc97 100644
--- a/core/app/models/spree/reimbursement/emails.rb
+++ b/core/app/models/spree/reimbursement/emails.rb
@@ -1,5 +1,5 @@
module Spree
- class Reimbursement < Spree::Base
+ class Reimbursement < Spree.base_class
module Emails
def send_reimbursement_email
# you can overwrite this method in your application / extension to send out the confirmation email
diff --git a/core/app/models/spree/reimbursement_type.rb b/core/app/models/spree/reimbursement_type.rb
index 99b5259040..76be373ae5 100644
--- a/core/app/models/spree/reimbursement_type.rb
+++ b/core/app/models/spree/reimbursement_type.rb
@@ -1,5 +1,5 @@
module Spree
- class ReimbursementType < Spree::Base
+ class ReimbursementType < Spree.base_class
include Spree::NamedType
KINDS = %w(Spree::ReimbursementType::Credit
diff --git a/core/app/models/spree/return_authorization.rb b/core/app/models/spree/return_authorization.rb
index d573e9fc2f..831b3066f8 100644
--- a/core/app/models/spree/return_authorization.rb
+++ b/core/app/models/spree/return_authorization.rb
@@ -1,5 +1,5 @@
module Spree
- class ReturnAuthorization < Spree::Base
+ class ReturnAuthorization < Spree.base_class
include Spree::Core::NumberGenerator.new(prefix: 'RA', length: 9)
include Spree::NumberIdentifier
if defined?(Spree::Webhooks::HasWebhooks)
diff --git a/core/app/models/spree/return_authorization_reason.rb b/core/app/models/spree/return_authorization_reason.rb
index 857d267d8f..d5496401a2 100644
--- a/core/app/models/spree/return_authorization_reason.rb
+++ b/core/app/models/spree/return_authorization_reason.rb
@@ -1,5 +1,5 @@
module Spree
- class ReturnAuthorizationReason < Spree::Base
+ class ReturnAuthorizationReason < Spree.base_class
include Spree::NamedType
has_many :return_authorizations, dependent: :restrict_with_error
diff --git a/core/app/models/spree/return_item.rb b/core/app/models/spree/return_item.rb
index 0d82c27c9a..28a16cd3e2 100644
--- a/core/app/models/spree/return_item.rb
+++ b/core/app/models/spree/return_item.rb
@@ -1,5 +1,5 @@
module Spree
- class ReturnItem < Spree::Base
+ class ReturnItem < Spree.base_class
COMPLETED_RECEPTION_STATUSES = %w(received given_to_customer)
if defined?(Spree::Webhooks::HasWebhooks)
diff --git a/core/app/models/spree/role.rb b/core/app/models/spree/role.rb
index 404adc26e2..663039d153 100644
--- a/core/app/models/spree/role.rb
+++ b/core/app/models/spree/role.rb
@@ -1,7 +1,9 @@
module Spree
- class Role < Spree::Base
+ class Role < Spree.base_class
include Spree::UniqueName
+ ADMIN_ROLE = 'admin'
+
has_many :role_users, class_name: 'Spree::RoleUser', dependent: :destroy
has_many :users, through: :role_users, class_name: "::#{Spree.user_class}"
end
diff --git a/core/app/models/spree/role_user.rb b/core/app/models/spree/role_user.rb
index e2edda01b4..6654a90b07 100644
--- a/core/app/models/spree/role_user.rb
+++ b/core/app/models/spree/role_user.rb
@@ -1,5 +1,5 @@
module Spree
- class RoleUser < Spree::Base
+ class RoleUser < Spree.base_class
belongs_to :role, class_name: 'Spree::Role'
belongs_to :user, class_name: Spree.admin_user_class.to_s
end
diff --git a/core/app/models/spree/shipment.rb b/core/app/models/spree/shipment.rb
index e8bb2107fe..927c9ad4dc 100644
--- a/core/app/models/spree/shipment.rb
+++ b/core/app/models/spree/shipment.rb
@@ -1,7 +1,7 @@
require 'ostruct'
module Spree
- class Shipment < Spree::Base
+ class Shipment < Spree.base_class
include Spree::Core::NumberGenerator.new(prefix: 'H', length: 11)
include Spree::NumberIdentifier
include Spree::NumberAsParam
diff --git a/core/app/models/spree/shipment/emails.rb b/core/app/models/spree/shipment/emails.rb
index 75882859f4..d5025649b3 100644
--- a/core/app/models/spree/shipment/emails.rb
+++ b/core/app/models/spree/shipment/emails.rb
@@ -1,5 +1,5 @@
module Spree
- class Shipment < Spree::Base
+ class Shipment < Spree.base_class
module Emails
def send_shipped_email
# you can overwrite this method in your application / extension to send out the confirmation email
diff --git a/core/app/models/spree/shipment/webhooks.rb b/core/app/models/spree/shipment/webhooks.rb
index 119aa84ea0..a9c0553772 100644
--- a/core/app/models/spree/shipment/webhooks.rb
+++ b/core/app/models/spree/shipment/webhooks.rb
@@ -1,5 +1,5 @@
module Spree
- class Shipment < Spree::Base
+ class Shipment < Spree.base_class
module Webhooks
extend ActiveSupport::Concern
diff --git a/core/app/models/spree/shipping_category.rb b/core/app/models/spree/shipping_category.rb
index e69cca8930..1f1f005ee6 100644
--- a/core/app/models/spree/shipping_category.rb
+++ b/core/app/models/spree/shipping_category.rb
@@ -1,5 +1,5 @@
module Spree
- class ShippingCategory < Spree::Base
+ class ShippingCategory < Spree.base_class
include Spree::UniqueName
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
diff --git a/core/app/models/spree/shipping_method.rb b/core/app/models/spree/shipping_method.rb
index 85fb7bf7cf..db76729f81 100644
--- a/core/app/models/spree/shipping_method.rb
+++ b/core/app/models/spree/shipping_method.rb
@@ -1,5 +1,5 @@
module Spree
- class ShippingMethod < Spree::Base
+ class ShippingMethod < Spree.base_class
acts_as_paranoid
include Spree::CalculatedAdjustments
include Spree::Metadata
diff --git a/core/app/models/spree/shipping_method_category.rb b/core/app/models/spree/shipping_method_category.rb
index 6774b71b0d..cdd4c75619 100644
--- a/core/app/models/spree/shipping_method_category.rb
+++ b/core/app/models/spree/shipping_method_category.rb
@@ -1,5 +1,5 @@
module Spree
- class ShippingMethodCategory < Spree::Base
+ class ShippingMethodCategory < Spree.base_class
belongs_to :shipping_method, class_name: 'Spree::ShippingMethod'
belongs_to :shipping_category, class_name: 'Spree::ShippingCategory', inverse_of: :shipping_method_categories
end
diff --git a/core/app/models/spree/shipping_method_zone.rb b/core/app/models/spree/shipping_method_zone.rb
index fc500a9d51..b968498211 100644
--- a/core/app/models/spree/shipping_method_zone.rb
+++ b/core/app/models/spree/shipping_method_zone.rb
@@ -1,5 +1,5 @@
module Spree
- class ShippingMethodZone < Spree::Base
+ class ShippingMethodZone < Spree.base_class
belongs_to :shipping_method, -> { with_deleted }, inverse_of: :shipping_method_zones, class_name: 'Spree::ShippingMethod'
belongs_to :zone, inverse_of: :shipping_method_zones, class_name: 'Spree::Zone'
diff --git a/core/app/models/spree/shipping_rate.rb b/core/app/models/spree/shipping_rate.rb
index c02f5da105..b40c42a088 100644
--- a/core/app/models/spree/shipping_rate.rb
+++ b/core/app/models/spree/shipping_rate.rb
@@ -1,5 +1,5 @@
module Spree
- class ShippingRate < Spree::Base
+ class ShippingRate < Spree.base_class
belongs_to :shipment, class_name: 'Spree::Shipment'
belongs_to :tax_rate, -> { with_deleted }, class_name: 'Spree::TaxRate'
belongs_to :shipping_method, -> { with_deleted }, class_name: 'Spree::ShippingMethod', inverse_of: :shipping_rates
diff --git a/core/app/models/spree/state.rb b/core/app/models/spree/state.rb
index 10fd3f0ef9..979645fbfd 100644
--- a/core/app/models/spree/state.rb
+++ b/core/app/models/spree/state.rb
@@ -1,5 +1,5 @@
module Spree
- class State < Spree::Base
+ class State < Spree.base_class
belongs_to :country, class_name: 'Spree::Country'
has_many :addresses, dependent: :restrict_with_error
diff --git a/core/app/models/spree/state_change.rb b/core/app/models/spree/state_change.rb
index cc65f6c3ef..4c74052f94 100644
--- a/core/app/models/spree/state_change.rb
+++ b/core/app/models/spree/state_change.rb
@@ -1,5 +1,5 @@
module Spree
- class StateChange < Spree::Base
+ class StateChange < Spree.base_class
belongs_to :user, class_name: "::#{Spree.user_class}", optional: true
belongs_to :stateful, polymorphic: true
diff --git a/core/app/models/spree/stock_item.rb b/core/app/models/spree/stock_item.rb
index 006ee326ac..d084e25bbc 100644
--- a/core/app/models/spree/stock_item.rb
+++ b/core/app/models/spree/stock_item.rb
@@ -1,5 +1,5 @@
module Spree
- class StockItem < Spree::Base
+ class StockItem < Spree.base_class
acts_as_paranoid
include Spree::Metadata
diff --git a/core/app/models/spree/stock_item/webhooks.rb b/core/app/models/spree/stock_item/webhooks.rb
index c02eebacde..895e395f2c 100644
--- a/core/app/models/spree/stock_item/webhooks.rb
+++ b/core/app/models/spree/stock_item/webhooks.rb
@@ -1,5 +1,5 @@
module Spree
- class StockItem < Spree::Base
+ class StockItem < Spree.base_class
module Webhooks
end
end
diff --git a/core/app/models/spree/stock_location.rb b/core/app/models/spree/stock_location.rb
index 001e9531d1..e22f3e5f94 100644
--- a/core/app/models/spree/stock_location.rb
+++ b/core/app/models/spree/stock_location.rb
@@ -1,5 +1,5 @@
module Spree
- class StockLocation < Spree::Base
+ class StockLocation < Spree.base_class
include Spree::UniqueName
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
diff --git a/core/app/models/spree/stock_movement.rb b/core/app/models/spree/stock_movement.rb
index 69e88fb566..2bd789e059 100644
--- a/core/app/models/spree/stock_movement.rb
+++ b/core/app/models/spree/stock_movement.rb
@@ -1,5 +1,5 @@
module Spree
- class StockMovement < Spree::Base
+ class StockMovement < Spree.base_class
QUANTITY_LIMITS = {
max: 2**31 - 1,
min: -2**31
diff --git a/core/app/models/spree/stock_movement/webhooks.rb b/core/app/models/spree/stock_movement/webhooks.rb
index 9464a82d11..9bc2a30c6d 100644
--- a/core/app/models/spree/stock_movement/webhooks.rb
+++ b/core/app/models/spree/stock_movement/webhooks.rb
@@ -1,5 +1,5 @@
module Spree
- class StockMovement < Spree::Base
+ class StockMovement < Spree.base_class
module Webhooks
end
end
diff --git a/core/app/models/spree/stock_transfer.rb b/core/app/models/spree/stock_transfer.rb
index deb4066f6a..05aab11300 100644
--- a/core/app/models/spree/stock_transfer.rb
+++ b/core/app/models/spree/stock_transfer.rb
@@ -1,5 +1,5 @@
module Spree
- class StockTransfer < Spree::Base
+ class StockTransfer < Spree.base_class
include Spree::Core::NumberGenerator.new(prefix: 'T')
include Spree::NumberIdentifier
include Spree::NumberAsParam
diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rb
index 48cad5d71a..c2f834cea2 100644
--- a/core/app/models/spree/store.rb
+++ b/core/app/models/spree/store.rb
@@ -1,5 +1,5 @@
module Spree
- class Store < Spree::Base
+ class Store < Spree.base_class
include Spree::TranslatableResource
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
diff --git a/core/app/models/spree/store_credit.rb b/core/app/models/spree/store_credit.rb
index ed4b27be46..eddc1b13d8 100644
--- a/core/app/models/spree/store_credit.rb
+++ b/core/app/models/spree/store_credit.rb
@@ -1,5 +1,5 @@
module Spree
- class StoreCredit < Spree::Base
+ class StoreCredit < Spree.base_class
include Spree::SingleStoreResource
include Spree::Metadata
if defined?(Spree::Webhooks::HasWebhooks)
diff --git a/core/app/models/spree/store_credit_category.rb b/core/app/models/spree/store_credit_category.rb
index 03548c8cfd..51e3901f28 100644
--- a/core/app/models/spree/store_credit_category.rb
+++ b/core/app/models/spree/store_credit_category.rb
@@ -1,5 +1,5 @@
module Spree
- class StoreCreditCategory < Spree::Base
+ class StoreCreditCategory < Spree.base_class
validates :name, presence: true
before_destroy :validate_not_used
diff --git a/core/app/models/spree/store_credit_event.rb b/core/app/models/spree/store_credit_event.rb
index e1ee9f54d4..82044d23b5 100644
--- a/core/app/models/spree/store_credit_event.rb
+++ b/core/app/models/spree/store_credit_event.rb
@@ -1,5 +1,5 @@
module Spree
- class StoreCreditEvent < Spree::Base
+ class StoreCreditEvent < Spree.base_class
acts_as_paranoid
belongs_to :store_credit
diff --git a/core/app/models/spree/store_credit_type.rb b/core/app/models/spree/store_credit_type.rb
index 2eb788aa2c..20df14571e 100644
--- a/core/app/models/spree/store_credit_type.rb
+++ b/core/app/models/spree/store_credit_type.rb
@@ -1,5 +1,5 @@
module Spree
- class StoreCreditType < Spree::Base
+ class StoreCreditType < Spree.base_class
DEFAULT_TYPE_NAME = 'Expiring'.freeze
has_many :store_credits, class_name: 'Spree::StoreCredit', foreign_key: 'type_id'
diff --git a/core/app/models/spree/store_payment_method.rb b/core/app/models/spree/store_payment_method.rb
index fd8b8249ca..add6ee5191 100644
--- a/core/app/models/spree/store_payment_method.rb
+++ b/core/app/models/spree/store_payment_method.rb
@@ -1,5 +1,5 @@
module Spree
- class StorePaymentMethod < Spree::Base
+ class StorePaymentMethod < Spree.base_class
self.table_name = 'spree_payment_methods_stores'
belongs_to :store, class_name: 'Spree::Store', touch: true
diff --git a/core/app/models/spree/store_product.rb b/core/app/models/spree/store_product.rb
index 2fb0539a9e..4657d2a828 100644
--- a/core/app/models/spree/store_product.rb
+++ b/core/app/models/spree/store_product.rb
@@ -1,5 +1,5 @@
module Spree
- class StoreProduct < Spree::Base
+ class StoreProduct < Spree.base_class
self.table_name = 'spree_products_stores'
belongs_to :store, class_name: 'Spree::Store', touch: true
diff --git a/core/app/models/spree/store_promotion.rb b/core/app/models/spree/store_promotion.rb
index ba0514ef05..0c145942ec 100644
--- a/core/app/models/spree/store_promotion.rb
+++ b/core/app/models/spree/store_promotion.rb
@@ -1,5 +1,5 @@
module Spree
- class StorePromotion < Spree::Base
+ class StorePromotion < Spree.base_class
self.table_name = 'spree_promotions_stores'
belongs_to :store, class_name: 'Spree::Store', touch: true
diff --git a/core/app/models/spree/tax_category.rb b/core/app/models/spree/tax_category.rb
index 0732969bdd..e61c14afd8 100644
--- a/core/app/models/spree/tax_category.rb
+++ b/core/app/models/spree/tax_category.rb
@@ -1,5 +1,5 @@
module Spree
- class TaxCategory < Spree::Base
+ class TaxCategory < Spree.base_class
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/tax_rate.rb b/core/app/models/spree/tax_rate.rb
index 15ee8f4d27..f6040fcef7 100644
--- a/core/app/models/spree/tax_rate.rb
+++ b/core/app/models/spree/tax_rate.rb
@@ -1,5 +1,5 @@
module Spree
- class TaxRate < Spree::Base
+ class TaxRate < Spree.base_class
acts_as_paranoid
include Spree::CalculatedAdjustments
diff --git a/core/app/models/spree/taxon.rb b/core/app/models/spree/taxon.rb
index e7a81dab77..e07877b6f4 100644
--- a/core/app/models/spree/taxon.rb
+++ b/core/app/models/spree/taxon.rb
@@ -2,7 +2,7 @@
require 'stringex'
module Spree
- class Taxon < Spree::Base
+ class Taxon < Spree.base_class
RULES_MATCH_POLICIES = %w[all any].freeze
SORT_ORDERS = %w[
manual
diff --git a/core/app/models/spree/taxonomy.rb b/core/app/models/spree/taxonomy.rb
index 55ce6c3066..5a4b37e1cc 100644
--- a/core/app/models/spree/taxonomy.rb
+++ b/core/app/models/spree/taxonomy.rb
@@ -1,5 +1,5 @@
module Spree
- class Taxonomy < Spree::Base
+ class Taxonomy < Spree.base_class
include Spree::TranslatableResource
include Spree::Metadata
include Spree::SingleStoreResource
diff --git a/core/app/models/spree/variant.rb b/core/app/models/spree/variant.rb
index 57ec634ebc..df39230f38 100644
--- a/core/app/models/spree/variant.rb
+++ b/core/app/models/spree/variant.rb
@@ -1,5 +1,5 @@
module Spree
- class Variant < Spree::Base
+ class Variant < Spree.base_class
acts_as_paranoid
acts_as_list scope: :product
diff --git a/core/app/models/spree/variant/webhooks.rb b/core/app/models/spree/variant/webhooks.rb
index 69466d4599..228f748ec4 100644
--- a/core/app/models/spree/variant/webhooks.rb
+++ b/core/app/models/spree/variant/webhooks.rb
@@ -1,5 +1,5 @@
module Spree
- class Variant < Spree::Base
+ class Variant < Spree.base_class
module Webhooks
end
end
diff --git a/core/app/models/spree/wished_item.rb b/core/app/models/spree/wished_item.rb
index 0c6d592d4b..77f24155c7 100644
--- a/core/app/models/spree/wished_item.rb
+++ b/core/app/models/spree/wished_item.rb
@@ -1,5 +1,5 @@
module Spree
- class WishedItem < Spree::Base
+ class WishedItem < Spree.base_class
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/wishlist.rb b/core/app/models/spree/wishlist.rb
index c9c1748c04..a820f935cc 100644
--- a/core/app/models/spree/wishlist.rb
+++ b/core/app/models/spree/wishlist.rb
@@ -1,5 +1,5 @@
module Spree
- class Wishlist < Spree::Base
+ class Wishlist < Spree.base_class
include Spree::SingleStoreResource
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
diff --git a/core/app/models/spree/zone.rb b/core/app/models/spree/zone.rb
index 218583f6d7..926d1118a0 100644
--- a/core/app/models/spree/zone.rb
+++ b/core/app/models/spree/zone.rb
@@ -1,5 +1,5 @@
module Spree
- class Zone < Spree::Base
+ class Zone < Spree.base_class
include Spree::UniqueName
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
diff --git a/core/app/models/spree/zone_member.rb b/core/app/models/spree/zone_member.rb
index 21bb5a32a9..ef92bc9ced 100644
--- a/core/app/models/spree/zone_member.rb
+++ b/core/app/models/spree/zone_member.rb
@@ -1,5 +1,5 @@
module Spree
- class ZoneMember < Spree::Base
+ class ZoneMember < Spree.base_class
belongs_to :zone, class_name: 'Spree::Zone', counter_cache: true, inverse_of: :zone_members
belongs_to :zoneable, polymorphic: true
diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rb
index edf78bdb66..44447ef7df 100644
--- a/core/lib/spree/core.rb
+++ b/core/lib/spree/core.rb
@@ -34,9 +34,18 @@ require 'wannabe_bool'
StateMachines::Machine.ignore_method_conflicts = true
module Spree
- mattr_accessor :user_class, :admin_user_class, :private_storage_service_name,
- :public_storage_service_name, :cdn_host, :searcher_class,
- :queues
+ mattr_accessor :base_class, :user_class, :admin_user_class,
+ :private_storage_service_name, :public_storage_service_name,
+ :cdn_host, :searcher_class, :queues
+
+ def self.base_class(constantize: true)
+ @@base_class ||= 'Spree::Base'
+ if @@base_class.is_a?(Class)
+ raise 'Spree.base_class MUST be a String or Symbol object, not a Class object.'
+ elsif @@base_class.is_a?(String) || @@base_class.is_a?(Symbol)
+ constantize ? @@base_class.to_s.constantize : @@base_class.to_s
+ end
+ end
def self.user_class(constantize: true)
if @@user_class.is_a?(Class)