spree_core 4.0.9 → 4.1.0.rc1

data/app/models/spree/product.rb

@@ -110,7 +110,7 @@ module Spree
 
     alias options product_option_types
 
-    self.whitelisted_ransackable_associations = %w[taxons stores variants_including_master master variants]
+    self.whitelisted_ransackable_associations = %w[stores variants_including_master master variants]
     self.whitelisted_ransackable_attributes = %w[description name slug discontinue_on]
     self.whitelisted_ransackable_scopes = %w[not_discontinued]
 
@@ -239,9 +239,7 @@ module Spree
     # values should not be displayed to frontend users. Otherwise it breaks the
     # idea of having variants
     def variants_and_option_values(current_currency = nil)
-      variants.includes(:option_values).active(current_currency).select do |variant|
-        variant.option_values.any?
-      end
+      variants.active(current_currency).joins(:option_value_variants)
     end
 
     def empty_option_values?
@@ -284,7 +282,10 @@ module Spree
     end
 
     def category
-      taxons.joins(:taxonomy).find_by(spree_taxonomies: { name: Spree.t(:taxonomy_categories_name) })
+      taxons.joins(:taxonomy).
+        where(spree_taxonomies: { name: Spree.t(:taxonomy_categories_name) }).
+        order(depth: :desc).
+        first
     end
 
     private
@@ -321,7 +322,7 @@ module Spree
           price: master.price
         )
       end
-      save
+      throw(:abort) unless save
     end
 
     def ensure_master

data/app/models/spree/promotion/actions/create_item_adjustments.rb

@@ -23,7 +23,7 @@ module Spree
           order   = line_item.order
 
           # Prevent negative order totals
-          amounts << order.amount - order.adjustments.eligible.sum(:amount).abs if order.adjustments.eligible.any?
+          amounts << order.amount - order.adjustments.sum(:amount).abs if order.adjustments.any?
 
           amounts.min * -1
         end

data/app/models/spree/promotion_handler/coupon.rb

@@ -25,6 +25,7 @@ module Spree
 
       def remove(coupon_code)
         promotion = order.promotions.with_coupon_code(coupon_code)
+
         if promotion.present?
           # Order promotion has to be destroyed before line item removing
           order.order_promotions.find_by!(promotion_id: promotion.id).destroy
@@ -75,7 +76,7 @@ module Spree
           line_item = order.find_line_item_by_variant(item.variant)
           next if line_item.blank?
 
-          Spree::Dependencies.cart_remove_item_service.constantize.call(order: order, item: item.variant, quantity: item.quantity)
+          Spree::Dependencies.cart_remove_item_service(order: order, item: item.variant, quantity: item.quantity)
         end
       end
 

data/app/models/spree/return_item/eligibility_validator/base_validator.rb

@@ -1,5 +1,5 @@
 module Spree
-  class Spree::ReturnItem::EligibilityValidator::BaseValidator
+  class ReturnItem::EligibilityValidator::BaseValidator
     attr_reader :errors
 
     def initialize(return_item)

data/app/models/spree/store.rb

@@ -1,10 +1,11 @@
 module Spree
   class Store < Spree::Base
     has_many :orders, class_name: 'Spree::Order'
+    has_many :payment_methods, class_name: 'Spree::PaymentMethod'
 
     with_options presence: true do
-      validates :code, uniqueness: { case_sensitive: false, allow_blank: true }
       validates :name, :url, :mail_from_address
+      validates :default_currency
     end
 
     before_save :ensure_default_exists_and_is_unique

data/app/models/spree/taxon.rb

@@ -48,13 +48,9 @@ module Spree
       fs
     end
 
-    # Return meta_title if set otherwise generates from root name and/or taxon name
+    # Return meta_title if set otherwise generates from taxon name
     def seo_title
-      if meta_title.blank?
-        root? ? name : "#{root.name} - #{name}"
-      else
-        meta_title
-      end
+      meta_title.blank? ? name : meta_title
     end
 
     # Creates permalink base for friendly_id

data/app/models/spree/variant.rb

@@ -116,15 +116,7 @@ module Spree
     end
 
     def options_text
-      values = option_values.sort do |a, b|
-        a.option_type.position <=> b.option_type.position
-      end
-
-      values.to_a.map! do |ov|
-        "#{ov.option_type.presentation}: #{ov.presentation}"
-      end
-
-      values.to_sentence(words_connector: ', ', two_words_connector: ', ')
+      Spree::Variants::OptionsPresenter.new(self).to_sentence
     end
 
     # Default to master name
@@ -234,11 +226,7 @@ module Spree
     end
 
     def in_stock?
-      # Issue 10280
-      # Check if model responds to cache version and fall back to updated_at for older rails versions
-      # This makes sure a version is supplied when recyclable cache keys are disabled.
-      version = respond_to?(:cache_version) ? cache_version : updated_at.to_i
-      Rails.cache.fetch(in_stock_cache_key, version: version) do
+      Rails.cache.fetch(in_stock_cache_key) do
         total_on_hand > 0
       end
     end

data/app/models/spree/zone.rb

@@ -25,7 +25,9 @@ module Spree
     self.whitelisted_ransackable_attributes = ['description']
 
     def self.default_tax
-      find_by(default_tax: true)
+      Rails.cache.fetch('default_tax') do
+        find_by(default_tax: true)
+      end
     end
 
     def self.potential_matching_zones(zone)
@@ -69,8 +71,8 @@ module Spree
     end
 
     def kind
-      if self[:kind].present?
-        self[:kind]
+      if kind?
+        super
       else
         not_nil_scope = members.where.not(zoneable_type: nil)
         zone_type = not_nil_scope.order('created_at ASC').pluck(:zoneable_type).last
@@ -173,6 +175,7 @@ module Spree
 
     def remove_previous_default
       Spree::Zone.with_default_tax.where.not(id: id).update_all(default_tax: false)
+      Rails.cache.delete('default_zone')
     end
 
     def set_zone_members(ids, type)

data/app/presenters/spree/product_summary_presenter.rb

@@ -0,0 +1,26 @@
+module Spree
+  class ProductSummaryPresenter
+    include Rails.application.routes.url_helpers
+
+    def initialize(product)
+      @product = product
+    end
+
+    def call
+      {
+        name: @product.name,
+        images: images
+      }
+    end
+
+    private
+
+    def images
+      @product.images.map do |image|
+        {
+          url_product: rails_representation_url(image.url(:product), only_path: true)
+        }
+      end
+    end
+  end
+end

data/app/presenters/spree/variant_presenter.rb

@@ -0,0 +1,69 @@
+module Spree
+  class VariantPresenter
+    include Rails.application.routes.url_helpers
+    include Spree::BaseHelper
+
+    attr_reader :current_currency, :current_price_options
+
+    def initialize(opts = {})
+      @variants = opts[:variants]
+      @is_product_available_in_currency = opts[:is_product_available_in_currency]
+      @current_currency = opts[:current_currency]
+      @current_price_options = opts[:current_price_options]
+    end
+
+    def call
+      @variants.map do |variant|
+        {
+          display_price: display_price(variant),
+          is_product_available_in_currency: @is_product_available_in_currency,
+          backorderable: backorderable?(variant),
+          images: images(variant),
+          option_values: option_values(variant),
+        }.merge(
+          variant_attributes(variant)
+        )
+      end
+    end
+
+    def images(variant)
+      variant.images.map do |image|
+        {
+          alt: image.alt,
+          url_product: rails_representation_url(image.url(:product), only_path: true)
+        }
+      end
+    end
+
+    def option_values(variant)
+      variant.option_values.map do |option_value|
+        {
+          id: option_value.id,
+          name: option_value.name,
+          presentation: option_value.presentation,
+        }
+      end
+    end
+
+    private
+
+    def backorderable?(variant)
+      backorderable_variant_ids.include?(variant.id)
+    end
+
+    def backorderable_variant_ids
+      @backorderable_variant_ids ||= Spree::Variant.joins(:stock_items).where(id: @variants.map(&:id)).
+        where(spree_stock_items: { backorderable: true }).merge(Spree::StockItem.with_active_stock_location).distinct.ids
+    end
+
+    def variant_attributes(variant)
+      {
+        id: variant.id,
+        sku: variant.sku,
+        price: variant.price,
+        in_stock: variant.in_stock?,
+        purchasable: variant.purchasable?
+      }
+    end
+  end
+end

data/app/presenters/spree/variants/option_types_presenter.rb

@@ -0,0 +1,74 @@
+module Spree
+  module Variants
+    class OptionTypesPresenter
+      def initialize(option_types)
+        @option_types = option_types
+      end
+
+      def default_variant
+        default_variant_data[:variant]
+      end
+
+      def options
+        option_types.map do |option_type|
+          {
+            id: option_type.id,
+            name: option_type.name,
+            presentation: option_type.presentation,
+            position: option_type.position,
+            option_values: option_values_options(option_type.option_values)
+          }
+        end
+      end
+
+      private
+
+      attr_reader :option_types
+
+      def default_variant_data
+        return {} if option_types.empty?
+
+        @default_variant_data ||= begin
+          find_in_stock_variant_data || find_backorderable_variant_data || find_first_variant_data
+        end
+      end
+
+      def find_in_stock_variant_data
+        find_variant_data(&:in_stock?)
+      end
+
+      def find_backorderable_variant_data
+        find_variant_data(&:backorderable?)
+      end
+
+      def find_variant_data(&block)
+        option_types.first.option_values.each do |option_value|
+          variant = option_value.variants.find(&block)
+
+          return { variant: variant, option_value: option_value } if variant
+        end
+
+        nil
+      end
+
+      def find_first_variant_data
+        option_value = option_types.first.option_values.first
+        variant = option_value.variants.first
+
+        { variant: variant, option_value: option_value }
+      end
+
+      def option_values_options(option_values)
+        option_values.map do |option_value|
+          {
+            id: option_value.id,
+            position: option_value.position,
+            presentation: option_value.presentation,
+            variant_id: option_value.variants.first.id,
+            is_default: option_value == default_variant_data[:option_value]
+          }
+        end
+      end
+    end
+  end
+end

data/app/presenters/spree/variants/options_presenter.rb

@@ -0,0 +1,49 @@
+module Spree
+  module Variants
+    class OptionsPresenter
+      WORDS_CONNECTOR = ', '.freeze
+
+      attr_reader :variant
+
+      delegate :option_values, to: :variant
+
+      def initialize(variant)
+        @variant = variant
+      end
+
+      def to_sentence
+        options = option_values
+        options = sort_options(options)
+        options = present_options(options)
+
+        join_options(options)
+      end
+
+      private
+
+      def sort_options(options)
+        options.sort_by { |o| o.option_type.position }
+      end
+
+      def present_options(options)
+        options.map do |ov|
+          method = "present_#{ov.option_type.name}_option"
+
+          respond_to?(method, true) ? send(method, ov) : present_option(ov)
+        end
+      end
+
+      def present_color_option(option)
+        "#{option.option_type.presentation}: #{option.name}"
+      end
+
+      def present_option(option)
+        "#{option.option_type.presentation}: #{option.presentation}"
+      end
+
+      def join_options(options)
+        options.to_sentence(words_connector: WORDS_CONNECTOR, two_words_connector: WORDS_CONNECTOR)
+      end
+    end
+  end
+end

data/app/services/spree/checkout/get_shipping_rates.rb

@@ -7,7 +7,9 @@ module Spree
         run :reload_order
         run :ensure_shipping_address
         run :ensure_line_items_present
-        run :generate_or_return_shipping_rates
+        run :move_order_to_delivery_state
+        run :generate_shipping_rates
+        run :return_shipments
       end
 
       private
@@ -29,11 +31,6 @@ module Spree
         success(order: order)
       end
 
-      def generate_or_return_shipping_rates(order:)
-        generate_shipping_rates(order: order) if order.shipments.empty?
-        return_shipments(order: order)
-      end
-
       def generate_shipping_rates(order:)
         ApplicationRecord.transaction do
           order.create_proposed_shipments
@@ -45,7 +42,13 @@ module Spree
       end
 
       def return_shipments(order:)
-        success(order.reload.shipments.includes([shipping_rates: :shipping_method]))
+        success(order.shipments.includes([shipping_rates: :shipping_method]))
+      end
+
+      def move_order_to_delivery_state(order:)
+        Spree::Dependencies.checkout_next_service.constantize.call(order: order) until order.state == 'delivery'
+
+        success(order: order)
       end
     end
   end

data/app/services/spree/checkout/update.rb

@@ -4,12 +4,8 @@ module Spree
       prepend Spree::ServiceModule::Base
 
       def call(order:, params:, permitted_attributes:, request_env:)
-        ship_changed = address_with_country_iso_present?(params, 'ship')
-        bill_changed = address_with_country_iso_present?(params, 'bill')
-        params = replace_country_iso_with_id(params, 'ship') if ship_changed
-        params = replace_country_iso_with_id(params, 'bill') if bill_changed
-        order.state = 'address' if (ship_changed || bill_changed) && order.has_checkout_step?('address')
-        order.state = 'delivery' if selected_shipping_rate_present?(params) && order.has_checkout_step?('delivery')
+        params = replace_country_iso_with_id(params, 'ship') if address_with_country_iso_present?(params, 'ship')
+        params = replace_country_iso_with_id(params, 'bill') if address_with_country_iso_present?(params, 'bill')
         return success(order) if order.update_from_params(params, permitted_attributes, request_env)
 
         failure(order)
@@ -24,13 +20,6 @@ module Spree
         true
       end
 
-      def selected_shipping_rate_present?(params)
-        shipments_attributes = params.dig(:order, :shipments_attributes)
-        return false unless shipments_attributes
-
-        shipments_attributes.any? { |s| s.dig(:selected_shipping_rate_id) }
-      end
-
       def replace_country_iso_with_id(params, address_kind = 'ship')
         country_id = Spree::Country.by_iso(params[:order]["#{address_kind}_address_attributes"].fetch(:country_iso))&.id