spree_core 3.6.6 → 3.7.0.rc1

data/app/models/spree/ability.rb

@@ -44,10 +44,10 @@ module Spree
         can :display, OptionValue
         can :create, Order
         can :read, Order do |order, token|
-          order.user == user || order.guest_token && token == order.guest_token
+          order.user == user || order.token && token == order.token
         end
         can :update, Order do |order, token|
-          !order.completed? && (order.user == user || order.guest_token && token == order.guest_token)
+          !order.completed? && (order.user == user || order.token && token == order.token)
         end
         can :display, CreditCard, user_id: user.id
         can :display, Product

data/app/models/spree/address.rb

@@ -29,6 +29,9 @@ module Spree
 
     validate :state_validate, :postal_code_validate
 
+    delegate :name, :iso3, to: :country, prefix: true
+    delegate :abbr,        to: :state,   prefix: true, allow_nil: true
+
     alias_attribute :first_name, :firstname
     alias_attribute :last_name, :lastname
 
@@ -55,27 +58,37 @@ module Spree
     end
 
     def same_as?(other)
-      return false if other.nil?
-      attributes.except(*EXCLUDED_KEYS_FOR_COMPARISION) == other.attributes.except(*EXCLUDED_KEYS_FOR_COMPARISION)
+      ActiveSupport::Deprecation.warn(<<-EOS, caller)
+        Address#same_as? is deprecated and will be removed in Spree 4.0. Please use Address#== instead"
+      EOS
+
+      self == other
     end
 
-    alias same_as same_as?
+    def same_as(other)
+      ActiveSupport::Deprecation.warn(<<-EOS, caller)
+        Address#same_as is deprecated and will be removed in Spree 4.0. Please use Address#== instead"
+      EOS
+
+      self == other
+    end
 
     def to_s
       "#{full_name}: #{address1}"
     end
 
     def clone
-      self.class.new(attributes.except('id', 'updated_at', 'created_at'))
+      self.class.new(value_attributes)
     end
 
-    def ==(other_address)
-      self_attrs = attributes
-      other_attrs = other_address.respond_to?(:attributes) ? other_address.attributes : {}
+    def ==(other)
+      return false unless other&.respond_to?(:value_attributes)
 
-      [self_attrs, other_attrs].each { |attrs| attrs.except!('id', 'created_at', 'updated_at') }
+      value_attributes == other.value_attributes
+    end
 
-      self_attrs == other_attrs
+    def value_attributes
+      attributes.except(*EXCLUDED_KEYS_FOR_COMPARISION)
     end
 
     def empty?
@@ -106,11 +119,6 @@ module Spree
 
     private
 
-    def clear_state_entities
-      clear_state
-      clear_state_name
-    end
-
     def clear_state
       self.state = nil
     end
@@ -132,6 +140,7 @@ module Spree
       # or when disabled by preference
       return if country.blank? || !Spree::Config[:address_requires_state]
       return unless country.states_required
+
       # ensure associated state belongs to country
       if state.present?
         if state.country == country

data/app/models/spree/adjustable/adjustments_updater.rb

@@ -44,7 +44,7 @@ module Spree
       end
 
       def adjustable_still_exists?
-        @adjustable && @adjustable.class.exists?(@adjustable.id)
+        @adjustable&.class&.exists?(@adjustable.id)
       end
     end
   end

data/app/models/spree/adjustable/promotion_accumulator.rb

@@ -24,6 +24,7 @@ module Spree
 
       def add_adjustment(adjustment, opts = {})
         return unless adjustment.promotion?
+
         source = opts[:source] || adjustment.source
         promotion = opts[:promotion] || source.promotion
 
@@ -32,7 +33,7 @@ module Spree
         add(promotions, promotion, source.promotion_id)
       end
 
-      def promotions_adjustments(promotion_id, adjustments = adjustments)
+      def promotions_adjustments(promotion_id, adjustments = self.adjustments)
         where(sources, promotion_id: promotion_id).map do |source|
           where(adjustments, source_id: source.id)
         end.flatten

data/app/models/spree/adjustment.rb

@@ -48,8 +48,18 @@ module Spree
 
     self.competing_promos_source_types = ['Spree::PromotionAction']
 
-    scope :open, -> { where(state: 'open') }
-    scope :closed, -> { where(state: 'closed') }
+    scope :open, -> {
+      ActiveSupport::Deprecation.warn 'Adjustment.open is deprecated. Please use Adjustment.not_finalized instead', caller
+      not_finalized
+    }
+
+    scope :closed, -> {
+      ActiveSupport::Deprecation.warn 'Adjustment.closed is deprecated. Please use Adjustment.finalized instead', caller
+      finalized
+    }
+
+    scope :not_finalized, -> { where(state: 'open') }
+    scope :finalized, -> { where(state: 'closed') }
     scope :tax, -> { where(source_type: 'Spree::TaxRate') }
     scope :non_tax, -> do
       source_type = arel_table[:source_type]
@@ -73,8 +83,12 @@ module Spree
     extend DisplayMoney
     money_methods :amount
 
+    def amount=(amount)
+      self[:amount] = Spree::LocalizedNumber.parse(amount)
+    end
+
     def currency
-      adjustable ? adjustable.currency : Spree::Config[:currency]
+      adjustable ? adjustable.currency : order.currency
     end
 
     def promotion?
@@ -86,6 +100,7 @@ module Spree
     # the specific object amount passed here.
     def update!(target = adjustable)
       return amount if closed? || source.blank?
+
       amount = source.compute_amount(target)
       attributes = { amount: amount, updated_at: Time.current }
       attributes[:eligible] = source.promotion.eligible?(target) if promotion?

data/app/models/spree/asset/support/active_storage.rb

@@ -16,7 +16,7 @@ module Spree
           end
 
           def dimensions_for_style(style)
-            self.class.styles.with_indifferent_access[style] || default_style
+            self.class.styles.with_indifferent_access[style] || self.class.styles.with_indifferent_access[default_style]
           end
         end
       end

data/app/models/spree/calculator.rb

@@ -1,9 +1,6 @@
 module Spree
   class Calculator < Spree::Base
-    # Conditional check for backwards compatibilty since acts as paranoid was added late https://github.com/spree/spree/issues/5858
-    if ActiveRecord::Base.connected? && connection.data_source_exists?(:spree_calculators) && connection.column_exists?(:spree_calculators, :deleted_at)
-      acts_as_paranoid
-    end
+    acts_as_paranoid
 
     belongs_to :calculable, polymorphic: true, optional: true
 

data/app/models/spree/calculator/flexi_rate.rb

@@ -16,18 +16,15 @@ module Spree
     end
 
     def compute(object)
-      sum = 0
-      max = preferred_max_items.to_i
-      items_count = object.quantity
-      items_count.times do |i|
-        if i == 0
-          sum += preferred_first_item.to_f
-        elsif ((max > 0) && (i <= (max - 1))) || (max == 0)
-          sum += preferred_additional_item.to_f
-        end
-      end
+      compute_from_quantity(object.quantity)
+    end
+
+    def compute_from_quantity(quantity)
+      count = [quantity, preferred_max_items].reject(&:zero?).min
+
+      return BigDecimal(0) if count.zero?
 
-      sum
+      preferred_first_item + (count - 1) * preferred_additional_item
     end
   end
 end

data/app/models/spree/calculator/returns/default_refund_amount.rb

@@ -11,6 +11,7 @@ module Spree
 
       def compute(return_item)
         return 0.0.to_d if return_item.exchange_requested?
+
         @inventory_unit = return_item.inventory_unit
         weighted_order_adjustment_amount(return_item) + weighted_line_item_pre_tax_amount(return_item)
       end
@@ -23,6 +24,7 @@ module Spree
 
       def percentage_of_order_total(return_item)
         return 0.0 if inventory_unit.order.pre_tax_item_amount.zero?
+
         weighted_line_item_pre_tax_amount(return_item) / inventory_unit.order.pre_tax_item_amount
       end
 
@@ -31,7 +33,7 @@ module Spree
       end
 
       def percentage_of_line_item(return_item)
-        return_item.return_quantity / BigDecimal.new(inventory_unit.line_item.quantity)
+        return_item.return_quantity / BigDecimal(inventory_unit.line_item.quantity)
       end
     end
   end

data/app/models/spree/calculator/shipping/flexi_rate.rb

@@ -13,22 +13,22 @@ module Spree
       end
 
       def compute_package(package)
-        compute_from_quantity(package.contents.sum(&:quantity))
+        quantity = package.contents.sum(&:quantity)
+
+        compute_from_quantity(quantity)
       end
 
-      def compute_from_quantity(quantity)
-        sum = 0
-        max = preferred_max_items.to_i
-        quantity.times do |i|
-          # check max value to avoid divide by 0 errors
-          sum += if (max == 0 && i == 0) || (max > 0) && (i % max == 0)
-                   preferred_first_item.to_f
-                 else
-                   preferred_additional_item.to_f
-                 end
-        end
+      delegate :compute_from_quantity, to: :flexi_rate_calculator
+
+      private
 
-        sum
+      def flexi_rate_calculator
+        ::Spree::Calculator::FlexiRate.new(
+          preferred_additional_item: preferred_additional_item,
+          preferred_first_item: preferred_first_item,
+          preferred_max_items: preferred_max_items,
+          preferred_currency: preferred_currency
+        )
       end
     end
   end

data/app/models/spree/country.rb

@@ -22,6 +22,10 @@ module Spree
       default || find_by(iso: 'US') || first
     end
 
+    def default?
+      id == Spree::Config[:default_country_id]
+    end
+
     def <=>(other)
       name <=> other.name
     end

data/app/models/spree/credit_card.rb

@@ -2,6 +2,12 @@ module Spree
   class CreditCard < Spree::Base
     include ActiveMerchant::Billing::CreditCardMethods
 
+    if !ENV['SPREE_DISABLE_DB_CONNECTION'] &&
+        connection.data_source_exists?(:spree_credit_cards) &&
+        connection.column_exists?(:spree_credit_cards, :deleted_at)
+      acts_as_paranoid
+    end
+
     belongs_to :payment_method
     belongs_to :user, class_name: Spree.user_class.to_s, foreign_key: 'user_id',
                       optional: true
@@ -75,7 +81,7 @@ module Spree
     def number=(num)
       @number = begin
                   num.gsub(/[^0-9]/, '')
-                rescue
+                rescue StandardError
                   nil
                 end
     end
@@ -89,7 +95,7 @@ module Spree
                        when 'dinersclub' then 'diners_club'
                        when '' then try_type_from_number
                        else type
-      end
+                       end
     end
 
     def set_last_digits

data/app/models/spree/customer_return.rb

@@ -34,6 +34,7 @@ module Spree
     # Temporarily tie a customer_return to one order
     def order
       return nil if return_items.blank?
+
       return_items.first.inventory_unit.order
     end
 

data/app/models/spree/fulfilment_changer.rb

@@ -0,0 +1,117 @@
+module Spree
+  class FulfilmentChanger
+    include ActiveModel::Validations
+
+    validates :quantity, numericality: { greater_than: 0 }
+    validates :desired_stock_location, presence: true
+    validate  :current_shipment_not_already_shipped
+    validate  :desired_shipment_different_from_current
+    validate  :enough_stock_at_desired_location, if: :handle_stock_counts?
+
+    def initialize(params = {})
+      @current_stock_location = params[:current_stock_location]
+      @desired_stock_location = params[:desired_stock_location]
+      @current_shipment       = params[:current_shipment]
+      @desired_shipment       = params[:desired_shipment]
+      @variant                = params[:variant]
+      @quantity               = params[:quantity]
+      @available_quantity     = [
+        desired_stock_location.try(:count_on_hand, variant).to_i,
+        current_quantity
+      ].max
+    end
+
+    def run!
+      return false if invalid?
+
+      desired_shipment.save! if desired_shipment.new_record?
+
+      handle_stock
+      reload_shipment_inventory_units
+      after_process_shipments
+
+      true
+    end
+
+    private
+
+    attr_reader :variant, :quantity, :current_stock_location, :desired_stock_location,
+      :current_shipment, :desired_shipment, :available_quantity
+
+    def handle_stock
+      ActiveRecord::Base.transaction do
+        if handle_stock_counts?
+          current_stock_location.restock(variant, current_on_hand_quantity, current_shipment)
+          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)
+      end
+    end
+
+    def after_process_shipments
+      if current_shipment.inventory_units.length.zero?
+        current_shipment.destroy!
+      else
+        current_shipment.refresh_rates
+      end
+
+      desired_shipment.refresh_rates
+
+      desired_shipment.order.reload
+      desired_shipment.order.update_with_updater!
+    end
+
+    def new_on_hand_quantity
+      [available_quantity, quantity].min
+    end
+
+    def unstock_quantity
+      desired_stock_location.backorderable?(variant) ? quantity : new_on_hand_quantity
+    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)
+    end
+
+    def reload_shipment_inventory_units
+      [current_shipment, desired_shipment].each { |shipment| shipment.inventory_units.reload }
+    end
+
+    def current_quantity
+      desired_stock_location == current_stock_location ? quantity : 0
+    end
+
+    def handle_stock_counts?
+      current_shipment.order.completed? && current_stock_location != desired_stock_location
+    end
+
+    def current_shipment_not_already_shipped
+      return unless current_shipment.shipped?
+
+      errors.add(:current_shipment, :has_already_been_shipped)
+    end
+
+    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)
+    end
+
+    def desired_shipment_different_from_current
+      return unless desired_shipment.id == current_shipment.id
+
+      errors.add(:desired_shipment, :can_not_transfer_within_same_shipment)
+    end
+  end
+end

data/app/models/spree/gateway.rb

@@ -49,6 +49,7 @@ module Spree
     def supports?(source)
       return true unless provider_class.respond_to? :supports?
       return false unless source.brand
+
       provider_class.supports?(source.brand)
     end