spree_core 5.4.0.beta3 → 5.4.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea9fcfc9e4ac5937296c789f151d5d431b60a2fadb131e5a7bca034cae47b2ab
-  data.tar.gz: e89e3fd21bf14b0bb0bda0de42c0ecc49d173add3d9ce58c29b3c781eafb55fa
+  metadata.gz: 29b95e3e3222214cdeef8094a1a9553636c875d88857244241431196d06399d2
+  data.tar.gz: 93c9f4d387fce7ba5e2e9f4b6454f9c46f1b8a15cfe180a16739c17bf76a5125
 SHA512:
-  metadata.gz: b9bd748be9f9b4949d9b71887990fe3ac2377a6f4e7ed3d3060b0be073d6c199bd92a633bb2c62e7b8ee13dc0d7dae07e1bedd3d4d9dc5edebf3e4fc3839cae7
-  data.tar.gz: 8f8639ca080722372b01f91df71e54e0dc3f8f39d82cdbd1b3ad72103d995dbaf9bc50ef0f2a6032b0d400c2e94387edd2e06f64a52f3932391ed49ee5650014
+  metadata.gz: 5c8a23c3edd35dacb0493c5435e28d114fc2611b4b25a0d85b4b5e4579f38402fb61a3a65a9f3b361fae8f67d5f58ac73984b6ab2cd4bcbb0326813589a18330
+  data.tar.gz: 1fabd1160061e412e2e9a4a1e92083686938a5313c3b29193e410bc07d6118d60af4bd7c2951794273c20f8b053f1dfc5acba8dfe748a722f5895aacc17d33d9

data/app/jobs/spree/exports/generate_job.rb

@@ -4,7 +4,7 @@ module Spree
       queue_as Spree.queues.exports
 
       def perform(export_id)
-        export = Spree::Export.find(export_id)
+        export = Spree::Export.find_by_prefix_id!(export_id)
         export.generate
       end
     end

data/app/jobs/spree/reports/generate_job.rb

@@ -4,7 +4,7 @@ module Spree
       queue_as Spree.queues.reports
 
       def perform(report_id)
-        report = Spree::Report.find(report_id)
+        report = Spree::Report.find_by_prefix_id!(report_id)
         report.generate
       end
     end

data/app/models/concerns/spree/product_scopes.rb

@@ -91,6 +91,14 @@ module Spree
           joins(:variants_including_master).merge(Spree::Variant.in_stock_or_backorderable)
         end
       end
+
+      add_search_scope :price_lte do |price|
+        where(Price.table_name => { amount: ..price })
+      end
+
+      add_search_scope :price_gte do |price|
+        where(Price.table_name => { amount: price.. })
+      end
       search_scopes << :in_stock
 
       def self.out_of_stock(out_of_stock = true)
@@ -260,7 +268,7 @@ module Spree
 
       def self.not_discontinued(only_not_discontinued = true)
         if only_not_discontinued != '0' && only_not_discontinued
-          where(discontinue_on: [nil, Time.current..])
+          where(discontinue_on: [nil, Time.current.beginning_of_minute..])
         else
           all
         end
@@ -278,7 +286,10 @@ module Spree
       # Can't use add_search_scope for this as it needs a default argument
       def self.available(available_on = nil, currency = nil)
         scope = not_discontinued.where(status: 'active')
-        scope = scope.where("#{Product.quoted_table_name}.available_on <= ?", available_on) if available_on
+        if available_on
+          available_on = available_on.beginning_of_minute if available_on.respond_to?(:beginning_of_minute)
+          scope = scope.where("#{Product.quoted_table_name}.available_on <= ?", available_on)
+        end
 
         unless Spree::Config.show_products_without_price
           currency ||= Spree::Store.default.default_currency

data/app/models/spree/address.rb

@@ -27,8 +27,6 @@ module Spree
     # those attributes depending of the logic of their applications
     ADDRESS_FIELDS = %w(firstname lastname company address1 address2 city state zipcode country phone)
     EXCLUDED_KEYS_FOR_COMPARISON = %w(id updated_at created_at deleted_at label user_id public_metadata private_metadata)
-    FIELDS_TO_NORMALIZE = %w(firstname lastname phone alternative_phone company address1 address2 city zipcode)
-
     if defined?(Spree::Security::Addresses)
       include Spree::Security::Addresses
     end
@@ -53,7 +51,6 @@ module Spree
     before_validation :normalize_country
     before_validation :normalize_state
     before_validation :clear_invalid_state_entities, if: -> { country.present? }, on: :update
-    before_validation :remove_emoji_and_normalize
 
     after_create :set_user_attributes, if: -> { user.present? }
 
@@ -294,17 +291,6 @@ module Spree
       end
     end
 
-    def remove_emoji_and_normalize
-      attributes_to_normalize = attributes.slice(*FIELDS_TO_NORMALIZE)
-      normalized_attributes = attributes_to_normalize.compact_blank.deep_transform_values do |value|
-        NormalizeString.remove_emoji_and_normalize(value.to_s).strip
-      end
-
-      normalized_attributes.transform_keys! { |key| key.gsub('original_', '') } if defined?(Spree::Security::Addresses)
-
-      assign_attributes(normalized_attributes)
-    end
-
     def set_user_attributes
       if user.name.blank?
         user.first_name = firstname

data/app/models/spree/country.rb

@@ -38,29 +38,8 @@ module Spree
       iso.upcase.chars.map { |c| (c.ord + 127397).chr(Encoding::UTF_8) }.join
     end
 
-    # Returns the currency for this country from its market in the current store.
-    # Looks up which market contains this country and returns that market's currency.
-    #
-    # @return [String, nil] currency code (e.g., 'USD', 'EUR') or nil if no market found
-    def market_currency
-      current_market&.currency
-    end
-
-    # Returns the default locale for this country from its market in the current store.
-    # Looks up which market contains this country and returns that market's default locale.
-    #
-    # @return [String, nil] locale code (e.g., 'en', 'de') or nil if no market found
-    def market_locale
-      current_market&.default_locale
-    end
-
-    # Returns the supported locales for this country from its market in the current store.
-    #
-    # @return [Array<String>] locale codes (e.g., ['en', 'fr']) or empty array if no market found
-    def market_supported_locales
-      current_market&.supported_locales_list || []
-    end
-
+    # Lookups Market for Country for the current Store
+    # @return [Spree::Market, nil]
     def current_market
       @current_market ||= Spree::Current.store&.market_for_country(self)
     end

data/app/models/spree/coupon_code.rb

@@ -19,7 +19,8 @@ module Spree
     validates :code, presence: true, uniqueness: { scope: spree_base_uniqueness_scope, conditions: -> { where(deleted_at: nil) } }
     validates :state, :promotion, presence: true
 
-    self.whitelisted_ransackable_attributes = %w[state code]
+    self.whitelisted_ransackable_attributes = %w[state code promotion_id]
+    self.whitelisted_ransackable_associations = %w[promotion]
 
     def self.used?(code)
       used_with_code(code).any?
@@ -36,5 +37,9 @@ module Spree
     def display_code
       code.upcase
     end
+
+    def to_csv(_store = nil)
+      Spree::CSV::CouponCodePresenter.new(self).call
+    end
   end
 end

data/app/models/spree/current.rb

@@ -34,10 +34,11 @@ module Spree
       super || market&.default_locale || store&.default_locale
     end
 
-    # Returns the current tax zone, falling back to the default tax zone.
+    # Returns the current tax zone.
+    # Fallback: market's tax zone (from default country) -> global default tax zone.
     # @return [Spree::Zone, nil]
     def zone
-      super || default_tax_zone
+      super || market&.tax_zone || default_tax_zone
     end
 
     # Returns the default tax zone (memoized per request).

data/app/models/spree/exports/coupon_codes.rb

@@ -0,0 +1,18 @@
+module Spree
+  module Exports
+    class CouponCodes < Spree::Export
+      def csv_headers
+        Spree::CSV::CouponCodePresenter::HEADERS
+      end
+
+      def scope_includes
+        [:promotion, :order]
+      end
+
+      def scope
+        model_class.joins(promotion: :stores).where(spree_stores: { id: store.id })
+                   .accessible_by(current_ability)
+      end
+    end
+  end
+end

data/app/models/spree/market.rb

@@ -64,6 +64,14 @@ module Spree
       countries.order(:name).first
     end
 
+    # Returns the tax zone matching this market's default country.
+    # Used by Spree::Current to determine the browsing tax zone before a customer enters an address.
+    #
+    # @return [Spree::Zone, nil]
+    def tax_zone
+      @tax_zone ||= Spree::Zone.match(default_country)
+    end
+
     # Returns supported locales as an array, always including default_locale
     #
     # @return [Array<String>]

data/app/models/spree/product.rb

@@ -220,7 +220,9 @@ module Spree
     self.whitelisted_ransackable_associations = %w[taxons stores variants_including_master master variants tags labels
                                                    shipping_category classifications option_types]
     self.whitelisted_ransackable_scopes = %w[not_discontinued search_by_name in_taxon price_between
+                                             price_lte price_gte
                                              multi_search in_stock out_of_stock with_option_value_ids
+
                                              ascend_by_price descend_by_price]
 
     [

data/app/models/spree/taxon.rb

@@ -5,16 +5,16 @@ module Spree
     has_prefix_id :txn  # Spree-specific: taxon
 
     RULES_MATCH_POLICIES = %w[all any].freeze
-    SORT_ORDERS = %w[
-      manual
-      best-selling
-      name-a-z
-      name-z-a
-      price-high-to-low
-      price-low-to-high
-      newest-first
-      oldest-first
-    ]
+    SORT_ORDERS = [
+      'manual',
+      'best_selling',
+      'price asc',
+      'price desc',
+      'available_on desc',
+      'available_on asc',
+      'name asc',
+      'name desc'
+    ].freeze
 
     include Spree::TranslatableResource
     include Spree::TranslatableResourceSlug

data/app/models/spree/variant.rb

@@ -103,7 +103,7 @@ module Spree
     scope :not_discontinued, lambda {
       where(
         arel_table[:discontinue_on].eq(nil).or(
-          arel_table[:discontinue_on].gteq(Time.current)
+          arel_table[:discontinue_on].gteq(Time.current.beginning_of_minute)
         )
       )
     }

data/app/models/spree/zone.rb

@@ -52,15 +52,27 @@ module Spree
 
     # Returns the matching zone with the highest priority zone type (State, Country, Zone.)
     # Returns nil in the case of no matches.
-    def self.match(address)
-      return unless address &&
-        matches = includes(:zone_members).
-                    order('spree_zones.zone_members_count', 'spree_zones.created_at').
-                    where("(spree_zone_members.zoneable_type = 'Spree::Country' AND " \
-                          'spree_zone_members.zoneable_id = ?) OR ' \
-                          "(spree_zone_members.zoneable_type = 'Spree::State' AND " \
-                          'spree_zone_members.zoneable_id = ?)', address.country_id, address.state_id).
-                    references(:zones)
+    # Accepts either an address (with country_id/state_id) or a Spree::Country directly.
+    def self.match(address_or_country)
+      return unless address_or_country
+
+      if address_or_country.is_a?(Spree::Country)
+        country_id = address_or_country.id
+        state_id = nil
+      else
+        country_id = address_or_country.country_id
+        state_id = address_or_country.state_id
+      end
+
+      matches = includes(:zone_members).
+                  order('spree_zones.zone_members_count', 'spree_zones.created_at').
+                  where("(spree_zone_members.zoneable_type = 'Spree::Country' AND " \
+                        'spree_zone_members.zoneable_id = ?) OR ' \
+                        "(spree_zone_members.zoneable_type = 'Spree::State' AND " \
+                        'spree_zone_members.zoneable_id = ?)', country_id, state_id).
+                  references(:zones)
+
+      return if matches.empty?
 
       %w[state country].each do |zone_kind|
         if match = matches.detect { |zone| zone_kind == zone.kind }

data/app/presenters/spree/csv/coupon_code_presenter.rb

@@ -0,0 +1,31 @@
+module Spree
+  module CSV
+    class CouponCodePresenter
+      HEADERS = [
+        'Code',
+        'State',
+        'Promotion Name',
+        'Order Number',
+        'Created At',
+        'Updated At'
+      ].freeze
+
+      def initialize(coupon_code)
+        @coupon_code = coupon_code
+      end
+
+      attr_accessor :coupon_code
+
+      def call
+        [
+          coupon_code.display_code,
+          coupon_code.state,
+          coupon_code.promotion&.name,
+          coupon_code.order&.number,
+          coupon_code.created_at&.strftime('%Y-%m-%d %H:%M:%S'),
+          coupon_code.updated_at&.strftime('%Y-%m-%d %H:%M:%S')
+        ]
+      end
+    end
+  end
+end

data/lib/spree/core/engine.rb

@@ -180,7 +180,8 @@ module Spree
           Spree::Exports::Orders,
           Spree::Exports::Customers,
           Spree::Exports::GiftCards,
-          Spree::Exports::NewsletterSubscribers
+          Spree::Exports::NewsletterSubscribers,
+          Spree::Exports::CouponCodes
         ]
 
         Rails.application.config.spree.import_types = [

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '5.4.0.beta3'.freeze
+  VERSION = '5.4.0.beta4'.freeze
 
   def self.version
     VERSION

data/lib/spree_core.rb

@@ -1,6 +1,5 @@
 require 'friendly_id/paranoia'
 require 'friendly_id/history_decorator'
 require 'mobility/plugins/store_based_fallbacks'
-require 'normalize_string'
 
 require 'spree/core'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.4.0.beta3
+  version: 5.4.0.beta4
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-02 00:00:00.000000000 Z
+date: 2026-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -490,20 +490,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: any_ascii
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: safely_block
   requirement: !ruby/object:Gem::Requirement
@@ -935,6 +921,7 @@ files:
 - app/models/spree/event.rb
 - app/models/spree/exchange.rb
 - app/models/spree/export.rb
+- app/models/spree/exports/coupon_codes.rb
 - app/models/spree/exports/customers.rb
 - app/models/spree/exports/gift_cards.rb
 - app/models/spree/exports/newsletter_subscribers.rb
@@ -1165,6 +1152,7 @@ files:
 - app/models/spree/zone.rb
 - app/models/spree/zone_member.rb
 - app/paginators/spree/shared/paginate.rb
+- app/presenters/spree/csv/coupon_code_presenter.rb
 - app/presenters/spree/csv/customer_presenter.rb
 - app/presenters/spree/csv/gift_card_presenter.rb
 - app/presenters/spree/csv/metafields_helper.rb
@@ -1463,7 +1451,6 @@ files:
 - lib/generators/spree/model_decorator/model_decorator_generator.rb
 - lib/generators/spree/model_decorator/templates/model_decorator.rb.tt
 - lib/mobility/plugins/store_based_fallbacks.rb
-- lib/normalize_string.rb
 - lib/spree/analytics.rb
 - lib/spree/core.rb
 - lib/spree/core/components.rb
@@ -1653,9 +1640,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.4.0.beta3
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.beta4
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.beta3
+  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.beta4
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/normalize_string.rb

@@ -1,18 +0,0 @@
-require 'any_ascii'
-
-module NormalizeString
-  def self.normalize(string)
-    return unless string.present?
-
-    AnyAscii.transliterate(string)
-  end
-
-  def self.remove_emoji_and_normalize(string, keep_emoji_when_empty: false)
-    return unless string.present?
-
-    result = AnyAscii.transliterate(string.gsub(/\p{So}/, ''))
-    return result if result.present? || !keep_emoji_when_empty
-
-    normalize(string)
-  end
-end