solidus_core 2.9.5 → 2.10.2

data/app/models/spree/line_item_action.rb

@@ -2,7 +2,7 @@
 
 module Spree
   class LineItemAction < Spree::Base
-    belongs_to :line_item
-    belongs_to :action, class_name: "Spree::PromotionAction"
+    belongs_to :line_item, optional: true
+    belongs_to :action, class_name: "Spree::PromotionAction", optional: true
   end
 end

data/app/models/spree/log_entry.rb

@@ -2,7 +2,7 @@
 
 module Spree
   class LogEntry < Spree::Base
-    belongs_to :source, polymorphic: true
+    belongs_to :source, polymorphic: true, optional: true
 
     def parsed_details
       @details ||= YAML.load(details)

data/app/models/spree/option_value.rb

@@ -2,7 +2,7 @@
 
 module Spree
   class OptionValue < Spree::Base
-    belongs_to :option_type, class_name: 'Spree::OptionType', inverse_of: :option_values
+    belongs_to :option_type, class_name: 'Spree::OptionType', inverse_of: :option_values, optional: true
     acts_as_list scope: :option_type
 
     has_many :option_values_variants, dependent: :destroy

data/app/models/spree/option_values_variant.rb

@@ -2,7 +2,7 @@
 
 module Spree
   class OptionValuesVariant < Spree::Base
-    belongs_to :variant
-    belongs_to :option_value
+    belongs_to :variant, optional: true
+    belongs_to :option_value, optional: true
   end
 end

data/app/models/spree/order.rb

@@ -55,15 +55,15 @@ module Spree
     deprecate :temporary_credit_card= => :temporary_payment_source=, deprecator: Spree::Deprecation
 
     # Customer info
-    belongs_to :user, class_name: Spree::UserClassHandle.new
-    belongs_to :bill_address, foreign_key: :bill_address_id, class_name: 'Spree::Address'
+    belongs_to :user, class_name: Spree::UserClassHandle.new, optional: true
+    belongs_to :bill_address, foreign_key: :bill_address_id, class_name: 'Spree::Address', optional: true
     alias_attribute :billing_address, :bill_address
 
-    belongs_to :ship_address, foreign_key: :ship_address_id, class_name: 'Spree::Address'
+    belongs_to :ship_address, foreign_key: :ship_address_id, class_name: 'Spree::Address', optional: true
     alias_attribute :shipping_address, :ship_address
     alias_attribute :ship_total, :shipment_total
 
-    belongs_to :store, class_name: 'Spree::Store'
+    belongs_to :store, class_name: 'Spree::Store', optional: true
 
     # Items
     has_many :line_items, -> { order(:created_at, :id) }, dependent: :destroy, inverse_of: :order
@@ -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
@@ -101,9 +102,9 @@ module Spree
 
     # Logging
     has_many :state_changes, as: :stateful
-    belongs_to :created_by, class_name: Spree::UserClassHandle.new
-    belongs_to :approver, class_name: Spree::UserClassHandle.new
-    belongs_to :canceler, class_name: Spree::UserClassHandle.new
+    belongs_to :created_by, class_name: Spree::UserClassHandle.new, optional: true
+    belongs_to :approver, class_name: Spree::UserClassHandle.new, optional: true
+    belongs_to :canceler, class_name: Spree::UserClassHandle.new, optional: true
 
     accepts_nested_attributes_for :line_items
     accepts_nested_attributes_for :bill_address
@@ -435,13 +436,6 @@ module Spree
       touch :completed_at
 
       Spree::Event.fire 'order_finalized', order: self
-
-      if method(:deliver_order_confirmation_email).owner != self.class
-        Spree::Deprecation.warn \
-          "deliver_order_confirmation_email has been deprecated and moved to " \
-          "Spree::MailerSubscriber#order_finalized, please move there any customizations.",
-          caller(1)
-      end
     end
 
     def fulfill!
@@ -450,16 +444,6 @@ module Spree
       save!
     end
 
-    def deliver_order_confirmation_email
-      Spree::Deprecation.warn \
-        "deliver_order_confirmation_email has been deprecated and moved to " \
-        "Spree::MailerSubscriber#order_finalized.",
-        caller(1)
-
-      Spree::Config.order_mailer_class.confirm_email(order).deliver_later
-      order.update_column(:confirmation_delivered, true)
-    end
-
     # Helper methods for checkout steps
     def paid?
       %w(paid credit_owed).include?(payment_state)
@@ -548,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
@@ -676,7 +660,7 @@ module Spree
       if remaining_total.zero?
         other_payments.each(&:invalidate!)
       elsif other_payments.size == 1
-        other_payments.first.update_attributes!(amount: remaining_total)
+        other_payments.first.update!(amount: remaining_total)
       end
 
       payments.reset
@@ -703,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_cancellations.rb

@@ -139,7 +139,7 @@ class Spree::OrderCancellations
 
     shipments.each do |shipment|
       if shipment.inventory_units.all? { |iu| iu.shipped? || iu.canceled? }
-        shipment.update_attributes!(state: 'shipped', shipped_at: Time.current)
+        shipment.update!(state: 'shipped', shipped_at: Time.current)
       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_contents.rb

@@ -35,7 +35,7 @@ module Spree
     end
 
     def update_cart(params)
-      if order.update_attributes(params)
+      if order.update(params)
         unless order.completed?
           order.line_items = order.line_items.select { |li| li.quantity > 0 }
           # Update totals, then check if the order is eligible for any cart promotions.
@@ -61,7 +61,7 @@ module Spree
         raise ArgumentError, 'user or name must be specified'
       end
 
-      order.update_attributes!(
+      order.update!(
         approver: user,
         approver_name: name,
         approved_at: Time.current

data/app/models/spree/order_mutex.rb

@@ -4,7 +4,7 @@ module Spree
   class OrderMutex < Spree::Base
     class LockFailed < StandardError; end
 
-    belongs_to :order, class_name: "Spree::Order"
+    belongs_to :order, class_name: "Spree::Order", optional: true
 
     scope :expired, -> { where(arel_table[:created_at].lteq(Spree::Config[:order_mutex_max_age].seconds.ago)) }
 

data/app/models/spree/order_promotion.rb

@@ -8,9 +8,9 @@ module Spree
   class OrderPromotion < Spree::Base
     self.table_name = 'spree_orders_promotions'
 
-    belongs_to :order, class_name: 'Spree::Order'
-    belongs_to :promotion, class_name: 'Spree::Promotion'
-    belongs_to :promotion_code, class_name: 'Spree::PromotionCode'
+    belongs_to :order, class_name: 'Spree::Order', optional: true
+    belongs_to :promotion, class_name: 'Spree::Promotion', optional: true
+    belongs_to :promotion_code, class_name: 'Spree::PromotionCode', optional: true
 
     validates :order, presence: true
     validates :promotion, presence: true

data/app/models/spree/order_shipping.rb

@@ -64,7 +64,7 @@ class Spree::OrderShipping
     inventory_units.map(&:shipment).uniq.each do |shipment|
       # Temporarily propagate the tracking number to the shipment as well
       # TODO: Remove tracking numbers from shipments.
-      shipment.update_attributes!(tracking: tracking_number)
+      shipment.update!(tracking: tracking_number)
 
       next unless shipment.inventory_units.reload.all? { |iu| iu.shipped? || iu.canceled? }
       # TODO: make OrderShipping#ship_shipment call Shipment#ship! rather than

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
@@ -74,7 +74,7 @@ module Spree
         label: tax_item.label,
         included: tax_item.included_in_price
       )
-      tax_adjustment.update_attributes!(amount: tax_item.amount)
+      tax_adjustment.update!(amount: tax_item.amount)
       tax_adjustment
     end
   end

data/app/models/spree/payment.rb

@@ -15,9 +15,9 @@ module Spree
     NON_RISKY_AVS_CODES = ['B', 'D', 'H', 'J', 'M', 'Q', 'T', 'V', 'X', 'Y'].freeze
     RISKY_AVS_CODES     = ['A', 'C', 'E', 'F', 'G', 'I', 'K', 'L', 'N', 'O', 'P', 'R', 'S', 'U', 'W', 'Z'].freeze
 
-    belongs_to :order, class_name: 'Spree::Order', touch: true, inverse_of: :payments
-    belongs_to :source, polymorphic: true
-    belongs_to :payment_method, -> { with_deleted }, class_name: 'Spree::PaymentMethod', inverse_of: :payments
+    belongs_to :order, class_name: 'Spree::Order', touch: true, inverse_of: :payments, optional: true
+    belongs_to :source, polymorphic: true, optional: true
+    belongs_to :payment_method, -> { with_deleted }, class_name: 'Spree::PaymentMethod', inverse_of: :payments, optional: true
 
     has_many :offsets, -> { offset_payment }, class_name: "Spree::Payment", foreign_key: :source_id
     has_many :log_entries, as: :source
@@ -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
@@ -273,7 +236,7 @@ module Spree
       # type of payment getting refunded, hence the additional check
       # if the source is a store credit.
       if store_credit? && source.is_a?(Spree::StoreCredit)
-        source.update_attributes!({
+        source.update!({
           action: Spree::StoreCredit::ELIGIBLE_ACTION,
           action_amount: amount,
           action_authorization_code: response_code

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

@@ -59,7 +59,7 @@ module Spree
           )
           money = ::Money.new(amount, currency)
           capture_events.create!(amount: money.to_d)
-          update_attributes!(amount: captured_amount)
+          update!(amount: captured_amount)
           handle_response(response, :complete, :failure)
         end
       end
@@ -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)

data/app/models/spree/payment_capture_event.rb

@@ -2,7 +2,7 @@
 
 module Spree
   class PaymentCaptureEvent < Spree::Base
-    belongs_to :payment, class_name: 'Spree::Payment'
+    belongs_to :payment, class_name: 'Spree::Payment', optional: true
 
     def display_amount
       Spree::Money.new(amount, { currency: payment.currency })

data/app/models/spree/payment_method.rb

@@ -93,8 +93,8 @@ module Spree
           else
             active.available_to_users.available_to_admin
           end
-        available_payment_methods.select do |p|
-          store.nil? || store.payment_methods.empty? || store.payment_methods.include?(p)
+        available_payment_methods.select do |payment|
+          store.nil? || store.payment_methods.empty? || store.payment_methods.include?(payment)
         end
       end
 
@@ -199,6 +199,9 @@ module Spree
     #     4. app/views/spree/admin/payments/source_views/_{partial_name}.html.erb
     #     The view that represents your payment method on orders in the backend
     #
+    #     5. app/views/spree/api/payments/source_views/_{partial_name}.json.jbuilder
+    #     The view that represents your payment method on orders through the api
+    #
     def partial_name
       deprecated_method_type_override || type.demodulize.underscore
     end

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

@@ -19,7 +19,7 @@ module Spree
       return if payment.source.has_payment_profile?
       # simulate the storage of credit card profile using remote service
       if success = VALID_CCS.include?(payment.source.number)
-        payment.source.update_attributes(gateway_customer_profile_id: generate_profile_id(success))
+        payment.source.update(gateway_customer_profile_id: generate_profile_id(success))
       end
     end
 

data/app/models/spree/payment_source.rb

@@ -4,7 +4,7 @@ module Spree
   class PaymentSource < Spree::Base
     self.abstract_class = true
 
-    belongs_to :payment_method
+    belongs_to :payment_method, optional: true
 
     has_many :payments, as: :source
     has_many :wallet_payment_sources, class_name: 'Spree::WalletPaymentSource', as: :payment_source, inverse_of: :payment_source

data/app/models/spree/price.rb

@@ -12,8 +12,8 @@ module Spree
 
     MAXIMUM_AMOUNT = BigDecimal('99_999_999.99')
 
-    belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant', touch: true
-    belongs_to :country, class_name: "Spree::Country", foreign_key: "country_iso", primary_key: "iso"
+    belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant', touch: true, optional: true
+    belongs_to :country, class_name: "Spree::Country", foreign_key: "country_iso", primary_key: "iso", optional: true
 
     delegate :product, to: :variant
     delegate :tax_rates, to: :variant

data/app/models/spree/product.rb

@@ -25,7 +25,7 @@ module Spree
       variants_including_master.discard_all
       self.product_option_types = []
       self.product_properties = []
-      self.classifications = []
+      self.classifications.destroy_all
       self.product_promotion_rules = []
     end
 
@@ -44,8 +44,8 @@ module Spree
     has_many :product_promotion_rules, dependent: :destroy
     has_many :promotion_rules, through: :product_promotion_rules
 
-    belongs_to :tax_category, class_name: 'Spree::TaxCategory'
-    belongs_to :shipping_category, class_name: 'Spree::ShippingCategory', inverse_of: :products
+    belongs_to :tax_category, class_name: 'Spree::TaxCategory', optional: true
+    belongs_to :shipping_category, class_name: 'Spree::ShippingCategory', inverse_of: :products, optional: true
 
     has_one :master,
       -> { where(is_master: true).with_deleted },
@@ -190,7 +190,7 @@ module Spree
     # @return [Hash] option_type as keys, array of variants as values.
     def categorise_variants_from_option(opt_type, pricing_options = Spree::Config.default_pricing_options)
       return {} unless option_types.include?(opt_type)
-      variants.with_prices(pricing_options).group_by { |v| v.option_values.detect { |o| o.option_type == opt_type } }
+      variants.with_prices(pricing_options).group_by { |variant| variant.option_values.detect { |option| option.option_type == opt_type } }
     end
     deprecate :categorise_variants_from_option, deprecator: Spree::Deprecation
 
@@ -323,7 +323,7 @@ module Spree
 
     def any_variants_not_track_inventory?
       if variants_including_master.loaded?
-        variants_including_master.any? { |v| !v.should_track_inventory? }
+        variants_including_master.any? { |variant| !variant.should_track_inventory? }
       else
         !Spree::Config.track_inventory_levels || variants_including_master.where(track_inventory: false).exists?
       end