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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
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.rbindex 7b9c9080c1..f735d57d2e 100644--- a/core/app/models/spree/address.rb+++ b/core/app/models/spree/address.rb@@ -4,9 +4,6 @@ module Spreeinclude Spree::Metafieldsinclude Spree::Metadata- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- endserialize :preferences, type: Hash, coder: YAML, default: {}diff --git a/core/app/models/spree/asset.rb b/core/app/models/spree/asset.rbindex 5bb987ad37..7c8b97e77b 100644--- a/core/app/models/spree/asset.rb+++ b/core/app/models/spree/asset.rb@@ -3,9 +3,6 @@ module Spreeinclude Support::ActiveStorageinclude Spree::Metafieldsinclude Spree::Metadata- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- endEXTERNAL_URL_METAFIELD_KEY = 'external.url'diff --git a/core/app/models/spree/credit_card.rb b/core/app/models/spree/credit_card.rbindex efd04ee8c7..b881ccd3ab 100644--- a/core/app/models/spree/credit_card.rb+++ b/core/app/models/spree/credit_card.rb@@ -5,9 +5,6 @@ module Spreeinclude Spree::Metadatainclude Spree::PaymentSourceConcern- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- endif defined?(Spree::Security::CreditCards)include Spree::Security::CreditCardsenddiff --git a/core/app/models/spree/customer_return.rb b/core/app/models/spree/customer_return.rbindex cdf45c844c..9b670c06d5 100644--- a/core/app/models/spree/customer_return.rb+++ b/core/app/models/spree/customer_return.rb@@ -4,9 +4,6 @@ module Spreeinclude Spree::NumberIdentifierinclude Spree::Metafieldsinclude Spree::Metadata- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- endbelongs_to :stock_locationbelongs_to :store, class_name: 'Spree::Store', inverse_of: :customer_returnsdiff --git a/core/app/models/spree/digital.rb b/core/app/models/spree/digital.rbindex 1d143a4064..3abc99dcef 100644--- a/core/app/models/spree/digital.rb+++ b/core/app/models/spree/digital.rb@@ -3,10 +3,6 @@ module Spreebelongs_to :varianthas_many :digital_links, dependent: :destroy- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- end-has_one_attached :attachment, service: Spree.private_storage_service_namevalidates :attachment, attached: truediff --git a/core/app/models/spree/digital_link.rb b/core/app/models/spree/digital_link.rbindex 120219e2b7..53cf35dae4 100644--- a/core/app/models/spree/digital_link.rb+++ b/core/app/models/spree/digital_link.rb@@ -6,9 +6,6 @@ module Spreehas_secure_tokenend- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- endif defined?(Spree::Security::DigitalLinks)include Spree::Security::DigitalLinksenddiff --git a/core/app/models/spree/inventory_unit.rb b/core/app/models/spree/inventory_unit.rbindex 1c8811aa31..91fc9053cd 100644--- a/core/app/models/spree/inventory_unit.rb+++ b/core/app/models/spree/inventory_unit.rb@@ -1,9 +1,6 @@module Spreeclass InventoryUnit < Spree.base_classextend Spree::DisplayMoney- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- endwith_options inverse_of: :inventory_units dobelongs_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.rbindex 50c7d8701a..29766c783f 100644--- a/core/app/models/spree/line_item.rb+++ b/core/app/models/spree/line_item.rb@@ -2,9 +2,6 @@ module Spreeclass LineItem < Spree.base_classinclude Spree::Metafieldsinclude Spree::Metadata- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- endattribute :quantity, :integer, default: 1diff --git a/core/app/models/spree/option_type.rb b/core/app/models/spree/option_type.rbindex ec28746be6..d827c84f01 100644--- a/core/app/models/spree/option_type.rb+++ b/core/app/models/spree/option_type.rb@@ -7,9 +7,6 @@ module Spreeinclude Spree::Metafieldsinclude Spree::Metadatainclude Spree::TranslatableResource- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- endTRANSLATABLE_FIELDS = %i[presentation].freezetranslates(*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.rbindex 3a2df5d6c7..4aca9a8563 100644--- a/core/app/models/spree/option_value.rb+++ b/core/app/models/spree/option_value.rb@@ -4,9 +4,6 @@ module Spreeinclude Spree::Metafieldsinclude Spree::Metadatainclude Spree::TranslatableResource- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- endTRANSLATABLE_FIELDS = %i[presentation].freezetranslates(*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.rbindex 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 Spreeclass PaymentCaptureEvent < Spree.base_class- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- end-belongs_to :payment, class_name: 'Spree::Payment'def display_amountdiff --git a/core/app/models/spree/price.rb b/core/app/models/spree/price.rbindex fae6f84e97..2f4ac41289 100644--- a/core/app/models/spree/price.rb+++ b/core/app/models/spree/price.rb@@ -1,9 +1,6 @@module Spreeclass Price < Spree.base_classinclude Spree::VatPriceCalculation- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- endacts_as_paranoiddiff --git a/core/app/models/spree/promotion.rb b/core/app/models/spree/promotion.rbindex 5e197a4e12..5cd5848928 100644--- a/core/app/models/spree/promotion.rb+++ b/core/app/models/spree/promotion.rb@@ -3,9 +3,6 @@ module Spreeinclude Spree::MultiStoreResourceinclude Spree::Metafieldsinclude Spree::Metadata- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- endif defined?(Spree::Security::Promotions)include Spree::Security::Promotionsenddiff --git a/core/app/models/spree/property.rb b/core/app/models/spree/property.rbindex 84ab12571f..a7b5df7396 100644--- a/core/app/models/spree/property.rb+++ b/core/app/models/spree/property.rb@@ -6,9 +6,6 @@ module Spreeinclude Spree::UniqueNameinclude Spree::DisplayOninclude Spree::TranslatableResource- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- endTRANSLATABLE_FIELDS = %i[presentation].freezetranslates(*TRANSLATABLE_FIELDS, column_fallback: !Spree.always_use_translations?)diff --git a/core/app/models/spree/prototype.rb b/core/app/models/spree/prototype.rbindex 39f45767ed..5b38f61305 100644--- a/core/app/models/spree/prototype.rb+++ b/core/app/models/spree/prototype.rb@@ -1,9 +1,6 @@module Spreeclass Prototype < Spree.base_classinclude Spree::Metadata- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- endhas_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.rbindex 8df09f6de4..18404fce7d 100644--- a/core/app/models/spree/refund.rb+++ b/core/app/models/spree/refund.rb@@ -2,9 +2,6 @@ module Spreeclass Refund < Spree.base_classinclude Spree::Metafieldsinclude Spree::Metadata- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- endif defined?(Spree::Security::Refunds)include Spree::Security::Refundsenddiff --git a/core/app/models/spree/reimbursement.rb b/core/app/models/spree/reimbursement.rbindex 7a73b53f3b..2e5fb4db95 100644--- a/core/app/models/spree/reimbursement.rb+++ b/core/app/models/spree/reimbursement.rb@@ -2,9 +2,6 @@ module Spreeclass Reimbursement < Spree.base_classinclude Spree::Core::NumberGenerator.new(prefix: 'RI', length: 9)include Spree::NumberIdentifier- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- endinclude Spree::Reimbursement::Emailsclass IncompleteReimbursementError < StandardError; enddiff --git a/core/app/models/spree/return_authorization.rb b/core/app/models/spree/return_authorization.rbindex e596045eb6..a3e9dd1d46 100644--- a/core/app/models/spree/return_authorization.rb+++ b/core/app/models/spree/return_authorization.rb@@ -2,9 +2,6 @@ module Spreeclass ReturnAuthorization < Spree.base_classinclude Spree::Core::NumberGenerator.new(prefix: 'RA', length: 9)include Spree::NumberIdentifier- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- endbelongs_to :order, class_name: 'Spree::Order', inverse_of: :return_authorizationsdiff --git a/core/app/models/spree/return_item.rb b/core/app/models/spree/return_item.rbindex 4f3cfb42cd..49f34d8710 100644--- a/core/app/models/spree/return_item.rb+++ b/core/app/models/spree/return_item.rb@@ -2,10 +2,6 @@ module Spreeclass ReturnItem < Spree.base_classCOMPLETED_RECEPTION_STATUSES = %w(received given_to_customer)- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- end-class_attribute :return_eligibility_validatorself.return_eligibility_validator = ReturnItem::EligibilityValidator::Defaultdiff --git a/core/app/models/spree/shipping_category.rb b/core/app/models/spree/shipping_category.rbindex 749a7c3a99..e2e314b6e7 100644--- a/core/app/models/spree/shipping_category.rb+++ b/core/app/models/spree/shipping_category.rb@@ -3,9 +3,6 @@ module SpreeDIGITAL_NAME = 'Digital'include Spree::UniqueName- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- endwith_options inverse_of: :shipping_category dohas_many :productsdiff --git a/core/app/models/spree/shipping_method.rb b/core/app/models/spree/shipping_method.rbindex 06bf10d14e..317a04554e 100644--- a/core/app/models/spree/shipping_method.rb+++ b/core/app/models/spree/shipping_method.rb@@ -5,9 +5,6 @@ module Spreeinclude Spree::Metafieldsinclude Spree::Metadatainclude Spree::DisplayOn- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- endif defined?(Spree::VendorConcern)include Spree::VendorConcernenddiff --git a/core/app/models/spree/stock_location.rb b/core/app/models/spree/stock_location.rbindex 330f6a12f6..2af2c89623 100644--- a/core/app/models/spree/stock_location.rb+++ b/core/app/models/spree/stock_location.rb@@ -1,9 +1,6 @@module Spreeclass StockLocation < Spree.base_classinclude Spree::UniqueName- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- endif defined?(Spree::Security::StockLocations)include Spree::Security::StockLocationsenddiff --git a/core/app/models/spree/stock_transfer.rb b/core/app/models/spree/stock_transfer.rbindex bf83ffe5f8..78b7cf22b3 100644--- a/core/app/models/spree/stock_transfer.rb+++ b/core/app/models/spree/stock_transfer.rb@@ -5,9 +5,6 @@ module Spreeinclude Spree::NumberAsParaminclude Spree::Metafieldsinclude Spree::Metadata- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- endhas_many :stock_movements, as: :originatoraccepts_nested_attributes_for :stock_movements, reject_if: proc { |attributes|diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rbindex 86fb8c1c6d..c9928b2085 100644--- a/core/app/models/spree/store.rb+++ b/core/app/models/spree/store.rb@@ -12,7 +12,6 @@ module Spreeinclude Spree::Metadatainclude Spree::Stores::Setupinclude Spree::Stores::Socials- include Spree::Webhooks::HasWebhooks if defined?(Spree::Webhooks::HasWebhooks)include Spree::Security::Stores if defined?(Spree::Security::Stores)include Spree::UserManagementdiff --git a/core/app/models/spree/store_credit.rb b/core/app/models/spree/store_credit.rbindex 4b81765af3..8a3fc43f42 100644--- a/core/app/models/spree/store_credit.rb+++ b/core/app/models/spree/store_credit.rb@@ -3,9 +3,6 @@ module Spreeinclude Spree::SingleStoreResourceinclude Spree::Metafieldsinclude Spree::Metadata- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- endacts_as_paranoiddiff --git a/core/app/models/spree/tax_category.rb b/core/app/models/spree/tax_category.rbindex 2fac3c7817..5dbceb871e 100644--- a/core/app/models/spree/tax_category.rb+++ b/core/app/models/spree/tax_category.rb@@ -1,9 +1,5 @@module Spreeclass TaxCategory < Spree.base_class- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- end-acts_as_paranoidvalidates :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.rbindex 6074304ddd..3816190349 100644--- a/core/app/models/spree/tax_rate.rb+++ b/core/app/models/spree/tax_rate.rb@@ -6,9 +6,6 @@ module Spreeinclude Spree::AdjustmentSourceinclude Spree::Metafieldsinclude Spree::Metadata- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- endwith_options inverse_of: :tax_rates dobelongs_to :zone, class_name: 'Spree::Zone', optional: truediff --git a/core/app/models/spree/taxon.rb b/core/app/models/spree/taxon.rbindex 35a6f0a31d..89b36da914 100644--- a/core/app/models/spree/taxon.rb+++ b/core/app/models/spree/taxon.rb@@ -19,9 +19,6 @@ module Spreeinclude Spree::Metafieldsinclude Spree::Metadatainclude Spree::MemoizedData- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- endMEMOIZED_METHODS = %w[cached_self_and_descendants_ids].freezediff --git a/core/app/models/spree/taxonomy.rb b/core/app/models/spree/taxonomy.rbindex fd8b31f8ed..8746d08f8a 100644--- a/core/app/models/spree/taxonomy.rb+++ b/core/app/models/spree/taxonomy.rb@@ -4,9 +4,6 @@ module Spreeinclude Spree::Metafieldsinclude Spree::Metadatainclude Spree::SingleStoreResource- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- endTRANSLATABLE_FIELDS = %i[name].freezetranslates(*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.rbindex 77f24155c7..24165c012b 100644--- a/core/app/models/spree/wished_item.rb+++ b/core/app/models/spree/wished_item.rb@@ -1,9 +1,5 @@module Spreeclass WishedItem < Spree.base_class- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- end-extend DisplayMoneymoney_methods :total, :pricediff --git a/core/app/models/spree/wishlist.rb b/core/app/models/spree/wishlist.rbindex 37e244be0f..3f021012a6 100644--- a/core/app/models/spree/wishlist.rb+++ b/core/app/models/spree/wishlist.rb@@ -1,9 +1,6 @@module Spreeclass Wishlist < Spree.base_classinclude Spree::SingleStoreResource- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- endif Rails::VERSION::STRING >= '7.1.0'has_secure_token on: :savediff --git a/core/app/models/spree/zone.rb b/core/app/models/spree/zone.rbindex 2ce9d7e511..b55f7c93c7 100644--- a/core/app/models/spree/zone.rb+++ b/core/app/models/spree/zone.rb@@ -1,9 +1,6 @@module Spreeclass Zone < Spree.base_classinclude Spree::UniqueName- if defined?(Spree::Webhooks::HasWebhooks)- include Spree::Webhooks::HasWebhooks- endwith_options dependent: :destroy, inverse_of: :zone dohas_many :zone_members, class_name: 'Spree::ZoneMember'