spree_api 4.1.12 → 4.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38bd4bf2ae62f5f2019c58e30756ca2ff678469f4efa5264a82400abc9af6f48
-  data.tar.gz: 199f6ebcf4a79862a238dd08ca444ec8938d85bb4f47b4386a71060efe8e5d21
+  metadata.gz: 0e97b8e826fb8c422cac7fd8f2c48ed976bd801d2cd6b6a83d2bc63e7502680f
+  data.tar.gz: 590a06b109db49907897f093deefddeba7a1c9179a899507a4afb6634ce1351d
 SHA512:
-  metadata.gz: ed12d85f966d2b03b6c1efd27ab9641d74b669dfe11908b16045e907900b5f9514af54e41d1ec91e4034017a4f981f7040c7cf169536b406c150a2ac85505b47
-  data.tar.gz: 11f665989207e8d720e7b06b1ca96c84b9d0540b08c7cbb9ce17fc154ca784917a3f7602ac3634569d258ce0c5f96cca3386e3e913db7acc456e575a19596093
+  metadata.gz: e38f559497fd36c7bd4660352ad2761002a07d441eaacce603eb4c9ae11a27ae5241715ff071dee71acd487f8c8368ca61ce301660b0b052bdd0d1379400d56e
+  data.tar.gz: c441f94c2e98c93b06dd0afefbf1fb9cd0aa5b27fa1057182bd135f8bd3c6dfe5325c54e0504aa44c75ee39015fb67261f43b74b4acdeea5bf765adcacf1dd68

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

@@ -35,11 +35,11 @@ module Spree
             end
 
             def collection_serializer
-              Spree::Api::Dependencies.storefront_cart_serializer.constantize
+              Spree::Api::Dependencies.storefront_order_serializer.constantize
             end
 
             def resource_serializer
-              Spree::Api::Dependencies.storefront_cart_serializer.constantize
+              Spree::Api::Dependencies.storefront_order_serializer.constantize
             end
 
             def collection_finder

data/app/models/spree/api_dependencies.rb

@@ -14,7 +14,7 @@ module Spree
       :storefront_collection_paginator, :storefront_user_serializer, :storefront_products_sorter, :storefront_products_finder,
       :storefront_product_serializer, :storefront_taxon_serializer, :storefront_taxon_finder, :storefront_find_by_variant_finder,
       :storefront_cart_update_service, :storefront_cart_estimate_shipping_rates_service, :storefront_estimated_shipment_serializer,
-      :storefront_store_serializer, :storefront_address_serializer,
+      :storefront_store_serializer, :storefront_address_serializer, :storefront_order_serializer,
       :storefront_account_create_address_service, :storefront_account_update_address_service, :storefront_address_finder
     ].freeze
 
@@ -66,6 +66,7 @@ module Spree
       @storefront_product_serializer = 'Spree::V2::Storefront::ProductSerializer'
       @storefront_estimated_shipment_serializer = 'Spree::V2::Storefront::EstimatedShippingRateSerializer'
       @storefront_store_serializer = 'Spree::V2::Storefront::StoreSerializer'
+      @storefront_order_serializer = 'Spree::V2::Storefront::CartSerializer'
 
       # sorters
       @storefront_order_sorter = Spree::Dependencies.order_sorter

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

@@ -9,7 +9,8 @@ module Spree
                    :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,
-                   :pre_tax_item_amount, :display_pre_tax_item_amount, :pre_tax_total, :display_pre_tax_total
+                   :pre_tax_item_amount, :display_pre_tax_item_amount, :pre_tax_total, :display_pre_tax_total,
+                   :shipment_state, :payment_state
 
         has_many   :line_items
         has_many   :variants

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

@@ -8,7 +8,7 @@ module Spree
         has_one :payment_method
 
         attributes :amount, :response_code, :number, :cvv_response_code, :cvv_response_message,
-                   :payment_method_id, :payment_method_name
+                   :payment_method_id, :payment_method_name, :state
       end
     end
   end

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

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

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

@@ -4,7 +4,7 @@ module Spree
       class StoreCreditSerializer < BaseSerializer
         set_type :store_credit
 
-        belongs_to :category
+        belongs_to :category, serializer: :store_credit_category
         has_many :store_credit_events
         belongs_to :credit_type,
                    id_method_name: :type_id,

data/lib/spree/api/testing_support/v2/current_order.rb

@@ -27,6 +27,8 @@ shared_examples 'returns valid cart JSON' do
     expect(json_response['data']).to have_type('cart')
     expect(json_response['data']).to have_attribute(:number).with_value(order.number)
     expect(json_response['data']).to have_attribute(:state).with_value(order.state)
+    expect(json_response['data']).to have_attribute(:payment_state).with_value(order.payment_state)
+    expect(json_response['data']).to have_attribute(:shipment_state).with_value(order.shipment_state)
     expect(json_response['data']).to have_attribute(:token).with_value(order.token)
     expect(json_response['data']).to have_attribute(:total).with_value(order.total.to_s)
     expect(json_response['data']).to have_attribute(:item_total).with_value(order.item_total.to_s)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 4.1.12
+  version: 4.1.13
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2020-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-rspec
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.12
+        version: 4.1.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.12
+        version: 4.1.13
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -169,6 +169,7 @@ files:
 - app/serializers/spree/v2/storefront/shipping_rate_serializer.rb
 - app/serializers/spree/v2/storefront/state_serializer.rb
 - app/serializers/spree/v2/storefront/stock_location_serializer.rb
+- app/serializers/spree/v2/storefront/store_credit_category_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
@@ -306,9 +307,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.1.12
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.1.13
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.1.12
+  source_code_uri: https://github.com/spree/spree/tree/v4.1.13
 post_install_message:
 rdoc_options: []
 require_paths: