solidus_core 2.10.0.beta1 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d36219391d7785627d0a35a8929f818350001dbe3f06149bc0f954daadaf301
-  data.tar.gz: 982ce1d0d2866b852b7e421361f06c81b6b4a98066093e5d6c8ae03ceb0d5866
+  metadata.gz: 0aabcb199c31d99f564afef69740c95363dff238117b5692ff26226f91f6bf06
+  data.tar.gz: fd982fa13569c953468edb060c7019f541b435cd404787b8c0674ff3db324606
 SHA512:
-  metadata.gz: 1cedc37f87d1641177f28e8172b6c667da086cd3ed4c1e8081390ffb8026974dd582731c5a4a2d827ff3333495e51705c0975b3efff5e25bce7d3b030302a7b4
-  data.tar.gz: f577d26426c6723f1b6bba21d11c647549a6569851b286b29756dfe9b8eccd710f235452393b12f8bd3ab43666eefd7b2d519024888e737233c9a69b14a81fc5
+  metadata.gz: d0532174df1e8cac35d61f180102c5123dec9f43d41b29d61a6ce37a87cb1d29f60a902de56ba5b0394094ef5c0ea28e13ca81033df598de93209dcf7105dbc5
+  data.tar.gz: 9df7b935ee802245a93da97b4341aacb7343aac7e6319b5b1673b30a0145f9f46d539aa5c2e3ab190e1e7dbf69b37843ff8c4739497ef24233a572fa49eb6d4d

data/app/helpers/spree/base_helper.rb

@@ -79,16 +79,16 @@ module Spree
 
       crumbs << [t('spree.products'), products_path]
       if taxon
-        crumbs += taxon.ancestors.collect { |a| [a.name, spree.nested_taxons_path(a.permalink)] } unless taxon.ancestors.empty?
+        crumbs += taxon.ancestors.collect { |ancestor| [ancestor.name, spree.nested_taxons_path(ancestor.permalink)] } unless taxon.ancestors.empty?
         crumbs << [taxon.name, spree.nested_taxons_path(taxon.permalink)]
       end
 
       separator = raw(separator)
 
-      items = crumbs.each_with_index.collect do |crumb, i|
+      items = crumbs.each_with_index.collect do |crumb, index|
         content_tag(:li, itemprop: 'itemListElement', itemscope: '', itemtype: 'https://schema.org/ListItem') do
           link_to(crumb.last, itemprop: 'item') do
-            content_tag(:span, crumb.first, itemprop: 'name') + tag('meta', { itemprop: 'position', content: (i + 1).to_s }, false, false)
+            content_tag(:span, crumb.first, itemprop: 'name') + tag('meta', { itemprop: 'position', content: (index + 1).to_s }, false, false)
           end + (crumb == crumbs.last ? '' : separator)
         end
       end
@@ -122,7 +122,7 @@ module Spree
       countries.collect do |country|
         country.name = country_names.fetch(country.iso, country.name)
         country
-      end.sort_by { |c| c.name.parameterize }
+      end.sort_by { |country| country.name.parameterize }
     end
 
     def seo_url(taxon)

data/app/helpers/spree/products_helper.rb

@@ -36,7 +36,8 @@ module Spree
     def variant_full_price(variant)
       return if variant.product.variants
                   .with_prices(current_pricing_options)
-                  .all? { |v| v.price_same_as_master?(current_pricing_options) }
+                  .all? { |variant_with_prices| variant_with_prices.price_same_as_master?(current_pricing_options) }
+
       variant.price_for(current_pricing_options).to_html
     end
 

data/app/jobs/spree/promotion_code_batch_job.rb

@@ -14,13 +14,13 @@ module Spree
           .promotion_code_batch_finished(promotion_code_batch)
           .deliver_now
       end
-    rescue StandardError => e
+    rescue StandardError => error
       if promotion_code_batch.email?
         Spree::Config.promotion_code_batch_mailer_class
           .promotion_code_batch_errored(promotion_code_batch)
           .deliver_now
       end
-      raise e
+      raise error
     end
   end
 end

data/app/models/concerns/spree/user_methods.rb

@@ -73,8 +73,8 @@ module Spree
     deprecate total_available_store_credit: :available_store_credit_total, deprecator: Spree::Deprecation
 
     def available_store_credit_total(currency:)
-      store_credits.reload.to_a.
-        select { |c| c.currency == currency }.
+      store_credits.to_a.
+        select { |credit| credit.currency == currency }.
         sum(&:amount_remaining)
     end
 

data/app/models/spree/address.rb

@@ -30,8 +30,9 @@ module Spree
       where(value_attributes(attributes))
     end
 
-    def self.build_default
-      new(country: Spree::Country.default)
+    # @return [Address] an address with default attributes
+    def self.build_default(*args, &block)
+      where(country: Spree::Country.default).build(*args, &block)
     end
 
     # @return [Address] an equal address already in the database or a newly created one
@@ -58,21 +59,16 @@ module Spree
     end
 
     # @return [Hash] hash of attributes contributing to value equality with optional merge
-    def self.value_attributes(base_attributes, merge_attributes = nil)
-      # dup because we may modify firstname/lastname.
-      base = base_attributes.dup
-
-      base.stringify_keys!
-
-      if merge_attributes
-        base.merge!(merge_attributes.stringify_keys)
-      end
+    def self.value_attributes(base_attributes, merge_attributes = {})
+      base = base_attributes.stringify_keys.merge(merge_attributes.stringify_keys)
 
       # TODO: Deprecate these aliased attributes
-      base['firstname'] = base.delete('first_name') if base.key?('first_name')
-      base['lastname'] = base.delete('last_name') if base.key?('last_name')
+      base['firstname'] = base['first_name'] if base.key?('first_name')
+      base['lastname'] = base['last_name'] if base.key?('last_name')
+
+      excluded_attributes = DB_ONLY_ATTRS + %w(first_name last_name)
 
-      base.except!(*DB_ONLY_ATTRS)
+      base.except(*excluded_attributes)
     end
 
     # @return [Hash] hash of attributes contributing to value equality
@@ -121,7 +117,7 @@ module Spree
     # @deprecated Do not use this
     def empty?
       Spree::Deprecation.warn("Address#empty? is deprecated.", caller)
-      attributes.except('id', 'created_at', 'updated_at', 'country_id').all? { |_, v| v.nil? }
+      attributes.except('id', 'created_at', 'updated_at', 'country_id').all? { |_, value| value.nil? }
     end
 
     # This exists because the default Object#blank?, checks empty? if it is

data/app/models/spree/adjustment.rb

@@ -56,6 +56,17 @@ module Spree
     extend DisplayMoney
     money_methods :amount
 
+    # Returns Adjustments of completed Orders.
+    #
+    # @param excluded_orders [Array<Spree::Order>] Orders to exclude from query
+    # @return [ActiveRecord::Relation] Scoped Adjustments
+    def self.in_completed_orders(excluded_orders: [])
+      joins(:order).
+      merge(Spree::Order.complete).
+      where.not(spree_orders: { id: excluded_orders }).
+      distinct
+    end
+
     def finalize!
       update!(finalized: true)
     end

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

@@ -12,7 +12,7 @@ module Spree
     # as object we always get line items, as calculable we have Coupon, ShippingMethod
     def compute(object)
       if object.is_a?(Array)
-        base = object.map { |o| o.respond_to?(:amount) ? o.amount : BigDecimal(o.to_s) }.sum
+        base = object.map { |element| element.respond_to?(:amount) ? element.amount : BigDecimal(element.to_s) }.sum
       else
         base = object.respond_to?(:amount) ? object.amount : BigDecimal(object.to_s)
       end

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

@@ -18,9 +18,9 @@ module Spree
       def compute_from_quantity(quantity)
         sum = 0
         max = preferred_max_items.to_i
-        quantity.times do |i|
+        quantity.times do |index|
           # check max value to avoid divide by 0 errors
-          if (max == 0 && i == 0) || (max > 0) && (i % max == 0)
+          if (max == 0 && index == 0) || (max > 0) && (index % max == 0)
             sum += preferred_first_item.to_f
           else
             sum += preferred_additional_item.to_f

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

@@ -11,8 +11,8 @@ module Spree
     before_validation do
       # Convert tier values to decimals. Strings don't do us much good.
       if preferred_tiers.is_a?(Hash)
-        self.preferred_tiers = preferred_tiers.map do |k, v|
-          [cast_to_d(k.to_s), cast_to_d(v.to_s)]
+        self.preferred_tiers = preferred_tiers.map do |key, value|
+          [cast_to_d(key.to_s), cast_to_d(value.to_s)]
         end.to_h
       end
     end
@@ -20,8 +20,8 @@ module Spree
     validate :preferred_tiers_content
 
     def compute(object)
-      _base, amount = preferred_tiers.sort.reverse.detect do |b, _|
-        object.amount >= b
+      _base, amount = preferred_tiers.sort.reverse.detect do |value, _|
+        object.amount >= value
       end
 
       if preferred_currency.casecmp(object.currency).zero?
@@ -41,7 +41,7 @@ module Spree
 
     def preferred_tiers_content
       if preferred_tiers.is_a? Hash
-        unless preferred_tiers.keys.all?{ |k| k.is_a?(Numeric) && k > 0 }
+        unless preferred_tiers.keys.all?{ |key| key.is_a?(Numeric) && key > 0 }
           errors.add(:base, :keys_should_be_positive_number)
         end
       else

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

@@ -11,8 +11,8 @@ module Spree
     before_validation do
       # Convert tier values to decimals. Strings don't do us much good.
       if preferred_tiers.is_a?(Hash)
-        self.preferred_tiers = preferred_tiers.map do |k, v|
-          [cast_to_d(k.to_s), cast_to_d(v.to_s)]
+        self.preferred_tiers = preferred_tiers.map do |key, value|
+          [cast_to_d(key.to_s), cast_to_d(value.to_s)]
         end.to_h
       end
     end
@@ -26,8 +26,8 @@ module Spree
     def compute(object)
       order = object.is_a?(Order) ? object : object.order
 
-      _base, percent = preferred_tiers.sort.reverse.detect do |b, _|
-        order.item_total >= b
+      _base, percent = preferred_tiers.sort.reverse.detect do |value, _|
+        order.item_total >= value
       end
 
       if preferred_currency.casecmp(order.currency).zero?
@@ -48,10 +48,10 @@ module Spree
 
     def preferred_tiers_content
       if preferred_tiers.is_a? Hash
-        unless preferred_tiers.keys.all?{ |k| k.is_a?(Numeric) && k > 0 }
+        unless preferred_tiers.keys.all?{ |key| key.is_a?(Numeric) && key > 0 }
           errors.add(:base, :keys_should_be_positive_number)
         end
-        unless preferred_tiers.values.all?{ |k| k.is_a?(Numeric) && k >= 0 && k <= 100 }
+        unless preferred_tiers.values.all?{ |key| key.is_a?(Numeric) && key >= 0 && key <= 100 }
           errors.add(:base, :values_should_be_percent)
         end
       else

data/app/models/spree/carton.rb

@@ -3,7 +3,7 @@
 class Spree::Carton < Spree::Base
   belongs_to :address, class_name: 'Spree::Address', optional: true
   belongs_to :stock_location, class_name: 'Spree::StockLocation', inverse_of: :cartons, optional: true
-  belongs_to :shipping_method, class_name: 'Spree::ShippingMethod', inverse_of: :cartons, optional: true
+  belongs_to :shipping_method, -> { with_discarded }, class_name: 'Spree::ShippingMethod', inverse_of: :cartons, optional: true
 
   has_many :inventory_units, class_name: "Spree::InventoryUnit", inverse_of: :carton, dependent: :nullify
   has_many :orders, -> { distinct }, through: :inventory_units

data/app/models/spree/credit_card.rb

@@ -47,13 +47,13 @@ module Spree
     }.freeze
 
     def default
-      Spree::Deprecation.warn("CreditCard.default is deprecated. Please use user.wallet.default_wallet_payment_source instead.", caller)
+      Spree::Deprecation.warn("CreditCard#default is deprecated. Please use user.wallet.default_wallet_payment_source instead.", caller)
       return false if user.nil?
       user.wallet.default_wallet_payment_source.try!(:payment_source) == self
     end
 
     def default=(set_as_default)
-      Spree::Deprecation.warn("CreditCard.default= is deprecated. Please use user.wallet.default_wallet_payment_source= instead.", caller)
+      Spree::Deprecation.warn("CreditCard#default= is deprecated. Please use user.wallet.default_wallet_payment_source= instead.", caller)
       if user.nil?
         raise "Cannot set 'default' on a credit card without a user"
       elsif set_as_default # setting this card as default

data/app/models/spree/inventory_unit.rb

@@ -58,25 +58,7 @@ module Spree
 
     scope :shippable, -> { on_hand }
 
-    # state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)
-    state_machine initial: :on_hand do
-      event :fill_backorder do
-        transition to: :on_hand, from: :backordered
-      end
-      after_transition on: :fill_backorder, do: :fulfill_order
-
-      event :ship do
-        transition to: :shipped, if: :allow_ship?
-      end
-
-      event :return do
-        transition to: :returned, from: :shipped
-      end
-
-      event :cancel do
-        transition to: :canceled, from: CANCELABLE_STATES.map(&:to_sym)
-      end
-    end
+    include ::Spree::Config.state_machines.inventory_unit
 
     # Updates the given inventory units to not be pending.
     #

data/app/models/spree/line_item.rb

@@ -72,7 +72,7 @@ module Spree
     # @return [BigDecimal] the amount of this item, taking into consideration
     #   all non-tax adjustments.
     def total_before_tax
-      amount + adjustments.select { |a| !a.tax? && a.eligible? }.sum(&:amount)
+      amount + adjustments.select { |value| !value.tax? && value.eligible? }.sum(&:amount)
     end
 
     # @return [BigDecimal] the amount of this line item before VAT tax

data/app/models/spree/order.rb

@@ -93,6 +93,7 @@ module Spree
 
     # Payments
     has_many :payments, dependent: :destroy, inverse_of: :order
+    has_many :valid_store_credit_payments, -> { store_credits.valid }, inverse_of: :order, class_name: 'Spree::Payment', foreign_key: :order_id
 
     # Returns
     has_many :return_authorizations, dependent: :destroy, inverse_of: :order
@@ -531,7 +532,7 @@ module Spree
     def create_proposed_shipments
       if completed?
         raise CannotRebuildShipments.new(I18n.t('spree.cannot_rebuild_shipments_order_completed'))
-      elsif shipments.any? { |s| !s.pending? }
+      elsif shipments.any? { |shipment| !shipment.pending? }
         raise CannotRebuildShipments.new(I18n.t('spree.cannot_rebuild_shipments_shipments_not_pending'))
       else
         shipments.destroy_all
@@ -686,7 +687,7 @@ module Spree
 
     def total_applicable_store_credit
       if can_complete? || complete?
-        payments.store_credits.valid.sum(:amount)
+        valid_store_credit_payments.to_a.sum(&:amount)
       else
         [total, (user.try(:available_store_credit_total, currency: currency) || 0.0)].min
       end

data/app/models/spree/order/checkout.rb

@@ -41,7 +41,7 @@ module Spree
           # On first definition, state_machines will not be defined
           state_machines.clear if respond_to?(:state_machines)
           state_machine :state, initial: :cart, use_transactions: false do
-            klass.next_event_transitions.each { |t| transition(t.merge(on: :next)) }
+            klass.next_event_transitions.each { |state| transition(state.merge(on: :next)) }
 
             # Persist the state on the order
             after_transition do |order, transition|

data/app/models/spree/order/payments.rb

@@ -46,9 +46,9 @@ module Spree
 
           payment.public_send(method)
         end
-      rescue Core::GatewayError => e
+      rescue Core::GatewayError => error
         result = !!Spree::Config[:allow_checkout_on_gateway_error]
-        errors.add(:base, e.message) && (return result)
+        errors.add(:base, error.message) && (return result)
       end
     end
   end

data/app/models/spree/order_capturing.rb

@@ -41,8 +41,8 @@ class Spree::OrderCapturing
   private
 
   def sorted_payments(order)
-    order.payments.pending.sort_by do |p|
-      [@sorted_payment_method_classes.index(p.payment_method.class), p.id]
+    order.payments.pending.sort_by do |payment|
+      [@sorted_payment_method_classes.index(payment.payment_method.class), payment.id]
     end
   end
 end

data/app/models/spree/order_taxation.rb

@@ -25,12 +25,12 @@ module Spree
     # @return [void]
     def apply(taxes)
       @order.line_items.each do |item|
-        taxed_items = taxes.line_item_taxes.select { |i| i.item_id == item.id }
+        taxed_items = taxes.line_item_taxes.select { |element| element.item_id == item.id }
         update_adjustments(item, taxed_items)
       end
 
       @order.shipments.each do |item|
-        taxed_items = taxes.shipment_taxes.select { |i| i.item_id == item.id }
+        taxed_items = taxes.shipment_taxes.select { |element| element.item_id == item.id }
         update_adjustments(item, taxed_items)
       end
     end

data/app/models/spree/payment.rb

@@ -47,7 +47,7 @@ module Spree
     default_scope -> { order(:created_at) }
 
     scope :from_credit_card, -> { where(source_type: 'Spree::CreditCard') }
-    scope :with_state, ->(s) { where(state: s.to_s) }
+    scope :with_state, ->(state) { where(state: state.to_s) }
     # "offset" is reserved by activerecord
     scope :offset_payment, -> { where("source_type = 'Spree::Payment' AND amount < 0 AND state = 'completed'") }
 
@@ -63,44 +63,7 @@ module Spree
     scope :store_credits, -> { where(source_type: Spree::StoreCredit.to_s) }
     scope :not_store_credits, -> { where(arel_table[:source_type].not_eq(Spree::StoreCredit.to_s).or(arel_table[:source_type].eq(nil))) }
 
-    # order state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)
-    state_machine initial: :checkout do
-      # With card payments, happens before purchase or authorization happens
-      #
-      # Setting it after creating a profile and authorizing a full amount will
-      # prevent the payment from being authorized again once Order transitions
-      # to complete
-      event :started_processing do
-        transition from: [:checkout, :pending, :completed, :processing], to: :processing
-      end
-      # When processing during checkout fails
-      event :failure do
-        transition from: [:pending, :processing], to: :failed
-      end
-      # With card payments this represents authorizing the payment
-      event :pend do
-        transition from: [:checkout, :processing], to: :pending
-      end
-      # With card payments this represents completing a purchase or capture transaction
-      event :complete do
-        transition from: [:processing, :pending, :checkout], to: :completed
-      end
-      event :void do
-        transition from: [:pending, :processing, :completed, :checkout], to: :void
-      end
-      # when the card brand isnt supported
-      event :invalidate do
-        transition from: [:checkout], to: :invalid
-      end
-
-      after_transition do |payment, transition|
-        payment.state_changes.create!(
-          previous_state: transition.from,
-          next_state:     transition.to,
-          name:           'payment'
-        )
-      end
-    end
+    include ::Spree::Config.state_machines.payment
 
     # @return [String] this payment's response code
     def transaction_id
@@ -232,8 +195,8 @@ module Spree
       return if source.imported
 
       payment_method.create_profile(self)
-    rescue ActiveMerchant::ConnectionError => e
-      gateway_error e
+    rescue ActiveMerchant::ConnectionError => error
+      gateway_error error
     end
 
     def invalidate_old_payments

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

@@ -199,8 +199,8 @@ module Spree
 
       def protect_from_connection_error
           yield
-      rescue ActiveMerchant::ConnectionError => e
-          gateway_error(e)
+      rescue ActiveMerchant::ConnectionError => error
+          gateway_error(error)
       end
 
       def gateway_error(error)