solidus_core 1.0.7 → 1.1.0.beta1

data/app/models/spree/item_adjustments.rb

@@ -41,7 +41,7 @@ module Spree
       promotion_adjustments = adjustments.select(&:promotion?)
       promotion_adjustments.each(&:update!)
 
-      promo_total = PromotionChooser.new(promotion_adjustments).update
+      promo_total = Spree::Config.promotion_chooser_class.new(promotion_adjustments).update
 
       # Calculating the totals for the order here would be incorrect. Order's
       # totals are the sum of the adjustments on all child models, as well as

data/app/models/spree/line_item_action.rb

@@ -1,5 +1,5 @@
 module Spree
-  class LineItemAction < ActiveRecord::Base
+  class LineItemAction < Spree::Base
     belongs_to :line_item
     belongs_to :action, class_name: "Spree::PromotionAction"
   end

data/app/models/spree/option_type.rb

@@ -17,14 +17,15 @@ module Spree
     validates :name, presence: true, uniqueness: true
     validates :presentation, presence: true
 
-    default_scope -> { order("#{self.table_name}.position") }
+    default_scope -> { order(:position) }
 
     accepts_nested_attributes_for :option_values, reject_if: lambda { |ov| ov[:name].blank? || ov[:presentation].blank? }, allow_destroy: true
 
     after_touch :touch_all_products
+    after_save :touch_all_products
 
     def touch_all_products
-      products.update_all(updated_at: Time.current)
+      products.find_each(&:touch)
     end
   end
 end

data/app/models/spree/option_value.rb

@@ -9,7 +9,7 @@ module Spree
     validates :name, presence: true, uniqueness: { scope: :option_type_id }
     validates :presentation, presence: true
 
-    after_save :touch
+    after_save :touch, if: :changed?
     after_touch :touch_all_variants
 
     self.whitelisted_ransackable_attributes = ['presentation']

data/app/models/spree/option_values_variant.rb

@@ -1,5 +1,5 @@
 module Spree
-  class OptionValuesVariant < ActiveRecord::Base
+  class OptionValuesVariant < Spree::Base
     belongs_to :variant
     belongs_to :option_value
   end

data/app/models/spree/order.rb

@@ -48,11 +48,11 @@ module Spree
 
     belongs_to :store, class_name: 'Spree::Store'
     has_many :state_changes, as: :stateful
-    has_many :line_items, -> { order('created_at', 'id') }, dependent: :destroy, inverse_of: :order
+    has_many :line_items, -> { order(:created_at, :id) }, dependent: :destroy, inverse_of: :order
     has_many :payments, dependent: :destroy
     has_many :return_authorizations, dependent: :destroy, inverse_of: :order
     has_many :reimbursements, inverse_of: :order
-    has_many :adjustments, -> { order("#{Adjustment.table_name}.created_at ASC") }, as: :adjustable, inverse_of: :adjustable, dependent: :destroy
+    has_many :adjustments, -> { order(:created_at) }, as: :adjustable, inverse_of: :adjustable, dependent: :destroy
     has_many :line_item_adjustments, through: :line_items, source: :adjustments
     has_many :shipment_adjustments, through: :shipments, source: :adjustments
     has_many :inventory_units, inverse_of: :order
@@ -82,7 +82,7 @@ module Spree
     # Needs to happen before save_permalink is called
     before_validation :set_currency
     before_validation :generate_order_number, on: :create
-    before_validation :clone_billing_address, if: :use_billing?
+    before_validation :assign_billing_to_shipping_address, if: :use_billing?
     attr_accessor :use_billing
 
 
@@ -93,7 +93,6 @@ module Spree
     validates :email, presence: true, if: :require_email
     validates :email, email: true, if: :require_email, allow_blank: true
     validates :number, presence: true, uniqueness: { allow_blank: true }
-    validate :has_available_shipment
 
     make_permalink field: :number
 
@@ -191,6 +190,7 @@ module Spree
     end
 
     def confirmation_required?
+      ActiveSupport::Deprecation.warn "Order#confirmation_required is deprecated.", caller
       true
     end
 
@@ -217,12 +217,8 @@ module Spree
       updater.update
     end
 
-    def clone_billing_address
-      if bill_address and self.ship_address.nil?
-        self.ship_address = bill_address.dup
-      else
-        self.ship_address.attributes = bill_address.attributes.except('id', 'updated_at', 'created_at')
-      end
+    def assign_billing_to_shipping_address
+      self.ship_address = bill_address if bill_address
       true
     end
 
@@ -272,7 +268,7 @@ module Spree
 
       self.number ||= loop do
         # Make a random number.
-        random = "#{options[:prefix]}#{(0...options[:length]).map { possible.shuffle.first }.join}"
+        random = "#{options[:prefix]}#{(0...options[:length]).map { possible.sample }.join}"
         # Use the random  number if no other order exists with it.
         if self.class.exists?(number: random)
           # If over half of all possible options are taken add another digit.
@@ -330,10 +326,14 @@ module Spree
     end
 
     def outstanding_balance
+      # If reimbursement has happened add it back to total to prevent balance_due payment state
+      # See: https://github.com/spree/spree/issues/6229
+      adjusted_payment_total = payment_total + refund_total
+
       if state == 'canceled'
-        -1 * payment_total
+        -1 * adjusted_payment_total
       else
-        total - payment_total
+        total - adjusted_payment_total
       end
     end
 
@@ -341,6 +341,10 @@ module Spree
       self.outstanding_balance != 0
     end
 
+    def refund_total
+      payments.flat_map(&:refunds).sum(&:amount)
+    end
+
     def name
       if (address = bill_address || ship_address)
         "#{address.firstname} #{address.lastname}"
@@ -365,7 +369,7 @@ module Spree
     # Called after transition to complete state when payments will have been processed
     def finalize!
       # lock all adjustments (coupon promotions, etc.)
-      all_adjustments.each{|a| a.close}
+      all_adjustments.each(&:finalize!)
 
       # update payment and shipment(s) states, and save
       updater.update_payment_state
@@ -390,7 +394,7 @@ module Spree
     end
 
     def deliver_order_confirmation_email
-      OrderMailer.confirm_email(self.id).deliver_now
+      OrderMailer.confirm_email(self).deliver_later
       update_column(:confirmation_delivered, true)
     end
 
@@ -400,7 +404,10 @@ module Spree
     end
 
     def available_payment_methods
-      @available_payment_methods ||= (PaymentMethod.available(:front_end) + PaymentMethod.available(:both)).uniq
+      @available_payment_methods ||= (
+        PaymentMethod.available(:front_end, store: store) +
+        PaymentMethod.available(:both, store: store)
+      ).uniq
     end
 
     def billing_firstname
@@ -509,6 +516,8 @@ module Spree
     end
 
     def create_proposed_shipments
+      return self.shipments if unreturned_exchange?
+
       if completed?
         raise CannotRebuildShipments.new(Spree.t(:cannot_rebuild_shipments_order_completed))
       elsif shipments.any? { |s| !s.pending? }
@@ -556,7 +565,7 @@ module Spree
     end
 
     def shipping_eq_billing_address?
-      (bill_address.empty? && ship_address.empty?) || bill_address.same_as?(ship_address)
+      bill_address == ship_address
     end
 
     def set_shipments_cost
@@ -587,19 +596,6 @@ module Spree
       !approved?
     end
 
-    # moved from api order_decorator. This is a better place for it.
-    def update_line_items(line_item_params)
-      return if line_item_params.blank?
-      line_item_params.each_value do |attributes|
-        if attributes[:id].present?
-          self.line_items.find(attributes[:id]).update_attributes!(attributes)
-        else
-          self.line_items.create!(attributes)
-        end
-      end
-      self.ensure_updated_shipments
-    end
-
     def reload(options=nil)
       remove_instance_variable(:@tax_zone) if defined?(@tax_zone)
       super
@@ -713,23 +709,6 @@ module Spree
       Spree::Money.new(total_available_store_credit - total_applicable_store_credit, { currency: currency })
     end
 
-    def payments_attributes=(attributes)
-      validate_payments_attributes(attributes)
-      super(attributes)
-    end
-
-    def validate_payments_attributes(attributes)
-      attributes = Array.wrap(attributes)
-      # Ensure the payment methods specified are allowed for this user
-      payment_methods = Spree::PaymentMethod.where(id: available_payment_methods)
-      attributes.each do |payment_attributes|
-        payment_method_id = payment_attributes[:payment_method_id]
-
-        # raise RecordNotFound unless it is an allowed payment method
-        payment_methods.find(payment_method_id) if payment_method_id
-      end
-    end
-
     private
 
     def link_by_email
@@ -770,18 +749,11 @@ module Spree
       end
     end
 
-    def has_available_shipment
-      return unless has_step?("delivery")
-      return unless has_step?(:address) && address?
-      return unless ship_address && ship_address.valid?
-      # errors.add(:base, :no_shipping_methods_available) if available_shipping_methods.empty?
-    end
-
     def ensure_available_shipping_rates
       if shipments.empty? || shipments.any? { |shipment| shipment.shipping_rates.blank? }
         # After this point, order redirects back to 'address' state and asks user to pick a proper address
         # Therefore, shipments are not necessary at this point.
-        shipments.delete_all
+        shipments.destroy_all
         errors.add(:base, Spree.t(:items_cannot_be_shipped)) and return false
       end
     end
@@ -796,7 +768,7 @@ module Spree
     end
 
     def send_cancel_email
-      OrderMailer.cancel_email(self.id).deliver_now
+      OrderMailer.cancel_email(self).deliver_later
     end
 
     def after_resume

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

@@ -67,6 +67,10 @@ module Spree
                 transition to: :awaiting_return
               end
 
+              event :complete do
+                transition to: :complete, from: :confirm
+              end
+
               if states[:payment]
                 event :payment_failed do
                   transition to: :payment, from: :confirm
@@ -81,11 +85,6 @@ module Spree
 
                 # see also process_payments_before_complete below which needs to
                 # be added in the correct sequence.
-
-                event :complete do
-                  transition to: :complete, from: :confirm
-                  transition to: :complete, from: :payment
-                end
               end
 
               before_transition from: :cart, do: :ensure_line_items_present
@@ -274,12 +273,21 @@ module Spree
             success
           end
 
+          def bill_address_attributes=(attributes)
+            self.bill_address = Address.immutable_merge(bill_address, attributes)
+          end
+
+          def ship_address_attributes=(attributes)
+            self.ship_address = Address.immutable_merge(ship_address, attributes)
+          end
+
           def assign_default_addresses!
             if self.user
-              self.bill_address = user.bill_address.try!(:dup) if !self.bill_address_id && user.bill_address.try!(:valid?)
+              # this is one of 2 places still using User#bill_address
+              self.bill_address ||= user.bill_address if user.bill_address.try!(:valid?)
               # Skip setting ship address if order doesn't have a delivery checkout step
               # to avoid triggering validations on shipping address
-              self.ship_address = user.ship_address.try!(:dup) if !self.ship_address_id && user.ship_address.try!(:valid?) && self.checkout_steps.include?("delivery")
+              self.ship_address ||= user.ship_address if user.ship_address.try!(:valid?) && self.checkout_steps.include?("delivery")
             end
           end
 
@@ -292,6 +300,7 @@ module Spree
           def persist_user_credit_card
             if !self.temporary_credit_card && self.user_id && self.valid_credit_cards.present?
               default_cc = self.valid_credit_cards.first
+              # TODO target for refactoring -- why is order checkout responsible for the user -> credit_card relationship?
               default_cc.user_id = self.user_id
               default_cc.default = true
               default_cc.save
@@ -302,7 +311,8 @@ module Spree
             if self.payments.from_credit_card.count == 0 && self.user && self.user.default_credit_card.try(:valid?)
               cc = self.user.default_credit_card
               self.payments.create!(payment_method_id: cc.payment_method_id, source: cc)
-              self.bill_address ||= self.user.bill_address.try!(:dup) if self.user.bill_address.try!(:valid?)
+              # this is one of 2 places still using User#bill_address
+              self.bill_address ||= user.default_credit_card.address || user.bill_address
             end
           end
 
@@ -326,10 +336,6 @@ module Spree
             end
           end
 
-          # For payment step, filter order parameters to produce the expected nested
-          # attributes for a single payment and its source, discarding attributes
-          # for payment methods other than the one selected
-          #
           # In case a existing credit card is provided it needs to build the payment
           # attributes from scratch so we can set the amount. example payload:
           #
@@ -340,14 +346,6 @@ module Spree
           #   }
           #
           def update_params_payment_source
-            if @updating_params[:payment_source].present?
-              source_params = @updating_params.delete(:payment_source)[@updating_params[:order][:payments_attributes].first[:payment_method_id].to_s]
-
-              if source_params
-                @updating_params[:order][:payments_attributes].first[:source_attributes] = source_params
-              end
-            end
-
             if @updating_params[:order] && (@updating_params[:order][:payments_attributes] || @updating_params[:order][:existing_card])
               @updating_params[:order][:payments_attributes] ||= [{}]
               @updating_params[:order][:payments_attributes].first[:amount] = self.total

data/app/models/spree/order_mutex.rb

@@ -1,5 +1,5 @@
 module Spree
-  class OrderMutex < ActiveRecord::Base
+  class OrderMutex < Spree::Base
 
     class LockFailed < StandardError; end
 

data/app/models/spree/order_promotion.rb

@@ -3,7 +3,7 @@ module Spree
   #
   # 1. A promotion that a user attempted to apply to their order
   # 2. The specific code that they used
-  class OrderPromotion < ActiveRecord::Base
+  class OrderPromotion < Spree::Base
     self.table_name = 'spree_orders_promotions'
 
     belongs_to :order, class_name: 'Spree::Order'

data/app/models/spree/order_shipping.rb

@@ -72,9 +72,9 @@ class Spree::OrderShipping
       end
     end
 
-    send_shipment_email(carton) if stock_location.fulfillable? && !suppress_mailer # e.g. digital gift cards that aren't actually shipped
+    send_shipment_emails(carton) if stock_location.fulfillable? && !suppress_mailer # e.g. digital gift cards that aren't actually shipped
     fulfill_order_stock_locations(stock_location)
-    update_order_state
+    @order.update!
 
     carton
   end
@@ -85,15 +85,9 @@ class Spree::OrderShipping
     Spree::OrderStockLocation.fulfill_for_order_with_stock_location(@order, stock_location)
   end
 
-  def update_order_state
-    new_state = Spree::OrderUpdater.new(@order).update_shipment_state
-    @order.update_columns(
-      shipment_state: new_state,
-      updated_at: Time.now,
-    )
-  end
-
-  def send_shipment_email(carton)
-    Spree::CartonMailer.shipped_email(carton.id).deliver_now
+  def send_shipment_emails(carton)
+    carton.orders.each do |order|
+      Spree::CartonMailer.shipped_email(order: order, carton: carton).deliver_later
+    end
   end
 end

data/app/models/spree/order_stock_location.rb

@@ -1,5 +1,5 @@
 module Spree
-  class OrderStockLocation < ActiveRecord::Base
+  class OrderStockLocation < Spree::Base
     belongs_to :variant, class_name: "Spree::Variant"
     belongs_to :stock_location, class_name: "Spree::StockLocation"
     belongs_to :order, class_name: "Spree::Order"

data/app/models/spree/payment.rb

@@ -35,9 +35,8 @@ module Spree
 
     validates :amount, numericality: true
     validates :source, presence: true, if: :source_required?
-    validates :payment_method, presence: true
 
-    default_scope -> { order("#{self.table_name}.created_at") }
+    default_scope -> { order(:created_at) }
 
     scope :from_credit_card, -> { where(source_type: 'Spree::CreditCard') }
     scope :with_state, ->(s) { where(state: s.to_s) }
@@ -244,18 +243,8 @@ module Spree
       end
 
       def update_order
-        if completed? || void?
-          order.updater.update_payment_total
-        end
-
-        if order.completed?
-          order.updater.update_payment_state
-          order.updater.update_shipments
-          order.updater.update_shipment_state
-        end
-
-        if self.completed? || order.completed?
-          order.persist_totals
+        if order.completed? || completed? || void?
+          order.update!
         end
       end
 

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

@@ -51,7 +51,6 @@ module Spree
         amount ||= money.money.cents
         started_processing!
         protect_from_connection_error do
-          check_environment
           # Standard ActiveMerchant capture usage
           response = payment_method.capture(
             amount,
@@ -68,7 +67,6 @@ module Spree
       def void_transaction!
         return true if void?
         protect_from_connection_error do
-          check_environment
 
           if payment_method.payment_profiles_supported?
             # Gateways supporting payment profiles will need access to credit card object because this stores the payment profile information
@@ -106,8 +104,13 @@ module Spree
                          :discount => order.promo_total * 100,
                          :currency => currency })
 
-        options.merge!({ :billing_address  => order.bill_address.try(:active_merchant_hash),
-                        :shipping_address => order.ship_address.try(:active_merchant_hash) })
+        bill_address = source.try(:address)
+        bill_address ||= order.bill_address
+
+        options.merge!(
+          billing_address: bill_address.try!(:active_merchant_hash),
+          shipping_address: order.ship_address.try!(:active_merchant_hash),
+        )
 
         options
       end
@@ -150,8 +153,6 @@ module Spree
 
       def gateway_action(source, action, success_state)
         protect_from_connection_error do
-          check_environment
-
           response = payment_method.send(action, money.money.cents,
                                          source,
                                          gateway_options)
@@ -215,14 +216,6 @@ module Spree
         raise Core::GatewayError.new(text)
       end
 
-      # Saftey check to make sure we're not accidentally performing operations on a live gateway.
-      # Ex. When testing in staging environment with a copy of production data.
-      def check_environment
-        return if payment_method.environment == Rails.env
-        message = Spree.t(:gateway_config_unavailable) + " - #{Rails.env}"
-        raise Core::GatewayError.new(message)
-      end
-
       # The unique identifier to be passed in to the payment gateway
       def gateway_order_id
         "#{order.number}-#{self.identifier}"