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.

Move auto-loading of Webhooks module to models itself (#11558)

Damian Legawiecde431ed6d4e4
diff --git a/api/lib/spree/api/engine.rb b/api/lib/spree/api/engine.rb
index c188b19c18..2b36d4b7f3 100644
--- a/api/lib/spree/api/engine.rb
+++ b/api/lib/spree/api/engine.rb
@@ -26,20 +26,6 @@ module Spree
end
def self.activate
- [
- Spree::Address, Spree::Asset, Spree::CmsPage, Spree::CreditCard, Spree::CustomerReturn,
- Spree::DigitalLink, Spree::Digital, Spree::InventoryUnit, Spree::LineItem, Spree::MenuItem,
- Spree::Menu, Spree::OptionType, Spree::OptionValue, Spree::Order, Spree::PaymentCaptureEvent,
- Spree::Payment, Spree::Price, Spree::Product, Spree::Promotion, Spree::Property, Spree::Prototype,
- Spree::Refund, Spree::Reimbursement, Spree::ReturnAuthorization, Spree::ReturnItem, Spree::Role,
- Spree::Shipment, Spree::ShippingCategory, Spree::ShippingMethod, Spree::ShippingRate,
- Spree::StockItem, Spree::StockLocation, Spree::StockMovement, Spree::StockTransfer,
- Spree::StoreCredit, Spree::Store, Spree::TaxCategory, Spree::TaxRate, Spree::Taxonomy,
- Spree::Taxon, Spree::Variant, Spree::WishedItem, Spree::Wishlist, Spree::Zone
- ].each do |webhookable_class|
- webhookable_class.include(Spree::Webhooks::HasWebhooks)
- end
-
Dir.glob(File.join(File.dirname(__FILE__), '../../../app/models/spree/api/webhooks/*_decorator*.rb')) do |c|
Rails.application.config.cache_classes ? require(c) : load(c)
end
diff --git a/core/app/models/spree/address.rb b/core/app/models/spree/address.rb
index 2d07bf6ce9..3f890eb0f8 100644
--- a/core/app/models/spree/address.rb
+++ b/core/app/models/spree/address.rb
@@ -4,6 +4,10 @@ module Spree
include Metadata
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
+
if Rails::VERSION::STRING >= '6.1'
serialize :preferences, Hash, default: {}
end
diff --git a/core/app/models/spree/asset.rb b/core/app/models/spree/asset.rb
index 10a14b818d..2114794c1c 100644
--- a/core/app/models/spree/asset.rb
+++ b/core/app/models/spree/asset.rb
@@ -2,6 +2,9 @@ module Spree
class Asset < Spree::Base
include Support::ActiveStorage
include Metadata
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
belongs_to :viewable, polymorphic: true, touch: true
acts_as_list scope: [:viewable_id, :viewable_type]
diff --git a/core/app/models/spree/cms_page.rb b/core/app/models/spree/cms_page.rb
index ea9ad37310..fd29ca715c 100644
--- a/core/app/models/spree/cms_page.rb
+++ b/core/app/models/spree/cms_page.rb
@@ -3,6 +3,10 @@ module Spree
include SingleStoreResource
include DisplayLink
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
+
acts_as_paranoid
TYPES = ['Spree::Cms::Pages::StandardPage',
diff --git a/core/app/models/spree/credit_card.rb b/core/app/models/spree/credit_card.rb
index b54de50da2..938772c33d 100644
--- a/core/app/models/spree/credit_card.rb
+++ b/core/app/models/spree/credit_card.rb
@@ -2,6 +2,9 @@ module Spree
class CreditCard < Spree::Base
include ActiveMerchant::Billing::CreditCardMethods
include Metadata
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
acts_as_paranoid
@@ -174,9 +177,9 @@ module Spree
def self.json_api_permitted_attributes
[
- 'number', 'month', 'year', 'expiry', 'verification_value', 'first_name', 'last_name',
- 'cc_type', 'gateway_customer_profile_id', 'gateway_payment_profile_id', 'last_digits',
- 'name', 'encrypted_data', 'address_id', 'created_at', 'updated_at', 'user_id',
+ 'number', 'month', 'year', 'expiry', 'verification_value', 'first_name', 'last_name',
+ 'cc_type', 'gateway_customer_profile_id', 'gateway_payment_profile_id', 'last_digits',
+ 'name', 'encrypted_data', 'address_id', 'created_at', 'updated_at', 'user_id',
'payment_method_id', 'default', 'deleted_at'
]
end
diff --git a/core/app/models/spree/customer_return.rb b/core/app/models/spree/customer_return.rb
index 6e52ab8c27..e853891801 100644
--- a/core/app/models/spree/customer_return.rb
+++ b/core/app/models/spree/customer_return.rb
@@ -3,6 +3,9 @@ module Spree
include Spree::Core::NumberGenerator.new(prefix: 'CR', length: 9)
include NumberIdentifier
include Metadata
+ if defined?(Spree::Webhooks)
+ 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 3ad0f344c3..2aba51d186 100644
--- a/core/app/models/spree/digital.rb
+++ b/core/app/models/spree/digital.rb
@@ -3,6 +3,10 @@ module Spree
belongs_to :variant
has_many :digital_links, dependent: :destroy
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
+
if Spree.private_storage_service_name
has_one_attached :attachment, service: Spree.private_storage_service_name
else
diff --git a/core/app/models/spree/digital_link.rb b/core/app/models/spree/digital_link.rb
index d08ef9b37c..b3d0b0e7b2 100644
--- a/core/app/models/spree/digital_link.rb
+++ b/core/app/models/spree/digital_link.rb
@@ -2,6 +2,10 @@ module Spree
class DigitalLink < Spree::Base
has_secure_token
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
+
belongs_to :digital
belongs_to :line_item
diff --git a/core/app/models/spree/inventory_unit.rb b/core/app/models/spree/inventory_unit.rb
index 1b16f2f160..689b4fb3f5 100644
--- a/core/app/models/spree/inventory_unit.rb
+++ b/core/app/models/spree/inventory_unit.rb
@@ -1,5 +1,9 @@
module Spree
class InventoryUnit < Spree::Base
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
+
with_options inverse_of: :inventory_units do
belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant'
belongs_to :order, class_name: 'Spree::Order'
diff --git a/core/app/models/spree/line_item.rb b/core/app/models/spree/line_item.rb
index 49af7ccb01..811a9ba26b 100644
--- a/core/app/models/spree/line_item.rb
+++ b/core/app/models/spree/line_item.rb
@@ -1,6 +1,9 @@
module Spree
class LineItem < Spree::Base
include Metadata
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
before_validation :ensure_valid_quantity
diff --git a/core/app/models/spree/menu.rb b/core/app/models/spree/menu.rb
index 25d82984f0..7705f442dd 100644
--- a/core/app/models/spree/menu.rb
+++ b/core/app/models/spree/menu.rb
@@ -1,6 +1,9 @@
module Spree
class Menu < Spree::Base
include SingleStoreResource
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
MENU_LOCATIONS = ['Header', 'Footer']
MENU_LOCATIONS_PARAMETERIZED = []
diff --git a/core/app/models/spree/menu_item.rb b/core/app/models/spree/menu_item.rb
index 3bb2d79d9a..0d3503a46b 100644
--- a/core/app/models/spree/menu_item.rb
+++ b/core/app/models/spree/menu_item.rb
@@ -1,6 +1,9 @@
module Spree
class MenuItem < Spree::Base
include Spree::DisplayLink
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
acts_as_nested_set dependent: :destroy
diff --git a/core/app/models/spree/option_type.rb b/core/app/models/spree/option_type.rb
index 0c7296581b..3edff3959b 100644
--- a/core/app/models/spree/option_type.rb
+++ b/core/app/models/spree/option_type.rb
@@ -2,6 +2,9 @@ module Spree
class OptionType < Spree::Base
include UniqueName
include Metadata
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
acts_as_list
diff --git a/core/app/models/spree/option_value.rb b/core/app/models/spree/option_value.rb
index 520eb3b512..f39a84504c 100644
--- a/core/app/models/spree/option_value.rb
+++ b/core/app/models/spree/option_value.rb
@@ -1,6 +1,9 @@
module Spree
class OptionValue < Spree::Base
include Metadata
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
belongs_to :option_type, class_name: 'Spree::OptionType', touch: true, inverse_of: :option_values
acts_as_list scope: :option_type
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rb
index d074a90921..3bbef78d1b 100644
--- a/core/app/models/spree/order.rb
+++ b/core/app/models/spree/order.rb
@@ -25,6 +25,9 @@ module Spree
include SingleStoreResource
include MemoizedData
include Metadata
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
MEMOIZED_METHODS = %w(tax_zone)
diff --git a/core/app/models/spree/payment.rb b/core/app/models/spree/payment.rb
index f3d6a81190..bf607053b0 100644
--- a/core/app/models/spree/payment.rb
+++ b/core/app/models/spree/payment.rb
@@ -6,6 +6,9 @@ module Spree
include NumberIdentifier
include NumberAsParam
include Metadata
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
include Spree::Payment::Processing
diff --git a/core/app/models/spree/payment_capture_event.rb b/core/app/models/spree/payment_capture_event.rb
index 65fbfb707d..5a165a38b5 100644
--- a/core/app/models/spree/payment_capture_event.rb
+++ b/core/app/models/spree/payment_capture_event.rb
@@ -1,5 +1,9 @@
module Spree
class PaymentCaptureEvent < Spree::Base
+ if defined?(Spree::Webhooks)
+ 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 1f012410e0..3434726455 100644
--- a/core/app/models/spree/price.rb
+++ b/core/app/models/spree/price.rb
@@ -1,6 +1,9 @@
module Spree
class Price < Spree::Base
include VatPriceCalculation
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
acts_as_paranoid
diff --git a/core/app/models/spree/product.rb b/core/app/models/spree/product.rb
index 35f8a6ce90..24ab187476 100644
--- a/core/app/models/spree/product.rb
+++ b/core/app/models/spree/product.rb
@@ -25,6 +25,9 @@ module Spree
include MultiStoreResource
include MemoizedData
include Metadata
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
MEMOIZED_METHODS = %w(total_on_hand taxonomy_ids taxon_and_ancestors category
default_variant_id tax_category default_variant
@@ -327,7 +330,7 @@ module Spree
def any_variant_in_stock_or_backorderable?
if variants.any?
variants_including_master.in_stock_or_backorderable.exists?
- else
+ else
master.in_stock_or_backorderable?
end
end
diff --git a/core/app/models/spree/promotion.rb b/core/app/models/spree/promotion.rb
index d9dd4488d7..43be4631df 100644
--- a/core/app/models/spree/promotion.rb
+++ b/core/app/models/spree/promotion.rb
@@ -2,6 +2,9 @@ module Spree
class Promotion < Spree::Base
include MultiStoreResource
include Metadata
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
MATCH_POLICIES = %w(all any)
UNACTIVATABLE_ORDER_STATES = ['complete', 'awaiting_return', 'returned']
diff --git a/core/app/models/spree/property.rb b/core/app/models/spree/property.rb
index 8c2fd56dee..026522ea90 100644
--- a/core/app/models/spree/property.rb
+++ b/core/app/models/spree/property.rb
@@ -2,6 +2,9 @@ module Spree
class Property < Spree::Base
include Spree::FilterParam
include Metadata
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
auto_strip_attributes :name, :presentation
diff --git a/core/app/models/spree/prototype.rb b/core/app/models/spree/prototype.rb
index b6a5f4fecd..e39189a7a0 100644
--- a/core/app/models/spree/prototype.rb
+++ b/core/app/models/spree/prototype.rb
@@ -1,6 +1,9 @@
module Spree
class Prototype < Spree::Base
include Metadata
+ if defined?(Spree::Webhooks)
+ 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 b8f73f9344..adf40a1d56 100644
--- a/core/app/models/spree/refund.rb
+++ b/core/app/models/spree/refund.rb
@@ -1,6 +1,9 @@
module Spree
class Refund < Spree::Base
include Metadata
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
with_options inverse_of: :refunds do
belongs_to :payment
diff --git a/core/app/models/spree/reimbursement.rb b/core/app/models/spree/reimbursement.rb
index 9318e1f638..49e78242b0 100644
--- a/core/app/models/spree/reimbursement.rb
+++ b/core/app/models/spree/reimbursement.rb
@@ -2,6 +2,9 @@ module Spree
class Reimbursement < Spree::Base
include Spree::Core::NumberGenerator.new(prefix: 'RI', length: 9)
include NumberIdentifier
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
class IncompleteReimbursementError < StandardError; end
diff --git a/core/app/models/spree/return_authorization.rb b/core/app/models/spree/return_authorization.rb
index 43c11796fc..1d42a9283a 100644
--- a/core/app/models/spree/return_authorization.rb
+++ b/core/app/models/spree/return_authorization.rb
@@ -2,6 +2,9 @@ module Spree
class ReturnAuthorization < Spree::Base
include Spree::Core::NumberGenerator.new(prefix: 'RA', length: 9)
include NumberIdentifier
+ if defined?(Spree::Webhooks)
+ 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 cd9522acd7..ae15a2ad37 100644
--- a/core/app/models/spree/return_item.rb
+++ b/core/app/models/spree/return_item.rb
@@ -2,6 +2,10 @@ module Spree
class ReturnItem < Spree::Base
COMPLETED_RECEPTION_STATUSES = %w(received given_to_customer)
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
+
class_attribute :return_eligibility_validator
self.return_eligibility_validator = ReturnItem::EligibilityValidator::Default
diff --git a/core/app/models/spree/role.rb b/core/app/models/spree/role.rb
index 02611c4c53..362bb22112 100644
--- a/core/app/models/spree/role.rb
+++ b/core/app/models/spree/role.rb
@@ -1,6 +1,9 @@
module Spree
class Role < Spree::Base
include UniqueName
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
has_many :role_users, class_name: 'Spree::RoleUser', dependent: :destroy
has_many :users, through: :role_users, class_name: Spree.user_class.to_s
diff --git a/core/app/models/spree/shipment.rb b/core/app/models/spree/shipment.rb
index 10aa814f64..4a68289865 100644
--- a/core/app/models/spree/shipment.rb
+++ b/core/app/models/spree/shipment.rb
@@ -6,6 +6,9 @@ module Spree
include NumberIdentifier
include NumberAsParam
include Metadata
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
with_options inverse_of: :shipments do
belongs_to :address, class_name: 'Spree::Address'
diff --git a/core/app/models/spree/shipping_category.rb b/core/app/models/spree/shipping_category.rb
index 17b90124e5..4e92657e9b 100644
--- a/core/app/models/spree/shipping_category.rb
+++ b/core/app/models/spree/shipping_category.rb
@@ -1,6 +1,9 @@
module Spree
class ShippingCategory < Spree::Base
include UniqueName
+ if defined?(Spree::Webhooks)
+ 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 2c8b697931..51a79ddca9 100644
--- a/core/app/models/spree/shipping_method.rb
+++ b/core/app/models/spree/shipping_method.rb
@@ -3,6 +3,9 @@ module Spree
acts_as_paranoid
include Spree::CalculatedAdjustments
include Metadata
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
DISPLAY = [:both, :front_end, :back_end]
diff --git a/core/app/models/spree/stock_item.rb b/core/app/models/spree/stock_item.rb
index 45773d8e65..9543d44bab 100644
--- a/core/app/models/spree/stock_item.rb
+++ b/core/app/models/spree/stock_item.rb
@@ -2,6 +2,10 @@ module Spree
class StockItem < Spree::Base
acts_as_paranoid
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
+
with_options inverse_of: :stock_items do
belongs_to :stock_location, class_name: 'Spree::StockLocation'
belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant'
diff --git a/core/app/models/spree/stock_location.rb b/core/app/models/spree/stock_location.rb
index 38d62c9350..2ed2ef5d19 100644
--- a/core/app/models/spree/stock_location.rb
+++ b/core/app/models/spree/stock_location.rb
@@ -1,6 +1,9 @@
module Spree
class StockLocation < Spree::Base
include UniqueName
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
has_many :shipments
has_many :stock_items, dependent: :delete_all, inverse_of: :stock_location
diff --git a/core/app/models/spree/stock_movement.rb b/core/app/models/spree/stock_movement.rb
index b0c475e204..194b999871 100644
--- a/core/app/models/spree/stock_movement.rb
+++ b/core/app/models/spree/stock_movement.rb
@@ -5,6 +5,10 @@ module Spree
min: -2**31
}.freeze
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
+
belongs_to :stock_item, class_name: 'Spree::StockItem', inverse_of: :stock_movements
belongs_to :originator, polymorphic: true
diff --git a/core/app/models/spree/stock_transfer.rb b/core/app/models/spree/stock_transfer.rb
index deb45b7d5c..05a78396a0 100644
--- a/core/app/models/spree/stock_transfer.rb
+++ b/core/app/models/spree/stock_transfer.rb
@@ -4,6 +4,9 @@ module Spree
include NumberIdentifier
include NumberAsParam
include Metadata
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
has_many :stock_movements, as: :originator
diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rb
index 078f1287f7..479a74fc23 100644
--- a/core/app/models/spree/store.rb
+++ b/core/app/models/spree/store.rb
@@ -1,5 +1,9 @@
module Spree
class Store < Spree::Base
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
+
typed_store :settings, coder: ActiveRecord::TypedStore::IdentityCoder do |s|
# Spree Digital Asset Configurations
s.boolean :limit_digital_download_count, default: true, null: false
diff --git a/core/app/models/spree/store_credit.rb b/core/app/models/spree/store_credit.rb
index 167480cbda..24cc2e2b17 100644
--- a/core/app/models/spree/store_credit.rb
+++ b/core/app/models/spree/store_credit.rb
@@ -2,6 +2,9 @@ module Spree
class StoreCredit < Spree::Base
include SingleStoreResource
include Metadata
+ if defined?(Spree::Webhooks)
+ 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 bdf219a0e9..2d444a19d3 100644
--- a/core/app/models/spree/tax_category.rb
+++ b/core/app/models/spree/tax_category.rb
@@ -1,5 +1,9 @@
module Spree
class TaxCategory < Spree::Base
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
+
acts_as_paranoid
validates :name, presence: true, uniqueness: { case_sensitive: false, scope: spree_base_uniqueness_scope.push(:deleted_at) }
diff --git a/core/app/models/spree/tax_rate.rb b/core/app/models/spree/tax_rate.rb
index 3b11a728f0..fc88dd9319 100644
--- a/core/app/models/spree/tax_rate.rb
+++ b/core/app/models/spree/tax_rate.rb
@@ -4,6 +4,9 @@ module Spree
include Spree::CalculatedAdjustments
include Spree::AdjustmentSource
+ if defined?(Spree::Webhooks)
+ 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 0a8c4e61fa..677657d584 100644
--- a/core/app/models/spree/taxon.rb
+++ b/core/app/models/spree/taxon.rb
@@ -4,6 +4,9 @@ require 'stringex'
module Spree
class Taxon < Spree::Base
include Metadata
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
extend FriendlyId
friendly_id :permalink, slug_column: :permalink, use: :history
diff --git a/core/app/models/spree/taxonomy.rb b/core/app/models/spree/taxonomy.rb
index fc4fb2c726..f889164260 100644
--- a/core/app/models/spree/taxonomy.rb
+++ b/core/app/models/spree/taxonomy.rb
@@ -1,6 +1,9 @@
module Spree
class Taxonomy < Spree::Base
include Metadata
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
acts_as_list
diff --git a/core/app/models/spree/variant.rb b/core/app/models/spree/variant.rb
index 0db58f84c4..5ea20f98f7 100644
--- a/core/app/models/spree/variant.rb
+++ b/core/app/models/spree/variant.rb
@@ -5,6 +5,9 @@ module Spree
include MemoizedData
include Metadata
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
MEMOIZED_METHODS = %w(purchasable in_stock backorderable tax_category options_text compare_at_price)
diff --git a/core/app/models/spree/wished_item.rb b/core/app/models/spree/wished_item.rb
index 7bc7cf578a..fcc27e2bc6 100644
--- a/core/app/models/spree/wished_item.rb
+++ b/core/app/models/spree/wished_item.rb
@@ -1,5 +1,9 @@
module Spree
class WishedItem < Spree::Base
+ if defined?(Spree::Webhooks)
+ 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 ed7b410348..bea3b1ef67 100644
--- a/core/app/models/spree/wishlist.rb
+++ b/core/app/models/spree/wishlist.rb
@@ -1,6 +1,9 @@
module Spree
class Wishlist < Spree::Base
include SingleStoreResource
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
has_secure_token
diff --git a/core/app/models/spree/zone.rb b/core/app/models/spree/zone.rb
index 52a43f5931..2c240c6ec1 100644
--- a/core/app/models/spree/zone.rb
+++ b/core/app/models/spree/zone.rb
@@ -1,6 +1,9 @@
module Spree
class Zone < Spree::Base
include UniqueName
+ if defined?(Spree::Webhooks)
+ include Spree::Webhooks::HasWebhooks
+ end
with_options dependent: :destroy, inverse_of: :zone do
has_many :zone_members, class_name: 'Spree::ZoneMember'