spree_core 3.3.6 → 3.4.0.rc1

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

@@ -2,10 +2,10 @@ module Spree
   class ReturnItem::EligibilityValidator::RMARequired < Spree::ReturnItem::EligibilityValidator::BaseValidator
     def eligible_for_return?
       if @return_item.return_authorization.present?
-        return true
+        true
       else
         add_error(:rma_required, Spree.t('return_item_rma_ineligible'))
-        return false
+        false
       end
     end
 
@@ -14,4 +14,3 @@ module Spree
     end
   end
 end
-

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

@@ -2,10 +2,10 @@ module Spree
   class ReturnItem::EligibilityValidator::TimeSincePurchase < Spree::ReturnItem::EligibilityValidator::BaseValidator
     def eligible_for_return?
       if (@return_item.inventory_unit.order.completed_at + Spree::Config[:return_eligibility_number_of_days].days) > Time.current
-        return true
+        true
       else
         add_error(:number_of_days, Spree.t('return_item_time_period_ineligible'))
-        return false
+        false
       end
     end
 

data/app/models/spree/return_item.rb

@@ -152,7 +152,7 @@ module Spree
       # will have a different variant than the inventory unit itself
       return unless exchange_required?
       exchange_inventory_units.build(variant: exchange_variant, line_item: inventory_unit.line_item,
-                                      order: inventory_unit.order, quantity: return_quantity)
+                                     order: inventory_unit.order, quantity: return_quantity)
     end
 
     def exchange_shipments
@@ -166,16 +166,14 @@ module Spree
     private
 
     def persist_acceptance_status_errors
-      self.update_attributes(acceptance_status_errors: validator.errors)
+      update_attributes(acceptance_status_errors: validator.errors)
     end
 
     def stock_item
       return unless customer_return
 
-      Spree::StockItem.find_by({
-        variant_id: inventory_unit.variant_id,
-        stock_location_id: customer_return.stock_location_id,
-      })
+      Spree::StockItem.find_by(variant_id: inventory_unit.variant_id,
+                               stock_location_id: customer_return.stock_location_id)
     end
 
     def currency
@@ -184,11 +182,13 @@ module Spree
 
     def process_inventory_unit!
       inventory_unit.return!
-      Spree::StockMovement.create!(
-        stock_item_id: stock_item.id,
-        quantity: inventory_unit.quantity,
-        originator: return_authorization
-      ) if should_restock?
+      if should_restock?
+        Spree::StockMovement.create!(
+          stock_item_id: stock_item.id,
+          quantity: inventory_unit.quantity,
+          originator: return_authorization
+        )
+      end
     end
 
     # This logic is also present in the customer return. The reason for the
@@ -237,16 +237,12 @@ module Spree
     end
 
     def validate_no_other_completed_return_items
-      other_return_item = Spree::ReturnItem.where({
-        inventory_unit_id: inventory_unit_id,
-        reception_status: COMPLETED_RECEPTION_STATUSES,
-      }).first
+      other_return_item = Spree::ReturnItem.where(inventory_unit_id: inventory_unit_id,
+                                                  reception_status: COMPLETED_RECEPTION_STATUSES).first
 
       if other_return_item
-        errors.add(:inventory_unit, :other_completed_return_item_exists, {
-          inventory_unit_id: inventory_unit_id,
-          return_item_id: other_return_item.id,
-        })
+        errors.add(:inventory_unit, :other_completed_return_item_exists,           inventory_unit_id: inventory_unit_id,
+                                                                                   return_item_id: other_return_item.id)
       end
     end
 

data/app/models/spree/returns_calculator.rb

@@ -1,7 +1,6 @@
 module Spree
   class ReturnsCalculator < Calculator
-
-    def compute(return_item)
+    def compute(_return_item)
       raise NotImplementedError, "Please implement 'compute(return_item)' in your calculator: #{self.class.name}"
     end
   end

data/app/models/spree/shipment.rb

@@ -76,7 +76,7 @@ module Spree
         shipment.state_changes.create!(
           previous_state: transition.from,
           next_state:     transition.to,
-          name:           'shipment',
+          name:           'shipment'
         )
       end
     end
@@ -125,11 +125,6 @@ module Spree
     end
     alias discounted_amount discounted_cost
 
-    def editable_by?(_user)
-      warn "`Spree::Shipment#editable_by?` is deprecated. You should use cancancan `can?` method for cheks like this."
-      !shipped?
-    end
-
     def final_price
       cost + adjustment_total
     end
@@ -224,7 +219,6 @@ module Spree
         selected_rate = shipping_rates.detect do |rate|
           rate.shipping_method_id == original_shipping_method_id
         end
-        save!
         self.selected_shipping_rate_id = selected_rate.id if selected_rate
       end
 
@@ -241,14 +235,12 @@ module Spree
       save!
     end
 
-    def set_up_inventory(state, variant, order, line_item, quantity = 1)
-      return if quantity <= 0
+    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,
-        quantity: quantity
+        line_item_id: line_item.id
       )
     end
 
@@ -289,7 +281,7 @@ module Spree
         update_columns(
           cost: selected_shipping_rate.cost,
           adjustment_total: adjustments.additional.map(&:update!).compact.sum,
-          updated_at: Time.current,
+          updated_at: Time.current
         )
       end
     end
@@ -332,22 +324,19 @@ module Spree
       new_state = determine_state(order)
       update_columns(
         state: new_state,
-        updated_at: Time.current,
+        updated_at: Time.current
       )
       after_ship if new_state == 'shipped' && old_state != 'shipped'
     end
 
     def transfer_to_location(variant, quantity, stock_location)
-      if quantity <= 0
-        raise ArgumentError
-      end
+      raise ArgumentError if quantity <= 0
 
       transaction do
         new_shipment = order.shipments.create!(stock_location: stock_location)
 
         order.contents.remove(variant, quantity, shipment: self)
         order.contents.add(variant, quantity, shipment: new_shipment)
-        order.update_with_updater!
 
         refresh_rates
         save!
@@ -361,14 +350,11 @@ module Spree
       end.try(:quantity) || 0
       final_quantity = quantity + quantity_already_shipment_to_transfer_to
 
-      if quantity <= 0 || self == shipment_to_transfer_to
-        raise ArgumentError
-      end
+      raise ArgumentError if quantity <= 0 || self == shipment_to_transfer_to
 
       transaction do
-        order.contents.remove(variant, final_quantity, shipment: self)
-        order.contents.add(variant, final_quantity, shipment: shipment_to_transfer_to)
-        order.update_with_updater!
+        order.contents.remove(variant, quantity, shipment: self)
+        order.contents.add(variant, quantity, shipment: shipment_to_transfer_to)
 
         refresh_rates
         save!
@@ -388,12 +374,12 @@ module Spree
     end
 
     def manifest_restock(item)
-      if item.states["on_hand"].to_i.positive?
-        stock_location.restock item.variant, item.states["on_hand"], self
+      if item.states['on_hand'].to_i.positive?
+        stock_location.restock item.variant, item.states['on_hand'], self
       end
 
-      if item.states["backordered"].to_i.positive?
-        stock_location.restock_backordered item.variant, item.states["backordered"]
+      if item.states['backordered'].to_i.positive?
+        stock_location.restock_backordered item.variant, item.states['backordered']
       end
     end
 
@@ -405,19 +391,12 @@ module Spree
       Adjustable::AdjustmentsUpdater.update(self)
     end
 
-    def send_shipped_email
-      warn "Shipment#send_shipped_email is deprecated, please use ShipmentHandler#send_shipped_email"
-      ShipmentMailer.shipped_email(id).deliver_later
-    end
-
     def set_cost_zero_when_nil
       self.cost = 0 unless cost
     end
 
     def update_adjustments
-      if saved_change_to_cost? && state != 'shipped'
-        recalculate_adjustments
-      end
+      recalculate_adjustments if saved_change_to_cost? && state != 'shipped'
     end
   end
 end

data/app/models/spree/shipment_handler.rb

@@ -20,24 +20,22 @@ module Spree
     def perform
       @shipment.inventory_units.each &:ship!
       @shipment.process_order_payments if Spree::Config[:auto_capture_on_dispatch]
+      send_shipped_email
       @shipment.touch :shipped_at
       update_order_shipment_state
-      send_shipped_email
     end
 
     private
-      def send_shipped_email
-        ShipmentMailer.shipped_email(@shipment.id).deliver_later
-      end
 
-      def update_order_shipment_state
-        order = @shipment.order
+    def send_shipped_email
+      ShipmentMailer.shipped_email(@shipment.id).deliver_later
+    end
 
-        new_state = OrderUpdater.new(order).update_shipment_state
-        order.update_columns(
-                             shipment_state: new_state,
-                             updated_at: Time.current,
-                             )
-      end
+    def update_order_shipment_state
+      order = @shipment.order
+
+      new_state = OrderUpdater.new(order).update_shipment_state
+      order.update_columns(shipment_state: new_state, updated_at: Time.current)
+    end
   end
 end

data/app/models/spree/shipping_calculator.rb

@@ -1,22 +1,21 @@
 module Spree
   class ShippingCalculator < Calculator
-
-    def compute_shipment(shipment)
+    def compute_shipment(_shipment)
       raise NotImplementedError, "Please implement 'compute_shipment(shipment)' in your calculator: #{self.class.name}"
     end
 
-    def compute_package(package)
+    def compute_package(_package)
       raise NotImplementedError, "Please implement 'compute_package(package)' in your calculator: #{self.class.name}"
     end
 
-    def available?(package)
+    def available?(_package)
       true
     end
 
     private
+
     def total(content_items)
-      content_items.map(&:amount).sum
+      content_items.sum(&:amount)
     end
   end
 end
-

data/app/models/spree/shipping_method.rb

@@ -38,8 +38,8 @@ module Spree
     end
 
     def self.calculators
-      spree_calculators.send(model_name_without_spree_namespace)
-        .select { |c| c.to_s.constantize < Spree::ShippingCalculator }
+      spree_calculators.send(model_name_without_spree_namespace).
+        select { |c| c.to_s.constantize < Spree::ShippingCalculator }
     end
 
     def tax_category
@@ -48,7 +48,7 @@ module Spree
 
     def available_to_display?(display_filter)
       (frontend? && display_filter == DISPLAY_ON_FRONT_END) ||
-      (backend? && display_filter == DISPLAY_ON_BACK_END)
+        (backend? && display_filter == DISPLAY_ON_BACK_END)
     end
 
     private

data/app/models/spree/shipping_rate.rb

@@ -22,12 +22,12 @@ module Spree
       return price if tax_rate.nil? || tax_amount == 0
 
       Spree.t tax_rate.included_in_price? ? :including_tax : :excluding_tax,
-              scope: "shipping_rates.display_price",
+              scope: 'shipping_rates.display_price',
               price: price,
               tax_amount: display_tax_amount,
               tax_rate_name: tax_rate.name
     end
-    alias_method :display_cost, :display_price
+    alias display_cost display_price
 
     def tax_amount
       @_tax_amount ||= tax_rate.calculator.compute_shipping_rate(self)

data/app/models/spree/state.rb

@@ -24,9 +24,9 @@ module Spree
     # blank is added elsewhere, if needed
     def self.states_group_by_country_id
       state_info = Hash.new { |h, k| h[k] = [] }
-      self.order(:name).each { |state|
+      order(:name).each do |state|
         state_info[state.country_id.to_s].push [state.id, state.name]
-      }
+      end
       state_info
     end
 

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

@@ -11,7 +11,7 @@ module Spree
         return if item_available?(line_item, quantity)
 
         variant = line_item.variant
-        display_name = "#{variant.name}"
+        display_name = variant.name.to_s
         display_name += " (#{variant.options_text})" unless variant.options_text.blank?
 
         line_item.errors[:quantity] << Spree.t(

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

@@ -31,14 +31,13 @@ module Spree
       end
 
       def on_hand?
-        state.to_s == "on_hand"
+        state.to_s == 'on_hand'
       end
 
       def backordered?
-        state.to_s == "backordered"
+        state.to_s == 'backordered'
       end
 
-
       def amount
         price * quantity
       end

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

@@ -21,7 +21,7 @@ module Spree
         packages = estimate_packages(packages)
       end
 
-      def build_packages(packages = Array.new)
+      def build_packages(packages = [])
         stock_locations_with_requested_variants.each do |stock_location|
           packer = build_packer(stock_location, inventory_units)
           packages += packer.packages
@@ -31,6 +31,7 @@ module Spree
       end
 
       private
+
       def stock_locations_with_requested_variants
         Spree::StockLocation.active.joins(:stock_items).
           where(spree_stock_items: { variant_id: requested_variant_ids }).distinct
@@ -57,7 +58,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,11 +16,12 @@ module Spree
       end
 
       private
+
       def build_missing
         @missing = Hash.new(0)
         required.keys.each do |variant|
-           missing = required[variant] - packed[variant]
-           @missing[variant] = missing if missing > 0
+          missing = required[variant] - packed[variant]
+          @missing[variant] = missing if missing > 0
         end
       end
 

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

@@ -17,6 +17,7 @@ module Spree
       end
 
       private
+
       def choose_default_shipping_rate(shipping_rates)
         unless shipping_rates.empty?
           shipping_rates.min_by(&:cost).selected = true
@@ -31,10 +32,11 @@ module Spree
         shipping_methods(package, ui_filter).map do |shipping_method|
           cost = shipping_method.calculator.compute(package)
 
+          next unless cost
           shipping_method.shipping_rates.new(
             cost: gross_amount(cost, taxation_options_for(shipping_method)),
             tax_rate: first_tax_rate_for(shipping_method.tax_category)
-          ) if cost
+          )
         end.compact
       end
 
@@ -59,10 +61,10 @@ module Spree
           calculator = ship_method.calculator
 
           ship_method.available_to_display?(display_filter) &&
-          ship_method.include?(order.ship_address) &&
-          calculator.available?(package) &&
-          (calculator.preferences[:currency].blank? ||
-           calculator.preferences[:currency] == currency)
+            ship_method.include?(order.ship_address) &&
+            calculator.available?(package) &&
+            (calculator.preferences[:currency].blank? ||
+             calculator.preferences[:currency] == currency)
         end
       end
     end

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

@@ -4,14 +4,14 @@ module Spree
       attr_reader :stock_location, :contents
       attr_accessor :shipping_rates
 
-      def initialize(stock_location, contents=[])
+      def initialize(stock_location, contents = [])
         @stock_location = stock_location
         @contents = contents
-        @shipping_rates = Array.new
+        @shipping_rates = []
       end
 
       def add(inventory_unit, state = :on_hand)
-         # Remove find_item check as already taken care by prioritizer
+        # Remove find_item check as already taken care by prioritizer
         contents << ContentItem.new(inventory_unit, state)
       end
 
@@ -31,7 +31,7 @@ module Spree
       # Fix regression that removed package.order.
       # Find it dynamically through an inventory_unit.
       def order
-        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
 
       def weight
@@ -55,7 +55,7 @@ module Spree
 
       def quantity(state = nil)
         matched_contents = state.nil? ? contents : contents.select { |c| c.state.to_s == state.to_s }
-        matched_contents.map(&:quantity).sum
+        matched_contents.sum(&:quantity)
       end
 
       def empty?

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

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

@@ -3,10 +3,10 @@ module Spree
     class Prioritizer
       attr_reader :packages
 
-      def initialize(packages, adjuster_class=Adjuster)
+      def initialize(packages, adjuster_class = Adjuster)
         @packages = packages
         @adjuster_class = adjuster_class
-        @adjusters = Hash.new
+        @adjusters = {}
       end
 
       def prioritized_packages
@@ -22,15 +22,13 @@ module Spree
         packages.each do |package|
           package.contents.each do |item|
             adjuster = find_adjuster(item)
-            if adjuster.nil?
-              adjuster = build_adjuster(item, package)
-            end
+            adjuster = build_adjuster(item, package) if adjuster.nil?
             adjuster.adjust(package, item)
           end
         end
       end
 
-      def build_adjuster(item, package)
+      def build_adjuster(item, _package)
         @adjusters[hash_item item] = @adjuster_class.new(item.inventory_unit)
       end
 
@@ -43,7 +41,7 @@ module Spree
       end
 
       def prune_packages
-        packages.reject! { |pkg| pkg.empty? }
+        packages.reject!(&:empty?)
       end
 
       def hash_item(item)

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

@@ -23,7 +23,6 @@ module Spree
       def can_supply?(required = 1)
         variant.available? && (total_on_hand >= required || backorderable?)
       end
-
     end
   end
 end

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

@@ -2,21 +2,19 @@ module Spree
   module Stock
     module Splitter
       class Backordered < Spree::Stock::Splitter::Base
-
         def split(packages)
           split_packages = []
           packages.each do |package|
-            if package.on_hand.size > 0
+            unless package.on_hand.empty?
               split_packages << build_package(package.on_hand)
             end
 
-            if package.backordered.size > 0
+            unless package.backordered.empty?
               split_packages << build_package(package.backordered)
             end
           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_item.rb

@@ -96,7 +96,7 @@ module Spree
       # the variant_id changes from nil when a new stock location is added
       stock_changed = (saved_change_to_count_on_hand? &&
                         saved_change_to_count_on_hand.any?(&:zero?)) ||
-                      saved_change_to_variant_id?
+        saved_change_to_variant_id?
 
       variant.touch if !Spree::Config.binary_inventory_cache || stock_changed
     end