solidus_core 1.2.3 → 1.3.0.beta1

data/app/models/spree/order_contents.rb

@@ -1,6 +1,6 @@
 module Spree
   class OrderContents
-    attr_accessor :order, :currency
+    attr_accessor :order
 
     def initialize(order)
       @order = order
@@ -24,7 +24,7 @@ module Spree
     def update_cart(params)
       if order.update_attributes(params)
         unless order.completed?
-          order.line_items = order.line_items.select {|li| li.quantity > 0 }
+          order.line_items = order.line_items.select { |li| li.quantity > 0 }
           # Update totals, then check if the order is eligible for any cart promotions.
           # If we do not update first, then the item total will be wrong and ItemTotal
           # promotion rules would not be triggered.
@@ -51,80 +51,82 @@ module Spree
       order.update_attributes!(
         approver: user,
         approver_name: name,
-        approved_at: Time.current,
+        approved_at: Time.current
       )
     end
 
-
     private
-      def after_add_or_remove(line_item, options = {})
-        reload_totals
-        shipment = options[:shipment]
-        shipment.present? ? shipment.update_amounts : order.ensure_updated_shipments
-        PromotionHandler::Cart.new(order, line_item).activate
-        ItemAdjustments.new(line_item).update
-        reload_totals
-        line_item
-      end
 
-      def order_updater
-        @updater ||= OrderUpdater.new(order)
-      end
+    def after_add_or_remove(line_item, options = {})
+      reload_totals
+      shipment = options[:shipment]
+      shipment.present? ? shipment.update_amounts : order.ensure_updated_shipments
+      PromotionHandler::Cart.new(order, line_item).activate
+      ItemAdjustments.new(line_item).update
+      reload_totals
+      line_item
+    end
 
-      def reload_totals
-        order_updater.update
-        order.reload
-      end
+    def order_updater
+      @updater ||= OrderUpdater.new(order)
+    end
 
-      def add_to_line_item(variant, quantity, options = {})
-        line_item = grab_line_item_by_variant(variant, false, options)
-
-        if line_item
-          line_item.quantity += quantity.to_i
-          line_item.currency = currency unless currency.nil?
-        else
-          opts = { currency: order.currency }.merge ActionController::Parameters.new(options).
-                                              permit(PermittedAttributes.line_item_attributes)
-          line_item = order.line_items.new(quantity: quantity,
-                                            variant: variant,
-                                            options: opts)
-          create_order_stock_locations(line_item, options[:stock_location_quantities])
-        end
-        line_item.target_shipment = options[:shipment] if options.has_key? :shipment
-        line_item.save!
-        line_item
+    def reload_totals
+      order_updater.update
+      order.reload
+    end
+
+    def add_to_line_item(variant, quantity, options = {})
+      line_item = grab_line_item_by_variant(variant, false, options)
+
+      line_item ||= order.line_items.new(
+        quantity: 0,
+        variant: variant,
+        currency: order.currency
+      )
+
+      line_item.quantity += quantity.to_i
+      line_item.options = ActionController::Parameters.new(options).permit(PermittedAttributes.line_item_attributes)
+
+      if line_item.new_record?
+        create_order_stock_locations(line_item, options[:stock_location_quantities])
       end
 
-      def remove_from_line_item(variant, quantity, options = {})
-        line_item = grab_line_item_by_variant(variant, true, options)
-        line_item.quantity -= quantity
-        line_item.target_shipment= options[:shipment]
+      line_item.target_shipment = options[:shipment]
+      line_item.save!
+      line_item
+    end
 
-        if line_item.quantity == 0
-          line_item.destroy
-        else
-          line_item.save!
-        end
+    def remove_from_line_item(variant, quantity, options = {})
+      line_item = grab_line_item_by_variant(variant, true, options)
+      line_item.quantity -= quantity
+      line_item.target_shipment = options[:shipment]
 
-        line_item
+      if line_item.quantity == 0
+        line_item.destroy
+      else
+        line_item.save!
       end
 
-      def grab_line_item_by_variant(variant, raise_error = false, options = {})
-        line_item = order.find_line_item_by_variant(variant, options)
+      line_item
+    end
 
-        if !line_item.present? && raise_error
-          raise ActiveRecord::RecordNotFound, "Line item not found for variant #{variant.sku}"
-        end
+    def grab_line_item_by_variant(variant, raise_error = false, options = {})
+      line_item = order.find_line_item_by_variant(variant, options)
 
-        line_item
+      if !line_item.present? && raise_error
+        raise ActiveRecord::RecordNotFound, "Line item not found for variant #{variant.sku}"
       end
 
-      def create_order_stock_locations(line_item, stock_location_quantities)
-        return unless stock_location_quantities.present?
-        order = line_item.order
-        stock_location_quantities.each do |stock_location_id, quantity|
-          order.order_stock_locations.create!(stock_location_id: stock_location_id, quantity: quantity, variant_id: line_item.variant_id) unless quantity.to_i.zero?
-        end
+      line_item
+    end
+
+    def create_order_stock_locations(line_item, stock_location_quantities)
+      return unless stock_location_quantities.present?
+      order = line_item.order
+      stock_location_quantities.each do |stock_location_id, quantity|
+        order.order_stock_locations.create!(stock_location_id: stock_location_id, quantity: quantity, variant_id: line_item.variant_id) unless quantity.to_i.zero?
       end
+    end
   end
 end

data/app/models/spree/order_inventory.rb

@@ -34,75 +34,80 @@ module Spree
     end
 
     private
-      def remove(item_units, shipment = nil)
-        quantity = item_units.size - line_item.quantity
-
-        if shipment.present?
-          remove_from_shipment(shipment, quantity)
-        else
-          order.shipments.each do |shipment|
-            break if quantity == 0
-            quantity -= remove_from_shipment(shipment, quantity)
-          end
-        end
-      end
 
-      # Returns either one of the shipment:
-      #
-      # first unshipped that already includes this variant
-      # first unshipped that's leaving from a stock_location that stocks this variant
-      def determine_target_shipment
-        shipment = order.shipments.detect do |shipment|
-          shipment.ready_or_pending? && shipment.include?(variant)
-        end
+    def remove(item_units, shipment = nil)
+      quantity = item_units.size - line_item.quantity
 
-        shipment ||= order.shipments.detect do |shipment|
-          shipment.ready_or_pending? && variant.stock_location_ids.include?(shipment.stock_location_id)
-        end
+      if shipment.present?
+        remove_from_shipment(shipment, quantity)
+      else
+        remove_from_any_shipment(quantity)
       end
+    end
 
-      def add_to_shipment(shipment, quantity)
-        if variant.should_track_inventory?
-          on_hand, back_order = shipment.stock_location.fill_status(variant, quantity)
+    # Returns either one of the shipment:
+    #
+    # first unshipped that already includes this variant
+    # first unshipped that's leaving from a stock_location that stocks this variant
+    def determine_target_shipment
+      potential_shipments = order.shipments.select(&:ready_or_pending?)
+
+      potential_shipments.detect do |shipment|
+        shipment.include?(variant)
+      end || potential_shipments.detect do |shipment|
+        variant.stock_location_ids.include?(shipment.stock_location_id)
+      end
+    end
 
-          on_hand.times { shipment.set_up_inventory('on_hand', variant, order, line_item) }
-          back_order.times { shipment.set_up_inventory('backordered', variant, order, line_item) }
-        else
-          quantity.times { shipment.set_up_inventory('on_hand', variant, order, line_item) }
-        end
+    def add_to_shipment(shipment, quantity)
+      if variant.should_track_inventory?
+        on_hand, back_order = shipment.stock_location.fill_status(variant, quantity)
 
-        # adding to this shipment, and removing from stock_location
-        if order.completed?
-          shipment.stock_location.unstock(variant, quantity, shipment)
-        end
+        on_hand.times { shipment.set_up_inventory('on_hand', variant, order, line_item) }
+        back_order.times { shipment.set_up_inventory('backordered', variant, order, line_item) }
+      else
+        quantity.times { shipment.set_up_inventory('on_hand', variant, order, line_item) }
+      end
 
-        quantity
+      # adding to this shipment, and removing from stock_location
+      if order.completed?
+        shipment.stock_location.unstock(variant, quantity, shipment)
       end
 
-      def remove_from_shipment(shipment, quantity)
-        return 0 if quantity == 0 || shipment.shipped?
+      quantity
+    end
 
-        shipment_units = shipment.inventory_units_for_item(line_item, variant).reject do |variant_unit|
-          # TODO: exclude all 'shipped' states
-          variant_unit.state == 'shipped'
-        end.sort_by(&:state)
+    def remove_from_any_shipment(quantity)
+      order.shipments.each do |shipment|
+        break if quantity == 0
+        quantity -= remove_from_shipment(shipment, quantity)
+      end
+    end
 
-        removed_quantity = 0
+    def remove_from_shipment(shipment, quantity)
+      return 0 if quantity == 0 || shipment.shipped?
 
-        shipment_units.each do |inventory_unit|
-          break if removed_quantity == quantity
-          inventory_unit.destroy
-          removed_quantity += 1
-        end
+      shipment_units = shipment.inventory_units_for_item(line_item, variant).reject do |variant_unit|
+        # TODO: exclude all 'shipped' states
+        variant_unit.state == 'shipped'
+      end.sort_by(&:state)
 
-        shipment.destroy if shipment.inventory_units.count == 0
+      removed_quantity = 0
 
-        # removing this from shipment, and adding to stock_location
-        if order.completed?
-          shipment.stock_location.restock variant, removed_quantity, shipment
-        end
+      shipment_units.each do |inventory_unit|
+        break if removed_quantity == quantity
+        inventory_unit.destroy
+        removed_quantity += 1
+      end
+
+      shipment.destroy if shipment.inventory_units.count == 0
 
-        removed_quantity
+      # removing this from shipment, and adding to stock_location
+      if order.completed?
+        shipment.stock_location.restock variant, removed_quantity, shipment
       end
+
+      removed_quantity
+    end
   end
 end

data/app/models/spree/order_mutex.rb

@@ -1,6 +1,5 @@
 module Spree
   class OrderMutex < Spree::Base
-
     class LockFailed < StandardError; end
 
     belongs_to :order, class_name: "Spree::Order"

data/app/models/spree/order_shipping.rb

@@ -24,7 +24,7 @@ class Spree::OrderShipping
       # TODO: Remove the `|| shipment.tracking` once Shipment#ship! is called by
       # OrderShipping#ship rather than vice versa
       tracking_number: tracking_number || shipment.tracking,
-      suppress_mailer: suppress_mailer,
+      suppress_mailer: suppress_mailer
     )
   end
 
@@ -46,7 +46,7 @@ class Spree::OrderShipping
     carton = nil
 
     Spree::InventoryUnit.transaction do
-      inventory_units.each &:ship!
+      inventory_units.each(&:ship!)
 
       carton = Spree::Carton.create!(
         stock_location: stock_location,
@@ -55,7 +55,7 @@ class Spree::OrderShipping
         inventory_units: inventory_units,
         shipped_at: shipped_at,
         external_number: external_number,
-        tracking: tracking_number,
+        tracking: tracking_number
       )
     end
 
@@ -64,12 +64,11 @@ class Spree::OrderShipping
       # TODO: Remove tracking numbers from shipments.
       shipment.update_attributes!(tracking: tracking_number)
 
-      if shipment.inventory_units(true).all? {|iu| iu.shipped? || iu.canceled? }
-        # TODO: make OrderShipping#ship_shipment call Shipment#ship! rather than
-        # having Shipment#ship! call OrderShipping#ship_shipment. We only really
-        # need this `update_columns` for the specs, until we make that change.
-        shipment.update_columns(state: 'shipped', shipped_at: Time.current)
-      end
+      next unless shipment.inventory_units.reload.all? { |iu| iu.shipped? || iu.canceled? }
+      # TODO: make OrderShipping#ship_shipment call Shipment#ship! rather than
+      # having Shipment#ship! call OrderShipping#ship_shipment. We only really
+      # need this `update_columns` for the specs, until we make that change.
+      shipment.update_columns(state: 'shipped', shipped_at: Time.current)
     end
 
     send_shipment_emails(carton) if stock_location.fulfillable? && !suppress_mailer # e.g. digital gift cards that aren't actually shipped

data/app/models/spree/order_stock_location.rb

@@ -5,11 +5,11 @@ module Spree
     belongs_to :order, class_name: "Spree::Order"
 
     def self.fulfill_for_order_with_stock_location(order, stock_location)
-      self.where(order_id: order.id, stock_location_id: stock_location.id).each(&:fulfill_shipment!)
+      where(order_id: order.id, stock_location_id: stock_location.id).each(&:fulfill_shipment!)
     end
 
     def fulfill_shipment!
-      self.update_attributes!(shipment_fulfilled: true)
+      update_attributes!(shipment_fulfilled: true)
     end
   end
-end
+end

data/app/models/spree/order_update_attributes.rb

@@ -14,8 +14,6 @@ module Spree
     # Assign the attributes to the order and save the order
     # @return true if saved, otherwise false and errors will be set on the order
     def apply
-      order.validate_payments_attributes(@payments_attributes)
-
       assign_order_attributes
       assign_payments_attributes
 

data/app/models/spree/order_updater.rb

@@ -48,7 +48,6 @@ module Spree
       update_adjustment_total
     end
 
-
     # give each of the shipments a chance to update themselves
     def update_shipments
       shipments.each do |shipment|
@@ -60,7 +59,7 @@ module Spree
     end
 
     def update_payment_total
-      order.payment_total = payments.completed.includes(:refunds).inject(0) { |sum, payment| sum + payment.amount - payment.refunds.sum(:amount) }
+      order.payment_total = payments.completed.includes(:refunds).map { |payment| payment.amount - payment.refunds.sum(:amount) }.sum
     end
 
     def update_shipment_total
@@ -75,14 +74,14 @@ module Spree
     def update_adjustment_total
       recalculate_adjustments
       order.adjustment_total = line_items.sum(:adjustment_total) +
-                               shipments.sum(:adjustment_total)  +
-                               adjustments.eligible.sum(:amount)
+      shipments.sum(:adjustment_total) +
+      adjustments.eligible.sum(:amount)
       order.included_tax_total = line_items.sum(:included_tax_total) + shipments.sum(:included_tax_total)
       order.additional_tax_total = line_items.sum(:additional_tax_total) + shipments.sum(:additional_tax_total)
 
       order.promo_total = line_items.sum(:promo_total) +
-                          shipments.sum(:promo_total) +
-                          adjustments.promotion.eligible.sum(:amount)
+      shipments.sum(:promo_total) +
+      adjustments.promotion.eligible.sum(:amount)
 
       update_order_total
     end
@@ -97,20 +96,7 @@ module Spree
     end
 
     def persist_totals
-      order.update_columns(
-        payment_state: order.payment_state,
-        shipment_state: order.shipment_state,
-        item_total: order.item_total,
-        item_count: order.item_count,
-        adjustment_total: order.adjustment_total,
-        included_tax_total: order.included_tax_total,
-        additional_tax_total: order.additional_tax_total,
-        payment_total: order.payment_total,
-        shipment_total: order.shipment_total,
-        promo_total: order.promo_total,
-        total: order.total,
-        updated_at: Time.current,
-      )
+      order.save!(validate: false)
     end
 
     # Updates the +shipment_state+ attribute according to the following logic:
@@ -135,7 +121,7 @@ module Spree
         else
           # will return nil if no shipments are found
           order.shipment_state = shipment_states.first
-          # TODO inventory unit states?
+          # TODO: inventory unit states?
           # if order.shipment_state && order.inventory_units.where(:shipment_id => nil).exists?
           #   shipments exist but there are unassigned inventory units
           #   order.shipment_state = 'partial'
@@ -171,8 +157,9 @@ module Spree
     end
 
     private
-      def round_money(n)
-        (n * 100).round / 100.0
-      end
+
+    def round_money(n)
+      (n * 100).round / 100.0
+    end
   end
 end

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

@@ -25,12 +25,10 @@ module Spree
 
         if payment_method.auto_capture?
           purchase!
+        elsif pending?
+          # do nothing. already authorized.
         else
-          if pending?
-            # do nothing. already authorized.
-          else
-            authorize!
-          end
+          authorize!
         end
       end
 
@@ -67,14 +65,13 @@ module Spree
       def void_transaction!
         return true if void?
         protect_from_connection_error do
-
           if payment_method.payment_profiles_supported?
             # Gateways supporting payment profiles will need access to credit card object because this stores the payment profile information
             # so supply the authorization itself as well as the credit card, rather than just the authorization code
-            response = payment_method.void(self.response_code, source, gateway_options)
+            response = payment_method.void(response_code, source, gateway_options)
           else
             # Standard ActiveMerchant void usage
-            response = payment_method.void(self.response_code, gateway_options)
+            response = payment_method.void(response_code, gateway_options)
           end
 
           handle_void_response(response)
@@ -88,29 +85,27 @@ module Spree
 
       def gateway_options
         order.reload
-        options = { :email       => order.email,
-                    :customer    => order.email,
-                    :customer_id => order.user_id,
-                    :ip          => order.last_ip_address,
+        options = { email: order.email,
+                    customer: order.email,
+                    customer_id: order.user_id,
+                    ip: order.last_ip_address,
                     # Need to pass in a unique identifier here to make some
                     # payment gateways happy.
                     #
                     # For more information, please see Spree::Payment#set_unique_identifier
-                    :order_id    => gateway_order_id }
+                    order_id: gateway_order_id }
 
-        options.merge!({ :shipping => order.ship_total * 100,
-                         :tax      => order.additional_tax_total * 100,
-                         :subtotal => order.item_total * 100,
-                         :discount => order.promo_total * 100,
-                         :currency => currency })
+        options[:shipping] = order.ship_total * 100
+        options[:tax] = order.additional_tax_total * 100
+        options[:subtotal] = order.item_total * 100
+        options[:discount] = order.promo_total * 100
+        options[:currency] = currency
 
         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[:billing_address] = bill_address.try!(:active_merchant_hash)
+        options[:shipping_address] = order.ship_address.try!(:active_merchant_hash)
 
         options
       end
@@ -124,12 +119,12 @@ module Spree
 
       def process_purchase
         started_processing!
-        result = gateway_action(source, :purchase, :complete)
+        gateway_action(source, :purchase, :complete)
         # This won't be called if gateway_action raises a GatewayError
         capture_events.create!(amount: amount)
       end
 
-      def handle_payment_preconditions(&block)
+      def handle_payment_preconditions(&_block)
         unless block_given?
           raise ArgumentError.new("handle_payment_preconditions must be called with a block")
         end
@@ -139,7 +134,7 @@ module Spree
 
         if source
           if !processing?
-            if payment_method.supports?(source) || token_based?
+            if payment_method.supports?(source)
               yield
             else
               invalidate!
@@ -173,9 +168,9 @@ module Spree
               self.cvv_response_message = response.cvv_result['message']
             end
           end
-          self.send("#{success_state}!")
+          send("#{success_state}!")
         else
-          self.send(failure_state)
+          send(failure_state)
           gateway_error(response)
         end
       end
@@ -185,22 +180,20 @@ module Spree
 
         if response.success?
           self.response_code = response.authorization
-          self.void
+          void
         else
           gateway_error(response)
         end
       end
 
       def record_response(response)
-        log_entries.create!(:details => response.to_yaml)
+        log_entries.create!(details: response.to_yaml)
       end
 
       def protect_from_connection_error
-        begin
           yield
-        rescue ActiveMerchant::ConnectionError => e
+      rescue ActiveMerchant::ConnectionError => e
           gateway_error(e)
-        end
       end
 
       def gateway_error(error)
@@ -218,11 +211,7 @@ module Spree
 
       # The unique identifier to be passed in to the payment gateway
       def gateway_order_id
-        "#{order.number}-#{self.number}"
-      end
-
-      def token_based?
-        source.gateway_customer_profile_id.present? || source.gateway_payment_profile_id.present?
+        "#{order.number}-#{number}"
       end
     end
   end