spree_core 2.4.10 → 3.0.0.rc1

data/app/models/spree/gateway/bogus.rb

@@ -60,10 +60,6 @@ module Spree
       ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, :test => true, :authorization => '12345')
     end
 
-    def cancel(_response_code)
-      ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345')
-    end
-
     def test?
       # Test mode is not really relevant with bogus gateway (no such thing as live server)
       true

data/app/models/spree/line_item.rb

@@ -35,9 +35,6 @@ module Spree
 
     attr_accessor :target_shipment
 
-    self.whitelisted_ransackable_associations = ['variant']
-    self.whitelisted_ransackable_attributes = ['variant_id']
-
     def copy_price
       if variant
         self.price = variant.price if price.nil?
@@ -141,11 +138,11 @@ module Spree
       end
 
       def recalculate_adjustments
-        Spree::ItemAdjustments.new(self).update
+        Adjustable::AdjustmentsUpdater.update(self)
       end
 
       def update_tax_charge
-        Spree::TaxRate.adjust(order.tax_zone, [self])
+        Spree::TaxRate.adjust(order, [self])
       end
 
       def ensure_proper_currency

data/app/models/spree/option_type.rb

@@ -1,16 +1,14 @@
 module Spree
   class OptionType < Spree::Base
-    acts_as_list
-
     has_many :option_values, -> { order(:position) }, dependent: :destroy, inverse_of: :option_type
     has_many :product_option_types, dependent: :destroy, inverse_of: :option_type
     has_many :products, through: :product_option_types
     has_and_belongs_to_many :prototypes, join_table: 'spree_option_types_prototypes'
 
-    validates :name, presence: true, uniqueness: true 
+    validates :name, presence: true, uniqueness: true
     validates :presentation, presence: true
 
-    default_scope -> { order("#{self.table_name}.position") }
+    default_scope { order("#{self.table_name}.position") }
 
     accepts_nested_attributes_for :option_values, reject_if: lambda { |ov| ov[:name].blank? || ov[:presentation].blank? }, allow_destroy: true
 

data/app/models/spree/option_value.rb

@@ -9,8 +9,6 @@ module Spree
 
     after_touch :touch_all_variants
 
-    self.whitelisted_ransackable_attributes = ['presentation']
-
     def touch_all_variants
       variants.update_all(updated_at: Time.current)
     end

data/app/models/spree/order.rb

@@ -3,14 +3,26 @@ require 'spree/order/checkout'
 
 module Spree
   class Order < Spree::Base
-
-    ORDER_NUMBER_LENGTH  = 9
-    ORDER_NUMBER_LETTERS = false
-    ORDER_NUMBER_PREFIX  = 'R'
+    extend FriendlyId
+    friendly_id :number, slug_column: :number, use: :slugged
 
     include Spree::Order::Checkout
     include Spree::Order::CurrencyUpdater
     include Spree::Order::Payments
+    include Spree::NumberGenerator
+
+    def generate_number(options = {})
+      options[:prefix] ||= 'R'
+      super(options)
+    end
+
+    extend Spree::DisplayMoney
+    money_methods :outstanding_balance, :item_total,           :adjustment_total,
+                  :included_tax_total,  :additional_tax_total, :tax_total,
+                  :shipment_total,      :promo_total,          :total
+
+    alias :display_ship_total :display_shipment_total
+    alias_attribute :ship_total, :shipment_total
 
     checkout_flow do
       go_to_state :address
@@ -21,9 +33,6 @@ module Spree
       remove_transition from: :delivery, to: :confirm
     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 considered_risky]
-
     attr_reader :coupon_code
     attr_accessor :temporary_address, :temporary_credit_card
 
@@ -44,10 +53,9 @@ module Spree
 
     belongs_to :ship_address, foreign_key: :ship_address_id, class_name: 'Spree::Address'
     alias_attribute :shipping_address, :ship_address
-    alias_attribute :ship_total, :shipment_total
 
     belongs_to :store, class_name: 'Spree::Store'
-    has_many :state_changes, as: :stateful, dependent: :destroy
+    has_many :state_changes, as: :stateful
     has_many :line_items, -> { order("#{LineItem.table_name}.created_at ASC") }, dependent: :destroy, inverse_of: :order
     has_many :payments, dependent: :destroy
     has_many :return_authorizations, dependent: :destroy, inverse_of: :order
@@ -59,11 +67,6 @@ module Spree
     has_many :products, through: :variants
     has_many :variants, through: :line_items
     has_many :refunds, through: :payments
-    has_many :all_adjustments,
-             class_name: 'Spree::Adjustment',
-             foreign_key: :order_id,
-             dependent: :destroy,
-             inverse_of: :order
 
     has_and_belongs_to_many :promotions, join_table: 'spree_orders_promotions'
 
@@ -81,24 +84,18 @@ 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?
     attr_accessor :use_billing
 
-
     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
-    validates :number, presence: true, uniqueness: { allow_blank: true }
     validate :has_available_shipment
 
-    make_permalink field: :number
-
     delegate :update_totals, :persist_totals, :to => :updater
-    delegate :merge!, to: :merger
 
     class_attribute :update_hooks
     self.update_hooks = Set.new
@@ -106,24 +103,12 @@ module Spree
     class_attribute :line_item_comparison_hooks
     self.line_item_comparison_hooks = Set.new
 
-    def self.by_number(number)
-      where(number: number)
-    end
-
     scope :created_between, ->(start_date, end_date) { where(created_at: start_date..end_date) }
     scope :completed_between, ->(start_date, end_date) { where(completed_at: start_date..end_date) }
 
     # shows completed orders first, by their completed_at date, then uncompleted orders by their created_at
     scope :reverse_chronological, -> { order('spree_orders.completed_at IS NULL', completed_at: :desc, created_at: :desc) }
 
-    def self.by_customer(customer)
-      joins(:user).where("#{Spree.user_class.table_name}.email" => customer)
-    end
-
-    def self.by_state(state)
-      where(state: state)
-    end
-
     def self.complete
       where.not(completed_at: nil)
     end
@@ -144,6 +129,11 @@ module Spree
       self.line_item_comparison_hooks.add(hook)
     end
 
+    def all_adjustments
+      Adjustment.where("order_id = :order_id OR (adjustable_id = :order_id AND adjustable_type = 'Spree::Order')",
+                       order_id: self.id)
+    end
+
     # For compatiblity with Calculator::PriceSack
     def amount
       line_items.inject(0.0) { |sum, li| sum + li.amount }
@@ -158,47 +148,10 @@ module Spree
       self[:currency] || Spree::Config[:currency]
     end
 
-    def display_outstanding_balance
-      Spree::Money.new(outstanding_balance, { currency: currency })
-    end
-
-    def display_item_total
-      Spree::Money.new(item_total, { currency: currency })
-    end
-
-    def display_adjustment_total
-      Spree::Money.new(adjustment_total, { currency: currency })
-    end
-
-    def display_included_tax_total
-      Spree::Money.new(included_tax_total, { currency: currency })
-    end
-
-    def display_additional_tax_total
-      Spree::Money.new(additional_tax_total, { currency: currency })
-    end
-
-    def display_tax_total
-      Spree::Money.new(tax_total, { currency: currency })
-    end
-
-    def display_shipment_total
-      Spree::Money.new(shipment_total, { currency: currency })
-    end
-    alias :display_ship_total :display_shipment_total
-
-    def display_total
-      Spree::Money.new(total, { currency: currency })
-    end
-
     def shipping_discount
       shipment_adjustments.eligible.sum(:amount) * - 1
     end
 
-    def to_param
-      number.to_s.to_url.upcase
-    end
-
     def completed?
       completed_at.present?
     end
@@ -249,10 +202,6 @@ module Spree
       updater.update
     end
 
-    def merger
-      @merger ||= Spree::OrderMerger.new(self)
-    end
-
     def clone_billing_address
       if bill_address and self.ship_address.nil?
         self.ship_address = bill_address.clone
@@ -289,35 +238,6 @@ module Spree
       end
     end
 
-    def generate_order_number(options = {})
-      options[:length]  ||= ORDER_NUMBER_LENGTH
-      options[:letters] ||= ORDER_NUMBER_LETTERS
-      options[:prefix]  ||= ORDER_NUMBER_PREFIX
-
-      possible = (0..9).to_a
-      possible += ('A'..'Z').to_a if options[:letters]
-
-      self.number ||= loop do
-        # Make a random number.
-        random = "#{options[:prefix]}#{(0...options[:length]).map { possible.shuffle.first }.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.
-          options[:length] += 1 if self.class.count > (10 ** options[:length] / 2)
-        else
-          break random
-        end
-      end
-    end
-
-    def shipped_shipments
-      shipments.shipped
-    end
-
-    def contains?(variant, options = {})
-      find_line_item_by_variant(variant, options).present?
-    end
-
     def quantity_of(variant, options = {})
       line_item = find_line_item_by_variant(variant, options)
       line_item ? line_item.quantity : 0
@@ -350,22 +270,13 @@ module Spree
     # 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::TaxRate.adjust(self, line_items)
+      Spree::TaxRate.adjust(self, shipments) if shipments.any?
     end
 
     def outstanding_balance
       if state == 'canceled'
         -1 * payment_total
-      elsif reimbursements.includes(:refunds).size > 0
-        reimbursed = reimbursements.includes(:refunds).inject(0) do |sum, reimbursement|
-          sum + reimbursement.refunds.sum(:amount)
-        end
-        # If reimbursement has happened add it back to total to prevent balance_due payment state
-        # See: https://github.com/spree/spree/issues/6229
-        total - (payment_total + reimbursed)
       else
         total - payment_total
       end
@@ -426,7 +337,7 @@ module Spree
     end
 
     def deliver_order_confirmation_email
-      OrderMailer.confirm_email(self.id).deliver
+      OrderMailer.confirm_email(id).deliver_later
       update_column(:confirmation_delivered, true)
     end
 
@@ -474,12 +385,44 @@ 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_item_count
+      updater.update_item_total
+      updater.persist_totals
+
+      # So that the destroy doesn't take out line items which may have been re-assigned
+      order.line_items.reload
+      order.destroy
+    end
+
     def empty!
       line_items.destroy_all
       updater.update_item_count
       adjustments.destroy_all
       shipments.destroy_all
-      state_changes.destroy_all
 
       update_totals
       persist_totals
@@ -519,14 +462,14 @@ module Spree
     end
 
     def create_proposed_shipments
-      all_adjustments.shipping.delete_all
+      adjustments.shipping.delete_all
       shipments.destroy_all
       self.shipments = Spree::Stock::Coordinator.new(self).shipments
     end
 
     def apply_free_shipping_promotions
       Spree::PromotionHandler::FreeShipping.new(self).activate
-      shipments.each { |shipment| ItemAdjustments.new(shipment).update }
+      shipments.each { |shipment| Adjustable::AdjustmentsUpdater.update(shipment) }
       updater.update_shipment_total
       persist_totals
     end
@@ -552,8 +495,8 @@ module Spree
       self.next! if self.line_items.size > 0
     end
 
-    def refresh_shipment_rates
-      shipments.map &:refresh_rates
+    def refresh_shipment_rates(shipping_method_filter = ShippingMethod::DISPLAY_ON_FRONT_END)
+      shipments.map { |s| s.refresh_rates(shipping_method_filter) }
     end
 
     def shipping_eq_billing_address?
@@ -612,19 +555,6 @@ module Spree
       update_column(:considered_risky, false)
     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
@@ -643,6 +573,16 @@ module Spree
         payments.offset_payment.exists? # how old versions of spree stored refunds
     end
 
+    # determines whether the inventory is fully discounted
+    #
+    # Returns
+    # - true if inventory amount is the exact negative of inventory related adjustments
+    # - false otherwise
+    def fully_discounted?
+      adjustment_total + line_items.map(&:final_amount).sum == 0.0
+    end
+    alias_method :fully_discounted, :fully_discounted?
+
     private
 
     def link_by_email
@@ -671,7 +611,7 @@ module Spree
       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.destroy_all
+        shipments.delete_all
         errors.add(:base, Spree.t(:items_cannot_be_shipped)) and return false
       end
     end
@@ -684,7 +624,7 @@ module Spree
     end
 
     def send_cancel_email
-      OrderMailer.cancel_email(self.id).deliver
+      OrderMailer.cancel_email(id).deliver_later
     end
 
     def after_resume

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

@@ -34,7 +34,7 @@ module Spree
             klass = self
 
             # To avoid a ton of warnings when the state machine is re-defined
-            StateMachine::Machine.ignore_method_conflicts = true
+            StateMachines::Machine.ignore_method_conflicts = true
             # To avoid multiple occurrences of the same transition being defined
             # On first definition, state_machines will not be defined
             state_machines.clear if respond_to?(:state_machines)