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
Simplify namespacing, Storefront API -> Store API to match Admin API
Damian Legawiec83eb226a8f53
diff --git a/api/app/controllers/concerns/spree/api/v3/storefront/authentication.rb b/api/app/controllers/concerns/spree/api/v3/store/authentication.rbsimilarity index 97%rename from api/app/controllers/concerns/spree/api/v3/storefront/authentication.rbrename to api/app/controllers/concerns/spree/api/v3/store/authentication.rbindex 7c24466747..49b9f26953 100644--- a/api/app/controllers/concerns/spree/api/v3/storefront/authentication.rb+++ b/api/app/controllers/concerns/spree/api/v3/store/authentication.rb@@ -1,7 +1,7 @@module Spreemodule Apimodule V3- module Storefront+ module Store# This concern provides helper methods for generating JWT tokens# For authentication verification, see Spree::Api::V3::Authenticationmodule Authenticationdiff --git a/api/app/controllers/spree/api/v3/resource_controller.rb b/api/app/controllers/spree/api/v3/resource_controller.rbindex 0b31199ad6..2bf183b2e8 100644--- a/api/app/controllers/spree/api/v3/resource_controller.rb+++ b/api/app/controllers/spree/api/v3/resource_controller.rb@@ -1,7 +1,7 @@module Spreemodule Apimodule V3- class ResourceController < ::Spree::Api::V3::BaseController+ class ResourceController < BaseControllerbefore_action :set_resource, only: [:show, :update, :destroy]# GET /api/v3/resourcediff --git a/api/app/controllers/spree/api/v3/storefront/addresses_controller.rb b/api/app/controllers/spree/api/v3/store/addresses_controller.rbsimilarity index 86%rename from api/app/controllers/spree/api/v3/storefront/addresses_controller.rbrename to api/app/controllers/spree/api/v3/store/addresses_controller.rbindex 4c550e2932..3048a0b5ab 100644--- a/api/app/controllers/spree/api/v3/storefront/addresses_controller.rb+++ b/api/app/controllers/spree/api/v3/store/addresses_controller.rb@@ -1,7 +1,7 @@module Spreemodule Apimodule V3- module Storefront+ module Storeclass AddressesController < ResourceControllerbefore_action :require_authentication!@@ -16,7 +16,7 @@ module Spreeenddef serializer_class- Spree.api.v3_storefront_address_serializer+ Spree.api.v3_store_address_serializerenddef permitted_paramsdiff --git a/api/app/controllers/spree/api/v3/storefront/auth_controller.rb b/api/app/controllers/spree/api/v3/store/auth_controller.rbsimilarity index 94%rename from api/app/controllers/spree/api/v3/storefront/auth_controller.rbrename to api/app/controllers/spree/api/v3/store/auth_controller.rbindex 71b2b3a713..474b006b21 100644--- a/api/app/controllers/spree/api/v3/storefront/auth_controller.rb+++ b/api/app/controllers/spree/api/v3/store/auth_controller.rb@@ -1,14 +1,14 @@module Spreemodule Apimodule V3- module Storefront+ module Storeclass AuthController < BaseControllerinclude Spree::Api::V3::Storefront::Authenticationskip_before_action :authenticate_user, only: [:create, :register, :oauth_callback]before_action :require_authentication!, only: [:refresh]- # POST /api/v3/storefront/auth/login+ # POST /api/v3/store/auth/login# Supports multiple authentication providers via :provider param# Examples:# { "provider": "email", "email": "...", "password": "..." }@@ -35,7 +35,7 @@ module Spreeendend- # POST /api/v3/storefront/auth/register+ # POST /api/v3/store/auth/registerdef registeruser = Spree.user_class.new(registration_params)@@ -50,7 +50,7 @@ module Spreeendend- # POST /api/v3/storefront/auth/refresh+ # POST /api/v3/store/auth/refreshdef refreshtoken = generate_jwt(current_user)render json: {@@ -59,7 +59,7 @@ module Spree}end- # POST /api/v3/storefront/auth/oauth/callback+ # POST /api/v3/store/auth/oauth/callback# OAuth callback endpoint for server-side OAuth flows# Example: { "provider": "google", "code": "authorization_code" }def oauth_callback@@ -135,7 +135,7 @@ module Spreeenddef user_serializer- Spree.api.v3_storefront_user_serializer+ Spree.api.v3_store_user_serializerendendenddiff --git a/api/app/controllers/spree/api/v3/storefront/countries_controller.rb b/api/app/controllers/spree/api/v3/store/countries_controller.rbsimilarity index 82%rename from api/app/controllers/spree/api/v3/storefront/countries_controller.rbrename to api/app/controllers/spree/api/v3/store/countries_controller.rbindex 8be67f9a7b..ad4f3f4897 100644--- a/api/app/controllers/spree/api/v3/storefront/countries_controller.rb+++ b/api/app/controllers/spree/api/v3/store/countries_controller.rb@@ -1,7 +1,7 @@module Spreemodule Apimodule V3- module Storefront+ module Storeclass CountriesController < ResourceControllerprotected@@ -14,7 +14,7 @@ module Spreeenddef serializer_class- Spree.api.v3_storefront_country_serializer+ Spree.api.v3_store_country_serializerendendenddiff --git a/api/app/controllers/spree/api/v3/storefront/credit_cards_controller.rb b/api/app/controllers/spree/api/v3/store/credit_cards_controller.rbsimilarity index 82%rename from api/app/controllers/spree/api/v3/storefront/credit_cards_controller.rbrename to api/app/controllers/spree/api/v3/store/credit_cards_controller.rbindex 7e6ae3c80b..d58818e711 100644--- a/api/app/controllers/spree/api/v3/storefront/credit_cards_controller.rb+++ b/api/app/controllers/spree/api/v3/store/credit_cards_controller.rb@@ -1,7 +1,7 @@module Spreemodule Apimodule V3- module Storefront+ module Storeclass CreditCardsController < ResourceControllerbefore_action :require_authentication!@@ -16,7 +16,7 @@ module Spreeenddef serializer_class- Spree.api.v3_storefront_credit_card_serializer+ Spree.api.v3_store_credit_card_serializerendendenddiff --git a/api/app/controllers/spree/api/v3/storefront/customers_controller.rb b/api/app/controllers/spree/api/v3/store/customers_controller.rbsimilarity index 82%rename from api/app/controllers/spree/api/v3/storefront/customers_controller.rbrename to api/app/controllers/spree/api/v3/store/customers_controller.rbindex fa10a1aca1..9864b6d6bd 100644--- a/api/app/controllers/spree/api/v3/storefront/customers_controller.rb+++ b/api/app/controllers/spree/api/v3/store/customers_controller.rb@@ -1,16 +1,16 @@module Spreemodule Apimodule V3- module Storefront+ module Storeclass CustomersController < BaseControllerbefore_action :require_authentication!- # GET /api/v3/storefront/customers/me+ # GET /api/v3/store/customers/medef showrender json: serialize_resource(current_user)end- # PATCH /api/v3/storefront/customers/me+ # PATCH /api/v3/store/customers/medef updateif current_user.update(permitted_params)render json: serialize_resource(current_user)@@ -26,7 +26,7 @@ module Spreeenddef serializer_class- Spree.api.v3_storefront_user_serializer+ Spree.api.v3_store_user_serializerenddef permitted_paramsdiff --git a/api/app/controllers/spree/api/v3/storefront/digitals_controller.rb b/api/app/controllers/spree/api/v3/store/digitals_controller.rbsimilarity index 91%rename from api/app/controllers/spree/api/v3/storefront/digitals_controller.rbrename to api/app/controllers/spree/api/v3/store/digitals_controller.rbindex 8a83e8ccc3..2e836d8237 100644--- a/api/app/controllers/spree/api/v3/storefront/digitals_controller.rb+++ b/api/app/controllers/spree/api/v3/store/digitals_controller.rb@@ -1,11 +1,11 @@module Spreemodule Apimodule V3- module Storefront+ module Storeclass DigitalsController < BaseController# Public endpoint - access via token- # GET /api/v3/storefront/digitals/:token+ # GET /api/v3/store/digitals/:tokendef downloaddigital_link = Spree::DigitalLink.find_by!(token: params[:token])diff --git a/api/app/controllers/spree/api/v3/storefront/line_items_controller.rb b/api/app/controllers/spree/api/v3/store/line_items_controller.rbsimilarity index 87%rename from api/app/controllers/spree/api/v3/storefront/line_items_controller.rbrename to api/app/controllers/spree/api/v3/store/line_items_controller.rbindex 72de19c097..294cb93c53 100644--- a/api/app/controllers/spree/api/v3/storefront/line_items_controller.rb+++ b/api/app/controllers/spree/api/v3/store/line_items_controller.rb@@ -1,15 +1,14 @@module Spreemodule Apimodule V3- module Storefront+ module Storeclass LineItemsController < ResourceControllerinclude Spree::Api::V3::OrderConcernbefore_action :set_orderbefore_action :authorize_order_access!- skip_before_action :set_resource- # POST /api/v3/storefront/orders/:order_id/line_items+ # POST /api/v3/store/orders/:order_id/line_itemsdef createresult = Spree.cart_add_item_service.call(order: @order,@@ -26,7 +25,7 @@ module Spreeendend- # PATCH /api/v3/storefront/orders/:order_id/line_items/:id+ # PATCH /api/v3/store/orders/:order_id/line_items/:iddef update@line_item = @order.line_items.find(params[:id])@@ -47,7 +46,7 @@ module Spreeendend- # DELETE /api/v3/storefront/orders/:order_id/line_items/:id+ # DELETE /api/v3/store/orders/:order_id/line_items/:iddef destroy@line_item = @order.line_items.find(params[:id])@@ -74,7 +73,7 @@ module Spreeenddef serializer_class- Spree.api.v3_storefront_line_item_serializer+ Spree.api.v3_store_line_item_serializerenddef permitted_paramsdiff --git a/api/app/controllers/spree/api/v3/store/order_promotions_controller.rb b/api/app/controllers/spree/api/v3/store/order_promotions_controller.rbnew file mode 100644index 0000000000..e0bfcbd4ec--- /dev/null+++ b/api/app/controllers/spree/api/v3/store/order_promotions_controller.rb@@ -0,0 +1,60 @@+module Spree+ module Api+ module V3+ module Store+ class OrderPromotionsController < ResourceController+ include Spree::Api::V3::OrderConcern++ before_action :set_order+ before_action :authorize_order_access!++ # POST /api/v3/store/orders/:order_id/order_promotions+ def create+ @order.coupon_code = permitted_params[:coupon_code]++ promotion_handler.apply++ if promotion_handler.successful?+ head :no_content, status: :created+ else+ render_errors(promotion_handler.error)+ end+ end++ # DELETE /api/v3/store/orders/:order_id/order_promotions/:id+ def destroy+ coupon_code = @order_promotion.code.presence || @order_promotion.name++ promotion_handler.remove(coupon_code)++ if promotion_handler.successful?+ head :no_content+ else+ render_errors(promotion_handler.error)+ end+ end++ def promotion_handler+ @promotion_handler ||= Spree::PromotionHandler::Coupon.new(@order)+ end++ def permitted_params+ params.require(:order_promotion).permit(:coupon_code)+ end++ def scope+ @order.order_promotions+ end++ def model_class+ Spree::OrderPromotion+ end++ def serializer_class+ Spree.api.v3_store_order_promotion_serializer+ end+ end+ end+ end+ end+enddiff --git a/api/app/controllers/spree/api/v3/storefront/orders_controller.rb b/api/app/controllers/spree/api/v3/store/orders_controller.rbsimilarity index 88%rename from api/app/controllers/spree/api/v3/storefront/orders_controller.rbrename to api/app/controllers/spree/api/v3/store/orders_controller.rbindex ccf6bec364..1819fd61f9 100644--- a/api/app/controllers/spree/api/v3/storefront/orders_controller.rb+++ b/api/app/controllers/spree/api/v3/store/orders_controller.rb@@ -1,7 +1,7 @@module Spreemodule Apimodule V3- module Storefront+ module Storeclass OrdersController < ResourceControllerinclude Spree::Api::V3::OrderConcern@@ -9,7 +9,7 @@ module Spreeskip_before_action :set_resource, only: [:index, :create]before_action :require_authentication!, only: [:index]- # POST /api/v3/storefront/orders (public - guest checkout)+ # POST /api/v3/store/orders (public - guest checkout)def create@resource = Spree::Order.create!(store: current_store,@@ -22,7 +22,7 @@ module Spree), status: :createdend- # PATCH /api/v3/storefront/orders/:id+ # PATCH /api/v3/store/orders/:iddef updateresult = update_service.call(order: @order,@@ -38,7 +38,7 @@ module Spreeendend- # PATCH /api/v3/storefront/orders/:id/next+ # PATCH /api/v3/store/orders/:id/nextdef nextresult = next_service.call(order: @order)@@ -49,7 +49,7 @@ module Spreeendend- # PATCH /api/v3/storefront/orders/:id/advance+ # PATCH /api/v3/store/orders/:id/advancedef advanceresult = advance_service.call(order: @order)@@ -60,7 +60,7 @@ module Spreeendend- # PATCH /api/v3/storefront/orders/:id/complete+ # PATCH /api/v3/store/orders/:id/completedef completeresult = complete_service.call(order: @order)@@ -71,7 +71,7 @@ module Spreeendend- # PATCH /api/v3/storefront/orders/:id/cancel+ # PATCH /api/v3/store/orders/:id/canceldef cancel@order.cancel!render json: serialize_resource(@order)@@ -89,7 +89,7 @@ module Spreeenddef serializer_class- Spree.api.v3_storefront_order_serializer+ Spree.api.v3_store_order_serializerenddef permitted_paramsdiff --git a/api/app/controllers/spree/api/v3/storefront/payment_sources_controller.rb b/api/app/controllers/spree/api/v3/store/payment_sources_controller.rbsimilarity index 87%rename from api/app/controllers/spree/api/v3/storefront/payment_sources_controller.rbrename to api/app/controllers/spree/api/v3/store/payment_sources_controller.rbindex bf5cf806bd..3a3db8fe1d 100644--- a/api/app/controllers/spree/api/v3/storefront/payment_sources_controller.rb+++ b/api/app/controllers/spree/api/v3/store/payment_sources_controller.rb@@ -16,7 +16,7 @@ module Spreeenddef serializer_class- Spree.api.v3_storefront_payment_source_serializer+ Spree.api.v3_store_payment_source_serializerendendenddiff --git a/api/app/controllers/spree/api/v3/storefront/products_controller.rb b/api/app/controllers/spree/api/v3/store/products_controller.rbsimilarity index 87%rename from api/app/controllers/spree/api/v3/storefront/products_controller.rbrename to api/app/controllers/spree/api/v3/store/products_controller.rbindex f89cc38793..c423615637 100644--- a/api/app/controllers/spree/api/v3/storefront/products_controller.rb+++ b/api/app/controllers/spree/api/v3/store/products_controller.rb@@ -1,7 +1,7 @@module Spreemodule Apimodule V3- module Storefront+ module Storeclass ProductsController < ResourceControllerprotected@@ -10,7 +10,7 @@ module Spreeenddef serializer_class- Spree.api.v3_storefront_product_serializer+ Spree.api.v3_store_product_serializerenddef scopediff --git a/api/app/controllers/spree/api/v3/storefront/shipments_controller.rb b/api/app/controllers/spree/api/v3/store/shipments_controller.rbsimilarity index 81%rename from api/app/controllers/spree/api/v3/storefront/shipments_controller.rbrename to api/app/controllers/spree/api/v3/store/shipments_controller.rbindex 685861a5af..c124724039 100644--- a/api/app/controllers/spree/api/v3/storefront/shipments_controller.rb+++ b/api/app/controllers/spree/api/v3/store/shipments_controller.rb@@ -1,7 +1,7 @@module Spreemodule Apimodule V3- module Storefront+ module Storeclass ShipmentsController < ResourceControllerinclude Spree::Api::V3::OrderConcern@@ -9,19 +9,19 @@ module Spreebefore_action :authorize_order_access!before_action :set_shipment, only: [:show, :update]- # GET /api/v3/storefront/orders/:order_id/shipments+ # GET /api/v3/store/orders/:order_id/shipmentsdef indexrender json: {data: serialize_collection(@order.shipments)}end- # GET /api/v3/storefront/orders/:order_id/shipments/:id+ # GET /api/v3/store/orders/:order_id/shipments/:iddef showrender json: serialize_resource(@shipment)end- # PATCH /api/v3/storefront/orders/:order_id/shipments/:id+ # PATCH /api/v3/store/orders/:order_id/shipments/:iddef updateif permitted_params[:selected_shipping_rate_id].present?@shipment.selected_shipping_rate_id = permitted_params[:selected_shipping_rate_id]@@ -42,7 +42,7 @@ module Spreeenddef serializer_class- Spree.api.v3_storefront_shipment_serializer+ Spree.api.v3_store_shipment_serializerenddef permitted_paramsdiff --git a/api/app/controllers/spree/api/v3/storefront/stores_controller.rb b/api/app/controllers/spree/api/v3/store/stores_controller.rbsimilarity index 80%rename from api/app/controllers/spree/api/v3/storefront/stores_controller.rbrename to api/app/controllers/spree/api/v3/store/stores_controller.rbindex 8b166edd3b..71efe8954b 100644--- a/api/app/controllers/spree/api/v3/storefront/stores_controller.rb+++ b/api/app/controllers/spree/api/v3/store/stores_controller.rb@@ -1,17 +1,17 @@module Spreemodule Apimodule V3- module Storefront+ module Storeclass StoresController < ResourceController# Public endpoint - no authentication required- # GET /api/v3/storefront/store+ # GET /api/v3/store/storedef current@store = current_storerender json: serialize_resource(@store)end- # GET /api/v3/storefront/stores/:code+ # GET /api/v3/store/stores/:codedef show@resource = Spree::Store.find_by!(code: params[:id])render json: serialize_resource(@resource)@@ -24,7 +24,7 @@ module Spreeenddef serializer_class- Spree.api.v3_storefront_store_serializer+ Spree.api.v3_store_store_serializerend# Not needed for showdiff --git a/api/app/controllers/spree/api/v3/storefront/taxonomies_controller.rb b/api/app/controllers/spree/api/v3/store/taxonomies_controller.rbsimilarity index 84%rename from api/app/controllers/spree/api/v3/storefront/taxonomies_controller.rbrename to api/app/controllers/spree/api/v3/store/taxonomies_controller.rbindex f9d3205155..b6147c742f 100644--- a/api/app/controllers/spree/api/v3/storefront/taxonomies_controller.rb+++ b/api/app/controllers/spree/api/v3/store/taxonomies_controller.rb@@ -10,7 +10,7 @@ module Spreeenddef serializer_class- Spree.api.v3_storefront_taxonomy_serializer+ Spree.api.v3_store_taxonomy_serializerendendenddiff --git a/api/app/controllers/spree/api/v3/storefront/taxons_controller.rb b/api/app/controllers/spree/api/v3/store/taxons_controller.rbsimilarity index 76%rename from api/app/controllers/spree/api/v3/storefront/taxons_controller.rbrename to api/app/controllers/spree/api/v3/store/taxons_controller.rbindex 1197b8f9d0..65e534c5d1 100644--- a/api/app/controllers/spree/api/v3/storefront/taxons_controller.rb+++ b/api/app/controllers/spree/api/v3/store/taxons_controller.rb@@ -1,10 +1,8 @@module Spreemodule Apimodule V3- module Storefront+ module Storeclass TaxonsController < ResourceController- # Public endpoint - no authentication required-protecteddef model_class@@ -12,7 +10,7 @@ module Spreeenddef serializer_class- Spree.api.v3_storefront_taxon_serializer+ Spree.api.v3_store_taxon_serializerenddef scopediff --git a/api/app/controllers/spree/api/v3/storefront/wishlist_items_controller.rb b/api/app/controllers/spree/api/v3/store/wishlist_items_controller.rbsimilarity index 81%rename from api/app/controllers/spree/api/v3/storefront/wishlist_items_controller.rbrename to api/app/controllers/spree/api/v3/store/wishlist_items_controller.rbindex 1f88da89eb..63201892e8 100644--- a/api/app/controllers/spree/api/v3/storefront/wishlist_items_controller.rb+++ b/api/app/controllers/spree/api/v3/store/wishlist_items_controller.rb@@ -1,8 +1,8 @@module Spreemodule Apimodule V3- module Storefront- class WishlistItemsController < ResourceController+ module Store+ class WishedItemsController < ResourceControllerbefore_action :require_authentication!before_action :set_wishlist@@ -21,7 +21,7 @@ module Spreeenddef serializer_class- Spree.api.v3_storefront_wished_item_serializer+ Spree.api.v3_store_wished_item_serializerenddef permitted_paramsdiff --git a/api/app/controllers/spree/api/v3/storefront/wishlists_controller.rb b/api/app/controllers/spree/api/v3/store/wishlists_controller.rbsimilarity index 87%rename from api/app/controllers/spree/api/v3/storefront/wishlists_controller.rbrename to api/app/controllers/spree/api/v3/store/wishlists_controller.rbindex a2f0de340b..409239fb8b 100644--- a/api/app/controllers/spree/api/v3/storefront/wishlists_controller.rb+++ b/api/app/controllers/spree/api/v3/store/wishlists_controller.rb@@ -1,7 +1,7 @@module Spreemodule Apimodule V3- module Storefront+ module Storeclass WishlistsController < ResourceControllerbefore_action :require_authentication!@@ -16,7 +16,7 @@ module Spreeenddef serializer_class- Spree.api.v3_storefront_wishlist_serializer+ Spree.api.v3_store_wishlist_serializerenddef permitted_paramsdiff --git a/api/app/controllers/spree/api/v3/storefront/base_controller.rb b/api/app/controllers/spree/api/v3/storefront/base_controller.rbdeleted file mode 100644index 928989a785..0000000000--- a/api/app/controllers/spree/api/v3/storefront/base_controller.rb+++ /dev/null@@ -1,10 +0,0 @@-module Spree- module Api- module V3- module Storefront- class BaseController < ::Spree::Api::V3::BaseController- end- end- end- end-enddiff --git a/api/app/controllers/spree/api/v3/storefront/coupon_codes_controller.rb b/api/app/controllers/spree/api/v3/storefront/coupon_codes_controller.rbdeleted file mode 100644index e4396a9255..0000000000--- a/api/app/controllers/spree/api/v3/storefront/coupon_codes_controller.rb+++ /dev/null@@ -1,36 +0,0 @@-module Spree- module Api- module V3- module Storefront- class CouponCodesController < BaseController- include Spree::Api::V3::OrderConcern-- before_action :set_order- before_action :authorize_order_access!-- # POST /api/v3/storefront/orders/:order_id/coupon_codes- def create- @order.coupon_code = params[:coupon_code]-- if @order.save- render json: serialize_resource(@order), status: :created- else- render_errors(@order.errors)- end- end-- # DELETE /api/v3/storefront/orders/:order_id/coupon_codes/:id- def destroy- @order.coupon_code = nil-- if @order.save- head :no_content- else- render_errors(@order.errors)- end- end- end- end- end- end-enddiff --git a/api/app/serializers/spree/api/v3/address_serializer.rb b/api/app/serializers/spree/api/v3/address_serializer.rbdeleted file mode 100644index 34d1566a8c..0000000000--- a/api/app/serializers/spree/api/v3/address_serializer.rb+++ /dev/null@@ -1,11 +0,0 @@-module Spree- module Api- module V3- class AddressSerializer < BaseSerializer- attributes :id, :firstname, :lastname, :full_name, :address1, :address2,- :city, :zipcode, :phone, :company, :state_id,- :state_text, :country_id, :country_iso, :country_name- end- end- end-enddiff --git a/api/app/serializers/spree/api/v3/country_serializer.rb b/api/app/serializers/spree/api/v3/country_serializer.rbdeleted file mode 100644index acc8d4ca0b..0000000000--- a/api/app/serializers/spree/api/v3/country_serializer.rb+++ /dev/null@@ -1,13 +0,0 @@-module Spree- module Api- module V3- class CountrySerializer < BaseSerializer- attributes :id, :iso, :iso3, :iso_name, :name, :states_required, :zipcode_required-- many :states,- resource: Spree.api.v3_storefront_state_serializer,- if: proc { params[:includes]&.include?('states') }- end- end- end-enddiff --git a/api/app/serializers/spree/api/v3/image_serializer.rb b/api/app/serializers/spree/api/v3/image_serializer.rbdeleted file mode 100644index b7c33c7dbf..0000000000--- a/api/app/serializers/spree/api/v3/image_serializer.rb+++ /dev/null@@ -1,38 +0,0 @@-module Spree- module Api- module V3- class ImageSerializer < BaseSerializer- attributes :id, :position, :alt, :viewable_type, :viewable_id-- attribute :original_url do |image|- image_url(image)- end-- # Dynamically define attributes for each configured image variant- # Uses named variants from Spree::Config.product_image_variant_sizes- # (e.g., mini, small, medium, large, xlarge)- Spree::Config.product_image_variant_sizes.each_key do |variant_name|- attribute :"#{variant_name}_url" do |image|- variant_url(image, variant_name)- end- end-- private-- def image_url(image)- return nil unless image&.attachment&.attached?-- Rails.application.routes.url_helpers.cdn_image_url(image.attachment)- end-- def variant_url(image, variant_name)- return nil unless image&.attachment&.attached?-- Rails.application.routes.url_helpers.cdn_image_url(- image.attachment.variant(variant_name)- )- end- end- end- end-enddiff --git a/api/app/serializers/spree/api/v3/line_item_serializer.rb b/api/app/serializers/spree/api/v3/line_item_serializer.rbdeleted file mode 100644index 77d57332ec..0000000000--- a/api/app/serializers/spree/api/v3/line_item_serializer.rb+++ /dev/null@@ -1,20 +0,0 @@-module Spree- module Api- module V3- class LineItemSerializer < BaseSerializer- attributes :id, :variant_id, :quantity, :name, :slug, :options_text,- :price, :display_price, :total, :display_total,- :adjustment_total, :display_adjustment_total,- :additional_tax_total, :display_additional_tax_total,- :included_tax_total, :display_included_tax_total,- :promo_total, :display_promo_total,- :pre_tax_amount, :display_pre_tax_amount,- :discounted_amount, :display_discounted_amount,- :compare_at_amount, :display_compare_at_amount-- many :images, resource: Spree.api.v3_storefront_image_serializer- many :option_values, resource: Spree.api.v3_storefront_option_value_serializer- end- end- end-enddiff --git a/api/app/serializers/spree/api/v3/option_type_serializer.rb b/api/app/serializers/spree/api/v3/option_type_serializer.rbdeleted file mode 100644index 5fbbb6175d..0000000000--- a/api/app/serializers/spree/api/v3/option_type_serializer.rb+++ /dev/null@@ -1,9 +0,0 @@-module Spree- module Api- module V3- class OptionTypeSerializer < BaseSerializer- attributes :id, :name, :presentation, :position- end- end- end-enddiff --git a/api/app/serializers/spree/api/v3/option_value_serializer.rb b/api/app/serializers/spree/api/v3/option_value_serializer.rbdeleted file mode 100644index fa6d7aca61..0000000000--- a/api/app/serializers/spree/api/v3/option_value_serializer.rb+++ /dev/null@@ -1,13 +0,0 @@-module Spree- module Api- module V3- class OptionValueSerializer < BaseSerializer- attributes :id, :name, :presentation, :position, :option_type_id-- attribute :option_type_name do |option_value|- option_value.option_type.name- end- end- end- end-enddiff --git a/api/app/serializers/spree/api/v3/order_serializer.rb b/api/app/serializers/spree/api/v3/order_serializer.rbdeleted file mode 100644index 6df5c68b90..0000000000--- a/api/app/serializers/spree/api/v3/order_serializer.rb+++ /dev/null@@ -1,41 +0,0 @@-module Spree- module Api- module V3- class OrderSerializer < BaseSerializer- attributes :id, :number, :state, :token, :email, :special_instructions,- :currency, :item_count, :shipment_state, :payment_state,- :item_total, :display_item_total, :ship_total, :display_ship_total,- :adjustment_total, :display_adjustment_total, :promo_total, :display_promo_total,- :tax_total, :display_tax_total, :included_tax_total, :display_included_tax_total,- :additional_tax_total, :display_additional_tax_total, :total, :display_total-- # Timestamps- attributes completed_at: :iso8601-- # Conditional associations- many :line_items,- resource: Spree.api.v3_storefront_line_item_serializer,- if: proc { params[:includes]&.include?('line_items') }-- many :shipments,- resource: Spree.api.v3_storefront_shipment_serializer,- if: proc { params[:includes]&.include?('shipments') }-- many :payments,- resource: Spree.api.v3_storefront_payment_serializer,- if: proc { params[:includes]&.include?('payments') }-- one :bill_address,- resource: Spree.api.v3_storefront_address_serializer,- if: proc { params[:includes]&.include?('bill_address') }-- one :ship_address,- resource: Spree.api.v3_storefront_address_serializer,- if: proc { params[:includes]&.include?('ship_address') }-- many :payment_methods,- resource: Spree.api.v3_storefront_payment_method_serializer- end- end- end-enddiff --git a/api/app/serializers/spree/api/v3/payment_method_serializer.rb b/api/app/serializers/spree/api/v3/payment_method_serializer.rbdeleted file mode 100644index 41329a58ea..0000000000--- a/api/app/serializers/spree/api/v3/payment_method_serializer.rb+++ /dev/null@@ -1,9 +0,0 @@-module Spree- module Api- module V3- class PaymentMethodSerializer < BaseSerializer- attributes :id, :name, :description, :type- end- end- end-enddiff --git a/api/app/serializers/spree/api/v3/payment_serializer.rb b/api/app/serializers/spree/api/v3/payment_serializer.rbdeleted file mode 100644index ea6eaaf7c8..0000000000--- a/api/app/serializers/spree/api/v3/payment_serializer.rb+++ /dev/null@@ -1,11 +0,0 @@-module Spree- module Api- module V3- class PaymentSerializer < BaseSerializer- attributes :id, :state, :payment_method_id, :response_code, :number, :amount, :display_amount-- one :payment_method, resource: Spree.api.v3_storefront_payment_method_serializer- end- end- end-enddiff --git a/api/app/serializers/spree/api/v3/product_serializer.rb b/api/app/serializers/spree/api/v3/product_serializer.rbdeleted file mode 100644index 7c7bd54c2b..0000000000--- a/api/app/serializers/spree/api/v3/product_serializer.rb+++ /dev/null@@ -1,91 +0,0 @@-module Spree- module Api- module V3- class ProductSerializer < BaseSerializer- attributes :id, :name, :description, :slug, :sku, :barcode,- :meta_description, :meta_keywords,- available_on: :iso8601-- attribute :purchasable do |product|- product.purchasable?- end-- attribute :in_stock do |product|- product.in_stock?- end-- attribute :backorderable do |product|- product.backorderable?- end-- attribute :available do |product|- product.available?- end-- attribute :price do |product|- price_object(product)&.amount&.to_f- end-- attribute :price_in_cents do |product|- price_object(product)&.display_amount&.amount_in_cents- end-- attribute :display_price do |product|- price_object(product)&.display_price&.to_s- end-- attribute :compare_at_price do |product|- price_object(product)&.compare_at_amount&.to_f- end-- attribute :compare_at_price_in_cents do |product|- price_object(product)&.display_compare_at_amount&.amount_in_cents if price_object(product)&.compare_at_amount&.present?- end-- attribute :display_compare_at_price do |product|- price_object(product)&.display_compare_at_amount&.to_s if price_object(product)&.compare_at_amount&.present?- end-- attribute :tags do |product|- product.taggings.map(&:tag)- end-- # Conditional associations- many :variant_images,- key: :images,- resource: Spree.api.v3_storefront_image_serializer,- if: proc { params[:includes]&.include?('images') }-- many :variants,- resource: Spree.api.v3_storefront_variant_serializer,- if: proc { params[:includes]&.include?('variants') }-- one :default_variant,- resource: Spree.api.v3_storefront_variant_serializer,- if: proc { params[:includes]&.include?('default_variant') }-- one :master,- key: :master_variant,- resource: Spree.api.v3_storefront_variant_serializer,- if: proc { params[:includes]&.include?('master_variant') }-- many :option_types,- resource: Spree.api.v3_storefront_option_type_serializer,- if: proc { params[:includes]&.include?('option_types') }-- many :taxons,- proc { |taxons, params|- taxons.select { |t| t.taxonomy.store_id == params[:store].id}- },- resource: Spree.api.v3_storefront_taxon_serializer,- if: proc { params[:includes]&.include?('taxons') }-- private-- def price_object(product)- @price_object ||= price_for(product.default_variant)- end- end- end- end-enddiff --git a/api/app/serializers/spree/api/v3/shipment_serializer.rb b/api/app/serializers/spree/api/v3/shipment_serializer.rbdeleted file mode 100644index 4a382cbb47..0000000000--- a/api/app/serializers/spree/api/v3/shipment_serializer.rb+++ /dev/null@@ -1,17 +0,0 @@-module Spree- module Api- module V3- class ShipmentSerializer < BaseSerializer- attributes :id, :number, :state, :tracking, :tracking_url, :shipped_at,- :cost, :display_cost, :adjustment_total, :display_adjustment_total,- :additional_tax_total, :display_additional_tax_total, :promo_total, :display_promo_total,- :included_tax_total, :display_included_tax_total, :total, :display_total-- one :shipping_method, resource: Spree.api.v3_storefront_shipping_method_serializer- one :stock_location, resource: Spree.api.v3_storefront_stock_location_serializer-- many :shipping_rates, resource: Spree.api.v3_storefront_shipping_rate_serializer- end- end- end-enddiff --git a/api/app/serializers/spree/api/v3/shipping_method_serializer.rb b/api/app/serializers/spree/api/v3/shipping_method_serializer.rbdeleted file mode 100644index a49df30b54..0000000000--- a/api/app/serializers/spree/api/v3/shipping_method_serializer.rb+++ /dev/null@@ -1,9 +0,0 @@-module Spree- module Api- module V3- class ShippingMethodSerializer < BaseSerializer- attributes :id, :name, :code- end- end- end-enddiff --git a/api/app/serializers/spree/api/v3/shipping_rate_serializer.rb b/api/app/serializers/spree/api/v3/shipping_rate_serializer.rbdeleted file mode 100644index 1437dc8614..0000000000--- a/api/app/serializers/spree/api/v3/shipping_rate_serializer.rb+++ /dev/null@@ -1,19 +0,0 @@-module Spree- module Api- module V3- class ShippingRateSerializer < BaseSerializer- attributes :id, :name, :selected, :shipping_method_id-- attribute :cost do |shipping_rate|- shipping_rate.cost.to_f- end-- attribute :display_cost do |shipping_rate|- shipping_rate.display_cost.to_s- end-- one :shipping_method, resource: Spree.api.v3_storefront_shipping_method_serializer- end- end- end-enddiff --git a/api/app/serializers/spree/api/v3/state_serializer.rb b/api/app/serializers/spree/api/v3/state_serializer.rbdeleted file mode 100644index 2a793b1e88..0000000000--- a/api/app/serializers/spree/api/v3/state_serializer.rb+++ /dev/null@@ -1,9 +0,0 @@-module Spree- module Api- module V3- class StateSerializer < BaseSerializer- attributes :id, :name, :abbr, :country_id- end- end- end-enddiff --git a/api/app/serializers/spree/api/v3/stock_location_serializer.rb b/api/app/serializers/spree/api/v3/stock_location_serializer.rbdeleted file mode 100644index c70405e4f0..0000000000--- a/api/app/serializers/spree/api/v3/stock_location_serializer.rb+++ /dev/null@@ -1,9 +0,0 @@-module Spree- module Api- module V3- class StockLocationSerializer < BaseSerializer- attributes :id, :name, :address1, :city, :zipcode, :country_id, :country_iso, :country_name, :state_id, :state_text- end- end- end-enddiff --git a/api/app/serializers/spree/api/v3/store/address_serializer.rb b/api/app/serializers/spree/api/v3/store/address_serializer.rbnew file mode 100644index 0000000000..f1b1a29c73--- /dev/null+++ b/api/app/serializers/spree/api/v3/store/address_serializer.rb@@ -0,0 +1,13 @@+module Spree+ module Api+ module V3+ module Store+ class AddressSerializer < BaseSerializer+ attributes :id, :firstname, :lastname, :full_name, :address1, :address2,+ :city, :zipcode, :phone, :company, :state_id,+ :state_text, :country_id, :country_iso, :country_name+ end+ end+ end+ end+enddiff --git a/api/app/serializers/spree/api/v3/store/country_serializer.rb b/api/app/serializers/spree/api/v3/store/country_serializer.rbnew file mode 100644index 0000000000..38d3842b34--- /dev/null+++ b/api/app/serializers/spree/api/v3/store/country_serializer.rb@@ -0,0 +1,15 @@+module Spree+ module Api+ module V3+ module Store+ class CountrySerializer < BaseSerializer+ attributes :id, :iso, :iso3, :iso_name, :name, :states_required, :zipcode_required++ many :states,+ resource: Spree.api.v3_store_state_serializer,+ if: proc { params[:includes]&.include?('states') }+ end+ end+ end+ end+enddiff --git a/api/app/serializers/spree/api/v3/store/image_serializer.rb b/api/app/serializers/spree/api/v3/store/image_serializer.rbnew file mode 100644index 0000000000..00cc0dbdcd--- /dev/null+++ b/api/app/serializers/spree/api/v3/store/image_serializer.rb@@ -0,0 +1,40 @@+module Spree+ module Api+ module V3+ module Store+ class ImageSerializer < BaseSerializer+ attributes :id, :position, :alt, :viewable_type, :viewable_id++ attribute :original_url do |image|+ image_url(image)+ end++ # Dynamically define attributes for each configured image variant+ # Uses named variants from Spree::Config.product_image_variant_sizes+ # (e.g., mini, small, medium, large, xlarge)+ Spree::Config.product_image_variant_sizes.each_key do |variant_name|+ attribute :"#{variant_name}_url" do |image|+ variant_url(image, variant_name)+ end+ end++ private++ def image_url(image)+ return nil unless image&.attachment&.attached?++ Rails.application.routes.url_helpers.cdn_image_url(image.attachment)+ end++ def variant_url(image, variant_name)+ return nil unless image&.attachment&.attached?++ Rails.application.routes.url_helpers.cdn_image_url(+ image.attachment.variant(variant_name)+ )+ end+ end+ end+ end+ end+enddiff --git a/api/app/serializers/spree/api/v3/store/line_item_serializer.rb b/api/app/serializers/spree/api/v3/store/line_item_serializer.rbnew file mode 100644index 0000000000..93c9cfe548--- /dev/null+++ b/api/app/serializers/spree/api/v3/store/line_item_serializer.rb@@ -0,0 +1,22 @@+module Spree+ module Api+ module V3+ module Store+ class LineItemSerializer < BaseSerializer+ attributes :id, :variant_id, :quantity, :name, :slug, :options_text,+ :price, :display_price, :total, :display_total,+ :adjustment_total, :display_adjustment_total,+ :additional_tax_total, :display_additional_tax_total,+ :included_tax_total, :display_included_tax_total,+ :promo_total, :display_promo_total,+ :pre_tax_amount, :display_pre_tax_amount,+ :discounted_amount, :display_discounted_amount,+ :compare_at_amount, :display_compare_at_amount++ many :images, resource: Spree.api.v3_store_image_serializer+ many :option_values, resource: Spree.api.v3_store_option_value_serializer+ end+ end+ end+ end+enddiff --git a/api/app/serializers/spree/api/v3/store/option_type_serializer.rb b/api/app/serializers/spree/api/v3/store/option_type_serializer.rbnew file mode 100644index 0000000000..fc54697e5e--- /dev/null+++ b/api/app/serializers/spree/api/v3/store/option_type_serializer.rb@@ -0,0 +1,11 @@+module Spree+ module Api+ module V3+ module Store+ class OptionTypeSerializer < BaseSerializer+ attributes :id, :name, :presentation, :position+ end+ end+ end+ end+enddiff --git a/api/app/serializers/spree/api/v3/store/option_value_serializer.rb b/api/app/serializers/spree/api/v3/store/option_value_serializer.rbnew file mode 100644index 0000000000..b4c93a4b02--- /dev/null+++ b/api/app/serializers/spree/api/v3/store/option_value_serializer.rb@@ -0,0 +1,19 @@+module Spree+ module Api+ module V3+ module Store+ class OptionValueSerializer < BaseSerializer+ attributes :id, :name, :presentation, :position, :option_type_id++ attribute :option_type_name do |option_value|+ option_value.option_type.name+ end++ attribute :option_type_presentation do |option_value|+ option_value.option_type.presentation+ end+ end+ end+ end+ end+enddiff --git a/api/app/serializers/spree/api/v3/store/order_promotion_serializer.rb b/api/app/serializers/spree/api/v3/store/order_promotion_serializer.rbnew file mode 100644index 0000000000..90bed172b1--- /dev/null+++ b/api/app/serializers/spree/api/v3/store/order_promotion_serializer.rb@@ -0,0 +1,11 @@+module Spree+ module Api+ module V3+ module Store+ class OrderPromotionSerializer < BaseSerializer+ attributes :id, :name, :description, :code, :amount, :display_amount, :promotion_id+ end+ end+ end+ end+enddiff --git a/api/app/serializers/spree/api/v3/store/order_serializer.rb b/api/app/serializers/spree/api/v3/store/order_serializer.rbnew file mode 100644index 0000000000..30e596cac4--- /dev/null+++ b/api/app/serializers/spree/api/v3/store/order_serializer.rb@@ -0,0 +1,47 @@+module Spree+ module Api+ module V3+ module Store+ class OrderSerializer < BaseSerializer+ attributes :id, :number, :state, :token, :email, :special_instructions,+ :currency, :item_count, :shipment_state, :payment_state,+ :item_total, :display_item_total, :ship_total, :display_ship_total,+ :adjustment_total, :display_adjustment_total, :promo_total, :display_promo_total,+ :tax_total, :display_tax_total, :included_tax_total, :display_included_tax_total,+ :additional_tax_total, :display_additional_tax_total, :total, :display_total++ # Timestamps+ attributes completed_at: :iso8601+++ many :order_promotions,+ resource: Spree.api.v3_store_order_promotion_serializer,+ if: proc { params[:includes]&.include?('order_promotions') }++ many :line_items,+ resource: Spree.api.v3_store_line_item_serializer,+ if: proc { params[:includes]&.include?('line_items') }++ many :shipments,+ resource: Spree.api.v3_store_shipment_serializer,+ if: proc { params[:includes]&.include?('shipments') }++ many :payments,+ resource: Spree.api.v3_store_payment_serializer,+ if: proc { params[:includes]&.include?('payments') }++ one :bill_address,+ resource: Spree.api.v3_store_address_serializer,+ if: proc { params[:includes]&.include?('bill_address') }++ one :ship_address,+ resource: Spree.api.v3_store_address_serializer,+ if: proc { params[:includes]&.include?('ship_address') }++ many :payment_methods,+ resource: Spree.api.v3_store_payment_method_serializer+ end+ end+ end+ end+enddiff --git a/api/app/serializers/spree/api/v3/store/payment_method_serializer.rb b/api/app/serializers/spree/api/v3/store/payment_method_serializer.rbnew file mode 100644index 0000000000..52f9988d6f--- /dev/null+++ b/api/app/serializers/spree/api/v3/store/payment_method_serializer.rb@@ -0,0 +1,11 @@+module Spree+ module Api+ module V3+ module Store+ class PaymentMethodSerializer < BaseSerializer+ attributes :id, :name, :description, :type+ end+ end+ end+ end+enddiff --git a/api/app/serializers/spree/api/v3/store/payment_serializer.rb b/api/app/serializers/spree/api/v3/store/payment_serializer.rbnew file mode 100644index 0000000000..e497d50387--- /dev/null+++ b/api/app/serializers/spree/api/v3/store/payment_serializer.rb@@ -0,0 +1,13 @@+module Spree+ module Api+ module V3+ module Store+ class PaymentSerializer < BaseSerializer+ attributes :id, :state, :payment_method_id, :response_code, :number, :amount, :display_amount++ one :payment_method, resource: Spree.api.v3_store_payment_method_serializer+ end+ end+ end+ end+enddiff --git a/api/app/serializers/spree/api/v3/store/product_serializer.rb b/api/app/serializers/spree/api/v3/store/product_serializer.rbnew file mode 100644index 0000000000..cb4e7345f0--- /dev/null+++ b/api/app/serializers/spree/api/v3/store/product_serializer.rb@@ -0,0 +1,93 @@+module Spree+ module Api+ module V3+ module Store+ class ProductSerializer < BaseSerializer+ attributes :id, :name, :description, :slug, :sku, :barcode,+ :meta_description, :meta_keywords,+ available_on: :iso8601++ attribute :purchasable do |product|+ product.purchasable?+ end++ attribute :in_stock do |product|+ product.in_stock?+ end++ attribute :backorderable do |product|+ product.backorderable?+ end++ attribute :available do |product|+ product.available?+ end++ attribute :price do |product|+ price_object(product)&.amount&.to_f+ end++ attribute :price_in_cents do |product|+ price_object(product)&.display_amount&.amount_in_cents+ end++ attribute :display_price do |product|+ price_object(product)&.display_price&.to_s+ end++ attribute :compare_at_price do |product|+ price_object(product)&.compare_at_amount&.to_f+ end++ attribute :compare_at_price_in_cents do |product|+ price_object(product)&.display_compare_at_amount&.amount_in_cents if price_object(product)&.compare_at_amount&.present?+ end++ attribute :display_compare_at_price do |product|+ price_object(product)&.display_compare_at_amount&.to_s if price_object(product)&.compare_at_amount&.present?+ end++ attribute :tags do |product|+ product.taggings.map(&:tag)+ end++ # Conditional associations+ many :variant_images,+ key: :images,+ resource: Spree.api.v3_store_image_serializer,+ if: proc { params[:includes]&.include?('images') }++ many :variants,+ resource: Spree.api.v3_store_variant_serializer,+ if: proc { params[:includes]&.include?('variants') }++ one :default_variant,+ resource: Spree.api.v3_store_variant_serializer,+ if: proc { params[:includes]&.include?('default_variant') }++ one :master,+ key: :master_variant,+ resource: Spree.api.v3_store_variant_serializer,+ if: proc { params[:includes]&.include?('master_variant') }++ many :option_types,+ resource: Spree.api.v3_store_option_type_serializer,+ if: proc { params[:includes]&.include?('option_types') }++ many :taxons,+ proc { |taxons, params|+ taxons.select { |t| t.taxonomy.store_id == params[:store].id}+ },+ resource: Spree.api.v3_store_taxon_serializer,+ if: proc { params[:includes]&.include?('taxons') }++ private++ def price_object(product)+ @price_object ||= price_for(product.default_variant)+ end+ end+ end+ end+ end+enddiff --git a/api/app/serializers/spree/api/v3/store/shipment_serializer.rb b/api/app/serializers/spree/api/v3/store/shipment_serializer.rbnew file mode 100644index 0000000000..adc14f4c19--- /dev/null+++ b/api/app/serializers/spree/api/v3/store/shipment_serializer.rb@@ -0,0 +1,19 @@+module Spree+ module Api+ module V3+ module Store+ class ShipmentSerializer < BaseSerializer+ attributes :id, :number, :state, :tracking, :tracking_url, :shipped_at,+ :cost, :display_cost, :adjustment_total, :display_adjustment_total,+ :additional_tax_total, :display_additional_tax_total, :promo_total, :display_promo_total,+ :included_tax_total, :display_included_tax_total, :total, :display_total++ one :shipping_method, resource: Spree.api.v3_store_shipping_method_serializer+ one :stock_location, resource: Spree.api.v3_store_stock_location_serializer++ many :shipping_rates, resource: Spree.api.v3_store_shipping_rate_serializer+ end+ end+ end+ end+enddiff --git a/api/app/serializers/spree/api/v3/store/shipping_method_serializer.rb b/api/app/serializers/spree/api/v3/store/shipping_method_serializer.rbnew file mode 100644index 0000000000..43acb42209--- /dev/null+++ b/api/app/serializers/spree/api/v3/store/shipping_method_serializer.rb@@ -0,0 +1,11 @@+module Spree+ module Api+ module V3+ module Store+ class ShippingMethodSerializer < BaseSerializer+ attributes :id, :name, :code+ end+ end+ end+ end+enddiff --git a/api/app/serializers/spree/api/v3/store/shipping_rate_serializer.rb b/api/app/serializers/spree/api/v3/store/shipping_rate_serializer.rbnew file mode 100644index 0000000000..0d4eb40440--- /dev/null+++ b/api/app/serializers/spree/api/v3/store/shipping_rate_serializer.rb@@ -0,0 +1,21 @@+module Spree+ module Api+ module V3+ module Store+ class ShippingRateSerializer < BaseSerializer+ attributes :id, :name, :selected, :shipping_method_id++ attribute :cost do |shipping_rate|+ shipping_rate.cost.to_f+ end++ attribute :display_cost do |shipping_rate|+ shipping_rate.display_cost.to_s+ end++ one :shipping_method, resource: Spree.api.v3_store_shipping_method_serializer+ end+ end+ end+ end+enddiff --git a/api/app/serializers/spree/api/v3/store/state_serializer.rb b/api/app/serializers/spree/api/v3/store/state_serializer.rbnew file mode 100644index 0000000000..9dda1f1c57--- /dev/null+++ b/api/app/serializers/spree/api/v3/store/state_serializer.rb@@ -0,0 +1,11 @@+module Spree+ module Api+ module V3+ module Store+ class StateSerializer < BaseSerializer+ attributes :id, :name, :abbr, :country_id+ end+ end+ end+ end+enddiff --git a/api/app/serializers/spree/api/v3/store/stock_location_serializer.rb b/api/app/serializers/spree/api/v3/store/stock_location_serializer.rbnew file mode 100644index 0000000000..8ebb58c0d7--- /dev/null+++ b/api/app/serializers/spree/api/v3/store/stock_location_serializer.rb@@ -0,0 +1,11 @@+module Spree+ module Api+ module V3+ module Store+ class StockLocationSerializer < BaseSerializer+ attributes :id, :name, :address1, :city, :zipcode, :country_id, :country_iso, :country_name, :state_id, :state_text+ end+ end+ end+ end+enddiff --git a/api/app/serializers/spree/api/v3/store/store_serializer.rb b/api/app/serializers/spree/api/v3/store/store_serializer.rbnew file mode 100644index 0000000000..fcfb20989b--- /dev/null+++ b/api/app/serializers/spree/api/v3/store/store_serializer.rb@@ -0,0 +1,39 @@+module Spree+ module Api+ module V3+ module Store+ class StoreSerializer < BaseSerializer+ attributes :id, :name, :url, :meta_description, :meta_keywords, :seo_title,+ :default_currency, :code, :default, :facebook, :twitter,+ :instagram, :customer_support_email, :default_locale++ attribute :supported_currencies do |store|+ store.supported_currencies_list.map(&:iso_code)+ end++ attribute :favicon_image_url do |store|+ image_url_for(store.favicon_image)+ end++ attribute :logo_image_url do |store|+ image_url_for(store.logo)+ end++ attribute :social_image_url do |store|+ image_url_for(store.social_image)+ end++ attribute :supported_locales do |store|+ store.supported_locales_list+ end++ many :payment_methods,+ proc { |payment_methods, _params|+ payment_methods.select { |pm| pm.available_on_front_end? && pm.active? }+ },+ resource: Spree.api.v3_store_payment_method_serializer+ end+ end+ end+ end+enddiff --git a/api/app/serializers/spree/api/v3/store/taxon_serializer.rb b/api/app/serializers/spree/api/v3/store/taxon_serializer.rbnew file mode 100644index 0000000000..a9d26423bc--- /dev/null+++ b/api/app/serializers/spree/api/v3/store/taxon_serializer.rb@@ -0,0 +1,50 @@+module Spree+ module Api+ module V3+ module Store+ class TaxonSerializer < BaseSerializer+ attributes :id, :name, :permalink, :position, :lft, :rgt, :depth,+ :meta_title, :meta_description, :meta_keywords,+ :parent_id, :taxonomy_id, :children_count++ attribute :description do |taxon|+ taxon.description.to_plain_text+ end++ attribute :description_html do |taxon|+ taxon.description.to_s+ end++ attribute :image_url do |taxon|+ image_url_for(taxon.image)+ end++ attribute :square_image_url do |taxon|+ image_url_for(taxon.square_image)+ end++ attribute :is_root do |taxon|+ taxon.root?+ end++ attribute :is_child do |taxon|+ taxon.child?+ end++ attribute :is_leaf do |taxon|+ taxon.leaf?+ end++ # Conditional associations+ one :parent,+ resource: Spree.api.v3_store_taxon_serializer,+ if: proc { params[:includes]&.include?('parent') }++ many :children,+ resource: Spree.api.v3_store_taxon_serializer,+ if: proc { params[:includes]&.include?('children') }+ end+ end+ end+ end+enddiff --git a/api/app/serializers/spree/api/v3/store/taxonomy_serializer.rb b/api/app/serializers/spree/api/v3/store/taxonomy_serializer.rbnew file mode 100644index 0000000000..b3e87cf5da--- /dev/null+++ b/api/app/serializers/spree/api/v3/store/taxonomy_serializer.rb@@ -0,0 +1,20 @@+module Spree+ module Api+ module V3+ module Store+ class TaxonomySerializer < BaseSerializer+ attributes :id, :name, :position++ # Conditional associations+ one :root,+ resource: Spree.api.v3_store_taxon_serializer,+ if: proc { params[:includes]&.include?('root') }++ many :taxons,+ resource: Spree.api.v3_store_taxon_serializer,+ if: proc { params[:includes]&.include?('taxons') }+ end+ end+ end+ end+enddiff --git a/api/app/serializers/spree/api/v3/store/user_serializer.rb b/api/app/serializers/spree/api/v3/store/user_serializer.rbnew file mode 100644index 0000000000..577b477951--- /dev/null+++ b/api/app/serializers/spree/api/v3/store/user_serializer.rb@@ -0,0 +1,15 @@+module Spree+ module Api+ module V3+ module Store+ class UserSerializer < BaseSerializer+ attributes :id, :email, :first_name, :last_name++ many :addresses, resource: Spree.api.v3_store_address_serializer+ one :default_billing_address, resource: Spree.api.v3_store_address_serializer+ one :default_shipping_address, resource: Spree.api.v3_store_address_serializer+ end+ end+ end+ end+enddiff --git a/api/app/serializers/spree/api/v3/store/variant_serializer.rb b/api/app/serializers/spree/api/v3/store/variant_serializer.rbnew file mode 100644index 0000000000..fc3245f795--- /dev/null+++ b/api/app/serializers/spree/api/v3/store/variant_serializer.rb@@ -0,0 +1,75 @@+module Spree+ module Api+ module V3+ module Store+ class VariantSerializer < BaseSerializer+ attributes :id, :product_id, :sku, :barcode, :is_master, :options_text, :track_inventory, :image_count++ attribute :purchasable do |variant|+ variant.purchasable?+ end++ attribute :in_stock do |variant|+ variant.in_stock?+ end++ attribute :backorderable do |variant|+ variant.backorderable?+ end++ attribute :weight do |variant|+ variant.weight&.to_f+ end++ attribute :height do |variant|+ variant.height&.to_f+ end++ attribute :width do |variant|+ variant.width&.to_f+ end++ attribute :depth do |variant|+ variant.depth&.to_f+ end++ attribute :price do |variant|+ price_object(variant)&.amount&.to_f+ end++ attribute :price_in_cents do |variant|+ price_object(variant)&.display_amount&.amount_in_cents+ end++ attribute :display_price do |variant|+ price_object(variant)&.display_price&.to_s+ end++ attribute :compare_at_price do |variant|+ price_object(variant)&.compare_at_amount&.to_f+ end++ attribute :display_compare_at_price do |variant|+ price = price_object(variant)+ next unless price&.compare_at_amount++ Spree::Money.new(price.compare_at_amount, currency: currency).to_s+ end++ # Conditional associations+ many :images,+ resource: Spree.api.v3_store_image_serializer,+ if: proc { params[:includes]&.include?('images') }++ many :option_values, resource: Spree.api.v3_store_option_value_serializer++ private++ def price_object(variant)+ @price_object ||= price_for(variant)+ end+ end+ end+ end+ end+enddiff --git a/api/app/serializers/spree/api/v3/store/wished_item_serializer.rb b/api/app/serializers/spree/api/v3/store/wished_item_serializer.rbnew file mode 100644index 0000000000..e10cca4e0c--- /dev/null+++ b/api/app/serializers/spree/api/v3/store/wished_item_serializer.rb@@ -0,0 +1,13 @@+module Spree+ module Api+ module V3+ module Store+ class WishedItemSerializer < BaseSerializer+ attributes :id, :variant_id, :wishlist_id, :quantity++ one :variant, resource: Spree.api.v3_store_variant_serializer+ end+ end+ end+ end+enddiff --git a/api/app/serializers/spree/api/v3/store/wishlist_serializer.rb b/api/app/serializers/spree/api/v3/store/wishlist_serializer.rbnew file mode 100644index 0000000000..fc650054cc--- /dev/null+++ b/api/app/serializers/spree/api/v3/store/wishlist_serializer.rb@@ -0,0 +1,24 @@+module Spree+ module Api+ module V3+ module Store+ class WishlistSerializer < BaseSerializer+ attributes :id, :name, :token++ attribute :is_default do |wishlist|+ wishlist.is_default?+ end++ attribute :is_private do |wishlist|+ wishlist.is_private?+ end++ many :wished_items,+ key: :items,+ resource: Spree.api.v3_store_wished_item_serializer,+ if: proc { params[:includes]&.include?('items') }+ end+ end+ end+ end+enddiff --git a/api/app/serializers/spree/api/v3/store_serializer.rb b/api/app/serializers/spree/api/v3/store_serializer.rbdeleted file mode 100644index 2dd06c4bc8..0000000000--- a/api/app/serializers/spree/api/v3/store_serializer.rb+++ /dev/null@@ -1,37 +0,0 @@-module Spree- module Api- module V3- class StoreSerializer < BaseSerializer- attributes :id, :name, :url, :meta_description, :meta_keywords, :seo_title,- :default_currency, :code, :default, :facebook, :twitter,- :instagram, :customer_support_email, :default_locale-- attribute :supported_currencies do |store|- store.supported_currencies_list.map(&:iso_code)- end-- attribute :favicon_image_url do |store|- image_url_for(store.favicon_image)- end-- attribute :logo_image_url do |store|- image_url_for(store.logo)- end-- attribute :social_image_url do |store|- image_url_for(store.social_image)- end-- attribute :supported_locales do |store|- store.supported_locales_list- end-- many :payment_methods,- proc { |payment_methods, _params|- payment_methods.select { |pm| pm.available_on_front_end? && pm.active? }- },- resource: Spree.api.v3_storefront_payment_method_serializer- end- end- end-enddiff --git a/api/app/serializers/spree/api/v3/taxon_serializer.rb b/api/app/serializers/spree/api/v3/taxon_serializer.rbdeleted file mode 100644index b915accf9d..0000000000--- a/api/app/serializers/spree/api/v3/taxon_serializer.rb+++ /dev/null@@ -1,48 +0,0 @@-module Spree- module Api- module V3- class TaxonSerializer < BaseSerializer- attributes :id, :name, :permalink, :position, :lft, :rgt, :depth,- :meta_title, :meta_description, :meta_keywords,- :parent_id, :taxonomy_id, :children_count-- attribute :description do |taxon|- taxon.description.to_plain_text- end-- attribute :description_html do |taxon|- taxon.description.to_s- end-- attribute :image_url do |taxon|- image_url_for(taxon.image)- end-- attribute :square_image_url do |taxon|- image_url_for(taxon.square_image)- end-- attribute :is_root do |taxon|- taxon.root?- end-- attribute :is_child do |taxon|- taxon.child?- end-- attribute :is_leaf do |taxon|- taxon.leaf?- end-- # Conditional associations- one :parent,- resource: Spree.api.v3_storefront_taxon_serializer,- if: proc { params[:includes]&.include?('parent') }-- many :children,- resource: Spree.api.v3_storefront_taxon_serializer,- if: proc { params[:includes]&.include?('children') }- end- end- end-enddiff --git a/api/app/serializers/spree/api/v3/taxonomy_serializer.rb b/api/app/serializers/spree/api/v3/taxonomy_serializer.rbdeleted file mode 100644index ed9512ace5..0000000000--- a/api/app/serializers/spree/api/v3/taxonomy_serializer.rb+++ /dev/null@@ -1,18 +0,0 @@-module Spree- module Api- module V3- class TaxonomySerializer < BaseSerializer- attributes :id, :name, :position-- # Conditional associations- one :root,- resource: Spree.api.v3_storefront_taxon_serializer,- if: proc { params[:includes]&.include?('root') }-- many :taxons,- resource: Spree.api.v3_storefront_taxon_serializer,- if: proc { params[:includes]&.include?('taxons') }- end- end- end-enddiff --git a/api/app/serializers/spree/api/v3/user_serializer.rb b/api/app/serializers/spree/api/v3/user_serializer.rbdeleted file mode 100644index 542a84f490..0000000000--- a/api/app/serializers/spree/api/v3/user_serializer.rb+++ /dev/null@@ -1,13 +0,0 @@-module Spree- module Api- module V3- class UserSerializer < BaseSerializer- attributes :id, :email, :first_name, :last_name-- many :addresses, resource: Spree.api.v3_storefront_address_serializer- one :default_billing_address, resource: Spree.api.v3_storefront_address_serializer- one :default_shipping_address, resource: Spree.api.v3_storefront_address_serializer- end- end- end-enddiff --git a/api/app/serializers/spree/api/v3/variant_serializer.rb b/api/app/serializers/spree/api/v3/variant_serializer.rbdeleted file mode 100644index 84a8275b22..0000000000--- a/api/app/serializers/spree/api/v3/variant_serializer.rb+++ /dev/null@@ -1,73 +0,0 @@-module Spree- module Api- module V3- class VariantSerializer < BaseSerializer- attributes :id, :product_id, :sku, :barcode, :is_master, :options_text, :track_inventory, :image_count-- attribute :purchasable do |variant|- variant.purchasable?- end-- attribute :in_stock do |variant|- variant.in_stock?- end-- attribute :backorderable do |variant|- variant.backorderable?- end-- attribute :weight do |variant|- variant.weight&.to_f- end-- attribute :height do |variant|- variant.height&.to_f- end-- attribute :width do |variant|- variant.width&.to_f- end-- attribute :depth do |variant|- variant.depth&.to_f- end-- attribute :price do |variant|- price_object(variant)&.amount&.to_f- end-- attribute :price_in_cents do |variant|- price_object(variant)&.display_amount&.amount_in_cents- end-- attribute :display_price do |variant|- price_object(variant)&.display_price&.to_s- end-- attribute :compare_at_price do |variant|- price_object(variant)&.compare_at_amount&.to_f- end-- attribute :display_compare_at_price do |variant|- price = price_object(variant)- next unless price&.compare_at_amount-- Spree::Money.new(price.compare_at_amount, currency: currency).to_s- end-- # Conditional associations- many :images,- resource: Spree.api.v3_storefront_image_serializer,- if: proc { params[:includes]&.include?('images') }-- many :option_values, resource: Spree.api.v3_storefront_option_value_serializer-- private-- def price_object(variant)- @price_object ||= price_for(variant)- end- end- end- end-enddiff --git a/api/app/serializers/spree/api/v3/wished_item_serializer.rb b/api/app/serializers/spree/api/v3/wished_item_serializer.rbdeleted file mode 100644index 5225baaac9..0000000000--- a/api/app/serializers/spree/api/v3/wished_item_serializer.rb+++ /dev/null@@ -1,11 +0,0 @@-module Spree- module Api- module V3- class WishedItemSerializer < BaseSerializer- attributes :id, :variant_id, :wishlist_id, :quantity-- one :variant, resource: Spree.api.v3_storefront_variant_serializer- end- end- end-enddiff --git a/api/app/serializers/spree/api/v3/wishlist_serializer.rb b/api/app/serializers/spree/api/v3/wishlist_serializer.rbdeleted file mode 100644index 9267a5eebf..0000000000--- a/api/app/serializers/spree/api/v3/wishlist_serializer.rb+++ /dev/null@@ -1,22 +0,0 @@-module Spree- module Api- module V3- class WishlistSerializer < BaseSerializer- attributes :id, :name, :token-- attribute :is_default do |wishlist|- wishlist.is_default?- end-- attribute :is_private do |wishlist|- wishlist.is_private?- end-- many :wished_items,- key: :items,- resource: Spree.api.v3_storefront_wished_item_serializer,- if: proc { params[:includes]&.include?('items') }- end- end- end-enddiff --git a/api/config/routes.rb b/api/config/routes.rbindex b969d0e4bc..2ef4be2318 100644--- a/api/config/routes.rb+++ b/api/config/routes.rb@@ -219,7 +219,7 @@ Spree::Core::Engine.add_routes doendnamespace :v3 do- namespace :storefront do+ namespace :store do# Authenticationpost 'auth/login', to: 'auth#create'post 'auth/register', to: 'auth#register'@@ -248,8 +248,8 @@ Spree::Core::Engine.add_routes doend# Nested resources - all require order access- resources :line_items, only: [:create, :show, :update, :destroy]- resources :coupon_codes, only: [:create, :destroy]+ resources :line_items, only: [:create, :update, :destroy]+ resources :order_promotions, only: [:create, :destroy]end# Customerdiff --git a/api/lib/spree/api/dependencies.rb b/api/lib/spree/api/dependencies.rbindex ac822ec8ce..d54db8357c 100644--- a/api/lib/spree/api/dependencies.rb+++ b/api/lib/spree/api/dependencies.rb@@ -91,30 +91,31 @@ module Spreestorefront_metafield_serializer: 'Spree::V2::Storefront::MetafieldSerializer',# v3 storefront serializers- v3_storefront_credit_card_serializer: 'Spree::Api::V3::CreditCardSerializer',- v3_storefront_product_serializer: 'Spree::Api::V3::ProductSerializer',- v3_storefront_variant_serializer: 'Spree::Api::V3::VariantSerializer',- v3_storefront_image_serializer: 'Spree::Api::V3::ImageSerializer',- v3_storefront_option_type_serializer: 'Spree::Api::V3::OptionTypeSerializer',- v3_storefront_option_value_serializer: 'Spree::Api::V3::OptionValueSerializer',- v3_storefront_order_serializer: 'Spree::Api::V3::OrderSerializer',- v3_storefront_line_item_serializer: 'Spree::Api::V3::LineItemSerializer',- v3_storefront_payment_serializer: 'Spree::Api::V3::PaymentSerializer',- v3_storefront_payment_source_serializer: 'Spree::Api::V3::PaymentSourceSerializer',- v3_storefront_shipment_serializer: 'Spree::Api::V3::ShipmentSerializer',- v3_storefront_address_serializer: 'Spree::Api::V3::AddressSerializer',- v3_storefront_user_serializer: 'Spree::Api::V3::UserSerializer',- v3_storefront_country_serializer: 'Spree::Api::V3::CountrySerializer',- v3_storefront_state_serializer: 'Spree::Api::V3::StateSerializer',- v3_storefront_store_serializer: 'Spree::Api::V3::StoreSerializer',- v3_storefront_wishlist_serializer: 'Spree::Api::V3::WishlistSerializer',- v3_storefront_wished_item_serializer: 'Spree::Api::V3::WishedItemSerializer',- v3_storefront_payment_method_serializer: 'Spree::Api::V3::PaymentMethodSerializer',- v3_storefront_shipping_method_serializer: 'Spree::Api::V3::ShippingMethodSerializer',- v3_storefront_shipping_rate_serializer: 'Spree::Api::V3::ShippingRateSerializer',- v3_storefront_stock_location_serializer: 'Spree::Api::V3::StockLocationSerializer',- v3_storefront_taxonomy_serializer: 'Spree::Api::V3::TaxonomySerializer',- v3_storefront_taxon_serializer: 'Spree::Api::V3::TaxonSerializer',+ v3_store_credit_card_serializer: 'Spree::Api::V3::Store::CreditCardSerializer',+ v3_store_product_serializer: 'Spree::Api::V3::Store::ProductSerializer',+ v3_store_variant_serializer: 'Spree::Api::V3::Store::VariantSerializer',+ v3_store_image_serializer: 'Spree::Api::V3::Store::ImageSerializer',+ v3_store_option_type_serializer: 'Spree::Api::V3::Store::OptionTypeSerializer',+ v3_store_option_value_serializer: 'Spree::Api::V3::Store::OptionValueSerializer',+ v3_store_order_serializer: 'Spree::Api::V3::Store::OrderSerializer',+ v3_store_line_item_serializer: 'Spree::Api::V3::Store::LineItemSerializer',+ v3_store_payment_serializer: 'Spree::Api::V3::Store::PaymentSerializer',+ v3_store_payment_source_serializer: 'Spree::Api::V3::Store::PaymentSourceSerializer',+ v3_store_shipment_serializer: 'Spree::Api::V3::Store::ShipmentSerializer',+ v3_store_address_serializer: 'Spree::Api::V3::Store::AddressSerializer',+ v3_store_user_serializer: 'Spree::Api::V3::Store::UserSerializer',+ v3_store_country_serializer: 'Spree::Api::V3::Store::CountrySerializer',+ v3_store_state_serializer: 'Spree::Api::V3::Store::StateSerializer',+ v3_store_store_serializer: 'Spree::Api::V3::Store::StoreSerializer',+ v3_store_wishlist_serializer: 'Spree::Api::V3::Store::WishlistSerializer',+ v3_store_wished_item_serializer: 'Spree::Api::V3::Store::WishedItemSerializer',+ v3_store_payment_method_serializer: 'Spree::Api::V3::Store::PaymentMethodSerializer',+ v3_store_shipping_method_serializer: 'Spree::Api::V3::Store::ShippingMethodSerializer',+ v3_store_shipping_rate_serializer: 'Spree::Api::V3::Store::ShippingRateSerializer',+ v3_store_stock_location_serializer: 'Spree::Api::V3::Store::StockLocationSerializer',+ v3_store_taxonomy_serializer: 'Spree::Api::V3::Store::TaxonomySerializer',+ v3_store_taxon_serializer: 'Spree::Api::V3::Store::TaxonSerializer',+ v3_store_order_promotion_serializer: 'Spree::Api::V3::Store::OrderPromotionSerializer',# platform serializersplatform_metafield_serializer: 'Spree::Api::V2::Platform::MetafieldSerializer',