solidus_core 2.4.2 → 2.5.0.beta1

data/app/models/spree/customer_return.rb

@@ -65,7 +65,7 @@ module Spree
 
     def return_items_belong_to_same_order
       if return_items.select{ |return_item| return_item.inventory_unit.order_id != order_id }.any?
-        errors.add(:base, Spree.t(:return_items_cannot_be_associated_with_multiple_orders))
+        errors.add(:base, I18n.t('spree.return_items_cannot_be_associated_with_multiple_orders'))
       end
     end
 

data/app/models/spree/inventory_unit.rb

@@ -7,7 +7,6 @@ module Spree
     CANCELABLE_STATES = ['on_hand', 'backordered', 'shipped']
 
     belongs_to :variant, -> { with_deleted }, class_name: "Spree::Variant", inverse_of: :inventory_units
-    belongs_to :order, class_name: "Spree::Order", inverse_of: :inventory_units
     belongs_to :shipment, class_name: "Spree::Shipment", touch: true, inverse_of: :inventory_units
     belongs_to :return_authorization, class_name: "Spree::ReturnAuthorization", inverse_of: :inventory_units
     belongs_to :carton, class_name: "Spree::Carton", inverse_of: :inventory_units
@@ -16,8 +15,15 @@ module Spree
     has_many :return_items, inverse_of: :inventory_unit, dependent: :destroy
     has_one :original_return_item, class_name: "Spree::ReturnItem", foreign_key: :exchange_inventory_unit_id, dependent: :destroy
     has_one :unit_cancel, class_name: "Spree::UnitCancel"
+    has_one :order, through: :shipment
 
-    validates_presence_of :order, :shipment, :line_item, :variant
+    delegate :order_id, to: :shipment
+
+    def order=(_)
+      raise "The order association has been removed from InventoryUnit. The order is now determined from the shipment."
+    end
+
+    validates_presence_of :shipment, :line_item, :variant
 
     before_destroy :ensure_can_destroy
 

data/app/models/spree/log_entry.rb

@@ -2,17 +2,6 @@ module Spree
   class LogEntry < Spree::Base
     belongs_to :source, polymorphic: true
 
-    # Fix for https://github.com/spree/spree/issues/1767
-    # If a payment fails, we want to make sure we keep the record of it failing
-    after_rollback :save_anyway
-
-    def save_anyway
-      log = Spree::LogEntry.new
-      log.source  = source
-      log.details = details
-      log.save!
-    end
-
     def parsed_details
       @details ||= YAML.load(details)
     end

data/app/models/spree/order.rb

@@ -73,13 +73,14 @@ module Spree
     has_many :products, through: :variants
 
     # Shipping
-    has_many :inventory_units, inverse_of: :order
-    has_many :cartons, -> { distinct }, through: :inventory_units
     has_many :shipments, dependent: :destroy, inverse_of: :order do
       def states
         pluck(:state).uniq
       end
     end
+    has_many :inventory_units, through: :shipments
+    has_many :cartons, -> { distinct }, through: :inventory_units
+
     has_many :order_stock_locations, class_name: "Spree::OrderStockLocation"
     has_many :stock_locations, through: :order_stock_locations
 
@@ -131,7 +132,13 @@ module Spree
     validates :number, presence: true, uniqueness: { allow_blank: true }
     validates :store_id, presence: true
 
-    make_permalink field: :number
+    def self.find_by_param(value)
+      find_by number: value
+    end
+
+    def self.find_by_param!(value)
+      find_by! number: value
+    end
 
     delegate :update_totals, :persist_totals, to: :updater
     delegate :firstname, :lastname, to: :bill_address, prefix: true, allow_nil: true
@@ -150,7 +157,7 @@ module Spree
     scope :by_store, ->(store) { where(store_id: store.id) }
 
     # shows completed orders first, by their completed_at date, then uncompleted orders by their created_at
-    scope :reverse_chronological, -> { order('spree_orders.completed_at IS NULL', completed_at: :desc, created_at: :desc) }
+    scope :reverse_chronological, -> { order(Arel.sql('spree_orders.completed_at IS NULL'), completed_at: :desc, created_at: :desc) }
 
     def self.by_customer(customer)
       joins(:user).where("#{Spree.user_class.table_name}.email" => customer)
@@ -168,6 +175,14 @@ module Spree
       where(completed_at: nil)
     end
 
+    def self.canceled
+      where(state: 'canceled')
+    end
+
+    def self.not_canceled
+      where.not(state: 'canceled')
+    end
+
     # Use this method in other gems that wish to register their own custom logic
     # that should be called after Order#update
     def self.register_update_hook(hook)
@@ -460,8 +475,8 @@ module Spree
     # Check to see if any line item variants are soft, deleted.
     # If so add error and restart checkout.
     def ensure_line_item_variants_are_not_deleted
-      if line_items.any? { |li| li.variant.paranoia_destroyed? }
-        errors.add(:base, Spree.t(:deleted_variants_present))
+      if line_items.any? { |li| li.variant.discarded? }
+        errors.add(:base, I18n.t('spree.deleted_variants_present'))
         restart_checkout_flow
         false
       else
@@ -520,15 +535,15 @@ module Spree
 
     def ensure_shipping_address
       unless ship_address && ship_address.valid?
-        errors.add(:base, Spree.t(:ship_address_required)) && (return false)
+        errors.add(:base, I18n.t('spree.ship_address_required')) && (return false)
       end
     end
 
     def create_proposed_shipments
       if completed?
-        raise CannotRebuildShipments.new(Spree.t(:cannot_rebuild_shipments_order_completed))
+        raise CannotRebuildShipments.new(I18n.t('spree.cannot_rebuild_shipments_order_completed'))
       elsif shipments.any? { |s| !s.pending? }
-        raise CannotRebuildShipments.new(Spree.t(:cannot_rebuild_shipments_shipments_not_pending))
+        raise CannotRebuildShipments.new(I18n.t('spree.cannot_rebuild_shipments_shipments_not_pending'))
       else
         shipments.destroy_all
         self.shipments = Spree::Config.stock.coordinator_class.new(self).shipments
@@ -660,7 +675,7 @@ module Spree
       payments.reset
 
       if payments.where(state: %w(checkout pending completed)).sum(:amount) != total
-        errors.add(:base, Spree.t("store_credit.errors.unable_to_fund")) && (return false)
+        errors.add(:base, I18n.t('spree.store_credit.errors.unable_to_fund')) && (return false)
       end
     end
 
@@ -782,7 +797,7 @@ module Spree
       return if !payment_required?
 
       if payments.valid.empty?
-        errors.add(:base, Spree.t(:no_payment_found))
+        errors.add(:base, I18n.t('spree.no_payment_found'))
         return false
       end
 
@@ -806,12 +821,12 @@ module Spree
     #   }
     #
     def update_params_payment_source
+      Spree::Deprecation.warn('update_params_payment_source is deprecated. Please use set_payment_parameters_amount instead.', caller)
       if @updating_params[:order] && (@updating_params[:order][:payments_attributes] || @updating_params[:order][:existing_card])
         @updating_params[:order][:payments_attributes] ||= [{}]
         @updating_params[:order][:payments_attributes].first[:amount] = total
       end
     end
-    deprecate update_params_payment_source: :set_payment_parameters_amount, deprecator: Spree::Deprecation
 
     def associate_store
       self.store ||= Spree::Store.default
@@ -842,7 +857,7 @@ module Spree
       if adjustment_changed
         restart_checkout_flow
         recalculate
-        errors.add(:base, Spree.t(:promotion_total_changed_before_complete))
+        errors.add(:base, I18n.t('spree.promotion_total_changed_before_complete'))
       end
       errors.empty?
     end
@@ -854,7 +869,7 @@ module Spree
 
     def ensure_line_items_present
       unless line_items.present?
-        errors.add(:base, Spree.t(:there_are_no_items_for_this_order)) && (return false)
+        errors.add(:base, I18n.t('spree.there_are_no_items_for_this_order')) && (return false)
       end
     end
 
@@ -863,13 +878,13 @@ module Spree
         # After this point, order redirects back to 'address' state and asks user to pick a proper address
         # Therefore, shipments are not necessary at this point.
         shipments.destroy_all
-        errors.add(:base, Spree.t(:items_cannot_be_shipped)) && (return false)
+        errors.add(:base, I18n.t('spree.items_cannot_be_shipped')) && (return false)
       end
     end
 
     def after_cancel
       shipments.each(&:cancel!)
-      payments.completed.each(&:cancel!)
+      payments.completed.each { |payment| payment.cancel! unless payment.fully_refunded? }
       payments.store_credits.pending.each(&:void_transaction!)
 
       send_cancel_email

data/app/models/spree/order_contents.rb

@@ -15,8 +15,6 @@ module Spree
     # @param [Hash] :options Options for the adding proccess
     #   Valid options:
     #     shipment: [Spree::Shipment] LineItem target shipment
-    #     stock_location_quantities:
-    #       stock_location_id: The stock location to source from
     #
     # @return [Spree::LineItem]
     def add(variant, quantity = 1, options = {})
@@ -98,10 +96,6 @@ module Spree
       line_item.quantity += quantity.to_i
       line_item.options = ActionController::Parameters.new(options).permit(PermittedAttributes.line_item_attributes).to_h
 
-      if line_item.new_record?
-        create_order_stock_locations(line_item, options[:stock_location_quantities])
-      end
-
       line_item.target_shipment = options[:shipment]
       line_item.save!
       line_item
@@ -130,13 +124,5 @@ module Spree
 
       line_item
     end
-
-    def create_order_stock_locations(line_item, stock_location_quantities)
-      return unless stock_location_quantities.present?
-      order = line_item.order
-      stock_location_quantities.each do |stock_location_id, quantity|
-        order.order_stock_locations.create!(stock_location_id: stock_location_id, quantity: quantity, variant_id: line_item.variant_id) unless quantity.to_i.zero?
-      end
-    end
   end
 end

data/app/models/spree/order_shipping.rb

@@ -72,7 +72,6 @@ class Spree::OrderShipping
     end
 
     send_shipment_emails(carton) if stock_location.fulfillable? && !suppress_mailer # e.g. digital gift cards that aren't actually shipped
-    fulfill_order_stock_locations(stock_location)
     @order.recalculate
 
     carton
@@ -80,10 +79,6 @@ class Spree::OrderShipping
 
   private
 
-  def fulfill_order_stock_locations(stock_location)
-    Spree::OrderStockLocation.fulfill_for_order_with_stock_location(@order, stock_location)
-  end
-
   def send_shipment_emails(carton)
     carton.orders.each do |order|
       Spree::Config.carton_shipped_email_class.shipped_email(order: order, carton: carton).deliver_later

data/app/models/spree/order_updater.rb

@@ -200,10 +200,6 @@ module Spree
       end
     end
 
-    def round_money(n)
-      (n * 100).round / 100.0
-    end
-
     def update_item_promotions
       [*line_items, *shipments].each do |item|
         promotion_adjustments = item.adjustments.select(&:promotion?)

data/app/models/spree/payment.rb

@@ -147,6 +147,11 @@ module Spree
       credit_allowed > 0
     end
 
+    # @return [Boolean] true when this payment has been fully refunded
+    def fully_refunded?
+      refunds.map(&:amount).sum == amount
+    end
+
     # @return [Array<String>] the actions available on this payment
     def actions
       sa = source_actions
@@ -200,7 +205,7 @@ module Spree
       if source && !source.valid?
         source.errors.each do |field, error|
           field_name = I18n.t("activerecord.attributes.#{source.class.to_s.underscore}.#{field}")
-          errors.add(Spree.t(source.class.to_s.demodulize.underscore), "#{field_name} #{error}")
+          errors.add(I18n.t(source.class.to_s.demodulize.underscore, scope: 'spree'), "#{field_name} #{error}")
         end
       end
       if errors.any?

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

@@ -143,11 +143,11 @@ module Spree
               yield
             else
               invalidate!
-              raise Core::GatewayError.new(Spree.t(:payment_method_not_supported))
+              raise Core::GatewayError.new(I18n.t('spree.payment_method_not_supported'))
             end
           end
         else
-          raise Core::GatewayError.new(Spree.t(:payment_processing_failed))
+          raise Core::GatewayError.new(I18n.t('spree.payment_processing_failed'))
         end
       end
 
@@ -205,11 +205,11 @@ module Spree
         if error.is_a? ActiveMerchant::Billing::Response
           text = error.params['message'] || error.params['response_reason_text'] || error.message
         elsif error.is_a? ActiveMerchant::ConnectionError
-          text = Spree.t(:unable_to_connect_to_gateway)
+          text = I18n.t('spree.unable_to_connect_to_gateway')
         else
           text = error.to_s
         end
-        logger.error(Spree.t(:gateway_error))
+        logger.error(I18n.t('spree.gateway_error'))
         logger.error("  #{error.to_yaml}")
         raise Core::GatewayError.new(text)
       end

data/app/models/spree/payment_method.rb

@@ -1,3 +1,4 @@
+require 'discard'
 require 'spree/preferences/statically_configurable'
 
 module Spree
@@ -16,6 +17,11 @@ module Spree
     preference :test_mode, :boolean, default: true
 
     acts_as_paranoid
+    include Spree::ParanoiaDeprecations
+
+    include Discard::Model
+    self.discard_column = :deleted_at
+
     acts_as_list
     DISPLAY = [:both, :front_end, :back_end]
 
@@ -58,7 +64,7 @@ module Spree
       def providers
         Spree::Deprecation.warn 'Spree::PaymentMethod.providers is deprecated and will be deleted in Solidus 3.0. ' \
           'Please use Rails.application.config.spree.payment_methods instead'
-        Rails.application.config.spree.payment_methods
+        Spree::Config.environment.payment_methods
       end
 
       def available(display_on = nil, store: nil)
@@ -184,7 +190,7 @@ module Spree
     # If method_type has been overridden, call it and return the value, otherwise return nil
     def deprecated_method_type_override
       if method(:method_type).owner != Spree::PaymentMethod
-        Spree::Deprecation.warn "overriding PaymentMethod#method_type is deprecated and will be removed from Solidus 3.0 (override partial_name instead)", caller
+        Spree::Deprecation.warn "#{method(:method_type).owner} is overriding PaymentMethod#method_type. This is deprecated and will be removed from Solidus 3.0 (override partial_name instead).", caller[1..-1]
         method_type
       end
     end
@@ -258,6 +264,5 @@ module Spree
         raise ::NotImplementedError, "You must implement gateway_class method for #{self.class}."
       end
     end
-    deprecate provider_class: :gateway_class, deprecator: Spree::Deprecation
   end
 end

data/app/models/spree/payment_method/credit_card.rb

@@ -8,7 +8,7 @@ module Spree
   #
   class PaymentMethod::CreditCard < PaymentMethod
     def payment_source_class
-      CreditCard
+      Spree::CreditCard
     end
 
     def partial_name

data/app/models/spree/payment_method/store_credit.rb

@@ -6,7 +6,7 @@ module Spree
 
     def authorize(amount_in_cents, provided_store_credit, gateway_options = {})
       if provided_store_credit.nil?
-        ActiveMerchant::Billing::Response.new(false, Spree.t('store_credit.unable_to_find'), {}, {})
+        ActiveMerchant::Billing::Response.new(false, I18n.t('spree.store_credit.unable_to_find'), {}, {})
       else
         action = ->(store_credit) {
           store_credit.authorize(
@@ -40,7 +40,7 @@ module Spree
       end
 
       if event.blank?
-        ActiveMerchant::Billing::Response.new(false, Spree.t('store_credit.unable_to_find'), {}, {})
+        ActiveMerchant::Billing::Response.new(false, I18n.t('spree.store_credit.unable_to_find'), {}, {})
       else
         capture(amount_in_cents, event.authorization_code, gateway_options)
       end
@@ -92,7 +92,7 @@ module Spree
         if response = action.call(store_credit)
           # note that we only need to return the auth code on an 'auth', but it's innocuous to always return
           ActiveMerchant::Billing::Response.new(true,
-                                                Spree.t('store_credit.successful_action', action: action_name),
+                                                I18n.t('spree.store_credit.successful_action', action: action_name),
                                                 {}, { authorization: auth_code || response })
         else
           ActiveMerchant::Billing::Response.new(false, store_credit.errors.full_messages.join, {}, {})
@@ -105,7 +105,7 @@ module Spree
       store_credit = Spree::StoreCreditEvent.find_by(authorization_code: auth_code).try(:store_credit)
 
       if store_credit.nil?
-        ActiveMerchant::Billing::Response.new(false, Spree.t('store_credit.unable_to_find_for_action', auth_code: auth_code, action: action_name), {}, {})
+        ActiveMerchant::Billing::Response.new(false, I18n.t('spree.store_credit.unable_to_find_for_action', auth_code: auth_code, action: action_name), {}, {})
       else
         handle_action_call(store_credit, action, action_name, auth_code)
       end

data/app/models/spree/price.rb

@@ -1,6 +1,12 @@
+require 'discard'
+
 module Spree
   class Price < Spree::Base
     acts_as_paranoid
+    include Spree::ParanoiaDeprecations
+
+    include Discard::Model
+    self.discard_column = :deleted_at
 
     MAXIMUM_AMOUNT = BigDecimal('99_999_999.99')
 
@@ -18,7 +24,7 @@ module Spree
     validates :currency, inclusion: { in: ::Money::Currency.all.map(&:iso_code), message: :invalid_code }
     validates :country, presence: true, unless: -> { for_any_country? }
 
-    scope :currently_valid, -> { order("country_iso IS NULL, updated_at DESC, id DESC") }
+    scope :currently_valid, -> { order(Arel.sql("country_iso IS NULL, updated_at DESC, id DESC")) }
     scope :for_master, -> { joins(:variant).where(spree_variants: { is_master: true }) }
     scope :for_variant, -> { joins(:variant).where(spree_variants: { is_master: false }) }
     scope :for_any_country, -> { where(country: nil) }

data/app/models/spree/product.rb

@@ -1,3 +1,5 @@
+require 'discard'
+
 module Spree
   # Products represent an entity for sale in a store. Products can have
   # variations, called variants. Product properties include description,
@@ -12,6 +14,18 @@ module Spree
     friendly_id :slug_candidates, use: :history
 
     acts_as_paranoid
+    include Spree::ParanoiaDeprecations
+
+    include Discard::Model
+    self.discard_column = :deleted_at
+
+    after_discard do
+      variants_including_master.discard_all
+      self.product_option_types = []
+      self.product_properties = []
+      self.classifications = []
+      self.product_promotion_rules = []
+    end
 
     has_many :product_option_types, dependent: :destroy, inverse_of: :product
     has_many :option_types, through: :product_option_types
@@ -60,23 +74,37 @@ module Spree
     end
 
     MASTER_ATTRIBUTES = [
-      :rebuild_vat_prices, :sku, :price, :currency, :display_amount, :display_price, :weight,
-      :height, :width, :depth, :cost_currency, :price_in, :price_for, :amount_in, :cost_price
+      :cost_currency,
+      :cost_price,
+      :depth,
+      :height,
+      :price,
+      :sku,
+      :weight,
+      :width,
     ]
     MASTER_ATTRIBUTES.each do |attr|
       delegate :"#{attr}", :"#{attr}=", to: :find_or_build_master
     end
 
-    delegate :display_amount, :display_price, :has_default_price?, to: :find_or_build_master
+    delegate :amount_in,
+             :display_amount,
+             :display_price,
+             :has_default_price?,
+             :images,
+             :price_for,
+             :price_in,
+             :rebuild_vat_prices=,
+             to: :find_or_build_master
 
-    delegate :images, to: :master, prefix: true
-    alias_method :images, :master_images
+    alias_method :master_images, :images
 
     has_many :variant_images, -> { order(:position) }, source: :images, through: :variants_including_master
 
     after_create :build_variants_from_option_values_hash, if: :option_values_hash
 
     after_destroy :punch_slug
+    after_discard :punch_slug
 
     after_initialize :ensure_master
 
@@ -340,7 +368,7 @@ module Spree
       run_callbacks(:touch)
     end
 
-    # Iterate through this products taxons and taxonomies and touch their timestamps in a batch
+    # Iterate through this product's taxons and taxonomies and touch their timestamps in a batch
     def touch_taxons
       taxons_to_touch = taxons.map(&:self_and_ancestors).flatten.uniq
       unless taxons_to_touch.empty?