spree_api 4.2.0.rc4 → 4.2.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c7b8ebf1a65cf7fb7063b4811c8d6226298c6435b5fdb9a60fd0c9a0579567d
-  data.tar.gz: 33ab903daaec69fdcb23340146c6e78be7dc64dbe760d2885353518d977887d3
+  metadata.gz: 4d89085eb3c34e7174431d231b1e9a883b6cbf3d7ee838d633125c352bd3a6db
+  data.tar.gz: 3402c8e857912d6655aea610e7092c4f749faf2f0b31a9f0c3f8601b292c43ba
 SHA512:
-  metadata.gz: 4f108ec0840bcfdf1aa5f15a8cf7f1de53fc7420bc0d0fc93072786ce139f60afcf5506470dca75c32cfac4b70221b4a9858e8b0a528b643e3f411c892cd46c9
-  data.tar.gz: 75d052059dda3df22fd17236878a14b9ca9a07da5bb287b0df03c11ea347a02abadabf75e2f7f7da950cd9e8bfdb56e96294d0a14ec46049797a63a69da58711
+  metadata.gz: bef7abadbdf0a40b95b04b45811eade8884c5f782c9720a3b009e90aabc133b9384122e65fcc443245102b6e444636e30f423d357efefebc8e63910240525efe
+  data.tar.gz: a1824c2bccb63b030b8d6cfe64237b1ce3b57dfd36adacdf71367b5a0408cec84a7d019bec4017c4d83f273a2de0e595d734cf506cb517b03b78932f9a871285

data/app/controllers/concerns/spree/api/v2/storefront/order_concern.rb

@@ -34,10 +34,6 @@ module Spree
             )
           end
 
-          def supported_currencies
-            current_store.supported_currencies_list
-          end
-
           def serialize_order(order)
             resource_serializer.new(order.reload, include: resource_includes, fields: sparse_fields).serializable_hash
           end

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

@@ -6,6 +6,8 @@ module Spree
       include Spree::Api::ControllerSetup
       include Spree::Core::ControllerHelpers::Store
       include Spree::Core::ControllerHelpers::StrongParameters
+      include Spree::Core::ControllerHelpers::Locale
+      include Spree::Core::ControllerHelpers::Currency
 
       attr_accessor :current_api_user
 

data/app/controllers/spree/api/v1/taxons_controller.rb

@@ -37,7 +37,7 @@ module Spree
             invalid_resource!(@taxon) and return
           end
 
-          @taxon.parent_id = taxonomy.root.id unless params[:taxon][:parent_id]
+          @taxon.parent_id = taxonomy.root_id unless params[:taxon][:parent_id]
 
           if @taxon.save
             respond_with(@taxon, status: 201, default_template: :show)

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

@@ -5,12 +5,12 @@ module Spree
         include CanCan::ControllerAdditions
         include Spree::Core::ControllerHelpers::StrongParameters
         include Spree::Core::ControllerHelpers::Store
+        include Spree::Core::ControllerHelpers::Locale
+        include Spree::Core::ControllerHelpers::Currency
         rescue_from ActiveRecord::RecordNotFound, with: :record_not_found
         rescue_from CanCan::AccessDenied, with: :access_denied
         rescue_from Spree::Core::GatewayError, with: :gateway_error
 
-        before_action :set_user_language
-
         def content_type
           Spree::Api::Config[:api_v2_content_type]
         end
@@ -84,6 +84,10 @@ module Spree
           fields.presence
         end
 
+        def serializer_params
+          { currency: current_currency, store: current_store, user: spree_current_user }
+        end
+
         def record_not_found
           render_error_payload(I18n.t(:resource_not_found, scope: 'spree.api'), 404)
         end
@@ -95,10 +99,6 @@ module Spree
         def gateway_error(exception)
           render_error_payload(exception.message)
         end
-
-        def set_user_language
-          I18n.locale = current_store.default_locale
-        end
       end
     end
   end

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

@@ -17,13 +17,14 @@ module Spree
         def serialize_collection(collection)
           collection_serializer.new(
             collection,
-            collection_options(collection)
+            collection_options(collection).merge(params: serializer_params)
           ).serializable_hash
         end
 
         def serialize_resource(resource)
           resource_serializer.new(
             resource,
+            params: serializer_params,
             include: resource_includes,
             fields: sparse_fields
           ).serializable_hash

data/app/helpers/spree/api/v2/display_money_helper.rb

@@ -0,0 +1,43 @@
+module Spree
+  module Api
+    module V2
+      module DisplayMoneyHelper
+        extend ActiveSupport::Concern
+
+        class_methods do
+          def find_price(product_or_variant, currency)
+            product_or_variant.price_in(currency)
+          end
+
+          def price(product_or_variant, currency)
+            price = find_price(product_or_variant, currency)
+            return nil if price.new_record?
+
+            format('%.2f', price.amount)
+          end
+
+          def display_price(product_or_variant, currency)
+            price = find_price(product_or_variant, currency)
+            return nil if price.new_record?
+
+            Spree::Money.new(price.amount, currency: currency).to_s
+          end
+
+          def compare_at_price(product_or_variant, currency)
+            price = find_price(product_or_variant, currency)
+            return nil if price.new_record? || price.compare_at_amount.blank?
+
+            format('%.2f', price.compare_at_amount)
+          end
+
+          def display_compare_at_price(product_or_variant, currency)
+            price = find_price(product_or_variant, currency)
+            return nil if price.new_record? || price.compare_at_amount.blank?
+
+            Spree::Money.new(price.compare_at_amount, currency: currency).to_s
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -2,11 +2,11 @@ module Spree
   module V2
     module Storefront
       class ProductSerializer < BaseSerializer
+        include ::Spree::Api::V2::DisplayMoneyHelper
+
         set_type :product
 
-        attributes :name, :description, :price, :currency, :display_price,
-                   :compare_at_price, :display_compare_at_price, :available_on,
-                   :slug, :meta_description, :meta_keywords, :updated_at
+        attributes :name, :description, :available_on, :slug, :meta_description, :meta_keywords, :updated_at
 
         attribute :purchasable do |product|
           product.purchasable?
@@ -24,6 +24,26 @@ module Spree
           product.available?
         end
 
+        attribute :currency do |_product, params|
+          params[:currency]
+        end
+
+        attribute :price do |product, params|
+          price(product, params[:currency])
+        end
+
+        attribute :display_price do |product, params|
+          display_price(product, params[:currency])
+        end
+
+        attribute :compare_at_price do |product, params|
+          compare_at_price(product, params[:currency])
+        end
+
+        attribute :display_compare_at_price do |product, params|
+          display_compare_at_price(product, params[:currency])
+        end
+
         has_many :variants
         has_many :option_types
         has_many :product_properties

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

@@ -2,10 +2,11 @@ module Spree
   module V2
     module Storefront
       class VariantSerializer < BaseSerializer
+        include ::Spree::Api::V2::DisplayMoneyHelper
+
         set_type :variant
 
-        attributes :sku, :price, :currency, :display_price, :weight, :height,
-                   :width, :depth, :is_master, :options_text
+        attributes :sku, :weight, :height, :width, :depth, :is_master, :options_text
 
         attribute :purchasable do |variant|
           variant.purchasable?
@@ -19,6 +20,26 @@ module Spree
           variant.backorderable?
         end
 
+        attribute :currency do |_product, params|
+          params[:currency]
+        end
+
+        attribute :price do |product, params|
+          price(product, params[:currency])
+        end
+
+        attribute :display_price do |product, params|
+          display_price(product, params[:currency])
+        end
+
+        attribute :compare_at_price do |product, params|
+          compare_at_price(product, params[:currency])
+        end
+
+        attribute :display_compare_at_price do |product, params|
+          display_compare_at_price(product, params[:currency])
+        end
+
         belongs_to :product
         has_many :images
         has_many :option_values

data/config/initializers/doorkeeper.rb

@@ -7,7 +7,14 @@ Doorkeeper.configure do
 
   resource_owner_from_credentials do
     user = Spree.user_class.find_for_database_authentication(email: params[:username])
-    user if user&.valid_for_authentication? { user.valid_password?(params[:password]) }
+
+    return nil if user.nil?
+
+    if defined?(Spree::Auth::Config) && Spree::Auth::Config[:confirmable] == true
+      user if user.active_for_authentication? && user.valid_for_authentication? { user.valid_password?(params[:password]) }
+    elsif user&.valid_for_authentication? { user.valid_password?(params[:password]) }
+      user
+    end
   end
 
   admin_authenticator do |routes|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 4.2.0.rc4
+  version: 4.2.0.rc5
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-20 00:00:00.000000000 Z
+date: 2021-02-04 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.2.0.rc4
+        version: 4.2.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc4
+        version: 4.2.0.rc5
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +147,7 @@ files:
 - 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
+- app/helpers/spree/api/v2/display_money_helper.rb
 - app/models/concerns/spree/user_api_authentication.rb
 - app/models/concerns/spree/user_api_methods.rb
 - app/models/spree/api_configuration.rb
@@ -308,9 +309,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.2.0.rc4
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc5
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc4
+  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc5
 post_install_message:
 rdoc_options: []
 require_paths: