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 order discount/fee mutations behind Tier 1 services

Damian Legawiec604deff6350f
diff --git a/spree/api/app/controllers/spree/api/v3/admin/orders/discounts_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/orders/discounts_controller.rb
index bbb97061fd..1d3f628e7c 100644
--- a/spree/api/app/controllers/spree/api/v3/admin/orders/discounts_controller.rb
+++ b/spree/api/app/controllers/spree/api/v3/admin/orders/discounts_controller.rb
@@ -35,11 +35,12 @@ module Spree
# PATCH /api/v3/admin/orders/:order_id/discounts/:id
def update
with_order_lock do
- return render_promotion_row_error if @resource.promotion?
+ result = Spree.order_discount_update_service.call(order: @parent, discount: @resource, attributes: permitted_params)
- if @resource.update(permitted_params)
- @parent.updater.resum_typed_totals!
+ if result.success?
render json: serialize_resource(@resource)
+ elsif result.error.value == :promotion_discount_not_editable
+ render_promotion_row_error
else
render_validation_error(@resource.errors)
end
@@ -49,11 +50,13 @@ module Spree
# DELETE /api/v3/admin/orders/:order_id/discounts/:id
def destroy
with_order_lock do
- return render_promotion_row_error if @resource.promotion?
+ result = Spree.order_discount_destroy_service.call(order: @parent, discount: @resource)
- @resource.destroy!
- @parent.updater.resum_typed_totals!
- head :no_content
+ if result.success?
+ head :no_content
+ else
+ render_promotion_row_error
+ end
end
end
diff --git a/spree/api/app/controllers/spree/api/v3/admin/orders/fees_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/orders/fees_controller.rb
index 5a1a17d7dc..d84eebcb08 100644
--- a/spree/api/app/controllers/spree/api/v3/admin/orders/fees_controller.rb
+++ b/spree/api/app/controllers/spree/api/v3/admin/orders/fees_controller.rb
@@ -14,13 +14,12 @@ module Spree
# POST /api/v3/admin/orders/:order_id/fees
def create
with_order_lock do
- @resource = @parent.fees.build(permitted_params.reverse_merge(kind: 'surcharge').merge(target_attributes))
+ result = Spree.order_fee_create_service.call(order: @parent, attributes: permitted_params.merge(target_attributes))
- if @resource.save
- @parent.updater.resum_typed_totals!
- render json: serialize_resource(@resource), status: :created
+ if result.success?
+ render json: serialize_resource(result.value), status: :created
else
- render_validation_error(@resource.errors)
+ render_validation_error(result.value.errors)
end
end
end
@@ -28,8 +27,9 @@ module Spree
# PATCH /api/v3/admin/orders/:order_id/fees/:id
def update
with_order_lock do
- if @resource.update(permitted_params)
- @parent.updater.resum_typed_totals!
+ result = Spree.order_fee_update_service.call(order: @parent, fee: @resource, attributes: permitted_params)
+
+ if result.success?
render json: serialize_resource(@resource)
else
render_validation_error(@resource.errors)
@@ -40,8 +40,7 @@ module Spree
# DELETE /api/v3/admin/orders/:order_id/fees/:id
def destroy
with_order_lock do
- @resource.destroy!
- @parent.updater.resum_typed_totals!
+ Spree.order_fee_destroy_service.call(order: @parent, fee: @resource)
head :no_content
end
end
diff --git a/spree/core/app/services/spree/orders/discounts/destroy.rb b/spree/core/app/services/spree/orders/discounts/destroy.rb
new file mode 100644
index 0000000000..76cee015f8
--- /dev/null
+++ b/spree/core/app/services/spree/orders/discounts/destroy.rb
@@ -0,0 +1,25 @@
+module Spree
+ module Orders
+ module Discounts
+ # Removes a manual discount row and re-sums the order totals.
+ # Promotion-sourced rows are recalculation-owned and refused.
+ class Destroy
+ prepend Spree::ServiceModule::Base
+
+ # @param order [Spree::Order]
+ # @param discount [Spree::Discount]
+ # @return [Spree::ServiceModule::Result] value is the destroyed row
+ def call(order:, discount:)
+ return failure(discount, :promotion_discount_not_editable) if discount.promotion?
+
+ order.with_lock do
+ discount.destroy!
+ Spree.order_recalculate_totals_workflow.call(order: order)
+ end
+
+ success(discount)
+ end
+ end
+ end
+ end
+end
diff --git a/spree/core/app/services/spree/orders/discounts/update.rb b/spree/core/app/services/spree/orders/discounts/update.rb
new file mode 100644
index 0000000000..abdd4608cd
--- /dev/null
+++ b/spree/core/app/services/spree/orders/discounts/update.rb
@@ -0,0 +1,29 @@
+module Spree
+ module Orders
+ module Discounts
+ # Updates a manual discount row and re-sums the order totals — part of
+ # the sanctioned post-placement edit path. Promotion-sourced rows are
+ # recalculation-owned and refused.
+ class Update
+ prepend Spree::ServiceModule::Base
+
+ # @param order [Spree::Order]
+ # @param discount [Spree::Discount]
+ # @param attributes [Hash, ActionController::Parameters]
+ # @return [Spree::ServiceModule::Result] value is the discount row
+ def call(order:, discount:, attributes:)
+ return failure(discount, :promotion_discount_not_editable) if discount.promotion?
+
+ updated = order.with_lock do
+ next false unless discount.update(attributes)
+
+ Spree.order_recalculate_totals_workflow.call(order: order)
+ true
+ end
+
+ updated ? success(discount) : failure(discount)
+ end
+ end
+ end
+ end
+end
diff --git a/spree/core/app/services/spree/orders/fees/create.rb b/spree/core/app/services/spree/orders/fees/create.rb
new file mode 100644
index 0000000000..0a873d8f60
--- /dev/null
+++ b/spree/core/app/services/spree/orders/fees/create.rb
@@ -0,0 +1,28 @@
+module Spree
+ module Orders
+ module Fees
+ # Creates a fee row (surcharge by default) and re-sums the order
+ # totals — part of the sanctioned post-placement edit path.
+ class Create
+ prepend Spree::ServiceModule::Base
+
+ # @param order [Spree::Order]
+ # @param attributes [Hash, ActionController::Parameters] may carry a
+ # line_item/fulfillment target; order-level when neither is given
+ # @return [Spree::ServiceModule::Result] value is the fee row
+ def call(order:, attributes:)
+ fee = order.fees.build(attributes.reverse_merge(kind: 'surcharge'))
+
+ created = order.with_lock do
+ next false unless fee.save
+
+ Spree.order_recalculate_totals_workflow.call(order: order)
+ true
+ end
+
+ created ? success(fee) : failure(fee)
+ end
+ end
+ end
+ end
+end
diff --git a/spree/core/app/services/spree/orders/fees/destroy.rb b/spree/core/app/services/spree/orders/fees/destroy.rb
new file mode 100644
index 0000000000..112ebfbd77
--- /dev/null
+++ b/spree/core/app/services/spree/orders/fees/destroy.rb
@@ -0,0 +1,22 @@
+module Spree
+ module Orders
+ module Fees
+ # Removes a fee row and re-sums the order totals.
+ class Destroy
+ prepend Spree::ServiceModule::Base
+
+ # @param order [Spree::Order]
+ # @param fee [Spree::Fee]
+ # @return [Spree::ServiceModule::Result] value is the destroyed row
+ def call(order:, fee:)
+ order.with_lock do
+ fee.destroy!
+ Spree.order_recalculate_totals_workflow.call(order: order)
+ end
+
+ success(fee)
+ end
+ end
+ end
+ end
+end
diff --git a/spree/core/app/services/spree/orders/fees/update.rb b/spree/core/app/services/spree/orders/fees/update.rb
new file mode 100644
index 0000000000..3ddfe48a3c
--- /dev/null
+++ b/spree/core/app/services/spree/orders/fees/update.rb
@@ -0,0 +1,25 @@
+module Spree
+ module Orders
+ module Fees
+ # Updates a fee row and re-sums the order totals.
+ class Update
+ prepend Spree::ServiceModule::Base
+
+ # @param order [Spree::Order]
+ # @param fee [Spree::Fee]
+ # @param attributes [Hash, ActionController::Parameters]
+ # @return [Spree::ServiceModule::Result] value is the fee row
+ def call(order:, fee:, attributes:)
+ updated = order.with_lock do
+ next false unless fee.update(attributes)
+
+ Spree.order_recalculate_totals_workflow.call(order: order)
+ true
+ end
+
+ updated ? success(fee) : failure(fee)
+ end
+ end
+ end
+ end
+end
diff --git a/spree/core/lib/spree/core/dependencies.rb b/spree/core/lib/spree/core/dependencies.rb
index 816a3dd29f..97ad7fe932 100644
--- a/spree/core/lib/spree/core/dependencies.rb
+++ b/spree/core/lib/spree/core/dependencies.rb
@@ -58,6 +58,11 @@ module Spree
order_resume_workflow: 'Spree::Orders::Resume',
order_complete_service: 'Spree::Orders::Complete',
order_add_manual_discount_service: 'Spree::Orders::AddManualDiscount',
+ order_discount_update_service: 'Spree::Orders::Discounts::Update',
+ order_discount_destroy_service: 'Spree::Orders::Discounts::Destroy',
+ order_fee_create_service: 'Spree::Orders::Fees::Create',
+ order_fee_update_service: 'Spree::Orders::Fees::Update',
+ order_fee_destroy_service: 'Spree::Orders::Fees::Destroy',
order_create_service: 'Spree::Orders::Create',
order_update_service: 'Spree::Orders::Update',
order_updater: 'Spree::OrderUpdater',