spree_core 5.3.4 → 5.4.0.beta2

data/app/models/spree/refund.rb

@@ -1,5 +1,7 @@
 module Spree
   class Refund < Spree.base_class
+    has_prefix_id :re  # Stripe: re_
+
     include Spree::Metafields
     include Spree::Metadata
     if defined?(Spree::Security::Refunds)
@@ -34,6 +36,10 @@ module Spree
 
     delegate :order, :currency, to: :payment
 
+    def amount=(amount)
+      self[:amount] = Spree::LocalizedNumber.parse(amount)
+    end
+
     def money
       Spree::Money.new(amount, currency: currency)
     end
@@ -81,7 +87,7 @@ module Spree
       update_order
     end
 
-    # return an activemerchant response object if successful or else raise an error
+    # return a payment response object if successful or else raise an error
     def process!(credit_cents)
       refund_total_in_cents = calculate_refund_amount(credit_cents)
 
@@ -100,7 +106,7 @@ module Spree
       end
 
       response
-    rescue ActiveMerchant::ConnectionError => e
+    rescue Spree::PaymentConnectionError => e
       Rails.logger.error(Spree.t(:gateway_error) + "  #{e.inspect}")
       raise Core::GatewayError, Spree.t(:unable_to_connect_to_gateway)
     end

data/app/models/spree/refund_reason.rb

@@ -1,5 +1,7 @@
 module Spree
   class RefundReason < Spree.base_class
+    has_prefix_id :rr
+
     include Spree::NamedType
 
     RETURN_PROCESSING_REASON = 'Return processing'

data/app/models/spree/reimbursement/credit.rb

@@ -1,5 +1,7 @@
 module Spree
   class Reimbursement::Credit < Spree.base_class
+    has_prefix_id :rcred
+
     class_attribute :default_creditable_class
     self.default_creditable_class = nil
 

data/app/models/spree/reimbursement.rb

@@ -1,5 +1,7 @@
 module Spree
   class Reimbursement < Spree.base_class
+    has_prefix_id :reimb
+
     include Spree::Core::NumberGenerator.new(prefix: 'RI', length: 9)
     include Spree::NumberIdentifier
     include Spree::Reimbursement::Emails

data/app/models/spree/reimbursement_type.rb

@@ -1,5 +1,7 @@
 module Spree
   class ReimbursementType < Spree.base_class
+    has_prefix_id :rtype
+
     include Spree::NamedType
 
     KINDS = %w(Spree::ReimbursementType::Credit

data/app/models/spree/report.rb

@@ -1,5 +1,7 @@
 module Spree
   class Report < Spree.base_class
+    has_prefix_id :rep
+
     include Spree::SingleStoreResource
     include Spree::VendorConcern if defined?(Spree::VendorConcern)
 
@@ -32,7 +34,7 @@ module Spree
     has_one_attached :attachment, service: Spree.private_storage_service_name
 
     def event_serializer_class
-      Spree::Events::ReportSerializer
+      'Spree::Api::V3::ReportSerializer'.safe_constantize
     end
 
     def self.report_type

data/app/models/spree/return_authorization.rb

@@ -1,5 +1,7 @@
 module Spree
   class ReturnAuthorization < Spree.base_class
+    has_prefix_id :ra
+
     include Spree::Core::NumberGenerator.new(prefix: 'RA', length: 9)
     include Spree::NumberIdentifier
 

data/app/models/spree/return_authorization_reason.rb

@@ -1,5 +1,7 @@
 module Spree
   class ReturnAuthorizationReason < Spree.base_class
+    has_prefix_id :rar
+
     include Spree::NamedType
 
     has_many :return_authorizations, dependent: :restrict_with_error

data/app/models/spree/return_item.rb

@@ -1,5 +1,7 @@
 module Spree
   class ReturnItem < Spree.base_class
+    has_prefix_id :ri
+
     COMPLETED_RECEPTION_STATUSES = %w(received given_to_customer)
 
     class_attribute :return_eligibility_validator

data/app/models/spree/role.rb

@@ -1,5 +1,7 @@
 module Spree
   class Role < Spree.base_class
+    has_prefix_id :role
+
     include Spree::UniqueName
 
     ADMIN_ROLE = 'admin'

data/app/models/spree/shipment/emails.rb

@@ -2,6 +2,7 @@ module Spree
   class Shipment < Spree.base_class
     module Emails
       def send_shipped_email
+        Spree::Deprecation.warn("Shipment#send_shipped_email is deprecated and will be removed in Spree 5.5. Please use events")
         # you can overwrite this method in your application / extension to send out the confirmation email
         # or use `spree_emails` gem
         # YourEmailVendor.deliver_shipment_notification_email(@shipment.id)

data/app/models/spree/shipment.rb

@@ -2,9 +2,10 @@ require 'ostruct'
 
 module Spree
   class Shipment < Spree.base_class
+    has_prefix_id :ship  # Spree-specific: shipment
+
     include Spree::Core::NumberGenerator.new(prefix: 'H', length: 11)
     include Spree::NumberIdentifier
-    include Spree::NumberAsParam
     include Spree::Metafields
     include Spree::Metadata
     if defined?(Spree::Security::Shipments)
@@ -346,6 +347,15 @@ module Spree
       shipping_rates.update_all(selected: false, updated_at: Time.current)
       shipping_rates.update(id, selected: true)
       save!
+      # Reload associations to pick up the new selected shipping rate
+      shipping_rates.reset
+      association(:selected_shipping_rate).reset
+      # Update shipment cost and order totals only for incomplete orders (during checkout)
+      # For completed orders, totals are managed separately (e.g., in tests or admin adjustments)
+      return if order.completed?
+
+      update_amounts
+      order.set_shipments_cost
     end
 
     def set_up_inventory(state, variant, order, line_item, quantity = 1)

data/app/models/spree/shipping_category.rb

@@ -1,5 +1,7 @@
 module Spree
   class ShippingCategory < Spree.base_class
+    has_prefix_id :scat
+
     DIGITAL_NAME = 'Digital'
 
     include Spree::UniqueName
@@ -14,10 +16,10 @@ module Spree
       find_by(name: DIGITAL_NAME)
     end
 
+    # Returns true if this shipping category includes a digital shipping method
+    # @return [Boolean]
     def includes_digital_shipping_method?
-      Rails.cache.fetch("#{cache_key_with_version}/includes-digital-shipping-method") do
-        shipping_methods.digital.exists?
-      end
+      @includes_digital_shipping_method ||= shipping_methods.digital.exists?
     end
   end
 end

data/app/models/spree/shipping_method.rb

@@ -1,5 +1,7 @@
 module Spree
   class ShippingMethod < Spree.base_class
+    has_prefix_id :shpm  # Spree-specific: shipping method
+
     acts_as_paranoid
     include Spree::CalculatedAdjustments
     include Spree::Metafields

data/app/models/spree/shipping_method_category.rb

@@ -1,5 +1,7 @@
 module Spree
   class ShippingMethodCategory < Spree.base_class
+    has_prefix_id :smcat
+
     belongs_to :shipping_method, class_name: 'Spree::ShippingMethod'
     belongs_to :shipping_category, class_name: 'Spree::ShippingCategory', inverse_of: :shipping_method_categories
   end

data/app/models/spree/shipping_rate.rb

@@ -1,5 +1,7 @@
 module Spree
   class ShippingRate < Spree.base_class
+    has_prefix_id :shpr  # Spree-specific: shipping rate
+
     belongs_to :shipment, class_name: 'Spree::Shipment'
     belongs_to :tax_rate, -> { with_deleted }, class_name: 'Spree::TaxRate'
     belongs_to :shipping_method, -> { with_deleted }, class_name: 'Spree::ShippingMethod', inverse_of: :shipping_rates

data/app/models/spree/state_change.rb

@@ -1,5 +1,7 @@
 module Spree
   class StateChange < Spree.base_class
+    has_prefix_id :sc
+
     belongs_to :user, class_name: "::#{Spree.user_class}", optional: true
     belongs_to :stateful, polymorphic: true
 

data/app/models/spree/stock_item.rb

@@ -1,5 +1,7 @@
 module Spree
   class StockItem < Spree.base_class
+    has_prefix_id :si
+
     acts_as_paranoid
 
     include Spree::Metafields

data/app/models/spree/stock_location.rb

@@ -1,5 +1,7 @@
 module Spree
   class StockLocation < Spree.base_class
+    has_prefix_id :sloc  # Spree-specific: stock location
+
     include Spree::UniqueName
     if defined?(Spree::Security::StockLocations)
       include Spree::Security::StockLocations

data/app/models/spree/stock_movement.rb

@@ -1,5 +1,7 @@
 module Spree
   class StockMovement < Spree.base_class
+    has_prefix_id :sm
+
     QUANTITY_LIMITS = {
       max: 2**31 - 1,
       min: -2**31

data/app/models/spree/stock_transfer.rb

@@ -1,8 +1,9 @@
 module Spree
   class StockTransfer < Spree.base_class
+    has_prefix_id :st
+
     include Spree::Core::NumberGenerator.new(prefix: 'T')
     include Spree::NumberIdentifier
-    include Spree::NumberAsParam
     include Spree::Metafields
     include Spree::Metadata