spree_core 5.0.4 → 5.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dad7a44435e17f7a0b717356dfe3f8f70cac0e9a18f38f505ded42f3908faf5
-  data.tar.gz: 109859dd8b1790ab9c0a22c1457e03e81708d79007664f0c8afae841573dd43e
+  metadata.gz: f19fd414a37bad67d13a4a491582f6c391ab2677a3ee2a93952e7e8cd52d94d0
+  data.tar.gz: 98d87831e0aeed0b5165eb4a38c6198a66423a4b2102a91f529eb2c9941db059
 SHA512:
-  metadata.gz: f09637caac881e203c1ff4f1104c2035c89df6cf671d619b7b9e4786a82a4d65332e6537fa4932545e1782203c82f1b41bb6e4c416674df57de95ccbb014410f
-  data.tar.gz: 2e499043d9f6393d208ce6cdb823059e734748e79924612d408e6de48d5e36c89cb1799405dd62da06e53aa6b8df3693033a267948fb3e6a4fc2077d4efbce2d
+  metadata.gz: a6e96c2e6e5ac2c433392016b01fc5aa6a73a719ce766ba3d6619fae46559b9ca25141be70621d0f31d207a8896a1d79de7dc154d474334af02c46fc9dbe9fba
+  data.tar.gz: 524ecf14bf52c91ac982cd6c489d45592eab70e68ed8de95f0565be7740a49a04aac9aeacffe94c3d355b480f68e6af051efd32b5ba2bd2334cdea1f1119f9f9

data/app/helpers/spree/base_helper.rb

@@ -242,7 +242,7 @@ module Spree
     end
 
     def spree_base_cache_key
-      [
+      @spree_base_cache_key ||= [
         I18n.locale,
         (current_currency if defined?(current_currency)),
         defined?(try_spree_current_user) && try_spree_current_user.present?,
@@ -258,6 +258,11 @@ module Spree
       Spree::DatabaseTypeUtilities.maximum_value_for(:integer)
     end
 
+    def payment_method_icon_tag(payment_method, opts = {})
+      image_tag "payment_icons/#{payment_method}.svg", opts
+    rescue Sprockets::Rails::Helper::AssetNotFound
+    end
+
     private
 
     def create_product_image_tag(image, product, options, style)

data/app/helpers/spree/images_helper.rb

@@ -18,10 +18,10 @@ module Spree
       width = options[:width]
       height = options[:height]
 
-      width = width * 2 if width.present?
-      height = height * 2 if height.present?
+      width *= 2 if width.present?
+      height *= 2 if height.present?
 
-      return unless image.attached?
+      return if image.respond_to?(:attached?) && !image.attached?
       return unless image.variable?
 
       if width.present? && height.present?
@@ -51,17 +51,18 @@ module Spree
       return unless height
       return if height.zero?
 
-      w, h = width.to_f, height.to_f
+      w = width.to_f
+      h = 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 = if h > w
+                h / w
+              elsif h < w
+                w / h
+              else
+                # h == w, square image
+                1.0
+              end
 
       ratio.round(3)
     end

data/app/helpers/spree/mail_helper.rb

@@ -1,10 +1,11 @@
 module Spree
   module MailHelper
-    include BaseHelper
+    include Spree::BaseHelper
+    include Spree::ImagesHelper
 
     def variant_image_url(variant)
-      image = default_image_for_product_or_variant(variant)
-      image ? main_app.cdn_image_url(image.url(:small)) : image_url('noimage/small.png')
+      image = variant.default_image
+      image.present? && image.attached? ? spree_image_url(image, width: 100, height: 100) : image_url('noimage/small.png')
     end
 
     def name_for(order)

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/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/option_value.rb

@@ -62,9 +62,9 @@ module Spree
     delegate :name, :presentation, to: :option_type, prefix: true, allow_nil: true
 
     def self.to_tom_select_json
-      all.pluck(:id, :presentation).map do |id, presentation|
+      all.pluck(:name, :presentation).map do |name, presentation|
         {
-          id: id,
+          id: name,
           name: presentation
         }
       end

data/app/models/spree/page_sections/featured_posts.rb

@@ -19,6 +19,10 @@ module Spree
         'news'
       end
 
+      def posts
+        Spree::Post.published.by_newest.limit(preferred_max_posts_to_show)
+      end
+
       private
 
       def make_posts_to_show_valid

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/post.rb

@@ -54,6 +54,7 @@ module Spree
     # Scopes
     #
     scope :published, -> { where(published_at: [..Time.current]) }
+    scope :by_newest, -> { order(created_at: :desc) }
 
     delegate :name, to: :author, prefix: true, allow_nil: true
     delegate :title, to: :post_category, prefix: true, allow_nil: true

data/app/models/spree/shipping_method.rb

@@ -93,7 +93,7 @@ module Spree
       if estimated_transit_business_days_min == estimated_transit_business_days_max
         estimated_transit_business_days_min.to_s
       else
-        "#{estimated_transit_business_days_min}-#{estimated_transit_business_days_max}"
+        [estimated_transit_business_days_min, estimated_transit_business_days_max].compact.join("-")
       end
     end
 

data/app/models/spree/taxon.rb

@@ -153,6 +153,10 @@ module Spree
       sort_order == 'manual'
     end
 
+    def page_builder_image
+      square_image.presence || image
+    end
+
     def active_products_with_descendants
       @active_products_with_descendants ||= store.products.
                                             joins(:classifications).

data/app/models/spree/theme.rb

@@ -155,7 +155,7 @@ module Spree
       end
     end
 
-    # Returns an array of available layout section classes for the theme
+    # Returns an array of available layout section classes for the theme, eg. header, footer, newsletter, etc.
     #
     # @return [Array<Class>]
     def available_layout_sections

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

@@ -716,6 +716,7 @@ en:
     capture: Capture
     capture_events: Capture events
     card_code: Card Verification Code (CVC)
+    card_expiration_placeholder: MM/YYYY
     card_number: Card Number
     card_type: Brand
     card_type_is: Card type is
@@ -891,6 +892,8 @@ en:
     destroy: Destroy
     details: Details
     developers: Developers
+    didn_t_receive_confirmation_instructions: Didn't receive confirmation instructions?
+    didn_t_receive_unlock_instructions: Didn't receive unlock instructions?
     digital:
       digital_delivery: Digital Delivery
     digital_assets: Digital assets
@@ -1208,6 +1211,9 @@ en:
     metadata: Metadata
     min: Min
     minimal_amount: Minimal Amount
+    minimum_password_length:
+      one: "(%{count} character minimum)"
+      other: "(%{count} characters minimum)"
     missing_return_authorization: Missing Return Authorization for %{item_name}.
     month: Month
     more: More
@@ -1481,7 +1487,7 @@ en:
     password_protected: Password protected
     paste: Paste
     path: Path
-    pay: pay
+    pay: Pay
     payment: Payment
     payment_amount: Payment amount
     payment_attempts: failed attempts
@@ -1498,11 +1504,11 @@ en:
     payment_source: Payment source
     payment_state: Payment State
     payment_states:
-      balance_due: Balance due
+      balance_due: Balance Due
       checkout: Checkout
       complete: Complete
       completed: Completed
-      credit_owed: Credit owed
+      credit_owed: Credit Owed
       failed: Failed
       paid: Paid
       partially_refunded: Partially Refunded
@@ -1526,8 +1532,6 @@ en:
     please_check_back_soon: Please check back soon.
     please_define_payment_methods: Please define some payment methods first.
     please_enter_reasonable_quantity: Please enter a reasonable quantity.
-    please_select: Please select
-    please_select_all_options: Please select all options
     policies: Policies
     populate_get_error: Something went wrong. Please try adding the item again.
     post_categories: Post categories
@@ -1878,6 +1882,7 @@ en:
     show_store_selector:
       long: Display the Store selector in the main nav bar of Storefront and allow users to change Store and Currency
       short: Show Store selector
+    sign_in_with_provider: Sign in with %{provider}
     sign_out: Sign out
     sign_up: Sign Up
     site_name: Site name
@@ -2098,6 +2103,7 @@ en:
     timezone: Timezone
     title: Title
     title_link: Title link
+    to: To
     to_add_variants_you_must_first_define: To add variants, you must first define
     toggle_menu: Toggle menu
     top_suggestions: Top suggestions

data/lib/spree/core/engine.rb

@@ -96,6 +96,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.0.4'.freeze
+  VERSION = '5.0.5'.freeze
 
   def self.version
     VERSION

data/lib/spree/permitted_attributes.rb

@@ -165,7 +165,14 @@ module Spree
       :product_id, :product, :option_values_attributes, :price, :compare_at_price,
       :weight, :height, :width, :depth, :sku, :barcode, :cost_currency,
       :weight_unit, :dimensions_unit,
-      { options: [:name, :value], option_value_ids: [] }
+      {
+        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: {},
+        option_value_variants_attributes: [:id, :option_value_id, :_destroy],
+        option_value_ids: []
+      }
     ]
 
     @@wishlist_attributes = [:name, :is_default, :is_private]

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

@@ -20,5 +20,9 @@ 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
+
+    factory :featured_posts_page_section, class: Spree::PageSections::FeaturedPosts
   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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.0.5
 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-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -603,6 +603,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
@@ -666,6 +667,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
@@ -1229,6 +1231,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
@@ -1308,9 +1311,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.4
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.0.5
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.0.4
+  source_code_uri: https://github.com/spree/spree/tree/v5.0.5
 post_install_message:
 rdoc_options: []
 require_paths: