spree_api 4.1.8 → 4.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ce01ac97150e84ad430f83628328fa2b07a18166ad6d819a5143be5792a042c
-  data.tar.gz: 3f04100734efc0d0c88e8c58d7ae481a3158f46292144712cccd9fdea806fc24
+  metadata.gz: 0e97b8e826fb8c422cac7fd8f2c48ed976bd801d2cd6b6a83d2bc63e7502680f
+  data.tar.gz: 590a06b109db49907897f093deefddeba7a1c9179a899507a4afb6634ce1351d
 SHA512:
-  metadata.gz: bd83e6d0bae731fd7291905cf90de9da31a77d1b086cbbcbddc98030d395fb86f859b2b1a76ea6dd1132e0d30dd2b3f58b4c99b0809e6b6d44ab6396f834d5ed
-  data.tar.gz: 5c604cf0684a2589d054966bd5a6b4e1a215d21b0e5731a48c91718934e05bef3eb8783d1ddbc559ac258d2a3184445b0362341ecb4aeb451923f388726df2c8
+  metadata.gz: e38f559497fd36c7bd4660352ad2761002a07d441eaacce603eb4c9ae11a27ae5241715ff071dee71acd487f8c8368ca61ce301660b0b052bdd0d1379400d56e
+  data.tar.gz: c441f94c2e98c93b06dd0afefbf1fb9cd0aa5b27fa1057182bd135f8bd3c6dfe5325c54e0504aa44c75ee39015fb67261f43b74b4acdeea5bf765adcacf1dd68

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

@@ -53,7 +53,12 @@ module Spree
         end
 
         def spree_current_user
-          @spree_current_user ||= Spree.user_class.find_by(id: doorkeeper_token.resource_owner_id) if doorkeeper_token
+          return nil unless doorkeeper_token
+          return @spree_current_user if @spree_current_user
+
+          doorkeeper_authorize!
+
+          @spree_current_user ||= Spree.user_class.find_by(id: doorkeeper_token.resource_owner_id)
         end
 
         def spree_authorize!(action, subject, *args)

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

@@ -0,0 +1,77 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        module Account
+          class AddressesController < ::Spree::Api::V2::BaseController
+            before_action :require_spree_current_user
+
+            def index
+              render_serialized_payload { serialize_collection(collection) }
+            end
+
+            def create
+              result = create_service.call(user: spree_current_user, address_params: address_params)
+              render_result(result)
+            end
+
+            def update
+              result = update_service.call(address: resource, address_params: address_params)
+              render_result(result)
+            end
+
+            private
+
+            def collection
+              collection_finder.new(scope: scope, params: params).execute
+            end
+
+            def resource
+              @resource ||= scope.find(params[:id])
+            end
+
+            def scope
+              spree_current_user.addresses
+            end
+
+            def collection_finder
+              Spree::Api::Dependencies.storefront_address_finder.constantize
+            end
+
+            def collection_serializer
+              Spree::Api::Dependencies.storefront_address_serializer.constantize
+            end
+
+            def resource_serializer
+              Spree::Api::Dependencies.storefront_address_serializer.constantize
+            end
+
+            def serialize_collection(collection)
+              collection_serializer.new(collection).serializable_hash
+            end
+
+            def create_service
+              Spree::Api::Dependencies.storefront_account_create_address_service.constantize
+            end
+
+            def update_service
+              Spree::Api::Dependencies.storefront_account_update_address_service.constantize
+            end
+
+            def address_params
+              params.require(:address).permit(permitted_address_attributes)
+            end
+
+            def render_result(result)
+              if result.success?
+                render_serialized_payload { serialize_resource(result.value) }
+              else
+                render_error_payload(result.error)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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/controllers/spree/api/v2/storefront/checkout_controller.rb

@@ -125,8 +125,7 @@ module Spree
           def serialize_shipping_rates(shipments)
             shipping_rates_serializer.new(
               shipments,
-              include: [:shipping_rates],
-              params: { show_rates: true }
+              include: [:shipping_rates, :stock_location]
             ).serializable_hash
           end
         end

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

@@ -29,7 +29,7 @@ module Spree
           end
 
           def ensure_order_token
-            raise ActiveRecord::RecordNotFound unless order_token
+            raise ActiveRecord::RecordNotFound unless order_token.present?
           end
         end
       end

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

@@ -0,0 +1,27 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        class StoresController < ::Spree::Api::V2::BaseController
+          def show
+            render_serialized_payload { serialize_resource(resource) }
+          end
+
+          private
+
+          def scope
+            Spree::Store
+          end
+
+          def resource
+            scope.find_by!(code: params[:code])
+          end
+
+          def resource_serializer
+            Spree::Api::Dependencies.storefront_store_serializer.constantize
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/spree/api_dependencies.rb

@@ -13,7 +13,9 @@ module Spree
       :storefront_country_serializer, :storefront_current_order_finder, :storefront_completed_order_finder, :storefront_order_sorter,
       :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_cart_update_service, :storefront_cart_estimate_shipping_rates_service, :storefront_estimated_shipment_serializer,
+      :storefront_store_serializer, :storefront_address_serializer, :storefront_order_serializer,
+      :storefront_account_create_address_service, :storefront_account_update_address_service, :storefront_address_finder
     ].freeze
 
     attr_accessor *INJECTION_POINTS
@@ -48,7 +50,12 @@ module Spree
       @storefront_checkout_remove_store_credit_service = Spree::Dependencies.checkout_remove_store_credit_service
       @storefront_checkout_get_shipping_rates_service = Spree::Dependencies.checkout_get_shipping_rates_service
 
+      # account services
+      @storefront_account_create_address_service = Spree::Dependencies.account_create_address_service
+      @storefront_account_update_address_service = Spree::Dependencies.account_update_address_service
+
       # serializers
+      @storefront_address_serializer = 'Spree::V2::Storefront::AddressSerializer'
       @storefront_cart_serializer = 'Spree::V2::Storefront::CartSerializer'
       @storefront_credit_card_serializer = 'Spree::V2::Storefront::CreditCardSerializer'
       @storefront_country_serializer = 'Spree::V2::Storefront::CountrySerializer'
@@ -58,6 +65,8 @@ module Spree
       @storefront_payment_method_serializer = 'Spree::V2::Storefront::PaymentMethodSerializer'
       @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
@@ -67,6 +76,7 @@ module Spree
       @storefront_collection_paginator = Spree::Dependencies.collection_paginator
 
       # finders
+      @storefront_address_finder = Spree::Dependencies.address_finder
       @storefront_country_finder = Spree::Dependencies.country_finder
       @storefront_current_order_finder = Spree::Dependencies.current_order_finder
       @storefront_completed_order_finder = Spree::Dependencies.completed_order_finder

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

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

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

@@ -9,7 +9,8 @@ module Spree
                    :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
+                   :included_tax_total, :display_included_tax_total,
+                   :pre_tax_amount, :display_pre_tax_amount
 
         belongs_to :variant
       end

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/shipment_serializer.rb

@@ -9,7 +9,9 @@ module Spree
 
         attribute :free, &:free?
 
-        has_many :shipping_rates, if: proc { |_record, params| params&.dig(:show_rates) }
+        has_many :shipping_rates
+
+        belongs_to :stock_location
       end
     end
   end

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

@@ -0,0 +1,11 @@
+module Spree
+  module V2
+    module Storefront
+      class StockLocationSerializer < BaseSerializer
+        set_type :stock_location
+
+        attributes :name
+      end
+    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/app/serializers/spree/v2/storefront/store_serializer.rb

@@ -0,0 +1,13 @@
+module Spree
+  module V2
+    module Storefront
+      class StoreSerializer < BaseSerializer
+        set_type :store
+
+        attributes :name, :url, :meta_description, :meta_keywords, :seo_title, :default_currency, :default, :supported_currencies, :facebook,
+                   :twitter, :instagram, :default_locale, :customer_support_email, :default_country_id, :description,
+                   :address, :contact_phone, :contact_email
+      end
+    end
+  end
+end

data/config/routes.rb

@@ -152,6 +152,7 @@ Spree::Core::Engine.add_routes do
         resource :account, controller: :account, only: %i[show]
 
         namespace :account do
+          resources :addresses, controller: :addresses, only: %i[index create update]
           resources :credit_cards, controller: :credit_cards, only: %i[index show]
           resources :orders, controller: :orders, only: %i[index show]
         end
@@ -161,6 +162,7 @@ Spree::Core::Engine.add_routes do
         get '/order_status/:number', to: 'order_status#show', as: :order_status
         resources :products, only: %i[index show]
         resources :taxons,   only: %i[index show], id: /.+/
+        get '/stores/:code', to: 'stores#show', as: :store
       end
     end
 

data/docs/v2/storefront/index.yaml

@@ -1125,6 +1125,14 @@ components:
             company:
               type: string
               example: 'Google Inc.'
+    AddressList:
+      required:
+        - data
+      properties:
+        data:
+          type: array
+          items:
+            $ref: '#/components/schemas/Address'
     Cart:
       required:
         - data
@@ -1291,6 +1299,18 @@ components:
         display_tax_total:
           type: string
           example: '$10.00'
+        pre_tax_item_amount:
+          type: string
+          example: '17.00'
+        display_pre_tax_item_amount:
+          type: string
+          example: '$17.00'
+        pre_tax_total:
+          type: string
+          example: '20.00'
+        display_pre_tax_total:
+          type: string
+          example: '$20.00'
         item_count:
           type: number
           example: 2
@@ -1503,6 +1523,12 @@ components:
             display_discounted_amount:
               type: string
               example: '$125.00'
+            pre_tax_amount:
+              type: string
+              example: '125.0'
+            display_pre_tax_amount:
+              type: string
+              example: '$125.00'
             promo_total:
               type: string
               example: '-5.0'

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

@@ -4,7 +4,7 @@ shared_context 'API v2 tokens' do
   let(:headers_order_token) { { 'X-Spree-Order-Token' => order.token } }
 end
 
-[200, 201, 400, 404, 403, 422].each do |status_code|
+[200, 201, 400, 401, 404, 403, 422].each do |status_code|
   shared_examples "returns #{status_code} HTTP status" do
     it "returns #{status_code}" do
       expect(response.status).to eq(status_code)

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)
@@ -48,6 +50,10 @@ shared_examples 'returns valid cart JSON' do
     expect(json_response['data']).to have_attribute(:promo_total).with_value(order.promo_total.to_s)
     expect(json_response['data']).to have_attribute(:display_promo_total).with_value(order.display_promo_total.to_s)
     expect(json_response['data']).to have_attribute(:display_total).with_value(order.display_total.to_s)
+    expect(json_response['data']).to have_attribute(:pre_tax_item_amount).with_value(order.pre_tax_item_amount.to_s)
+    expect(json_response['data']).to have_attribute(:display_pre_tax_item_amount).with_value(order.display_pre_tax_item_amount.to_s)
+    expect(json_response['data']).to have_attribute(:pre_tax_total).with_value(order.pre_tax_total.to_s)
+    expect(json_response['data']).to have_attribute(:display_pre_tax_total).with_value(order.display_pre_tax_total.to_s)
     expect(json_response['data']).to have_relationships(:user, :line_items, :variants, :billing_address, :shipping_address, :payments, :shipments, :promotions)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 4.1.8
+  version: 4.1.13
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-05 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.8
+        version: 4.1.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.8
+        version: 4.1.13
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +133,7 @@ files:
 - app/controllers/spree/api/v1/variants_controller.rb
 - app/controllers/spree/api/v1/zones_controller.rb
 - app/controllers/spree/api/v2/base_controller.rb
+- app/controllers/spree/api/v2/storefront/account/addresses_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
@@ -141,6 +142,7 @@ files:
 - app/controllers/spree/api/v2/storefront/countries_controller.rb
 - app/controllers/spree/api/v2/storefront/order_status_controller.rb
 - app/controllers/spree/api/v2/storefront/products_controller.rb
+- app/controllers/spree/api/v2/storefront/stores_controller.rb
 - app/controllers/spree/api/v2/storefront/taxons_controller.rb
 - app/helpers/spree/api/api_helpers.rb
 - app/helpers/spree/api/v2/collection_options_helpers.rb
@@ -166,9 +168,12 @@ 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/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
+- app/serializers/spree/v2/storefront/store_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
@@ -302,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.8
+  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.8
+  source_code_uri: https://github.com/spree/spree/tree/v4.1.13
 post_install_message:
 rdoc_options: []
 require_paths: