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.

Making sure we're always including Spree concerns with Spree namespac… (#12032)

Damian Legawieccbe632739a8a
diff --git a/core/app/models/concerns/spree/named_type.rb b/core/app/models/concerns/spree/named_type.rb
index b0a1710017..0851539695 100644
--- a/core/app/models/concerns/spree/named_type.rb
+++ b/core/app/models/concerns/spree/named_type.rb
@@ -6,7 +6,7 @@ module Spree
scope :active, -> { where(active: true) }
default_scope { order(Arel.sql("LOWER(#{table_name}.name)")) }
- include UniqueName
+ include Spree::UniqueName
end
end
end
diff --git a/core/app/models/spree/address.rb b/core/app/models/spree/address.rb
index 5f6107b57a..1feb02a8a5 100644
--- a/core/app/models/spree/address.rb
+++ b/core/app/models/spree/address.rb
@@ -2,7 +2,7 @@ module Spree
class Address < Spree::Base
require 'validates_zipcode'
- include Metadata
+ include Spree::Metadata
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/asset.rb b/core/app/models/spree/asset.rb
index 3b0574bfd3..97702f8d93 100644
--- a/core/app/models/spree/asset.rb
+++ b/core/app/models/spree/asset.rb
@@ -1,7 +1,7 @@
module Spree
class Asset < Spree::Base
include Support::ActiveStorage
- include Metadata
+ include Spree::Metadata
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/calculator/default_tax.rb b/core/app/models/spree/calculator/default_tax.rb
index 14afd1aa6f..645cfe18e8 100644
--- a/core/app/models/spree/calculator/default_tax.rb
+++ b/core/app/models/spree/calculator/default_tax.rb
@@ -2,7 +2,7 @@ require_dependency 'spree/calculator'
module Spree
class Calculator::DefaultTax < Calculator
- include VatPriceCalculation
+ include Spree::VatPriceCalculation
def self.description
Spree.t(:default_tax)
end
diff --git a/core/app/models/spree/cms_page.rb b/core/app/models/spree/cms_page.rb
index 46a6cfa2e4..6958ebe82b 100644
--- a/core/app/models/spree/cms_page.rb
+++ b/core/app/models/spree/cms_page.rb
@@ -1,7 +1,7 @@
module Spree
class CmsPage < Base
- include SingleStoreResource
- include DisplayLink
+ include Spree::SingleStoreResource
+ include Spree::DisplayLink
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
diff --git a/core/app/models/spree/cms_section.rb b/core/app/models/spree/cms_section.rb
index ed359d7087..443a4d123c 100644
--- a/core/app/models/spree/cms_section.rb
+++ b/core/app/models/spree/cms_section.rb
@@ -1,6 +1,6 @@
module Spree
class CmsSection < Base
- include DisplayLink
+ include Spree::DisplayLink
acts_as_list scope: :cms_page
belongs_to :cms_page, touch: true
diff --git a/core/app/models/spree/credit_card.rb b/core/app/models/spree/credit_card.rb
index 726a362592..d9bf218c5b 100644
--- a/core/app/models/spree/credit_card.rb
+++ b/core/app/models/spree/credit_card.rb
@@ -1,7 +1,7 @@
module Spree
class CreditCard < Spree::Base
include ActiveMerchant::Billing::CreditCardMethods
- include Metadata
+ include Spree::Metadata
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/customer_return.rb b/core/app/models/spree/customer_return.rb
index b9611615b3..781f9d826f 100644
--- a/core/app/models/spree/customer_return.rb
+++ b/core/app/models/spree/customer_return.rb
@@ -1,8 +1,8 @@
module Spree
class CustomerReturn < Spree::Base
include Spree::Core::NumberGenerator.new(prefix: 'CR', length: 9)
- include NumberIdentifier
- include Metadata
+ include Spree::NumberIdentifier
+ include Spree::Metadata
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/image.rb b/core/app/models/spree/image.rb
index 158fb0a213..0c28fb296f 100644
--- a/core/app/models/spree/image.rb
+++ b/core/app/models/spree/image.rb
@@ -1,8 +1,8 @@
module Spree
class Image < Asset
- include Configuration::ActiveStorage
+ include Spree::Image::Configuration::ActiveStorage
include Rails.application.routes.url_helpers
- include ::Spree::ImageMethods
+ include Spree::ImageMethods
# In Rails 5.x class constants are being undefined/redefined during the code reloading process
# in a rails development environment, after which the actual ruby objects stored in those class constants
diff --git a/core/app/models/spree/legacy_user.rb b/core/app/models/spree/legacy_user.rb
index d21df8559d..5030b9bb9d 100644
--- a/core/app/models/spree/legacy_user.rb
+++ b/core/app/models/spree/legacy_user.rb
@@ -1,9 +1,9 @@
# Default implementation of User. This class is intended to be modified by extensions (ex. spree_auth_devise)
module Spree
class LegacyUser < Spree::Base
- include UserAddress
- include UserPaymentSource
- include UserMethods
+ include Spree::UserAddress
+ include Spree::UserPaymentSource
+ include Spree::UserMethods
include Spree::Metadata
self.table_name = 'spree_users'
diff --git a/core/app/models/spree/line_item.rb b/core/app/models/spree/line_item.rb
index e9696cbb73..11d0b4cf86 100644
--- a/core/app/models/spree/line_item.rb
+++ b/core/app/models/spree/line_item.rb
@@ -1,6 +1,6 @@
module Spree
class LineItem < Spree::Base
- include Metadata
+ include Spree::Metadata
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/menu.rb b/core/app/models/spree/menu.rb
index 893d80dfec..f4711911dc 100644
--- a/core/app/models/spree/menu.rb
+++ b/core/app/models/spree/menu.rb
@@ -1,6 +1,6 @@
module Spree
class Menu < Spree::Base
- include SingleStoreResource
+ include Spree::SingleStoreResource
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/option_type.rb b/core/app/models/spree/option_type.rb
index 59cfd97715..58d5de11ef 100644
--- a/core/app/models/spree/option_type.rb
+++ b/core/app/models/spree/option_type.rb
@@ -1,8 +1,8 @@
module Spree
class OptionType < Spree::Base
- include UniqueName
- include Metadata
- include TranslatableResource
+ include Spree::UniqueName
+ include Spree::Metadata
+ include Spree::TranslatableResource
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/option_value.rb b/core/app/models/spree/option_value.rb
index 697dfe9e34..0e363ff7b7 100644
--- a/core/app/models/spree/option_value.rb
+++ b/core/app/models/spree/option_value.rb
@@ -1,7 +1,7 @@
module Spree
class OptionValue < Spree::Base
- include Metadata
- include TranslatableResource
+ include Spree::Metadata
+ include Spree::TranslatableResource
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rb
index 1f9e11ed38..97b1ac4914 100644
--- a/core/app/models/spree/order.rb
+++ b/core/app/models/spree/order.rb
@@ -20,10 +20,10 @@ module Spree
include Spree::Core::NumberGenerator.new(prefix: 'R')
include Spree::Core::TokenGenerator
- include NumberIdentifier
- include NumberAsParam
- include SingleStoreResource
- include MemoizedData
+ include Spree::NumberIdentifier
+ include Spree::NumberAsParam
+ include Spree::SingleStoreResource
+ include Spree::MemoizedData
include Spree::Metadata
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
diff --git a/core/app/models/spree/payment.rb b/core/app/models/spree/payment.rb
index 574f03d821..c8c06ad134 100644
--- a/core/app/models/spree/payment.rb
+++ b/core/app/models/spree/payment.rb
@@ -3,9 +3,9 @@ require_dependency 'spree/payment/processing'
module Spree
class Payment < Spree::Base
include Spree::Core::NumberGenerator.new(prefix: 'P', letters: true, length: 7)
- include NumberIdentifier
- include NumberAsParam
- include Metadata
+ include Spree::NumberIdentifier
+ include Spree::NumberAsParam
+ include Spree::Metadata
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 22b0c2b25b..82b0c81bbe 100644
--- a/core/app/models/spree/payment_method.rb
+++ b/core/app/models/spree/payment_method.rb
@@ -3,7 +3,7 @@ module Spree
acts_as_paranoid
acts_as_list
- include MultiStoreResource
+ include Spree::MultiStoreResource
include Spree::Metadata
if defined?(Spree::Security::PaymentMethods)
include Spree::Security::PaymentMethods
diff --git a/core/app/models/spree/payment_source.rb b/core/app/models/spree/payment_source.rb
index 058e621e3a..400073e811 100644
--- a/core/app/models/spree/payment_source.rb
+++ b/core/app/models/spree/payment_source.rb
@@ -1,6 +1,6 @@
module Spree
class PaymentSource < Spree::Base
- include Metadata
+ include Spree::Metadata
belongs_to :payment_method, class_name: 'Spree::PaymentMethod'
belongs_to :user, class_name: 'Spree::User', optional: true
diff --git a/core/app/models/spree/price.rb b/core/app/models/spree/price.rb
index 26f67c3eff..ab1b2b4449 100644
--- a/core/app/models/spree/price.rb
+++ b/core/app/models/spree/price.rb
@@ -1,6 +1,6 @@
module Spree
class Price < Spree::Base
- include VatPriceCalculation
+ include Spree::VatPriceCalculation
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/product.rb b/core/app/models/spree/product.rb
index 7a8aa7c407..79c36c2523 100644
--- a/core/app/models/spree/product.rb
+++ b/core/app/models/spree/product.rb
@@ -21,12 +21,12 @@
module Spree
class Product < Spree::Base
extend FriendlyId
- include ProductScopes
- include MultiStoreResource
- include TranslatableResource
- include TranslatableResourceSlug
- include MemoizedData
- include Metadata
+ include Spree::ProductScopes
+ include Spree::MultiStoreResource
+ include Spree::TranslatableResource
+ include Spree::TranslatableResourceSlug
+ include Spree::MemoizedData
+ include Spree::Metadata
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/product_property.rb b/core/app/models/spree/product_property.rb
index ce5dbdf961..09e9e189bd 100644
--- a/core/app/models/spree/product_property.rb
+++ b/core/app/models/spree/product_property.rb
@@ -1,7 +1,7 @@
module Spree
class ProductProperty < Spree::Base
include Spree::FilterParam
- include TranslatableResource
+ include Spree::TranslatableResource
TRANSLATABLE_FIELDS = %i[value filter_param].freeze
translates(*TRANSLATABLE_FIELDS)
diff --git a/core/app/models/spree/promotion.rb b/core/app/models/spree/promotion.rb
index b69dae3c12..121b2ea771 100644
--- a/core/app/models/spree/promotion.rb
+++ b/core/app/models/spree/promotion.rb
@@ -1,7 +1,7 @@
module Spree
class Promotion < Spree::Base
- include MultiStoreResource
- include Metadata
+ include Spree::MultiStoreResource
+ include Spree::Metadata
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/property.rb b/core/app/models/spree/property.rb
index 1c5c4efcc6..12338a5481 100644
--- a/core/app/models/spree/property.rb
+++ b/core/app/models/spree/property.rb
@@ -1,8 +1,8 @@
module Spree
class Property < Spree::Base
include Spree::FilterParam
- include Metadata
- include TranslatableResource
+ include Spree::Metadata
+ include Spree::TranslatableResource
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/prototype.rb b/core/app/models/spree/prototype.rb
index 06ad516953..0fc4b2d409 100644
--- a/core/app/models/spree/prototype.rb
+++ b/core/app/models/spree/prototype.rb
@@ -1,6 +1,6 @@
module Spree
class Prototype < Spree::Base
- include Metadata
+ include Spree::Metadata
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/refund.rb b/core/app/models/spree/refund.rb
index f30fc9ff94..b980c55149 100644
--- a/core/app/models/spree/refund.rb
+++ b/core/app/models/spree/refund.rb
@@ -1,6 +1,6 @@
module Spree
class Refund < Spree::Base
- include Metadata
+ include Spree::Metadata
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/reimbursement.rb b/core/app/models/spree/reimbursement.rb
index f81b3e05db..a38f74f2e6 100644
--- a/core/app/models/spree/reimbursement.rb
+++ b/core/app/models/spree/reimbursement.rb
@@ -1,7 +1,7 @@
module Spree
class Reimbursement < Spree::Base
include Spree::Core::NumberGenerator.new(prefix: 'RI', length: 9)
- include NumberIdentifier
+ include Spree::NumberIdentifier
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/return_authorization.rb b/core/app/models/spree/return_authorization.rb
index 7dd8a533d0..d573e9fc2f 100644
--- a/core/app/models/spree/return_authorization.rb
+++ b/core/app/models/spree/return_authorization.rb
@@ -1,7 +1,7 @@
module Spree
class ReturnAuthorization < Spree::Base
include Spree::Core::NumberGenerator.new(prefix: 'RA', length: 9)
- include NumberIdentifier
+ include Spree::NumberIdentifier
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/role.rb b/core/app/models/spree/role.rb
index 6dd576af6c..404adc26e2 100644
--- a/core/app/models/spree/role.rb
+++ b/core/app/models/spree/role.rb
@@ -1,6 +1,6 @@
module Spree
class Role < Spree::Base
- include UniqueName
+ include Spree::UniqueName
has_many :role_users, class_name: 'Spree::RoleUser', dependent: :destroy
has_many :users, through: :role_users, class_name: "::#{Spree.user_class}"
diff --git a/core/app/models/spree/shipment.rb b/core/app/models/spree/shipment.rb
index a746ba840d..f945de6696 100644
--- a/core/app/models/spree/shipment.rb
+++ b/core/app/models/spree/shipment.rb
@@ -3,9 +3,9 @@ require 'ostruct'
module Spree
class Shipment < Spree::Base
include Spree::Core::NumberGenerator.new(prefix: 'H', length: 11)
- include NumberIdentifier
- include NumberAsParam
- include Metadata
+ include Spree::NumberIdentifier
+ include Spree::NumberAsParam
+ include Spree::Metadata
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/shipping_category.rb b/core/app/models/spree/shipping_category.rb
index 022e90ce5d..e69cca8930 100644
--- a/core/app/models/spree/shipping_category.rb
+++ b/core/app/models/spree/shipping_category.rb
@@ -1,6 +1,6 @@
module Spree
class ShippingCategory < Spree::Base
- include UniqueName
+ include Spree::UniqueName
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/shipping_method.rb b/core/app/models/spree/shipping_method.rb
index 0678d036d8..6ea496adf7 100644
--- a/core/app/models/spree/shipping_method.rb
+++ b/core/app/models/spree/shipping_method.rb
@@ -2,7 +2,7 @@ module Spree
class ShippingMethod < Spree::Base
acts_as_paranoid
include Spree::CalculatedAdjustments
- include Metadata
+ include Spree::Metadata
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/stock/estimator.rb b/core/app/models/spree/stock/estimator.rb
index 7749be2f42..c9931b0d2a 100644
--- a/core/app/models/spree/stock/estimator.rb
+++ b/core/app/models/spree/stock/estimator.rb
@@ -1,7 +1,7 @@
module Spree
module Stock
class Estimator
- include VatPriceCalculation
+ include Spree::VatPriceCalculation
attr_reader :order, :currency
diff --git a/core/app/models/spree/stock_item.rb b/core/app/models/spree/stock_item.rb
index b2efa692a7..45759b9a9f 100644
--- a/core/app/models/spree/stock_item.rb
+++ b/core/app/models/spree/stock_item.rb
@@ -2,7 +2,7 @@ module Spree
class StockItem < Spree::Base
acts_as_paranoid
- include Metadata
+ include Spree::Metadata
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/stock_location.rb b/core/app/models/spree/stock_location.rb
index f58d1806aa..26b75c9ddf 100644
--- a/core/app/models/spree/stock_location.rb
+++ b/core/app/models/spree/stock_location.rb
@@ -1,6 +1,6 @@
module Spree
class StockLocation < Spree::Base
- include UniqueName
+ include Spree::UniqueName
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/stock_transfer.rb b/core/app/models/spree/stock_transfer.rb
index f39fc3e1ab..240c44c923 100644
--- a/core/app/models/spree/stock_transfer.rb
+++ b/core/app/models/spree/stock_transfer.rb
@@ -1,9 +1,9 @@
module Spree
class StockTransfer < Spree::Base
include Spree::Core::NumberGenerator.new(prefix: 'T')
- include NumberIdentifier
- include NumberAsParam
- include Metadata
+ include Spree::NumberIdentifier
+ include Spree::NumberAsParam
+ include Spree::Metadata
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rb
index f7a1b27d50..1de6157c16 100644
--- a/core/app/models/spree/store.rb
+++ b/core/app/models/spree/store.rb
@@ -1,6 +1,6 @@
module Spree
class Store < Spree::Base
- include TranslatableResource
+ include Spree::TranslatableResource
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/store_credit.rb b/core/app/models/spree/store_credit.rb
index 37efe85e3d..a486416fcf 100644
--- a/core/app/models/spree/store_credit.rb
+++ b/core/app/models/spree/store_credit.rb
@@ -1,7 +1,7 @@
module Spree
class StoreCredit < Spree::Base
- include SingleStoreResource
- include Metadata
+ include Spree::SingleStoreResource
+ include Spree::Metadata
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/taxon.rb b/core/app/models/spree/taxon.rb
index 5f7177082a..8524c1034f 100644
--- a/core/app/models/spree/taxon.rb
+++ b/core/app/models/spree/taxon.rb
@@ -3,9 +3,9 @@ require 'stringex'
module Spree
class Taxon < Spree::Base
- include TranslatableResource
- include TranslatableResourceSlug
- include Metadata
+ include Spree::TranslatableResource
+ include Spree::TranslatableResourceSlug
+ include Spree::Metadata
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/taxon_image.rb b/core/app/models/spree/taxon_image.rb
index 5f2d3741ee..95e04c2ff3 100644
--- a/core/app/models/spree/taxon_image.rb
+++ b/core/app/models/spree/taxon_image.rb
@@ -1,8 +1,8 @@
module Spree
class TaxonImage < Asset
- include Configuration::ActiveStorage
+ include Spree::TaxonImage::Configuration::ActiveStorage
include Rails.application.routes.url_helpers
- include ::Spree::ImageMethods
+ include Spree::ImageMethods
def styles
self.class.styles.map do |_, size|
diff --git a/core/app/models/spree/taxonomy.rb b/core/app/models/spree/taxonomy.rb
index 87d9080936..067281d136 100644
--- a/core/app/models/spree/taxonomy.rb
+++ b/core/app/models/spree/taxonomy.rb
@@ -1,7 +1,7 @@
module Spree
class Taxonomy < Spree::Base
- include TranslatableResource
- include Metadata
+ include Spree::TranslatableResource
+ include Spree::Metadata
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/variant.rb b/core/app/models/spree/variant.rb
index 558a5ffd50..abac51d04e 100644
--- a/core/app/models/spree/variant.rb
+++ b/core/app/models/spree/variant.rb
@@ -3,8 +3,8 @@ module Spree
acts_as_paranoid
acts_as_list scope: :product
- include MemoizedData
- include Metadata
+ include Spree::MemoizedData
+ include Spree::Metadata
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 a248803b3c..679afdba8c 100644
--- a/core/app/models/spree/wishlist.rb
+++ b/core/app/models/spree/wishlist.rb
@@ -1,6 +1,6 @@
module Spree
class Wishlist < Spree::Base
- include SingleStoreResource
+ include Spree::SingleStoreResource
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end
diff --git a/core/app/models/spree/zone.rb b/core/app/models/spree/zone.rb
index 3a36ff1c2d..218583f6d7 100644
--- a/core/app/models/spree/zone.rb
+++ b/core/app/models/spree/zone.rb
@@ -1,6 +1,6 @@
module Spree
class Zone < Spree::Base
- include UniqueName
+ include Spree::UniqueName
if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Webhooks::HasWebhooks
end