spree_core 3.6.6 → 3.7.0.rc1

data/app/models/spree/order_inventory.rb

@@ -26,7 +26,7 @@ module Spree
       if units_count < line_item.quantity
         quantity = line_item.quantity - units_count
 
-        shipment = determine_target_shipment unless shipment
+        shipment ||= determine_target_shipment
         add_to_shipment(shipment, quantity)
       elsif (units_count > line_item.quantity) || (units_count == line_item.quantity && line_item_changed)
         remove(units_count, shipment)
@@ -43,6 +43,7 @@ module Spree
       else
         order.shipments.each do |shipment|
           break if quantity.zero?
+
           quantity -= remove_from_shipment(shipment, quantity)
         end
       end
@@ -71,7 +72,9 @@ module Spree
     end
 
     def add_to_shipment(shipment, quantity)
-      if variant.should_track_inventory?
+      if shipment.nil?
+        shipment = order.create_proposed_shipments.first
+      elsif variant.should_track_inventory?
         on_hand, back_order = shipment.stock_location.fill_status(variant, quantity)
 
         shipment.set_up_inventory('on_hand', variant, order, line_item, on_hand)
@@ -99,6 +102,7 @@ module Spree
       shipment_units.each do |inventory_unit|
         inventory_unit.quantity.times do
           break if removed_quantity == quantity
+
           if inventory_unit.quantity > 1
             inventory_unit.decrement(:quantity)
           else

data/app/models/spree/order_merger.rb

@@ -29,9 +29,7 @@ module Spree
     def find_matching_line_item(other_order_line_item)
       order.line_items.detect do |my_li|
         my_li.variant == other_order_line_item.variant &&
-          order.line_item_comparison_hooks.all? do |hook|
-            order.send(hook, my_li, other_order_line_item.serializable_hash)
-          end
+          CompareLineItems.new.call(order: order, line_item: my_li, options: other_order_line_item.serializable_hash).value
       end
     end
 

data/app/models/spree/order_promotion.rb

@@ -2,5 +2,15 @@ module Spree
   class OrderPromotion < Spree::Base
     belongs_to :order, class_name: 'Spree::Order'
     belongs_to :promotion, class_name: 'Spree::Promotion'
+
+    delegate :name, :description, :code, to: :promotion
+    delegate :currency, to: :order
+
+    extend Spree::DisplayMoney
+    money_methods :amount
+
+    def amount
+      order.all_adjustments.promotion.where(source: promotion.actions).sum(:amount)
+    end
   end
 end

data/app/models/spree/order_updater.rb

@@ -53,10 +53,13 @@ module Spree
 
     # give each of the shipments a chance to update themselves
     def update_shipments
+      shipping_method_filter = order.completed? ? ShippingMethod::DISPLAY_ON_BACK_END : ShippingMethod::DISPLAY_ON_FRONT_END
+
       shipments.each do |shipment|
         next unless shipment.persisted?
+
         shipment.update!(order)
-        shipment.refresh_rates
+        shipment.refresh_rates(shipping_method_filter)
         shipment.update_amounts
       end
     end
@@ -132,16 +135,16 @@ module Spree
         # get all the shipment states for this order
         shipment_states = shipments.states
         order.shipment_state = if shipment_states.size > 1
-          # multiple shiment states means it's most likely partially shipped
+                                 # multiple shipment states means it's most likely partially shipped
                                  'partial'
                                else
-          # will return nil if no shipments are found
+                                 # will return nil if no shipments are found
                                  shipment_states.first
-          # TODO: inventory unit states?
-          # if order.shipment_state && order.inventory_units.where(shipment_id: nil).exists?
-          #   shipments exist but there are unassigned inventory units
-          #   order.shipment_state = 'partial'
-          # end
+                                 # TODO: inventory unit states?
+                                 # if order.shipment_state && order.inventory_units.where(shipment_id: nil).exists?
+                                 #   shipments exist but there are unassigned inventory units
+                                 #   order.shipment_state = 'partial'
+                                 # end
                                end
       end
 

data/app/models/spree/payment.rb

@@ -24,6 +24,7 @@ module Spree
 
     validates :payment_method, presence: true
     validates :number, uniqueness: true
+    validates :source, presence: true, if: -> { payment_method&.source_required? }
 
     before_validation :validate_source
 
@@ -43,6 +44,7 @@ module Spree
     validates :amount, numericality: true
 
     delegate :store_credit?, to: :payment_method, allow_nil: true
+    delegate :name,          to: :payment_method, allow_nil: true, prefix: true
     default_scope { order(:created_at) }
 
     scope :from_credit_card, -> { where(source_type: 'Spree::CreditCard') }
@@ -102,8 +104,8 @@ module Spree
       after_transition do |payment, transition|
         payment.state_changes.create!(
           previous_state: transition.from,
-          next_state:     transition.to,
-          name:           'payment'
+          next_state: transition.to,
+          name: 'payment'
         )
       end
     end
@@ -138,6 +140,7 @@ module Spree
     # see https://github.com/spree/spree/issues/981
     def build_source
       return unless new_record?
+
       if source_attributes.present? && source.blank? && payment_method.try(:payment_source_class)
         self.source = payment_method.payment_source_class.new(source_attributes)
         source.payment_method_id = payment_method.id
@@ -146,7 +149,8 @@ module Spree
     end
 
     def actions
-      return [] unless payment_source && payment_source.respond_to?(:actions)
+      return [] unless payment_source&.respond_to?(:actions)
+
       payment_source.actions.select { |action| !payment_source.respond_to?("can_#{action}?") || payment_source.send("can_#{action}?", self) }
     end
 
@@ -157,6 +161,7 @@ module Spree
 
     def is_avs_risky?
       return false if avs_response.blank? || NON_RISKY_AVS_CODES.include?(avs_response)
+
       true
     end
 
@@ -164,6 +169,7 @@ module Spree
       return false if cvv_response_code == 'M'
       return false if cvv_response_code.nil?
       return false if cvv_response_message.present?
+
       true
     end
 

data/app/models/spree/payment/processing.rb

@@ -8,7 +8,7 @@ module Spree
       end
 
       def process!
-        if payment_method && payment_method.auto_capture?
+        if payment_method&.auto_capture?
           purchase!
         else
           authorize!
@@ -29,6 +29,7 @@ module Spree
       # a new pending payment record for the remaining amount to capture later.
       def capture!(amount = nil)
         return true if completed?
+
         amount ||= money.amount_in_cents
         started_processing!
         protect_from_connection_error do
@@ -47,6 +48,7 @@ module Spree
 
       def void_transaction!
         return true if void?
+
         protect_from_connection_error do
           if payment_method.payment_profiles_supported?
             # Gateways supporting payment profiles will need access to credit card object because this stores the payment profile information
@@ -96,7 +98,7 @@ module Spree
           raise ArgumentError, 'handle_payment_preconditions must be called with a block'
         end
 
-        if payment_method && payment_method.source_required?
+        if payment_method&.source_required?
           if source
             unless processing?
               if payment_method.supports?(source) || token_based?
@@ -146,11 +148,9 @@ module Spree
       end
 
       def protect_from_connection_error
-
         yield
       rescue ActiveMerchant::ConnectionError => e
         gateway_error(e)
-
       end
 
       def gateway_error(error)

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

@@ -48,10 +48,10 @@ module Spree::Preferences
 
         # does it exist in the database?
         val = if preference = Spree::Preference.find_by(key: key)
-          # it does exist
+                # it does exist
                 preference.value
               else
-          # use the fallback value
+                # use the fallback value
                 yield
               end
 
@@ -89,7 +89,7 @@ module Spree::Preferences
       return unless should_persist?
 
       preference = Spree::Preference.find_by(key: cache_key)
-      preference.destroy if preference
+      preference&.destroy
     end
 
     def should_persist?

data/app/models/spree/product.rb

@@ -125,6 +125,21 @@ module Spree
 
     alias master_images images
 
+    # Cant use short form block syntax due to https://github.com/Netflix/fast_jsonapi/issues/259
+    def purchasable?
+      variants_including_master.any?(&:purchasable?)
+    end
+
+    # Cant use short form block syntax due to https://github.com/Netflix/fast_jsonapi/issues/259
+    def in_stock?
+      variants_including_master.any?(&:in_stock?)
+    end
+
+    # Cant use short form block syntax due to https://github.com/Netflix/fast_jsonapi/issues/259
+    def backorderable?
+      variants_including_master.any?(&:backorderable?)
+    end
+
     def find_or_build_master
       master || build_master
     end
@@ -134,6 +149,14 @@ module Spree
       variants.any?
     end
 
+    def default_variant
+      has_variants? ? variants.first : master
+    end
+
+    def default_variant_id
+      default_variant.id
+    end
+
     def tax_category
       super || TaxCategory.find_by(is_default: true)
     end
@@ -147,6 +170,7 @@ module Spree
     # Ensures option_types and product_option_types exist for keys in option_values_hash
     def ensure_option_types_exist_for_values_hash
       return if option_values_hash.nil?
+
       required_option_type_ids = option_values_hash.keys.map(&:to_i)
       missing_option_type_ids = required_option_type_ids - option_type_ids
       missing_option_type_ids.each do |id|
@@ -188,10 +212,16 @@ module Spree
       variants_including_master.any?(&:can_supply?)
     end
 
+    # determine if any variant (including master) is out of stock and backorderable
+    def backordered?
+      variants_including_master.any?(&:backordered?)
+    end
+
     # split variants list into hash which shows mapping of opt value onto matching variants
     # eg categorise_variants_from_option(color) => {"red" -> [...], "blue" -> [...]}
     def categorise_variants_from_option(opt_type)
       return {} unless option_types.include?(opt_type)
+
       variants.active.group_by { |v| v.option_values.detect { |o| o.option_type == opt_type } }
     end
 
@@ -270,6 +300,7 @@ module Spree
 
     def any_variants_not_track_inventory?
       return true unless Spree::Config.track_inventory_levels
+
       if variants_including_master.loaded?
         variants_including_master.any? { |v| !v.track_inventory? }
       else
@@ -294,6 +325,7 @@ module Spree
 
     def ensure_master
       return unless new_record?
+
       self.master ||= build_master
     end
 

data/app/models/spree/product/scopes.rb

@@ -22,6 +22,7 @@ module Spree
       scopes.each do |name|
         # We should not define price scopes here, as they require something slightly different
         next if name.to_s.include?('master_price')
+
         parts = name.to_s.match(/(.*)_by_(.*)/)
         scope(name.to_s, -> { order(Arel.sql("#{Product.quoted_table_name}.#{parts[2]} #{parts[1] == 'ascend' ? 'ASC' : 'DESC'}")) })
       end
@@ -29,10 +30,10 @@ module Spree
 
     def self.property_conditions(property)
       properties = Property.table_name
-      conditions = case property
-                   when String   then { "#{properties}.name" => property }
-                   when Property then { "#{properties}.id" => property.id }
-                   else { "#{properties}.id" => property.to_i }
+      case property
+      when String   then { "#{properties}.name" => property }
+      when Property then { "#{properties}.id" => property.id }
+      else { "#{properties}.id" => property.to_i }
       end
     end
 
@@ -109,7 +110,7 @@ module Spree
                    when String     then { "#{option_types}.name" => option }
                    when OptionType then { "#{option_types}.id" => option.id }
                    else { "#{option_types}.id" => option.to_i }
-      end
+                   end
 
       joins(:option_types).where(conditions)
     end
@@ -120,7 +121,7 @@ module Spree
                        when String then OptionType.find_by(name: option) || option.to_i
                        when OptionType then option.id
                        else option.to_i
-      end
+                       end
 
       conditions = "#{option_values}.name = ? AND #{option_values}.option_type_id = ?", value, option_type_id
       group('spree_products.id').joins(variants_including_master: :option_values).where(conditions)
@@ -210,50 +211,27 @@ module Spree
       group('spree_products.id').joins(:taxons).where(Taxon.arel_table[:name].eq(name))
     end
 
-    def self.distinct_by_product_ids(sort_order = nil)
-      sort_column = sort_order.split(' ').first
-
-      # Postgres will complain when using ordering by expressions not present in
-      # SELECT DISTINCT. e.g.
-      #
-      #   PG::InvalidColumnReference: ERROR:  for SELECT DISTINCT, ORDER BY
-      #   expressions must appear in select list. e.g.
-      #
-      #   SELECT  DISTINCT "spree_products".* FROM "spree_products" LEFT OUTER JOIN
-      #   "spree_variants" ON "spree_variants"."product_id" = "spree_products"."id" AND "spree_variants"."is_master" = 't'
-      #   AND "spree_variants"."deleted_at" IS NULL LEFT OUTER JOIN "spree_prices" ON
-      #   "spree_prices"."variant_id" = "spree_variants"."id" AND "spree_prices"."currency" = 'USD'
-      #   AND "spree_prices"."deleted_at" IS NULL WHERE "spree_products"."deleted_at" IS NULL AND ('t'='t')
-      #   ORDER BY "spree_prices"."amount" ASC LIMIT 10 OFFSET 0
-      #
-      # Don't allow sort_column, a variable coming from params,
-      # to be anything but a column in the database
-      if ApplicationRecord.connection.adapter_name == 'PostgreSQL' && !column_names.include?(sort_column)
-        all
-      else
-        distinct
-      end
-    end
-
-    private
-
     def self.price_table_name
       Price.quoted_table_name
     end
+    private_class_method :price_table_name
 
     # specifically avoid having an order for taxon search (conflicts with main order)
     def self.prepare_taxon_conditions(taxons)
       ids = taxons.map { |taxon| taxon.self_and_descendants.pluck(:id) }.flatten.uniq
       joins(:classifications).where(Classification.table_name => { taxon_id: ids })
     end
+    private_class_method :prepare_taxon_conditions
 
     # Produce an array of keywords for use in scopes.
     # Always return array with at least an empty string to avoid SQL errors
     def self.prepare_words(words)
       return [''] if words.blank?
+
       a = words.split(/[,\s]/).map(&:strip)
       a.any? ? a : ['']
     end
+    private_class_method :prepare_words
 
     def self.get_taxons(*ids_or_records_or_names)
       taxons = Taxon.table_name
@@ -267,5 +245,6 @@ module Spree
         end
       end.compact.flatten.uniq
     end
-    end
+    private_class_method :get_taxons
+  end
 end

data/app/models/spree/product_property.rb

@@ -17,7 +17,7 @@ module Spree
     self.whitelisted_ransackable_associations = ['property']
 
     # virtual attributes for use with AJAX completion stuff
-    delegate :name, to: :property, prefix: true, allow_nil: true
+    delegate :name, :presentation, to: :property, prefix: true, allow_nil: true
 
     def property_name=(name)
       if name.present?

data/app/models/spree/promotion.rb

@@ -119,6 +119,7 @@ module Spree
     # called anytime order.update_with_updater! happens
     def eligible?(promotable)
       return false if expired? || usage_limit_exceeded?(promotable) || blacklisted?(promotable)
+
       !!eligible_rules(promotable, {})
     end
 
@@ -128,6 +129,7 @@ module Spree
     def eligible_rules(promotable, options = {})
       # Promotions without rules are eligible by default.
       return [] if rules.none?
+
       specific_rules = rules.select { |rule| rule.applicable?(promotable) }
       return [] if specific_rules.none?
 

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

@@ -9,11 +9,16 @@ module Spree
 
         def perform(options = {})
           order = options[:order]
+
           create_unique_adjustment(order, order)
         end
 
         def compute_amount(order)
-          [(order.item_total + order.ship_total - order.shipping_discount), compute(order)].min * -1
+          [order_total(order), compute(order)].min * -1
+        end
+
+        def order_total(order)
+          order.item_total + order.ship_total - order.shipping_discount
         end
       end
     end