spree_core 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dc7cce417107635f46c74c979366413643377d2998d7af5654b8ec7a6e7403b
-  data.tar.gz: 94ed7a5b9cb4018aa68943bd8f313fb2f18ea3b9a47071b58b3e7ea0a38edc61
+  metadata.gz: 5a60d5a6d4ba0fd4d7e223de06835389a8c4c39572dabe07e29a4fb5312d2548
+  data.tar.gz: 1163cb99eaca807157669cc6ae77f3c2eae58c8b63de520b27c329244c870d22
 SHA512:
-  metadata.gz: dec7666d5d8e9d72480f079b5ec0e23d5dae63063378d4151919494b89ba07c104c46150d13a9c25b3edb90901bc3c1e290ffb9c5812b2b277df15cbe20daa46
-  data.tar.gz: 60484eb5165486926e268c6cc155f8e4930356c28050b1f98868c701fd0660f06cd028ddce4ad8971e491b7e9cc60f4c14ede124aa151efe5c8d5c4c2a702153
+  metadata.gz: d69a80bb1326c8f17f29c299701c20b372736a16002688a51cb0f9cef9f95a650ef3f2eb860e5d671e3fda54745fc2eace0b54a534e746d0b12e0337ea7cb547
+  data.tar.gz: 20864a616e90144196cf5b3d8a4b4d8ef35bed9bf85415a1ed07361b1c4451fd77716adfdfbb9a122ac0284eee6b2b00e2d9b24f5dddf825167eb7fe2f5e97c7

data/app/helpers/spree/base_helper.rb

@@ -163,6 +163,15 @@ module Spree
       Spree::Core::Engine.frontend_available?
     end
 
+    # returns the URL of an object on the storefront
+    # @param resource [Spree::Product, Spree::Post, Spree::Taxon, Spree::Page] the resource to get the URL for
+    # @param options [Hash] the options for the URL
+    # @option options [String] :locale the locale of the resource, defaults to I18n.locale
+    # @option options [String] :store the store of the resource, defaults to current_store
+    # @option options [String] :relative whether to use the relative URL, defaults to false
+    # @option options [String] :preview_id the preview ID of the resource, usually the ID of the resource
+    # @option options [String] :variant_id the variant ID of the resource, usually the ID of the variant (only used for products)
+    # @return [String] the URL of the resource
     def spree_storefront_resource_url(resource, options = {})
       options.merge!(locale: locale_param) if defined?(locale_param) && locale_param.present?
 

data/app/helpers/spree/images_helper.rb

@@ -1,6 +1,77 @@
 module Spree
   module ImagesHelper
+    # render an image tag with a spree image variant
+    # it also automatically scales the width and height by 2x to look great on retina screens
+    #
+    # @param image [ActiveStorage::Attachment] the image to render
+    # @param options [Hash] options for the image tag
+    # @option options [Integer] :width the width of the image
+    # @option options [Integer] :height the height of the image
+    def spree_image_tag(image, options = {})
+      image_tag(
+        spree_image_url(image, { width: options[:width], height: options[:height] }),
+        options
+      )
+    end
+
+    def spree_image_url(image, options = {})
+      width = options[:width]
+      height = options[:height]
+
+      width = width * 2 if width.present?
+      height = height * 2 if height.present?
+
+      return unless image.attached?
+      return unless image.variable?
+
+      if width.present? && height.present?
+        main_app.cdn_image_url(
+          image.variant(spree_image_variant_options(resize_to_fill: [width, height]))
+        )
+      else
+        main_app.cdn_image_url(
+          image.variant(spree_image_variant_options(resize_to_limit: [width, height]))
+        )
+      end
+    end
+
+    def spree_asset_aspect_ratio(attachment)
+      return unless attachment.present?
+      return unless attachment.analyzed?
+
+      metadata = attachment.metadata
+      aspect_ratio = metadata['aspect_ratio'].presence
+
+      return aspect_ratio if aspect_ratio
+
+      width = metadata['width']&.to_f
+      return unless width
+
+      height = metadata['height']&.to_f
+      return unless height
+      return if height.zero?
+
+      w, h = width.to_f, height.to_f
+
+      # Always return width / height, flipping if needed
+      if h > w
+        ratio = h / w
+      elsif h < w
+        ratio = w / h
+      else
+        # h == w, square image
+        ratio = 1.0
+      end
+
+      ratio.round(3)
+    end
+
     # convert images to webp with some sane optimization defaults
+    # it also automatically scales the width and height by 2x to look great on retina screens
+    #
+    # @param options [Hash] options for the image variant
+    # @option options [Integer] :width the width of the image
+    # @option options [Integer] :height the height of the image
     def spree_image_variant_options(options = {})
       {
         saver: {

data/app/javascript/spree/core/controllers/address_autocomplete_controller.js

@@ -121,10 +121,7 @@ export default class extends Controller {
 
   async fillAddress(placeID) {
     const placeDetails =
-      await this.googlePlacesSuggestionsProvider.getPlaceDetails(
-        placeID,
-        this.address1Target
-      )
+      await this.googlePlacesSuggestionsProvider.getPlaceDetails(placeID)
 
     if (placeDetails) {
       this.address1Target.value = placeDetails.fullAddress

data/app/javascript/spree/core/helpers/address_autocomplete/google_places_suggestions_provider.js

@@ -6,139 +6,115 @@ export default class {
     }
     this.placesApi = await google.maps.importLibrary('places')
     this.googleSessionToken = new this.placesApi.AutocompleteSessionToken()
-    this.autocompleteSevice = new this.placesApi.AutocompleteService()
   }
 
   async getSuggestions(input, country) {
-    return new Promise((resolve, reject) => {
-      if (this.placesApi === undefined) {
-        reject('You must call connect() before getSuggestions()')
-        return
-      }
+    if (this.placesApi === undefined) {
+      throw new Error('You must call connect() before getSuggestions()')
+    }
 
-      this.autocompleteSevice.getPlacePredictions(
-        {
-          input,
-          // We can use `address`, `street_address`
-          // `street_address` is the most accurate and specific, but sometimes it returns no results, even if the address is valid
-          // Since we are validating the address on the server, we can use `address`
-          types: [],
-          componentRestrictions: {
-            country
-          },
-          sessionToken: this.googleSessionToken
-        },
-        (predictions, status) => {
-          if (status !== this.placesApi.PlacesServiceStatus.OK) {
-            resolve([])
-          } else {
-            resolve(predictions.map(this.parsePrediction.bind(this)))
-          }
-        }
-      )
-    })
+    const request = {
+      input,
+      // We can use `address`, `street_address`
+      // `street_address` is the most accurate and specific, but sometimes it returns no results, even if the address is valid
+      // Since we are validating the address on the server, we can use `address`
+      includedRegionCodes: [country],
+      sessionToken: this.googleSessionToken
+    }
+
+    try {
+      const response = await this.placesApi.AutocompleteSuggestion.fetchAutocompleteSuggestions(request)
+      return response.suggestions.map((element, index) => this.parsePrediction(element.placePrediction, index))
+    } catch (error) {
+      console.error('Error fetching autocomplete suggestions', error)
+      return []
+    }
   }
 
-  async getPlaceDetails(placeID, target) {
-    return new Promise((resolve, reject) => {
-      if (this.placesApi === undefined) {
-        reject('You must call connect() before getPlaceDetails()')
-        return
-      }
+  async getPlaceDetails(placeID) {
+    if (this.placesApi === undefined) {
+      throw new Error('You must call connect() before getPlaceDetails()')
+    }
 
-      const service = new this.placesApi.PlacesService(target)
-      service.getDetails(
-        {
-          placeId: placeID,
-          fields: ['address_components'],
-          sessionToken: this.googleSessionToken
-        },
-        (place, status) => {
-          if (status !== this.placesApi.PlacesServiceStatus.OK) {
-            resolve(null)
-            return
-          }
+    try {
+      const service = new this.placesApi.Place({ id: placeID })
 
-          this.sessionToken = new this.placesApi.AutocompleteSessionToken()
+      const { place } = await service.fetchFields({ fields: ["addressComponents"] })
 
-          const fullAddress = []
-          let hasStreetNumber = false
+      const fullAddress = []
+      let hasStreetNumber = false
 
-          const details = {
-            fullAddress: '',
-            city: '',
-            stateAbbr: '',
-            zipcode: '',
-            hasStreetNumber: false
-          }
+      const details = {
+        fullAddress: '',
+        city: '',
+        stateAbbr: '',
+        zipcode: '',
+        hasStreetNumber: false
+      }
 
-          let locality = undefined
-          let postal_town = undefined
-          let sublocality = undefined
-          let administrative_area_level_3 = undefined
-          let premise = undefined
-          let subpremise = undefined
+      let locality, postal_town, sublocality, administrative_area_level_3, premise, subpremise
 
-          place.address_components.forEach((component) => {
-            if (component.types.includes('street_number')) {
-              fullAddress.push(component.long_name)
-              hasStreetNumber = true
-            }
-            if (component.types.includes('subpremise')) {
-              subpremise = component.long_name
-            }
-            if (component.types.includes('premise')) {
-              premise = component.long_name
-            }
-            if (component.types.includes('route')) {
-              fullAddress.push(component.long_name)
-            }
-            if (component.types.includes('locality')) {
-              locality = component.long_name
-            }
-            if (component.types.includes('postal_town')) {
-              postal_town = component.long_name
-            }
-            if (component.types.includes('sublocality')) {
-              sublocality = component.long_name
-            }
-            if (component.types.includes('administrative_area_level_1')) {
-              details.stateAbbr = component.short_name
-            }
-            if (component.types.includes('postal_code')) {
-              details.zipcode = component.long_name
-            }
-            if (component.types.includes('administrative_area_level_3')) {
-              administrative_area_level_3 = component.long_name
-            }
-          })
-          // City is tricky, because it can be in different fields
-          details.city =
-            locality ||
-            postal_town ||
-            sublocality ||
-            administrative_area_level_3 ||
-            ''
-          if (premise && !hasStreetNumber) {
-            fullAddress.unshift(premise)
-            hasStreetNumber = true
-          }
-          if (subpremise) {
-            fullAddress.push(subpremise)
-          }
-          details.hasStreetNumber = hasStreetNumber
-          details.fullAddress = fullAddress.join(' ')
-          resolve(details)
+      place.addressComponents.forEach((component) => {
+        if (component.types.includes('street_number')) {
+          fullAddress.push(component.longText)
+          hasStreetNumber = true
         }
-      )
-    })
+        if (component.types.includes('subpremise')) {
+          subpremise = component.longText
+        }
+        if (component.types.includes('premise')) {
+          premise = component.longText
+        }
+        if (component.types.includes('route')) {
+          fullAddress.push(component.longText)
+        }
+        if (component.types.includes('locality')) {
+          locality = component.longText
+        }
+        if (component.types.includes('postal_town')) {
+          postal_town = component.longText
+        }
+        if (component.types.includes('sublocality')) {
+          sublocality = component.longText
+        }
+        if (component.types.includes('administrative_area_level_1')) {
+          details.stateAbbr = component.shortText
+        }
+        if (component.types.includes('postal_code')) {
+          details.zipcode = component.longText
+        }
+        if (component.types.includes('administrative_area_level_3')) {
+          administrative_area_level_3 = component.longText
+        }
+      })
+      // City is tricky, because it can be in different fields
+      details.city =
+        locality ||
+        postal_town ||
+        sublocality ||
+        administrative_area_level_3 ||
+        ''
+      if (premise && !hasStreetNumber) {
+        fullAddress.unshift(premise)
+        hasStreetNumber = true
+      }
+      if (subpremise) {
+        fullAddress.push(subpremise)
+      }
+      details.hasStreetNumber = hasStreetNumber
+      details.fullAddress = fullAddress.join(' ')
+      return details
+    } catch (error) {
+      console.error('Error fetching autocomplete details', error)
+      return null
+    }
   }
 
   parsePrediction(prediction, index) {
     const suggestion = {
       index: index,
-      placeID: prediction.place_id,
-      description: prediction.description
+      placeID: prediction.placeId,
+      description: prediction.text.text
     }
 
     const splittedText = this.splitTextForMarks(prediction)
@@ -155,12 +131,18 @@ export default class {
 
   // This function takes the prediction and splits the description into an array of objects with the text and a boolean indicating if it should be highlighted
   splitTextForMarks(prediction) {
-    let markedAreas = [...prediction.matched_substrings.sort((m) => m.offset)]
+    const description = prediction.text.text;
+    let markedAreas = prediction.text.matches
+      .map(({ startOffset, endOffset }) => ({
+        offset: startOffset,
+        length: endOffset - startOffset
+      }))
+      .sort((a, b) => a.offset - b.offset);
     const textAreas = []
-    for (let i = 0; i < prediction.description.length; i++) {
+    for (let i = 0; i < description.length; i++) {
       if (markedAreas[0]?.offset === i) {
         textAreas.push({
-          text: prediction.description.substring(i, i + markedAreas[0].length),
+          text: description.substring(i, i + markedAreas[0].length),
           marked: true
         })
         i += markedAreas[0].length - 1
@@ -168,7 +150,7 @@ export default class {
         markedAreas = [...markedAreas.sort((m) => m.offset)]
       } else {
         textAreas.push({
-          text: prediction.description.charAt(i),
+          text: description.charAt(i),
           marked: false
         })
       }

data/app/models/spree/credit_card.rb

@@ -12,7 +12,7 @@ module Spree
     acts_as_paranoid
 
     belongs_to :payment_method
-    belongs_to :user, class_name: "::#{Spree.user_class}", foreign_key: 'user_id', optional: true
+    belongs_to :user, class_name: Spree.user_class.to_s, foreign_key: 'user_id', optional: true
     belongs_to :gateway_customer, class_name: 'Spree::GatewayCustomer', optional: true
 
     has_many :payments, as: :source

data/app/models/spree/order.rb

@@ -504,6 +504,7 @@ module Spree
     end
 
     def available_payment_methods(store = nil)
+      Spree::Deprecation.warn('`Order#available_payment_methods` is deprecated and will be removed in Spree 6. Use `collect_frontend_payment_methods` instead.')
       if store.present?
         Spree::Deprecation.warn('The `store` parameter is deprecated and will be removed in Spree 5. Order is already associated with Store')
       end
@@ -754,7 +755,11 @@ module Spree
     end
 
     def collect_backend_payment_methods
-      PaymentMethod.active.available_on_back_end.select { |pm| pm.available_for_order?(self) }
+      store.payment_methods.active.available_on_back_end.select { |pm| pm.available_for_order?(self) }
+    end
+
+    def collect_frontend_payment_methods
+      store.payment_methods.active.available_on_front_end.select { |pm| pm.available_for_order?(self) }
     end
 
     # determines whether the inventory is fully discounted
@@ -771,19 +776,6 @@ module Spree
       Spree::CouponCode.find_by(order: self, promotion: promotions).try(:code) || promotions.pluck(:code).compact.first
     end
 
-    def validate_payments_attributes(attributes)
-      Spree::Deprecation.warn('`Order#validate_payments_attributes` is deprecated and will be removed in Spree 5')
-
-      # Ensure the payment methods specified are allowed for this user
-      payment_method_ids = available_payment_methods.map(&:id).map(&:to_s)
-
-      attributes.each do |payment_attributes|
-        payment_method_id = payment_attributes[:payment_method_id].to_s
-
-        raise ActiveRecord::RecordNotFound unless payment_method_ids.include?(payment_method_id)
-      end
-    end
-
     def valid_promotions
       order_promotions.where(promotion_id: valid_promotion_ids).uniq(&:promotion_id)
     end
@@ -887,6 +879,7 @@ module Spree
     end
 
     def collect_payment_methods(store = nil)
+      Spree::Deprecation.warn('`Order#collect_payment_methods` is deprecated and will be removed in Spree 6. Use `collect_frontend_payment_methods` instead.')
       if store.present?
         Spree::Deprecation.warn('The `store` parameter is deprecated and will be removed in Spree 5. Order is already associated with Store')
       end

data/app/models/spree/theme.rb

@@ -98,7 +98,7 @@ module Spree
     end
 
     def create_default_pages
-      Rails.application.config.spree.pages.each do |page_class|
+      Rails.application.config.spree.pages.map(&:to_s).map(&:constantize).each do |page_class|
         next if page_class == Spree::Pages::Custom
 
         page_class.where(pageable: self).first_or_create!
@@ -107,7 +107,7 @@ module Spree
 
     def create_layout_sections
       ApplicationRecord.transaction do
-        available_layout_sections.each do |section_class|
+        available_layout_sections.map(&:to_s).map(&:constantize).each do |section_class|
           section_class.where(pageable: self).first_or_create!
         end
       end

data/app/services/spree/checkout/update.rb

@@ -9,8 +9,16 @@ module Spree
         bill_changed = address_with_country_iso_present?(params, 'bill')
         params[:order][:ship_address_attributes] = replace_country_iso_with_id(params[:order][:ship_address_attributes]) if ship_changed
         params[:order][:bill_address_attributes] = replace_country_iso_with_id(params[:order][:bill_address_attributes]) if bill_changed
-        order.state = 'address' if (ship_changed || bill_changed) && order.has_checkout_step?('address')
-        order.state = 'delivery' if selected_shipping_rate_present?(params) && order.has_checkout_step?('delivery')
+
+        # for quick checkouts we cannot revert to previous states
+        # we already have the address and delivery steps completed
+        # however we need to update the shipping address with missing data
+        # as previously we didn't have access to first/last name and street
+        unless params[:do_not_change_state]
+          order.state = 'address' if (ship_changed || bill_changed || quick_checkout_cancelled?(params)) && order.has_checkout_step?('address')
+          order.state = 'delivery' if selected_shipping_rate_present?(params) && order.has_checkout_step?('delivery')
+        end
+
         return success(order) if order.update_from_params(params, permitted_attributes, request_env)
 
         failure(order)
@@ -31,6 +39,10 @@ module Spree
 
         shipments_attributes.any? { |s| s.dig(:selected_shipping_rate_id) }
       end
+
+      def quick_checkout_cancelled?(params)
+        params.dig(:order, :ship_address_id) == 'CLEAR'
+      end
     end
   end
 end

data/app/services/spree/payments/create.rb

@@ -14,7 +14,7 @@ module Spree
       protected
 
       def prepare_payment_attributes(order:, params:)
-        payment_method = order.available_payment_methods.find { |pm| pm.id.to_s == params[:payment_method_id]&.to_s }
+        payment_method = order.collect_frontend_payment_methods.find { |pm| pm.id.to_s == params[:payment_method_id]&.to_s }
 
         payment_attributes = {
           amount: params[:amount] || order.order_total_after_store_credit,

data/app/services/spree/products/prepare_nested_attributes.rb

@@ -130,8 +130,10 @@ module Spree
         option_value_variant_params = {}
 
         option_value_params.each_with_index do |opt, index|
-          option_type = Spree::OptionType.where(name: opt[:name].parameterize).first_or_initialize do |o|
+          option_type = Spree::OptionType.find_by(id: opt[:id]) if opt.fetch(:id)
+          option_type ||= Spree::OptionType.where(name: opt[:name].parameterize).first_or_initialize do |o|
             o.name = o.presentation = opt[:name]
+            o.position = opt[:position]
             o.save!
           end
           option_value = option_type.option_values.where(name: opt[:value].parameterize).first_or_initialize do |o|

data/app/views/active_storage/blobs/_blob.html.erb

@@ -1,12 +1,6 @@
 <figure class="attachment attachment--<%= blob.representable? ? "preview" : "file" %> attachment--<%= blob.filename.extension %>">
   <% if blob.representable? %>
-    <%= image_tag main_app.cdn_image_url(
-      blob.variant(
-        spree_image_variant_options(
-          resize_to_limit: local_assigns[:in_gallery] ? [ 800, 600 ] : [ 1024, 768 ]
-        )
-      )
-    ) %>
+    <%= spree_image_tag(blob, width: local_assigns[:in_gallery] ? 400 : 512, height: local_assigns[:in_gallery] ? 300 : 400) %>
   <% end %>
 
   <figcaption class="attachment__caption">

data/app/views/spree/shared/_mailer_logo.html.erb

@@ -5,7 +5,7 @@
 <%= link_to current_store.url_or_custom_domain, id: 'site-logo', style: "text-decoration: none;" do %>
   <span style="display: none;"><%= current_store.name %></span>
   <% if logo.present? && logo.attached? && logo.variable? %>
-    <% aspect_ratio = as_aspect_ratio(logo) %>
+    <% aspect_ratio = spree_asset_aspect_ratio(logo) %>
     <% logo_style = "aspect-ratio: #{aspect_ratio};" %>
 
     <% if aspect_ratio.to_f > 10 %>

data/config/locales/en.yml

@@ -310,6 +310,9 @@ en:
       spree/address:
         one: Address
         other: Addresses
+      spree/classification:
+        one: Classification
+        other: Classifications
       spree/cms_page:
         one: Page
         other: Pages
@@ -328,6 +331,9 @@ en:
       spree/digital:
         one: Digital asset
         other: Digital assets
+      spree/export:
+        one: Export
+        other: Exports
       spree/inventory_unit:
         one: Inventory Unit
         other: Inventory Units
@@ -349,6 +355,9 @@ en:
       spree/payment_method:
         one: Payment Method
         other: Payment Methods
+      spree/price:
+        one: Price
+        other: Prices
       spree/product:
         one: Product
         other: Products
@@ -397,6 +406,9 @@ en:
       spree/state_change:
         one: State Change
         other: State Changes
+      spree/stock_item:
+        one: Stock Item
+        other: Stock Items
       spree/stock_location:
         one: Stock Location
         other: Stock Locations
@@ -406,6 +418,9 @@ en:
       spree/stock_transfer:
         one: Stock Transfer
         other: Stock Transfers
+      spree/store:
+        one: Store
+        other: Stores
       spree/store_credit:
         one: Store Credit
         other: Store Credits
@@ -424,6 +439,9 @@ en:
       spree/taxonomy:
         one: Taxonomy
         other: Taxonomies
+      spree/theme:
+        one: Theme
+        other: Themes
       spree/tracker:
         one: Tracker
         other: Trackers
@@ -1741,7 +1759,6 @@ en:
     sales_totals: Sales Totals
     same_as_shipping_address: Same as shipping address
     save_and_continue: Save and Continue
-    save_changes: Save changes
     save_my_address: Save my address
     saving: Saving
     say_no: 'No'

data/db/migrate/20241005093437_add_multi_code_to_spree_promotions.rb

@@ -7,8 +7,10 @@ class AddMultiCodeToSpreePromotions < ActiveRecord::Migration[6.1]
 
     add_index :spree_promotions, :kind, if_not_exists: true
 
-    Spree::Promotion.reset_column_information
-    # set all promotions without a code to automatic
-    Spree::Promotion.where(code: [nil, '']).update_all(kind: 1)
+    unless Rails.env.test?
+      Spree::Promotion.reset_column_information
+      # set all promotions without a code to automatic
+      Spree::Promotion.where(code: [nil, '']).update_all(kind: 1)
+    end
   end
 end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '5.0.0'.freeze
+  VERSION = '5.0.1'.freeze
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-03 00:00:00.000000000 Z
+date: 2025-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -1308,9 +1308,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.0.0
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.0.1
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.0.0
+  source_code_uri: https://github.com/spree/spree/tree/v5.0.1
 post_install_message:
 rdoc_options: []
 require_paths: