spree_core 5.1.0.beta3 → 5.1.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dbf1c3a02958e3dcb370c47d5cd4e9c209924301fcf451e91cdce682e60ea74
-  data.tar.gz: 83d62b4be4aeeb60fda78de84dfe73bd5ebf9603b32b5b938274be67a54c25a0
+  metadata.gz: 40078ca0fe53f0e6a2af34f66cec79f80823d752aceabac637f5e247b32976a6
+  data.tar.gz: 5ae9476bc4e0fee22c705e9b1979a4d29d1057066c20d017a8c956392d137712
 SHA512:
-  metadata.gz: fdfef29cde021604e1309c49fd2218ced2bbf37c66b4642a88979955e57d6744a1f6630b1e8937aa4633d626f8c509bf8a7c3fc1c5bf76f0c5ba3f8472bd7fe1
-  data.tar.gz: a2d843bd61853ce37850019f7d378a83cd7fe88b523f1be07354271350498e851625caa9a49f969cbf338a00c12bb289d55a449f8a212d1a8290bab75d720971
+  metadata.gz: ff673f06e666ffcf7b987182bbc226c6663a645a7fac34d14ae79021f076972f21de05e27639e920885cd2478dc17a2f1f648bcfcbb29987909a71ab71913e6d
+  data.tar.gz: e52971afaf599280aef97bbad4cc33d81621003770dd43edae06532bb86486584d0bfc758299896dbbb56a1f9fc71c34c68791b47bbe1ce8588ba786ec4a78b5

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/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/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/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.beta3'.freeze
+  VERSION = '5.1.0.beta4'.freeze
 
   def self.version
     VERSION

data/lib/spree/permitted_attributes.rb

@@ -271,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/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/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.beta3
+  version: 5.1.0.beta4
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-29 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
@@ -1266,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
@@ -1345,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.beta3
+  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.beta3
+  source_code_uri: https://github.com/spree/spree/tree/v5.1.0.beta4
 post_install_message:
 rdoc_options: []
 require_paths: