Merge pull request spree#9223 from spark-solutions/3-7-stable

3.7.0 final release

Author: damianlegawiec

api/app/controllers/spree/api/v2/base_controller.rb

@@ -7,23 +7,27 @@ class BaseController < ActionController::API
         rescue_from ActiveRecord::RecordNotFound, with: :record_not_found
         rescue_from CanCan::AccessDenied, with: :access_denied
 
+        def content_type
+          Spree::Api::Config[:api_v2_content_type]
+        end
+
         private
 
         def collection_paginator
           Spree::Api::Dependencies.storefront_collection_paginator.constantize
         end
 
         def render_serialized_payload(status = 200)
-          render json: yield, status: status
+          render json: yield, status: status, content_type: content_type
         rescue ArgumentError => exception
           render_error_payload(exception.message, 400)
         end
 
         def render_error_payload(error, status = 422)
           if error.is_a?(Struct)
-            render json: { error: error.to_s, errors: error.to_h }, status: status
+            render json: { error: error.to_s, errors: error.to_h }, status: status, content_type: content_type
           elsif error.is_a?(String)
-            render json: { error: error }, status: status
+            render json: { error: error }, status: status, content_type: content_type
           end
         end
 

api/app/controllers/spree/api/v2/storefront/order_status_controller.rb

@@ -0,0 +1,40 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        class OrderStatusController < ::Spree::Api::V2::BaseController
+          include Spree::Api::V2::Storefront::OrderConcern
+
+          def show
+            render_serialized_payload { serialize_resource(resource) }
+          end
+
+          private
+
+          def resource
+            resource = resource_finder.new(number: params[:number], token: order_token).execute.take
+            raise ActiveRecord::RecordNotFound if resource.nil?
+
+            resource
+          end
+
+          def serialize_resource(resource)
+            resource_serializer.new(
+              resource,
+              include: resource_includes,
+              sparse_fields: sparse_fields
+            ).serializable_hash
+          end
+
+          def resource_finder
+            Spree::Api::Dependencies.storefront_completed_order_finder.constantize
+          end
+
+          def resource_serializer
+            Spree::Api::Dependencies.storefront_cart_serializer.constantize
+          end
+        end
+      end
+    end
+  end
+end

api/app/models/spree/api_configuration.rb

@@ -1,5 +1,6 @@
 module Spree
   class ApiConfiguration < Preferences::Configuration
     preference :requires_authentication, :boolean, default: true
+    preference :api_v2_content_type, :string, default: 'application/vnd.api+json'
   end
 end

api/config/initializers/json_api_mime_types.rb

@@ -0,0 +1,8 @@
+api_mime_types = %w(
+  application/vnd.api+json
+  text/x-json
+  application/json
+)
+
+Mime::Type.unregister :json
+Mime::Type.register 'application/json', :json, api_mime_types

api/config/routes.rb

@@ -158,6 +158,7 @@
 
         resources :countries, only: %i[index]
         get '/countries/:iso', to: 'countries#show', as: :country
+        get '/order_status/:number', to: 'order_status#show', as: :order_status
         resources :products, only: %i[index show]
         resources :taxons,   only: %i[index show]
       end