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.

Drop legacy Webhooks code

Damian Legawiec4f6147dcc3e5
diff --git a/docs/plans/6.0-typed-stock-movements.md b/docs/plans/6.0-typed-stock-movements.md
index b22399b90b..8c399e7054 100644
--- a/docs/plans/6.0-typed-stock-movements.md
+++ b/docs/plans/6.0-typed-stock-movements.md
@@ -75,7 +75,6 @@ class Spree::StockMovement < Spree.base_class
KINDS = %w[received allocated shipped released adjusted].freeze
- include Spree::StockMovement::Webhooks
include Spree::StockMovement::CustomEvents
publishes_lifecycle_events
diff --git a/spree/core/app/models/spree/fulfillment.rb b/spree/core/app/models/spree/fulfillment.rb
index dda0a0b227..e6ed804b3d 100644
--- a/spree/core/app/models/spree/fulfillment.rb
+++ b/spree/core/app/models/spree/fulfillment.rb
@@ -14,7 +14,6 @@ module Spree
if defined?(Spree::VendorConcern)
include Spree::VendorConcern
end
- include Spree::Fulfillment::Webhooks
include Spree::Fulfillment::CustomEvents
publishes_lifecycle_events
@@ -115,7 +114,7 @@ module Spree
transition from: %i(ready ready_for_pickup canceled), to: :fulfilled, if: ->(fulfillment) { fulfillment.provider.can_fulfill?(fulfillment) }
end
after_transition to: :ready, do: :publish_fulfillment_ready_event
- after_transition to: :fulfilled, do: [:after_fulfill, :send_fulfillment_fulfilled_webhook, :publish_fulfillment_fulfilled_event]
+ after_transition to: :fulfilled, do: [:after_fulfill, :publish_fulfillment_fulfilled_event]
event :cancel do
transition to: :canceled, from: %i(pending ready ready_for_pickup)
diff --git a/spree/core/app/models/spree/fulfillment/webhooks.rb b/spree/core/app/models/spree/fulfillment/webhooks.rb
deleted file mode 100644
index 051e1bce38..0000000000
--- a/spree/core/app/models/spree/fulfillment/webhooks.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module Spree
- class Fulfillment < Spree.base_class
- module Webhooks
- extend ActiveSupport::Concern
-
- def send_fulfillment_fulfilled_webhook
- # Implement your logic here
- end
-
- # @deprecated Use {#send_fulfillment_fulfilled_webhook}; removed in 6.1.
- def send_shipment_shipped_webhook
- Spree::Deprecation.warn('Spree::Fulfillment#send_shipment_shipped_webhook is deprecated and will be removed in Spree 6.1. Use #send_fulfillment_fulfilled_webhook instead.')
- send_fulfillment_fulfilled_webhook
- end
- end
- end
-end
diff --git a/spree/core/app/models/spree/payment.rb b/spree/core/app/models/spree/payment.rb
index 2fd1506083..1800a5344d 100644
--- a/spree/core/app/models/spree/payment.rb
+++ b/spree/core/app/models/spree/payment.rb
@@ -15,7 +15,6 @@ module Spree
extend Spree::DisplayMoney
include Spree::Payment::Processing
- include Spree::Payment::Webhooks
include Spree::Payment::CustomEvents
publishes_lifecycle_events
@@ -126,11 +125,11 @@ module Spree
event :complete do
transition from: [:processing, :pending, :checkout], to: :completed
end
- after_transition to: :completed, do: [:after_completed, :send_payment_completed_webhook, :publish_payment_completed_event]
+ after_transition to: :completed, do: [:after_completed, :publish_payment_completed_event]
event :void do
transition from: [:pending, :processing, :completed, :checkout], to: :void
end
- after_transition to: :void, do: [:after_void, :send_payment_voided_webhook, :publish_payment_voided_event]
+ after_transition to: :void, do: [:after_void, :publish_payment_voided_event]
# when the card brand isn't supported
event :invalidate do
transition from: [:checkout], to: :invalid
diff --git a/spree/core/app/models/spree/payment/webhooks.rb b/spree/core/app/models/spree/payment/webhooks.rb
deleted file mode 100644
index 56e8f9a51c..0000000000
--- a/spree/core/app/models/spree/payment/webhooks.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module Spree
- class Payment < Spree.base_class
- module Webhooks
- extend ActiveSupport::Concern
-
- def send_payment_voided_webhook
- # Implement your logic here
- end
-
- def send_payment_completed_webhook
- # Implement your logic here
- end
- end
- end
-end
diff --git a/spree/core/app/models/spree/product.rb b/spree/core/app/models/spree/product.rb
index 1a7f6bd1cc..b933348eb7 100644
--- a/spree/core/app/models/spree/product.rb
+++ b/spree/core/app/models/spree/product.rb
@@ -29,7 +29,6 @@ module Spree
include Spree::MetafieldFilterable
include Spree::Metadata
include Spree::Searchable
- include Spree::Product::Webhooks
include Spree::Product::Slugs
include Spree::Product::Channels
include Spree::SearchIndexable
@@ -346,17 +345,17 @@ module Spree
event :activate do
transition to: :active
end
- after_transition to: :active, do: [:after_activate, :send_product_activated_webhook, :publish_product_activated_event]
+ after_transition to: :active, do: [:after_activate, :publish_product_activated_event]
event :archive do
transition to: :archived
end
- after_transition to: :archived, do: [:after_archive, :send_product_archived_webhook, :publish_product_archived_event]
+ after_transition to: :archived, do: [:after_archive, :publish_product_archived_event]
event :draft do
transition to: :draft
end
- after_transition to: :draft, do: [:after_draft, :send_product_drafted_webhook]
+ after_transition to: :draft, do: :after_draft
end
def self.bulk_auto_match_collections(store, product_ids)
diff --git a/spree/core/app/models/spree/product/webhooks.rb b/spree/core/app/models/spree/product/webhooks.rb
deleted file mode 100644
index 86a12b71bf..0000000000
--- a/spree/core/app/models/spree/product/webhooks.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module Spree
- class Product < Spree.base_class
- module Webhooks
- def send_product_activated_webhook
- # Implement your logic here
- end
-
- def send_product_archived_webhook
- # Implement your logic here
- end
-
- def send_product_drafted_webhook
- # Implement your logic here
- end
- end
- end
-end
diff --git a/spree/core/app/models/spree/stock_item.rb b/spree/core/app/models/spree/stock_item.rb
index b4abe717f3..1c76bfb59e 100644
--- a/spree/core/app/models/spree/stock_item.rb
+++ b/spree/core/app/models/spree/stock_item.rb
@@ -6,7 +6,6 @@ module Spree
include Spree::Metafields
include Spree::Metadata
- include Spree::StockItem::Webhooks
publishes_lifecycle_events
diff --git a/spree/core/app/models/spree/stock_item/webhooks.rb b/spree/core/app/models/spree/stock_item/webhooks.rb
deleted file mode 100644
index 895e395f2c..0000000000
--- a/spree/core/app/models/spree/stock_item/webhooks.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module Spree
- class StockItem < Spree.base_class
- module Webhooks
- end
- end
-end
diff --git a/spree/core/app/models/spree/stock_movement.rb b/spree/core/app/models/spree/stock_movement.rb
index d4fe03502d..92e302f67e 100644
--- a/spree/core/app/models/spree/stock_movement.rb
+++ b/spree/core/app/models/spree/stock_movement.rb
@@ -7,7 +7,6 @@ module Spree
min: -2**31
}.freeze
- include Spree::StockMovement::Webhooks
include Spree::StockMovement::CustomEvents
publishes_lifecycle_events
diff --git a/spree/core/app/models/spree/stock_movement/webhooks.rb b/spree/core/app/models/spree/stock_movement/webhooks.rb
deleted file mode 100644
index 9bc2a30c6d..0000000000
--- a/spree/core/app/models/spree/stock_movement/webhooks.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module Spree
- class StockMovement < Spree.base_class
- module Webhooks
- end
- end
-end
diff --git a/spree/core/app/models/spree/variant.rb b/spree/core/app/models/spree/variant.rb
index af7dd8a735..4c0d1db17a 100644
--- a/spree/core/app/models/spree/variant.rb
+++ b/spree/core/app/models/spree/variant.rb
@@ -9,7 +9,6 @@ module Spree
include Spree::Metafields
include Spree::Metadata
include Spree::Searchable
- include Spree::Variant::Webhooks
publishes_lifecycle_events
diff --git a/spree/core/app/models/spree/variant/webhooks.rb b/spree/core/app/models/spree/variant/webhooks.rb
deleted file mode 100644
index 228f748ec4..0000000000
--- a/spree/core/app/models/spree/variant/webhooks.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module Spree
- class Variant < Spree.base_class
- module Webhooks
- end
- end
-end
diff --git a/spree/core/lib/spree/core.rb b/spree/core/lib/spree/core.rb
index 34a90ea37b..05daa543af 100644
--- a/spree/core/lib/spree/core.rb
+++ b/spree/core/lib/spree/core.rb
@@ -586,7 +586,6 @@ require 'spree/service_module'
require 'spree/workflow'
require 'spree/analytics'
require 'spree/events'
-require 'spree/webhooks'
require 'spree/core/partials'
require 'spree/core/controller_helpers/auth'
diff --git a/spree/core/lib/spree/webhooks.rb b/spree/core/lib/spree/webhooks.rb
deleted file mode 100644
index 4f1acc074a..0000000000
--- a/spree/core/lib/spree/webhooks.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-module Spree
- module Webhooks
- def self.disable_webhooks
- Spree::Deprecation.warn('Spree::Webhooks.disable_webhooks is deprecated and will be removed in Spree 5.5. Use Spree::LegacyWebhooks.disable_webhooks instead.')
- prev_value = disabled?
- Thread.current[:disable_spree_legacy_webhooks] = true
- yield
- ensure
- Thread.current[:disable_spree_legacy_webhooks] = prev_value
- end
-
- def self.disabled?
- Spree::Deprecation.warn('Spree::Webhooks.disabled? is deprecated and will be removed in Spree 5.5. Use Spree::LegacyWebhooks.disabled? instead.')
- !!Thread.current[:disable_spree_legacy_webhooks]
- end
-
- def self.disabled=(value)
- Spree::Deprecation.warn('Spree::Webhooks.disabled= is deprecated and will be removed in Spree 5.5. Use Spree::LegacyWebhooks.disabled= instead.')
- Thread.current[:disable_spree_legacy_webhooks] = value
- end
- end
-end