solidus_core 1.2.3 → 1.3.0.beta1

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

@@ -1,61 +1,58 @@
 module Spree
   class Order < Spree::Base
     module Payments
-      extend ActiveSupport::Concern
-      included do
-        # processes any pending payments and must return a boolean as it's
-        # return value is used by the checkout state_machine to determine
-        # success or failure of the 'complete' event for the order
-        #
-        # Returns:
-        #
-        # - true if all pending payments processed successfully
-        #
-        # - true if a payment failed, ie. raised a GatewayError
-        #   which gets rescued and converted to TRUE when
-        #   :allow_checkout_gateway_error is set to true
-        #
-        # - false if a payment failed, ie. raised a GatewayError
-        #   which gets rescued and converted to FALSE when
-        #   :allow_checkout_on_gateway_error is set to false
-        #
-        def process_payments!
-          process_payments_with(:process!)
-        end
+      # processes any pending payments and must return a boolean as it's
+      # return value is used by the checkout state_machine to determine
+      # success or failure of the 'complete' event for the order
+      #
+      # Returns:
+      #
+      # - true if all pending payments processed successfully
+      #
+      # - true if a payment failed, ie. raised a GatewayError
+      #   which gets rescued and converted to TRUE when
+      #   :allow_checkout_gateway_error is set to true
+      #
+      # - false if a payment failed, ie. raised a GatewayError
+      #   which gets rescued and converted to FALSE when
+      #   :allow_checkout_on_gateway_error is set to false
+      #
+      def process_payments!
+        process_payments_with(:process!)
+      end
 
-        def authorize_payments!
-          process_payments_with(:authorize!)
-        end
+      def authorize_payments!
+        process_payments_with(:authorize!)
+      end
 
-        def capture_payments!
-          process_payments_with(:purchase!)
-        end
+      def capture_payments!
+        process_payments_with(:purchase!)
+      end
 
-        def unprocessed_payments
-          payments.select { |payment| payment.checkout? }
-        end
+      def unprocessed_payments
+        payments.select(&:checkout?)
+      end
 
-        private
+      private
 
-        def process_payments_with(method)
-          # Don't run if there is nothing to pay.
-          return true if payment_total >= total
-          # Prevent orders from transitioning to complete without a successfully processed payment.
-          raise Core::GatewayError.new(Spree.t(:no_payment_found)) if unprocessed_payments.empty?
+      def process_payments_with(method)
+        # Don't run if there is nothing to pay.
+        return true if payment_total >= total
+        # Prevent orders from transitioning to complete without a successfully processed payment.
+        raise Core::GatewayError.new(Spree.t(:no_payment_found)) if unprocessed_payments.empty?
 
-          unprocessed_payments.each do |payment|
-            break if payment_total >= total
+        unprocessed_payments.each do |payment|
+          break if payment_total >= total
 
-            payment.public_send(method)
+          payment.public_send(method)
 
-            if payment.completed?
-              self.payment_total += payment.amount
-            end
+          if payment.completed?
+            self.payment_total += payment.amount
           end
-        rescue Core::GatewayError => e
-          result = !!Spree::Config[:allow_checkout_on_gateway_error]
-          errors.add(:base, e.message) and return result
         end
+      rescue Core::GatewayError => e
+        result = !!Spree::Config[:allow_checkout_on_gateway_error]
+        errors.add(:base, e.message) && (return result)
       end
     end
   end

data/app/models/spree/order.rb

@@ -3,7 +3,6 @@ require 'spree/order/checkout'
 
 module Spree
   class Order < Spree::Base
-
     ORDER_NUMBER_LENGTH  = 9
     ORDER_NUMBER_LETTERS = false
     ORDER_NUMBER_PREFIX  = 'R'
@@ -28,7 +27,7 @@ module Spree
     end
 
     self.whitelisted_ransackable_associations = %w[shipments user promotions bill_address ship_address line_items]
-    self.whitelisted_ransackable_attributes =  %w[completed_at created_at email number state payment_state shipment_state total]
+    self.whitelisted_ransackable_attributes = %w[completed_at created_at email number state payment_state shipment_state total]
 
     attr_reader :coupon_code
     attr_accessor :temporary_address, :temporary_credit_card
@@ -70,7 +69,7 @@ module Spree
     has_many :order_promotions, class_name: 'Spree::OrderPromotion'
     has_many :promotions, through: :order_promotions
 
-    has_many :cartons, -> { uniq }, through: :inventory_units
+    has_many :cartons, -> { distinct }, through: :inventory_units
     has_many :shipments, dependent: :destroy, inverse_of: :order do
       def states
         pluck(:state).uniq
@@ -84,18 +83,19 @@ module Spree
     accepts_nested_attributes_for :shipments
 
     # Needs to happen before save_permalink is called
+    before_validation :associate_store
     before_validation :set_currency
     before_validation :generate_order_number, on: :create
     before_validation :assign_billing_to_shipping_address, if: :use_billing?
     attr_accessor :use_billing
 
-
     before_create :create_token
     before_create :link_by_email
 
     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 }
+    validates :store_id, presence: true
 
     make_permalink field: :number
 
@@ -104,7 +104,6 @@ module Spree
     alias_method :billing_firstname, :bill_address_firstname
     alias_method :billing_lastname, :bill_address_lastname
 
-
     class_attribute :update_hooks
     self.update_hooks = Set.new
 
@@ -146,18 +145,18 @@ module Spree
     # Use this method in other gems that wish to register their own custom logic
     # that should be called after Order#update
     def self.register_update_hook(hook)
-      self.update_hooks.add(hook)
+      update_hooks.add(hook)
     end
 
     # Use this method in other gems that wish to register their own custom logic
     # that should be called when determining if two line items are equal.
     def self.register_line_item_comparison_hook(hook)
-      self.line_item_comparison_hooks.add(hook)
+      line_item_comparison_hooks.add(hook)
     end
 
     # For compatiblity with Calculator::PriceSack
     def amount
-      line_items.inject(0.0) { |sum, li| sum + li.amount }
+      line_items.map(&:amount).sum
     end
 
     # Sum of all line item amounts pre-tax
@@ -165,6 +164,11 @@ module Spree
       line_items.to_a.sum(&:pre_tax_amount)
     end
 
+    # Sum of all line item amounts after promotions, before added tax
+    def discounted_item_amount
+      line_items.to_a.sum(&:discounted_amount)
+    end
+
     def currency
       self[:currency] || Spree::Config[:currency]
     end
@@ -174,7 +178,7 @@ module Spree
     end
 
     def to_param
-      number.to_s.to_url.upcase
+      number
     end
 
     def completed?
@@ -211,7 +215,11 @@ module Spree
 
     # Returns the address for taxation based on configuration
     def tax_address
-      Spree::Config[:tax_using_ship_address] ? ship_address : bill_address
+      if Spree::Config[:tax_using_ship_address]
+        ship_address
+      else
+        bill_address
+      end || store.default_cart_tax_location
     end
 
     def updater
@@ -228,12 +236,12 @@ module Spree
     end
 
     def allow_cancel?
-      return false unless completed? and state != 'canceled'
+      return false unless completed? && state != 'canceled'
       shipment_state.nil? || %w{ready backorder pending}.include?(shipment_state)
     end
 
     def all_inventory_units_returned?
-      inventory_units.all? { |inventory_unit| inventory_unit.returned? }
+      inventory_units.all?(&:returned?)
     end
 
     def contents
@@ -253,7 +261,7 @@ module Spree
       self.user = user
       attrs_to_set = { user_id: user.try(:id) }
       attrs_to_set[:email] = user.try(:email) if override_email
-      attrs_to_set[:created_by_id] = user.try(:id) if self.created_by.blank?
+      attrs_to_set[:created_by_id] = user.try(:id) if created_by.blank?
 
       if persisted?
         # immediately persist the changes we just made, but don't use save since we might have an invalid address associated
@@ -277,7 +285,7 @@ module Spree
         # 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.
-          options[:length] += 1 if self.class.count > (10 ** options[:length] / 2)
+          options[:length] += 1 if self.class.count > (10**options[:length] / 2)
         else
           break random
         end
@@ -300,8 +308,8 @@ module Spree
     def find_line_item_by_variant(variant, options = {})
       line_items.detect { |line_item|
                     line_item.variant_id == variant.id &&
-                    line_item_options_match(line_item, options)
-                  }
+                      line_item_options_match(line_item, options)
+      }
     end
 
     # This method enables extensions to participate in the
@@ -316,18 +324,15 @@ module Spree
     def line_item_options_match(line_item, options)
       return true unless options
 
-      self.line_item_comparison_hooks.all? { |hook|
-        self.send(hook, line_item, options)
+      line_item_comparison_hooks.all? { |hook|
+        send(hook, line_item, options)
       }
     end
 
     # Creates new tax charges if there are any applicable rates. If prices already
     # include taxes then price adjustments are created instead.
     def create_tax_charge!
-      # We want to only look up the applicable tax zone once and pass it to TaxRate calculation to avoid duplicated lookups.
-      order_tax_zone = self.tax_zone
-      Spree::TaxRate.adjust(order_tax_zone, line_items)
-      Spree::TaxRate.adjust(order_tax_zone, shipments) if shipments.any?
+      Spree::Tax::OrderAdjuster.new(self).adjust!
     end
 
     def outstanding_balance
@@ -343,7 +348,7 @@ module Spree
     end
 
     def outstanding_balance?
-      self.outstanding_balance != 0
+      outstanding_balance != 0
     end
 
     def refund_total
@@ -357,7 +362,7 @@ module Spree
     end
 
     def can_ship?
-      self.complete? || self.resumed? || self.awaiting_return? || self.returned?
+      complete? || resumed? || awaiting_return? || returned?
     end
 
     def credit_cards
@@ -412,7 +417,9 @@ module Spree
       @available_payment_methods ||= (
         PaymentMethod.available(:front_end, store: store) +
         PaymentMethod.available(:both, store: store)
-      ).uniq
+      ).
+      uniq.
+      sort_by(&:position)
     end
 
     def insufficient_stock_lines
@@ -453,40 +460,43 @@ module Spree
     def state_changed(name)
       state = "#{name}_state"
       if persisted?
-        old_state = self.send("#{state}_was")
-        new_state = self.send(state)
+        old_state = send("#{state}_was")
+        new_state = send(state)
         unless old_state == new_state
-          self.state_changes.create(
+          state_changes.create(
             previous_state: old_state,
             next_state:     new_state,
             name:           name,
-            user_id:        self.user_id
+            user_id:        user_id
           )
         end
       end
     end
 
     def coupon_code=(code)
-      @coupon_code = code.strip.downcase rescue nil
+      @coupon_code = begin
+                       code.strip.downcase
+                     rescue
+                       nil
+                     end
     end
 
     def can_add_coupon?
       Spree::Promotion.order_activatable?(self)
     end
 
-
     def shipped?
       %w(partial shipped).include?(shipment_state)
     end
 
     def ensure_shipping_address
       unless ship_address && ship_address.valid?
-        errors.add(:base, Spree.t(:ship_address_required)) and return false
+        errors.add(:base, Spree.t(:ship_address_required)) && (return false)
       end
     end
 
     def create_proposed_shipments
-      return self.shipments if unreturned_exchange?
+      return shipments if unreturned_exchange?
 
       if completed?
         raise CannotRebuildShipments.new(Spree.t(:cannot_rebuild_shipments_order_completed))
@@ -513,21 +523,20 @@ module Spree
     # e.g. customer goes back from payment step and changes order items
     def ensure_updated_shipments
       if !completed? && shipments.all?(&:pending?)
-        self.shipments.destroy_all
-        self.update_column(:shipment_total, 0)
+        shipments.destroy_all
+        update_column(:shipment_total, 0)
         restart_checkout_flow
       end
-
     end
 
     def restart_checkout_flow
-      return if self.state == 'cart'
+      return if state == 'cart'
 
-      self.update_columns(
+      update_columns(
         state: 'cart',
-        updated_at: Time.current,
+        updated_at: Time.current
       )
-      self.next! if self.line_items.size > 0
+      next! if line_items.size > 0
     end
 
     def refresh_shipment_rates
@@ -545,28 +554,28 @@ module Spree
     end
 
     def is_risky?
-      self.payments.risky.count > 0
+      payments.risky.count > 0
     end
 
     def canceled_by(user)
-      self.transaction do
+      transaction do
         cancel!
-        self.update_columns(
+        update_columns(
           canceler_id: user.id,
-          canceled_at: Time.current,
+          canceled_at: Time.current
         )
       end
     end
 
     def approved?
-      !!self.approved_at
+      !!approved_at
     end
 
     def can_approve?
       !approved?
     end
 
-    def reload(options=nil)
+    def reload(options = nil)
       remove_instance_variable(:@tax_zone) if defined?(@tax_zone)
       super
     end
@@ -600,8 +609,8 @@ module Spree
       #
       # FIXME: find a better way to determine if an order is an unreturned
       # exchange
-      shipment = self.shipments.first
-      shipment.present? ? (shipment.created_at < self.created_at - 1) : false
+      shipment = shipments.first
+      shipment.present? ? (shipment.created_at < created_at - 1) : false
     end
 
     def tax_total
@@ -645,9 +654,8 @@ module Spree
       payments.reset
 
       if payments.where(state: %w(checkout pending)).sum(:amount) != total
-        errors.add(:base, Spree.t("store_credit.errors.unable_to_fund")) and return false
+        errors.add(:base, Spree.t("store_credit.errors.unable_to_fund")) && (return false)
       end
-
     end
 
     def covered_by_store_credit?
@@ -681,32 +689,19 @@ 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]
+    private
 
-        # raise RecordNotFound unless it is an allowed payment method
-        payment_methods.find(payment_method_id) if payment_method_id
-      end
+    def associate_store
+      self.store ||= Spree::Store.default
     end
 
-    private
-
     def link_by_email
-      self.email = user.email if self.user
+      self.email = user.email if user
     end
 
     # Determine if email is required (we don't want validation errors before we hit the checkout)
     def require_email
-      true unless new_record? or ['cart', 'address'].include?(state)
+      true unless new_record? || ['cart', 'address'].include?(state)
     end
 
     def ensure_inventory_units
@@ -734,7 +729,7 @@ module Spree
 
     def ensure_line_items_present
       unless line_items.present?
-        errors.add(:base, Spree.t(:there_are_no_items_for_this_order)) and return false
+        errors.add(:base, Spree.t(:there_are_no_items_for_this_order)) && (return false)
       end
     end
 
@@ -743,17 +738,17 @@ module Spree
         # 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.destroy_all
-        errors.add(:base, Spree.t(:items_cannot_be_shipped)) and return false
+        errors.add(:base, Spree.t(:items_cannot_be_shipped)) && (return false)
       end
     end
 
     def after_cancel
-      shipments.each { |shipment| shipment.cancel! }
-      payments.completed.each { |payment| payment.cancel! }
-      payments.store_credits.pending.each { |payment| payment.void_transaction! }
+      shipments.each(&:cancel!)
+      payments.completed.each(&:cancel!)
+      payments.store_credits.pending.each(&:void_transaction!)
 
       send_cancel_email
-      self.update!
+      update!
     end
 
     def send_cancel_email
@@ -761,7 +756,7 @@ module Spree
     end
 
     def after_resume
-      shipments.each { |shipment| shipment.resume! }
+      shipments.each(&:resume!)
     end
 
     def use_billing?

data/app/models/spree/order_cancellations.rb

@@ -1,5 +1,6 @@
 # This class represents all of the actions one can take to modify an Order after it is complete
 class Spree::OrderCancellations
+  extend ActiveModel::Translation
 
   # If you need to message a third party service when an item is canceled then
   # set short_ship_tax_notifier to an object that responds to:
@@ -31,7 +32,6 @@ class Spree::OrderCancellations
     unit_cancels = []
 
     Spree::OrderMutex.with_lock!(@order) do
-
       Spree::InventoryUnit.transaction do
         inventory_units.each do |iu|
           unit_cancels << short_ship_unit(iu, whodunnit: whodunnit)
@@ -67,7 +67,7 @@ class Spree::OrderCancellations
       unit_cancel = Spree::UnitCancel.create!(
         inventory_unit: inventory_unit,
         reason: reason,
-        created_by: whodunnit,
+        created_by: whodunnit
       )
 
       inventory_unit.cancel!
@@ -99,7 +99,7 @@ class Spree::OrderCancellations
     unit_cancel = Spree::UnitCancel.create!(
       inventory_unit: inventory_unit,
       reason: Spree::UnitCancel::SHORT_SHIP,
-      created_by: whodunnit,
+      created_by: whodunnit
     )
     unit_cancel.adjust!
     inventory_unit.cancel!
@@ -115,7 +115,7 @@ class Spree::OrderCancellations
       to_a
 
     shipments.each do |shipment|
-      if shipment.inventory_units.all? {|iu| iu.shipped? || iu.canceled? }
+      if shipment.inventory_units.all? { |iu| iu.shipped? || iu.canceled? }
         shipment.update_attributes!(state: 'shipped', shipped_at: Time.current)
       end
     end

data/app/models/spree/order_capturing.rb

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