spree_core 4.0.8 → 4.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 588155cb249e1eefd8e5c6ae2e6945618789083950c80c871d6edf1301816335
-  data.tar.gz: e8d545d4df554f51f6c3e23bb11da7174b78e73285d2ca58106df76f95971fb8
+  metadata.gz: db73357d472e46822ad95d6ee2071b01413e2f1ab743177f7cfc8845c6830092
+  data.tar.gz: 83c396103e3809183ac12c21f72e4831cb2c10d1089232bdecd58395459a961b
 SHA512:
-  metadata.gz: ef4fcece6d37dfe33965151bfdb649985a343498bd1b028143deee6d1c34a9203e8d799424ccd68bca8d1fd2ea40ff9285c3f7fa4035c6b1338c0fcd3d33863b
-  data.tar.gz: ae4a54b8c2732465955b5039faafb25bc4e22b5b3f723c928eaadca424f6dd06b5549fbd35ebc730baaae0e4083c4b891c35de336f5bc0e2bd2e2e62758865ca
+  metadata.gz: f57f8d0b1bee1cb0b0d77b7aa82ac8f62d89a783e07dbd1e5f2a8a6d780eaf8de46ccf5e898420d423fe1d133ce2645615cd4611580ca92008d006c059667e1a
+  data.tar.gz: 7e3aee2e5bcc514a78dcc8da3cfb5b35635f691fc2fe9ac68002c9cd208bc96b5df4f784da4612cf1ad409dea467e0a5c29cc13e156e25aa7baeb5d72f367f47

data/app/assets/javascripts/spree.js

@@ -2,7 +2,6 @@
 function Spree () {}
 
 Spree.ready = function (callback) {
-  jQuery(callback)
   return jQuery(document).on('page:load turbolinks:load', function () {
     return callback(jQuery)
   })

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

@@ -112,17 +112,30 @@ module Spree
       def by_options(products)
         return products unless options?
 
-        products.where(
-          id: options.map do |key, value|
-            products.with_option_value(key, value).ids
-          end.flatten.compact.uniq
-        )
+        options.map do |key, value|
+          products.with_option_value(key, value)
+        end.inject(:&)
       end
 
       def by_option_value_ids(products)
         return products unless option_value_ids?
 
-        products.joins(variants: :option_values).distinct.where(spree_option_values: { id: option_value_ids })
+        product_ids = Spree::Product.
+                      joins(variants: :option_values).
+                      where(spree_option_values: { id: option_value_ids }).
+                      group("#{Spree::Product.table_name}.id, #{Spree::Variant.table_name}.id").
+                      having('COUNT(spree_option_values.option_type_id) = ?', option_types_count(option_value_ids)).
+                      distinct.
+                      ids
+
+        products.where(id: product_ids)
+      end
+
+      def option_types_count(option_value_ids)
+        Spree::OptionValue.
+          where(id: option_value_ids).
+          distinct.
+          count(:option_type_id)
       end
 
       def ordered(products)

data/app/finders/spree/variants/option_types_finder.rb

@@ -0,0 +1,21 @@
+module Spree
+  module Variants
+    class OptionTypesFinder
+      COLOR_TYPE = 'color'.freeze
+
+      def initialize(variant_ids:)
+        @variant_ids = variant_ids
+      end
+
+      def execute
+        Spree::OptionType.includes(option_values: :variants).where(spree_variants: { id: variant_ids }).
+          reorder('spree_option_types.position ASC, spree_option_values.position ASC').
+          partition { |option_type| option_type.name.downcase == COLOR_TYPE }.flatten
+      end
+
+      private
+
+      attr_reader :variant_ids
+    end
+  end
+end

data/app/finders/spree/variants/visible_finder.rb

@@ -0,0 +1,22 @@
+module Spree
+  module Variants
+    class VisibleFinder
+      def initialize(scope:, current_currency:)
+        @scope = scope
+        @current_currency = current_currency
+      end
+
+      def execute
+        Spree::Variant.where(id: active_variants).joins(:option_values).order('spree_option_values.position ASC')
+      end
+
+      private
+
+      attr_reader :scope, :current_currency
+
+      def active_variants
+        scope.active(current_currency).unscope(:order)
+      end
+    end
+  end
+end

data/app/helpers/spree/base_helper.rb

@@ -32,8 +32,12 @@ module Spree
       end
     end
 
-    def logo(image_path = Spree::Config[:logo])
-      link_to image_tag(image_path), spree.respond_to?(:root_path) ? spree.root_path : main_app.root_path
+    def logo(image_path = Spree::Config[:logo], options = {})
+      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 meta_data
@@ -50,15 +54,32 @@ module Spree
       end
 
       if meta[:keywords].blank? || meta[:description].blank?
-        meta.reverse_merge!(keywords: current_store.meta_keywords,
-                            description: current_store.meta_description)
+        if object && object[:name].present?
+          meta.reverse_merge!(keywords: [object.name, current_store.meta_keywords].reject(&:blank?).join(', '),
+                              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.meta_description || current_store.seo_title))
+        end
       end
       meta
     end
 
+    def meta_image_url_path
+      object = instance_variable_get('@' + controller_name.singularize)
+      return unless object.is_a?(Spree::Product)
+
+      image = default_image_for_product_or_variant(object)
+      image&.attachment.present? ? main_app.url_for(image.attachment) : asset_path(Spree::Config[:logo])
+    end
+
+    def meta_image_data_tag
+      tag('meta', property: 'og:image', content: meta_image_url_path) if meta_image_url_path
+    end
+
     def meta_data_tags
       meta_data.map do |name, content|
-        tag('meta', name: name, content: content)
+        tag('meta', name: name, content: content) unless name.nil? || content.nil?
       end.join("\n")
     end
 
@@ -75,14 +96,30 @@ module Spree
       [I18n.l(time.to_date, format: :long), time.strftime('%l:%M %p')].join(' ')
     end
 
-    def seo_url(taxon)
-      spree.nested_taxons_path(taxon.permalink)
+    def seo_url(taxon, options = nil)
+      spree.nested_taxons_path(taxon.permalink, options)
     end
 
     def frontend_available?
       Spree::Core::Engine.frontend_available?
     end
 
+    def default_image_for_product_or_variant(product_or_variant)
+      if product_or_variant.images.empty?
+        if product_or_variant.is_a?(Spree::Product) && product_or_variant.variant_images.any?
+          product_or_variant.variant_images.first
+        elsif product_or_variant.is_a?(Spree::Variant) && product_or_variant.product.variant_images.any?
+          product_or_variant.product.variant_images.first
+        end
+      else
+        product_or_variant.images.first
+      end
+    end
+
+    def base_cache_key
+      [I18n.locale, current_currency]
+    end
+
     private
 
     def create_product_image_tag(image, product, options, style)
@@ -94,18 +131,11 @@ module Spree
       self.class.send :define_method, "#{style}_image" do |product, *options|
         options = options.first || {}
         options[:alt] ||= product.name
-        if product.images.empty?
-          if !product.is_a?(Spree::Variant) && !product.variant_images.empty?
-            create_product_image_tag(product.variant_images.first, product, options, style)
-          else
-            if product.is_a?(Variant) && !product.product.variant_images.empty?
-              create_product_image_tag(product.product.variant_images.first, product, options, style)
-            else
-              image_tag "noimage/#{style}.png", options
-            end
-          end
+        image_path = default_image_for_product_or_variant(product)
+        if image_path.present?
+          create_product_image_tag image_path, product, options, style
         else
-          create_product_image_tag(product.images.first, product, options, style)
+          image_tag "noimage/#{style}.png", options
         end
       end
     end

data/app/helpers/spree/products_helper.rb

@@ -1,5 +1,7 @@
 module Spree
   module ProductsHelper
+    include BaseHelper
+
     # returns the formatted price for the specified variant as a full price or a difference depending on configuration
     def variant_price(variant)
       if Spree::Config[:show_variant_full_price]
@@ -29,6 +31,14 @@ module Spree
       end
     end
 
+    def default_variant(variants)
+      variants_option_types_presenter(variants).default_variant || variants.find(&:is_master)
+    end
+
+    def used_variants_options(variants)
+      variants_option_types_presenter(variants).options
+    end
+
     # converts line breaks in product description into <p> tags (for html display purposes)
     def product_description(product)
       description = if Spree::Config[:show_raw_product_description]
@@ -47,15 +57,27 @@ module Spree
       end
     end
 
-    def cache_key_for_products
-      count = @products.count
-      max_updated_at = (@products.maximum(:updated_at) || Date.today).to_s(:number)
-      products_cache_keys = "spree/products/all-#{params[:page]}-#{max_updated_at}-#{count}"
-      (common_product_cache_keys + [products_cache_keys]).compact.join('/')
+    def cache_key_for_products(products = @products, additional_cache_key = nil)
+      count = products.count
+      max_updated_at = (products.maximum(:updated_at) || Date.today).to_s(:number)
+      products_cache_keys = "spree/products/all-#{params[:page]}-#{params[:sort_by]}-#{max_updated_at}-#{count}-#{@taxon&.id}"
+      (common_product_cache_keys + [products_cache_keys] + [additional_cache_key]).compact.join('/')
     end
 
     def cache_key_for_product(product = @product)
-      (common_product_cache_keys + [product.cache_key_with_version, product.possible_promotions]).compact.join('/')
+      cache_key_elements = common_product_cache_keys
+      cache_key_elements += [
+        product.cache_key_with_version,
+        product.possible_promotions
+      ]
+
+      cache_key_elements.compact.join('/')
+    end
+
+    def limit_descritpion(string)
+      return string if string.length <= 450
+
+      string.slice(0..449) + '...'
     end
 
     def available_status(product) # will return a human readable string
@@ -71,16 +93,62 @@ module Spree
       end
     end
 
-    private
+    def product_images(product, variants)
+      variants = if product.variants_and_option_values(current_currency).any?
+                   variants.reject(&:is_master)
+                 else
+                   variants
+      end
+
+      variants.map(&:images).flatten
+    end
+
+    def product_variants_matrix(is_product_available_in_currency)
+      Spree::VariantPresenter.new(
+        variants: @variants,
+        is_product_available_in_currency: is_product_available_in_currency,
+        current_currency: current_currency,
+        current_price_options: current_price_options
+      ).call.to_json
+    end
+
+    def related_products
+      return [] unless @product.respond_to?(:has_related_products?) && @product.has_related_products?(:related_products)
+
+      @_related_products ||= @product.
+                             related_products.
+                             includes(
+                               :tax_category,
+                               master: [
+                                 :prices,
+                                 images: { attachment_attachment: :blob },
+                               ]
+                             ).
+                             limit(Spree::Config[:products_per_page])
+    end
+
+    def product_available_in_currency?(product)
+      !(product.price_in(current_currency).amount.nil? || product.price_in(current_currency).amount.zero?)
+    end
 
     def common_product_cache_keys
-      [I18n.locale, current_currency] + price_options_cache_key
+      base_cache_key + price_options_cache_key
     end
 
+    private
+
     def price_options_cache_key
       current_price_options.sort.map(&:last).map do |value|
         value.try(:cache_key) || value
       end
     end
+
+    def variants_option_types_presenter(variants)
+      @_variants_option_types_presenter ||= begin
+        option_types = Spree::Variants::OptionTypesFinder.new(variant_ids: variants.map(&:id)).execute
+
+        Spree::Variants::OptionTypesPresenter.new(option_types)
+      end
+    end
   end
 end

data/app/models/concerns/spree/user_methods.rb

@@ -47,9 +47,9 @@ module Spree
       spree_roles.any? { |role| role.name == role_in_question.to_s }
     end
 
-    def last_incomplete_spree_order(store)
+    def last_incomplete_spree_order(store, options = {})
       orders.where(store: store).incomplete.
-        includes(line_items: [variant: [:images, :option_values, :product]]).
+        includes(options[:includes]).
         order('created_at DESC').
         first
     end

data/app/models/spree/app_dependencies.rb

@@ -11,8 +11,7 @@ module Spree
       :checkout_remove_store_credit_service, :checkout_get_shipping_rates_service,
       :coupon_handler, :country_finder, :current_order_finder, :credit_card_finder,
       :completed_order_finder, :order_sorter, :cart_compare_line_items_service, :collection_paginator, :products_sorter,
-      :products_finder, :taxon_finder, :line_item_by_variant_finder, :cart_estimate_shipping_rates_service,
-      :account_create_address_service, :account_update_address_service, :address_finder
+      :products_finder, :taxon_finder, :line_item_by_variant_finder, :cart_estimate_shipping_rates_service
     ].freeze
 
     attr_accessor *INJECTION_POINTS
@@ -60,14 +59,9 @@ module Spree
       # coupons
       # TODO: we should split this service into 2 seperate - Add and Remove
       @coupon_handler = 'Spree::PromotionHandler::Coupon'
-
-      # account
-      @account_create_address_service = 'Spree::Account::Addresses::Create'
-      @account_update_address_service = 'Spree::Account::Addresses::Update'
     end
 
     def set_default_finders
-      @address_finder = 'Spree::Addresses::Find'
       @country_finder = 'Spree::Countries::Find'
       @current_order_finder = 'Spree::Orders::FindCurrent'
       @completed_order_finder = 'Spree::Orders::FindComplete'

data/app/models/spree/credit_card.rb

@@ -24,9 +24,10 @@ module Spree
     attribute :month, ActiveRecord::Type::Integer.new
     attribute :year,  ActiveRecord::Type::Integer.new
 
-    attr_reader :number, :verification_value
+    attr_reader :number
     attr_accessor :encrypted_data,
                   :imported,
+                  :verification_value,
                   :manual_entry
 
     with_options if: :require_card_numbers?, on: :create do
@@ -100,11 +101,9 @@ module Spree
                        end
     end
 
-    def verification_value=(value)
-      @verification_value = value.to_s.gsub(/\s/, '')
-    end
-
     def set_last_digits
+      number.to_s.gsub!(/\s/, '')
+      verification_value.to_s.gsub!(/\s/, '')
       self.last_digits ||= number.to_s.length <= 4 ? number : number.to_s.slice(-4..-1)
     end
 

data/app/models/spree/image/configuration/active_storage.rb

@@ -15,7 +15,15 @@ module Spree
               mini: '48x48>',
               small: '100x100>',
               product: '240x240>',
-              large: '600x600>'
+              pdp_thumbnail: '160x200>',
+              plp_and_carousel: '448x600>',
+              plp_and_carousel_xs: '254x340>',
+              plp_and_carousel_sm: '350x468>',
+              plp_and_carousel_md: '222x297>',
+              plp_and_carousel_lg: '278x371>',
+              large: '600x600>',
+              plp: '278x371>',
+              zoomed: '650x870>'
             }
           end
 

data/app/models/spree/image.rb

@@ -2,7 +2,7 @@ module Spree
   class Image < Asset
     include Configuration::ActiveStorage
     include Rails.application.routes.url_helpers
-  
+
     # In Rails 5.x class constants are being undefined/redefined during the code reloading process
     # in a rails development environment, after which the actual ruby objects stored in those class constants
     # are no longer equal (subclass == self) what causes error ActiveRecord::SubclassNotFound
@@ -12,14 +12,63 @@ module Spree
 
     def styles
       self.class.styles.map do |_, size|
-        width, height = size[/(\d+)x(\d+)/].split('x')
+        width, height = size.chop.split('x')
 
         {
-          url: polymorphic_path(attachment.variant(resize: size), only_path: true),
+          url: polymorphic_path(attachment.variant(combine_options: {
+                                                     gravity: 'center',
+                                                     resize: size,
+                                                     extent: size,
+                                                     background: 'snow2',
+                                                     quality: 80
+                                                   }), only_path: true),
           width: width,
           height: height
         }
       end
     end
+
+    def style(name)
+      size = self.class.styles[name]
+      return unless size
+
+      width, height = size.chop.split('x')
+
+      {
+        url: polymorphic_path(attachment.variant(combine_options: {
+                                                   gravity: 'center',
+                                                   resize: size,
+                                                   extent: size,
+                                                   background: 'snow2',
+                                                   quality: 80
+                                                 }), only_path: true),
+        size: size,
+        width: width,
+        height: height
+      }
+    end
+
+    def style_dimensions(name)
+      size = self.class.styles[name]
+      width, height = size.chop.split('x')
+
+      {
+        width: width,
+        height: height
+      }
+    end
+
+    def plp_url
+      size = self.class.styles[:plp_and_carousel]
+      variant = attachment.variant(
+        gravity: 'center',
+        resize: size,
+        extent: size,
+        background: 'snow2',
+        quality: 80
+      )
+
+      polymorphic_path(variant, only_path: true)
+    end
   end
 end

data/app/models/spree/line_item.rb

@@ -59,8 +59,7 @@ module Spree
 
     extend DisplayMoney
     money_methods :amount, :subtotal, :discounted_amount, :final_amount, :total, :price,
-                  :adjustment_total, :additional_tax_total, :promo_total, :included_tax_total,
-                  :pre_tax_amount
+                  :adjustment_total, :additional_tax_total, :promo_total, :included_tax_total
 
     alias single_money display_price
     alias single_display_amount display_price

data/app/models/spree/option_type.rb

@@ -23,6 +23,10 @@ module Spree
 
     after_touch :touch_all_products
 
+    def filter_param
+      presentation.titleize.delete(' ').downcase
+    end
+
     private
 
     def touch_all_products

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

@@ -55,18 +55,31 @@ module Spree
       def update_or_create_address(attributes = {})
         return if attributes.blank?
 
-        attributes.transform_values! { |v| v == '' ? nil : v }
+        attributes = attributes.select { |_k, v| v.present? }
 
-        default_address_scope = user ? user.addresses : ::Spree::Address
-        default_address = default_address_scope.find_by(id: attributes[:id])
+        if user
+          address = user.addresses.build(attributes.except(:id)).check
+          return address if address.id
+        end
+
+        if attributes[:id]
+          address = Spree::Address.find(attributes[:id])
+          attributes.delete(:id)
 
-        if default_address&.editable?
-          default_address.update(attributes)
+          if address&.editable?
+            address.update(attributes)
+            return address
+          else
+            attributes.delete(:id)
+          end
+        end
 
-          return default_address
+        unless attributes[:id]
+          address = Spree::Address.new(attributes)
+          address.save
         end
 
-        ::Spree::Address.find_or_create_by(attributes.except(:id, :updated_at, :created_at))
+        address
       end
     end
   end

data/app/models/spree/order.rb

@@ -21,8 +21,7 @@ module Spree
     extend Spree::DisplayMoney
     money_methods :outstanding_balance, :item_total,           :adjustment_total,
                   :included_tax_total,  :additional_tax_total, :tax_total,
-                  :shipment_total,      :promo_total,          :total,
-                  :cart_promo_total,    :pre_tax_item_amount,  :pre_tax_total
+                  :shipment_total,      :promo_total,          :total
 
     alias display_ship_total display_shipment_total
     alias_attribute :ship_total, :shipment_total
@@ -174,12 +173,7 @@ module Spree
 
     # Sum of all line item amounts pre-tax
     def pre_tax_item_amount
-      line_items.sum(:pre_tax_amount)
-    end
-
-    # Sum of all line item and shipment pre-tax
-    def pre_tax_total
-      pre_tax_item_amount + shipments.sum(:pre_tax_amount)
+      line_items.to_a.sum(&:pre_tax_amount)
     end
 
     def shipping_discount
@@ -375,8 +369,8 @@ module Spree
       payment_state == 'paid' || payment_state == 'credit_owed'
     end
 
-    def available_payment_methods
-      @available_payment_methods ||= collect_payment_methods
+    def available_payment_methods(store = nil)
+      @available_payment_methods ||= collect_payment_methods(store)
     end
 
     def insufficient_stock_lines
@@ -631,6 +625,12 @@ module Spree
       all_adjustments.eligible.nonzero.promotion.map { |a| a.source.promotion_id }.uniq
     end
 
+    def valid_coupon_promotions
+      promotions.
+        where(id: valid_promotion_ids).
+        coupons
+    end
+
     private
 
     def link_by_email
@@ -689,8 +689,8 @@ module Spree
       self.token ||= generate_token
     end
 
-    def collect_payment_methods
-      PaymentMethod.available_on_front_end.select { |pm| pm.available_for_order?(self) }
+    def collect_payment_methods(store = nil)
+      PaymentMethod.available_on_front_end.select { |pm| pm.available_for_order?(self) && pm.available_for_store?(store) }
     end
 
     def credit_card_nil_payment?(attributes)

data/app/models/spree/payment_method.rb

@@ -12,6 +12,8 @@ module Spree
 
     validates :name, presence: true
 
+    belongs_to :store
+
     with_options dependent: :restrict_with_error do
       has_many :payments, class_name: 'Spree::Payment', inverse_of: :payment_method
       has_many :credit_cards, class_name: 'Spree::CreditCard'
@@ -75,5 +77,11 @@ module Spree
     def available_for_order?(_order)
       true
     end
+
+    def available_for_store?(store)
+      return true if store.blank? || store_id.blank?
+
+      store_id == store.id
+    end
   end
 end

data/app/models/spree/preferences/preferable.rb

@@ -100,7 +100,7 @@ module Spree::Preferences::Preferable
       if value.is_a?(FalseClass) ||
           value.nil? ||
           value == 0 ||
-          value&.to_s =~ /^(f|false|0)$/i ||
+          value =~ /^(f|false|0)$/i ||
           (value.respond_to?(:empty?) && value.empty?)
         false
       else