solidus_core 1.1.4 → 1.2.0.beta1

data/app/models/spree/option_type_prototype.rb

@@ -0,0 +1,6 @@
+module Spree
+  class OptionTypePrototype < Spree::Base
+    belongs_to :option_type
+    belongs_to :prototype
+  end
+end

data/app/models/spree/option_value.rb

@@ -6,7 +6,7 @@ module Spree
     has_many :option_values_variants, dependent: :destroy
     has_many :variants, through: :option_values_variants
 
-    validates :name, presence: true, uniqueness: { scope: :option_type_id }
+    validates :name, presence: true, uniqueness: { scope: :option_type_id, allow_blank: true }
     validates :presentation, presence: true
 
     after_save :touch, if: :changed?

data/app/models/spree/order.rb

@@ -9,7 +9,6 @@ module Spree
     ORDER_NUMBER_PREFIX  = 'R'
 
     include Spree::Order::Checkout
-    include Spree::Order::CurrencyUpdater
     include Spree::Order::Payments
 
     class InsufficientStock < StandardError; end
@@ -93,7 +92,6 @@ module Spree
 
     before_create :create_token
     before_create :link_by_email
-    before_update :homogenize_line_item_currencies, if: :currency_changed?
 
     validates :email, presence: true, if: :require_email
     validates :email, email: true, if: :require_email, allow_blank: true
@@ -101,7 +99,11 @@ module Spree
 
     make_permalink field: :number
 
-    delegate :update_totals, :persist_totals, :to => :updater
+    delegate :update_totals, :persist_totals, to: :updater
+    delegate :firstname, :lastname, to: :bill_address, prefix: true, allow_nil: true
+    alias_method :billing_firstname, :bill_address_firstname
+    alias_method :billing_lastname, :bill_address_lastname
+
 
     class_attribute :update_hooks
     self.update_hooks = Set.new
@@ -109,8 +111,11 @@ module Spree
     class_attribute :line_item_comparison_hooks
     self.line_item_comparison_hooks = Set.new
 
-    def self.by_number(number)
-      where(number: number)
+    class << self
+      def by_number(number)
+        where(number: number)
+      end
+      deprecate :by_number, deprecator: Spree::Deprecation
     end
 
     scope :created_between, ->(start_date, end_date) { where(created_at: start_date..end_date) }
@@ -190,9 +195,9 @@ module Spree
     end
 
     def confirmation_required?
-      ActiveSupport::Deprecation.warn "Order#confirmation_required is deprecated.", caller
       true
     end
+    deprecate :confirmation_required?, deprecator: Spree::Deprecation
 
     def backordered?
       shipments.any?(&:backordered?)
@@ -410,14 +415,6 @@ module Spree
       ).uniq
     end
 
-    def billing_firstname
-      bill_address.try(:firstname)
-    end
-
-    def billing_lastname
-      bill_address.try(:lastname)
-    end
-
     def insufficient_stock_lines
       line_items.select(&:insufficient_stock?)
     end
@@ -435,35 +432,8 @@ module Spree
       end
     end
 
-    def merge!(order, user = nil)
-      order.line_items.each do |other_order_line_item|
-        next unless other_order_line_item.currency == currency
-
-        # Compare the line items of the other order with mine.
-        # Make sure you allow any extensions to chime in on whether or
-        # not the extension-specific parts of the line item match
-        current_line_item = self.line_items.detect { |my_li|
-                      my_li.variant == other_order_line_item.variant &&
-                      self.line_item_comparison_hooks.all? { |hook|
-                        self.send(hook, my_li, other_order_line_item.serializable_hash)
-                      }
-                    }
-        if current_line_item
-          current_line_item.quantity += other_order_line_item.quantity
-          current_line_item.save!
-        else
-          other_order_line_item.order_id = self.id
-          other_order_line_item.save!
-        end
-      end
-
-      self.associate_user!(user) if !self.user && !user.blank?
-
-      updater.update
-
-      # So that the destroy doesn't take out line items which may have been re-assigned
-      order.line_items.reload
-      order.destroy
+    def merge!(*args)
+      Spree::Config.order_merger_class.new(self).merge!(*args)
     end
 
     def empty!
@@ -555,7 +525,7 @@ module Spree
 
       self.update_columns(
         state: 'cart',
-        updated_at: Time.now,
+        updated_at: Time.current,
       )
       self.next! if self.line_items.size > 0
     end
@@ -583,7 +553,7 @@ module Spree
         cancel!
         self.update_columns(
           canceler_id: user.id,
-          canceled_at: Time.now,
+          canceled_at: Time.current,
         )
       end
     end
@@ -615,10 +585,12 @@ module Spree
       guest_token
     end
 
+    # @deprecated Do not use this method. Behaviour is unreliable.
     def fully_discounted?
       adjustment_total + line_items.map(&:final_amount).sum == 0.0
     end
     alias_method :fully_discounted, :fully_discounted?
+    deprecate :fully_discounted, deprecator: Spree::Deprecation
 
     def unreturned_exchange?
       # created_at - 1 is a hack to ensure that this doesn't blow up on MySQL,
@@ -709,23 +681,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
@@ -793,7 +748,7 @@ module Spree
     end
 
     def use_billing?
-      @use_billing == true || @use_billing == 'true' || @use_billing == '1'
+      use_billing.in?([true, 'true', '1'])
     end
 
     def set_currency

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

@@ -247,7 +247,9 @@ module Spree
 
           set_callback :updating_from_params, :before, :update_params_payment_source
 
+          # @deprecated Use {OrderUpdateAttributes} instead
           def update_from_params(params, permitted_params, request_env = {})
+            ActiveSupport::Deprecation.warn "update_from_params is deprecated. Use the OrderUpdateAttributes class instead", caller
             success = false
             @updating_params = params
             run_callbacks :updating_from_params do
@@ -274,8 +276,8 @@ module Spree
                 attributes[:payments_attributes].first[:request_env] = request_env
               end
 
-              success = self.update_attributes(attributes)
-              set_shipments_cost if self.shipments.any?
+              update = OrderUpdateAttributes.new(self, attributes, request_env: request_env)
+              success = update.apply
             end
 
             @updating_params = nil

data/app/models/spree/order_cancellations.rb

@@ -14,6 +14,15 @@ class Spree::OrderCancellations
     @order = order
   end
 
+  # Marks inventory units short shipped. Adjusts the order based on the value of the inventory.
+  # Sends an email to the customer about what inventory has been short shipped.
+  #
+  # @api public
+  #
+  # @param [Array<InventoryUnit>] inventory_units the inventory units to be short shipped
+  # @param [String] whodunnit the system or person that is short shipping the inventory units
+  #
+  # @return [Array<UnitCancel>] the units that have been canceled due to short shipping
   def short_ship(inventory_units, whodunnit:nil)
     if inventory_units.map(&:order_id).uniq != [@order.id]
       raise ArgumentError, "Not all inventory units belong to this order"
@@ -42,6 +51,48 @@ class Spree::OrderCancellations
     unit_cancels
   end
 
+  # Marks inventory unit canceled. Optionally allows specifying the reason why and who is performing the action.
+  #
+  # @api public
+  #
+  # @param [InventoryUnit] inventory_unit the inventory unit to be canceled
+  # @param [String] reason the reason that you are canceling the inventory unit
+  # @param [String] whodunnit the system or person that is canceling the inventory unit
+  #
+  # @return [UnitCancel] the unit that has been canceled
+  def cancel_unit(inventory_unit, reason: Spree::UnitCancel::DEFAULT_REASON, whodunnit:nil)
+    unit_cancel = nil
+
+    Spree::OrderMutex.with_lock!(@order) do
+      unit_cancel = Spree::UnitCancel.create!(
+        inventory_unit: inventory_unit,
+        reason: reason,
+        created_by: whodunnit,
+      )
+
+      inventory_unit.cancel!
+    end
+
+    unit_cancel
+  end
+
+  # Reimburses inventory units due to cancellation.
+  #
+  # @api public
+  # @param [Array<InventoryUnit>] inventory_units the inventory units to be reimbursed
+  # @return [Reimbursement] the reimbursement for inventory being canceled
+  def reimburse_units(inventory_units)
+    reimbursement = nil
+
+    Spree::OrderMutex.with_lock!(@order) do
+      return_items = inventory_units.map(&:current_or_new_return_item)
+      reimbursement = Spree::Reimbursement.new(order: @order, return_items: return_items)
+      reimbursement.return_all
+    end
+
+    reimbursement
+  end
+
   private
 
   def short_ship_unit(inventory_unit, whodunnit:nil)
@@ -65,7 +116,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.now)
+        shipment.update_attributes!(state: 'shipped', shipped_at: Time.current)
       end
     end
   end

data/app/models/spree/order_contents.rb

@@ -51,7 +51,7 @@ module Spree
       order.update_attributes!(
         approver: user,
         approver_name: name,
-        approved_at: Time.now,
+        approved_at: Time.current,
       )
     end
 

data/app/models/spree/order_merger.rb

@@ -0,0 +1,143 @@
+module Spree
+  # Spree::OrderMerger is responsible for taking two orders and merging them
+  # together by adding the line items from additional orders to the order
+  # that the OrderMerger is initialized with.
+  #
+  # Orders that are merged should be incomplete orders which should belong to
+  # the same user. They should also be in the same currency.
+  class OrderMerger
+    # @!attribute order
+    #   @api public
+    #   @return [Spree::Order] The order which items wll be merged into.
+    attr_accessor :order
+
+    delegate :updater, to: :order
+
+    # Create the OrderMerger
+    #
+    # @api public
+    # @param [Spree::Order] order The order which line items will be merged
+    # into.
+    def initialize(order)
+      @order = order
+    end
+
+    # Merge a second order in to the order the OrderMerger was initialized with
+    #
+    # The line items from `other_order` will be merged in to the `order` for
+    # this OrderMerger object. If the line items are for the same variant, it
+    # will the quantity of the incoming line item to the existing line item.
+    # Otherwise, it will assign the line item to the new order.
+    #
+    # After the orders have been merged the `other_order` will be destroyed.
+    #
+    # @example
+    #   initial_order = Spree::Order.find(1)
+    #   order_to_merge = Spree::Order.find(2)
+    #   merger = Spree::OrderMerger.new(initial_order)
+    #   merger.merge!(order_to_merge)
+    #   # order_to_merge is destroyed, initial order now contains the line items
+    #   # of order_to_merge
+    #
+    # @api public
+    # @param [Spree::Order] other_order An order which will be merged in to the
+    # order the OrderMerger was initialized with.
+    # @param [Spree::User] user Associate the order the user specified. If not
+    # specified, the order user association will not be changed.
+    # @return [void]
+    def merge!(other_order, user = nil)
+      other_order.line_items.each do |other_order_line_item|
+        next unless other_order_line_item.currency == order.currency
+
+        current_line_item = find_matching_line_item(other_order_line_item)
+        handle_merge(current_line_item, other_order_line_item)
+      end
+
+      set_user(user)
+      persist_merge
+
+      # So that the destroy doesn't take out line items which may have been re-assigned
+      other_order.line_items.reload
+      other_order.destroy
+    end
+
+    private
+
+    # Retreive a matching line item from the existing order
+    #
+    # It will compare line items based on variants, and all line item
+    # comparison hooks on the order.
+    #
+    # @api private
+    # @param [Spree::LineItem] other_order_line_item The line item from
+    # `other_order` we are attempting to merge in.
+    # @return [Spree::LineItem] A matching line item from the order. nil if none
+    # exist.
+    def find_matching_line_item(other_order_line_item)
+      order.line_items.detect do |my_li|
+        my_li.variant == other_order_line_item.variant &&
+          order.line_item_comparison_hooks.all? do |hook|
+            order.send(hook, my_li, other_order_line_item.serializable_hash)
+          end
+      end
+    end
+
+    # Associate the user with the order
+    #
+    # @api private
+    # @param [Spree::User] user The user to associate with the order. If nil
+    # the order user association will remain the same. If the order is already
+    # associated with a user, it will not be changed.
+    # @return [void]
+    def set_user(user)
+      order.associate_user!(user) if !order.user && user
+    end
+
+    # Merge the `other_order_line_item` into `current_line_item`
+    #
+    # If `current_line_item` is nil, the `other_order_line_item` will be
+    # re-assigned to the `order`.
+    #
+    # If the merged line item can not be saved, an error will be added to
+    # `order`.
+    #
+    # @api private
+    # @param [Spree::LineItem] current_line_item The line item to be merged
+    # into. If nil, the `other_order_line_item` will be re-assigned.
+    # @param [Spree::LineItem] other_order_line_item The line item to merge in.
+    # @return [void]
+    def handle_merge(current_line_item, other_order_line_item)
+      if current_line_item
+        current_line_item.quantity += other_order_line_item.quantity
+        handle_error(current_line_item) unless current_line_item.save
+      else
+        other_order_line_item.order_id = order.id
+        handle_error(other_order_line_item) unless other_order_line_item.save
+      end
+    end
+
+    # Handle an error from saving the `line_item`
+    #
+    # This adds errors from the line item to the `errors[:base]` of the order.
+    #
+    # @api private
+    # @param [Spree::LineItem] line_item The line item which could not be saved
+    # @return [void]
+    def handle_error(line_item)
+      order.errors[:base] << line_item.errors.full_messages
+    end
+
+    # Save the order totals after merge
+    #
+    # It triggers the order updater to ensure that item counts and totals are
+    # up to date.
+    #
+    # @api private
+    # @return [void]
+    def persist_merge
+      updater.update_item_count
+      updater.update_item_total
+      updater.persist_totals
+    end
+  end
+end

data/app/models/spree/order_shipping.rb

@@ -19,7 +19,7 @@ class Spree::OrderShipping
       stock_location: shipment.stock_location,
       address: shipment.address,
       shipping_method: shipment.shipping_method,
-      shipped_at: Time.now,
+      shipped_at: Time.current,
       external_number: external_number,
       # TODO: Remove the `|| shipment.tracking` once Shipment#ship! is called by
       # OrderShipping#ship rather than vice versa
@@ -41,7 +41,7 @@ class Spree::OrderShipping
   # @param tracking_number An option tracking number.
   # @return The carton created.
   def ship(inventory_units:, stock_location:, address:, shipping_method:,
-           shipped_at: Time.now, external_number: nil, tracking_number: nil, suppress_mailer: false)
+           shipped_at: Time.current, external_number: nil, tracking_number: nil, suppress_mailer: false)
 
     carton = nil
 
@@ -68,7 +68,7 @@ class Spree::OrderShipping
         # 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.now)
+        shipment.update_columns(state: 'shipped', shipped_at: Time.current)
       end
     end