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
Use new Dependencies 2.0 DSL everywhere (#13398)
Damian Legawiec9922642d5f6c
diff --git a/admin/app/controllers/spree/admin/addresses_controller.rb b/admin/app/controllers/spree/admin/addresses_controller.rbindex a4edc8fea8..05223be728 100644--- a/admin/app/controllers/spree/admin/addresses_controller.rb+++ b/admin/app/controllers/spree/admin/addresses_controller.rb@@ -54,11 +54,11 @@ module Spreeenddef create_service- Spree::Dependencies.address_create_service.constantize+ Spree.address_create_serviceenddef update_service- Spree::Dependencies.address_update_service.constantize+ Spree.address_update_serviceenddef address_update_address_changes_exceptdiff --git a/admin/app/controllers/spree/admin/line_items_controller.rb b/admin/app/controllers/spree/admin/line_items_controller.rbindex 80f68c9861..624cf807b6 100644--- a/admin/app/controllers/spree/admin/line_items_controller.rb+++ b/admin/app/controllers/spree/admin/line_items_controller.rb@@ -20,7 +20,7 @@ module Spree'address'end- result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: max_state)+ result = Spree.checkout_advance_service.call(order: @order, state: max_state)unless result.success?flash[:error] = result.error.value.full_messages.to_sentence@@ -53,7 +53,7 @@ module Spree'address'end- result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: max_state)+ result = Spree.checkout_advance_service.call(order: @order, state: max_state)unless result.success?flash[:error] = result.error.value.full_messages.to_sentence@@ -98,15 +98,15 @@ module Spreeenddef update_service- Spree::Dependencies.line_item_update_service.constantize+ Spree.line_item_update_serviceenddef destroy_service- Spree::Dependencies.line_item_destroy_service.constantize+ Spree.line_item_destroy_serviceenddef create_service- Spree::Dependencies.line_item_create_service.constantize+ Spree.line_item_create_serviceenddef build_resourcediff --git a/admin/app/controllers/spree/admin/orders/billing_address_controller.rb b/admin/app/controllers/spree/admin/orders/billing_address_controller.rbindex 13ae0647f1..22804afb9f 100644--- a/admin/app/controllers/spree/admin/orders/billing_address_controller.rb+++ b/admin/app/controllers/spree/admin/orders/billing_address_controller.rb@@ -36,7 +36,7 @@ module Spree'address'end- advance_to_payment_result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: max_state)+ advance_to_payment_result = Spree.checkout_advance_service.call(order: @order, state: max_state)unless advance_to_payment_result.success?flash[:error] = advance_to_payment_result.error.value.full_messages.to_sentence@@ -76,7 +76,7 @@ module Spree'address'end- advance_to_payment_result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: max_state)+ advance_to_payment_result = Spree.checkout_advance_service.call(order: @order, state: max_state)unless advance_to_payment_result.success?flash[:error] = advance_to_payment_result.error.value.full_messages.to_sentencediff --git a/admin/app/controllers/spree/admin/orders/contact_information_controller.rb b/admin/app/controllers/spree/admin/orders/contact_information_controller.rbindex 1c16605af7..dd0c2b5779 100644--- a/admin/app/controllers/spree/admin/orders/contact_information_controller.rb+++ b/admin/app/controllers/spree/admin/orders/contact_information_controller.rb@@ -18,7 +18,7 @@ module Spree'address'end- result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: max_state)+ result = Spree.checkout_advance_service.call(order: @order, state: max_state)unless result.success?flash[:error] = result.error.value.full_messages.to_sentencediff --git a/admin/app/controllers/spree/admin/orders/shipping_address_controller.rb b/admin/app/controllers/spree/admin/orders/shipping_address_controller.rbindex e64932ec0e..0ab4710537 100644--- a/admin/app/controllers/spree/admin/orders/shipping_address_controller.rb+++ b/admin/app/controllers/spree/admin/orders/shipping_address_controller.rb@@ -23,7 +23,7 @@ module Spree@order.shipments.update_all(address_id: @order.ship_address.id, updated_at: Time.current)if [email protected]? && @order.line_items.any?@order.ensure_updated_shipments- advance_to_payment_result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: 'payment')+ advance_to_payment_result = Spree.checkout_advance_service.call(order: @order, state: 'payment')unless advance_to_payment_result.success?flash[:error] = advance_to_payment_result.error.value.full_messages.to_sentence@@ -57,7 +57,7 @@ module Spree@order.shipments.update_all(address_id: @order.ship_address.id, updated_at: Time.current)if [email protected]? && @order.line_items.any?@order.ensure_updated_shipments- advance_to_payment_result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: 'payment')+ advance_to_payment_result = Spree.checkout_advance_service.call(order: @order, state: 'payment')unless advance_to_payment_result.success?flash[:error] = advance_to_payment_result.error.value.full_messages.to_sentencediff --git a/admin/app/controllers/spree/admin/orders/user_controller.rb b/admin/app/controllers/spree/admin/orders/user_controller.rbindex 772589d9d9..02a4137158 100644--- a/admin/app/controllers/spree/admin/orders/user_controller.rb+++ b/admin/app/controllers/spree/admin/orders/user_controller.rb@@ -22,7 +22,7 @@ module Spree'address'end- result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: max_state)+ result = Spree.checkout_advance_service.call(order: @order, state: max_state)if result.success?flash[:success] = flash_message_for(@order, :successfully_updated)@@ -64,7 +64,7 @@ module Spree'address'end- result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: max_state)+ result = Spree.checkout_advance_service.call(order: @order, state: max_state)unless result.success?flash[:error] = result.error.value.full_messages.to_sentencediff --git a/admin/app/controllers/spree/admin/shipments_controller.rb b/admin/app/controllers/spree/admin/shipments_controller.rbindex a78c27edef..c40546982e 100644--- a/admin/app/controllers/spree/admin/shipments_controller.rb+++ b/admin/app/controllers/spree/admin/shipments_controller.rb@@ -11,7 +11,7 @@ module Spreebefore_action :refresh_shipping_rates, only: :editdef update- @result = Spree::Dependencies.shipment_update_service.constantize.call(shipment: @shipment, shipment_attributes: permitted_resource_params)+ @result = Spree.shipment_update_service.call(shipment: @shipment, shipment_attributes: permitted_resource_params)flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:shipment)) if @result.success?redirect_back fallback_location: spree.edit_admin_order_path(@order)diff --git a/admin/spec/controllers/spree/admin/invitations_controller_spec.rb b/admin/spec/controllers/spree/admin/invitations_controller_spec.rbindex 4ae6ad32b6..ba41a77bba 100644--- a/admin/spec/controllers/spree/admin/invitations_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/invitations_controller_spec.rb@@ -230,7 +230,7 @@ RSpec.describe Spree::Admin::InvitationsController, type: :controller dolet(:another_user) { create(:user) }before do- allow(controller).to receive(:current_ability).and_return(Spree::Dependencies.ability_class.constantize.new(another_user))+ allow(controller).to receive(:current_ability).and_return(Spree.ability_class.new(another_user))allow(controller).to receive(:try_spree_current_user).and_return(another_user)put :accept, params: { id: invitation.id }enddiff --git a/admin/spec/controllers/spree/admin/refunds_controller_spec.rb b/admin/spec/controllers/spree/admin/refunds_controller_spec.rbindex 1dea3f3319..60bbab5916 100644--- a/admin/spec/controllers/spree/admin/refunds_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/refunds_controller_spec.rb@@ -7,7 +7,7 @@ describe Spree::Admin::RefundsController, type: :controller dolet(:user) { create(:admin_user) }before do- allow(controller).to receive(:current_ability).and_return(Spree::Dependencies.ability_class.constantize.new(user))+ allow(controller).to receive(:current_ability).and_return(Spree.ability_class.new(user))endlet(:order) { create(:completed_order_with_totals) }diff --git a/api/app/controllers/concerns/spree/api/v2/storefront/order_concern.rb b/api/app/controllers/concerns/spree/api/v2/storefront/order_concern.rbindex 5622ec9ff5..716a8ee1a0 100644--- a/api/app/controllers/concerns/spree/api/v2/storefront/order_concern.rb+++ b/api/app/controllers/concerns/spree/api/v2/storefront/order_concern.rb@@ -26,7 +26,7 @@ module Spreeenddef find_spree_current_order- Spree::Api::Dependencies.storefront_current_order_finder.constantize.new.execute(+ Spree.api.storefront_current_order_finder.new.execute(store: current_store,user: spree_current_user,token: order_token,diff --git a/api/app/controllers/spree/api/v2/base_controller.rb b/api/app/controllers/spree/api/v2/base_controller.rbindex 63fafe15c5..e88c05a1e3 100644--- a/api/app/controllers/spree/api/v2/base_controller.rb+++ b/api/app/controllers/spree/api/v2/base_controller.rb@@ -53,7 +53,7 @@ module Spree# Returns the collection paginator# @return [Class] The collection paginator class, default is Spree::Shared::Paginatedef collection_paginator- Spree::Api::Dependencies.storefront_collection_paginator.constantize+ Spree.api.storefront_collection_paginatorend# Renders a serialized payload with the given status code@@ -120,7 +120,7 @@ module Spree# Needs to be overridden so that we use Spree's Ability rather than anyone else's.def current_ability- @current_ability ||= Spree::Dependencies.ability_class.constantize.new(spree_current_user, ability_options)+ @current_ability ||= Spree.ability_class.new(spree_current_user, ability_options)end# this method can be extended in extensions or developer applicationsdiff --git a/api/app/controllers/spree/api/v2/data_feeds/google_controller.rb b/api/app/controllers/spree/api/v2/data_feeds/google_controller.rbindex 2c7d39f3de..4a1e8ccb03 100644--- a/api/app/controllers/spree/api/v2/data_feeds/google_controller.rb+++ b/api/app/controllers/spree/api/v2/data_feeds/google_controller.rb@@ -14,7 +14,7 @@ module Spreeenddef data_feeds_google_rss_service- Spree::Dependencies.data_feeds_google_rss_service.constantize.new.call(settings)+ Spree.data_feeds_google_rss_service.new.call(settings)endendenddiff --git a/api/app/controllers/spree/api/v2/platform/addresses_controller.rb b/api/app/controllers/spree/api/v2/platform/addresses_controller.rbindex ae778b9691..625c032e17 100644--- a/api/app/controllers/spree/api/v2/platform/addresses_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/addresses_controller.rb@@ -14,7 +14,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_address_serializer.constantize+ Spree.api.platform_address_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/adjustments_controller.rb b/api/app/controllers/spree/api/v2/platform/adjustments_controller.rbindex bc200675b8..6ab0358043 100644--- a/api/app/controllers/spree/api/v2/platform/adjustments_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/adjustments_controller.rb@@ -14,7 +14,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_adjustment_serializer.constantize+ Spree.api.platform_adjustment_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/classifications_controller.rb b/api/app/controllers/spree/api/v2/platform/classifications_controller.rbindex ab43d8a1fb..b42280eb5a 100644--- a/api/app/controllers/spree/api/v2/platform/classifications_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/classifications_controller.rb@@ -17,7 +17,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_classification_serializer.constantize+ Spree.api.platform_classification_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/countries_controller.rb b/api/app/controllers/spree/api/v2/platform/countries_controller.rbindex dbdfb4b3b8..17f1278422 100644--- a/api/app/controllers/spree/api/v2/platform/countries_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/countries_controller.rb@@ -14,7 +14,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_country_serializer.constantize+ Spree.api.platform_country_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/data_feeds_controller.rb b/api/app/controllers/spree/api/v2/platform/data_feeds_controller.rbindex c9f9ad6cfa..d17afee92e 100644--- a/api/app/controllers/spree/api/v2/platform/data_feeds_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/data_feeds_controller.rb@@ -10,7 +10,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_data_feed_serializer.constantize+ Spree.api.platform_data_feed_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/digital_links_controller.rb b/api/app/controllers/spree/api/v2/platform/digital_links_controller.rbindex 214e1aebd9..a1793059fc 100644--- a/api/app/controllers/spree/api/v2/platform/digital_links_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/digital_links_controller.rb@@ -20,7 +20,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_digital_link_serializer.constantize+ Spree.api.platform_digital_link_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/digitals_controller.rb b/api/app/controllers/spree/api/v2/platform/digitals_controller.rbindex 21ad6626d4..7ade57332b 100644--- a/api/app/controllers/spree/api/v2/platform/digitals_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/digitals_controller.rb@@ -14,7 +14,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_digital_serializer.constantize+ Spree.api.platform_digital_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/gift_cards_controller.rb b/api/app/controllers/spree/api/v2/platform/gift_cards_controller.rbindex 09abb7191a..46d1c36724 100644--- a/api/app/controllers/spree/api/v2/platform/gift_cards_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/gift_cards_controller.rb@@ -14,7 +14,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_gift_card_serializer.constantize+ Spree.api.platform_gift_card_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/line_items_controller.rb b/api/app/controllers/spree/api/v2/platform/line_items_controller.rbindex 17f520b629..0ce50fc275 100644--- a/api/app/controllers/spree/api/v2/platform/line_items_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/line_items_controller.rb@@ -42,19 +42,19 @@ module Spreeenddef create_service- Spree::Api::Dependencies.platform_line_item_create_service.constantize+ Spree.api.platform_line_item_create_serviceenddef update_service- Spree::Api::Dependencies.platform_line_item_update_service.constantize+ Spree.api.platform_line_item_update_serviceenddef destroy_service- Spree::Api::Dependencies.platform_line_item_destroy_service.constantize+ Spree.api.platform_line_item_destroy_serviceenddef resource_serializer- Spree::Api::Dependencies.platform_line_item_serializer.constantize+ Spree.api.platform_line_item_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/option_types_controller.rb b/api/app/controllers/spree/api/v2/platform/option_types_controller.rbindex 4c4d3fd3e3..0ce847c157 100644--- a/api/app/controllers/spree/api/v2/platform/option_types_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/option_types_controller.rb@@ -10,7 +10,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_option_type_serializer.constantize+ Spree.api.platform_option_type_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/option_values_controller.rb b/api/app/controllers/spree/api/v2/platform/option_values_controller.rbindex 27888bc0cb..56f7b6d2ec 100644--- a/api/app/controllers/spree/api/v2/platform/option_values_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/option_values_controller.rb@@ -14,7 +14,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_option_value_serializer.constantize+ Spree.api.platform_option_value_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/orders_controller.rb b/api/app/controllers/spree/api/v2/platform/orders_controller.rbindex 8f6253a829..d308c217ff 100644--- a/api/app/controllers/spree/api/v2/platform/orders_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/orders_controller.rb@@ -106,43 +106,43 @@ module Spreeenddef update_service- Spree::Api::Dependencies.platform_order_update_service.constantize+ Spree.api.platform_order_update_serviceenddef next_service- Spree::Api::Dependencies.platform_order_next_service.constantize+ Spree.api.platform_order_next_serviceenddef advance_service- Spree::Api::Dependencies.platform_order_advance_service.constantize+ Spree.api.platform_order_advance_serviceenddef use_store_credit_service- Spree::Api::Dependencies.platform_order_use_store_credit_service.constantize+ Spree.api.platform_order_use_store_credit_serviceenddef complete_service- Spree::Api::Dependencies.platform_order_complete_service.constantize+ Spree.api.platform_order_complete_serviceenddef empty_service- Spree::Api::Dependencies.platform_order_empty_service.constantize+ Spree.api.platform_order_empty_serviceenddef destroy_service- Spree::Api::Dependencies.platform_order_destroy_service.constantize+ Spree.api.platform_order_destroy_serviceenddef approve_service- Spree::Api::Dependencies.platform_order_approve_service.constantize+ Spree.api.platform_order_approve_serviceenddef cancel_service- Spree::Api::Dependencies.platform_order_cancel_service.constantize+ Spree.api.platform_order_cancel_serviceenddef coupon_handler- Spree::Api::Dependencies.platform_coupon_handler.constantize+ Spree.api.platform_coupon_handlerenddef spree_permitted_attributes@@ -158,7 +158,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_order_serializer.constantize+ Spree.api.platform_order_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/payment_methods_controller.rb b/api/app/controllers/spree/api/v2/platform/payment_methods_controller.rbindex 165a46bd35..996e93f625 100644--- a/api/app/controllers/spree/api/v2/platform/payment_methods_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/payment_methods_controller.rb@@ -22,7 +22,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_payment_method_serializer.constantize+ Spree.api.platform_payment_method_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/payments_controller.rb b/api/app/controllers/spree/api/v2/platform/payments_controller.rbindex 6f526e8c03..df655b3671 100644--- a/api/app/controllers/spree/api/v2/platform/payments_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/payments_controller.rb@@ -12,7 +12,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_payment_serializer.constantize+ Spree.api.platform_payment_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/products_controller.rb b/api/app/controllers/spree/api/v2/platform/products_controller.rbindex 58ba301746..e8ba103c4e 100644--- a/api/app/controllers/spree/api/v2/platform/products_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/products_controller.rb@@ -28,11 +28,11 @@ module Spreeenddef collection_sorter- Spree::Api::Dependencies.platform_products_sorter.constantize+ Spree.api.platform_products_sorterenddef resource_serializer- Spree::Api::Dependencies.platform_product_serializer.constantize+ Spree.api.platform_product_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/promotion_actions_controller.rb b/api/app/controllers/spree/api/v2/platform/promotion_actions_controller.rbindex aca194b548..9fcc902a19 100644--- a/api/app/controllers/spree/api/v2/platform/promotion_actions_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/promotion_actions_controller.rb@@ -25,7 +25,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_promotion_action_serializer.constantize+ Spree.api.platform_promotion_action_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/promotion_categories_controller.rb b/api/app/controllers/spree/api/v2/platform/promotion_categories_controller.rbindex cb0190808a..562f2ac5f3 100644--- a/api/app/controllers/spree/api/v2/platform/promotion_categories_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/promotion_categories_controller.rb@@ -14,7 +14,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_promotion_category_serializer.constantize+ Spree.api.platform_promotion_category_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/promotion_rules_controller.rb b/api/app/controllers/spree/api/v2/platform/promotion_rules_controller.rbindex 7fb66bdc11..278bc83d31 100644--- a/api/app/controllers/spree/api/v2/platform/promotion_rules_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/promotion_rules_controller.rb@@ -20,7 +20,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_promotion_rule_serializer.constantize+ Spree.api.platform_promotion_rule_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/promotions_controller.rb b/api/app/controllers/spree/api/v2/platform/promotions_controller.rbindex 3e6944bd7c..8c0851a762 100644--- a/api/app/controllers/spree/api/v2/platform/promotions_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/promotions_controller.rb@@ -26,7 +26,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_promotion_serializer.constantize+ Spree.api.platform_promotion_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/roles_controller.rb b/api/app/controllers/spree/api/v2/platform/roles_controller.rbindex 4bf54c6e47..13e42016e4 100644--- a/api/app/controllers/spree/api/v2/platform/roles_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/roles_controller.rb@@ -10,7 +10,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_role_serializer.constantize+ Spree.api.platform_role_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/shipments_controller.rb b/api/app/controllers/spree/api/v2/platform/shipments_controller.rbindex 1c06934043..99a47b7b82 100644--- a/api/app/controllers/spree/api/v2/platform/shipments_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/shipments_controller.rb@@ -118,27 +118,27 @@ module Spreeenddef create_service- Spree::Api::Dependencies.platform_shipment_create_service.constantize+ Spree.api.platform_shipment_create_serviceenddef update_service- Spree::Api::Dependencies.platform_shipment_update_service.constantize+ Spree.api.platform_shipment_update_serviceenddef change_state_service- Spree::Api::Dependencies.platform_shipment_change_state_service.constantize+ Spree.api.platform_shipment_change_state_serviceenddef add_item_service- Spree::Api::Dependencies.platform_shipment_add_item_service.constantize+ Spree.api.platform_shipment_add_item_serviceenddef remove_item_service- Spree::Api::Dependencies.platform_shipment_remove_item_service.constantize+ Spree.api.platform_shipment_remove_item_serviceenddef resource_serializer- Spree::Api::Dependencies.platform_shipment_serializer.constantize+ Spree.api.platform_shipment_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/shipping_categories_controller.rb b/api/app/controllers/spree/api/v2/platform/shipping_categories_controller.rbindex 2ce5eaef85..aafdca42ae 100644--- a/api/app/controllers/spree/api/v2/platform/shipping_categories_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/shipping_categories_controller.rb@@ -10,7 +10,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_shipping_category_serializer.constantize+ Spree.api.platform_shipping_category_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/shipping_methods_controller.rb b/api/app/controllers/spree/api/v2/platform/shipping_methods_controller.rbindex bfaec9227b..29ab32c499 100644--- a/api/app/controllers/spree/api/v2/platform/shipping_methods_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/shipping_methods_controller.rb@@ -19,7 +19,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_shipping_method_serializer.constantize+ Spree.api.platform_shipping_method_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/states_controller.rb b/api/app/controllers/spree/api/v2/platform/states_controller.rbindex 0211a3617d..85642a49d5 100644--- a/api/app/controllers/spree/api/v2/platform/states_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/states_controller.rb@@ -14,7 +14,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_state_serializer.constantize+ Spree.api.platform_state_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/stock_items_controller.rb b/api/app/controllers/spree/api/v2/platform/stock_items_controller.rbindex 3d79648de2..2a719f2714 100644--- a/api/app/controllers/spree/api/v2/platform/stock_items_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/stock_items_controller.rb@@ -14,7 +14,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_stock_item_serializer.constantize+ Spree.api.platform_stock_item_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/stock_locations_controller.rb b/api/app/controllers/spree/api/v2/platform/stock_locations_controller.rbindex 01d6e36524..790f4fe172 100644--- a/api/app/controllers/spree/api/v2/platform/stock_locations_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/stock_locations_controller.rb@@ -14,7 +14,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_stock_location_serializer.constantize+ Spree.api.platform_stock_location_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/store_credit_categories_controller.rb b/api/app/controllers/spree/api/v2/platform/store_credit_categories_controller.rbindex 582aae74dd..c2af60e9e5 100644--- a/api/app/controllers/spree/api/v2/platform/store_credit_categories_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/store_credit_categories_controller.rb@@ -10,7 +10,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_store_credit_category_serializer.constantize+ Spree.api.platform_store_credit_category_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/store_credit_types_controller.rb b/api/app/controllers/spree/api/v2/platform/store_credit_types_controller.rbindex 64f82b5d63..97433fcb8c 100644--- a/api/app/controllers/spree/api/v2/platform/store_credit_types_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/store_credit_types_controller.rb@@ -10,7 +10,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_store_credit_type_serializer.constantize+ Spree.api.platform_store_credit_type_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/store_credits_controller.rb b/api/app/controllers/spree/api/v2/platform/store_credits_controller.rbindex bb6216b780..bfdf1eb7d1 100644--- a/api/app/controllers/spree/api/v2/platform/store_credits_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/store_credits_controller.rb@@ -14,7 +14,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_store_credit_serializer.constantize+ Spree.api.platform_store_credit_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/tax_categories_controller.rb b/api/app/controllers/spree/api/v2/platform/tax_categories_controller.rbindex dfd47c3b90..58a91389b1 100644--- a/api/app/controllers/spree/api/v2/platform/tax_categories_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/tax_categories_controller.rb@@ -14,7 +14,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_tax_category_serializer.constantize+ Spree.api.platform_tax_category_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/tax_rates_controller.rb b/api/app/controllers/spree/api/v2/platform/tax_rates_controller.rbindex 413cd88afd..1da1226a80 100644--- a/api/app/controllers/spree/api/v2/platform/tax_rates_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/tax_rates_controller.rb@@ -18,7 +18,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_tax_rate_serializer.constantize+ Spree.api.platform_tax_rate_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/taxonomies_controller.rb b/api/app/controllers/spree/api/v2/platform/taxonomies_controller.rbindex 0334e0e55b..028093eec2 100644--- a/api/app/controllers/spree/api/v2/platform/taxonomies_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/taxonomies_controller.rb@@ -14,7 +14,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_taxonomy_serializer.constantize+ Spree.api.platform_taxonomy_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/taxons_controller.rb b/api/app/controllers/spree/api/v2/platform/taxons_controller.rbindex a4fccea290..3a2c328aa3 100644--- a/api/app/controllers/spree/api/v2/platform/taxons_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/taxons_controller.rb@@ -50,7 +50,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_taxon_serializer.constantize+ Spree.api.platform_taxon_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/users_controller.rb b/api/app/controllers/spree/api/v2/platform/users_controller.rbindex 6e8cb362f3..bfaeab213a 100644--- a/api/app/controllers/spree/api/v2/platform/users_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/users_controller.rb@@ -10,7 +10,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_user_serializer.constantize+ Spree.api.platform_user_serializerenddef scope_includesdiff --git a/api/app/controllers/spree/api/v2/platform/variants_controller.rb b/api/app/controllers/spree/api/v2/platform/variants_controller.rbindex 89b70a80d0..6a1863fa31 100644--- a/api/app/controllers/spree/api/v2/platform/variants_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/variants_controller.rb@@ -14,7 +14,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_variant_serializer.constantize+ Spree.api.platform_variant_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/webhooks/events_controller.rb b/api/app/controllers/spree/api/v2/platform/webhooks/events_controller.rbindex f8c7a53911..061314dcca 100644--- a/api/app/controllers/spree/api/v2/platform/webhooks/events_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/webhooks/events_controller.rb@@ -15,7 +15,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_webhooks_event_serializer.constantize+ Spree.api.platform_webhooks_event_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/webhooks/subscribers_controller.rb b/api/app/controllers/spree/api/v2/platform/webhooks/subscribers_controller.rbindex c57206f4c0..855a53482b 100644--- a/api/app/controllers/spree/api/v2/platform/webhooks/subscribers_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/webhooks/subscribers_controller.rb@@ -15,7 +15,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_webhooks_subscriber_serializer.constantize+ Spree.api.platform_webhooks_subscriber_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/wished_items_controller.rb b/api/app/controllers/spree/api/v2/platform/wished_items_controller.rbindex 36990890c6..5a11ac9c12 100644--- a/api/app/controllers/spree/api/v2/platform/wished_items_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/wished_items_controller.rb@@ -14,7 +14,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_wished_item_serializer.constantize+ Spree.api.platform_wished_item_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/wishlists_controller.rb b/api/app/controllers/spree/api/v2/platform/wishlists_controller.rbindex 210ab38088..34a92a4f60 100644--- a/api/app/controllers/spree/api/v2/platform/wishlists_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/wishlists_controller.rb@@ -14,7 +14,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_wishlist_serializer.constantize+ Spree.api.platform_wishlist_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/platform/zones_controller.rb b/api/app/controllers/spree/api/v2/platform/zones_controller.rbindex ce2528e9e5..c01b9b58d4 100644--- a/api/app/controllers/spree/api/v2/platform/zones_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/zones_controller.rb@@ -14,7 +14,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.platform_zone_serializer.constantize+ Spree.api.platform_zone_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/resource_controller.rb b/api/app/controllers/spree/api/v2/resource_controller.rbindex 916d12d47e..f93252d2a8 100644--- a/api/app/controllers/spree/api/v2/resource_controller.rb+++ b/api/app/controllers/spree/api/v2/resource_controller.rb@@ -68,7 +68,7 @@ module Spreeenddef collection_sorter- Spree::Api::Dependencies.storefront_collection_sorter.constantize+ Spree.api.storefront_collection_sorterendendenddiff --git a/api/app/controllers/spree/api/v2/storefront/account/addresses_controller.rb b/api/app/controllers/spree/api/v2/storefront/account/addresses_controller.rbindex 879ce13e76..0b09883460 100644--- a/api/app/controllers/spree/api/v2/storefront/account/addresses_controller.rb+++ b/api/app/controllers/spree/api/v2/storefront/account/addresses_controller.rb@@ -47,23 +47,23 @@ module Spreeenddef collection_finder- Spree::Api::Dependencies.storefront_address_finder.constantize+ Spree.api.storefront_address_finderenddef collection_serializer- Spree::Api::Dependencies.storefront_address_serializer.constantize+ Spree.api.storefront_address_serializerenddef resource_serializer- Spree::Api::Dependencies.storefront_address_serializer.constantize+ Spree.api.storefront_address_serializerenddef create_service- Spree::Api::Dependencies.storefront_address_create_service.constantize+ Spree.api.storefront_address_create_serviceenddef update_service- Spree::Api::Dependencies.storefront_address_update_service.constantize+ Spree.api.storefront_address_update_serviceenddef address_paramsdiff --git a/api/app/controllers/spree/api/v2/storefront/account/credit_cards_controller.rb b/api/app/controllers/spree/api/v2/storefront/account/credit_cards_controller.rbindex 3aa3cc1735..159678cd3f 100644--- a/api/app/controllers/spree/api/v2/storefront/account/credit_cards_controller.rb+++ b/api/app/controllers/spree/api/v2/storefront/account/credit_cards_controller.rb@@ -30,19 +30,19 @@ module Spreeenddef collection_serializer- Spree::Api::Dependencies.storefront_credit_card_serializer.constantize+ Spree.api.storefront_credit_card_serializerenddef collection_finder- Spree::Api::Dependencies.storefront_credit_card_finder.constantize+ Spree.api.storefront_credit_card_finderenddef resource_serializer- Spree::Api::Dependencies.storefront_credit_card_serializer.constantize+ Spree.api.storefront_credit_card_serializerenddef destroy_service- Spree::Api::Dependencies.storefront_credit_cards_destroy_service.constantize+ Spree.api.storefront_credit_cards_destroy_serviceendendenddiff --git a/api/app/controllers/spree/api/v2/storefront/account/orders_controller.rb b/api/app/controllers/spree/api/v2/storefront/account/orders_controller.rbindex 5119b3b6de..27609c73a8 100644--- a/api/app/controllers/spree/api/v2/storefront/account/orders_controller.rb+++ b/api/app/controllers/spree/api/v2/storefront/account/orders_controller.rb@@ -24,19 +24,19 @@ module Spreeenddef collection_serializer- Spree::Api::Dependencies.storefront_order_serializer.constantize+ Spree.api.storefront_order_serializerenddef resource_serializer- Spree::Api::Dependencies.storefront_order_serializer.constantize+ Spree.api.storefront_order_serializerenddef collection_finder- Spree::Api::Dependencies.storefront_completed_order_finder.constantize+ Spree.api.storefront_completed_order_finderenddef resource_finder- Spree::Api::Dependencies.storefront_completed_order_finder.constantize+ Spree.api.storefront_completed_order_finderenddef model_classdiff --git a/api/app/controllers/spree/api/v2/storefront/account_controller.rb b/api/app/controllers/spree/api/v2/storefront/account_controller.rbindex 498c38c9bf..9225b2a94e 100644--- a/api/app/controllers/spree/api/v2/storefront/account_controller.rb+++ b/api/app/controllers/spree/api/v2/storefront/account_controller.rb@@ -23,7 +23,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.storefront_user_serializer.constantize+ Spree.api.storefront_user_serializerenddef model_class@@ -31,11 +31,11 @@ module Spreeenddef create_service- Spree::Api::Dependencies.storefront_account_create_service.constantize+ Spree.api.storefront_account_create_serviceenddef update_service- Spree::Api::Dependencies.storefront_account_update_service.constantize+ Spree.api.storefront_account_update_serviceenddef user_create_paramsdiff --git a/api/app/controllers/spree/api/v2/storefront/cart_controller.rb b/api/app/controllers/spree/api/v2/storefront/cart_controller.rbindex ff156d033d..008b5c1c79 100644--- a/api/app/controllers/spree/api/v2/storefront/cart_controller.rb+++ b/api/app/controllers/spree/api/v2/storefront/cart_controller.rb@@ -141,7 +141,7 @@ module Spreedef associateguest_order_token = params[:guest_order_token]- guest_order = ::Spree::Api::Dependencies.storefront_current_order_finder.constantize.new.execute(+ guest_order = ::Spree.api.storefront_current_order_finder.new.execute(store: current_store,user: nil,token: guest_order_token,@@ -170,47 +170,47 @@ module Spreeprivatedef resource_serializer- Spree::Api::Dependencies.storefront_cart_serializer.constantize+ Spree.api.storefront_cart_serializerenddef create_service- Spree::Api::Dependencies.storefront_cart_create_service.constantize+ Spree.api.storefront_cart_create_serviceenddef add_item_service- Spree::Api::Dependencies.storefront_cart_add_item_service.constantize+ Spree.api.storefront_cart_add_item_serviceenddef empty_cart_service- Spree::Api::Dependencies.storefront_cart_empty_service.constantize+ Spree.api.storefront_cart_empty_serviceenddef destroy_cart_service- Spree::Api::Dependencies.storefront_cart_destroy_service.constantize+ Spree.api.storefront_cart_destroy_serviceenddef set_item_quantity_service- Spree::Api::Dependencies.storefront_cart_set_item_quantity_service.constantize+ Spree.api.storefront_cart_set_item_quantity_serviceenddef remove_line_item_service- Spree::Api::Dependencies.storefront_cart_remove_line_item_service.constantize+ Spree.api.storefront_cart_remove_line_item_serviceenddef coupon_handler- Spree::Api::Dependencies.storefront_coupon_handler.constantize+ Spree.api.storefront_coupon_handlerenddef estimate_shipping_rates_service- Spree::Api::Dependencies.storefront_cart_estimate_shipping_rates_service.constantize+ Spree.api.storefront_cart_estimate_shipping_rates_serviceenddef associate_service- Spree::Api::Dependencies.storefront_cart_associate_service.constantize+ Spree.api.storefront_cart_associate_serviceenddef change_currency_service- Spree::Api::Dependencies.storefront_cart_change_currency_service.constantize+ Spree.api.storefront_cart_change_currency_serviceenddef line_item@@ -226,7 +226,7 @@ module Spreeenddef estimate_shipping_rates_serializer- Spree::Api::Dependencies.storefront_estimated_shipment_serializer.constantize+ Spree.api.storefront_estimated_shipment_serializerenddef serialize_estimated_shipping_rates(shipping_rates)diff --git a/api/app/controllers/spree/api/v2/storefront/checkout_controller.rb b/api/app/controllers/spree/api/v2/storefront/checkout_controller.rbindex 987cf02bfb..d94e830479 100644--- a/api/app/controllers/spree/api/v2/storefront/checkout_controller.rb+++ b/api/app/controllers/spree/api/v2/storefront/checkout_controller.rb@@ -114,51 +114,51 @@ module Spreeprivatedef resource_serializer- Spree::Api::Dependencies.storefront_cart_serializer.constantize+ Spree.api.storefront_cart_serializerenddef next_service- Spree::Api::Dependencies.storefront_checkout_next_service.constantize+ Spree.api.storefront_checkout_next_serviceenddef advance_service- Spree::Api::Dependencies.storefront_checkout_advance_service.constantize+ Spree.api.storefront_checkout_advance_serviceenddef add_store_credit_service- Spree::Api::Dependencies.storefront_checkout_add_store_credit_service.constantize+ Spree.api.storefront_checkout_add_store_credit_serviceenddef remove_store_credit_service- Spree::Api::Dependencies.storefront_checkout_remove_store_credit_service.constantize+ Spree.api.storefront_checkout_remove_store_credit_serviceenddef complete_service- Spree::Api::Dependencies.storefront_checkout_complete_service.constantize+ Spree.api.storefront_checkout_complete_serviceenddef update_service- Spree::Api::Dependencies.storefront_checkout_update_service.constantize+ Spree.api.storefront_checkout_update_serviceenddef payment_methods_serializer- Spree::Api::Dependencies.storefront_payment_method_serializer.constantize+ Spree.api.storefront_payment_method_serializerenddef shipping_rates_service- Spree::Api::Dependencies.storefront_checkout_get_shipping_rates_service.constantize+ Spree.api.storefront_checkout_get_shipping_rates_serviceenddef shipping_rates_serializer- Spree::Api::Dependencies.storefront_shipment_serializer.constantize+ Spree.api.storefront_shipment_serializerenddef create_payment_service- Spree::Api::Dependencies.storefront_payment_create_service.constantize+ Spree.api.storefront_payment_create_serviceenddef select_shipping_method_service- Spree::Api::Dependencies.storefront_checkout_select_shipping_method_service.constantize+ Spree.api.storefront_checkout_select_shipping_method_serviceenddef serialize_payment_methods(payment_methods)diff --git a/api/app/controllers/spree/api/v2/storefront/countries_controller.rb b/api/app/controllers/spree/api/v2/storefront/countries_controller.rbindex 72a05a1586..7b7b4b0146 100644--- a/api/app/controllers/spree/api/v2/storefront/countries_controller.rb+++ b/api/app/controllers/spree/api/v2/storefront/countries_controller.rb@@ -31,15 +31,15 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.storefront_country_serializer.constantize+ Spree.api.storefront_country_serializerenddef collection_serializer- Spree::Api::Dependencies.storefront_country_serializer.constantize+ Spree.api.storefront_country_serializerenddef collection_finder- Spree::Api::Dependencies.storefront_country_finder.constantize+ Spree.api.storefront_country_finderenddef model_classdiff --git a/api/app/controllers/spree/api/v2/storefront/order_status_controller.rb b/api/app/controllers/spree/api/v2/storefront/order_status_controller.rbindex ec09b5ef1e..c6331cb97a 100644--- a/api/app/controllers/spree/api/v2/storefront/order_status_controller.rb+++ b/api/app/controllers/spree/api/v2/storefront/order_status_controller.rb@@ -17,11 +17,11 @@ module Spreeenddef resource_finder- Spree::Api::Dependencies.storefront_completed_order_finder.constantize+ Spree.api.storefront_completed_order_finderenddef resource_serializer- Spree::Api::Dependencies.storefront_cart_serializer.constantize+ Spree.api.storefront_cart_serializerenddef ensure_order_tokendiff --git a/api/app/controllers/spree/api/v2/storefront/policies_controller.rb b/api/app/controllers/spree/api/v2/storefront/policies_controller.rbindex 4f8644ad37..59f50f274f 100644--- a/api/app/controllers/spree/api/v2/storefront/policies_controller.rb+++ b/api/app/controllers/spree/api/v2/storefront/policies_controller.rb@@ -6,11 +6,11 @@ module Spreeprivatedef collection_serializer- Spree::Api::Dependencies.storefront_policy_serializer.constantize+ Spree.api.storefront_policy_serializerenddef resource_serializer- Spree::Api::Dependencies.storefront_policy_serializer.constantize+ Spree.api.storefront_policy_serializerenddef resourcediff --git a/api/app/controllers/spree/api/v2/storefront/posts_controller.rb b/api/app/controllers/spree/api/v2/storefront/posts_controller.rbindex df58c24e96..d7502f62d6 100644--- a/api/app/controllers/spree/api/v2/storefront/posts_controller.rb+++ b/api/app/controllers/spree/api/v2/storefront/posts_controller.rb@@ -18,11 +18,11 @@ module Spreeenddef collection_finder- Spree::Api::Dependencies.storefront_posts_finder.constantize+ Spree.api.storefront_posts_finderenddef collection_sorter- Spree::Api::Dependencies.storefront_posts_sorter.constantize+ Spree.api.storefront_posts_sorterenddef collection_serializerdiff --git a/api/app/controllers/spree/api/v2/storefront/products_controller.rb b/api/app/controllers/spree/api/v2/storefront/products_controller.rbindex 21bf92cb1d..420ede01d5 100644--- a/api/app/controllers/spree/api/v2/storefront/products_controller.rb+++ b/api/app/controllers/spree/api/v2/storefront/products_controller.rb@@ -28,19 +28,19 @@ module Spreeenddef collection_sorter- Spree::Api::Dependencies.storefront_products_sorter.constantize+ Spree.api.storefront_products_sorterenddef collection_finder- Spree::Api::Dependencies.storefront_products_finder.constantize+ Spree.api.storefront_products_finderenddef collection_serializer- Spree::Api::Dependencies.storefront_product_serializer.constantize+ Spree.api.storefront_product_serializerenddef resource_serializer- Spree::Api::Dependencies.storefront_product_serializer.constantize+ Spree.api.storefront_product_serializerenddef model_classdiff --git a/api/app/controllers/spree/api/v2/storefront/stores_controller.rb b/api/app/controllers/spree/api/v2/storefront/stores_controller.rbindex 6699fee62e..6729fcb5c5 100644--- a/api/app/controllers/spree/api/v2/storefront/stores_controller.rb+++ b/api/app/controllers/spree/api/v2/storefront/stores_controller.rb@@ -18,7 +18,7 @@ module Spreeenddef resource_serializer- Spree::Api::Dependencies.storefront_store_serializer.constantize+ Spree.api.storefront_store_serializerendendenddiff --git a/api/app/controllers/spree/api/v2/storefront/taxons_controller.rb b/api/app/controllers/spree/api/v2/storefront/taxons_controller.rbindex 400c0ef5f4..621d917463 100644--- a/api/app/controllers/spree/api/v2/storefront/taxons_controller.rb+++ b/api/app/controllers/spree/api/v2/storefront/taxons_controller.rb@@ -6,15 +6,15 @@ module Spreeprivatedef collection_serializer- Spree::Api::Dependencies.storefront_taxon_serializer.constantize+ Spree.api.storefront_taxon_serializerenddef resource_serializer- Spree::Api::Dependencies.storefront_taxon_serializer.constantize+ Spree.api.storefront_taxon_serializerenddef collection_finder- Spree::Api::Dependencies.storefront_taxon_finder.constantize+ Spree.api.storefront_taxon_finderenddef paginated_collectiondiff --git a/api/app/controllers/spree/api/v2/storefront/variants_controller.rb b/api/app/controllers/spree/api/v2/storefront/variants_controller.rbindex d9c9eedb2f..e5514145ce 100644--- a/api/app/controllers/spree/api/v2/storefront/variants_controller.rb+++ b/api/app/controllers/spree/api/v2/storefront/variants_controller.rb@@ -19,11 +19,11 @@ module Spreeenddef collection_finder- Spree::Api::Dependencies.storefront_variant_finder.constantize+ Spree.api.storefront_variant_finderenddef collection_serializer- Spree::Api::Dependencies.storefront_variant_serializer.constantize+ Spree.api.storefront_variant_serializerenddef scope_includesdiff --git a/api/app/serializers/concerns/spree/api/v2/public_metafields_concern.rb b/api/app/serializers/concerns/spree/api/v2/public_metafields_concern.rbindex 6988625380..b6916d429f 100644--- a/api/app/serializers/concerns/spree/api/v2/public_metafields_concern.rb+++ b/api/app/serializers/concerns/spree/api/v2/public_metafields_concern.rb@@ -5,7 +5,7 @@ module Spreeextend ActiveSupport::Concernincluded do- has_many :metafields, serializer: Spree::Api::Dependencies.storefront_metafield_serializer.constantize,+ has_many :metafields, serializer: Spree.api.storefront_metafield_serializer,record_type: :metafield,object_method_name: :public_metafieldsenddiff --git a/api/app/serializers/concerns/spree/api/v2/resource_serializer_concern.rb b/api/app/serializers/concerns/spree/api/v2/resource_serializer_concern.rbindex 53ce11e47f..d3ada95fdd 100644--- a/api/app/serializers/concerns/spree/api/v2/resource_serializer_concern.rb+++ b/api/app/serializers/concerns/spree/api/v2/resource_serializer_concern.rb@@ -20,7 +20,7 @@ module Spreemetafield_enabled_resources = Spree::MetafieldDefinition.available_resources || []if metafield_enabled_resources.map(&:name).include?(model_klazz.name) && model_klazz.method_defined?(:metafields)- base.has_many :metafields, serializer: Spree::Api::Dependencies.platform_metafield_serializer.constantize,+ base.has_many :metafields, serializer: Spree.api.platform_metafield_serializer,record_type: :metafield,object_method_name: :metafieldsenddiff --git a/api/app/serializers/spree/api/v2/platform/address_serializer.rb b/api/app/serializers/spree/api/v2/platform/address_serializer.rbindex 059b8e98ae..068cfe8c28 100644--- a/api/app/serializers/spree/api/v2/platform/address_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/address_serializer.rb@@ -5,9 +5,9 @@ module Spreeclass AddressSerializer < BaseSerializerinclude ResourceSerializerConcern- belongs_to :country, serializer: Spree::Api::Dependencies.platform_country_serializer.constantize- belongs_to :state, serializer: Spree::Api::Dependencies.platform_state_serializer.constantize- belongs_to :user, serializer: Spree::Api::Dependencies.platform_user_serializer.constantize+ belongs_to :country, serializer: Spree.api.platform_country_serializer+ belongs_to :state, serializer: Spree.api.platform_state_serializer+ belongs_to :user, serializer: Spree.api.platform_user_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/adjustment_serializer.rb b/api/app/serializers/spree/api/v2/platform/adjustment_serializer.rbindex e89ac979b1..999fc3e1ab 100644--- a/api/app/serializers/spree/api/v2/platform/adjustment_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/adjustment_serializer.rb@@ -5,13 +5,13 @@ module Spreeclass AdjustmentSerializer < BaseSerializerinclude ResourceSerializerConcern- belongs_to :order, serializer: Spree::Api::Dependencies.platform_order_serializer.constantize+ belongs_to :order, serializer: Spree.api.platform_order_serializerbelongs_to :adjustable, polymorphic: truebelongs_to :source, polymorphic: {- Spree::Promotion::Actions::FreeShipping => Spree::Api::Dependencies.platform_promotion_action_serializer.constantize,- Spree::Promotion::Actions::CreateAdjustment => Spree::Api::Dependencies.platform_promotion_action_serializer.constantize,- Spree::Promotion::Actions::CreateItemAdjustments => Spree::Api::Dependencies.platform_promotion_action_serializer.constantize,- Spree::Promotion::Actions::CreateLineItems => Spree::Api::Dependencies.platform_promotion_action_serializer.constantize+ Spree::Promotion::Actions::FreeShipping => Spree.api.platform_promotion_action_serializer,+ Spree::Promotion::Actions::CreateAdjustment => Spree.api.platform_promotion_action_serializer,+ Spree::Promotion::Actions::CreateItemAdjustments => Spree.api.platform_promotion_action_serializer,+ Spree::Promotion::Actions::CreateLineItems => Spree.api.platform_promotion_action_serializer}endenddiff --git a/api/app/serializers/spree/api/v2/platform/classification_serializer.rb b/api/app/serializers/spree/api/v2/platform/classification_serializer.rbindex c384def072..6b7eed2d71 100644--- a/api/app/serializers/spree/api/v2/platform/classification_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/classification_serializer.rb@@ -5,8 +5,8 @@ module Spreeclass ClassificationSerializer < BaseSerializerinclude ResourceSerializerConcern- belongs_to :product, serializer: Spree::Api::Dependencies.platform_product_serializer.constantize- belongs_to :taxon, serializer: Spree::Api::Dependencies.platform_taxon_serializer.constantize+ belongs_to :product, serializer: Spree.api.platform_product_serializer+ belongs_to :taxon, serializer: Spree.api.platform_taxon_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/country_serializer.rb b/api/app/serializers/spree/api/v2/platform/country_serializer.rbindex 59f340e7c9..a14dffc198 100644--- a/api/app/serializers/spree/api/v2/platform/country_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/country_serializer.rb@@ -5,7 +5,7 @@ module Spreeclass CountrySerializer < BaseSerializerinclude ResourceSerializerConcern- has_many :states, serializer: Spree::Api::Dependencies.platform_state_serializer.constantize+ has_many :states, serializer: Spree.api.platform_state_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/credit_card_serializer.rb b/api/app/serializers/spree/api/v2/platform/credit_card_serializer.rbindex 25b9e70302..f506dc5155 100644--- a/api/app/serializers/spree/api/v2/platform/credit_card_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/credit_card_serializer.rb@@ -5,8 +5,8 @@ module Spreeclass CreditCardSerializer < BaseSerializerinclude ResourceSerializerConcern- belongs_to :payment_method, serializer: Spree::Api::Dependencies.platform_payment_method_serializer.constantize- belongs_to :user, serializer: Spree::Api::Dependencies.platform_user_serializer.constantize+ belongs_to :payment_method, serializer: Spree.api.platform_payment_method_serializer+ belongs_to :user, serializer: Spree.api.platform_user_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/customer_return_serializer.rb b/api/app/serializers/spree/api/v2/platform/customer_return_serializer.rbindex 0b3959464b..8fcbf3e7ce 100644--- a/api/app/serializers/spree/api/v2/platform/customer_return_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/customer_return_serializer.rb@@ -5,11 +5,11 @@ module Spreeclass CustomerReturnSerializer < BaseSerializerinclude ResourceSerializerConcern- belongs_to :stock_location, serializer: Spree::Api::Dependencies.platform_stock_location_serializer.constantize+ belongs_to :stock_location, serializer: Spree.api.platform_stock_location_serializer- has_many :reimbursements, serializer: Spree::Api::Dependencies.platform_reimbursement_serializer.constantize- has_many :return_items, serializer: Spree::Api::Dependencies.platform_return_item_serializer.constantize- has_many :return_authorizations, serializer: Spree::Api::Dependencies.platform_return_authorization_serializer.constantize+ has_many :reimbursements, serializer: Spree.api.platform_reimbursement_serializer+ has_many :return_items, serializer: Spree.api.platform_return_item_serializer+ has_many :return_authorizations, serializer: Spree.api.platform_return_authorization_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/digital_link_serializer.rb b/api/app/serializers/spree/api/v2/platform/digital_link_serializer.rbindex 70d9599914..906b3cf462 100644--- a/api/app/serializers/spree/api/v2/platform/digital_link_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/digital_link_serializer.rb@@ -7,8 +7,8 @@ module Spreeattributes :token, :access_counter- belongs_to :digital, serializer: Spree::Api::Dependencies.platform_digital_serializer.constantize- belongs_to :line_item, serializer: Spree::Api::Dependencies.platform_line_item_serializer.constantize+ belongs_to :digital, serializer: Spree.api.platform_digital_serializer+ belongs_to :line_item, serializer: Spree.api.platform_line_item_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/digital_serializer.rb b/api/app/serializers/spree/api/v2/platform/digital_serializer.rbindex 9c11b42b7e..2eb43d8c67 100644--- a/api/app/serializers/spree/api/v2/platform/digital_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/digital_serializer.rb@@ -21,7 +21,7 @@ module Spreedigital.attachment.byte_size.to_iend- belongs_to :variant, serializer: Spree::Api::Dependencies.platform_variant_serializer.constantize+ belongs_to :variant, serializer: Spree.api.platform_variant_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/gift_card_serializer.rb b/api/app/serializers/spree/api/v2/platform/gift_card_serializer.rbindex ae5f1831c9..8d9c454811 100644--- a/api/app/serializers/spree/api/v2/platform/gift_card_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/gift_card_serializer.rb@@ -7,9 +7,9 @@ module Spreeset_type :gift_card- belongs_to :user, serializer: Spree::Api::Dependencies.platform_user_serializer.constantize+ belongs_to :user, serializer: Spree.api.platform_user_serializer- has_many :orders, serializer: Spree::Api::Dependencies.platform_order_serializer.constantize+ has_many :orders, serializer: Spree.api.platform_order_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/inventory_unit_serializer.rb b/api/app/serializers/spree/api/v2/platform/inventory_unit_serializer.rbindex c088f11cd7..e72d66431c 100644--- a/api/app/serializers/spree/api/v2/platform/inventory_unit_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/inventory_unit_serializer.rb@@ -5,13 +5,13 @@ module Spreeclass InventoryUnitSerializer < BaseSerializerinclude ResourceSerializerConcern- belongs_to :order, serializer: Spree::Api::Dependencies.platform_order_serializer.constantize- belongs_to :variant, serializer: Spree::Api::Dependencies.platform_variant_serializer.constantize- belongs_to :shipment, serializer: Spree::Api::Dependencies.platform_shipment_serializer.constantize- has_many :return_items, serializer: Spree::Api::Dependencies.platform_return_item_serializer.constantize- has_many :return_authorizations, serializer: Spree::Api::Dependencies.platform_return_authorization_serializer.constantize- belongs_to :line_item, serializer: Spree::Api::Dependencies.platform_line_item_serializer.constantize- belongs_to :original_return_item, serializer: Spree::Api::Dependencies.platform_return_item_serializer.constantize, type: :return_item+ belongs_to :order, serializer: Spree.api.platform_order_serializer+ belongs_to :variant, serializer: Spree.api.platform_variant_serializer+ belongs_to :shipment, serializer: Spree.api.platform_shipment_serializer+ has_many :return_items, serializer: Spree.api.platform_return_item_serializer+ has_many :return_authorizations, serializer: Spree.api.platform_return_authorization_serializer+ belongs_to :line_item, serializer: Spree.api.platform_line_item_serializer+ belongs_to :original_return_item, serializer: Spree.api.platform_return_item_serializer, type: :return_itemendendenddiff --git a/api/app/serializers/spree/api/v2/platform/line_item_serializer.rb b/api/app/serializers/spree/api/v2/platform/line_item_serializer.rbindex 2542449b31..b2fd895dc4 100644--- a/api/app/serializers/spree/api/v2/platform/line_item_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/line_item_serializer.rb@@ -5,13 +5,13 @@ module Spreeclass LineItemSerializer < BaseSerializerinclude ResourceSerializerConcern- belongs_to :order, serializer: Spree::Api::Dependencies.platform_order_serializer.constantize- belongs_to :tax_category, serializer: Spree::Api::Dependencies.platform_tax_category_serializer.constantize- belongs_to :variant, serializer: Spree::Api::Dependencies.platform_variant_serializer.constantize+ belongs_to :order, serializer: Spree.api.platform_order_serializer+ belongs_to :tax_category, serializer: Spree.api.platform_tax_category_serializer+ belongs_to :variant, serializer: Spree.api.platform_variant_serializer- has_many :adjustments, serializer: Spree::Api::Dependencies.platform_adjustment_serializer.constantize- has_many :inventory_units, serializer: Spree::Api::Dependencies.platform_inventory_unit_serializer.constantize- has_many :digital_links, serializer: Spree::Api::Dependencies.platform_digital_link_serializer.constantize+ has_many :adjustments, serializer: Spree.api.platform_adjustment_serializer+ has_many :inventory_units, serializer: Spree.api.platform_inventory_unit_serializer+ has_many :digital_links, serializer: Spree.api.platform_digital_link_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/option_type_serializer.rb b/api/app/serializers/spree/api/v2/platform/option_type_serializer.rbindex 10d83bc895..9f2e397f8c 100644--- a/api/app/serializers/spree/api/v2/platform/option_type_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/option_type_serializer.rb@@ -5,7 +5,7 @@ module Spreeclass OptionTypeSerializer < BaseSerializerinclude ResourceSerializerConcern- has_many :option_values, serializer: Spree::Api::Dependencies.platform_option_value_serializer.constantize+ has_many :option_values, serializer: Spree.api.platform_option_value_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/option_value_serializer.rb b/api/app/serializers/spree/api/v2/platform/option_value_serializer.rbindex fb97ab879b..bc1b083593 100644--- a/api/app/serializers/spree/api/v2/platform/option_value_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/option_value_serializer.rb@@ -5,7 +5,7 @@ module Spreeclass OptionValueSerializer < BaseSerializerinclude ResourceSerializerConcern- belongs_to :option_type, serializer: Spree::Api::Dependencies.platform_option_type_serializer.constantize+ belongs_to :option_type, serializer: Spree.api.platform_option_type_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/order_promotion_serializer.rb b/api/app/serializers/spree/api/v2/platform/order_promotion_serializer.rbindex 4ee6bacf34..421eb2b26b 100644--- a/api/app/serializers/spree/api/v2/platform/order_promotion_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/order_promotion_serializer.rb@@ -5,8 +5,8 @@ module Spreeclass OrderPromotionSerializer < BaseSerializerinclude ResourceSerializerConcern- belongs_to :order, serializer: Spree::Api::Dependencies.platform_order_serializer.constantize- belongs_to :promotion, serializer: Spree::Api::Dependencies.platform_promotion_serializer.constantize+ belongs_to :order, serializer: Spree.api.platform_order_serializer+ belongs_to :promotion, serializer: Spree.api.platform_promotion_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/order_serializer.rb b/api/app/serializers/spree/api/v2/platform/order_serializer.rbindex 8c682d6ede..5cd09bceca 100644--- a/api/app/serializers/spree/api/v2/platform/order_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/order_serializer.rb@@ -5,25 +5,25 @@ module Spreeclass OrderSerializer < BaseSerializerinclude ResourceSerializerConcern- belongs_to :user, serializer: Spree::Api::Dependencies.platform_user_serializer.constantize- belongs_to :created_by, serializer: Spree::Api::Dependencies.platform_admin_user_serializer.constantize- belongs_to :approver, serializer: Spree::Api::Dependencies.platform_admin_user_serializer.constantize- belongs_to :canceler, serializer: Spree::Api::Dependencies.platform_admin_user_serializer.constantize+ belongs_to :user, serializer: Spree.api.platform_user_serializer+ belongs_to :created_by, serializer: Spree.api.platform_admin_user_serializer+ belongs_to :approver, serializer: Spree.api.platform_admin_user_serializer+ belongs_to :canceler, serializer: Spree.api.platform_admin_user_serializer- belongs_to :bill_address, serializer: Spree::Api::Dependencies.platform_address_serializer.constantize- belongs_to :ship_address, serializer: Spree::Api::Dependencies.platform_address_serializer.constantize+ belongs_to :bill_address, serializer: Spree.api.platform_address_serializer+ belongs_to :ship_address, serializer: Spree.api.platform_address_serializer- has_many :line_items, serializer: Spree::Api::Dependencies.platform_line_item_serializer.constantize- has_many :payments, serializer: Spree::Api::Dependencies.platform_payment_serializer.constantize- has_many :shipments, serializer: Spree::Api::Dependencies.platform_shipment_serializer.constantize+ has_many :line_items, serializer: Spree.api.platform_line_item_serializer+ has_many :payments, serializer: Spree.api.platform_payment_serializer+ has_many :shipments, serializer: Spree.api.platform_shipment_serializer- has_many :state_changes, serializer: Spree::Api::Dependencies.platform_state_change_serializer.constantize- has_many :return_authorizations, serializer: Spree::Api::Dependencies.platform_return_authorization_serializer.constantize- has_many :reimbursements, serializer: Spree::Api::Dependencies.platform_reimbursement_serializer.constantize- has_many :adjustments, serializer: Spree::Api::Dependencies.platform_adjustment_serializer.constantize- has_many :all_adjustments, serializer: Spree::Api::Dependencies.platform_adjustment_serializer.constantize, type: :adjustment+ has_many :state_changes, serializer: Spree.api.platform_state_change_serializer+ has_many :return_authorizations, serializer: Spree.api.platform_return_authorization_serializer+ has_many :reimbursements, serializer: Spree.api.platform_reimbursement_serializer+ has_many :adjustments, serializer: Spree.api.platform_adjustment_serializer+ has_many :all_adjustments, serializer: Spree.api.platform_adjustment_serializer, type: :adjustment- has_many :order_promotions, serializer: Spree::Api::Dependencies.platform_order_promotion_serializer.constantize+ has_many :order_promotions, serializer: Spree.api.platform_order_promotion_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/payment_capture_event_serializer.rb b/api/app/serializers/spree/api/v2/platform/payment_capture_event_serializer.rbindex c8585f7eb3..572bb19ce3 100644--- a/api/app/serializers/spree/api/v2/platform/payment_capture_event_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/payment_capture_event_serializer.rb@@ -5,7 +5,7 @@ module Spreeclass PaymentCaptureEventSerializer < BaseSerializerinclude ResourceSerializerConcern- belongs_to :payment, serializer: Spree::Api::Dependencies.platform_payment_serializer.constantize+ belongs_to :payment, serializer: Spree.api.platform_payment_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/payment_method_serializer.rb b/api/app/serializers/spree/api/v2/platform/payment_method_serializer.rbindex f88b278f2d..8f74010cf1 100644--- a/api/app/serializers/spree/api/v2/platform/payment_method_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/payment_method_serializer.rb@@ -10,7 +10,7 @@ module Spreepayment_method.preferencesend- has_many :stores, serializer: Spree::Api::Dependencies.platform_store_serializer.constantize+ has_many :stores, serializer: Spree.api.platform_store_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/payment_serializer.rb b/api/app/serializers/spree/api/v2/platform/payment_serializer.rbindex c5873f4920..5e1bd1477d 100644--- a/api/app/serializers/spree/api/v2/platform/payment_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/payment_serializer.rb@@ -5,16 +5,16 @@ module Spreeclass PaymentSerializer < BaseSerializerinclude ResourceSerializerConcern- belongs_to :order, serializer: Spree::Api::Dependencies.platform_order_serializer.constantize- belongs_to :payment_method, serializer: Spree::Api::Dependencies.platform_payment_method_serializer.constantize- belongs_to :source, polymorphic: true, serializer: Spree::Api::Dependencies.platform_payment_source_serializer.constantize+ belongs_to :order, serializer: Spree.api.platform_order_serializer+ belongs_to :payment_method, serializer: Spree.api.platform_payment_method_serializer+ belongs_to :source, polymorphic: true, serializer: Spree.api.platform_payment_source_serializer- has_many :log_entries, serializer: Spree::Api::Dependencies.platform_log_entry_serializer.constantize- has_many :state_changes, serializer: Spree::Api::Dependencies.platform_state_change_serializer.constantize+ has_many :log_entries, serializer: Spree.api.platform_log_entry_serializer+ has_many :state_changes, serializer: Spree.api.platform_state_change_serializerhas_many :payment_capture_events, object_method_name: :capture_events,id_method_name: :capture_event_ids,- serializer: Spree::Api::Dependencies.platform_payment_capture_event_serializer.constantize- has_many :refunds, serializer: Spree::Api::Dependencies.platform_refund_serializer.constantize+ serializer: Spree.api.platform_payment_capture_event_serializer+ has_many :refunds, serializer: Spree.api.platform_refund_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/payment_source_serializer.rb b/api/app/serializers/spree/api/v2/platform/payment_source_serializer.rbindex beded3869d..b8a29cfefc 100644--- a/api/app/serializers/spree/api/v2/platform/payment_source_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/payment_source_serializer.rb@@ -3,8 +3,8 @@ module Spreemodule V2module Platformclass PaymentSourceSerializer < BaseSerializer- belongs_to :payment_method, serializer: Spree::Api::Dependencies.platform_payment_method_serializer.constantize- belongs_to :user, serializer: Spree::Api::Dependencies.platform_user_serializer.constantize+ belongs_to :payment_method, serializer: Spree.api.platform_payment_method_serializer+ belongs_to :user, serializer: Spree.api.platform_user_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/product_serializer.rb b/api/app/serializers/spree/api/v2/platform/product_serializer.rbindex 608c222abe..a91958dbb1 100644--- a/api/app/serializers/spree/api/v2/platform/product_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/product_serializer.rb@@ -42,24 +42,24 @@ module Spreedisplay_compare_at_price(product, params[:currency])end- belongs_to :tax_category, serializer: Spree::Api::Dependencies.platform_tax_category_serializer.constantize+ belongs_to :tax_category, serializer: Spree.api.platform_tax_category_serializerhas_one :primary_variant,object_method_name: :master,id_method_name: :master_id,record_type: :variant,- serializer: Spree::Api::Dependencies.platform_variant_serializer.constantize+ serializer: Spree.api.platform_variant_serializerhas_one :default_variant,object_method_name: :default_variant,id_method_name: :default_variant_id,record_type: :variant,- serializer: Spree::Api::Dependencies.platform_variant_serializer.constantize+ serializer: Spree.api.platform_variant_serializer- has_many :variants, serializer: Spree::Api::Dependencies.platform_variant_serializer.constantize- has_many :option_types, serializer: Spree::Api::Dependencies.platform_option_type_serializer.constantize- has_many :product_properties, serializer: Spree::Api::Dependencies.platform_product_property_serializer.constantize- has_many :taxons, serializer: Spree::Api::Dependencies.platform_taxon_serializer.constantize, record_type: :taxon do |object, params|+ has_many :variants, serializer: Spree.api.platform_variant_serializer+ has_many :option_types, serializer: Spree.api.platform_option_type_serializer+ has_many :product_properties, serializer: Spree.api.platform_product_property_serializer+ has_many :taxons, serializer: Spree.api.platform_taxon_serializer, record_type: :taxon do |object, params|if params[:store].present?object.taxons_for_store(params[:store])else@@ -71,7 +71,7 @@ module Spreeobject_method_name: :variant_images,id_method_name: :variant_image_ids,record_type: :image,- serializer: Spree::Api::Dependencies.platform_image_serializer.constantize+ serializer: Spree.api.platform_image_serializer# TODO: add stock items# TODO: add pricesdiff --git a/api/app/serializers/spree/api/v2/platform/promotion_action_line_item_serializer.rb b/api/app/serializers/spree/api/v2/platform/promotion_action_line_item_serializer.rbindex 642801d1d5..42d9ba915c 100644--- a/api/app/serializers/spree/api/v2/platform/promotion_action_line_item_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/promotion_action_line_item_serializer.rb@@ -5,8 +5,8 @@ module Spreeclass PromotionActionLineItemSerializer < BaseSerializerinclude ResourceSerializerConcern- belongs_to :promotion_action, serializer: Spree::Api::Dependencies.platform_promotion_action_serializer.constantize- belongs_to :variant, serializer: Spree::Api::Dependencies.platform_variant_serializer.constantize+ belongs_to :promotion_action, serializer: Spree.api.platform_promotion_action_serializer+ belongs_to :variant, serializer: Spree.api.platform_variant_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/promotion_action_serializer.rb b/api/app/serializers/spree/api/v2/platform/promotion_action_serializer.rbindex 4421520ee8..d6a3e4d0c8 100644--- a/api/app/serializers/spree/api/v2/platform/promotion_action_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/promotion_action_serializer.rb@@ -5,13 +5,13 @@ module Spreeclass PromotionActionSerializer < BaseSerializerinclude ResourceSerializerConcern- belongs_to :promotion, serializer: Spree::Api::Dependencies.platform_promotion_serializer.constantize+ belongs_to :promotion, serializer: Spree.api.platform_promotion_serializer# Some promotion actions have a :calculator, while others do not.- has_one :calculator, serializer: Spree::Api::Dependencies.platform_calculator_serializer.constantize, if: proc { |record| record.respond_to?(:calculator) }+ has_one :calculator, serializer: Spree.api.platform_calculator_serializer, if: proc { |record| record.respond_to?(:calculator) }# Only the CreateLineItems promotion action uses :promotion_action_line_items.- has_many :promotion_action_line_items, serializer: Spree::Api::Dependencies.platform_promotion_action_line_item_serializer.constantize, if: proc { |record| record.respond_to?(:promotion_action_line_items) }+ has_many :promotion_action_line_items, serializer: Spree.api.platform_promotion_action_line_item_serializer, if: proc { |record| record.respond_to?(:promotion_action_line_items) }endendenddiff --git a/api/app/serializers/spree/api/v2/platform/promotion_category_serializer.rb b/api/app/serializers/spree/api/v2/platform/promotion_category_serializer.rbindex 9a27b24c1d..30b5778f4f 100644--- a/api/app/serializers/spree/api/v2/platform/promotion_category_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/promotion_category_serializer.rb@@ -5,7 +5,7 @@ module Spreeclass PromotionCategorySerializer < BaseSerializerinclude ResourceSerializerConcern- has_many :promotions, serializer: Spree::Api::Dependencies.platform_promotion_serializer.constantize+ has_many :promotions, serializer: Spree.api.platform_promotion_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/promotion_rule_serializer.rb b/api/app/serializers/spree/api/v2/platform/promotion_rule_serializer.rbindex b221ec6bdc..b43ea6a0a3 100644--- a/api/app/serializers/spree/api/v2/platform/promotion_rule_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/promotion_rule_serializer.rb@@ -9,11 +9,11 @@ module Spreepromotion_rule.preferencesend- belongs_to :promotion, serializer: Spree::Api::Dependencies.platform_promotion_serializer.constantize+ belongs_to :promotion, serializer: Spree.api.platform_promotion_serializer- has_many :products, through: :product_promotion_rules, serializer: Spree::Api::Dependencies.platform_product_serializer.constantize, if: proc { |record| record.respond_to?(:product_promotion_rules) }- has_many :users, through: :promotion_rule_users, serializer: Spree::Api::Dependencies.platform_user_serializer.constantize, if: proc { |record| record.respond_to?(:promotion_rule_users) }- has_many :taxons, through: :promotion_rule_taxons, serializer: Spree::Api::Dependencies.platform_taxon_serializer.constantize, if: proc { |record| record.respond_to?(:promotion_rule_taxons) }+ has_many :products, through: :product_promotion_rules, serializer: Spree.api.platform_product_serializer, if: proc { |record| record.respond_to?(:product_promotion_rules) }+ has_many :users, through: :promotion_rule_users, serializer: Spree.api.platform_user_serializer, if: proc { |record| record.respond_to?(:promotion_rule_users) }+ has_many :taxons, through: :promotion_rule_taxons, serializer: Spree.api.platform_taxon_serializer, if: proc { |record| record.respond_to?(:promotion_rule_taxons) }endendenddiff --git a/api/app/serializers/spree/api/v2/platform/promotion_serializer.rb b/api/app/serializers/spree/api/v2/platform/promotion_serializer.rbindex 8632397fc0..a89934ef38 100644--- a/api/app/serializers/spree/api/v2/platform/promotion_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/promotion_serializer.rb@@ -5,11 +5,11 @@ module Spreeclass PromotionSerializer < BaseSerializerinclude ResourceSerializerConcern- belongs_to :promotion_category, serializer: Spree::Api::Dependencies.platform_promotion_category_serializer.constantize+ belongs_to :promotion_category, serializer: Spree.api.platform_promotion_category_serializer- has_many :promotion_rules, serializer: Spree::Api::Dependencies.platform_promotion_rule_serializer.constantize- has_many :promotion_actions, serializer: Spree::Api::Dependencies.platform_promotion_action_serializer.constantize- has_many :stores, serializer: Spree::Api::Dependencies.platform_store_serializer.constantize+ has_many :promotion_rules, serializer: Spree.api.platform_promotion_rule_serializer+ has_many :promotion_actions, serializer: Spree.api.platform_promotion_action_serializer+ has_many :stores, serializer: Spree.api.platform_store_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/prototype_serializer.rb b/api/app/serializers/spree/api/v2/platform/prototype_serializer.rbindex c72bdfc002..19a0e0c586 100644--- a/api/app/serializers/spree/api/v2/platform/prototype_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/prototype_serializer.rb@@ -5,9 +5,9 @@ module Spreeclass PrototypeSerializer < BaseSerializerinclude ResourceSerializerConcern- has_many :properties, serializer: Spree::Api::Dependencies.platform_property_serializer.constantize- has_many :option_types, serializer: Spree::Api::Dependencies.platform_option_type_serializer.constantize- has_many :taxons, serializer: Spree::Api::Dependencies.platform_taxon_serializer.constantize+ has_many :properties, serializer: Spree.api.platform_property_serializer+ has_many :option_types, serializer: Spree.api.platform_option_type_serializer+ has_many :taxons, serializer: Spree.api.platform_taxon_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/refund_serializer.rb b/api/app/serializers/spree/api/v2/platform/refund_serializer.rbindex 79d67bbbbd..ac442fad73 100644--- a/api/app/serializers/spree/api/v2/platform/refund_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/refund_serializer.rb@@ -5,11 +5,11 @@ module Spreeclass RefundSerializer < BaseSerializerinclude ResourceSerializerConcern- belongs_to :refunder, serializer: Spree::Api::Dependencies.platform_admin_user_serializer.constantize- belongs_to :payment, serializer: Spree::Api::Dependencies.platform_payment_serializer.constantize- belongs_to :reimbursement, serializer: Spree::Api::Dependencies.platform_reimbursement_serializer.constantize- belongs_to :refund_reason, object_method_name: :reason, serializer: Spree::Api::Dependencies.platform_refund_reason_serializer.constantize- has_many :log_entries, serializer: Spree::Api::Dependencies.platform_log_entry_serializer.constantize+ belongs_to :refunder, serializer: Spree.api.platform_admin_user_serializer+ belongs_to :payment, serializer: Spree.api.platform_payment_serializer+ belongs_to :reimbursement, serializer: Spree.api.platform_reimbursement_serializer+ belongs_to :refund_reason, object_method_name: :reason, serializer: Spree.api.platform_refund_reason_serializer+ has_many :log_entries, serializer: Spree.api.platform_log_entry_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/reimbursement_serializer.rb b/api/app/serializers/spree/api/v2/platform/reimbursement_serializer.rbindex 4888dae247..2cd095b949 100644--- a/api/app/serializers/spree/api/v2/platform/reimbursement_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/reimbursement_serializer.rb@@ -5,13 +5,13 @@ module Spreeclass ReimbursementSerializer < BaseSerializerinclude ResourceSerializerConcern- belongs_to :order, serializer: Spree::Api::Dependencies.platform_order_serializer.constantize- belongs_to :customer_return, serializer: Spree::Api::Dependencies.platform_customer_return_serializer.constantize- belongs_to :performed_by, serializer: Spree::Api::Dependencies.platform_admin_user_serializer.constantize+ belongs_to :order, serializer: Spree.api.platform_order_serializer+ belongs_to :customer_return, serializer: Spree.api.platform_customer_return_serializer+ belongs_to :performed_by, serializer: Spree.api.platform_admin_user_serializer- has_many :refunds, serializer: Spree::Api::Dependencies.platform_refund_serializer.constantize- has_many :reimbursement_credits, object_method_name: :credits, id_method_name: :credit_ids, serializer: Spree::Api::Dependencies.platform_reimbursement_credit_serializer.constantize- has_many :return_items, serializer: Spree::Api::Dependencies.platform_return_item_serializer.constantize+ has_many :refunds, serializer: Spree.api.platform_refund_serializer+ has_many :reimbursement_credits, object_method_name: :credits, id_method_name: :credit_ids, serializer: Spree.api.platform_reimbursement_credit_serializer+ has_many :return_items, serializer: Spree.api.platform_return_item_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/return_authorization_serializer.rb b/api/app/serializers/spree/api/v2/platform/return_authorization_serializer.rbindex 8ae9e80d77..fcdbcfcbf1 100644--- a/api/app/serializers/spree/api/v2/platform/return_authorization_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/return_authorization_serializer.rb@@ -5,11 +5,11 @@ module Spreeclass ReturnAuthorizationSerializer < BaseSerializerinclude ResourceSerializerConcern- belongs_to :order, serializer: Spree::Api::Dependencies.platform_order_serializer.constantize- belongs_to :stock_location, serializer: Spree::Api::Dependencies.platform_stock_location_serializer.constantize- belongs_to :return_authorization_reason, object_method_name: :reason, serializer: Spree::Api::Dependencies.platform_return_authorization_reason_serializer.constantize+ belongs_to :order, serializer: Spree.api.platform_order_serializer+ belongs_to :stock_location, serializer: Spree.api.platform_stock_location_serializer+ belongs_to :return_authorization_reason, object_method_name: :reason, serializer: Spree.api.platform_return_authorization_reason_serializer- has_many :return_items, serializer: Spree::Api::Dependencies.platform_return_item_serializer.constantize+ has_many :return_items, serializer: Spree.api.platform_return_item_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/return_item_serializer.rb b/api/app/serializers/spree/api/v2/platform/return_item_serializer.rbindex 91530d353d..260490f531 100644--- a/api/app/serializers/spree/api/v2/platform/return_item_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/return_item_serializer.rb@@ -5,10 +5,10 @@ module Spreeclass ReturnItemSerializer < BaseSerializerinclude ResourceSerializerConcern- has_many :exchange_inventory_units, serializer: Spree::Api::Dependencies.platform_inventory_unit_serializer.constantize, type: :inventory_unit- belongs_to :exchange_variant, serializer: Spree::Api::Dependencies.platform_variant_serializer.constantize, type: :variant- belongs_to :preferred_reimbursement_type, serializer: Spree::Api::Dependencies.platform_reimbursement_type_serializer.constantize, type: :reimbursement_type- belongs_to :override_reimbursement_type, serializer: Spree::Api::Dependencies.platform_reimbursement_type_serializer.constantize, type: :reimbursement_type+ has_many :exchange_inventory_units, serializer: Spree.api.platform_inventory_unit_serializer, type: :inventory_unit+ belongs_to :exchange_variant, serializer: Spree.api.platform_variant_serializer, type: :variant+ belongs_to :preferred_reimbursement_type, serializer: Spree.api.platform_reimbursement_type_serializer, type: :reimbursement_type+ belongs_to :override_reimbursement_type, serializer: Spree.api.platform_reimbursement_type_serializer, type: :reimbursement_typeendendenddiff --git a/api/app/serializers/spree/api/v2/platform/shipment_serializer.rb b/api/app/serializers/spree/api/v2/platform/shipment_serializer.rbindex 3206d71373..7e83090c03 100644--- a/api/app/serializers/spree/api/v2/platform/shipment_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/shipment_serializer.rb@@ -7,14 +7,14 @@ module Spreeattribute :tracking_url- belongs_to :order, serializer: Spree::Api::Dependencies.platform_order_serializer.constantize- belongs_to :address, serializer: Spree::Api::Dependencies.platform_address_serializer.constantize- belongs_to :stock_location, serializer: Spree::Api::Dependencies.platform_stock_location_serializer.constantize- has_many :adjustments, serializer: Spree::Api::Dependencies.platform_adjustment_serializer.constantize- has_many :inventory_units, serializer: Spree::Api::Dependencies.platform_inventory_unit_serializer.constantize- has_many :shipping_rates, serializer: Spree::Api::Dependencies.platform_shipping_rate_serializer.constantize- has_many :state_changes, serializer: Spree::Api::Dependencies.platform_state_change_serializer.constantize- has_one :selected_shipping_rate, serializer: Spree::Api::Dependencies.platform_shipping_rate_serializer.constantize, type: :shipping_rate+ belongs_to :order, serializer: Spree.api.platform_order_serializer+ belongs_to :address, serializer: Spree.api.platform_address_serializer+ belongs_to :stock_location, serializer: Spree.api.platform_stock_location_serializer+ has_many :adjustments, serializer: Spree.api.platform_adjustment_serializer+ has_many :inventory_units, serializer: Spree.api.platform_inventory_unit_serializer+ has_many :shipping_rates, serializer: Spree.api.platform_shipping_rate_serializer+ has_many :state_changes, serializer: Spree.api.platform_state_change_serializer+ has_one :selected_shipping_rate, serializer: Spree.api.platform_shipping_rate_serializer, type: :shipping_rateendendenddiff --git a/api/app/serializers/spree/api/v2/platform/shipping_method_serializer.rb b/api/app/serializers/spree/api/v2/platform/shipping_method_serializer.rbindex 2ab39575b0..fc58f0c331 100644--- a/api/app/serializers/spree/api/v2/platform/shipping_method_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/shipping_method_serializer.rb@@ -5,10 +5,10 @@ module Spreeclass ShippingMethodSerializer < BaseSerializerattributes :name, :code, :admin_name, :display_on, :tracking_url, :created_at, :updated_at, :deleted_at, :public_metadata, :private_metadata- has_many :shipping_categories, serializer: Spree::Api::Dependencies.platform_shipping_category_serializer.constantize- has_many :shipping_rates, serializer: Spree::Api::Dependencies.platform_shipping_rate_serializer.constantize- belongs_to :tax_category, serializer: Spree::Api::Dependencies.platform_tax_category_serializer.constantize- has_one :calculator, serializer: Spree::Api::Dependencies.platform_calculator_serializer.constantize+ has_many :shipping_categories, serializer: Spree.api.platform_shipping_category_serializer+ has_many :shipping_rates, serializer: Spree.api.platform_shipping_rate_serializer+ belongs_to :tax_category, serializer: Spree.api.platform_tax_category_serializer+ has_one :calculator, serializer: Spree.api.platform_calculator_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/shipping_rate_serializer.rb b/api/app/serializers/spree/api/v2/platform/shipping_rate_serializer.rbindex 7d7379797d..1045010e54 100644--- a/api/app/serializers/spree/api/v2/platform/shipping_rate_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/shipping_rate_serializer.rb@@ -5,9 +5,9 @@ module Spreeclass ShippingRateSerializer < BaseSerializerinclude ResourceSerializerConcern- belongs_to :shipment, serializer: Spree::Api::Dependencies.platform_shipment_serializer.constantize- belongs_to :tax_rate, serializer: Spree::Api::Dependencies.platform_tax_rate_serializer.constantize- belongs_to :shipping_method, serializer: Spree::Api::Dependencies.platform_shipping_method_serializer.constantize+ belongs_to :shipment, serializer: Spree.api.platform_shipment_serializer+ belongs_to :tax_rate, serializer: Spree.api.platform_tax_rate_serializer+ belongs_to :shipping_method, serializer: Spree.api.platform_shipping_method_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/state_change_serializer.rb b/api/app/serializers/spree/api/v2/platform/state_change_serializer.rbindex 9015afb971..317eedcdbe 100644--- a/api/app/serializers/spree/api/v2/platform/state_change_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/state_change_serializer.rb@@ -5,7 +5,7 @@ module Spreeclass StateChangeSerializer < BaseSerializerinclude ResourceSerializerConcern- belongs_to :user, serializer: Spree::Api::Dependencies.platform_user_serializer.constantize+ belongs_to :user, serializer: Spree.api.platform_user_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/state_serializer.rb b/api/app/serializers/spree/api/v2/platform/state_serializer.rbindex 01c3c00a38..9fd037d399 100644--- a/api/app/serializers/spree/api/v2/platform/state_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/state_serializer.rb@@ -5,7 +5,7 @@ module Spreeclass StateSerializer < BaseSerializerinclude ResourceSerializerConcern- belongs_to :country, serializer: Spree::Api::Dependencies.platform_country_serializer.constantize+ belongs_to :country, serializer: Spree.api.platform_country_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/stock_item_serializer.rb b/api/app/serializers/spree/api/v2/platform/stock_item_serializer.rbindex 3effed90b8..d400b9a5d6 100644--- a/api/app/serializers/spree/api/v2/platform/stock_item_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/stock_item_serializer.rb@@ -9,8 +9,8 @@ module Spreestock_item.available?end- belongs_to :stock_location, serializer: Spree::Api::Dependencies.platform_stock_location_serializer.constantize- belongs_to :variant, serializer: Spree::Api::Dependencies.platform_variant_serializer.constantize+ belongs_to :stock_location, serializer: Spree.api.platform_stock_location_serializer+ belongs_to :variant, serializer: Spree.api.platform_variant_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/stock_location_serializer.rb b/api/app/serializers/spree/api/v2/platform/stock_location_serializer.rbindex b94ffa345f..94ae3dc40b 100644--- a/api/app/serializers/spree/api/v2/platform/stock_location_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/stock_location_serializer.rb@@ -6,7 +6,7 @@ module Spreeinclude ResourceSerializerConcernattributes :name- belongs_to :country, serializer: Spree::Api::Dependencies.platform_country_serializer.constantize+ belongs_to :country, serializer: Spree.api.platform_country_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/stock_transfer_serializer.rb b/api/app/serializers/spree/api/v2/platform/stock_transfer_serializer.rbindex cf713c6039..5efb6fa021 100644--- a/api/app/serializers/spree/api/v2/platform/stock_transfer_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/stock_transfer_serializer.rb@@ -5,9 +5,9 @@ module Spreeclass StockTransferSerializer < BaseSerializerinclude ResourceSerializerConcern- belongs_to :destination_location, serializer: Spree::Api::Dependencies.platform_stock_location_serializer.constantize- belongs_to :source_location, serializer: Spree::Api::Dependencies.platform_stock_location_serializer.constantize- has_many :stock_movements, serializer: Spree::Api::Dependencies.platform_stock_movement_serializer.constantize+ belongs_to :destination_location, serializer: Spree.api.platform_stock_location_serializer+ belongs_to :source_location, serializer: Spree.api.platform_stock_location_serializer+ has_many :stock_movements, serializer: Spree.api.platform_stock_movement_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/store_credit_event_serializer.rb b/api/app/serializers/spree/api/v2/platform/store_credit_event_serializer.rbindex d8261a3e6d..6fc0736c18 100644--- a/api/app/serializers/spree/api/v2/platform/store_credit_event_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/store_credit_event_serializer.rb@@ -5,7 +5,7 @@ module Spreeclass StoreCreditEventSerializer < BaseSerializerinclude ResourceSerializerConcern- belongs_to :store_credit, serializer: Spree::Api::Dependencies.platform_store_credit_serializer.constantize+ belongs_to :store_credit, serializer: Spree.api.platform_store_credit_serializerbelongs_to :originator, polymorphic: trueendenddiff --git a/api/app/serializers/spree/api/v2/platform/store_credit_serializer.rb b/api/app/serializers/spree/api/v2/platform/store_credit_serializer.rbindex 7f440400b6..e39a4a7a69 100644--- a/api/app/serializers/spree/api/v2/platform/store_credit_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/store_credit_serializer.rb@@ -5,12 +5,12 @@ module Spreeclass StoreCreditSerializer < BaseSerializerinclude ResourceSerializerConcern- belongs_to :user, serializer: Spree::Api::Dependencies.platform_user_serializer.constantize- belongs_to :created_by, serializer: Spree::Api::Dependencies.platform_admin_user_serializer.constantize- belongs_to :store_credit_category, object_method_name: :category, id_method_name: :category_id, serializer: Spree::Api::Dependencies.platform_store_credit_category_serializer.constantize- belongs_to :store_credit_type, object_method_name: :credit_type, id_method_name: :type_id, serializer: Spree::Api::Dependencies.platform_store_credit_type_serializer.constantize+ belongs_to :user, serializer: Spree.api.platform_user_serializer+ belongs_to :created_by, serializer: Spree.api.platform_admin_user_serializer+ belongs_to :store_credit_category, object_method_name: :category, id_method_name: :category_id, serializer: Spree.api.platform_store_credit_category_serializer+ belongs_to :store_credit_type, object_method_name: :credit_type, id_method_name: :type_id, serializer: Spree.api.platform_store_credit_type_serializer- has_many :store_credit_events, serializer: Spree::Api::Dependencies.platform_store_credit_event_serializer.constantize+ has_many :store_credit_events, serializer: Spree.api.platform_store_credit_event_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/store_serializer.rb b/api/app/serializers/spree/api/v2/platform/store_serializer.rbindex 6c10d17651..c7cbc70da7 100644--- a/api/app/serializers/spree/api/v2/platform/store_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/store_serializer.rb@@ -6,7 +6,7 @@ module Spreeinclude ResourceSerializerConcerninclude StoreMediaSerializerImagesConcern- has_one :default_country, serializer: Spree::Api::Dependencies.platform_country_serializer.constantize, record_type: :country, id_method_name: :default_country_id+ has_one :default_country, serializer: Spree.api.platform_country_serializer, record_type: :country, id_method_name: :default_country_idendendenddiff --git a/api/app/serializers/spree/api/v2/platform/tax_category_serializer.rb b/api/app/serializers/spree/api/v2/platform/tax_category_serializer.rbindex 6c7317b759..42fcb75830 100644--- a/api/app/serializers/spree/api/v2/platform/tax_category_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/tax_category_serializer.rb@@ -5,7 +5,7 @@ module Spreeclass TaxCategorySerializer < BaseSerializerinclude ResourceSerializerConcern- has_many :tax_rates, serializer: Spree::Api::Dependencies.platform_tax_rate_serializer.constantize+ has_many :tax_rates, serializer: Spree.api.platform_tax_rate_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/tax_rate_serializer.rb b/api/app/serializers/spree/api/v2/platform/tax_rate_serializer.rbindex ba8048dd8f..a9640349ce 100644--- a/api/app/serializers/spree/api/v2/platform/tax_rate_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/tax_rate_serializer.rb@@ -5,8 +5,8 @@ module Spreeclass TaxRateSerializer < BaseSerializerinclude ResourceSerializerConcern- belongs_to :zone, serializer: Spree::Api::Dependencies.platform_zone_serializer.constantize- belongs_to :tax_category, serializer: Spree::Api::Dependencies.platform_tax_category_serializer.constantize+ belongs_to :zone, serializer: Spree.api.platform_zone_serializer+ belongs_to :tax_category, serializer: Spree.api.platform_tax_category_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/taxon_serializer.rb b/api/app/serializers/spree/api/v2/platform/taxon_serializer.rbindex d2054d23f2..0cb6338343 100644--- a/api/app/serializers/spree/api/v2/platform/taxon_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/taxon_serializer.rb@@ -27,19 +27,19 @@ module Spreetaxon.leaf?end- belongs_to :parent, record_type: :taxon, serializer: Spree::Api::Dependencies.platform_taxon_serializer.constantize- belongs_to :taxonomy, record_type: :taxonomy, serializer: Spree::Api::Dependencies.platform_taxonomy_serializer.constantize+ belongs_to :parent, record_type: :taxon, serializer: Spree.api.platform_taxon_serializer+ belongs_to :taxonomy, record_type: :taxonomy, serializer: Spree.api.platform_taxonomy_serializer- has_many :children, record_type: :taxon, serializer: Spree::Api::Dependencies.platform_taxon_serializer.constantize+ has_many :children, record_type: :taxon, serializer: Spree.api.platform_taxon_serializerhas_many :products, record_type: :product,- serializer: Spree::Api::Dependencies.platform_product_serializer.constantize,+ serializer: Spree.api.platform_product_serializer,if: proc { |_taxon, params| params && params[:include_products] == true }has_one :image,object_method_name: :icon,id_method_name: :icon_id,record_type: :taxon_image,- serializer: Spree::Api::Dependencies.platform_taxon_image_serializer.constantize+ serializer: Spree.api.platform_taxon_image_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/taxonomy_serializer.rb b/api/app/serializers/spree/api/v2/platform/taxonomy_serializer.rbindex 8636ec9a39..15205de0a6 100644--- a/api/app/serializers/spree/api/v2/platform/taxonomy_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/taxonomy_serializer.rb@@ -5,8 +5,8 @@ module Spreeclass TaxonomySerializer < BaseSerializerinclude ResourceSerializerConcern- has_many :taxons, serializer: Spree::Api::Dependencies.platform_taxon_serializer.constantize- has_one :root, serializer: Spree::Api::Dependencies.platform_taxon_serializer.constantize+ has_many :taxons, serializer: Spree.api.platform_taxon_serializer+ has_one :root, serializer: Spree.api.platform_taxon_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/user_serializer.rb b/api/app/serializers/spree/api/v2/platform/user_serializer.rbindex 2b1991fa71..86f367bdb9 100644--- a/api/app/serializers/spree/api/v2/platform/user_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/user_serializer.rb@@ -21,11 +21,11 @@ module Spreehas_one :bill_address,record_type: :address,- serializer: Spree::Api::Dependencies.platform_address_serializer.constantize+ serializer: Spree.api.platform_address_serializerhas_one :ship_address,record_type: :address,- serializer: Spree::Api::Dependencies.platform_address_serializer.constantize+ serializer: Spree.api.platform_address_serializerdef self.price_stats(stats)stats.map { |value| { currency: value.currency.to_s, amount: value.money.to_s } }diff --git a/api/app/serializers/spree/api/v2/platform/variant_serializer.rb b/api/app/serializers/spree/api/v2/platform/variant_serializer.rbindex 2f6cc0c2cb..9de68b6129 100644--- a/api/app/serializers/spree/api/v2/platform/variant_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/variant_serializer.rb@@ -44,13 +44,13 @@ module Spreedisplay_compare_at_price(object, params[:currency])end- belongs_to :product, serializer: Spree::Api::Dependencies.platform_product_serializer.constantize- belongs_to :tax_category, serializer: Spree::Api::Dependencies.platform_tax_category_serializer.constantize- has_many :digitals, serializer: Spree::Api::Dependencies.platform_digital_serializer.constantize- has_many :images, serializer: Spree::Api::Dependencies.platform_image_serializer.constantize- has_many :option_values, serializer: Spree::Api::Dependencies.platform_option_value_serializer.constantize- has_many :stock_items, serializer: Spree::Api::Dependencies.platform_stock_item_serializer.constantize- has_many :stock_locations, serializer: Spree::Api::Dependencies.platform_stock_location_serializer.constantize+ belongs_to :product, serializer: Spree.api.platform_product_serializer+ belongs_to :tax_category, serializer: Spree.api.platform_tax_category_serializer+ has_many :digitals, serializer: Spree.api.platform_digital_serializer+ has_many :images, serializer: Spree.api.platform_image_serializer+ has_many :option_values, serializer: Spree.api.platform_option_value_serializer+ has_many :stock_items, serializer: Spree.api.platform_stock_item_serializer+ has_many :stock_locations, serializer: Spree.api.platform_stock_location_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/wished_item_serializer.rb b/api/app/serializers/spree/api/v2/platform/wished_item_serializer.rbindex af832221d0..907faab934 100644--- a/api/app/serializers/spree/api/v2/platform/wished_item_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/wished_item_serializer.rb@@ -21,7 +21,7 @@ module Spreewished_item.display_total(currency: params[:currency]).to_send- belongs_to :variant, serializer: Spree::Api::Dependencies.platform_variant_serializer.constantize+ belongs_to :variant, serializer: Spree.api.platform_variant_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/wishlist_serializer.rb b/api/app/serializers/spree/api/v2/platform/wishlist_serializer.rbindex 13f7af4afe..00a3254c24 100644--- a/api/app/serializers/spree/api/v2/platform/wishlist_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/wishlist_serializer.rb@@ -11,7 +11,7 @@ module Spreewishlist.include?(params[:is_variant_included])end- has_many :wished_items, serializer: Spree::Api::Dependencies.platform_wished_item_serializer.constantize+ has_many :wished_items, serializer: Spree.api.platform_wished_item_serializerendendenddiff --git a/api/app/serializers/spree/api/v2/platform/zone_serializer.rb b/api/app/serializers/spree/api/v2/platform/zone_serializer.rbindex a3f082011d..67f372fdd2 100644--- a/api/app/serializers/spree/api/v2/platform/zone_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/zone_serializer.rb@@ -5,7 +5,7 @@ module Spreeclass ZoneSerializer < BaseSerializerinclude ResourceSerializerConcern- has_many :zone_members, serializer: Spree::Api::Dependencies.platform_zone_member_serializer.constantize+ has_many :zone_members, serializer: Spree.api.platform_zone_member_serializerendendenddiff --git a/api/app/serializers/spree/v2/storefront/cart_serializer.rb b/api/app/serializers/spree/v2/storefront/cart_serializer.rbindex eea245dcb0..d2ba10b509 100644--- a/api/app/serializers/spree/v2/storefront/cart_serializer.rb+++ b/api/app/serializers/spree/v2/storefront/cart_serializer.rb@@ -42,25 +42,25 @@ module Spreecart.display_total_minus_store_credits.amount_in_centsend- has_many :line_items, serializer: Spree::Api::Dependencies.storefront_line_item_serializer.constantize- has_many :variants, serializer: Spree::Api::Dependencies.storefront_variant_serializer.constantize- has_many :promotions, serializer: Spree::Api::Dependencies.storefront_order_promotion_serializer.constantize, object_method_name: :valid_promotions, id_method_name: :valid_promotion_ids- has_many :payments, serializer: Spree::Api::Dependencies.storefront_payment_serializer.constantize do |cart|+ has_many :line_items, serializer: Spree.api.storefront_line_item_serializer+ has_many :variants, serializer: Spree.api.storefront_variant_serializer+ has_many :promotions, serializer: Spree.api.storefront_order_promotion_serializer, object_method_name: :valid_promotions, id_method_name: :valid_promotion_ids+ has_many :payments, serializer: Spree.api.storefront_payment_serializer do |cart|cart.payments.validend- has_many :shipments, serializer: Spree::Api::Dependencies.storefront_shipment_serializer.constantize+ has_many :shipments, serializer: Spree.api.storefront_shipment_serializer- belongs_to :user, serializer: Spree::Api::Dependencies.storefront_user_serializer.constantize+ belongs_to :user, serializer: Spree.api.storefront_user_serializerbelongs_to :billing_address,id_method_name: :bill_address_id,- serializer: Spree::Api::Dependencies.storefront_address_serializer.constantize,+ serializer: Spree.api.storefront_address_serializer,record_type: :addressbelongs_to :shipping_address,id_method_name: :ship_address_id,- serializer: Spree::Api::Dependencies.storefront_address_serializer.constantize,+ serializer: Spree.api.storefront_address_serializer,record_type: :address- belongs_to :gift_card, serializer: Spree::Api::Dependencies.storefront_gift_card_serializer.constantize+ belongs_to :gift_card, serializer: Spree.api.storefront_gift_card_serializerendendenddiff --git a/api/app/serializers/spree/v2/storefront/credit_card_serializer.rb b/api/app/serializers/spree/v2/storefront/credit_card_serializer.rbindex 18239ac66b..8699da6f92 100644--- a/api/app/serializers/spree/v2/storefront/credit_card_serializer.rb+++ b/api/app/serializers/spree/v2/storefront/credit_card_serializer.rb@@ -8,7 +8,7 @@ module Spreeattributes :cc_type, :last_digits, :month, :year, :name, :default, :gateway_payment_profile_id, :public_metadata- belongs_to :payment_method, serializer: Spree::Api::Dependencies.storefront_payment_method_serializer.constantize+ belongs_to :payment_method, serializer: Spree.api.storefront_payment_method_serializerendendenddiff --git a/api/app/serializers/spree/v2/storefront/estimated_shipping_rate_serializer.rb b/api/app/serializers/spree/v2/storefront/estimated_shipping_rate_serializer.rbindex d85ee004ad..d30d4d9bd2 100644--- a/api/app/serializers/spree/v2/storefront/estimated_shipping_rate_serializer.rb+++ b/api/app/serializers/spree/v2/storefront/estimated_shipping_rate_serializer.rb@@ -12,7 +12,7 @@ module Spreeshipping_rate.shipping_method_id.to_send- belongs_to :shipping_method, serializer: Spree::Api::Dependencies.storefront_shipping_method_serializer.constantize+ belongs_to :shipping_method, serializer: Spree.api.storefront_shipping_method_serializerattribute :final_price do |shipping_rate|shipping_rate.costdiff --git a/api/app/serializers/spree/v2/storefront/line_item_serializer.rb b/api/app/serializers/spree/v2/storefront/line_item_serializer.rbindex da4d973836..de6e790151 100644--- a/api/app/serializers/spree/v2/storefront/line_item_serializer.rb+++ b/api/app/serializers/spree/v2/storefront/line_item_serializer.rb@@ -15,8 +15,8 @@ module Spree:pre_tax_amount, :display_pre_tax_amount, :compare_at_amount, :display_compare_at_amount,:public_metadata- belongs_to :variant, serializer: Spree::Api::Dependencies.storefront_variant_serializer.constantize- has_many :digital_links, serializer: Spree::Api::Dependencies.storefront_digital_link_serializer.constantize+ belongs_to :variant, serializer: Spree.api.storefront_variant_serializer+ has_many :digital_links, serializer: Spree.api.storefront_digital_link_serializerendendenddiff --git a/api/app/serializers/spree/v2/storefront/option_type_serializer.rb b/api/app/serializers/spree/v2/storefront/option_type_serializer.rbindex 9017627a28..e2525ea964 100644--- a/api/app/serializers/spree/v2/storefront/option_type_serializer.rb+++ b/api/app/serializers/spree/v2/storefront/option_type_serializer.rb@@ -8,7 +8,7 @@ module Spreeattributes :name, :presentation, :position, :public_metadata- has_many :option_values, serializer: Spree::Api::Dependencies.storefront_option_value_serializer.constantize+ has_many :option_values, serializer: Spree.api.storefront_option_value_serializerendendenddiff --git a/api/app/serializers/spree/v2/storefront/option_value_serializer.rb b/api/app/serializers/spree/v2/storefront/option_value_serializer.rbindex c61bbfe492..372efb7e41 100644--- a/api/app/serializers/spree/v2/storefront/option_value_serializer.rb+++ b/api/app/serializers/spree/v2/storefront/option_value_serializer.rb@@ -6,7 +6,7 @@ module Spreeattributes :name, :presentation, :position, :public_metadata- belongs_to :option_type, serializer: Spree::Api::Dependencies.storefront_option_type_serializer.constantize+ belongs_to :option_type, serializer: Spree.api.storefront_option_type_serializerendendenddiff --git a/api/app/serializers/spree/v2/storefront/payment_serializer.rb b/api/app/serializers/spree/v2/storefront/payment_serializer.rbindex f2d0f6d316..910cf3b468 100644--- a/api/app/serializers/spree/v2/storefront/payment_serializer.rb+++ b/api/app/serializers/spree/v2/storefront/payment_serializer.rb@@ -7,7 +7,7 @@ module Spreeset_type :paymenthas_one :source, polymorphic: true- has_one :payment_method, serializer: Spree::Api::Dependencies.storefront_payment_method_serializer.constantize+ has_one :payment_method, serializer: Spree.api.storefront_payment_method_serializerattributes :amount, :response_code, :number, :cvv_response_code, :cvv_response_message, :payment_method_name, :state, :public_metadatadiff --git a/api/app/serializers/spree/v2/storefront/payment_source_serializer.rb b/api/app/serializers/spree/v2/storefront/payment_source_serializer.rbindex f842c3df22..10fdf6cdd6 100644--- a/api/app/serializers/spree/v2/storefront/payment_source_serializer.rb+++ b/api/app/serializers/spree/v2/storefront/payment_source_serializer.rb@@ -4,8 +4,8 @@ module Spreeclass PaymentSourceSerializer < BaseSerializerinclude Spree::Api::V2::PublicMetafieldsConcern- belongs_to :payment_method, serializer: Spree::Api::Dependencies.storefront_payment_method_serializer.constantize- belongs_to :user, serializer: Spree::Api::Dependencies.storefront_user_serializer.constantize+ belongs_to :payment_method, serializer: Spree.api.storefront_payment_method_serializer+ belongs_to :user, serializer: Spree.api.storefront_user_serializerendendenddiff --git a/api/app/serializers/spree/v2/storefront/post_category_serializer.rb b/api/app/serializers/spree/v2/storefront/post_category_serializer.rbindex 29c0e5ec83..141ee0c0ca 100644--- a/api/app/serializers/spree/v2/storefront/post_category_serializer.rb+++ b/api/app/serializers/spree/v2/storefront/post_category_serializer.rb@@ -12,7 +12,7 @@ module Spreecategory.description.to_plain_text if category.description.present?end- has_many :posts, serializer: Spree::Api::Dependencies.storefront_post_serializer.constantize, record_type: :post, if: proc { |_record, params|+ has_many :posts, serializer: Spree.api.storefront_post_serializer, record_type: :post, if: proc { |_record, params|params[:include_posts] == true} do |category|category.posts.published.by_newestdiff --git a/api/app/serializers/spree/v2/storefront/post_serializer.rb b/api/app/serializers/spree/v2/storefront/post_serializer.rbindex 6148727a74..4abf49e7ec 100644--- a/api/app/serializers/spree/v2/storefront/post_serializer.rb+++ b/api/app/serializers/spree/v2/storefront/post_serializer.rb@@ -44,7 +44,7 @@ module Spreeurl_helpers.cdn_image_url(post.image.attachment) if post.image.present? && post.image.attached?end- belongs_to :post_category, serializer: Spree::Api::Dependencies.storefront_post_category_serializer.constantize, record_type: :post_category+ belongs_to :post_category, serializer: Spree.api.storefront_post_category_serializer, record_type: :post_categoryendendenddiff --git a/api/app/serializers/spree/v2/storefront/product_serializer.rb b/api/app/serializers/spree/v2/storefront/product_serializer.rbindex d7ee7ce69f..1f4e9042f4 100644--- a/api/app/serializers/spree/v2/storefront/product_serializer.rb+++ b/api/app/serializers/spree/v2/storefront/product_serializer.rb@@ -52,11 +52,11 @@ module Spreeattribute :tags, &:tag_listattribute :labels, &:label_list- has_many :variants, serializer: Spree::Api::Dependencies.storefront_variant_serializer.constantize- has_many :option_types, serializer: Spree::Api::Dependencies.storefront_option_type_serializer.constantize- has_many :product_properties, serializer: Spree::Api::Dependencies.storefront_product_property_serializer.constantize+ has_many :variants, serializer: Spree.api.storefront_variant_serializer+ has_many :option_types, serializer: Spree.api.storefront_option_type_serializer+ has_many :product_properties, serializer: Spree.api.storefront_product_property_serializer- has_many :taxons, serializer: Spree::Api::Dependencies.storefront_taxon_serializer.constantize, record_type: :taxon do |object, params|+ has_many :taxons, serializer: Spree.api.storefront_taxon_serializer, record_type: :taxon do |object, params|object.taxons_for_store(params[:store]).order(:id)end@@ -65,19 +65,19 @@ module Spreeobject_method_name: :variant_images,id_method_name: :variant_image_ids,record_type: :image,- serializer: Spree::Api::Dependencies.storefront_image_serializer.constantize+ serializer: Spree.api.storefront_image_serializerhas_one :default_variant,object_method_name: :default_variant,id_method_name: :default_variant_id,record_type: :variant,- serializer: Spree::Api::Dependencies.storefront_variant_serializer.constantize+ serializer: Spree.api.storefront_variant_serializerhas_one :primary_variant,object_method_name: :master,id_method_name: :master_id,record_type: :variant,- serializer: Spree::Api::Dependencies.storefront_variant_serializer.constantize+ serializer: Spree.api.storefront_variant_serializerendendenddiff --git a/api/app/serializers/spree/v2/storefront/shipment_serializer.rb b/api/app/serializers/spree/v2/storefront/shipment_serializer.rbindex 83ec90fd1f..1b33439526 100644--- a/api/app/serializers/spree/v2/storefront/shipment_serializer.rb+++ b/api/app/serializers/spree/v2/storefront/shipment_serializer.rb@@ -13,11 +13,11 @@ module Spreeshipment.free?end- has_many :shipping_rates, serializer: Spree::Api::Dependencies.storefront_shipping_rate_serializer.constantize- has_one :selected_shipping_rate, serializer: Spree::Api::Dependencies.storefront_shipping_rate_serializer.constantize+ has_many :shipping_rates, serializer: Spree.api.storefront_shipping_rate_serializer+ has_one :selected_shipping_rate, serializer: Spree.api.storefront_shipping_rate_serializer- belongs_to :stock_location, serializer: Spree::Api::Dependencies.storefront_stock_location_serializer.constantize- has_many :line_items, serializer: Spree::Api::Dependencies.storefront_line_item_serializer.constantize do |shipment|+ belongs_to :stock_location, serializer: Spree.api.storefront_stock_location_serializer+ has_many :line_items, serializer: Spree.api.storefront_line_item_serializer do |shipment|shipment.line_itemsendenddiff --git a/api/app/serializers/spree/v2/storefront/shipping_rate_serializer.rb b/api/app/serializers/spree/v2/storefront/shipping_rate_serializer.rbindex 3ab88da2fb..790c92231c 100644--- a/api/app/serializers/spree/v2/storefront/shipping_rate_serializer.rb+++ b/api/app/serializers/spree/v2/storefront/shipping_rate_serializer.rb@@ -11,7 +11,7 @@ module Spreeshipping_rate.shipping_method_id.to_send- belongs_to :shipping_method, serializer: Spree::Api::Dependencies.storefront_shipping_method_serializer.constantize+ belongs_to :shipping_method, serializer: Spree.api.storefront_shipping_method_serializerattribute :free do |shipping_rate|shipping_rate.free?diff --git a/api/app/serializers/spree/v2/storefront/store_credit_serializer.rb b/api/app/serializers/spree/v2/storefront/store_credit_serializer.rbindex 5d8eebefc1..ea158cf42d 100644--- a/api/app/serializers/spree/v2/storefront/store_credit_serializer.rb+++ b/api/app/serializers/spree/v2/storefront/store_credit_serializer.rb@@ -6,11 +6,11 @@ module Spreeset_type :store_credit- belongs_to :category, serializer: Spree::Api::Dependencies.storefront_store_credit_category_serializer.constantize- has_many :store_credit_events, serializer: Spree::Api::Dependencies.storefront_store_credit_event_serializer.constantize+ belongs_to :category, serializer: Spree.api.storefront_store_credit_category_serializer+ has_many :store_credit_events, serializer: Spree.api.storefront_store_credit_event_serializerbelongs_to :credit_type,id_method_name: :type_id,- serializer: Spree::Api::Dependencies.storefront_store_credit_type_serializer.constantize+ serializer: Spree.api.storefront_store_credit_type_serializerattributes :amount, :amount_used, :created_at, :public_metadataenddiff --git a/api/app/serializers/spree/v2/storefront/store_serializer.rb b/api/app/serializers/spree/v2/storefront/store_serializer.rbindex 09d37fe5c1..72c7f37617 100644--- a/api/app/serializers/spree/v2/storefront/store_serializer.rb+++ b/api/app/serializers/spree/v2/storefront/store_serializer.rb@@ -11,7 +11,7 @@ module Spree:default, :supported_currencies, :facebook, :twitter, :instagram, :default_locale,:customer_support_email, :description, :address, :contact_phone, :supported_locales- has_one :default_country, serializer: Spree::Api::Dependencies.storefront_country_serializer.constantize, record_type: :country, id_method_name: :default_country_id+ has_one :default_country, serializer: Spree.api.storefront_country_serializer, record_type: :country, id_method_name: :default_country_idendendenddiff --git a/api/app/serializers/spree/v2/storefront/taxon_serializer.rb b/api/app/serializers/spree/v2/storefront/taxon_serializer.rbindex 923d47c7b2..a8091a6dd0 100644--- a/api/app/serializers/spree/v2/storefront/taxon_serializer.rb+++ b/api/app/serializers/spree/v2/storefront/taxon_serializer.rb@@ -37,18 +37,18 @@ module Spreetaxon.localized_slugs_for_store(params[:store])end- belongs_to :parent, record_type: :taxon, serializer: Spree::Api::Dependencies.storefront_taxon_serializer.constantize- belongs_to :taxonomy, record_type: :taxonomy, serializer: Spree::Api::Dependencies.storefront_taxonomy_serializer.constantize+ belongs_to :parent, record_type: :taxon, serializer: Spree.api.storefront_taxon_serializer+ belongs_to :taxonomy, record_type: :taxonomy, serializer: Spree.api.storefront_taxonomy_serializer- has_many :children, record_type: :taxon, serializer: Spree::Api::Dependencies.storefront_taxon_serializer.constantize- has_many :products, record_type: :product, serializer: Spree::Api::Dependencies.storefront_product_serializer.constantize,+ has_many :children, record_type: :taxon, serializer: Spree.api.storefront_taxon_serializer+ has_many :products, record_type: :product, serializer: Spree.api.storefront_product_serializer,if: proc { |_taxon, params| params && params[:include_products] == true }has_one :image,object_method_name: :icon,id_method_name: :icon_id,record_type: :taxon_image,- serializer: Spree::Api::Dependencies.storefront_taxon_image_serializer.constantize+ serializer: Spree.api.storefront_taxon_image_serializerendendenddiff --git a/api/app/serializers/spree/v2/storefront/user_serializer.rb b/api/app/serializers/spree/v2/storefront/user_serializer.rbindex f739432d9c..fe6d81d92d 100644--- a/api/app/serializers/spree/v2/storefront/user_serializer.rb+++ b/api/app/serializers/spree/v2/storefront/user_serializer.rb@@ -20,13 +20,13 @@ module Spreeid_method_name: :bill_address_id,object_method_name: :bill_address,record_type: :address,- serializer: Spree::Api::Dependencies.storefront_address_serializer.constantize+ serializer: Spree.api.storefront_address_serializerhas_one :default_shipping_address,id_method_name: :ship_address_id,object_method_name: :ship_address,record_type: :address,- serializer: Spree::Api::Dependencies.storefront_address_serializer.constantize+ serializer: Spree.api.storefront_address_serializerendendenddiff --git a/api/app/serializers/spree/v2/storefront/variant_serializer.rb b/api/app/serializers/spree/v2/storefront/variant_serializer.rbindex e7e50652ee..50b35d68ac 100644--- a/api/app/serializers/spree/v2/storefront/variant_serializer.rb+++ b/api/app/serializers/spree/v2/storefront/variant_serializer.rb@@ -41,9 +41,9 @@ module Spreedisplay_compare_at_price(product, params[:currency])end- belongs_to :product, serializer: Spree::Api::Dependencies.storefront_product_serializer.constantize- has_many :images, serializer: Spree::Api::Dependencies.storefront_image_serializer.constantize- has_many :option_values, serializer: Spree::Api::Dependencies.storefront_option_value_serializer.constantize+ belongs_to :product, serializer: Spree.api.storefront_product_serializer+ has_many :images, serializer: Spree.api.storefront_image_serializer+ has_many :option_values, serializer: Spree.api.storefront_option_value_serializerendendenddiff --git a/api/app/serializers/spree/v2/storefront/wished_item_serializer.rb b/api/app/serializers/spree/v2/storefront/wished_item_serializer.rbindex 545fce70a8..f643902712 100644--- a/api/app/serializers/spree/v2/storefront/wished_item_serializer.rb+++ b/api/app/serializers/spree/v2/storefront/wished_item_serializer.rb@@ -22,7 +22,7 @@ module Spreewished_item.display_total(currency: params[:currency]).to_send- belongs_to :variant, serializer: Spree::Api::Dependencies.storefront_variant_serializer.constantize+ belongs_to :variant, serializer: Spree.api.storefront_variant_serializerendendenddiff --git a/api/app/serializers/spree/v2/storefront/wishlist_serializer.rb b/api/app/serializers/spree/v2/storefront/wishlist_serializer.rbindex dc1b91b8d8..b712aa304c 100644--- a/api/app/serializers/spree/v2/storefront/wishlist_serializer.rb+++ b/api/app/serializers/spree/v2/storefront/wishlist_serializer.rb@@ -10,7 +10,7 @@ module Spreewishlist.include?(params[:is_variant_included])end- has_many :wished_items, serializer: Spree::Api::Dependencies.storefront_wished_item_serializer.constantize+ has_many :wished_items, serializer: Spree.api.storefront_wished_item_serializerendendenddiff --git a/api/spec/requests/spree/api/v2/storefront/account_spec.rb b/api/spec/requests/spree/api/v2/storefront/account_spec.rbindex 98488b2f70..aa7340b271 100644--- a/api/spec/requests/spree/api/v2/storefront/account_spec.rb+++ b/api/spec/requests/spree/api/v2/storefront/account_spec.rb@@ -140,7 +140,7 @@ describe 'Storefront API v2 Account spec', type: :request dolet(:error) { instance_double(ActiveModel::Errors) }before do- allow(Spree::Api::Dependencies).to receive_message_chain(:storefront_account_create_service, :constantize).and_return(service)+ allow(Spree).to receive_message_chain(:api, :storefront_account_create_service).and_return(service)endinclude_context 'stubs for failed user saving'@@ -148,7 +148,7 @@ describe 'Storefront API v2 Account spec', type: :request dodescribe 'mocks' doafter { post "/api/v2/storefront/account", params: params }- it { expect(Spree::Api::Dependencies).to receive_message_chain(:storefront_account_create_service, :constantize).and_return(service) }+ it { expect(Spree).to receive_message_chain(:api, :storefront_account_create_service).and_return(service) }it_behaves_like 'mock tests for failed user saving'end@@ -246,7 +246,7 @@ describe 'Storefront API v2 Account spec', type: :request dolet(:error) { instance_double(ActiveModel::Errors) }before do- allow(Spree::Api::Dependencies).to receive_message_chain(:storefront_account_update_service, :constantize).and_return(service)+ allow(Spree).to receive_message_chain(:api, :storefront_account_update_service).and_return(service)endinclude_context 'stubs for failed user saving'@@ -254,7 +254,7 @@ describe 'Storefront API v2 Account spec', type: :request dodescribe 'mocks' doafter { patch "/api/v2/storefront/account", params: params, headers: headers }- it { expect(Spree::Api::Dependencies).to receive_message_chain(:storefront_account_update_service, :constantize).and_return(service) }+ it { expect(Spree).to receive_message_chain(:api, :storefront_account_update_service).and_return(service) }it_behaves_like 'mock tests for failed user saving'enddiff --git a/core/lib/generators/spree/cursor_rules/templates/spree_rules.mdc b/core/lib/generators/spree/cursor_rules/templates/spree_rules.mdcindex af64872809..d5fd22c3e1 100644--- a/core/lib/generators/spree/cursor_rules/templates/spree_rules.mdc+++ b/core/lib/generators/spree/cursor_rules/templates/spree_rules.mdc@@ -148,7 +148,7 @@ class MyAddToCartService < Spree::Cart::AddItemdef call(order:, variant:, quantity: nil, public_metadata: {}, private_metadata: {}, options: {})ApplicationRecord.transaction dorun :add_to_line_item- run Spree::Dependencies.cart_recalculate_service.constantize+ run Spree.cart_recalculate_servicerun :update_external_systemendend@@ -363,7 +363,7 @@ module Spreeprivatedef serialized_collection- Spree::Api::Dependencies.storefront_product_serializer.constantize.new(+ Spree.api.storefront_product_serializer.new(collection,include: resource_includes,fields: sparse_fieldsdiff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rbindex 3e7789ab03..34804973da 100644--- a/core/spec/models/spree/order_spec.rb+++ b/core/spec/models/spree/order_spec.rb@@ -769,12 +769,12 @@ describe Spree::Order, type: :model doit 'matches line item when options match' doallow(order).to receive(:foos_match).and_return(true)- expect(Spree::Dependencies.cart_compare_line_items_service.constantize.new.call(order: order, line_item: line_items.first, options: { foos: { bar: :zoo } }).value).to be true+ expect(Spree.cart_compare_line_items_service.new.call(order: order, line_item: line_items.first, options: { foos: { bar: :zoo } }).value).to be trueendit 'does not match line item without options' doallow(order).to receive(:foos_match).and_return(false)- expect(Spree::Dependencies.cart_compare_line_items_service.constantize.new.call(order: order, line_item: line_items.first).value).to be false+ expect(Spree.cart_compare_line_items_service.new.call(order: order, line_item: line_items.first).value).to be falseendendenddiff --git a/core/spec/services/spree/checkout/advance_spec.rb b/core/spec/services/spree/checkout/advance_spec.rbindex 740347c16f..c9d46a2c7a 100644--- a/core/spec/services/spree/checkout/advance_spec.rb+++ b/core/spec/services/spree/checkout/advance_spec.rb@@ -133,7 +133,7 @@ RSpec.describe Spree::Checkout::Advance docontext 'when next service fails' dobefore do- allow_next_instance_of(Spree::Dependencies.checkout_next_service.constantize) do |instance|+ allow_next_instance_of(Spree.checkout_next_service) do |instance|allow(instance).to receive(:call).and_return(Spree::ServiceModule::Result.new(false, order))endend@@ -151,7 +151,7 @@ RSpec.describe Spree::Checkout::Advance dolet(:order) { create(:order_ready_to_ship) }it 'stops advancement' do- expect(Spree::Dependencies.checkout_next_service.constantize).not_to receive(:new)+ expect(Spree.checkout_next_service).not_to receive(:new)result = service.call(order: order)diff --git a/storefront/app/controllers/spree/account/orders_controller.rb b/storefront/app/controllers/spree/account/orders_controller.rbindex 54acf14e9d..7a31ca853d 100644--- a/storefront/app/controllers/spree/account/orders_controller.rb+++ b/storefront/app/controllers/spree/account/orders_controller.rb@@ -26,7 +26,7 @@ module Spreeenddef order_finder- Spree::Dependencies.completed_order_finder.constantize+ Spree.completed_order_finderenddef load_order_detailsdiff --git a/storefront/app/controllers/spree/addresses_controller.rb b/storefront/app/controllers/spree/addresses_controller.rbindex 3f5b5122cc..d498bfab53 100644--- a/storefront/app/controllers/spree/addresses_controller.rb+++ b/storefront/app/controllers/spree/addresses_controller.rb@@ -91,11 +91,11 @@ module Spreeenddef create_service- Spree::Dependencies.address_create_service.constantize+ Spree.address_create_serviceenddef update_service- Spree::Dependencies.address_update_service.constantize+ Spree.address_update_serviceenddef load_and_authorize_addressdiff --git a/storefront/app/controllers/spree/checkout_controller.rb b/storefront/app/controllers/spree/checkout_controller.rbindex 660a4a3121..37fcff211d 100644--- a/storefront/app/controllers/spree/checkout_controller.rb+++ b/storefront/app/controllers/spree/checkout_controller.rb@@ -342,7 +342,7 @@ module Spreepackages = @order.shipments.map(&:to_package)@differentiator = Spree::Stock::Differentiator.new(@order, packages)@differentiator.missing.each do |variant, quantity|- Spree::Dependencies.cart_remove_item_service.constantize.call(order: @order, variant: variant, quantity: quantity)+ Spree.cart_remove_item_service.call(order: @order, variant: variant, quantity: quantity)endendend@@ -365,19 +365,19 @@ module Spreeenddef add_store_credit_service- Spree::Dependencies.checkout_add_store_credit_service.constantize+ Spree.checkout_add_store_credit_serviceenddef remove_store_credit_service- Spree::Dependencies.checkout_remove_store_credit_service.constantize+ Spree.checkout_remove_store_credit_serviceenddef remove_line_item_service- Spree::Dependencies.cart_remove_line_item_service.constantize+ Spree.cart_remove_line_item_serviceenddef coupon_handler- Spree::Dependencies.coupon_handler.constantize+ Spree.coupon_handlerenddef accurate_title@@ -387,7 +387,7 @@ module Spreedef remove_expired_gift_cardreturn unless @order.gift_card.present? && @order.gift_card.expired?- Spree::Dependencies.gift_card_remove_service.constantize.call(order: @order)+ Spree.gift_card_remove_service.call(order: @order)endendenddiff --git a/storefront/app/controllers/spree/line_items_controller.rb b/storefront/app/controllers/spree/line_items_controller.rbindex 1bcb184410..992518fa1f 100644--- a/storefront/app/controllers/spree/line_items_controller.rb+++ b/storefront/app/controllers/spree/line_items_controller.rb@@ -89,15 +89,15 @@ module Spreeenddef cart_add_item_service- Spree::Dependencies.cart_add_item_service.constantize+ Spree.cart_add_item_serviceenddef cart_remove_line_item_service- Spree::Dependencies.cart_remove_line_item_service.constantize+ Spree.cart_remove_line_item_serviceenddef cart_set_item_quantity_service- Spree::Dependencies.cart_set_item_quantity_service.constantize+ Spree.cart_set_item_quantity_serviceendendenddiff --git a/storefront/app/controllers/spree/order_status_controller.rb b/storefront/app/controllers/spree/order_status_controller.rbindex cb2bb28397..5304aa4b7d 100644--- a/storefront/app/controllers/spree/order_status_controller.rb+++ b/storefront/app/controllers/spree/order_status_controller.rb@@ -26,7 +26,7 @@ module Spreeenddef order_finder- Spree::Dependencies.completed_order_finder.constantize+ Spree.completed_order_finderendendenddiff --git a/storefront/app/controllers/spree/orders_controller.rb b/storefront/app/controllers/spree/orders_controller.rbindex 06c579020c..24eff25c39 100644--- a/storefront/app/controllers/spree/orders_controller.rb+++ b/storefront/app/controllers/spree/orders_controller.rb@@ -81,15 +81,15 @@ module Spreeenddef cart_remove_out_of_stock_items_service- Spree::Dependencies.cart_remove_out_of_stock_items_service.constantize+ Spree.cart_remove_out_of_stock_items_serviceenddef cart_update_service- Spree::Dependencies.cart_update_service.constantize+ Spree.cart_update_serviceenddef complete_order_finder- Spree::Dependencies.completed_order_finder.constantize+ Spree.completed_order_finderenddef remove_out_of_stock_itemsdiff --git a/storefront/app/controllers/spree/store_controller.rb b/storefront/app/controllers/spree/store_controller.rbindex 49fad2880f..e0f5529018 100644--- a/storefront/app/controllers/spree/store_controller.rb+++ b/storefront/app/controllers/spree/store_controller.rb@@ -124,7 +124,7 @@ module Spreeenddef storefront_products_finder- @storefront_products_finder ||= Spree::Dependencies.products_finder.constantize+ @storefront_products_finder ||= Spree.products_finderenddef storefront_products_scope