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.

Rename prepended modules to avoid name clashing.

Sebastian Palma4407f236eddb
diff --git a/api/app/models/spree/api/order.rb b/api/app/models/spree/api/order.rb
deleted file mode 100644
index b0167db770..0000000000
--- a/api/app/models/spree/api/order.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module Spree
- module Api
- module Order
- def cancel
- super
- Spree::Webhooks::Endpoints::QueueRequests.call(event: 'order.cancel', payload: {})
- end
-
- def finalize!
- super
- Spree::Webhooks::Endpoints::QueueRequests.call(event: 'order.complete', payload: {})
- end
- end
- end
-end
diff --git a/api/app/models/spree/api/payment.rb b/api/app/models/spree/api/payment.rb
deleted file mode 100644
index b0ecc66d1b..0000000000
--- a/api/app/models/spree/api/payment.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module Spree
- module Api
- module Payment
- private
-
- def after_void
- super
- Spree::Webhooks::Endpoints::QueueRequests.call(event: 'payment.void', payload: {})
- end
- end
- end
-end
diff --git a/api/app/models/spree/api/shipment.rb b/api/app/models/spree/api/shipment.rb
deleted file mode 100644
index cbade45d3e..0000000000
--- a/api/app/models/spree/api/shipment.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module Spree
- module Api
- module Shipment
- private
-
- def after_ship
- super
- Spree::Webhooks::Endpoints::QueueRequests.call(event: 'shipment.ship', payload: {})
- end
- end
- end
-end
diff --git a/api/app/models/spree/api/webhooks/order.rb b/api/app/models/spree/api/webhooks/order.rb
new file mode 100644
index 0000000000..6265132cd1
--- /dev/null
+++ b/api/app/models/spree/api/webhooks/order.rb
@@ -0,0 +1,17 @@
+module Spree
+ module Api
+ module Webhooks
+ module Order
+ def cancel
+ super
+ Spree::Webhooks::Endpoints::QueueRequests.call(event: 'order.cancel', payload: {})
+ end
+
+ def finalize!
+ super
+ Spree::Webhooks::Endpoints::QueueRequests.call(event: 'order.complete', payload: {})
+ end
+ end
+ end
+ end
+end
diff --git a/api/app/models/spree/api/webhooks/payment.rb b/api/app/models/spree/api/webhooks/payment.rb
new file mode 100644
index 0000000000..119d6f7da6
--- /dev/null
+++ b/api/app/models/spree/api/webhooks/payment.rb
@@ -0,0 +1,14 @@
+module Spree
+ module Api
+ module Webhooks
+ module Payment
+ private
+
+ def after_void
+ super
+ Spree::Webhooks::Endpoints::QueueRequests.call(event: 'payment.void', payload: {})
+ end
+ end
+ end
+ end
+end
diff --git a/api/app/models/spree/api/webhooks/shipment.rb b/api/app/models/spree/api/webhooks/shipment.rb
new file mode 100644
index 0000000000..152da17260
--- /dev/null
+++ b/api/app/models/spree/api/webhooks/shipment.rb
@@ -0,0 +1,14 @@
+module Spree
+ module Api
+ module Webhooks
+ module Shipment
+ private
+
+ def after_ship
+ super
+ Spree::Webhooks::Endpoints::QueueRequests.call(event: 'shipment.ship', payload: {})
+ end
+ end
+ end
+ end
+end
diff --git a/api/lib/spree/api/engine.rb b/api/lib/spree/api/engine.rb
index cb76b69d40..514cc8c7a0 100644
--- a/api/lib/spree/api/engine.rb
+++ b/api/lib/spree/api/engine.rb
@@ -24,9 +24,9 @@ module Spree
initializer 'Spree::Webhooks' do
Spree::Base.include(Spree::Webhooks::HasWebhooks)
- Spree::Order.prepend(Spree::Api::Order)
- Spree::Payment.prepend(Spree::Api::Payment)
- Spree::Shipment.prepend(Spree::Api::Shipment)
+ Spree::Order.prepend(Spree::Api::Webhooks::Order)
+ Spree::Payment.prepend(Spree::Api::Webhooks::Payment)
+ Spree::Shipment.prepend(Spree::Api::Webhooks::Shipment)
end
def self.root
diff --git a/api/spec/models/spree/webhooks/has_webhooks_spec.rb b/api/spec/models/concerns/spree/webhooks/has_webhooks_spec.rb
similarity index 100%
rename from api/spec/models/spree/webhooks/has_webhooks_spec.rb
rename to api/spec/models/concerns/spree/webhooks/has_webhooks_spec.rb
diff --git a/api/spec/models/spree/order_spec.rb b/api/spec/models/spree/api/webhooks/order_spec.rb
similarity index 100%
rename from api/spec/models/spree/order_spec.rb
rename to api/spec/models/spree/api/webhooks/order_spec.rb
diff --git a/api/spec/models/spree/payment_spec.rb b/api/spec/models/spree/api/webhooks/payment_spec.rb
similarity index 100%
rename from api/spec/models/spree/payment_spec.rb
rename to api/spec/models/spree/api/webhooks/payment_spec.rb
diff --git a/api/spec/models/spree/shipment_spec.rb b/api/spec/models/spree/api/webhooks/shipment_spec.rb
similarity index 100%
rename from api/spec/models/spree/shipment_spec.rb
rename to api/spec/models/spree/api/webhooks/shipment_spec.rb