spree_core 5.1.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10a63ea31ea45db426f45aa13fb90de77dac8ab0a024f7812562aed34991b9e8
-  data.tar.gz: 2ca5104581c280ce3b1328e52bfd8988971012feb01287174b4afa3ea494917c
+  metadata.gz: 7d8a34e50f4423209d4f31a31ef6c40055c0257c83ee28d41655bd0a6c004f83
+  data.tar.gz: 49a23607e20571089a6443447413ea236f02bd5d92518de83ddd334d859b18b8
 SHA512:
-  metadata.gz: f23f420db0bcced89590044a3b101754c934b06bc882adbe288163ef9b46166e829f79c824ad3eb83329ed8b6eb4e03aefcac8d1e5783eec42e7ba00ceb59dcb
-  data.tar.gz: d6c770cd94212ca2f919a62eeafc5bc58cc1440da8c3f98c9c6421c20fd12188995e0f93662225d0fb91d7afe769ae5488fc4b34360aeaa5fec2443e14216a49
+  metadata.gz: 3e85f284aeb474a1b25d9b4c9d0f15bfae581cab26a06e7433c74bc54756e837e079eab6aca88f9e895a1f36baee7ab12b6069a839a8c3a006cef5b29f94f02b
+  data.tar.gz: b10269230a1ca074f7de2bc16a31aa7fdd58e858d6e5ae7fd143884e72f67a0b8b4e04754effbfde836ff91763fbc082c5f74311d842f06e550dddc76ffa69b5

data/app/helpers/spree/base_helper.rb

@@ -1,5 +1,9 @@
 module Spree
   module BaseHelper
+    def spree_dom_id(record)
+      dom_id(record, 'spree')
+    end
+
     def available_countries
       countries = current_store.countries_available_for_checkout
 

data/app/helpers/spree/images_helper.rb

@@ -9,7 +9,7 @@ module Spree
     # @option options [Integer] :height the height of the image
     def spree_image_tag(image, options = {})
       image_tag(
-        spree_image_url(image, { width: options[:width], height: options[:height] }),
+        spree_image_url(image, { width: options[:width], height: options[:height], format: options[:format] }),
         options
       )
     end
@@ -18,7 +18,6 @@ module Spree
       return unless image
       return unless image.variable?
       return if image.respond_to?(:attached?) && !image.attached?
-      
       url_helpers = respond_to?(:main_app) ? main_app : Rails.application.routes.url_helpers
       width = options[:width]
       height = options[:height]
@@ -28,11 +27,11 @@ module Spree
 
       if width.present? && height.present?
         url_helpers.cdn_image_url(
-          image.variant(spree_image_variant_options(resize_to_fill: [width, height]))
+          image.variant(spree_image_variant_options(resize_to_fill: [width, height], format: options[:format]))
         )
       else
         url_helpers.cdn_image_url(
-          image.variant(spree_image_variant_options(resize_to_limit: [width, height]))
+          image.variant(spree_image_variant_options(resize_to_limit: [width, height], format: options[:format]))
         )
       end
     end
@@ -77,16 +76,30 @@ module Spree
     # @option options [Integer] :height the height of the image
     def spree_image_variant_options(options = {})
       {
-        saver: {
-          strip: true,
-          quality: 75,
-          lossless: false,
-          alpha_q: 85,
-          reduction_effort: 6,
-          smart_subsample: true
-        },
-        format: :webp
-      }.merge(options)
+        saver: options[:format] == :png ? png_variant_options : webp_variant_options,
+        format: options[:format] || :webp
+      }.merge(options.except(:format))
+    end
+
+    private
+
+    def webp_variant_options
+      {
+        strip: true,
+        quality: 75,
+        lossless: false,
+        alpha_q: 85,
+        reduction_effort: 6,
+        smart_subsample: true
+      }
+    end
+
+    def png_variant_options
+      {
+        strip: true,
+        compression_level: 8,
+        interlace: true
+      }
     end
   end
 end

data/app/helpers/spree/mail_helper.rb

@@ -5,7 +5,7 @@ module Spree
 
     def variant_image_url(variant)
       image = variant.default_image
-      image.present? && image.attached? ? spree_image_url(image, width: 100, height: 100) : image_url('noimage/small.png')
+      image.present? && image.attached? ? spree_image_url(image, width: 100, height: 100, format: :png) : image_url('noimage/small.png')
     end
 
     def name_for(order)

data/app/models/spree/order/checkout.rb

@@ -110,7 +110,7 @@ module Spree
                 before_transition to: :delivery, do: :create_shipment_tax_charge!
                 before_transition from: :delivery, do: :apply_free_shipping_promotions
                 before_transition to: :delivery, do: :apply_unassigned_promotions
-                after_transition to: :delivery, do: :go_to_payment_if_fully_digital!
+                after_transition to: :delivery, do: :move_to_next_step_if_address_not_required
               end
 
               before_transition to: :resumed, do: :ensure_line_item_variants_are_not_discontinued
@@ -298,6 +298,12 @@ module Spree
             user && user.default_credit_card.try(:valid?)
           end
 
+          def move_to_next_step_if_address_not_required
+            return if requires_ship_address?
+
+            next!
+          end
+
           private
 
           # For payment step, filter order parameters to produce the expected nested

data/app/models/spree/order/digital.rb

@@ -32,13 +32,6 @@ module Spree
           end
         end
       end
-
-      def go_to_payment_if_fully_digital!
-        return unless digital?
-        return unless delivery?
-
-        next!
-      end
     end
   end
 end

data/app/models/spree/product.rb

@@ -46,7 +46,7 @@ module Spree
       'archived' => 'archived'
     }.freeze
 
-    TRANSLATABLE_FIELDS = %i[name description slug meta_description meta_keywords meta_title].freeze
+    TRANSLATABLE_FIELDS = %i[name description slug meta_description meta_title].freeze
     translates(*TRANSLATABLE_FIELDS, column_fallback: !Spree.always_use_translations?)
 
     self::Translation.class_eval do
@@ -251,7 +251,7 @@ module Spree
       delegate method_name, :"#{method_name}=", to: :default_variant
     end
 
-    delegate :display_amount, :display_price, :has_default_price?,
+    delegate :display_amount, :display_price, :has_default_price?, :track_inventory?,
              :display_compare_at_price, :images, to: :default_variant
 
     delegate :name, to: :brand, prefix: true, allow_nil: true

data/app/models/spree/shipping_category.rb

@@ -1,5 +1,7 @@
 module Spree
   class ShippingCategory < Spree.base_class
+    DIGITAL_NAME = 'Digital'
+
     include Spree::UniqueName
     if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
@@ -10,5 +12,9 @@ module Spree
       has_many :shipping_method_categories
     end
     has_many :shipping_methods, through: :shipping_method_categories
+
+    def self.digital
+      find_by(name: DIGITAL_NAME)
+    end
   end
 end

data/app/models/spree/store.rb

@@ -25,8 +25,8 @@ module Spree
     # Translations
     #
     TRANSLATABLE_FIELDS = %i[name meta_description meta_keywords seo_title facebook
-                             twitter instagram customer_support_email description
-                             address contact_phone new_order_notifications_email].freeze
+                             twitter instagram customer_support_email
+                             address contact_phone].freeze
     translates(*TRANSLATABLE_FIELDS, column_fallback: !Spree.always_use_translations?)
     self::Translation.class_eval do
       acts_as_paranoid

data/app/models/spree/variant.rb

@@ -74,7 +74,7 @@ module Spree
     after_create :set_master_out_of_stock, unless: :is_master?
     after_commit :clear_line_items_cache, on: :update
 
-    after_create :create_default_stock_item, unless: :track_inventory?
+    after_save :create_default_stock_item, unless: :track_inventory?
     after_update_commit :handle_track_inventory_change
 
     after_commit :remove_prices_from_master_variant, on: [:create, :update], unless: :is_master?

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

@@ -23,7 +23,7 @@
     <% elsif payment_method_icon_tag(payment.payment_method.payment_icon_name).present? %>
       <div class="d-flex flex align-items-center items-center">
         <div><%= payment_method_icon_tag(payment.payment_method.payment_icon_name) %></div>
-        <div class="mx-2"><%= Spree.t(:store_credit_name) %></div>
+        <div class="ml-3"><%= Spree.t(:store_credit_name) %></div>
       </div>
     <% end %>
   <% elsif source.present? %>

data/lib/spree/core/version.rb

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

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

@@ -53,6 +53,11 @@ FactoryBot.define do
           create(:product_property, product: product, property_id: 10, value: 'Epsilon')
         end
       end
+
+      factory :digital_product do
+        track_inventory { false }
+        shipping_category { |r| Spree::ShippingCategory.digital || r.association(:digital_shipping_category) }
+      end
     end
   end
 end

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

@@ -2,4 +2,8 @@ FactoryBot.define do
   factory :shipping_category, class: Spree::ShippingCategory do
     sequence(:name) { |n| "ShippingCategory #{n}" }
   end
+
+  factory :digital_shipping_category, class: Spree::ShippingCategory do
+    name { 'Digital' }
+  end
 end

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

@@ -24,7 +24,7 @@ FactoryBot.define do
 
       before(:create) do |shipping_method|
         shipping_method.shipping_categories.delete_all
-        shipping_method.shipping_categories << create(:shipping_category, name: 'Digital')
+        shipping_method.shipping_categories << create(:digital_shipping_category)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.1.1
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-03 00:00:00.000000000 Z
+date: 2025-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -1382,9 +1382,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
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.1
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.1.0
+  source_code_uri: https://github.com/spree/spree/tree/v5.1.1
 post_install_message:
 rdoc_options: []
 require_paths: