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.

Patching last models to use `Spree.base_class`

Damian Legawiec7e1533701f3f
diff --git a/core/app/models/spree/cms_page.rb b/core/app/models/spree/cms_page.rb
index 6958ebe82b..2022742641 100644
--- a/core/app/models/spree/cms_page.rb
+++ b/core/app/models/spree/cms_page.rb
@@ -1,5 +1,5 @@
module Spree
- class CmsPage < Base
+ class CmsPage < Spree.base_class
include Spree::SingleStoreResource
include Spree::DisplayLink
diff --git a/core/app/models/spree/cms_section.rb b/core/app/models/spree/cms_section.rb
index 443a4d123c..62a627f991 100644
--- a/core/app/models/spree/cms_section.rb
+++ b/core/app/models/spree/cms_section.rb
@@ -1,5 +1,5 @@
module Spree
- class CmsSection < Base
+ class CmsSection < Spree.base_class
include Spree::DisplayLink
acts_as_list scope: :cms_page
diff --git a/core/app/models/spree/data_feed.rb b/core/app/models/spree/data_feed.rb
index a727813418..75985a45cc 100644
--- a/core/app/models/spree/data_feed.rb
+++ b/core/app/models/spree/data_feed.rb
@@ -1,5 +1,5 @@
module Spree
- class DataFeed < Base
+ class DataFeed < Spree.base_class
belongs_to :store, class_name: 'Spree::Store', foreign_key: 'store_id'
scope :for_store, ->(store) { where(store: store) }
diff --git a/core/app/models/spree/export.rb b/core/app/models/spree/export.rb
index dec04f3cea..b76f9fe7c6 100644
--- a/core/app/models/spree/export.rb
+++ b/core/app/models/spree/export.rb
@@ -1,7 +1,7 @@
require 'csv'
module Spree
- class Export < Base
+ class Export < Spree.base_class
SUPPORTED_FILE_FORMATS = %i[csv].freeze
include Spree::SingleStoreResource
diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rb
index dfb413c2e0..d8c306995b 100644
--- a/core/app/models/spree/store.rb
+++ b/core/app/models/spree/store.rb
@@ -307,7 +307,6 @@ module Spree
taxonomies.find_or_create_by(name: I18n.t('spree.taxonomy_categories_name', default: I18n.t('spree.taxonomy_categories_name', locale: :en)))
taxonomies.find_or_create_by(name: I18n.t('spree.taxonomy_brands_name', default: I18n.t('spree.taxonomy_brands_name', locale: :en)))
taxonomies.find_or_create_by(name: I18n.t('spree.taxonomy_collections_name', default: I18n.t('spree.taxonomy_collections_name', locale: :en)))
- rescue ActiveRecord::NotNullViolation
end
def ensure_default_automatic_taxons
diff --git a/core/app/models/spree/taxon_rule.rb b/core/app/models/spree/taxon_rule.rb
index 079834c59d..9de60b28da 100644
--- a/core/app/models/spree/taxon_rule.rb
+++ b/core/app/models/spree/taxon_rule.rb
@@ -1,5 +1,5 @@
module Spree
- class TaxonRule < Base
+ class TaxonRule < Spree.base_class
MATCH_POLICIES = %w[
is_equal_to
is_not_equal_to