solidus_core 2.4.2 → 2.5.0.beta1

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

@@ -6,7 +6,7 @@ module Spree
           if @return_item.inventory_unit.order.completed?
             return true
           else
-            add_error(:order_not_completed, Spree.t('return_item_order_not_completed'))
+            add_error(:order_not_completed, I18n.t('spree.return_item_order_not_completed'))
             return false
           end
         end

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

@@ -6,7 +6,7 @@ module Spree
           if @return_item.return_authorization.present?
             return true
           else
-            add_error(:rma_required, Spree.t('return_item_rma_ineligible'))
+            add_error(:rma_required, I18n.t('spree.return_item_rma_ineligible'))
             return false
           end
         end

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

@@ -6,7 +6,7 @@ module Spree
           if (@return_item.inventory_unit.order.completed_at + Spree::Config[:return_eligibility_number_of_days].days) > Time.current
             return true
           else
-            add_error(:number_of_days, Spree.t('return_item_time_period_ineligible'))
+            add_error(:number_of_days, I18n.t('spree.return_item_time_period_ineligible'))
             return false
           end
         end

data/app/models/spree/shipment.rb

@@ -7,7 +7,7 @@ module Spree
 
     has_many :adjustments, as: :adjustable, inverse_of: :adjustable, dependent: :delete_all
     has_many :inventory_units, dependent: :destroy, inverse_of: :shipment
-    has_many :shipping_rates, -> { order(:cost) }, dependent: :destroy
+    has_many :shipping_rates, -> { order(:cost) }, dependent: :destroy, inverse_of: :shipment
     has_many :shipping_methods, through: :shipping_rates
     has_many :state_changes, as: :stateful
     has_many :cartons, -> { uniq }, through: :inventory_units
@@ -219,6 +219,14 @@ module Spree
       shipping_rates
     end
 
+    def select_shipping_method(shipping_method)
+      estimator = Spree::Config.stock.estimator_class.new
+      rates = estimator.shipping_rates(to_package, false)
+      rate = rates.detect { |r| r.shipping_method_id == shipping_method.id }
+      rate.selected = true
+      self.shipping_rates = [rate]
+    end
+
     def selected_shipping_rate
       shipping_rates.detect(&:selected?)
     end
@@ -232,14 +240,17 @@ module Spree
     end
 
     def selected_shipping_rate_id=(id)
-      selected_shipping_rate.update(selected: false) if selected_shipping_rate
+      return if selected_shipping_rate_id == id
       new_rate = shipping_rates.detect { |rate| rate.id == id.to_i }
       fail(
         ArgumentError,
         "Could not find shipping rate id #{id} for shipment #{number}"
       ) unless new_rate
-      new_rate.update(selected: true)
-      save!
+
+      transaction do
+        selected_shipping_rate.update!(selected: false) if selected_shipping_rate
+        new_rate.update!(selected: true)
+      end
     end
 
     # Determines the appropriate +state+ according to the following logic:
@@ -259,11 +270,10 @@ module Spree
       end
     end
 
-    def set_up_inventory(state, variant, order, line_item)
+    def set_up_inventory(state, variant, _order, line_item)
       inventory_units.create(
         state: state,
         variant_id: variant.id,
-        order_id: order.id,
         line_item_id: line_item.id
       )
     end

data/app/models/spree/shipping_method.rb

@@ -1,8 +1,15 @@
+require 'discard'
+
 module Spree
   # Represents a means of having a shipment delivered, such as FedEx or UPS.
   #
   class ShippingMethod < Spree::Base
     acts_as_paranoid
+    include Spree::ParanoiaDeprecations
+
+    include Discard::Model
+    self.discard_column = :deleted_at
+
     include Spree::CalculatedAdjustments
     DISPLAY = ActiveSupport::Deprecation::DeprecatedObjectProxy.new(
       [:both, :front_end, :back_end],

data/app/models/spree/shipping_rate.rb

@@ -9,6 +9,7 @@ module Spree
     has_many :taxes,
              class_name: "Spree::ShippingRateTax",
              foreign_key: "shipping_rate_id",
+             inverse_of: :shipping_rate,
              dependent: :destroy
 
     delegate :order, :currency, to: :shipment
@@ -26,21 +27,20 @@ module Spree
     def display_price
       price = display_amount.to_s
 
-      return price if taxes.empty? || amount == 0
+      return price if taxes.to_a.empty? || amount == 0
 
       tax_explanations = taxes.map(&:label).join(tax_label_separator)
 
-      Spree.t :display_price_with_explanations,
-               scope: 'shipping_rate.display_price',
-               price: price,
-               explanations: tax_explanations
+      I18n.t 'spree.shipping_rate.display_price.display_price_with_explanations',
+             price: price,
+             explanations: tax_explanations
     end
     alias_method :display_cost, :display_price
 
     private
 
     def tax_label_separator
-      Spree.t :tax_label_separator, scope: 'shipping_rate.display_price'
+      I18n.t 'spree.shipping_rate.display_price.tax_label_separator'
     end
   end
 end

data/app/models/spree/shipping_rate_tax.rb

@@ -14,8 +14,8 @@ module Spree
     delegate :currency, to: :shipping_rate, allow_nil: true
 
     def label
-      Spree.t translation_key,
-        scope: 'shipping_rate_tax.label',
+      I18n.t translation_key,
+        scope: 'spree.shipping_rate_tax.label',
         amount: display_absolute_amount,
         tax_rate_name: tax_rate.name
     end

data/app/models/spree/stock/availability_validator.rb

@@ -9,8 +9,8 @@ module Spree
           display_name = variant.name.to_s
           display_name += %{ (#{variant.options_text})} unless variant.options_text.blank?
 
-          line_item.errors[:quantity] << Spree.t(
-            :selected_quantity_not_available,
+          line_item.errors[:quantity] << I18n.t(
+            'spree.selected_quantity_not_available',
             item: display_name.inspect
           )
           false

data/app/models/spree/stock/estimator.rb

@@ -31,6 +31,8 @@ module Spree
       end
 
       def calculate_shipping_rates(package)
+        tax_calculator_class = Spree::Config.shipping_rate_tax_calculator_class
+        tax_calculator = tax_calculator_class.new(package.shipment.order)
         shipping_methods(package).map do |shipping_method|
           cost = shipping_method.calculator.compute(package)
           if cost
@@ -38,7 +40,13 @@ module Spree
               cost: cost,
               shipment: package.shipment
             )
-            Spree::Config.shipping_rate_taxer_class.new.tax(rate)
+            tax_calculator.calculate(rate).each do |tax|
+              rate.taxes.new(
+                amount: tax.amount,
+                tax_rate: tax.tax_rate
+              )
+            end
+            rate
           end
         end.compact
       end

data/app/models/spree/stock/inventory_unit_builder.rb

@@ -11,8 +11,7 @@ module Spree
             Spree::InventoryUnit.new(
               pending: true,
               variant: line_item.variant,
-              line_item: line_item,
-              order: @order
+              line_item: line_item
             )
           end
         end

data/app/models/spree/stock/inventory_validator.rb

@@ -3,8 +3,8 @@ module Spree
     class InventoryValidator < ActiveModel::Validator
       def validate(line_item)
         if line_item.inventory_units.count != line_item.quantity
-          line_item.errors[:inventory] << Spree.t(
-            :inventory_not_available,
+          line_item.errors[:inventory] << I18n.t(
+            'spree.inventory_not_available',
             item: line_item.variant.name
           )
         end

data/app/models/spree/stock/package.rb

@@ -44,7 +44,7 @@ module Spree
       def order
         # Fix regression that removed package.order.
         # Find it dynamically through an inventory_unit.
-        contents.detect { |item| !!item.try(:inventory_unit).try(:order) }.try(:inventory_unit).try(:order)
+        contents.detect { |item| !!item.try(:line_item).try(:order) }.try(:line_item).try(:order)
       end
 
       # @return [Float] the summed weight of the contents of this package

data/app/models/spree/stock/simple_coordinator.rb

@@ -10,7 +10,7 @@ module Spree
     #   * Combine allocated and on hand inventory into a single shipment per-location
     #
     # After allocation, splitters are run on each Package (as configured in
-    # Rails.application.config.spree.stock_splitters)
+    # Spree::Config.environment.stock_splitters)
     #
     # Finally, shipping rates are calculated using the class configured as
     # Spree::Config.stock.estimator_class.
@@ -20,7 +20,7 @@ module Spree
       def initialize(order, inventory_units = nil)
         @order = order
         @inventory_units = inventory_units || InventoryUnitBuilder.new(order).units
-        @splitters = Rails.application.config.spree.stock_splitters
+        @splitters = Spree::Config.environment.stock_splitters
         @stock_locations = Spree::StockLocation.active
 
         @inventory_units_by_variant = @inventory_units.group_by(&:variant)

data/app/models/spree/stock_item.rb

@@ -1,6 +1,12 @@
+require 'discard'
+
 module Spree
   class StockItem < Spree::Base
     acts_as_paranoid
+    include Spree::ParanoiaDeprecations
+
+    include Discard::Model
+    self.discard_column = :deleted_at
 
     belongs_to :stock_location, class_name: 'Spree::StockLocation', inverse_of: :stock_items
     belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant', inverse_of: :stock_items

data/app/models/spree/stock_location.rb

@@ -24,7 +24,7 @@ module Spree
     scope :active, -> { where(active: true) }
     scope :order_default, -> { order(default: :desc, name: :asc) }
 
-    after_create :create_stock_items, if: "self.propagate_all_variants?"
+    after_create :create_stock_items, if: :propagate_all_variants?
     after_save :ensure_one_default
 
     def state_text
@@ -93,7 +93,7 @@ module Spree
 
     def move(variant, quantity, originator = nil)
       if quantity < 1 && !stock_item(variant)
-        raise InvalidMovementError.new(Spree.t(:negative_movement_absent_item))
+        raise InvalidMovementError.new(I18n.t('spree.negative_movement_absent_item'))
       end
       stock_item_or_create(variant).stock_movements.create!(quantity: quantity,
                                                             originator: originator)

data/app/models/spree/store_credit.rb

@@ -1,5 +1,11 @@
+require 'discard'
+
 class Spree::StoreCredit < Spree::PaymentSource
   acts_as_paranoid
+  include Spree::ParanoiaDeprecations
+
+  include Discard::Model
+  self.discard_column = :deleted_at
 
   VOID_ACTION       = 'void'
   CREDIT_ACTION     = 'credit'
@@ -33,6 +39,7 @@ class Spree::StoreCredit < Spree::PaymentSource
   before_validation :associate_credit_type
   before_validation :validate_category_unchanged, on: :update
   before_destroy :validate_no_amount_used
+  validate :validate_no_amount_used, if: :discarded?
 
   attr_accessor :action, :action_amount, :action_originator, :action_authorization_code, :update_reason
 
@@ -72,9 +79,9 @@ class Spree::StoreCredit < Spree::PaymentSource
 
   def validate_authorization(amount, order_currency)
     if amount_remaining.to_d < amount.to_d
-      errors.add(:base, Spree.t('store_credit.insufficient_funds'))
+      errors.add(:base, I18n.t('spree.store_credit.insufficient_funds'))
     elsif currency != order_currency
-      errors.add(:base, Spree.t('store_credit.currency_mismatch'))
+      errors.add(:base, I18n.t('spree.store_credit.currency_mismatch'))
     end
     errors.blank?
   end
@@ -85,7 +92,7 @@ class Spree::StoreCredit < Spree::PaymentSource
 
     if amount <= auth_event.amount
       if currency != order_currency
-        errors.add(:base, Spree.t('store_credit.currency_mismatch'))
+        errors.add(:base, I18n.t('spree.store_credit.currency_mismatch'))
         false
       else
         update_attributes!({
@@ -100,7 +107,7 @@ class Spree::StoreCredit < Spree::PaymentSource
         authorization_code
       end
     else
-      errors.add(:base, Spree.t('store_credit.insufficient_authorized_amount'))
+      errors.add(:base, I18n.t('spree.store_credit.insufficient_authorized_amount'))
       false
     end
   end
@@ -117,7 +124,7 @@ class Spree::StoreCredit < Spree::PaymentSource
       })
       true
     else
-      errors.add(:base, Spree.t('store_credit.unable_to_void', auth_code: authorization_code))
+      errors.add(:base, I18n.t('spree.store_credit.unable_to_void', auth_code: authorization_code))
       false
     end
   end
@@ -127,7 +134,7 @@ class Spree::StoreCredit < Spree::PaymentSource
     capture_event = store_credit_events.find_by(action: CAPTURE_ACTION, authorization_code: authorization_code)
 
     if currency != order_currency # sanity check to make sure the order currency hasn't changed since the auth
-      errors.add(:base, Spree.t('store_credit.currency_mismatch'))
+      errors.add(:base, I18n.t('spree.store_credit.currency_mismatch'))
       false
     elsif capture_event && amount <= capture_event.amount
       action_attributes = {
@@ -139,7 +146,7 @@ class Spree::StoreCredit < Spree::PaymentSource
       create_credit_record(amount, action_attributes)
       true
     else
-      errors.add(:base, Spree.t('store_credit.unable_to_credit', auth_code: authorization_code))
+      errors.add(:base, I18n.t('spree.store_credit.unable_to_credit', auth_code: authorization_code))
       false
     end
   end
@@ -182,7 +189,7 @@ class Spree::StoreCredit < Spree::PaymentSource
       self.invalidated_at = Time.current
       save
     else
-      errors.add(:invalidated_at, Spree.t("store_credit.errors.cannot_invalidate_uncaptured_authorization"))
+      errors.add(:invalidated_at, I18n.t('spree.store_credit.errors.cannot_invalidate_uncaptured_authorization'))
       return false
     end
   end
@@ -222,7 +229,7 @@ class Spree::StoreCredit < Spree::PaymentSource
   end
 
   def credit_allocation_memo
-    Spree.t("store_credit.credit_allocation_memo", id: id)
+    I18n.t("spree.store_credit.credit_allocation_memo", id: id)
   end
 
   def store_event
@@ -247,19 +254,19 @@ class Spree::StoreCredit < Spree::PaymentSource
     return true if amount_used.nil?
 
     if amount_used > amount
-      errors.add(:amount_used, Spree.t('admin.store_credits.errors.amount_used_cannot_be_greater'))
+      errors.add(:amount_used, I18n.t('spree.admin.store_credits.errors.amount_used_cannot_be_greater'))
     end
   end
 
   def amount_authorized_less_than_or_equal_to_amount
     if (amount_used + amount_authorized) > amount
-      errors.add(:amount_authorized, Spree.t('admin.store_credits.errors.amount_authorized_exceeds_total_credit'))
+      errors.add(:amount_authorized, I18n.t('spree.admin.store_credits.errors.amount_authorized_exceeds_total_credit'))
     end
   end
 
   def validate_category_unchanged
     if category_id_changed?
-      errors.add(:category, Spree.t('admin.store_credits.errors.cannot_be_modified'))
+      errors.add(:category, I18n.t('spree.admin.store_credits.errors.cannot_be_modified'))
     end
   end
 

data/app/models/spree/store_credit_category.rb

@@ -3,7 +3,7 @@ class Spree::StoreCreditCategory < Spree::Base
   self.non_expiring_credit_types = [Spree::StoreCreditType::NON_EXPIRING]
 
   class_attribute :reimbursement_category_name
-  self.reimbursement_category_name = Spree.t("store_credit_category.default")
+  self.reimbursement_category_name = I18n.t('spree.store_credit_category.default')
 
   def self.reimbursement_category(_reimbursement)
     Spree::StoreCreditCategory.find_by(name: reimbursement_category_name) ||

data/app/models/spree/store_credit_event.rb

@@ -1,6 +1,12 @@
+require 'discard'
+
 module Spree
   class StoreCreditEvent < Spree::Base
     acts_as_paranoid
+    include Spree::ParanoiaDeprecations
+
+    include Discard::Model
+    self.discard_column = :deleted_at
 
     belongs_to :store_credit
     belongs_to :originator, polymorphic: true
@@ -44,7 +50,7 @@ module Spree
 
     def display_action
       return if NON_EXPOSED_ACTIONS.include?(action)
-      Spree.t("store_credit.display_action.#{action}")
+      I18n.t("spree.store_credit.display_action.#{action}")
     end
 
     def order

data/app/models/spree/tax/shipping_rate_taxer.rb

@@ -8,7 +8,7 @@ module Spree
       #   This parameter will be modified.
       # @return [Spree::ShippingRate] The shipping rate with associated tax objects
       def tax(shipping_rate)
-        taxes = Spree::Config.shipping_rate_tax_calculator_class.new(shipping_rate).calculate
+        taxes = Spree::Config.shipping_rate_tax_calculator_class.new(shipping_rate.order).calculate(shipping_rate)
         taxes.each do |tax|
           shipping_rate.taxes.build(
             amount: tax.amount,

data/app/models/spree/tax_calculator/shipping_rate.rb

@@ -21,15 +21,24 @@ module Spree
       # @param [Spree::ShippingRate] shipping_rate the shipping rate to
       #   calculate taxes on
       # @return [Spree::TaxCalculator::ShippingRate]
-      def initialize(shipping_rate)
-        @shipping_rate = shipping_rate
+      def initialize(order)
+        if order.is_a?(::Spree::ShippingRate)
+          Spree::Deprecation.warn "passing a single shipping rate to Spree::TaxCalculator::ShippingRate is DEPRECATED. It now expects an order"
+          shipping_rate = order
+          @order = shipping_rate.order
+          @shipping_rate = shipping_rate
+        else
+          @order = order
+          @shipping_rate = nil
+        end
       end
 
       # Calculate taxes for a shipping rate.
       #
       # @return [Array<Spree::Tax::ItemTax>] the calculated taxes for the
       #   shipping rate
-      def calculate
+      def calculate(shipping_rate)
+        shipping_rate ||= @shipping_rate
         rates_for_item(shipping_rate).map do |rate|
           amount = rate.compute_amount(shipping_rate)