spree_core 2.2.14 → 2.3.0

data/app/models/spree/calculator/shipping/price_sack.rb

@@ -1,6 +1,4 @@
 require_dependency 'spree/shipping_calculator'
-# For #to_d method on Ruby 1.8
-require 'bigdecimal/util'
 
 module Spree
   module Calculator::Shipping
@@ -8,7 +6,7 @@ module Spree
       preference :minimal_amount, :decimal, default: 0
       preference :normal_amount, :decimal, default: 0
       preference :discount_amount, :decimal, default: 0
-      preference :currency, :string, default: Spree::Config[:currency]
+      preference :currency, :string, default: ->{ Spree::Config[:currency] }
 
       def self.description
         Spree.t(:shipping_price_sack)

data/app/models/spree/classification.rb

@@ -1,5 +1,5 @@
 module Spree
-  class Classification < ActiveRecord::Base
+  class Classification < Spree::Base
     self.table_name = 'spree_products_taxons'
     acts_as_list
     belongs_to :product, class_name: "Spree::Product", inverse_of: :classifications

data/app/models/spree/configuration.rb

@@ -1,5 +1,5 @@
 module Spree
-  class Configuration < ActiveRecord::Base
+  class Configuration < Spree::Base
 
   end
 end

data/app/models/spree/country.rb

@@ -1,5 +1,5 @@
 module Spree
-  class Country < ActiveRecord::Base
+  class Country < Spree::Base
     has_many :states, -> { order('name ASC') }, dependent: :destroy
     has_many :addresses, dependent: :nullify
 

data/app/models/spree/credit_card.rb

@@ -1,5 +1,5 @@
 module Spree
-  class CreditCard < ActiveRecord::Base
+  class CreditCard < Spree::Base
     belongs_to :payment_method
     has_many :payments, as: :source
 
@@ -110,11 +110,11 @@ module Spree
     # Looking at the ActiveMerchant source code we should probably be calling #to_active_merchant before passing
     # the object to ActiveMerchant but this should do for now.
     def first_name
-      super || name.to_s.split(/[[:space:]]/, 2)[0]
+      name.to_s.split(/[[:space:]]/, 2)[0]
     end
 
     def last_name
-      super || name.to_s.split(/[[:space:]]/, 2)[1]
+      name.to_s.split(/[[:space:]]/, 2)[1]
     end
 
     def to_active_merchant
@@ -123,8 +123,8 @@ module Spree
         :month => month,
         :year => year,
         :verification_value => verification_value,
-        :first_name => first_name || name.to_s.split(/[[:space:]]/, 2)[0],
-        :last_name => last_name || name.to_s.split(/[[:space:]]/, 2)[1]
+        :first_name => first_name,
+        :last_name => last_name,
       )
     end
 
@@ -132,13 +132,9 @@ module Spree
 
     def expiry_not_in_the_past
       if year.present? && month.present?
-        if month.to_i < 1 || month.to_i > 12
-          errors.add(:base, :expiry_invalid)
-        else
-          current = Time.current
-          if year.to_i < current.year or (year.to_i == current.year and month.to_i < current.month)
-            errors.add(:base, :card_expired)
-          end
+        time = Time.zone.parse("#{year}-#{month}-1")
+        if time < Time.zone.now.to_time.beginning_of_month
+          errors.add(:base, :card_expired)
         end
       end
     end

data/app/models/spree/gateway.rb

@@ -75,8 +75,5 @@ module Spree
         end
       end
     end
-
-    # for backwards compatibility
-    alias_method :source_with_profiles, :reusable_sources
   end
 end

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

@@ -19,9 +19,8 @@ module Spree
 
     def create_profile(payment)
       # simulate the storage of credit card profile using remote service
-      if success = VALID_CCS.include?(payment.source.number)
-        payment.source.update_attributes(:gateway_customer_profile_id => generate_profile_id(success))
-      end
+      success = VALID_CCS.include? payment.source.number
+      payment.source.update_attributes(:gateway_customer_profile_id => generate_profile_id(success))
     end
 
     def authorize(money, credit_card, options = {})

data/app/models/spree/image.rb

@@ -1,6 +1,5 @@
 module Spree
   class Image < Asset
-    validates_attachment_presence :attachment
     validate :no_attachment_errors
 
     has_attached_file :attachment,
@@ -9,6 +8,9 @@ module Spree
                       url: '/spree/products/:id/:style/:basename.:extension',
                       path: ':rails_root/public/spree/products/:id/:style/:basename.:extension',
                       convert_options: { all: '-strip -auto-orient -colorspace sRGB' }
+    validates_attachment :attachment,
+      :presence => true,
+      :content_type => { :content_type => %w(image/jpeg image/jpg image/png image/gif) }
 
     # save the w,h of the original image (from which others can be calculated)
     # we need to look at the write-queue for images which have not been saved yet

data/app/models/spree/inventory_unit.rb

@@ -1,9 +1,9 @@
 module Spree
-  class InventoryUnit < ActiveRecord::Base
+  class InventoryUnit < Spree::Base
     belongs_to :variant, class_name: "Spree::Variant", inverse_of: :inventory_units
     belongs_to :order, class_name: "Spree::Order", inverse_of: :inventory_units
     belongs_to :shipment, class_name: "Spree::Shipment", touch: true, inverse_of: :inventory_units
-    belongs_to :return_authorization, class_name: "Spree::ReturnAuthorization", inverse_of: :inventory_units
+    belongs_to :return_authorization, class_name: "Spree::ReturnAuthorization"
     belongs_to :line_item, class_name: "Spree::LineItem", inverse_of: :inventory_units
 
     scope :backordered, -> { where state: 'backordered' }
@@ -21,7 +21,7 @@ module Spree
       event :fill_backorder do
         transition to: :on_hand, from: :backordered
       end
-      after_transition on: :fill_backorder, do: :fulfill_order
+      after_transition on: :fill_backorder, do: :update_order
 
       event :ship do
         transition to: :shipped, if: :allow_ship?
@@ -69,9 +69,8 @@ module Spree
         Spree::Config[:allow_backorder_shipping] || self.on_hand?
       end
 
-      def fulfill_order
-        self.reload
-        order.fulfill!
+      def update_order
+        order.update!
       end
   end
 end

data/app/models/spree/item_adjustments.rb

@@ -47,9 +47,8 @@ module Spree
       included_tax_total = 0
       additional_tax_total = 0
       run_callbacks :tax_adjustments do
-        tax = (item.respond_to?(:all_adjustments) ? item.all_adjustments : item.adjustments).tax
-        included_tax_total = tax.included.reload.map(&:update!).compact.sum
-        additional_tax_total = tax.additional.reload.map(&:update!).compact.sum
+        included_tax_total = adjustments.tax.included.reload.map(&:update!).compact.sum
+        additional_tax_total = adjustments.tax.additional.reload.map(&:update!).compact.sum
       end
 
       item.update_columns(
@@ -72,7 +71,7 @@ module Spree
     end
 
     def best_promotion_adjustment
-      @best_promotion_adjustment ||= adjustments.promotion.eligible.reorder("amount ASC, created_at DESC, id DESC").first
+      @best_promotion_adjustment ||= adjustments.promotion.eligible.reorder("amount ASC, created_at DESC").first
     end
   end
 end

data/app/models/spree/legacy_user.rb

@@ -1,6 +1,6 @@
 # Default implementation of User.  This class is intended to be modified by extensions (ex. spree_auth_devise)
 module Spree
-  class LegacyUser < ActiveRecord::Base
+  class LegacyUser < Spree::Base
     include Core::UserAddress
     include Core::UserPaymentSource
 

data/app/models/spree/line_item.rb

@@ -1,5 +1,5 @@
 module Spree
-  class LineItem < ActiveRecord::Base
+  class LineItem < Spree::Base
     before_validation :adjust_quantity
     belongs_to :order, class_name: "Spree::Order", inverse_of: :line_items, touch: true
     belongs_to :variant, class_name: "Spree::Variant", inverse_of: :line_items
@@ -30,13 +30,10 @@ module Spree
 
     after_create :update_tax_charge
 
-    delegate :name, :description, :should_track_inventory?, to: :variant
+    delegate :name, :description, :sku, :should_track_inventory?, to: :variant
 
     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?
@@ -88,10 +85,6 @@ module Spree
       !sufficient_stock?
     end
 
-    def assign_stock_changes_to=(shipment)
-      @preferred_shipment = shipment
-    end
-
     # Remove product default_scope `deleted_at: nil`
     def product
       variant.product
@@ -104,14 +97,14 @@ module Spree
 
     private
       def update_inventory
-        if changed?
+        if changed? || target_shipment.present?
           Spree::OrderInventory.new(self.order, self).verify(target_shipment)
         end
       end
 
       def update_adjustments
         if quantity_changed?
-          update_tax_charge # Called to ensure pre_tax_amount is updated.
+          update_tax_charge # Called to ensure pre_tax_amount is updated. 
           recalculate_adjustments
         end
       end
@@ -121,12 +114,12 @@ module Spree
       end
 
       def update_tax_charge
-        Spree::TaxRate.adjust(order, [self])
+        Spree::TaxRate.adjust(order.tax_zone, [self])
       end
 
       def ensure_proper_currency
         unless currency == order.currency
-          errors.add(:currency, :must_match_order_currency)
+          errors.add(:currency, t(:must_match_order_currency))
         end
       end
   end

data/app/models/spree/log_entry.rb

@@ -1,5 +1,5 @@
 module Spree
-  class LogEntry < ActiveRecord::Base
+  class LogEntry < Spree::Base
     belongs_to :source, polymorphic: true
 
     # Fix for #1767

data/app/models/spree/option_type.rb

@@ -1,5 +1,5 @@
 module Spree
-  class OptionType < ActiveRecord::Base
+  class OptionType < Spree::Base
     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

data/app/models/spree/option_value.rb

@@ -1,5 +1,5 @@
 module Spree
-  class OptionValue < ActiveRecord::Base
+  class OptionValue < Spree::Base
     belongs_to :option_type, class_name: 'Spree::OptionType', touch: true, inverse_of: :option_values
     acts_as_list scope: :option_type
     has_and_belongs_to_many :variants, join_table: 'spree_option_values_variants', class_name: "Spree::Variant"
@@ -8,8 +8,6 @@ module Spree
 
     after_touch :touch_all_variants
 
-    self.whitelisted_ransackable_attributes = ['presentation']
-
     def touch_all_variants
       # This can cause a cascade of products to be updated
       # To disable it in Rails 4.1, we can do this:

data/app/models/spree/order.rb

@@ -2,24 +2,25 @@ require 'spree/core/validators/email'
 require 'spree/order/checkout'
 
 module Spree
-  class Order < ActiveRecord::Base
-    include Spree::Order::Checkout
-    include Spree::Order::CurrencyUpdater
+  class Order < Spree::Base
+    include Checkout
+    include CurrencyUpdater
 
     checkout_flow do
       go_to_state :address
       go_to_state :delivery
-      go_to_state :payment, if: ->(order) { order.payment_required? }
+      go_to_state :payment, if: ->(order) do
+        # TODO there should be a better fix work around for the issues this is
+        # resolving we shouldn't be setting shipments cost every time a order
+        # object is loaded
+        order.set_shipments_cost if order.shipments.any?
+        order.payment_required?
+      end
       go_to_state :confirm, if: ->(order) { order.confirmation_required? }
       go_to_state :complete
       remove_transition from: :delivery, to: :confirm
     end
 
-    token_resource
-
-    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]
-
     attr_reader :coupon_code
 
     if Spree.user_class
@@ -41,9 +42,9 @@ module Spree
     alias_attribute :ship_total, :shipment_total
 
     has_many :state_changes, as: :stateful
-    has_many :line_items, -> { order("#{LineItem.table_name}.created_at ASC") }, dependent: :destroy, inverse_of: :order
+    has_many :line_items, -> { order('created_at ASC') }, dependent: :destroy, inverse_of: :order
     has_many :payments, dependent: :destroy
-    has_many :return_authorizations, dependent: :destroy, inverse_of: :order
+    has_many :return_authorizations, dependent: :destroy
     has_many :adjustments, -> { order("#{Adjustment.table_name}.created_at ASC") }, as: :adjustable, dependent: :destroy
     has_many :line_item_adjustments, through: :line_items, source: :adjustments
     has_many :shipment_adjustments, through: :shipments, source: :adjustments
@@ -71,12 +72,13 @@ module Spree
     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, uniqueness: true
     validate :has_available_shipment
 
     make_permalink field: :number
@@ -92,12 +94,6 @@ module Spree
 
     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) }
-    scope :reverse_chronological, -> { order(created_at: :desc) }
-
-    def self.between(start_date, end_date)
-      ActiveSupport::Deprecation.warn("Order#between will be deprecated in Spree 2.3, please use either Order#created_between or Order#completed_between instead.")
-      self.created_between(start_date, end_date)
-    end
 
     def self.by_customer(customer)
       joins(:user).where("#{Spree.user_class.table_name}.email" => customer)
@@ -213,14 +209,6 @@ module Spree
       @tax_zone ||= Zone.match(tax_address) || Zone.default_tax
     end
 
-    # Indicates whether tax should be backed out of the price calcualtions in
-    # cases where prices include tax but the customer is not required to pay
-    # taxes in that case.
-    def exclude_tax?
-      return false unless Spree::Config[:prices_inc_tax]
-      tax_zone != Zone.default_tax
-    end
-
     # Returns the address for taxation based on configuration
     def tax_address
       Spree::Config[:tax_using_ship_address] ? ship_address : bill_address
@@ -270,18 +258,15 @@ module Spree
       end
     end
 
-    def generate_order_number(digits = 9)
-      self.number ||= loop do
-         # Make a random number.
-         random = "R#{Array.new(digits){rand(10)}.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.
-           digits += 1 if self.class.count > (10 ** digits / 2)
-         else
-           break random
-         end
-       end
+    # FIXME refactor this method and implement validation using validates_* utilities
+    def generate_order_number
+      record = true
+      while record
+        random = "R#{Array.new(9){rand(9)}.join}"
+        record = self.class.where(number: random).first
+      end
+      self.number = random if self.number.blank?
+      self.number
     end
 
     def shipped_shipments
@@ -304,16 +289,14 @@ 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!
-      Spree::TaxRate.adjust(self, line_items)
-      Spree::TaxRate.adjust(self, shipments) if shipments.any?
+      # 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?
     end
 
     def outstanding_balance
-      if self.state == 'canceled' && self.payments.present? && self.payments.completed.size > 0
-        -1 * payment_total
-      else
-        total - payment_total
-      end
+      total - payment_total
     end
 
     def outstanding_balance?
@@ -359,12 +342,6 @@ module Spree
       consider_risk
     end
 
-    def fulfill!
-      shipments.each { |shipment| shipment.update!(self) if shipment.persisted? }
-      updater.update_shipment_state
-      save!
-    end
-
     def deliver_order_confirmation_email
       OrderMailer.confirm_email(self.id).deliver
       update_column(:confirmation_delivered, true)
@@ -388,26 +365,25 @@ module Spree
     # 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!
-      if pending_payments.empty?
-        raise Core::GatewayError.new Spree.t(:no_pending_payments)
-      else
-        pending_payments.each do |payment|
-          break if payment_total >= total
+      pending_payments.each do |payment|
+        break if payment_total >= total
 
-          payment.process!
+        payment.process!
 
-          if payment.completed?
-            self.payment_total += payment.amount
-          end
+        if payment.completed?
+          self.payment_total += payment.amount
         end
       end
     rescue Core::GatewayError => e
@@ -427,17 +403,10 @@ module Spree
      line_items.select(&:insufficient_stock?)
     end
 
-    def ensure_line_items_are_in_stock
-      if insufficient_stock_lines.present?
-        errors.add(:base, Spree.t(:insufficient_stock_lines_present)) and return false
-      end
-    end
-
     def merge!(order, user = nil)
       order.line_items.each do |line_item|
         next unless line_item.currency == currency
         current_line_item = self.line_items.find_by(variant: line_item.variant)
-
         if current_line_item
           current_line_item.quantity += line_item.quantity
           current_line_item.save
@@ -564,7 +533,6 @@ module Spree
         self.update_columns(
           approver_id: user.id,
           approved_at: Time.now,
-          considered_risky: false,
         )
       end
     end
@@ -604,11 +572,15 @@ module Spree
       self.ensure_updated_shipments
     end
 
-    def reload(options=nil)
+    def reload
       remove_instance_variable(:@tax_zone) if defined?(@tax_zone)
       super
     end
 
+    def tax_total
+      included_tax_total + additional_tax_total
+    end
+
     private
 
       def link_by_email
@@ -635,6 +607,9 @@ module Spree
 
       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
           errors.add(:base, Spree.t(:items_cannot_be_shipped)) and return false
         end
       end
@@ -642,8 +617,9 @@ module Spree
       def after_cancel
         shipments.each { |shipment| shipment.cancel! }
         payments.completed.each { |payment| payment.cancel! }
+
         send_cancel_email
-        self.update!
+        self.update_column(:payment_state, 'credit_owed') unless shipped?
       end
 
       def send_cancel_email
@@ -663,5 +639,11 @@ module Spree
         self.currency = Spree::Config[:currency] if self[:currency].nil?
       end
 
+      def create_token
+        self.guest_token ||= loop do
+          random_token = SecureRandom.urlsafe_base64(nil, false)
+          break random_token unless self.class.exists?(guest_token: random_token)
+        end
+      end
   end
 end