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.

Remove obsolete `include Spree::Webhooks::HasWebhooks` from models

Damian Legawiec6ca78c64861c
diff --git a/core/app/models/spree/address.rb b/core/app/models/spree/address.rb
index 7b9c9080c1..f735d57d2e 100644
--- a/core/app/models/spree/address.rb
+++ b/core/app/models/spree/address.rb
@@ -4,9 +4,6 @@ module Spree
include Spree::Metafields
include Spree::Metadata
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
serialize :preferences, type: Hash, coder: YAML, default: {}
diff --git a/core/app/models/spree/asset.rb b/core/app/models/spree/asset.rb
index 5bb987ad37..7c8b97e77b 100644
--- a/core/app/models/spree/asset.rb
+++ b/core/app/models/spree/asset.rb
@@ -3,9 +3,6 @@ module Spree
include Support::ActiveStorage
include Spree::Metafields
include Spree::Metadata
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
EXTERNAL_URL_METAFIELD_KEY = 'external.url'
diff --git a/core/app/models/spree/credit_card.rb b/core/app/models/spree/credit_card.rb
index efd04ee8c7..b881ccd3ab 100644
--- a/core/app/models/spree/credit_card.rb
+++ b/core/app/models/spree/credit_card.rb
@@ -5,9 +5,6 @@ module Spree
include Spree::Metadata
include Spree::PaymentSourceConcern
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
if defined?(Spree::Security::CreditCards)
include Spree::Security::CreditCards
end
diff --git a/core/app/models/spree/customer_return.rb b/core/app/models/spree/customer_return.rb
index cdf45c844c..9b670c06d5 100644
--- a/core/app/models/spree/customer_return.rb
+++ b/core/app/models/spree/customer_return.rb
@@ -4,9 +4,6 @@ module Spree
include Spree::NumberIdentifier
include Spree::Metafields
include Spree::Metadata
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
belongs_to :stock_location
belongs_to :store, class_name: 'Spree::Store', inverse_of: :customer_returns
diff --git a/core/app/models/spree/digital.rb b/core/app/models/spree/digital.rb
index 1d143a4064..3abc99dcef 100644
--- a/core/app/models/spree/digital.rb
+++ b/core/app/models/spree/digital.rb
@@ -3,10 +3,6 @@ module Spree
belongs_to :variant
has_many :digital_links, dependent: :destroy
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
-
has_one_attached :attachment, service: Spree.private_storage_service_name
validates :attachment, attached: true
diff --git a/core/app/models/spree/digital_link.rb b/core/app/models/spree/digital_link.rb
index 120219e2b7..53cf35dae4 100644
--- a/core/app/models/spree/digital_link.rb
+++ b/core/app/models/spree/digital_link.rb
@@ -6,9 +6,6 @@ module Spree
has_secure_token
end
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
if defined?(Spree::Security::DigitalLinks)
include Spree::Security::DigitalLinks
end
diff --git a/core/app/models/spree/inventory_unit.rb b/core/app/models/spree/inventory_unit.rb
index 1c8811aa31..91fc9053cd 100644
--- a/core/app/models/spree/inventory_unit.rb
+++ b/core/app/models/spree/inventory_unit.rb
@@ -1,9 +1,6 @@
module Spree
class InventoryUnit < Spree.base_class
extend Spree::DisplayMoney
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
with_options inverse_of: :inventory_units do
belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant'
diff --git a/core/app/models/spree/line_item.rb b/core/app/models/spree/line_item.rb
index 50c7d8701a..29766c783f 100644
--- a/core/app/models/spree/line_item.rb
+++ b/core/app/models/spree/line_item.rb
@@ -2,9 +2,6 @@ module Spree
class LineItem < Spree.base_class
include Spree::Metafields
include Spree::Metadata
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
attribute :quantity, :integer, default: 1
diff --git a/core/app/models/spree/option_type.rb b/core/app/models/spree/option_type.rb
index ec28746be6..d827c84f01 100644
--- a/core/app/models/spree/option_type.rb
+++ b/core/app/models/spree/option_type.rb
@@ -7,9 +7,6 @@ module Spree
include Spree::Metafields
include Spree::Metadata
include Spree::TranslatableResource
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
TRANSLATABLE_FIELDS = %i[presentation].freeze
translates(*TRANSLATABLE_FIELDS, column_fallback: !Spree.always_use_translations?)
diff --git a/core/app/models/spree/option_value.rb b/core/app/models/spree/option_value.rb
index 3a2df5d6c7..4aca9a8563 100644
--- a/core/app/models/spree/option_value.rb
+++ b/core/app/models/spree/option_value.rb
@@ -4,9 +4,6 @@ module Spree
include Spree::Metafields
include Spree::Metadata
include Spree::TranslatableResource
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
TRANSLATABLE_FIELDS = %i[presentation].freeze
translates(*TRANSLATABLE_FIELDS, column_fallback: !Spree.always_use_translations?)
diff --git a/core/app/models/spree/payment_capture_event.rb b/core/app/models/spree/payment_capture_event.rb
index c32aadb9aa..b315c0e2f7 100644
--- a/core/app/models/spree/payment_capture_event.rb
+++ b/core/app/models/spree/payment_capture_event.rb
@@ -1,9 +1,5 @@
module Spree
class PaymentCaptureEvent < Spree.base_class
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
-
belongs_to :payment, class_name: 'Spree::Payment'
def display_amount
diff --git a/core/app/models/spree/price.rb b/core/app/models/spree/price.rb
index fae6f84e97..2f4ac41289 100644
--- a/core/app/models/spree/price.rb
+++ b/core/app/models/spree/price.rb
@@ -1,9 +1,6 @@
module Spree
class Price < Spree.base_class
include Spree::VatPriceCalculation
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
acts_as_paranoid
diff --git a/core/app/models/spree/promotion.rb b/core/app/models/spree/promotion.rb
index 5e197a4e12..5cd5848928 100644
--- a/core/app/models/spree/promotion.rb
+++ b/core/app/models/spree/promotion.rb
@@ -3,9 +3,6 @@ module Spree
include Spree::MultiStoreResource
include Spree::Metafields
include Spree::Metadata
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
if defined?(Spree::Security::Promotions)
include Spree::Security::Promotions
end
diff --git a/core/app/models/spree/property.rb b/core/app/models/spree/property.rb
index 84ab12571f..a7b5df7396 100644
--- a/core/app/models/spree/property.rb
+++ b/core/app/models/spree/property.rb
@@ -6,9 +6,6 @@ module Spree
include Spree::UniqueName
include Spree::DisplayOn
include Spree::TranslatableResource
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
TRANSLATABLE_FIELDS = %i[presentation].freeze
translates(*TRANSLATABLE_FIELDS, column_fallback: !Spree.always_use_translations?)
diff --git a/core/app/models/spree/prototype.rb b/core/app/models/spree/prototype.rb
index 39f45767ed..5b38f61305 100644
--- a/core/app/models/spree/prototype.rb
+++ b/core/app/models/spree/prototype.rb
@@ -1,9 +1,6 @@
module Spree
class Prototype < Spree.base_class
include Spree::Metadata
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
has_many :property_prototypes, class_name: 'Spree::PropertyPrototype'
has_many :properties, through: :property_prototypes, class_name: 'Spree::Property'
diff --git a/core/app/models/spree/refund.rb b/core/app/models/spree/refund.rb
index 8df09f6de4..18404fce7d 100644
--- a/core/app/models/spree/refund.rb
+++ b/core/app/models/spree/refund.rb
@@ -2,9 +2,6 @@ module Spree
class Refund < Spree.base_class
include Spree::Metafields
include Spree::Metadata
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
if defined?(Spree::Security::Refunds)
include Spree::Security::Refunds
end
diff --git a/core/app/models/spree/reimbursement.rb b/core/app/models/spree/reimbursement.rb
index 7a73b53f3b..2e5fb4db95 100644
--- a/core/app/models/spree/reimbursement.rb
+++ b/core/app/models/spree/reimbursement.rb
@@ -2,9 +2,6 @@ module Spree
class Reimbursement < Spree.base_class
include Spree::Core::NumberGenerator.new(prefix: 'RI', length: 9)
include Spree::NumberIdentifier
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
include Spree::Reimbursement::Emails
class IncompleteReimbursementError < StandardError; end
diff --git a/core/app/models/spree/return_authorization.rb b/core/app/models/spree/return_authorization.rb
index e596045eb6..a3e9dd1d46 100644
--- a/core/app/models/spree/return_authorization.rb
+++ b/core/app/models/spree/return_authorization.rb
@@ -2,9 +2,6 @@ module Spree
class ReturnAuthorization < Spree.base_class
include Spree::Core::NumberGenerator.new(prefix: 'RA', length: 9)
include Spree::NumberIdentifier
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
belongs_to :order, class_name: 'Spree::Order', inverse_of: :return_authorizations
diff --git a/core/app/models/spree/return_item.rb b/core/app/models/spree/return_item.rb
index 4f3cfb42cd..49f34d8710 100644
--- a/core/app/models/spree/return_item.rb
+++ b/core/app/models/spree/return_item.rb
@@ -2,10 +2,6 @@ module Spree
class ReturnItem < Spree.base_class
COMPLETED_RECEPTION_STATUSES = %w(received given_to_customer)
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
-
class_attribute :return_eligibility_validator
self.return_eligibility_validator = ReturnItem::EligibilityValidator::Default
diff --git a/core/app/models/spree/shipping_category.rb b/core/app/models/spree/shipping_category.rb
index 749a7c3a99..e2e314b6e7 100644
--- a/core/app/models/spree/shipping_category.rb
+++ b/core/app/models/spree/shipping_category.rb
@@ -3,9 +3,6 @@ module Spree
DIGITAL_NAME = 'Digital'
include Spree::UniqueName
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
with_options inverse_of: :shipping_category do
has_many :products
diff --git a/core/app/models/spree/shipping_method.rb b/core/app/models/spree/shipping_method.rb
index 06bf10d14e..317a04554e 100644
--- a/core/app/models/spree/shipping_method.rb
+++ b/core/app/models/spree/shipping_method.rb
@@ -5,9 +5,6 @@ module Spree
include Spree::Metafields
include Spree::Metadata
include Spree::DisplayOn
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
if defined?(Spree::VendorConcern)
include Spree::VendorConcern
end
diff --git a/core/app/models/spree/stock_location.rb b/core/app/models/spree/stock_location.rb
index 330f6a12f6..2af2c89623 100644
--- a/core/app/models/spree/stock_location.rb
+++ b/core/app/models/spree/stock_location.rb
@@ -1,9 +1,6 @@
module Spree
class StockLocation < Spree.base_class
include Spree::UniqueName
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
if defined?(Spree::Security::StockLocations)
include Spree::Security::StockLocations
end
diff --git a/core/app/models/spree/stock_transfer.rb b/core/app/models/spree/stock_transfer.rb
index bf83ffe5f8..78b7cf22b3 100644
--- a/core/app/models/spree/stock_transfer.rb
+++ b/core/app/models/spree/stock_transfer.rb
@@ -5,9 +5,6 @@ module Spree
include Spree::NumberAsParam
include Spree::Metafields
include Spree::Metadata
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
has_many :stock_movements, as: :originator
accepts_nested_attributes_for :stock_movements, reject_if: proc { |attributes|
diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rb
index 86fb8c1c6d..c9928b2085 100644
--- a/core/app/models/spree/store.rb
+++ b/core/app/models/spree/store.rb
@@ -12,7 +12,6 @@ module Spree
include Spree::Metadata
include Spree::Stores::Setup
include Spree::Stores::Socials
- include Spree::Webhooks::HasWebhooks if defined?(Spree::Webhooks::HasWebhooks)
include Spree::Security::Stores if defined?(Spree::Security::Stores)
include Spree::UserManagement
diff --git a/core/app/models/spree/store_credit.rb b/core/app/models/spree/store_credit.rb
index 4b81765af3..8a3fc43f42 100644
--- a/core/app/models/spree/store_credit.rb
+++ b/core/app/models/spree/store_credit.rb
@@ -3,9 +3,6 @@ module Spree
include Spree::SingleStoreResource
include Spree::Metafields
include Spree::Metadata
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
acts_as_paranoid
diff --git a/core/app/models/spree/tax_category.rb b/core/app/models/spree/tax_category.rb
index 2fac3c7817..5dbceb871e 100644
--- a/core/app/models/spree/tax_category.rb
+++ b/core/app/models/spree/tax_category.rb
@@ -1,9 +1,5 @@
module Spree
class TaxCategory < Spree.base_class
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
-
acts_as_paranoid
validates :name, presence: true, uniqueness: { case_sensitive: false, scope: spree_base_uniqueness_scope + [:deleted_at] }
diff --git a/core/app/models/spree/tax_rate.rb b/core/app/models/spree/tax_rate.rb
index 6074304ddd..3816190349 100644
--- a/core/app/models/spree/tax_rate.rb
+++ b/core/app/models/spree/tax_rate.rb
@@ -6,9 +6,6 @@ module Spree
include Spree::AdjustmentSource
include Spree::Metafields
include Spree::Metadata
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
with_options inverse_of: :tax_rates do
belongs_to :zone, class_name: 'Spree::Zone', optional: true
diff --git a/core/app/models/spree/taxon.rb b/core/app/models/spree/taxon.rb
index 35a6f0a31d..89b36da914 100644
--- a/core/app/models/spree/taxon.rb
+++ b/core/app/models/spree/taxon.rb
@@ -19,9 +19,6 @@ module Spree
include Spree::Metafields
include Spree::Metadata
include Spree::MemoizedData
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
MEMOIZED_METHODS = %w[cached_self_and_descendants_ids].freeze
diff --git a/core/app/models/spree/taxonomy.rb b/core/app/models/spree/taxonomy.rb
index fd8b31f8ed..8746d08f8a 100644
--- a/core/app/models/spree/taxonomy.rb
+++ b/core/app/models/spree/taxonomy.rb
@@ -4,9 +4,6 @@ module Spree
include Spree::Metafields
include Spree::Metadata
include Spree::SingleStoreResource
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
TRANSLATABLE_FIELDS = %i[name].freeze
translates(*TRANSLATABLE_FIELDS, column_fallback: !Spree.always_use_translations?)
diff --git a/core/app/models/spree/wished_item.rb b/core/app/models/spree/wished_item.rb
index 77f24155c7..24165c012b 100644
--- a/core/app/models/spree/wished_item.rb
+++ b/core/app/models/spree/wished_item.rb
@@ -1,9 +1,5 @@
module Spree
class WishedItem < Spree.base_class
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
-
extend DisplayMoney
money_methods :total, :price
diff --git a/core/app/models/spree/wishlist.rb b/core/app/models/spree/wishlist.rb
index 37e244be0f..3f021012a6 100644
--- a/core/app/models/spree/wishlist.rb
+++ b/core/app/models/spree/wishlist.rb
@@ -1,9 +1,6 @@
module Spree
class Wishlist < Spree.base_class
include Spree::SingleStoreResource
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
if Rails::VERSION::STRING >= '7.1.0'
has_secure_token on: :save
diff --git a/core/app/models/spree/zone.rb b/core/app/models/spree/zone.rb
index 2ce9d7e511..b55f7c93c7 100644
--- a/core/app/models/spree/zone.rb
+++ b/core/app/models/spree/zone.rb
@@ -1,9 +1,6 @@
module Spree
class Zone < Spree.base_class
include Spree::UniqueName
- if defined?(Spree::Webhooks::HasWebhooks)
- include Spree::Webhooks::HasWebhooks
- end
with_options dependent: :destroy, inverse_of: :zone do
has_many :zone_members, class_name: 'Spree::ZoneMember'