spree_api 3.7.0.rc1 → 3.7.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 966dd14cce417e7119d423b7b05d052b85e0f0372f7bcb04c966f239cf8aafae
-  data.tar.gz: e6903c09540a78763157058235d32dc07405747646dc24f2b980ab7df19249d6
+  metadata.gz: 27ba29a8ab5de5c7606f6707d735c73063ee4525961d8e22906b9145af89a9de
+  data.tar.gz: 4cc4d78e86ac737ce57d57c27a72f9759038edd6196b9315debdd9dda0cdc31f
 SHA512:
-  metadata.gz: e8ad9bc26e1c98498461bd06975be490627cb53857cb2ca64a01a40e410e866978c7387ee46102d1a39b96f0f751bd14d2da33c3f8928617fb28e12d4b37e4cb
-  data.tar.gz: cfc7d9802acc6f4a82bf5ccc56028ed303663fe1495292d2f0a1c507a7da63adcd82dbfbaea29fcf3c334e3c17aab63a811487d33a75c29f1a020671de62d06c
+  metadata.gz: 1fb141c57d7361926931e1a812273bbbee9f632fa2a8ff0755229b1abd0dfedcd36f504676516410f136190de522415c0f8e2497ad93936a4d774a67fa0c1fff
+  data.tar.gz: c8f51c67395b4b68133b856e9844b216cbfed071d0de7a4ae0a7a4053e4ac0053bfd5ba30fc95e46edf1532a3be220e951ae06c90f4b8700c574e2bdaca4b703

data/app/controllers/spree/api/v2/storefront/account/credit_cards_controller.rb

@@ -23,8 +23,8 @@ module Spree
             def dependencies
               {
                 resource_finder: Spree::CreditCards::Find,
-                collection_serializer: Spree::V2::Storefront::Account::CreditCardSerializer,
-                resource_serializer: Spree::V2::Storefront::Account::CreditCardSerializer
+                collection_serializer: Spree::V2::Storefront::CreditCardSerializer,
+                resource_serializer: Spree::V2::Storefront::CreditCardSerializer
               }
             end
 

data/app/controllers/spree/api/v2/storefront/account/orders_controller.rb

@@ -0,0 +1,80 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        module Account
+          class OrdersController < ::Spree::Api::V2::BaseController
+            include Spree::Api::V2::CollectionOptionsHelpers
+            before_action :require_spree_current_user
+
+            def index
+              render_serialized_payload { serialize_collection(paginated_collection) }
+            end
+
+            def show
+              spree_authorize! :show, resource
+
+              render_serialized_payload { serialize_resource(resource) }
+            end
+
+            private
+
+            def paginated_collection
+              dependencies[:collection_paginator].new(sorted_collection, params).call
+            end
+
+            def sorted_collection
+              dependencies[:collection_sorter].new(collection, params).call
+            end
+
+            def collection
+              dependencies[:collection_finder].new(user: spree_current_user).execute
+            end
+
+            def resource
+              resource = dependencies[:resource_finder].new(user: spree_current_user, number: params[:id]).execute.take
+              raise ActiveRecord::RecordNotFound if resource.nil?
+
+              resource
+            end
+
+            def serialize_collection(collection)
+              dependencies[:collection_serializer].new(
+                collection,
+                collection_options(collection)
+              ).serializable_hash
+            end
+
+            def serialize_resource(resource)
+              dependencies[:resource_serializer].new(
+                resource,
+                include: resource_includes,
+                sparse_fields: sparse_fields
+              ).serializable_hash
+            end
+
+            def dependencies
+              {
+                collection_sorter: Spree::Orders::Sort,
+                resource_finder: Spree::Orders::FindComplete,
+                resource_serializer: Spree::V2::Storefront::CartSerializer,
+                collection_serializer: Spree::V2::Storefront::CartSerializer,
+                collection_finder: Spree::Orders::FindComplete,
+                collection_paginator: Spree::Shared::Paginate
+              }
+            end
+
+            def collection_options(collection)
+              {
+                links: collection_links(collection),
+                meta: collection_meta(collection),
+                include: resource_includes,
+                sparse_fields: sparse_fields
+              }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/storefront/account_controller.rb

@@ -24,7 +24,7 @@ module Spree
           end
 
           def dependencies
-            { resource_serializer: Spree::V2::Storefront::AccountSerializer }
+            { resource_serializer: Spree::V2::Storefront::UserSerializer }
           end
         end
       end

data/app/serializers/spree/v2/storefront/address_serializer.rb

@@ -5,9 +5,10 @@ module Spree
         set_type :address
 
         attributes :firstname, :lastname, :address1, :address2, :city, :zipcode, :phone, :state_name,
-                   :company, :country_name, :country_iso3
+                   :company, :country_name, :country_iso3, :country_iso
 
         attribute :state_code, &:state_abbr
+        attribute :state_name, &:state_name_text
       end
     end
   end

data/app/serializers/spree/v2/storefront/cart_serializer.rb

@@ -5,7 +5,7 @@ module Spree
         set_type :cart
 
         attributes :number, :item_total, :total, :ship_total, :adjustment_total, :created_at,
-                   :updated_at, :included_tax_total, :additional_tax_total, :display_additional_tax_total,
+                   :updated_at, :completed_at, :included_tax_total, :additional_tax_total, :display_additional_tax_total,
                    :display_included_tax_total, :tax_total, :currency, :state, :token, :email,
                    :display_item_total, :display_ship_total, :display_adjustment_total, :display_tax_total,
                    :promo_total, :display_promo_total, :item_count, :special_instructions, :display_total

data/app/serializers/spree/v2/storefront/credit_card_serializer.rb

@@ -0,0 +1,13 @@
+module Spree
+  module V2
+    module Storefront
+      class CreditCardSerializer < BaseSerializer
+        set_type :credit_card
+
+        attributes :cc_type, :last_digits, :month, :year, :name, :default
+
+        belongs_to :payment_method
+      end
+    end
+  end
+end

data/app/serializers/spree/v2/storefront/line_item_serializer.rb

@@ -7,6 +7,7 @@ module Spree
         attributes :name, :quantity, :price, :slug, :options_text, :currency,
                    :display_price, :total, :display_total, :adjustment_total,
                    :display_adjustment_total, :additional_tax_total,
+                   :discounted_amount, :display_discounted_amount,
                    :display_additional_tax_total, :promo_total, :display_promo_total,
                    :included_tax_total, :display_included_tax_total
 

data/app/serializers/spree/v2/storefront/option_type_serializer.rb

@@ -4,7 +4,7 @@ module Spree
       class OptionTypeSerializer < BaseSerializer
         set_type   :option_type
 
-        attributes :id, :name, :presentation, :position
+        attributes :name, :presentation, :position
 
         has_many   :option_values
       end

data/app/serializers/spree/v2/storefront/option_value_serializer.rb

@@ -4,7 +4,9 @@ module Spree
       class OptionValueSerializer < BaseSerializer
         set_type   :option_value
 
-        attributes :id, :name, :presentation, :position
+        attributes :name, :presentation, :position
+
+        belongs_to :option_type
       end
     end
   end

data/app/serializers/spree/v2/storefront/payment_serializer.rb

@@ -4,6 +4,9 @@ module Spree
       class PaymentSerializer < BaseSerializer
         set_type :payment
 
+        has_one :source, polymorphic: true
+        has_one :payment_method
+
         attributes :amount, :response_code, :number, :cvv_response_code, :cvv_response_message,
                    :payment_method_id, :payment_method_name
       end

data/app/serializers/spree/v2/storefront/store_credit_event_serializer.rb

@@ -0,0 +1,15 @@
+module Spree
+  module V2
+    module Storefront
+      class StoreCreditEventSerializer < BaseSerializer
+        set_type :store_credit_event
+
+        attributes :action, :amount, :user_total_amount, :created_at
+
+        attribute :order_number do |object|
+          object.order&.number
+        end
+      end
+    end
+  end
+end

data/app/serializers/spree/v2/storefront/store_credit_serializer.rb

@@ -0,0 +1,17 @@
+module Spree
+  module V2
+    module Storefront
+      class StoreCreditSerializer < BaseSerializer
+        set_type :store_credit
+
+        belongs_to :category
+        has_many :store_credit_events
+        belongs_to :credit_type,
+                   id_method_name: :type_id,
+                   serializer: :store_credit_type
+
+        attributes :amount, :amount_used, :created_at
+      end
+    end
+  end
+end

data/app/serializers/spree/v2/storefront/store_credit_type_serializer.rb

@@ -0,0 +1,11 @@
+module Spree
+  module V2
+    module Storefront
+      class StoreCreditTypeSerializer < BaseSerializer
+        set_type :store_credit_type
+
+        attributes :name
+      end
+    end
+  end
+end

data/app/serializers/spree/v2/storefront/user_serializer.rb

@@ -2,9 +2,27 @@ module Spree
   module V2
     module Storefront
       class UserSerializer < BaseSerializer
-        set_type   :user
+        set_type :user
 
         attributes :email
+
+        attribute :store_credits, &:total_available_store_credit
+
+        attribute :completed_orders do |object|
+          object.orders.complete.count
+        end
+
+        has_one :default_billing_address,
+          id_method_name: :bill_address_id,
+          object_method_name: :bill_address,
+          record_type: :address,
+          serializer: :address
+
+        has_one :default_shipping_address,
+          id_method_name: :ship_address_id,
+          object_method_name: :ship_address,
+          record_type: :address,
+          serializer: :address
       end
     end
   end

data/app/serializers/spree/v2/storefront/variant_serializer.rb

@@ -5,8 +5,7 @@ module Spree
         set_type :variant
 
         attributes :name, :sku, :price, :currency, :display_price, :weight, :height,
-                   :width, :depth, :is_master, :options_text, :slug, :description,
-                   :track_inventory
+                   :width, :depth, :is_master, :options_text, :slug, :description
 
         attribute :purchasable,   &:purchasable?
         attribute :in_stock,      &:in_stock?

data/config/routes.rb

@@ -153,6 +153,7 @@ Spree::Core::Engine.add_routes do
 
         namespace :account do
           resources :credit_cards, controller: :credit_cards, only: %i[index show]
+          resources :orders, controller: :orders, only: %i[index show]
         end
 
         resources :countries, only: %i[index]

data/docs/v2/storefront/index.yaml

@@ -90,6 +90,50 @@ paths:
         - $ref: '#/components/parameters/SparseFieldsParam'
       security:
         - bearerAuth: []
+  '/account/orders':
+    get:
+      description: Returns Orders placed by the User. Only completed ones.
+      tags:
+        - Account
+      operationId: 'Completed Orders'
+      responses:
+        '200':
+          description: Listing user completed orders.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/CartList'
+        '403':
+          $ref: '#/components/responses/403Forbidden'
+      parameters:
+        - $ref: '#/components/parameters/CartIncludeParam'
+        - $ref: '#/components/parameters/SparseFieldsParam'
+        - $ref: '#/components/parameters/PageParam'
+        - $ref: '#/components/parameters/PerPageParam'
+      security:
+        - bearerAuth: []
+  '/account/orders/{number}':
+    get:
+      description: >-
+        Return the User's completed Order
+      tags:
+        - Account
+      operationId: 'Completed User Order'
+      responses:
+        '200':
+          description: Listing user completed order.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Cart'
+        '403':
+          $ref: '#/components/responses/403Forbidden'
+      parameters:
+        - $ref: '#/components/parameters/OrderParam'
+        - $ref: '#/components/parameters/CartIncludeParam'
+        - $ref: '#/components/parameters/SparseFieldsParam'
+      security:
+        - bearerAuth: []
   '/cart':
     post:
       description: >-
@@ -363,7 +407,7 @@ paths:
                 phone: '3014445002',
                 zipcode: '20814',
                 state_name: 'MD',
-                country_id: 232
+                country_iso: 'US'
               }
             },
             ship_address_attributes: {
@@ -375,7 +419,7 @@ paths:
                 phone: '3014445002',
                 zipcode: '20814',
                 state_name: 'MD',
-                country_id: 232
+                country_iso: 'US'
               }
             }
           }
@@ -1015,149 +1059,12 @@ components:
       properties:
         data:
           type: object
+          $ref: '#/components/schemas/CartAttributesWithRelationships'
           required:
             - id
             - type
             - attributes
             - relationships
-          properties:
-            id:
-              type: string
-              example: '1'
-            type:
-              type: string
-              default: 'cart'
-            attributes:
-              type: object
-              properties:
-                number:
-                  type: string
-                  example: 'R123456789'
-                email:
-                  type: string
-                  example: 'spree@example.com'
-                item_total:
-                  type: string
-                  example: '19.99'
-                display_item_total:
-                  type: string
-                  example: '$19.99'
-                total:
-                  type: string
-                  example: '29.99'
-                display_total:
-                  type: string
-                  example: '$29.99'
-                ship_total:
-                  type: string
-                  example: '0.0'
-                display_ship_total:
-                  type: string
-                  example: '$19.99'
-                adjustment_total:
-                  type: string
-                  example: '10.0'
-                display_adjustment_total:
-                  type: string
-                  example: '$10.00'
-                promo_total:
-                  type: string
-                  example: '-10.0'
-                display_promo_total:
-                  type: string
-                  example: '-$10.00'
-                created_at:
-                  $ref: '#/components/schemas/Timestamp'
-                updated_at:
-                  $ref: '#/components/schemas/Timestamp'
-                included_tax_total:
-                  type: string
-                  example: '5.00'
-                additional_tax_total:
-                  type: string
-                  example: '5.0'
-                display_additional_tax_total:
-                  type: string
-                  example: '$5.00'
-                display_included_tax_total:
-                  type: string
-                  example: '$5.00'
-                tax_total:
-                  type: string
-                  example: '10.0'
-                display_tax_total:
-                  type: string
-                  example: '$10.00'
-                item_count:
-                  type: number
-                  example: 2
-                  description: 'Total quantity number of all items added to the Cart'
-                special_instructions:
-                  type: string
-                  example: 'Please wrap it as a gift'
-                  description: 'Message added by the Customer'
-                currency:
-                  type: string
-                  example: 'USD'
-                state:
-                  type: string
-                  example: 'address'
-                  description: 'State of the Cart in the Checkout flow'
-                token:
-                  type: string
-                  example: abcdef123456
-                  description: >-
-                    Used for authorizing any action for an order within Spree’s
-                    API
-            relationships:
-              type: object
-              properties:
-                line_items:
-                  type: object
-                  properties:
-                    data:
-                      type: array
-                      items:
-                        $ref: '#/components/schemas/Relation'
-                promotions:
-                  type: object
-                  properties:
-                    data:
-                      type: array
-                      items:
-                        $ref: '#/components/schemas/Relation'
-                variants:
-                  type: object
-                  properties:
-                    data:
-                      type: array
-                      items:
-                        $ref: '#/components/schemas/Relation'
-                user:
-                  type: object
-                  properties:
-                    data:
-                      $ref: '#/components/schemas/Relation'
-                billing_address:
-                  type: object
-                  properties:
-                    data:
-                      $ref: '#/components/schemas/Relation'
-                shipping_address:
-                  type: object
-                  properties:
-                    data:
-                      $ref: '#/components/schemas/Relation'
-                payments:
-                  type: object
-                  properties:
-                    data:
-                      $ref: '#/components/schemas/Relation'
-                shipments:
-                  type: object
-                  properties:
-                    data:
-                      $ref: '#/components/schemas/Relation'
         included:
           type: array
           items:
@@ -1169,10 +1076,172 @@ components:
               - $ref: '#/components/schemas/User'
               - $ref: '#/components/schemas/Address'
               - $ref: '#/components/schemas/ShipmentAttributesWithoutRelationsips'
-    CreditCardList:
+    CartList:
       required:
         - data
         - included
+      properties:
+        data:
+          required:
+            - id
+            - type
+            - attributes
+            - relationships
+          type: array
+          items:
+            $ref: '#/components/schemas/CartAttributesWithRelationships'
+        included:
+          type: array
+          items:
+            type: object
+            oneOf:
+              - $ref: '#/components/schemas/VariantAttributesAndRelationships'
+              - $ref: '#/components/schemas/LineItem'
+              - $ref: '#/components/schemas/Promotion'
+              - $ref: '#/components/schemas/User'
+              - $ref: '#/components/schemas/Address'
+              - $ref: '#/components/schemas/ShipmentAttributesWithoutRelationsips'
+    CartAttributesWithRelationships:
+      properties:
+        id:
+          type: string
+          example: '1'
+        type:
+          type: string
+          example: 'cart'
+        attributes:
+          $ref: '#/components/schemas/CartAttributes'
+        relationships:
+          $ref: '#/components/schemas/CartRelationships'
+    CartRelationships:
+      type: object
+      properties:
+        line_items:
+          type: object
+          description: ''
+          properties:
+            data:
+              $ref: '#/components/schemas/Relation'
+        promotions:
+          type: object
+          properties:
+            data:
+              $ref: '#/components/schemas/Relation'
+        variants:
+          type: object
+          properties:
+            data:
+              $ref: '#/components/schemas/Relation'
+        user:
+          type: object
+          properties:
+            data:
+              $ref: '#/components/schemas/Relation'
+        billing_address:
+          type: object
+          properties:
+            data:
+              $ref: '#/components/schemas/Relation'
+        shipping_address:
+          type: object
+          properties:
+            data:
+              $ref: '#/components/schemas/Relation'
+        payments:
+          type: object
+          properties:
+            data:
+              $ref: '#/components/schemas/Relation'
+        shipments:
+          type: object
+          properties:
+            data:
+              $ref: '#/components/schemas/Relation'
+    CartAttributes:
+      type: object
+      properties:
+        number:
+          type: string
+          example: 'R123456789'
+        email:
+          type: string
+          example: 'spree@example.com'
+        item_total:
+          type: string
+          example: '19.99'
+        display_item_total:
+          type: string
+          example: '$19.99'
+        total:
+          type: string
+          example: '29.99'
+        display_total:
+          type: string
+          example: '$29.99'
+        ship_total:
+          type: string
+          example: '0.0'
+        display_ship_total:
+          type: string
+          example: '$19.99'
+        adjustment_total:
+          type: string
+          example: '10.0'
+        display_adjustment_total:
+          type: string
+          example: '$10.00'
+        promo_total:
+          type: string
+          example: '-10.0'
+        display_promo_total:
+          type: string
+          example: '-$10.00'
+        created_at:
+          $ref: '#/components/schemas/Timestamp'
+        updated_at:
+          $ref: '#/components/schemas/Timestamp'
+        included_tax_total:
+          type: string
+          example: '5.00'
+        additional_tax_total:
+          type: string
+          example: '5.0'
+        display_additional_tax_total:
+          type: string
+          example: '$5.00'
+        display_included_tax_total:
+          type: string
+          example: '$5.00'
+        tax_total:
+          type: string
+          example: '10.0'
+        display_tax_total:
+          type: string
+          example: '$10.00'
+        item_count:
+          type: number
+          example: 2
+          description: 'Total quantity number of all items added to the Cart'
+        special_instructions:
+          type: string
+          example: 'Please wrap it as a gift'
+          description: 'Message added by the Customer'
+        currency:
+          type: string
+          example: 'USD'
+        state:
+          type: string
+          example: 'address'
+          description: 'State of the Cart in the Checkout flow'
+        token:
+          type: string
+          example: abcdef123456
+          description: >-
+            Used for authorizing any action for an order within Spree’s
+            API
+    CreditCardList:
+      required:
+        - included
       properties:
         data:
           type: array
@@ -1206,15 +1275,23 @@ components:
         last_digits:
           type: string
           example: '1232'
+          description: 'Last 4 digits of CC number'
         month:
           type: integer
           example: 10
+          description: 'Expiration date month'
         year:
           type: integer
           example: 2019
+          description: 'Expiration date year'
         name:
           type: string
           example: 'John Doe'
+          description: 'Card holder name'
+        default:
+          type: boolean
+          example: true
+          description: 'Defines if this is the default CC for a signed in user'
     CreditCardAttributesWithRelationships:
       properties:
         id:
@@ -1347,6 +1424,12 @@ components:
             display_additional_tax_total:
               type: string
               example: '$5.00'
+            discounted_amount:
+              type: string
+              example: '125.0'
+            display_discounted_amount:
+              type: string
+              example: '$125.00'
             promo_total:
               type: string
               example: '-5.0'
@@ -2237,9 +2320,13 @@ components:
         state_name:
           type: string
           description: 'State/region/province 2 letter abbrevation'
-        country_id:
-          type: number
-          description: 'ID number of Country in the database'
+        country_iso:
+          type: string
+          description: >-
+            Country ISO (2-chars) or ISO3 (3-chars) code, list of codes:
+            <a href="https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes" target="_blank" rel="noopener">
+              https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes
+            </a>
       example:
         firstname: 'John'
         lastname: 'Snow'
@@ -2249,7 +2336,7 @@ components:
         phone: '3014445002'
         zipcode: '20814'
         state_name: 'MD'
-        country_id: 232
+        country_iso: 'US'
 
   parameters:
     CreditCardIncludeParam:
@@ -2306,7 +2393,15 @@ components:
       description: Number of requested records per page when paginating collection
       schema:
         type: integer
-      example: 10
+      example:
+    OrderParam:
+      name: number
+      in: path
+      required: true
+      description: Number of Order
+      schema:
+        type: string
+      example: 'R653163382'
     CartIncludeParam:
       name: include
       in: query
@@ -2435,10 +2530,18 @@ components:
       content:
         application/json:
           schema:
-            $ref: '#/components/schemas/Error'
+            properties:
+              error:
+                type: string
+                example: 'The resource you were looking for could not be found.'
+                default: 'The resource you were looking for could not be found.'
     403Forbidden:
       description: You are not authorized to access this page.
       content:
         application/json:
           schema:
-            $ref: '#/components/schemas/Error'
+            properties:
+              error:
+                type: string
+                example: 'You are not authorized to access this page.'
+                default: 'You are not authorized to access this page.'

data/lib/spree/api/engine.rb

@@ -39,6 +39,10 @@ module Spree
         Spree::Api::Config = Spree::ApiConfiguration.new
       end
 
+      initializer 'spree.api.checking_migrations' do
+        Migrations.new(config, engine_name).check
+      end
+
       def self.activate
         Dir.glob(File.join(File.dirname(__FILE__), '../../../app/**/*_decorator*.rb')) do |c|
           Rails.configuration.cache_classes ? require(c) : load(c)

data/spree_api.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.homepage      = 'http://spreecommerce.org'
   s.license       = 'BSD-3-Clause'
 
-  s.required_ruby_version = '>= 2.3.0'
+  s.required_ruby_version = '>= 2.3.3'
 
   s.files         = `git ls-files`.split($\).reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
   s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 3.7.0.rc1
+  version: 3.7.0.rc2
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-11 00:00:00.000000000 Z
+date: 2019-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-rspec
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.0.rc1
+        version: 3.7.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.0.rc1
+        version: 3.7.0.rc2
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -143,6 +143,7 @@ files:
 - app/controllers/spree/api/v1/zones_controller.rb
 - app/controllers/spree/api/v2/base_controller.rb
 - app/controllers/spree/api/v2/storefront/account/credit_cards_controller.rb
+- app/controllers/spree/api/v2/storefront/account/orders_controller.rb
 - app/controllers/spree/api/v2/storefront/account_controller.rb
 - app/controllers/spree/api/v2/storefront/cart_controller.rb
 - app/controllers/spree/api/v2/storefront/checkout_controller.rb
@@ -157,12 +158,11 @@ files:
 - app/models/doorkeeper/access_token_decorator.rb
 - app/models/doorkeeper/application_decorator.rb
 - app/models/spree/api_configuration.rb
-- app/serializers/spree/v2/storefront/account/credit_card_serializer.rb
-- app/serializers/spree/v2/storefront/account_serializer.rb
 - app/serializers/spree/v2/storefront/address_serializer.rb
 - app/serializers/spree/v2/storefront/base_serializer.rb
 - app/serializers/spree/v2/storefront/cart_serializer.rb
 - app/serializers/spree/v2/storefront/country_serializer.rb
+- app/serializers/spree/v2/storefront/credit_card_serializer.rb
 - app/serializers/spree/v2/storefront/image_serializer.rb
 - app/serializers/spree/v2/storefront/line_item_serializer.rb
 - app/serializers/spree/v2/storefront/option_type_serializer.rb
@@ -175,6 +175,9 @@ files:
 - app/serializers/spree/v2/storefront/shipment_serializer.rb
 - app/serializers/spree/v2/storefront/shipping_rate_serializer.rb
 - app/serializers/spree/v2/storefront/state_serializer.rb
+- app/serializers/spree/v2/storefront/store_credit_event_serializer.rb
+- app/serializers/spree/v2/storefront/store_credit_serializer.rb
+- app/serializers/spree/v2/storefront/store_credit_type_serializer.rb
 - app/serializers/spree/v2/storefront/taxon_image_serializer.rb
 - app/serializers/spree/v2/storefront/taxon_serializer.rb
 - app/serializers/spree/v2/storefront/taxonomy_serializer.rb
@@ -313,7 +316,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.3.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
@@ -321,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Spree's API

data/app/serializers/spree/v2/storefront/account/credit_card_serializer.rb

@@ -1,16 +0,0 @@
-module Spree
-  module V2
-    module Storefront
-      module Account
-        class CreditCardSerializer < BaseSerializer
-          set_type :credit_card
-
-          attributes :cc_type, :last_digits, :month, :year, :name
-
-          belongs_to :payment_method,
-                     serializer: Spree::V2::Storefront::PaymentMethodSerializer
-        end
-      end
-    end
-  end
-end

data/app/serializers/spree/v2/storefront/account_serializer.rb

@@ -1,29 +0,0 @@
-module Spree
-  module V2
-    module Storefront
-      class AccountSerializer < BaseSerializer
-        set_type :user
-
-        attributes :email
-
-        attribute :store_credits, &:total_available_store_credit
-
-        attribute :completed_orders do |object|
-          object.orders.complete.count
-        end
-
-        has_one :default_billing_address,
-          id_method_name: :bill_address_id,
-          object_method_name: :bill_address,
-          record_type: :address,
-          serializer: :address
-
-        has_one :default_shipping_address,
-          id_method_name: :ship_address_id,
-          object_method_name: :ship_address,
-          record_type: :address,
-          serializer: :address
-      end
-    end
-  end
-end