spree_api 6.0.0.rc2 → 6.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06aac9de6a57402c698fb881a27df504047b5a488e9bdc87b472af681115d5f8
-  data.tar.gz: fa3c078090e803d00a5fa1b947b594175d8c5657d90e9490f074a57b814f7dd3
+  metadata.gz: 2bf002c9d8182f8a69971d92c1ba84a2fe26571baefa007570c1a6e30761bd48
+  data.tar.gz: 78504b7007e37077c04a3b75b33644ad3e127670d7ec221888743bac8f25c9aa
 SHA512:
-  metadata.gz: c3d0ab4516f51aaa3e3c062e35fc1267c2c90191948e5b0d0dc5a7d6fba6b7ce5020cc66ac563ea9ae49c3948d13cf8a2245b655678fb14806612409d3f7cae3
-  data.tar.gz: ac4aae51601b99ab1e4985c521a6edd4dae0613ec68f7950f837cf6fa4181a3c258fd9765206443e1a1b590e2584ce64fb2a93174dd9276a73bc526446a02111
+  metadata.gz: ab37287b927bcbcc8c0e79ecfad9795608390098243660a2bd0b79a0c8b104b72a0f7485b1b67790b5f7b0978ea3af18349b7870b50c85edfdeb1702e1eca87a
+  data.tar.gz: 2317c9ac3b2cd0aecdcf432d9c83dab6ec44b077b078c960ddda56b9a066a41080841779c2a1bd6838bfb2fe07c71b03d3e6b34b8ad37681df20f61bdd637c98

data/app/controllers/concerns/spree/api/v3/store/search_provider_support.rb

@@ -18,12 +18,11 @@ module Spree
           private
 
           def search_query
-            params.dig(:q, :search)
+            search_params['search']
           end
 
           def search_filters
-            q = params[:q]&.to_unsafe_h || params[:q] || {}
-            q = q.to_h if q.respond_to?(:to_h) && !q.is_a?(Hash)
+            q = search_params
             # Decode Stripe-style prefixed IDs in `*_id_in`/`id_eq`/etc. so
             # SPA + storefront filters can pass `prod_…` keys; the search
             # provider hands the filter hash straight to Ransack on the
@@ -31,6 +30,12 @@ module Spree
             decode_prefixed_id_predicates(q.except('search')).presence
           end
 
+          # A `q` sent as anything but a hash (`q=foo`) filters nothing.
+          def search_params
+            q = params[:q]
+            q.respond_to?(:to_unsafe_h) ? q.to_unsafe_h : {}
+          end
+
           def search_provider
             @search_provider ||= Spree.search_provider.constantize.new(current_store)
           end

data/app/controllers/spree/api/v3/store/carts/store_credits_controller.rb

@@ -9,11 +9,12 @@ module Spree
 
             before_action :require_authentication!
             before_action :find_cart!
+            before_action :stringify_numeric_amount, only: :create
 
             request_params 'ApplyStoreCreditParams', action: :create do |body|
               body.attribute :amount, :decimal,
                 example: '10.00',
-                description: 'Defaults to as much as the cart can use.'
+                description: 'Defaults to as much as the cart can use. A JSON number is still read until 6.1, with a deprecation warning.'
             end
 
             # POST /api/v3/store/carts/:cart_id/store_credits
@@ -46,6 +47,17 @@ module Spree
                 end
               end
             end
+
+            private
+
+            # 5.6 storefronts sent a JSON number; read it through its text so no
+            # float reaches the money math.
+            def stringify_numeric_amount
+              return unless params[:amount].is_a?(Numeric)
+
+              Spree::Deprecation.warn('Sending the store credit amount as a JSON number is deprecated and will be refused in Spree 6.1. Send a decimal string such as "25.00".')
+              params[:amount] = params[:amount].to_s
+            end
           end
         end
       end

data/app/controllers/spree/api/v3/store/carts_controller.rb

@@ -15,8 +15,6 @@ module Spree
             schema.attribute :id, :id,
               description: 'An existing address of the customer to use. The other fields are then ignored.'
             schema.include_attributes Spree::Api::V3::Store::AddressRequestSchema
-            schema.attribute :quick_checkout, :boolean,
-              description: 'Relaxes validation (name, phone, postal code, street), for express checkouts that share a partial address.'
           end
 
           # Creating and updating a cart accept the same fields.

data/app/request_schemas/spree/api/v3/store/address_request_schema.rb

@@ -20,6 +20,8 @@ module Spree
             example: 'NY',
             description: 'ISO 3166-2 subdivision code without the country prefix, such as `CA` or `NY`.'
           attribute :state_name, :string, description: 'The state name, for countries without predefined states.'
+          attribute :quick_checkout, :boolean,
+            description: 'Relaxes validation (name, phone, postal code, street), for express checkouts that share a partial address.'
           attribute :country_iso, :string, deprecated: 'Use `country_code`. Removed in 6.1.'
           attribute :state_abbr, :string, deprecated: 'Use `state_code`. Removed in 6.1.'
         end

data/app/serializers/spree/api/v3/admin/price_history_serializer.rb

@@ -6,6 +6,7 @@ module Spree
       module Admin
         class PriceHistorySerializer < V3::PriceHistorySerializer
           without_formatted_money
+          _attributes.delete(:amount_in_cents)
 
           typelize variant_id: :string,
                    price_id: :string,

data/app/serializers/spree/api/v3/admin/price_serializer.rb

@@ -6,6 +6,8 @@ module Spree
         # Extends Store Price Serializer with admin-only fields
         class PriceSerializer < V3::PriceSerializer
           without_formatted_money
+          _attributes.delete(:amount_in_cents)
+          _attributes.delete(:compare_at_amount_in_cents)
 
           typelize variant_id: [:string, nullable: true],
                    min_quantity: :number,

data/app/serializers/spree/api/v3/cart_serializer.rb

@@ -74,7 +74,11 @@ module Spree
         # it is dropped rather than redacted for a gated guest: a requirement
         # with its numbers stripped tells them nothing they can act on.
         attribute :requirements do |order|
-          requirements = Spree::Checkout::Requirements.new(order).call
+          # 5.6 storefronts matched the delivery requirement by its field, so
+          # it keeps the old name until 6.1; `code` already carries the new one.
+          requirements = Spree::Checkout::Requirements.new(order).call.map do |requirement|
+            requirement[:field] == 'delivery_method' ? requirement.merge(field: 'shipping_method') : requirement
+          end
           next requirements unless params[:hide_prices]
 
           requirements.reject { |requirement| requirement[:code] == 'order_minimum_not_met' }

data/app/serializers/spree/api/v3/price_history_serializer.rb

@@ -6,12 +6,17 @@ module Spree
       class PriceHistorySerializer < BaseSerializer
         typelize display_amount: display_money_type(:display_amount, nullable: false),
                  currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
-                 recorded_at: :string
+                 recorded_at: :string,
+                 amount_in_cents: [:number, nullable: true, deprecated: 'Use `amount`. Removed in 6.1.']
 
         attributes :currency
 
         money_attributes :amount, unit_price: true
 
+        attribute :amount_in_cents do |price_history|
+          price_history.amount_in_cents unless params[:hide_prices]
+        end
+
         attributes :display_amount
 
         attribute :recorded_at do |price_history|

data/app/serializers/spree/api/v3/price_serializer.rb

@@ -8,12 +8,22 @@ module Spree
         typelize display_amount: display_money_type(:display_amount),
                  display_compare_at_amount: display_money_type(:display_compare_at_amount),
                  currency: [:string, nullable: true, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
-                 price_list_id: [:string, nullable: true]
+                 price_list_id: [:string, nullable: true],
+                 amount_in_cents: [:number, nullable: true, deprecated: 'Use `amount`. Removed in 6.1.'],
+                 compare_at_amount_in_cents: [:number, nullable: true, deprecated: 'Use `compare_at_amount`. Removed in 6.1.']
 
         attributes :currency
 
         money_attributes :amount, :compare_at_amount, unit_price: true
 
+        attribute :amount_in_cents do |price|
+          price.amount_in_cents unless params[:hide_prices]
+        end
+
+        attribute :compare_at_amount_in_cents do |price|
+          price.compare_at_amount_in_cents unless params[:hide_prices]
+        end
+
         attribute :display_amount do |price|
           price.display_amount&.to_s
         end

data/app/serializers/spree/api/v3/seller/price_history_serializer.rb

@@ -4,6 +4,7 @@ module Spree
       module Seller
         class PriceHistorySerializer < V3::PriceHistorySerializer
           without_formatted_money(:seller)
+          _attributes.delete(:amount_in_cents)
         end
       end
     end

data/app/serializers/spree/api/v3/seller/price_serializer.rb

@@ -4,6 +4,8 @@ module Spree
       module Seller
         class PriceSerializer < V3::PriceSerializer
           without_formatted_money(:seller)
+          _attributes.delete(:amount_in_cents)
+          _attributes.delete(:compare_at_amount_in_cents)
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 6.0.0.rc2
+  version: 6.0.0.rc3
 platform: ruby
 authors:
 - Vendo Connect Inc.
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc2
+        version: 6.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc2
+        version: 6.0.0.rc3
 description: Spree Commerce Store / Admin API and HTTP webhooks
 email:
 - hello@spreecommerce.org
@@ -792,9 +792,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v6.0.0.rc2
+  changelog_uri: https://github.com/spree/spree/releases/tag/v6.0.0.rc3
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v6.0.0.rc2
+  source_code_uri: https://github.com/spree/spree/tree/v6.0.0.rc3
 post_install_message:
 rdoc_options: []
 require_paths: