Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Fix failing specs

Damian Kaczmarczykfb03f82f49b3
diff --git a/api/app/controllers/spree/api/v2/base_controller.rb b/api/app/controllers/spree/api/v2/base_controller.rb
index 9995756701..8fea933c10 100644
--- a/api/app/controllers/spree/api/v2/base_controller.rb
+++ b/api/app/controllers/spree/api/v2/base_controller.rb
@@ -114,7 +114,11 @@ module Spree
end
def serializer_params
- { currency: current_currency, store: current_store, user: spree_current_user }
+ {
+ currency: current_currency,
+ store: current_store,
+ user: spree_current_user
+ }
end
def record_not_found
diff --git a/api/app/controllers/spree/api/v2/storefront/account/addresses_controller.rb b/api/app/controllers/spree/api/v2/storefront/account/addresses_controller.rb
index f44c80a5a5..2b1d885942 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
@@ -38,10 +38,6 @@ module Spree
Spree::Api::Dependencies.storefront_address_serializer.constantize
end
- def serialize_collection(collection)
- collection_serializer.new(collection).serializable_hash
- end
-
def create_service
Spree::Api::Dependencies.storefront_account_create_address_service.constantize
end
diff --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.rb
index 1cd1b1f942..6a7c42b3ab 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
@@ -27,14 +27,6 @@ module Spree
def resource_finder
Spree::Api::Dependencies.storefront_credit_card_finder.constantize
end
-
- def serialize_collection(collection)
- collection_serializer.new(
- collection,
- include: resource_includes,
- fields: sparse_fields
- ).serializable_hash
- end
end
end
end
diff --git a/api/app/controllers/spree/api/v2/storefront/cart_controller.rb b/api/app/controllers/spree/api/v2/storefront/cart_controller.rb
index 0d4444bae6..8c2a83c2bc 100644
--- a/api/app/controllers/spree/api/v2/storefront/cart_controller.rb
+++ b/api/app/controllers/spree/api/v2/storefront/cart_controller.rb
@@ -163,7 +163,7 @@ module Spree
def serialize_estimated_shipping_rates(shipping_rates)
estimate_shipping_rates_serializer.new(
shipping_rates,
- params: { currency: spree_current_order.currency }
+ params: serializer_params
).serializable_hash
end
diff --git a/api/app/controllers/spree/api/v2/storefront/checkout_controller.rb b/api/app/controllers/spree/api/v2/storefront/checkout_controller.rb
index 8ceef14038..bfcf47de50 100644
--- a/api/app/controllers/spree/api/v2/storefront/checkout_controller.rb
+++ b/api/app/controllers/spree/api/v2/storefront/checkout_controller.rb
@@ -119,12 +119,13 @@ module Spree
end
def serialize_payment_methods(payment_methods)
- payment_methods_serializer.new(payment_methods).serializable_hash
+ payment_methods_serializer.new(payment_methods, params: serializer_params).serializable_hash
end
def serialize_shipping_rates(shipments)
shipping_rates_serializer.new(
shipments,
+ params: serializer_params,
include: [:shipping_rates, :stock_location]
).serializable_hash
end
diff --git a/api/app/controllers/spree/api/v2/storefront/countries_controller.rb b/api/app/controllers/spree/api/v2/storefront/countries_controller.rb
index 0e5b5cf5b3..904d022e0b 100644
--- a/api/app/controllers/spree/api/v2/storefront/countries_controller.rb
+++ b/api/app/controllers/spree/api/v2/storefront/countries_controller.rb
@@ -6,22 +6,26 @@ module Spree
private
def serialize_collection(collection)
- collection_serializer.new(collection).serializable_hash
+ collection_serializer.new(
+ collection,
+ collection_options(collection).merge(params: collection_serializer_params)
+ ).serializable_hash
end
- def serialize_resource(resource)
- resource_serializer.new(
- resource,
- include: resource_includes,
- fields: sparse_fields,
- params: resource_serializer_params
- ).serializable_hash
+ def collection_serializer_params
+ {
+ currency: current_currency,
+ store: current_store,
+ user: spree_current_user,
+ }
end
- def resource_serializer_params
+ def serializer_params
{
+ currency: current_currency,
+ store: current_store,
+ user: spree_current_user,
include_states: true,
- current_store: current_store
}
end
diff --git a/api/app/serializers/spree/v2/storefront/country_serializer.rb b/api/app/serializers/spree/v2/storefront/country_serializer.rb
index 4666c37183..4214badec8 100644
--- a/api/app/serializers/spree/v2/storefront/country_serializer.rb
+++ b/api/app/serializers/spree/v2/storefront/country_serializer.rb
@@ -15,8 +15,8 @@ module Spree
has_many :checkout_zone_applicable_states,
serializer: ::Spree::V2::Storefront::StateSerializer,
- if: proc { |_record, params| params && params[:current_store].present? } do |object, params|
- params[:current_store].states_available_for_checkout(object)
+ if: proc { |_record, params| params && params[:store].present? } do |object, params|
+ params[:store].states_available_for_checkout(object)
end
end
end