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.

Use Spree dependencies to allow swapping/extending gift card services

Damian Legawiec6b7e3e2f22af
diff --git a/api/lib/spree/api/dependencies.rb b/api/lib/spree/api/dependencies.rb
index 868da5b057..b06021010c 100644
--- a/api/lib/spree/api/dependencies.rb
+++ b/api/lib/spree/api/dependencies.rb
@@ -32,6 +32,10 @@ module Spree
storefront_checkout_get_shipping_rates_service: -> { Spree::Dependencies.checkout_get_shipping_rates_service },
storefront_checkout_select_shipping_method_service: -> { Spree::Dependencies.checkout_select_shipping_method_service },
+ # gift cards
+ storefront_gift_card_apply_service: -> { Spree::Dependencies.gift_card_apply_service },
+ storefront_gift_card_remove_service: -> { Spree::Dependencies.gift_card_remove_service },
+
# account services
storefront_account_create_service: -> { Spree::Dependencies.account_create_service },
storefront_account_update_service: -> { Spree::Dependencies.account_update_service },
diff --git a/core/app/models/spree/order/gift_card.rb b/core/app/models/spree/order/gift_card.rb
index 6fbdd762a4..9999fba8e3 100644
--- a/core/app/models/spree/order/gift_card.rb
+++ b/core/app/models/spree/order/gift_card.rb
@@ -20,11 +20,11 @@ module Spree
end
def apply_gift_card(gift_card)
- Spree::GiftCards::Apply.call(gift_card: gift_card, order: self)
+ Spree::Dependencies.gift_card_apply_service.constantize.call(gift_card: gift_card, order: self)
end
def remove_gift_card
- Spree::GiftCards::Remove.call(order: self)
+ Spree::Dependencies.gift_card_remove_service.constantize.call(order: self)
end
def recalculate_gift_card
diff --git a/core/lib/spree/core/dependencies.rb b/core/lib/spree/core/dependencies.rb
index 73daa3a982..37cbd2b326 100644
--- a/core/lib/spree/core/dependencies.rb
+++ b/core/lib/spree/core/dependencies.rb
@@ -33,6 +33,10 @@ module Spree
checkout_get_shipping_rates_service: 'Spree::Checkout::GetShippingRates',
checkout_select_shipping_method_service: 'Spree::Checkout::SelectShippingMethod',
+ # gift cards
+ gift_card_apply_service: 'Spree::GiftCards::Apply',
+ gift_card_remove_service: 'Spree::GiftCards::Remove',
+
# order
order_approve_service: 'Spree::Orders::Approve',
order_cancel_service: 'Spree::Orders::Cancel',
diff --git a/storefront/app/controllers/spree/checkout_controller.rb b/storefront/app/controllers/spree/checkout_controller.rb
index 9e6e2070f4..c8e9144166 100644
--- a/storefront/app/controllers/spree/checkout_controller.rb
+++ b/storefront/app/controllers/spree/checkout_controller.rb
@@ -377,7 +377,7 @@ module Spree
def remove_expired_gift_card
return unless @order.gift_card.present? && @order.gift_card.expired?
- Spree::GiftCards::Remove.call(order: @order)
+ Spree::Dependencies.gift_card_remove_service.constantize.call(order: @order)
end
end
end