spree_core 5.1.0.beta2 → 5.1.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8150046e1776256aacec11512b848d9cbd5074d17b7aacafd7b2736cfd934c3
-  data.tar.gz: 8a04db5d73b2abf21a587ea66313d4fb7ff7120ed46ef9d22f38ddf1b3c5f295
+  metadata.gz: 40078ca0fe53f0e6a2af34f66cec79f80823d752aceabac637f5e247b32976a6
+  data.tar.gz: 5ae9476bc4e0fee22c705e9b1979a4d29d1057066c20d017a8c956392d137712
 SHA512:
-  metadata.gz: 8024d8aa8b617d7be12713acf1787a7c4569dc708d74cbf34850ec6bc8fcea5630c15fdfe6efa4796c82825fc9724d637b219da887f888f909dd29d22582178f
-  data.tar.gz: 60db3009f9a9a30bfca2b8c6895b7777a35eaac8819ca06a112e2315e234137ee87e5fea3796335e53e8a8e5c562f22183d7d8c6c3c3b1f8e9466d76ba3bbde5
+  metadata.gz: ff673f06e666ffcf7b987182bbc226c6663a645a7fac34d14ae79021f076972f21de05e27639e920885cd2478dc17a2f1f648bcfcbb29987909a71ab71913e6d
+  data.tar.gz: e52971afaf599280aef97bbad4cc33d81621003770dd43edae06532bb86486584d0bfc758299896dbbb56a1f9fc71c34c68791b47bbe1ce8588ba786ec4a78b5

data/app/helpers/spree/mail_helper.rb

@@ -17,6 +17,8 @@ module Spree
     end
 
     def logo_path
+      Spree::Deprecation.warn('logo_path is deprecated and will be removed in Spree 6.0. Please use Active Storage URL helpers instead.')
+
       return main_app.cdn_image_url(store_logo.variant(resize_to_limit: [244, 104])) if store_logo&.variable?
 
       return main_app.cdn_image_url(store_logo) if store_logo&.image?

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

@@ -0,0 +1,39 @@
+module Spree
+  module PaymentSourceConcern
+    extend ActiveSupport::Concern
+
+    # Available actions for the payment source.
+    # @return [Array<String>]
+    def actions
+      %w{capture void credit}
+    end
+
+    # Indicates whether its possible to capture the payment
+    # @param payment [Spree::Payment]
+    # @return [Boolean]
+    def can_capture?(payment)
+      payment.pending? || payment.checkout?
+    end
+
+    # Indicates whether its possible to void the payment.
+    # @param payment [Spree::Payment]
+    # @return [Boolean]
+    def can_void?(payment)
+      !payment.failed? && !payment.void?
+    end
+
+    # Indicates whether its possible to credit the payment.  Note that most gateways require that the
+    # payment be settled first which generally happens within 12-24 hours of the transaction.
+    # @param payment [Spree::Payment]
+    # @return [Boolean]
+    def can_credit?(payment)
+      payment.completed? && payment.credit_allowed > 0
+    end
+
+    # Returns true if the payment source has a payment profile.
+    # @return [Boolean]
+    def has_payment_profile?
+      gateway_customer_profile_id.present? || gateway_payment_profile_id.present?
+    end
+  end
+end

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

@@ -305,7 +305,12 @@ module Spree
       # .search_by_name
       if defined?(PgSearch)
         include PgSearch::Model
-        pg_search_scope :search_by_name, against: { name: 'A', meta_title: 'B' }, using: { tsearch: { any_word: true, prefix: true } }
+
+        if connected? && connection.extension_enabled?('pg_trgm')
+          pg_search_scope :search_by_name, against: { name: 'A', meta_title: 'B' }, using: { trigram: { threshold: 0.3, word_similarity: true } }
+        else
+          pg_search_scope :search_by_name, against: { name: 'A', meta_title: 'B' }, using: { tsearch: { any_word: true, prefix: true } }
+        end
       else
         def self.search_by_name(query)
           i18n { name.lower.matches("%#{query.downcase}%") }

data/app/models/spree/address.rb

@@ -189,7 +189,7 @@ module Spree
     end
 
     def show_company_address_field?
-      false
+      Spree::Store.current.prefers_company_field_enabled?
     end
 
     def editable?

data/app/models/spree/credit_card.rb

@@ -2,6 +2,8 @@ module Spree
   class CreditCard < Spree.base_class
     include ActiveMerchant::Billing::CreditCardMethods
     include Spree::Metadata
+    include Spree::PaymentSourceConcern
+
     if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
@@ -135,30 +137,6 @@ module Spree
       brand.present? ? brand.upcase : Spree.t(:no_cc_type)
     end
 
-    def actions
-      %w{capture void credit}
-    end
-
-    # Indicates whether its possible to capture the payment
-    def can_capture?(payment)
-      payment.pending? || payment.checkout?
-    end
-
-    # Indicates whether its possible to void the payment.
-    def can_void?(payment)
-      !payment.failed? && !payment.void?
-    end
-
-    # Indicates whether its possible to credit the payment.  Note that most gateways require that the
-    # payment be settled first which generally happens within 12-24 hours of the transaction.
-    def can_credit?(payment)
-      payment.completed? && payment.credit_allowed > 0
-    end
-
-    def has_payment_profile?
-      gateway_customer_profile_id.present? || gateway_payment_profile_id.present?
-    end
-
     # ActiveMerchant needs first_name/last_name because we pass it a Spree::CreditCard and it calls those methods on it.
     # Looking at the ActiveMerchant source code we should probably be calling #to_active_merchant before passing
     # the object to ActiveMerchant but this should do for now.

data/app/models/spree/gateway/custom_payment_source_method.rb

@@ -0,0 +1,33 @@
+module Spree
+  class Gateway::CustomPaymentSourceMethod < Gateway
+    def provider_class
+      self.class
+    end
+
+    def payment_source_class
+      Spree::PaymentSource
+    end
+
+    def payment_profiles_supported?
+      true
+    end
+
+    def show_in_admin?
+      false
+    end
+
+    def create_profile(payment)
+      return if payment.source.gateway_customer.present?
+
+      user = payment.source.user || payment.order.user
+      return if user.blank?
+
+      find_or_create_customer(user)
+    end
+
+    # simulate a 3rd party payment gateway api to fetch/or create a customer
+    def find_or_create_customer(user)
+      gateway_customers.find_or_create_by!(user: user, profile_id: "CUSTOMER-#{user.id}")
+    end
+  end
+end

data/app/models/spree/payment.rb

@@ -302,7 +302,8 @@ module Spree
       # Payment profile cannot be created without source
       return unless source
       # Imported payments shouldn't create a payment profile.
-      return if source.imported
+      # Imported is only available on Spree::CreditCard, non-credit card payments should not have this attribute.
+      return if source.respond_to?(:imported) && source.imported
 
       payment_method.create_profile(self)
     rescue ActiveMerchant::ConnectionError => e

data/app/models/spree/payment_source.rb

@@ -1,10 +1,31 @@
+# This model is used to store payment sources for non-credit card payments, eg wallet, account, etc.
 module Spree
   class PaymentSource < Spree.base_class
     include Spree::Metadata
+    include Spree::PaymentSourceConcern
 
+    #
+    # Associations
+    #
     belongs_to :payment_method, class_name: 'Spree::PaymentMethod'
     belongs_to :user, class_name: Spree.user_class.to_s, optional: true
 
+    #
+    # Validations
+    #
     validates_uniqueness_of :gateway_payment_profile_id, scope: :type
+
+    #
+    # Delegations
+    #
+    delegate :profile_id, to: :gateway_customer, prefix: true, allow_nil: true
+
+    # Returns the gateway customer for the user.
+    # @return [Spree::GatewayCustomer]
+    def gateway_customer
+      return if user.blank?
+
+      payment_method.gateway_customers.find_by(user: user)
+    end
   end
 end

data/app/models/spree/product.rb

@@ -50,8 +50,11 @@ module Spree
       if defined?(PgSearch)
         include PgSearch::Model
 
-        pg_search_scope :search_by_name, against: { name: 'A', meta_title: 'B' },
-                                         using: { tsearch: { prefix: true, any_word: true } }
+        if connected? && connection.extension_enabled?('pg_trgm')
+          pg_search_scope :search_by_name, against: { name: 'A', meta_title: 'B' }, using: { trigram: { threshold: 0.3, word_similarity: true } }
+        else
+          pg_search_scope :search_by_name, against: { name: 'A', meta_title: 'B' }, using: { tsearch: { any_word: true, prefix: true } }
+        end
       end
 
       before_save :set_slug

data/app/models/spree/stock_location.rb

@@ -29,7 +29,6 @@ module Spree
     after_update :conditional_touch_records
 
     delegate :name, :iso3, :iso, :iso_name, to: :country, prefix: true
-    delegate :show_company_address_field?, to: :address
 
     def state_text
       state.try(:abbr) || state.try(:name) || state_name
@@ -136,6 +135,7 @@ module Spree
       Spree::Address.new(
         address1: address1,
         address2: address2,
+        company: company,
         city: city,
         state: state,
         state_name: state_name,
@@ -159,6 +159,10 @@ module Spree
       false
     end
 
+    def show_company_address_field?
+      true
+    end
+
     def display_name
       @display_name ||= [admin_name, name].delete_if(&:blank?).join(' / ')
     end

data/app/models/spree/store.rb

@@ -48,6 +48,9 @@ module Spree
     preference :password_protected, :boolean, default: false
     # Checkout preferences
     preference :guest_checkout, :boolean, default: true
+    preference :special_instructions_enabled, :boolean, default: false
+    # Address preferences
+    preference :company_field_enabled, :boolean, default: false
     # digital assets preferences
     preference :limit_digital_download_count, :boolean, default: true
     preference :limit_digital_download_days, :boolean, default: true

data/app/models/spree/wishlist.rb

@@ -36,6 +36,13 @@ module Spree
       @wished_items_count ||= variant_ids.count
     end
 
+    # returns the variant ids in the wishlist
+    #
+    # @return [Array<Integer>]
+    def variant_ids
+      @variant_ids ||= wished_items.pluck(:variant_id)
+    end
+
     def self.get_by_param(param)
       find_by(token: param)
     end

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

@@ -136,8 +136,15 @@ module Spree
             o.position = opt[:position]
             o.save!
           end
-          option_value = option_type.option_values.where(name: opt[:value].parameterize).first_or_initialize do |o|
-            o.name = o.presentation = opt[:value]
+
+          option_value_identificator = if opt[:option_value_name].present?
+                                         opt[:option_value_name]
+                                       else
+                                         opt[:option_value_presentation].parameterize
+                                       end
+
+          option_value = option_type.option_values.where(name: option_value_identificator).first_or_initialize do |o|
+            o.name = o.presentation = opt[:option_value_presentation]
             o.save!
           end
 

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

@@ -30,6 +30,15 @@
     <div class="flex-shrink-0">
       <%= payment_method_icon_tag source.class.to_s.demodulize.downcase, height: 30 %>
     </div>
+    <div>
+      <% if payment.payment_method.respond_to?(:source_partial_name) %>
+        <%= render partial: "spree/payment_sources/#{payment.payment_method.source_partial_name}", locals: { payment: payment, source: source } %>
+      <% elsif source.respond_to?(:name) %>
+        <%= source.name %>
+      <% else %>
+        <%= source.class.to_s.demodulize.downcase %>
+      <% end %>
+    </div>
   <% else %>
     <div class="flex-shrink-0">
       <%= payment_method_icon_tag payment.payment_method.payment_icon_name %>

data/config/locales/en.yml

@@ -567,6 +567,7 @@ en:
       receive: Mark as received
       refund: Refund
       reject: Reject
+      remove: Remove
       resend: Resend
       resolve: Mark as resolved
       save: Save
@@ -630,6 +631,7 @@ en:
       successfully_updated: Updated successfully
       unsuccessfully_saved: There was an error while trying to save your address.
       unsuccessfully_updated: There was an update while trying to update your address.
+    address_settings: Address settings
     addresses: Addresses
     adjustable: Adjustable
     adjustment: Adjustment

data/db/migrate/20250527134027_add_company_to_spree_stock_locations.rb

@@ -0,0 +1,5 @@
+class AddCompanyToSpreeStockLocations < ActiveRecord::Migration[7.2]
+  def change
+    add_column :spree_stock_locations, :company, :string, if_not_exists: true
+  end
+end

data/lib/spree/core/configuration.rb

@@ -37,7 +37,7 @@ module Spree
       preference :auto_capture_on_dispatch, :boolean, default: false # Captures payment for each shipment in Shipment#after_ship callback, and makes Shipment.ready when payment authorized.
       preference :binary_inventory_cache, :boolean, default: false, deprecated: true # only invalidate product cache when a stock item changes whether it is in_stock
       preference :checkout_zone, :string, default: nil, deprecated: true # replace with the name of a zone if you would like to limit the countries
-      preference :company, :boolean, default: false # Request company field for billing and shipping addr
+      preference :company, :boolean, default: false, deprecated: 'Use the company_field_enabled preference in the Spree::Store model' # Request company field for billing and shipping addr
       preference :currency, :string, default: 'USD', deprecated: true
       preference :credit_to_new_allocation, :boolean, default: false
       preference :disable_sku_validation, :boolean, default: false # when turned off disables the built-in SKU uniqueness validation

data/lib/spree/core/engine.rb

@@ -98,6 +98,7 @@ module Spree
         Rails.application.config.spree.payment_methods = [
           Spree::Gateway::Bogus,
           Spree::Gateway::BogusSimple,
+          Spree::Gateway::CustomPaymentSourceMethod,
           Spree::PaymentMethod::Check,
           Spree::PaymentMethod::StoreCredit
         ]

data/lib/spree/core/version.rb

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

data/lib/spree/permitted_attributes.rb

@@ -27,6 +27,8 @@ module Spree
       :page_section_attributes,
       :payment_attributes,
       :payment_method_attributes,
+      :post_attributes,
+      :post_category_attributes,
       :product_attributes,
       :promotion_attributes,
       :promotion_rule_attributes,
@@ -101,7 +103,7 @@ module Spree
 
     @@digital_link_attributes = [:access_counter]
 
-    @@export_attributes = [:type, :format, :record_selection, search_params: {}]
+    @@export_attributes = [:type, :format, :record_selection, :search_params]
 
     @@image_attributes = [:alt, :attachment, :position, :viewable_type, :viewable_id]
 
@@ -125,16 +127,20 @@ module Spree
 
     @@page_attributes = [:name, :slug, :meta_title, :meta_description, :meta_keywords]
 
-    @@page_block_attributes = [:type, :name, :position]
+    @@page_block_attributes = [:type, :name, :text, :position]
 
-    @@page_link_attributes = [:linkable_id, :linkable_type, :position, :label, :url]
+    @@page_link_attributes = [:linkable_id, :linkable_type, :position, :label, :url, :open_in_new_tab]
 
-    @@page_section_attributes = [:type, :name, :position, :asset]
+    @@page_section_attributes = [:type, :name, :position, :asset, :text, :description]
 
     @@payment_attributes = [:amount, :payment_method_id, :payment_method]
 
     @@payment_method_attributes = [:name, :type, :description, :active, :display_on, :auto_capture, :position]
 
+    @@post_attributes = [:title, :meta_title, :meta_description, :slug, :author_id, :post_category_id, :published_at, :content, :excerpt, :image, tag_list: []]
+
+    @@post_category_attributes = [:title, :slug, :description]
+
     @@product_properties_attributes = [:property_name, :property_id, :value, :position, :_destroy]
 
     @@product_attributes = [
@@ -207,7 +213,7 @@ module Spree
     @@stock_item_attributes = [:variant_id, :stock_location_id, :backorderable, :count_on_hand]
 
     @@stock_location_attributes = [
-      :name, :active, :address1, :address2, :city, :zipcode,
+      :name, :active, :address1, :address2, :city, :zipcode, :company,
       :backorderable_default, :state_name, :state_id, :country_id, :phone,
       :propagate_all_variants
     ]
@@ -265,7 +271,7 @@ module Spree
       :weight, :height, :width, :depth, :sku, :barcode, :cost_currency,
       :weight_unit, :dimensions_unit,
       {
-        options: [:id, :name, :value, :position, :_destroy],
+        options: [:id, :name, :option_value_presentation, :option_value_name, :position, :_destroy],
         stock_items_attributes: [:id, :count_on_hand, :stock_location_id, :backorderable, :_destroy],
         prices_attributes: [:id, :amount, :compare_at_amount, :currency, :_destroy],
         price: {},

data/lib/spree/testing_support/factories/page_section_factory.rb

@@ -20,5 +20,7 @@ FactoryBot.define do
     factory :newsletter_page_section, class: Spree::PageSections::Newsletter
 
     factory :video_page_section, class: Spree::PageSections::Video
+
+    factory :image_with_text_page_section, class: Spree::PageSections::ImageWithText
   end
 end

data/lib/spree/testing_support/factories/payment_factory.rb

@@ -14,6 +14,11 @@ FactoryBot.define do
         create(:refund, amount: 5, payment: payment)
       end
     end
+
+    factory :custom_payment, class: Spree::Payment do
+      payment_method { create(:custom_payment_method, stores: [order.store]) }
+      source { create(:payment_source, user: order.user, payment_method: payment_method) }
+    end
   end
 
   factory :check_payment, class: Spree::Payment do

data/lib/spree/testing_support/factories/payment_method_factory.rb

@@ -37,4 +37,9 @@ FactoryBot.define do
     active        { true }
     auto_capture  { true }
   end
+
+  factory :custom_payment_method, parent: :payment_method, class: Spree::Gateway::CustomPaymentSourceMethod do
+    type { 'Spree::Gateway::CustomPaymentSourceMethod' }
+    name { 'Custom' }
+  end
 end

data/lib/spree/testing_support/factories/payment_source_factory.rb

@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :payment_source, class: Spree::PaymentSource do
+    association(:payment_method, factory: :custom_payment_method)
+  end
+end

data/lib/spree/testing_support/factories/post_factory.rb

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :post, class: Spree::Post do
-    post_category { create(:post_category) }
+    post_category { create(:post_category, store: Spree::Store.default || create(:store)) }
     title { FFaker::Lorem.sentence }
     content { FFaker::Lorem.paragraph }
     published_at { Time.current }

data/lib/spree/testing_support/factories/theme_factory.rb

@@ -8,7 +8,7 @@ FactoryBot.define do
     end
 
     trait :preview do
-      parent { create(:theme) }
+      parent { Spree::Store.default.default_theme || create(:theme, store: store) }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.1.0.beta2
+  version: 5.1.0.beta4
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-22 00:00:00.000000000 Z
+date: 2025-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -622,6 +622,7 @@ files:
 - app/models/concerns/spree/number_as_param.rb
 - app/models/concerns/spree/number_identifier.rb
 - app/models/concerns/spree/parameterizable_name.rb
+- app/models/concerns/spree/payment_source_concern.rb
 - app/models/concerns/spree/previewable.rb
 - app/models/concerns/spree/product_scopes.rb
 - app/models/concerns/spree/ransackable_attributes.rb
@@ -686,6 +687,7 @@ files:
 - app/models/spree/gateway.rb
 - app/models/spree/gateway/bogus.rb
 - app/models/spree/gateway/bogus_simple.rb
+- app/models/spree/gateway/custom_payment_source_method.rb
 - app/models/spree/gateway_customer.rb
 - app/models/spree/image.rb
 - app/models/spree/image/configuration/active_storage.rb
@@ -1158,6 +1160,7 @@ files:
 - db/migrate/20250418174652_add_resource_to_spree_role_users.rb
 - db/migrate/20250508060800_add_selected_locale_to_spree_admin_users.rb
 - db/migrate/20250509143831_add_session_id_to_spree_assets.rb
+- db/migrate/20250527134027_add_company_to_spree_stock_locations.rb
 - db/seeds.rb
 - lib/friendly_id/paranoia.rb
 - lib/generators/spree/authentication/custom/custom_generator.rb
@@ -1265,6 +1268,7 @@ files:
 - lib/spree/testing_support/factories/payment_capture_event_factory.rb
 - lib/spree/testing_support/factories/payment_factory.rb
 - lib/spree/testing_support/factories/payment_method_factory.rb
+- lib/spree/testing_support/factories/payment_source_factory.rb
 - lib/spree/testing_support/factories/post_category_factory.rb
 - lib/spree/testing_support/factories/post_factory.rb
 - lib/spree/testing_support/factories/price_factory.rb
@@ -1344,9 +1348,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.1.0.beta2
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.0.beta4
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.1.0.beta2
+  source_code_uri: https://github.com/spree/spree/tree/v5.1.0.beta4
 post_install_message:
 rdoc_options: []
 require_paths: