solidus_core 1.2.3 → 1.3.0.beta1

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

@@ -10,15 +10,18 @@ module Spree
       end
 
       def shipments
-        packages.map do |package|
-          package.to_shipment.tap { |s| s.address = order.ship_address }
-        end
+        packages.map(&:shipment)
       end
 
+      private
+
       def packages
         packages = build_location_configured_packages
         packages = build_packages(packages)
         packages = prioritize_packages(packages)
+        packages.each do |package|
+          package.shipment = package.to_shipment
+        end
         packages = estimate_packages(packages)
         validate_packages(packages)
         packages
@@ -35,7 +38,7 @@ module Spree
       # through the rest of the packing / prioritization, lets just put them
       # in packages we know they should be in and deal with other automatically-
       # handled inventory units otherwise.
-      def build_location_configured_packages(packages = Array.new)
+      def build_location_configured_packages(packages = [])
         order.order_stock_locations.where(shipment_fulfilled: false).group_by(&:stock_location).each do |stock_location, stock_location_configurations|
           units = stock_location_configurations.flat_map do |stock_location_configuration|
             unallocated_inventory_units.select { |iu| iu.variant == stock_location_configuration.variant }.take(stock_location_configuration.quantity)
@@ -56,7 +59,7 @@ module Spree
       # for the given order
       #
       # Returns an array of Package instances
-      def build_packages(packages = Array.new)
+      def build_packages(packages = [])
         stock_location_variant_ids.each do |stock_location, variant_ids|
           units_for_location = unallocated_inventory_units.select { |unit| variant_ids.include?(unit.variant_id) }
           packer = build_packer(stock_location, units_for_location)
@@ -65,8 +68,6 @@ module Spree
         packages
       end
 
-      private
-
       # This finds the variants we're looking for in each active stock location.
       # It returns a hash like:
       #   {
@@ -99,13 +100,11 @@ module Spree
         # build the final lookup hash of
         #   {<stock location> => <set of variant ids>, ...}
         # using the previous results
-        hash = location_variant_ids.each_with_object({}) do |(location_id, variant_id), hash|
+        location_variant_ids.each_with_object({}) do |(location_id, variant_id), hash|
           location = location_lookup[location_id]
           hash[location] ||= Set.new
           hash[location] << variant_id
         end
-
-        hash
       end
 
       def unallocated_inventory_units
@@ -122,9 +121,9 @@ module Spree
       end
 
       def estimate_packages(packages)
-        estimator = Spree::Config.stock.estimator_class.new(order)
+        estimator = Spree::Config.stock.estimator_class.new
         packages.each do |package|
-          package.shipping_rates = estimator.shipping_rates(package)
+          package.shipment.shipping_rates = estimator.shipping_rates(package)
         end
         packages
       end
@@ -142,7 +141,7 @@ module Spree
         Packer.new(stock_location, inventory_units, splitters(stock_location))
       end
 
-      def splitters(stock_location)
+      def splitters(_stock_location)
         # extension point to return custom splitters for a location
         Rails.application.config.spree.stock_splitters
       end

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

@@ -16,6 +16,7 @@ module Spree
       end
 
       private
+
       def build_missing
         @missing = Hash.new(0)
         required.keys.each do |variant|

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

@@ -1,13 +1,8 @@
 module Spree
   module Stock
     class Estimator
-      attr_reader :order, :currency
-
-      # @param order [Spree::Order] the order whose shipping rates to estimate
-      def initialize(order)
-        @order = order
-        @currency = order.currency
-      end
+      class ShipmentRequired < StandardError; end
+      class OrderRequired < StandardError; end
 
       # Estimate the shipping rates for a package.
       #
@@ -17,6 +12,9 @@ module Spree
       # @return [Array<Spree::ShippingRate>] the shipping rates sorted by
       #   descending cost, with the least costly marked "selected"
       def shipping_rates(package, frontend_only = true)
+        raise ShipmentRequired if package.shipment.nil?
+        raise OrderRequired if package.shipment.order.nil?
+
         rates = calculate_shipping_rates(package)
         rates.select! { |rate| rate.shipping_method.frontend? } if frontend_only
         choose_default_shipping_rate(rates)
@@ -24,6 +22,7 @@ module Spree
       end
 
       private
+
       def choose_default_shipping_rate(shipping_rates)
         unless shipping_rates.empty?
           default_shipping_rate = Spree::Config.shipping_rate_selector_class.new(shipping_rates).find_default
@@ -34,32 +33,26 @@ module Spree
       def calculate_shipping_rates(package)
         shipping_methods(package).map do |shipping_method|
           cost = shipping_method.calculator.compute(package)
-          tax_category = shipping_method.tax_category
-          if tax_category
-            tax_rate = tax_category.tax_rates.detect do |rate|
-              # If the rate's zone matches the order's zone, a positive adjustment will be applied.
-              # If the rate is from the default tax zone, then a negative adjustment will be applied.
-              # See the tests in shipping_rate_spec.rb for an example of this.d
-              rate.zone == order.tax_zone || rate.zone.default_tax?
-            end
-          end
-
           if cost
-            rate = shipping_method.shipping_rates.new(cost: cost)
-            rate.tax_rate = tax_rate if tax_rate
+            rate = shipping_method.shipping_rates.new(
+              cost: cost,
+              shipment: package.shipment
+            )
+            Spree::Config.shipping_rate_taxer_class.new.tax(rate)
           end
-
-          rate
         end.compact
       end
 
       def shipping_methods(package)
-        package.shipping_methods.select do |ship_method|
+        package.shipping_methods
+          .available_for_address(package.shipment.address)
+          .includes(:calculator, tax_category: :tax_rates)
+          .to_a
+          .select do |ship_method|
           calculator = ship_method.calculator
-          ship_method.include?(order.ship_address) &&
           calculator.available?(package) &&
-          (calculator.preferences[:currency].blank? ||
-           calculator.preferences[:currency] == currency)
+            (calculator.preferences[:currency].blank? ||
+             calculator.preferences[:currency] == package.shipment.order.currency)
         end
       end
     end

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

@@ -7,7 +7,7 @@ module Spree
 
       def units
         @order.line_items.flat_map do |line_item|
-          line_item.quantity.times.map do |i|
+          Array.new(line_item.quantity) do |_i|
             @order.inventory_units.build(
               pending: true,
               variant: line_item.variant,

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

@@ -2,14 +2,13 @@ module Spree
   module Stock
     class Package
       attr_reader :stock_location, :contents
-      attr_accessor :shipping_rates
+      attr_accessor :shipment
 
       # @param stock_location [Spree::StockLocation] the stock location this package originates from
       # @param contents [Array<Spree::Stock::ContentItem>] the contents of this package
-      def initialize(stock_location, contents=[])
+      def initialize(stock_location, contents = [])
         @stock_location = stock_location
         @contents = contents
-        @shipping_rates = Array.new
       end
 
       # Adds an inventory unit to this package.
@@ -45,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(:inventory_unit).try(:order) }.try(:inventory_unit).try(:order)
       end
 
       # @return [Float] the summed weight of the contents of this package
@@ -102,13 +101,15 @@ module Spree
       # @return [Array<Spree::ShippingCategory>] the shipping categories of the
       #   variants in this package
       def shipping_categories
-        contents.map { |item| item.variant.shipping_category }.compact.uniq
+        ShippingCategory.where(id: shipping_category_ids)
       end
 
-      # @return [Array<Spree::ShippingMethod>] the shipping methods available
-      #   for this pacakges shipping categories
+      # @return [ActiveRecord::Relation] the [Spree::ShippingMethod]s available
+      #   for this pacakge based on the stock location and shipping categories.
       def shipping_methods
-        shipping_categories.map(&:shipping_methods).reduce(:&).to_a
+        Spree::ShippingMethod.
+          with_all_shipping_category_ids(shipping_category_ids).
+          available_in_stock_location(stock_location)
       end
 
       # @return [Spree::Shipment] a new shipment containing this package's
@@ -121,11 +122,20 @@ module Spree
         contents.each { |content_item| content_item.inventory_unit.state = content_item.state.to_s }
 
         Spree::Shipment.new(
+          order: order,
+          address: order.ship_address,
           stock_location: stock_location,
-          shipping_rates: shipping_rates,
           inventory_units: contents.map(&:inventory_unit)
         )
       end
+
+      private
+
+      # @return [Array<Fixnum>] the unique ids of all shipping categories of
+      #   variants in this package
+      def shipping_category_ids
+        contents.map { |item| item.variant.shipping_category_id }.compact.uniq
+      end
     end
   end
 end

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

@@ -3,7 +3,7 @@ module Spree
     class Packer
       attr_reader :stock_location, :inventory_units, :splitters
 
-      def initialize(stock_location, inventory_units, splitters=[Splitter::Base])
+      def initialize(stock_location, inventory_units, splitters = [Splitter::Base])
         @stock_location = stock_location
         @inventory_units = inventory_units
         @splitters = splitters
@@ -31,7 +31,6 @@ module Spree
           else
             package.add_multiple units
           end
-
         end
         package
       end
@@ -54,7 +53,7 @@ module Spree
 
       def build_splitter
         splitter = nil
-        splitters.reverse.each do |klass|
+        splitters.reverse_each do |klass|
           splitter = klass.new(self, splitter)
         end
         splitter

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

@@ -3,7 +3,7 @@ module Spree
     class Prioritizer
       attr_reader :packages, :inventory_units
 
-      def initialize(inventory_units, packages, adjuster_class=Adjuster)
+      def initialize(inventory_units, packages, adjuster_class = Adjuster)
         @inventory_units = inventory_units
         @packages = packages
         @adjuster_class = adjuster_class
@@ -17,6 +17,7 @@ module Spree
       end
 
       private
+
       def adjust_packages
         inventory_units.each do |inventory_unit|
           adjuster = @adjuster_class.new(inventory_unit, :on_hand)
@@ -40,7 +41,7 @@ module Spree
       end
 
       def prune_packages
-        packages.reject! { |pkg| pkg.empty? }
+        packages.reject!(&:empty?)
       end
     end
   end

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

@@ -7,9 +7,9 @@ module Spree
         @variant = variant
         where_args = { variant_id: @variant }
         if stock_location
-          where_args.merge!(stock_location: stock_location)
+          where_args[:stock_location] = stock_location
         else
-          where_args.merge!(Spree::StockLocation.table_name => { active: true })
+          where_args[Spree::StockLocation.table_name] = { active: true }
         end
         @stock_items = Spree::StockItem.joins(:stock_location).where(where_args)
       end
@@ -41,7 +41,6 @@ module Spree
       def can_supply?(required)
         total_on_hand >= required || backorderable?
       end
-
     end
   end
 end

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

@@ -1,7 +1,6 @@
 module Spree
   module Stock
     class ShippingRateSelector
-
       attr_reader :shipping_rates
 
       def initialize(shipping_rates)

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

@@ -1,7 +1,6 @@
 module Spree
   module Stock
     class ShippingRateSorter
-
       attr_reader :shipping_rates
 
       def initialize(shipping_rates)

data/app/models/spree/stock/splitter/backordered.rb

@@ -2,7 +2,6 @@ module Spree
   module Stock
     module Splitter
       class Backordered < Spree::Stock::Splitter::Base
-
         def split(packages)
           split_packages = []
           packages.each do |package|
@@ -16,7 +15,6 @@ module Spree
           end
           return_next split_packages
         end
-
       end
     end
   end

data/app/models/spree/stock/splitter/base.rb

@@ -4,7 +4,7 @@ module Spree
       class Base
         attr_reader :packer, :next_splitter
 
-        def initialize(packer, next_splitter=nil)
+        def initialize(packer, next_splitter = nil)
           @packer = packer
           @next_splitter = next_splitter
         end
@@ -15,11 +15,12 @@ module Spree
         end
 
         private
+
         def return_next(packages)
           next_splitter ? next_splitter.split(packages) : packages
         end
 
-        def build_package(contents=[])
+        def build_package(contents = [])
           Spree::Stock::Package.new(stock_location, contents)
         end
       end

data/app/models/spree/stock/splitter/shipping_category.rb

@@ -11,6 +11,7 @@ module Spree
         end
 
         private
+
         def split_by_category(package)
           categories = Hash.new { |hash, key| hash[key] = [] }
           package.contents.each do |item|
@@ -21,7 +22,7 @@ module Spree
 
         def hash_to_packages(categories)
           packages = []
-          categories.each do |id, contents|
+          categories.each do |_id, contents|
             packages << build_package(contents)
           end
           packages

data/app/models/spree/stock/splitter/weight.rb

@@ -17,9 +17,10 @@ module Spree
         end
 
         private
+
         def reduce(package)
           removed = []
-          while package.weight > self.threshold
+          while package.weight > threshold
             break if package.contents.size == 1
             removed << package.contents.shift
           end
@@ -29,4 +30,3 @@ module Spree
     end
   end
 end
-

data/app/models/spree/stock_item.rb

@@ -32,11 +32,11 @@ module Spree
     # @param value [Fixnum] the amount to change the count on hand by, positive
     #   or negative values are valid
     def adjust_count_on_hand(value)
-      self.with_lock do
-        self.count_on_hand = self.count_on_hand + value
+      with_lock do
+        self.count_on_hand = count_on_hand + value
         process_backorders(count_on_hand - count_on_hand_was)
 
-        self.save!
+        save!
       end
     end
 
@@ -48,24 +48,24 @@ module Spree
       self.count_on_hand = value
       process_backorders(count_on_hand - count_on_hand_was)
 
-      self.save!
+      save!
     end
 
     # @return [Boolean] true if this stock item's count on hand is not zero
     def in_stock?
-      self.count_on_hand > 0
+      count_on_hand > 0
     end
 
     # @return [Boolean] true if this stock item can be included in a shipment
     def available?
-      self.in_stock? || self.backorderable?
+      in_stock? || backorderable?
     end
 
     # Sets the count on hand to zero if it not already zero.
     #
     # @note This processes backorders if the count on hand is not zero.
     def reduce_count_on_hand_to_zero
-      self.set_count_on_hand(0) if count_on_hand > 0
+      set_count_on_hand(0) if count_on_hand > 0
     end
 
     def fill_status(quantity)
@@ -82,44 +82,43 @@ module Spree
     end
 
     private
-      def verify_count_on_hand?
-        count_on_hand_changed? && !backorderable? && (count_on_hand < count_on_hand_was) && (count_on_hand < 0)
-      end
 
-      def count_on_hand=(value)
-        write_attribute(:count_on_hand, value)
-      end
+    def verify_count_on_hand?
+      count_on_hand_changed? && !backorderable? && (count_on_hand < count_on_hand_was) && (count_on_hand < 0)
+    end
 
-      # Process backorders based on amount of stock received
-      # If stock was -20 and is now -15 (increase of 5 units), then we should process 5 inventory orders.
-      # If stock was -20 but then was -25 (decrease of 5 units), do nothing.
-      def process_backorders(number)
-        if number > 0
-          backordered_inventory_units.first(number).each do |unit|
-            unit.fill_backorder
-          end
-        end
-      end
+    def count_on_hand=(value)
+      write_attribute(:count_on_hand, value)
+    end
 
-      def conditional_variant_touch
-        variant.touch if inventory_cache_threshold.nil? || should_touch_variant?
+    # Process backorders based on amount of stock received
+    # If stock was -20 and is now -15 (increase of 5 units), then we should process 5 inventory orders.
+    # If stock was -20 but then was -25 (decrease of 5 units), do nothing.
+    def process_backorders(number)
+      if number > 0
+        backordered_inventory_units.first(number).each(&:fill_backorder)
       end
+    end
 
-      def should_touch_variant?
-        # the variant_id changes from nil when a new stock location is added
-        inventory_cache_threshold &&
+    def conditional_variant_touch
+      variant.touch if inventory_cache_threshold.nil? || should_touch_variant?
+    end
+
+    def should_touch_variant?
+      # the variant_id changes from nil when a new stock location is added
+      inventory_cache_threshold &&
         (count_on_hand_changed? && count_on_hand_change.any? { |c| c < inventory_cache_threshold }) ||
         variant_id_changed?
-      end
+    end
 
-      def inventory_cache_threshold
-        # only warn if store is setting binary_inventory_cache (default = false)
-        @cache_threshold ||= if Spree::Config.binary_inventory_cache
-          ActiveSupport::Deprecation.warn "Spree::Config.binary_inventory_cache=true is DEPRECATED. Instead use Spree::Config.inventory_cache_threshold=1"
-          1
-        else
-          Spree::Config.inventory_cache_threshold
-        end
+    def inventory_cache_threshold
+      # only warn if store is setting binary_inventory_cache (default = false)
+      @cache_threshold ||= if Spree::Config.binary_inventory_cache
+        ActiveSupport::Deprecation.warn "Spree::Config.binary_inventory_cache=true is DEPRECATED. Instead use Spree::Config.inventory_cache_threshold=1"
+        1
+      else
+        Spree::Config.inventory_cache_threshold
       end
+    end
   end
 end

data/app/models/spree/stock_location.rb

@@ -12,13 +12,16 @@ module Spree
     belongs_to :state, class_name: 'Spree::State'
     belongs_to :country, class_name: 'Spree::Country'
 
+    has_many :shipping_method_stock_locations, dependent: :destroy
+    has_many :shipping_methods, through: :shipping_method_stock_locations
+
     validates_presence_of :name
     validates_uniqueness_of :code, allow_blank: true, case_sensitive: false
 
     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: "self.propagate_all_variants?"
     after_save :ensure_one_default
 
     def state_text
@@ -27,14 +30,14 @@ module Spree
 
     # Wrapper for creating a new stock item respecting the backorderable config
     def propagate_variant(variant)
-      self.stock_items.create!(variant: variant, backorderable: self.backorderable_default)
+      stock_items.create!(variant: variant, backorderable: backorderable_default)
     end
 
     # Return either an existing stock item or create a new one. Useful in
     # scenarios where the user might not know whether there is already a stock
     # item for a given variant
     def set_up_stock_item(variant)
-      self.stock_item(variant) || propagate_variant(variant)
+      stock_item(variant) || propagate_variant(variant)
     end
 
     # Returns an instance of StockItem for the variant id.
@@ -73,7 +76,7 @@ module Spree
       move(variant, quantity, originator)
     end
 
-    def restock_backordered(variant, quantity, originator = nil)
+    def restock_backordered(variant, quantity, _originator = nil)
       item = stock_item_or_create(variant)
       item.update_columns(
         count_on_hand: item.count_on_hand + quantity,
@@ -102,17 +105,18 @@ module Spree
     end
 
     private
-      def create_stock_items
-        Variant.find_each { |variant| self.propagate_variant(variant) }
-      end
 
-      def ensure_one_default
-        if self.default
-          StockLocation.where(default: true).where.not(id: self.id).each do |stock_location|
-            stock_location.default = false
-            stock_location.save!
-          end
+    def create_stock_items
+      Variant.find_each { |variant| propagate_variant(variant) }
+    end
+
+    def ensure_one_default
+      if default
+        StockLocation.where(default: true).where.not(id: id).each do |stock_location|
+          stock_location.default = false
+          stock_location.save!
         end
       end
+    end
   end
 end

data/app/models/spree/stock_movement.rb

@@ -19,10 +19,8 @@ module Spree
     private
 
     def update_stock_item_quantity
-      return unless self.stock_item.should_track_inventory?
+      return unless stock_item.should_track_inventory?
       stock_item.adjust_count_on_hand quantity
     end
-
   end
 end
-

data/app/models/spree/stock_transfer.rb

@@ -4,14 +4,14 @@ module Spree
 
     acts_as_paranoid
 
-    has_many :stock_movements, :as => :originator
+    has_many :stock_movements, as: :originator
     has_many :transfer_items, inverse_of: :stock_transfer
 
-    belongs_to :created_by, :class_name => Spree::UserClassHandle.new
-    belongs_to :finalized_by, :class_name => Spree::UserClassHandle.new
-    belongs_to :closed_by, :class_name => Spree::UserClassHandle.new
-    belongs_to :source_location, :class_name => 'Spree::StockLocation'
-    belongs_to :destination_location, :class_name => 'Spree::StockLocation'
+    belongs_to :created_by, class_name: Spree::UserClassHandle.new
+    belongs_to :finalized_by, class_name: Spree::UserClassHandle.new
+    belongs_to :closed_by, class_name: Spree::UserClassHandle.new
+    belongs_to :source_location, class_name: 'Spree::StockLocation'
+    belongs_to :destination_location, class_name: 'Spree::StockLocation'
 
     validates_presence_of :source_location
     validates_presence_of :destination_location, if: :finalized?
@@ -70,7 +70,7 @@ module Spree
 
     def finalize(finalized_by)
       if finalizable?
-        self.update_attributes({ finalized_at: Time.current, finalized_by: finalized_by })
+        update_attributes({ finalized_at: Time.current, finalized_by: finalized_by })
       else
         errors.add(:base, Spree.t(:stock_transfer_cannot_be_finalized))
         false
@@ -91,7 +91,7 @@ module Spree
 
     def close(closed_by)
       if receivable?
-        self.update_attributes({ closed_at: Time.current, closed_by: closed_by })
+        update_attributes({ closed_at: Time.current, closed_by: closed_by })
       else
         errors.add(:base, Spree.t(:stock_transfer_must_be_receivable))
         false

data/app/models/spree/store.rb

@@ -2,6 +2,7 @@ module Spree
   class Store < Spree::Base
     has_many :store_payment_methods, inverse_of: :store
     has_many :payment_methods, through: :store_payment_methods
+    has_many :orders, class_name: "Spree::Order"
 
     validates :code, presence: true, uniqueness: { allow_blank: true }
     validates :name, presence: true
@@ -22,6 +23,11 @@ module Spree
       where(default: true).first || new
     end
 
+    def default_cart_tax_location
+      @default_cart_tax_location ||=
+        Spree::Tax::TaxLocation.new(country: Spree::Country.find_by(iso: cart_tax_country_iso))
+    end
+
     private
 
     def ensure_default_exists_and_is_unique