spree_core 5.4.0.beta2 → 5.4.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af6f55a25483bfb02dab0b15f67356a2732cbeb190074b9ddb75a1692594fb7a
-  data.tar.gz: 8f0b8f77983432ef1e1baa52def6ed2674f9e0794bc632dd91757551c4ee71c4
+  metadata.gz: 29b95e3e3222214cdeef8094a1a9553636c875d88857244241431196d06399d2
+  data.tar.gz: 93c9f4d387fce7ba5e2e9f4b6454f9c46f1b8a15cfe180a16739c17bf76a5125
 SHA512:
-  metadata.gz: 46c6fc812dc90ba1ae3061b2e4066df5e9dd8ad530fde2db85095a7b5cb444fec2d51f4736a528c61ee4423e64d986478fdcf5478c40888e99818b849e444d60
-  data.tar.gz: aa2913c4e9882dd0e77d03ddcfae4f8277e4657b807080ce2d3549fd63f5c6da18448e2574b7742ad82b227a299dccfce3717a7df504be4442e3c7f0bf21629e
+  metadata.gz: 5c8a23c3edd35dacb0493c5435e28d114fc2611b4b25a0d85b4b5e4579f38402fb61a3a65a9f3b361fae8f67d5f58ac73984b6ab2cd4bcbb0326813589a18330
+  data.tar.gz: 1fabd1160061e412e2e9a4a1e92083686938a5313c3b29193e410bc07d6118d60af4bd7c2951794273c20f8b053f1dfc5acba8dfe748a722f5895aacc17d33d9

data/app/finders/spree/products/find.rb

@@ -22,14 +22,8 @@ module Spree
         @in_stock         = params.dig(:filter, :in_stock)
         @backorderable    = params.dig(:filter, :backorderable)
         @purchasable      = params.dig(:filter, :purchasable)
-        @out_of_stock     = params.dig(:filter, :out_of_stock).to_b
         @tags             = params.dig(:filter, :tags).to_s.split(',').compact_blank
         @vendor_ids       = params.dig(:filter, :vendor_ids)&.split(',')&.compact_blank || []
-
-        if @purchasable.present? && @out_of_stock.present?
-          @purchasable = false
-          @out_of_stock = false
-        end
       end
 
       def execute
@@ -50,7 +44,6 @@ module Spree
         products = show_only_stock(products)
         products = show_only_backorderable(products)
         products = show_only_purchasable(products)
-        products = show_only_out_of_stock(products)
         products = by_taxonomies(products)
         products = ordered(products)
         products = by_vendor_ids(products)
@@ -62,7 +55,7 @@ module Spree
 
       attr_reader :ids, :skus, :price, :currency, :taxons, :concat_taxons, :name, :options, :option_value_ids, :scope,
                   :sort_by, :deleted, :discontinued, :store, :in_stock, :backorderable, :purchasable, :tags,
-                  :query, :vendor_ids, :out_of_stock, :slug, :taxonomies
+                  :query, :vendor_ids, :slug, :taxonomies
 
       def query?
         query.present?
@@ -294,12 +287,6 @@ module Spree
         products.in_stock_or_backorderable
       end
 
-      def show_only_out_of_stock(products)
-        return products unless out_of_stock.present?
-
-        products.out_of_stock
-      end
-
       def map_prices(prices)
         prices.map do |price|
           price == 'Infinity' ? BigDecimal::INFINITY : price.to_f

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

@@ -81,9 +81,34 @@ module Spree
         where(Price.table_name => { amount: price.. })
       end
 
-      add_search_scope :in_stock do
-        joins(:variants_including_master).merge(Spree::Variant.in_stock)
+      # Can't use add_search_scope for this as it needs a default argument
+      # Ransack calls with '1' to activate, '0' or nil to skip
+      # In Ruby code: in_stock(true) for in-stock, in_stock(false) for out-of-stock
+      def self.in_stock(in_stock = true)
+        if in_stock == '0' || !in_stock
+          all
+        else
+          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)
+        if out_of_stock == '0' || !out_of_stock
+          all
+        else
+          where.not(id: joins(:variants_including_master).merge(Spree::Variant.in_stock_or_backorderable))
+        end
       end
+      search_scopes << :out_of_stock
 
       add_search_scope :backorderable do
         joins(:variants_including_master).merge(Spree::Variant.backorderable)
@@ -243,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
@@ -261,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/api_key.rb

@@ -6,11 +6,14 @@ module Spree
     PREFIXES = { 'publishable' => 'pk_', 'secret' => 'sk_' }.freeze
     TOKEN_LENGTH = 24
 
-    # @!attribute [r] plaintext_token
-    #   The raw token value, only available in memory immediately after creation
-    #   of a secret key. Not persisted to the database.
-    #   @return [String, nil]
-    attr_reader :plaintext_token
+    # Returns the raw token value. For publishable keys this is the persisted
+    # +token+ column. For secret keys it is only available in memory immediately
+    # after creation (not persisted).
+    #
+    # @return [String, nil]
+    def plaintext_token
+      publishable? ? token : @plaintext_token
+    end
 
     belongs_to :store, class_name: 'Spree::Store'
     belongs_to :created_by, polymorphic: true, optional: true

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

@@ -44,8 +44,7 @@ module Spree
       joins(:market_countries)
         .where(store_id: store.id)
         .where(spree_market_countries: { country_id: country.id })
-        .order(:position)
-        .first
+        .take
     end
 
     # Returns the default market for a store, or falls back to the first by position
@@ -65,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/market_country.rb

@@ -8,6 +8,7 @@ module Spree
     validates :market, :country, presence: true
     validates :country_id, uniqueness: { scope: :market_id }
     validate :country_covered_by_shipping_zone
+    validate :country_unique_per_store
 
     private
 
@@ -21,5 +22,21 @@ module Spree
         errors.add(:country, :not_in_shipping_zone)
       end
     end
+
+    def country_unique_per_store
+      return if market.blank? || country.blank?
+
+      store = market.store
+      return if store.blank?
+
+      existing = self.class.joins(:market)
+                     .where(country_id: country_id)
+                     .where(spree_markets: { store_id: store.id, deleted_at: nil })
+                     .where.not(id: id)
+
+      if existing.exists?
+        errors.add(:country, :already_in_market)
+      end
+    end
   end
 end

data/app/models/spree/newsletter_subscriber.rb

@@ -1,10 +1,7 @@
-require_dependency 'spree/newsletter_subscriber/emails'
-
 module Spree
   class NewsletterSubscriber < Spree.base_class
     has_prefix_id :sub
 
-    include Spree::NewsletterSubscriber::Emails
     include Spree::Metafields
 
     publishes_lifecycle_events

data/app/models/spree/order.rb

@@ -3,7 +3,6 @@ require_dependency 'spree/order/currency_updater'
 require_dependency 'spree/order/digital'
 require_dependency 'spree/order/payments'
 require_dependency 'spree/order/store_credit'
-require_dependency 'spree/order/emails'
 require_dependency 'spree/order/gift_card'
 
 module Spree
@@ -22,7 +21,6 @@ module Spree
     include Spree::Order::Payments
     include Spree::Order::StoreCredit
     include Spree::Order::AddressBook
-    include Spree::Order::Emails
     include Spree::Order::Webhooks
     include Spree::Core::NumberGenerator.new(prefix: 'R')
     include Spree::Order::GiftCard
@@ -311,9 +309,9 @@ module Spree
     # @return [Boolean]
     def order_refunded?
       return false if item_count.zero?
+      return false if refunds_total.zero?
 
-      (payment_state.in?(%w[void failed]) && refunds_total.positive?) ||
-        refunds_total == total_minus_store_credits - additional_tax_total.abs
+      payment_state.in?(%w[void failed]) || refunds_total == total_minus_store_credits - additional_tax_total.abs
     end
 
     def refunds_total
@@ -965,7 +963,6 @@ module Spree
         payments.store_credits.pending.each(&:void!)
       end
 
-      send_cancel_email
       update_with_updater!
       send_order_canceled_webhook
       publish_order_canceled_event

data/app/models/spree/product.rb

@@ -197,18 +197,6 @@ module Spree
     scope :by_source, ->(source) { send(source) }
     scope :paused, -> { where(status: 'paused') }
     scope :published, -> { where(status: 'active') }
-    scope :in_stock_items, -> { joins(:variants).merge(Spree::Variant.in_stock_or_backorderable) }
-    scope :out_of_stock_items, lambda {
-      joins(variants_including_master: :stock_items).
-        where(spree_variants: { track_inventory: true }).
-        where.not(id: Spree::Variant.where(track_inventory: false).pluck(:product_id).uniq).
-        where(spree_stock_items: { backorderable: false }).
-        group(:id).
-        having("SUM(#{Spree::StockItem.table_name}.count_on_hand) <= 0")
-    }
-    scope :out_of_stock, lambda {
-                           joins(:stock_items).where("#{Spree::Variant.table_name}.track_inventory = ? OR #{Spree::StockItem.table_name}.count_on_hand <= ?", false, 0)
-                         }
 
     attr_accessor :option_values_hash
 
@@ -232,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
-                                             multi_search in_stock_items out_of_stock_items with_option_value_ids
+                                             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/reimbursement.rb

@@ -4,7 +4,6 @@ module Spree
 
     include Spree::Core::NumberGenerator.new(prefix: 'RI', length: 9)
     include Spree::NumberIdentifier
-    include Spree::Reimbursement::Emails
 
     class IncompleteReimbursementError < StandardError; end
 
@@ -116,7 +115,6 @@ module Spree
       if unpaid_amount_within_tolerance?
         reimbursed!
         reimbursement_success_hooks.each { |h| h.call self }
-        send_reimbursement_email
       else
         errored!
         reimbursement_failure_hooks.each { |h| h.call self }

data/app/models/spree/shipment.rb

@@ -14,7 +14,6 @@ module Spree
     if defined?(Spree::VendorConcern)
       include Spree::VendorConcern
     end
-    include Spree::Shipment::Emails
     include Spree::Shipment::Webhooks
     include Spree::Shipment::CustomEvents
 

data/app/models/spree/shipment_handler.rb

@@ -1,6 +1,5 @@
 module Spree
   class ShipmentHandler
-    include Spree::Shipment::Emails
     include Spree::IntegrationsConcern
 
     class << self
@@ -25,7 +24,6 @@ module Spree
       @shipment.process_order_payments if Spree::Config[:auto_capture_on_dispatch]
       @shipment.touch :shipped_at
       update_order_shipment_state
-      send_shipped_email
     end
 
     protected

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/app/services/spree/newsletter/subscribe.rb

@@ -19,8 +19,8 @@ module Spree
           end
         end
 
-        # deliver confirmation email after the transaction is completed
-        subscriber.deliver_newsletter_email_verification unless subscriber.verified?
+        # publish event to trigger email delivery via subscriber
+        subscriber.publish_event('newsletter_subscriber.subscribed') unless subscriber.verified?
         subscriber
       end
 

data/app/subscribers/spree/invitation_email_subscriber.rb

@@ -34,7 +34,7 @@ module Spree
 
     def find_invitation(event)
       invitation_id = event.payload['id']
-      Spree::Invitation.find_by(id: invitation_id)
+      Spree::Invitation.find_by_prefix_id(invitation_id)
     end
   end
 end

data/config/locales/en.yml

@@ -292,6 +292,7 @@ en:
         spree/market_country:
           attributes:
             country:
+              already_in_market: is already assigned to another market in this store
               not_in_shipping_zone: is not covered by any shipping zone. Please set up a shipping zone first.
         spree/payment:
           attributes:

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.beta2'.freeze
+  VERSION = '5.4.0.beta4'.freeze
 
   def self.version
     VERSION

data/lib/spree/core.rb

@@ -427,7 +427,6 @@ require 'spree/events'
 require 'spree/webhooks'
 
 require 'spree/core/partials'
-require 'spree/core/importer'
 require 'spree/core/controller_helpers/auth'
 require 'spree/core/controller_helpers/common'
 require 'spree/core/controller_helpers/order'

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'