spree_core 4.2.0.rc2 → 4.2.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c4aedf602c42650159969df6a8bc7f450fd1c68f6d93d2a40ff8635f691b5be
-  data.tar.gz: 41c8433179fb96ecb5ea01dd0b7f35cf600652531f8bdebdb837e24977cf795f
+  metadata.gz: 6e1c991fe1a4f4ffcb163ad34f7db0d399c802a14b09cabae9b6db567db1adbc
+  data.tar.gz: 6d27129f5c12ec9b48941c3001a341d8306e219fdb702b153944645bc1044b72
 SHA512:
-  metadata.gz: 5f3c60e7a972db6b1a2747b06485210904a431959eda4bdf5e9b0948207b5352bbff1b9fca5c414ac68b03d872301fb8aaffdbb1aef8b61777c51c5fa927b0c1
-  data.tar.gz: 15fa837cab8e2f12a409ff45432206e01f3d54211545b52c3ae26c0291baa2ee40cd8f49edaccdb9d6914411b8bacff269abc91993968741b959d555b8bdab30
+  metadata.gz: 4627be5137cf9b13ac72562df61b91a6ad0a95eb0119e9b9cf0c9a32b562874799ff35a0187ae8eadec622c88c0c5ee56f10cb21df79512b6524394b2f668fb1
+  data.tar.gz: ecaf570ab3245130d1ea2b521e0201937617e2aa0d308051d56ec17e2757549ce202fc243bb0c9b7609e379dfb7179005773656a8c7cc69632341c9751a26967

data/app/controllers/spree/base_controller.rb

@@ -11,5 +11,3 @@ class Spree::BaseController < ApplicationController
 
   respond_to :html
 end
-
-require 'spree/i18n/initializer'

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

@@ -1,17 +1,6 @@
 module Spree
   module Addresses
-    class Find
-      def initialize(scope:, params:)
-        @scope = scope
-      end
-
-      def execute
-        scope
-      end
-
-      private
-
-      attr_reader :scope
+    class Find < ::Spree::BaseFinder
     end
   end
 end

data/app/finders/spree/base_finder.rb

@@ -0,0 +1,14 @@
+module Spree
+  class BaseFinder
+    def initialize(scope:, params:)
+      @scope = scope
+      @params = params
+    end
+
+    attr_reader :scope, :params
+
+    def execute
+      scope
+    end
+  end
+end

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

@@ -1,13 +1,21 @@
 module Spree
   module Countries
-    class Find
-      def initialize(scope, params)
+    class Find < ::Spree::BaseFinder
+      def initialize(scope:, params:)
         @scope = scope
 
         @shippable = String(params[:filter][:shippable]) unless params[:filter].nil?
       end
 
       def call
+        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+          Spree::Countries::Find.new.call is deprecated and will be removed in Spree 5.0.
+          Please use Spree::Countries::Find.new.execute instead
+        DEPRECATION
+        execute
+      end
+
+      def execute
         countries = by_shippability(scope)
 
         countries
@@ -15,7 +23,7 @@ module Spree
 
       private
 
-      attr_reader :shippable, :scope
+      attr_reader :shippable
 
       def shippable?
         shippable.present?

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

@@ -1,7 +1,7 @@
 module Spree
   module CreditCards
-    class Find
-      def execute(scope:, params:)
+    class Find < ::Spree::BaseFinder
+      def execute
         return scope.default.take if params[:id].eql?('default')
         return scope.where(payment_method_id: params[:filter]['payment_method_id']) if params[:filter].present?
 

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

@@ -15,7 +15,7 @@ module Spree
       private
 
       def incomplete_orders
-        Spree::Order.incomplete.includes(scope_includes)
+        Spree::Order.incomplete.not_canceled.includes(scope_includes)
       end
 
       def scope_includes

data/app/helpers/spree/base_helper.rb

@@ -1,13 +1,7 @@
 module Spree
   module BaseHelper
     def available_countries
-      checkout_zone = current_store.checkout_zone || Spree::Zone.default_checkout_zone
-
-      countries = if checkout_zone && checkout_zone.kind == 'country'
-                    checkout_zone.country_list
-                  else
-                    Spree::Country.all
-                  end
+      countries = current_store.countries_available_for_checkout
 
       countries.collect do |country|
         country.name = Spree.t(country.iso, scope: 'country_names', default: country.name)

data/app/mailers/spree/base_mailer.rb

@@ -1,6 +1,6 @@
 module Spree
   class BaseMailer < ActionMailer::Base
-    add_template_helper(MailHelper)
+    helper Spree::MailHelper
 
     def current_store
       @current_store ||= Spree::Store.current
@@ -23,7 +23,7 @@ module Spree
     helper_method :frontend_available?
 
     def mail(headers = {}, &block)
-      ensure_default_action_mailer_url_host
+      ensure_default_action_mailer_url_host(headers[:store_url])
       set_email_locale
       super if Spree::Config[:send_core_emails]
     end
@@ -33,9 +33,9 @@ module Spree
     # this ensures that ActionMailer::Base.default_url_options[:host] is always set
     # this is only a fail-safe solution if developer didn't set this in environment files
     # http://guides.rubyonrails.org/action_mailer_basics.html#generating-urls-in-action-mailer-views
-    def ensure_default_action_mailer_url_host
+    def ensure_default_action_mailer_url_host(store_url = nil)
       ActionMailer::Base.default_url_options ||= {}
-      ActionMailer::Base.default_url_options[:host] ||= current_store.url
+      ActionMailer::Base.default_url_options[:host] ||= store_url || current_store.url
     end
 
     def set_email_locale

data/app/mailers/spree/order_mailer.rb

@@ -5,14 +5,14 @@ module Spree
       current_store = @order.store
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
       subject += "#{current_store.name} #{Spree.t('order_mailer.confirm_email.subject')} ##{@order.number}"
-      mail(to: @order.email, from: from_address, subject: subject)
+      mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.url)
     end
 
     def store_owner_notification_email(order)
       @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
       current_store = @order.store
       subject = Spree.t('order_mailer.store_owner_notification_email.subject', store_name: current_store.name)
-      mail(to: current_store.new_order_notifications_email, from: from_address, subject: subject)
+      mail(to: current_store.new_order_notifications_email, from: from_address, subject: subject, store_url: current_store.url)
     end
 
     def cancel_email(order, resend = false)
@@ -20,7 +20,7 @@ module Spree
       current_store = @order.store
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
       subject += "#{current_store.name} #{Spree.t('order_mailer.cancel_email.subject')} ##{@order.number}"
-      mail(to: @order.email, from: from_address, subject: subject)
+      mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.url)
     end
   end
 end

data/app/mailers/spree/reimbursement_mailer.rb

@@ -6,7 +6,7 @@ module Spree
       current_store = @reimbursement.store || Spree::Store.current
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
       subject += "#{current_store.name} #{Spree.t('reimbursement_mailer.reimbursement_email.subject')} ##{@order.number}"
-      mail(to: @order.email, from: current_store.mail_from_address, subject: subject)
+      mail(to: @order.email, from: current_store.mail_from_address, subject: subject, store_url: current_store.url)
     end
   end
 end

data/app/mailers/spree/shipment_mailer.rb

@@ -6,7 +6,7 @@ module Spree
       current_store = @shipment.store
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
       subject += "#{current_store.name} #{Spree.t('shipment_mailer.shipped_email.subject')} ##{@order.number}"
-      mail(to: @order.email, from: from_address, subject: subject)
+      mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.url)
     end
   end
 end

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

@@ -4,7 +4,7 @@ module Spree
 
     included do
       has_one :default_price,
-              -> { where currency: Spree::Config[:currency] },
+              -> { with_deleted.where(currency: Spree::Config[:currency]) },
               class_name: 'Spree::Price',
               dependent: :destroy
 
@@ -14,10 +14,6 @@ module Spree
 
       after_save :save_default_price
 
-      def default_price
-        Spree::Price.unscoped { super }
-      end
-
       def has_default_price?
         !default_price.nil?
       end

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

@@ -31,7 +31,7 @@ module Spree
       self.whitelisted_ransackable_attributes = %w[id email]
 
       def self.with_email(query)
-        where('email LIKE ?', "%#{query}%")
+        where("#{table_name}.email LIKE ?", "%#{query}%")
       end
 
       def self.with_address(query, address = :ship_address)
@@ -42,7 +42,7 @@ module Spree
 
       def self.with_email_or_address(email, address)
         left_outer_joins(:addresses).
-          where("#{Spree::Address.table_name}.firstname LIKE ? or #{Spree::Address.table_name}.lastname LIKE ? or email LIKE ?",
+          where("#{Spree::Address.table_name}.firstname LIKE ? or #{Spree::Address.table_name}.lastname LIKE ? or #{table_name}.email LIKE ?",
                 "%#{address}%", "%#{address}%", "%#{email}%")
       end
     end

data/app/models/spree/ability.rb

@@ -42,12 +42,7 @@ module Spree
         can :update, Order do |order, token|
           !order.completed? && (order.user == user || order.token && token == order.token)
         end
-        can :manage, Spree::Address do |address|
-          address.user == user
-        end
-        can :create, Spree::Address do |_address|
-          user.id.present?
-        end
+        can :manage, Address, user_id: user.id
         can :read, CreditCard, user_id: user.id
         can :read, Product
         can :read, ProductProperty
@@ -55,6 +50,7 @@ module Spree
         can :create, Spree.user_class
         can [:show, :update, :destroy], Spree.user_class, id: user.id
         can :read, State
+        can :read, Store
         can :read, Taxon
         can :read, Taxonomy
         can :read, Variant

data/app/models/spree/address.rb

@@ -2,6 +2,10 @@ module Spree
   class Address < Spree::Base
     require 'twitter_cldr'
 
+    if Rails::VERSION::STRING >= '6.1'
+      serialize :preferences, Hash, default: {}
+    end
+
     NO_ZIPCODE_ISO_CODES ||= [
       'AO', 'AG', 'AW', 'BS', 'BZ', 'BJ', 'BM', 'BO', 'BW', 'BF', 'BI', 'CM', 'CF', 'KM', 'CG',
       'CD', 'CK', 'CUW', 'CI', 'DJ', 'DM', 'GQ', 'ER', 'FJ', 'TF', 'GAB', 'GM', 'GH', 'GD', 'GN',

data/app/models/spree/app_dependencies.rb

@@ -12,7 +12,8 @@ module Spree
       :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
+      :account_create_address_service, :account_update_address_service, :address_finder,
+      :collection_sorter
     ].freeze
 
     attr_accessor *INJECTION_POINTS
@@ -51,7 +52,8 @@ module Spree
       @checkout_get_shipping_rates_service = 'Spree::Checkout::GetShippingRates'
 
       # sorter
-      @order_sorter = 'Spree::Orders::Sort'
+      @collection_sorter = 'Spree::BaseSorter'
+      @order_sorter = 'Spree::BaseSorter'
       @products_sorter = 'Spree::Products::Sort'
 
       # paginator

data/app/models/spree/base.rb

@@ -25,4 +25,9 @@ class Spree::Base < ApplicationRecord
   def self.spree_base_scopes
     where(nil)
   end
+
+  # FIXME: https://github.com/rails/rails/issues/40943
+  def self.has_many_inversing
+    false
+  end
 end

data/app/models/spree/fulfilment_changer.rb

@@ -36,7 +36,7 @@ module Spree
     private
 
     attr_reader :variant, :quantity, :current_stock_location, :desired_stock_location,
-      :current_shipment, :desired_shipment, :available_quantity
+                :current_shipment, :desired_shipment, :available_quantity
 
     def handle_stock
       ActiveRecord::Base.transaction do
@@ -45,13 +45,64 @@ module Spree
           desired_stock_location.unstock(variant, unstock_quantity, desired_shipment)
         end
 
-        update_current_shipment_inventory_units(new_on_hand_quantity, :on_hand)
-        update_current_shipment_inventory_units(quantity - new_on_hand_quantity, :backordered)
+        move_inventory_units_between_shipments
+      end
+    end
+
+    def move_inventory_units_between_shipments
+      update_desired_shipment_inventory_units
+      update_current_shipment_inventory_units
+    end
+
+    def current_shipment_units
+      @current_shipment_units ||= current_shipment.inventory_units.on_hand_or_backordered.where(variant_id: variant.id)
+    end
+
+    def update_desired_shipment_inventory_units
+      on_hand_unit = get_desired_shipment_inventory_unit(:on_hand)
+      on_hand_unit.update(quantity: on_hand_unit.quantity + new_on_hand_quantity)
+
+      new_backorder_quantity = current_on_hand_quantity - new_on_hand_quantity
+      if new_backorder_quantity > 0
+        backordered_unit = get_desired_shipment_inventory_unit(:backordered)
+        backordered_unit.update(quantity: backordered_unit.quantity + new_backorder_quantity)
+      end
+    end
+
+    def update_current_shipment_inventory_units
+      reduced_quantity = current_on_hand_quantity
+
+      # Reduce quantities from all backordered units first in case there is more than one.
+      backorder_units = current_shipment_units.backordered
+      reduced_quantity = reduce_units_quantities(reduced_quantity, backorder_units) if backorder_units.any?
+
+      # Reduce quantities from all on_hand units in case there is more than one.
+      if reduced_quantity > 0
+        on_hand_units = current_shipment_units.on_hand
+        reduce_units_quantities(reduced_quantity, on_hand_units) if on_hand_units.any?
+      end
+    end
+
+    def reduce_units_quantities(reduced_quantity, units)
+      units.each do |unit|
+        unit.quantity > reduced_quantity ? unit.update(quantity: unit.quantity - reduced_quantity) : unit.destroy!
+        reduced_quantity -= unit.quantity
+      end
+      reduced_quantity
+    end
+
+    def get_desired_shipment_inventory_unit(state)
+      desired_shipment.inventory_units.find_or_create_by(state: state) do |unit|
+        current_shipment_unit = current_shipment_units.first
+        unit.variant_id = current_shipment_unit.variant_id
+        unit.order_id = current_shipment_unit.order_id
+        unit.line_item_id = current_shipment_unit.line_item_id
+        unit.quantity = 0
       end
     end
 
     def after_process_shipments
-      if current_shipment.inventory_units.length.zero?
+      if current_shipment.inventory_units.sum(:quantity).zero?
         current_shipment.destroy!
       else
         current_shipment.refresh_rates
@@ -64,7 +115,7 @@ module Spree
     end
 
     def new_on_hand_quantity
-      [available_quantity, quantity].min
+      [available_quantity, current_on_hand_quantity].min
     end
 
     def unstock_quantity
@@ -72,16 +123,7 @@ module Spree
     end
 
     def current_on_hand_quantity
-      [current_shipment.inventory_units.on_hand_or_backordered.size, quantity].min
-    end
-
-    def update_current_shipment_inventory_units(quantity, state)
-      current_shipment.
-        inventory_units.
-        where(variant: variant).
-        order(state: :asc).
-        limit(quantity).
-        update_all(shipment_id: desired_shipment.id, state: state)
+      [current_shipment.inventory_units.on_hand_or_backordered.sum(:quantity), quantity].min
     end
 
     def reload_shipment_inventory_units
@@ -105,7 +147,7 @@ module Spree
     def enough_stock_at_desired_location
       return if Spree::Stock::Quantifier.new(variant, desired_stock_location).can_supply?(quantity)
 
-      errors.add(:desired_shipment, :not_enough_stock_at_desired_location)
+      errors.add(:desired_shipment, :has_not_enough_stock_at_desired_location)
     end
 
     def desired_shipment_different_from_current

data/app/models/spree/inventory_unit.rb

@@ -1,10 +1,10 @@
 module Spree
   class InventoryUnit < Spree::Base
     with_options inverse_of: :inventory_units do
-      belongs_to :variant, class_name: 'Spree::Variant'
+      belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant'
       belongs_to :order, class_name: 'Spree::Order'
       belongs_to :shipment, class_name: 'Spree::Shipment', touch: true, optional: true
-      has_many :return_items
+      has_many :return_items, inverse_of: :inventory_unit
       has_many :return_authorizations, class_name: 'Spree::ReturnAuthorization', through: :return_items
       belongs_to :line_item, class_name: 'Spree::LineItem'
     end
@@ -84,11 +84,6 @@ module Spree
       split_inventory!(1)
     end
 
-    # Remove variant default_scope `deleted_at: nil`
-    def variant
-      Spree::Variant.unscoped { super }
-    end
-
     def current_or_new_return_item
       Spree::ReturnItem.from_inventory_unit(self)
     end

data/app/models/spree/line_item.rb

@@ -4,7 +4,7 @@ module Spree
 
     with_options inverse_of: :line_items do
       belongs_to :order, class_name: 'Spree::Order', touch: true
-      belongs_to :variant, class_name: 'Spree::Variant'
+      belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant'
     end
     belongs_to :tax_category, class_name: 'Spree::TaxCategory'
 
@@ -120,11 +120,6 @@ module Spree
       assign_attributes opts
     end
 
-    # Remove variant default_scope `deleted_at: nil`
-    def variant
-      Spree::Variant.unscoped { super }
-    end
-
     private
 
     def ensure_valid_quantity