spree_core 4.10.1 → 5.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 918652467235e29f0c6defaeddbb7530e77c10f67f12abe2355b6e66c1401b86
-  data.tar.gz: 685c2ec7206e68233b5811dc8f5ab3ab47029a3fd07431db724b79da47175fea
+  metadata.gz: 5b0801c23fbb8cd3771471358df47a3b16c62d063c6f2721ade347cfdc1f7f5c
+  data.tar.gz: 84049aed1f998d89471aac0d8b0d4614b301234b5e7cd7a032fe42cff50de4db
 SHA512:
-  metadata.gz: e4ab07e13870ed8a97caeb349f37d439090081ed7d693b76858bea8718f698d2546664315f2525c1134dfa7633c2068dd82d9bebc77a41e59f094deb4d7b54ee
-  data.tar.gz: dacf561acf437770b5ad7291c5785a2eed28d53056a30b3eb6480146d862c6332b9849849344cc91e7c69b63cc77e73aeab373c0601ecc760eb2c46f9ed2322b
+  metadata.gz: f8b9420d3a8d33484b98801baf8b85262a1b0d28424a370df01a36161264df4a73d849f3570a9f4cd89f0047c77d1023eb4103800165cde57b99df915e468eed
+  data.tar.gz: 82c9c3467ba606290d40ebf8d45987ba02f4ddccfafc580664e9256152901bda9db582dc9806388cda0054fd4f589321b11230e22ab621aa5b45afc804277637

data/app/assets/config/spree_core_manifest.js

@@ -0,0 +1,4 @@
+//= link_tree ../../javascript/spree/core/controllers .js
+//= link_tree ../../javascript/spree/core/helpers .js
+//= link_tree ../../../vendor/javascript .js
+//= link_tree ../images

data/app/controllers/spree/base_controller.rb

@@ -3,12 +3,9 @@ require_dependency 'spree/core/controller_helpers/strong_parameters'
 
 class Spree::BaseController < ApplicationController
   include Spree::Core::ControllerHelpers::Auth
-  include Spree::Core::ControllerHelpers::Common
-  include Spree::Core::ControllerHelpers::Search
   include Spree::Core::ControllerHelpers::Store
   include Spree::Core::ControllerHelpers::StrongParameters
   include Spree::Core::ControllerHelpers::Locale
   include Spree::Core::ControllerHelpers::Currency
-
-  respond_to :html
+  include Spree::Core::ControllerHelpers::Turbo
 end

data/app/finders/spree/orders/find_complete.rb

@@ -3,13 +3,14 @@ module Spree
     class FindComplete
       include Spree::Orders::FinderHelper
 
-      attr_reader :user, :number, :token, :store
+      attr_reader :user, :number, :token, :store, :email
 
-      def initialize(user: nil, number: nil, token: nil, store: nil)
+      def initialize(user: nil, number: nil, token: nil, store: nil, email: nil)
         @user = user
         @number = number
         @token = token
         @store = store
+        @email = email
       end
 
       def execute
@@ -17,6 +18,7 @@ module Spree
         orders = by_number(orders)
         orders = by_token(orders)
         orders = by_store(orders)
+        orders = by_email(orders)
 
         orders
       end
@@ -43,6 +45,10 @@ module Spree
         store.present?
       end
 
+      def email?
+        email.present?
+      end
+
       def by_user(orders)
         return orders unless user?
 
@@ -66,6 +72,12 @@ module Spree
 
         orders.where(store: store)
       end
+
+      def by_email(orders)
+        return orders unless email?
+
+        orders.where(email: email.strip.downcase)
+      end
     end
   end
 end

data/app/finders/spree/products/find.rb

@@ -1,21 +1,14 @@
 module Spree
   module Products
     class Find
-      def initialize(scope:, params:, current_currency: nil)
-        @scope = scope
-
-        if current_currency.present?
-          Spree::Deprecation.warn(<<-DEPRECATION, caller)
-            `current_currency` param is deprecated and will be removed in Spree 5.
-            Please pass `:currency` in `params` hash instead.
-          DEPRECATION
-        end
-
+      def initialize(scope:, params:)
+        @scope            = scope
+        @query            = params[:q].presence&.strip
         @ids              = String(params.dig(:filter, :ids)).split(',')
         @skus             = String(params.dig(:filter, :skus)).split(',')
         @store            = params[:store] || Spree::Store.default
         @price            = map_prices(String(params.dig(:filter, :price)).split(','))
-        @currency         = current_currency || params.dig(:filter, :currency) || params[:currency]
+        @currency         = params.dig(:filter, :currency) || params[:currency] || Spree::Store.default.default_currency
         @taxons           = taxon_ids(params.dig(:filter, :taxons))
         @concat_taxons    = taxon_ids(params.dig(:filter, :concat_taxons))
         @name             = params.dig(:filter, :name)
@@ -28,11 +21,21 @@ module Spree
         @in_stock         = params.dig(:filter, :in_stock)
         @backorderable    = params.dig(:filter, :backorderable)
         @purchasable      = params.dig(:filter, :purchasable)
+        @out_of_stock     = params.dig(:filter, :out_of_stock).to_b
+        @tags             = params.dig(:filter, :tags).to_s.split(',').compact_blank
+        @vendor_ids       = params.dig(:filter, :vendor_ids)&.split(',')&.compact_blank || []
+
+        if @purchasable.present? && @out_of_stock.present?
+          @purchasable = false
+          @out_of_stock = false
+        end
       end
 
       def execute
         products = by_ids(scope)
         products = by_skus(products)
+        products = by_query(products)
+        products = include_discontinued(products)
         products = by_price(products)
         products = by_currency(products)
         products = by_taxons(products)
@@ -41,12 +44,14 @@ module Spree
         products = by_options(products)
         products = by_option_value_ids(products)
         products = by_properties(products)
+        products = by_tags(products)
         products = include_deleted(products)
-        products = include_discontinued(products)
         products = show_only_stock(products)
         products = show_only_backorderable(products)
         products = show_only_purchasable(products)
+        products = show_only_out_of_stock(products)
         products = ordered(products)
+        products = by_vendor_ids(products)
 
         products.distinct
       end
@@ -54,7 +59,12 @@ module Spree
       private
 
       attr_reader :ids, :skus, :price, :currency, :taxons, :concat_taxons, :name, :options, :option_value_ids, :scope,
-                  :sort_by, :deleted, :discontinued, :properties, :store, :in_stock, :backorderable, :purchasable
+                  :sort_by, :deleted, :discontinued, :properties, :store, :in_stock, :backorderable, :purchasable, :tags,
+                  :query, :vendor_ids, :out_of_stock
+
+      def query?
+        query.present?
+      end
 
       def ids?
         ids.present?
@@ -100,6 +110,16 @@ module Spree
         properties.present? && properties.values.reject(&:empty?).present?
       end
 
+      def vendor_ids?
+        vendor_ids.present?
+      end
+
+      def by_query(products)
+        return products unless query?
+
+        products.multi_search(query)
+      end
+
       def by_ids(products)
         return products unless ids?
 
@@ -155,7 +175,9 @@ module Spree
       def by_options(products)
         return products unless options?
 
-        products_ids = options.map { |key, value| products.with_option_value(key, value)&.ids }.compact.uniq
+        products_for_options = query? ? products.unscope(:order) : products
+
+        products_ids = options.map { |key, value| products_for_options.with_option_value(key, value)&.ids }.compact.uniq
         products.where(id: products_ids.reduce(&:intersection))
       end
 
@@ -194,6 +216,16 @@ module Spree
         products.where(id: product_ids)
       end
 
+      def by_tags(products)
+        return products if tags.empty?
+
+        products.tagged_with(tags, any: true)
+      end
+
+      def by_vendor_ids(products)
+        products
+      end
+
       def option_types_count(option_value_ids)
         Spree::OptionValue.
           where(id: option_value_ids).
@@ -205,7 +237,7 @@ module Spree
         return products unless sort_by?
 
         case sort_by
-        when 'default'
+        when 'default', 'manual'
           if taxons?
             products.ascend_by_taxons_min_position(taxons)
           else
@@ -214,17 +246,23 @@ module Spree
         when 'name-a-z'
           # workaround for Mobility issue #596 - explicitly select fields to avoid error when selecting distinct
           products.i18n.
-            select("#{Product.table_name}.*").select(:name).order(name: :asc)
+            select("#{Spree::Product.table_name}.*").select(:name).order(name: :asc)
         when 'name-z-a'
           # workaround for Mobility issue #596
           products.i18n.
-            select("#{Product.table_name}.*").select(:name).order(name: :desc)
+            select("#{Spree::Product.table_name}.*").select(:name).order(name: :desc)
         when 'newest-first'
           products.order(available_on: :desc)
+        when 'oldest-first'
+          products.order(available_on: :asc)
         when 'price-high-to-low'
-          order_by_price(products, :descend_by_master_price)
+          order_by_price(products, :desc)
         when 'price-low-to-high'
-          order_by_price(products, :ascend_by_master_price)
+          order_by_price(products, :asc)
+        when 'best-selling'
+          order_by_best_selling(products)
+        else
+          products
         end
       end
 
@@ -254,6 +292,12 @@ module Spree
         products.in_stock_or_backorderable
       end
 
+      def show_only_out_of_stock(products)
+        return products unless out_of_stock.present?
+
+        products.out_of_stock
+      end
+
       def map_prices(prices)
         prices.map do |price|
           price == 'Infinity' ? BigDecimal::INFINITY : price.to_f
@@ -267,11 +311,18 @@ module Spree
         taxons.map(&:cached_self_and_descendants_ids).flatten.compact.uniq.map(&:to_s)
       end
 
-      def order_by_price(scope, order_type)
+      def order_by_price(scope, sort_order)
         scope.
-          select("#{Product.table_name}.*, #{Spree::Price.table_name}.amount").
-          reorder('').
-          send(order_type)
+          joins(variants_including_master: :prices).
+          select("#{Spree::Product.table_name}.* , min(#{Spree::Price.table_name}.amount)").
+          where(Spree::Price.table_name => { currency: currency }).
+          where.not(Spree::Price.table_name => { amount: nil }).
+          order("min(#{Spree::Price.table_name}.amount) #{sort_order}").
+          group("#{Spree::Product.table_name}.id")
+      end
+
+      def order_by_best_selling(scope)
+        scope.by_best_selling(:desc)
       end
     end
   end

data/app/finders/spree/stores/find_current.rb

@@ -7,7 +7,11 @@ module Spree
       end
 
       def execute
-        by_url(scope) || scope.default
+        store = by_url(scope) || scope.default
+        return if store.nil?
+
+        Spree::Current.store = store
+        store
       end
 
       protected
@@ -17,7 +21,7 @@ module Spree
       def by_url(scope)
         return if url.blank?
 
-        scope.by_url(url).first
+        scope.by_custom_domain(url).or(scope.by_url(url)).first
       end
     end
   end

data/app/helpers/spree/addresses_helper.rb

@@ -0,0 +1,106 @@
+# https://github.com/spree-contrib/spree_address_book/blob/master/app/helpers/spree/addresses_helper.rb
+module Spree
+  module AddressesHelper
+    def address_field(form, method, address_id = 'b', required = false, text_field_attributes: {}, &handler)
+      content_tag :div, id: [address_id, method].join, class: 'mb-4' do
+        if handler
+          yield
+        else
+          method_name = I18n.t("activerecord.attributes.spree/address.#{method}")
+          form.label(method, method_name, class: 'block text-xs text-neutral-600 mb-1') +
+          form.text_field(method,
+                          class: ['text-input w-full'].compact,
+                          placeholder: method_name,
+                          required: required,
+                          aria: { label: method_name },
+                          **text_field_attributes)
+
+        end
+      end
+    end
+
+    def address_zipcode(form, country, address_id = 'b')
+      method_name = Spree.t(:zipcode)
+      form.label(:zipcode, method_name, id: address_id + '_zipcode_label', class: 'block text-xs text-neutral-600 mb-1') +
+      form.text_field(:zipcode,
+                      class: 'text-input h-full',
+                      placeholder: method_name,
+                      required: country&.zipcode_required?,
+                      data: { 'address-form-target': 'zipcode', address_autocomplete_target: 'zipcode' },
+                      aria: { label: Spree.t(:zipcode) })
+    end
+
+    def address_state(form, country, address_id = 'b')
+      country ||= address_default_country
+      states_required = country.states_required?
+      have_states = states_required && country.states.any?
+      state_elements = [
+        form.label(Spree.t(:state).downcase,
+                   Spree.t(:state),
+                   class: [have_states ? 'state-select-label' : nil, ' block text-xs text-neutral-600 mb-1'].compact,
+                   id: address_id + '_state_label',
+                   data: { 'address-form-target': 'stateLabel' }) +
+          form.collection_select(:state_id, checkout_zone_applicable_states_for(country).sort_by(&:name),
+                                 :id, :name,
+                                 { prompt: Spree.t(:state) },
+                                 class: 'select-input min-w-full max-w-full',
+                                 data: { 'address-form-target': 'state', address_autocomplete_target: 'state' },
+                                 required: have_states && states_required,
+                                 aria: { label: Spree.t(:state) }) +
+          form.text_field(:state_name,
+                          class: 'ml-3 text-input',
+                          aria: { label: Spree.t(:state) },
+                          required: !have_states && states_required,
+                          data: { 'address-form-target': 'stateName' },
+                          placeholder: Spree.t(:state))
+      ].join.tr('"', "'").delete("\n")
+
+      content_tag :span, class: 'w-full state-select max-w-full' do
+        state_elements.html_safe
+      end
+    end
+
+    def available_states
+      @available_states ||= Rails.cache.fetch(['available-states-v2', current_store.cache_key_with_version]) do
+        Spree::State.where(country_id: available_countries).pluck(:country_id, :id, :abbr, :name)
+      end
+    end
+
+    def current_store_countries_with_states_ids
+      @current_store_countries_with_states_ids ||= current_store.countries_available_for_checkout.where(states_required: true).includes(:states).each_with_object([]) do |country, memo|
+        memo << current_store.states_available_for_checkout(country)
+      end.flatten.pluck(:country_id)
+    end
+
+    def current_store_countries_without_states_ids
+      @current_store_countries_without_states_ids ||= current_store.countries_available_for_checkout.where(states_required: false).ids
+    end
+
+    def current_store_supported_countries_ids
+      @current_store_supported_countries_ids ||= Rails.cache.fetch(['current_store_supported_countries_ids', current_store]) do
+        (current_store_countries_with_states_ids + current_store_countries_without_states_ids).uniq
+      end
+    end
+
+    def user_available_addresses
+      return [] unless try_spree_current_user
+
+      @user_available_addresses ||= begin
+        try_spree_current_user.
+          addresses.
+          includes(:country, :state).
+          not_quick_checkout.
+          where(country_id: current_store_supported_countries_ids).
+          includes(:user)
+      end
+    end
+
+    def checkout_zone_applicable_states_for(country)
+      current_store.states_available_for_checkout(country)
+    end
+
+    def address_default_country
+      @address_default_country ||= current_store.default_country
+    end
+  end
+end

data/app/helpers/spree/base_helper.rb

@@ -54,27 +54,6 @@ module Spree
       end
     end
 
-    def logo(image_path = nil, options = {})
-      Spree::Deprecation.warn(<<-DEPRECATION, caller)
-        `BaseHelper#logo` is deprecated and will be removed in Spree 5.0.
-        Please use `FrontendHelper#logo` instead
-      DEPRECATION
-
-      image_path ||= if current_store.logo.attached? && current_store.logo.variable?
-                       main_app.cdn_image_url(current_store.logo.variant(resize_to_limit: [244, 104]))
-                     elsif current_store.logo.attached? && current_store.logo.image?
-                       main_app.cdn_image_url(current_store.logo)
-                     else
-                       'logo/spree_50.png'
-                     end
-
-      path = spree.respond_to?(:root_path) ? spree.root_path : main_app.root_path
-
-      link_to path, 'aria-label': current_store.name, method: options[:method] do
-        image_tag image_path, alt: current_store.name, title: current_store.name
-      end
-    end
-
     def spree_favicon_path
       if current_store.favicon.present?
         main_app.cdn_image_url(current_store.favicon)
@@ -127,7 +106,7 @@ module Spree
                               description: [object.name, current_store.meta_description].reject(&:blank?).join(', '))
         else
           meta.reverse_merge!(keywords: (current_store.meta_keywords || current_store.seo_title),
-                              description: (current_store.homepage(I18n.locale)&.seo_meta_description || current_store.seo_meta_description))
+                              description: current_store.seo_meta_description)
         end
       end
       meta
@@ -157,12 +136,22 @@ module Spree
     def pretty_time(time)
       return '' if time.blank?
 
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
+        `BaseHelper#pretty_time` is deprecated and will be removed in Spree 6.0.
+        Please add `local_time` gem to your Gemfile and use `local_time(time)` instead
+      DEPRECATION
+
       [I18n.l(time.to_date, format: :long), time.strftime('%l:%M %p %Z')].join(' ')
     end
 
     def pretty_date(date)
       return '' if date.blank?
 
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
+        `BaseHelper#pretty_date` is deprecated and will be removed in Spree 6.0.
+        Please add `local_time` gem to your Gemfile and use `local_date(date)` instead
+      DEPRECATION
+
       [I18n.l(date.to_date, format: :long)].join(' ')
     end
 
@@ -175,9 +164,17 @@ module Spree
     end
 
     def spree_storefront_resource_url(resource, options = {})
-      if defined?(locale_param) && locale_param.present?
-        options.merge!(locale: locale_param)
-      end
+      options.merge!(locale: locale_param) if defined?(locale_param) && locale_param.present?
+
+      store = options[:store] || current_store
+
+      base_url = if options[:relative]
+                   ''
+                 elsif store.formatted_custom_domain.blank?
+                   store.formatted_url
+                 else
+                   store.formatted_custom_domain
+                 end
 
       localize = if options[:locale].present?
                    "/#{options[:locale]}"
@@ -186,47 +183,66 @@ module Spree
                  end
 
       if resource.instance_of?(Spree::Product)
-        "#{current_store.formatted_url + localize}/#{Spree::Config[:storefront_products_path]}/#{resource.slug}"
-      elsif resource.instance_of?(Spree::Taxon)
-        "#{current_store.formatted_url + localize}/#{Spree::Config[:storefront_taxons_path]}/#{resource.permalink}"
-      elsif resource.instance_of?(Spree::Cms::Pages::FeaturePage) || resource.instance_of?(Spree::Cms::Pages::StandardPage)
-        "#{current_store.formatted_url + localize}/#{Spree::Config[:storefront_pages_path]}/#{resource.slug}"
+        preview_id = ("preview_id=#{options[:preview_id]}" if options[:preview_id].present?)
+
+        variant_id = ("variant_id=#{options[:variant_id]}" if options[:variant_id].present?)
+
+        params = [preview_id, variant_id].compact_blank.join('&')
+        params = "?#{params}" if params.present?
+
+        "#{base_url + localize}/products/#{resource.slug}#{params}"
+      elsif resource.is_a?(Post)
+        preview_id = options[:preview_id].present? ? "?preview_id=#{options[:preview_id]}" : ''
+        "#{base_url + localize}/posts/#{resource.slug}#{preview_id}"
+      elsif resource.is_a?(Spree::Taxon)
+        "#{base_url + localize}/t/#{resource.permalink}"
+      elsif resource.is_a?(Spree::Page) || resource.is_a?(ActionText::RichText)
+        "#{base_url + localize}#{resource.page_builder_url}"
+      elsif resource.is_a?(Spree::PageLink)
+        resource.linkable_url
       elsif localize.blank?
-        current_store.formatted_url
+        base_url
       else
-        current_store.formatted_url + localize
+        base_url + localize
       end
     end
 
     # we should always try to render image of the default variant
     # same as it's done on PDP
     def default_image_for_product(product)
-      if product.images.any?
-        product.images.first
-      elsif product.default_variant.images.any?
-        product.default_variant.images.first
-      elsif product.variant_images.any?
-        product.variant_images.first
-      end
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
+        `BaseHelper#default_image_for_product` is deprecated and will be removed in Spree 6.0.
+        Please use `product.default_image` instead
+      DEPRECATION
+
+      product.default_image
     end
 
     def default_image_for_product_or_variant(product_or_variant)
-      Rails.cache.fetch("spree/default-image/#{product_or_variant.cache_key_with_version}") do
-        if product_or_variant.is_a?(Spree::Product)
-          default_image_for_product(product_or_variant)
-        elsif product_or_variant.is_a?(Spree::Variant)
-          if product_or_variant.images.any?
-            product_or_variant.images.first
-          else
-            default_image_for_product(product_or_variant.product)
-          end
-        end
-      end
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
+        `BaseHelper#default_image_for_product_or_variant` is deprecated and will be removed in Spree 6.0.
+        Please use `product_or_variant.default_image` instead
+      DEPRECATION
+
+      product_or_variant.default_image
     end
 
     def base_cache_key
-      [I18n.locale, current_currency, defined?(try_spree_current_user) && try_spree_current_user.present?,
-       defined?(try_spree_current_user) && try_spree_current_user.try(:has_spree_role?, 'admin')]
+      Spree::Deprecation.warn('`base_cache_key` is deprecated and will be removed in Spree 6. Please use `spree_base_cache_key` instead')
+      spree_base_cache_key
+    end
+
+    def spree_base_cache_key
+      [
+        I18n.locale,
+        (current_currency if defined?(current_currency)),
+        defined?(try_spree_current_user) && try_spree_current_user.present?,
+        defined?(try_spree_current_user) && try_spree_current_user.try(:has_spree_role?, 'admin')
+      ].compact
+    end
+
+    def spree_base_cache_scope
+      ->(record = nil) { [*spree_base_cache_key, record].compact_blank }
     end
 
     def maximum_quantity
@@ -248,7 +264,9 @@ module Spree
         img = if image_path.present?
                 create_product_image_tag image_path, product, options, style
               else
-                inline_svg_tag 'noimage/backend-missing-image.svg', class: 'noimage', size: '60%*60%'
+                width = style.to_s.split('x').first.to_i
+                height = style.to_s.split('x').last.to_i
+                content_tag(:div, width: width, height: height, style: "background-color: #f0f0f0;")
               end
 
         content_tag(:div, img, class: "admin-product-image-container #{style}-img")
@@ -257,8 +275,9 @@ module Spree
 
     # Returns style of image or nil
     def image_style_from_method_name(method_name)
-      if method_name.to_s.match(/_image$/) && style = method_name.to_s.sub(/_image$/, '')
-        style if style.in? Spree::Image.styles.with_indifferent_access
+      style = method_name.to_s.sub(/_image$/, '')
+      if method_name.to_s.match(/_image$/) && Spree::Image.styles.keys.map(&:to_s).include?(style)
+        style
       end
     end
 
@@ -268,5 +287,14 @@ module Spree
 
       tag('meta', name: 'robots', content: current_store.seo_robots)
     end
+
+    def legal_policy(policy)
+      current_store.send("customer_#{policy}")&.body&.html_safe
+    end
+
+    I18N_PLURAL_MANY_COUNT = 2.1
+    def plural_resource_name(resource_class)
+      resource_class.model_name.human(count: I18N_PLURAL_MANY_COUNT)
+    end
   end
 end

data/app/helpers/spree/currency_helper.rb

@@ -30,5 +30,17 @@ module Spree
 
       [label, currency]
     end
+
+    def preferred_currencies
+      @preferred_currencies ||= current_store.supported_currencies_list
+    end
+
+    def preferred_currencies_select_options
+      preferred_currencies.map { |currency| ["#{currency.name} - #{currency.iso_code}", currency] }
+    end
+
+    def currency_money(currency = current_currency)
+      ::Money::Currency.find(currency)
+    end
   end
 end

data/app/helpers/spree/images_helper.rb

@@ -0,0 +1,18 @@
+module Spree
+  module ImagesHelper
+    # convert images to webp with some sane optimization defaults
+    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)
+    end
+  end
+end

data/app/helpers/spree/mail_helper.rb

@@ -0,0 +1,24 @@
+module Spree
+  module MailHelper
+    include BaseHelper
+
+    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')
+    end
+
+    def name_for(order)
+      order.name || Spree.t('customer')
+    end
+
+    def store_logo
+      @store_logo ||= current_store&.mailer_logo || current_store&.logo
+    end
+
+    def logo_path
+      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?
+    end
+  end
+end