spree_core 2.2.14 → 2.3.0

data/app/models/spree/product_option_type.rb

@@ -1,5 +1,5 @@
 module Spree
-  class ProductOptionType < ActiveRecord::Base
+  class ProductOptionType < Spree::Base
     belongs_to :product, class_name: 'Spree::Product', inverse_of: :product_option_types
     belongs_to :option_type, class_name: 'Spree::OptionType', inverse_of: :product_option_types
     acts_as_list scope: :product

data/app/models/spree/product_property.rb

@@ -1,5 +1,5 @@
 module Spree
-  class ProductProperty < ActiveRecord::Base
+  class ProductProperty < Spree::Base
     belongs_to :product, touch: true, class_name: 'Spree::Product', inverse_of: :product_properties
     belongs_to :property, class_name: 'Spree::Property', inverse_of: :product_properties
 
@@ -8,8 +8,6 @@ module Spree
 
     default_scope -> { order("#{self.table_name}.position") }
 
-    self.whitelisted_ransackable_attributes = ['value']
-
     # virtual attributes for use with AJAX completion stuff
     def property_name
       property.name if property

data/app/models/spree/product_scope/scopes.rb

@@ -1,5 +1,5 @@
 module Spree
-  class ProductScope < ActiveRecord::Base
+  class ProductScope < Spree::Base
     before_validation(:on => :create) do
       # Add default empty arguments so scope validates and errors aren't caused when previewing it
       if name && args = self.class.arguments_for_scope_name(name)

data/app/models/spree/promotion.rb

@@ -1,5 +1,5 @@
 module Spree
-  class Promotion < ActiveRecord::Base
+  class Promotion < Spree::Base
     MATCH_POLICIES = %w(all any)
     UNACTIVATABLE_ORDER_STATES = ["complete", "awaiting_return", "returned"]
 
@@ -22,14 +22,14 @@ module Spree
 
     before_save :normalize_blank_values
 
-    self.whitelisted_ransackable_attributes = ['code', 'path', 'promotion_category_id']
+    scope :coupons, ->{ where("#{table_name}.code IS NOT NULL") }
 
     def self.advertised
       where(advertise: true)
     end
 
     def self.with_coupon_code(coupon_code)
-      where("lower(#{self.table_name}.code) = ?", coupon_code.strip.downcase).first
+      where("lower(code) = ?", coupon_code.strip.downcase).first
     end
 
     def self.active
@@ -107,8 +107,7 @@ module Spree
     end
 
     def adjusted_credits_count(promotable)
-      adjustments = promotable.is_a?(Order) ? promotable.all_adjustments : promotable.adjustments
-      credits_count - adjustments.promotion.where(:source_id => actions.pluck(:id)).count
+      credits_count - promotable.adjustments.promotion.where(:source_id => actions.pluck(:id)).count
     end
 
     def credits

data/app/models/spree/promotion/actions/create_adjustment.rb

@@ -3,14 +3,13 @@ module Spree
     module Actions
       class CreateAdjustment < PromotionAction
         include Spree::Core::CalculatedAdjustments
-        include Spree::Core::AdjustmentSource
 
         has_many :adjustments, as: :source
 
         delegate :eligible?, to: :promotion
 
         before_validation :ensure_action_has_calculator
-        before_destroy :deals_with_adjustments_for_deleted_source
+        before_destroy :deals_with_adjustments
 
         # Creates the adjustment related to a promotion for the order passed
         # through options hash
@@ -56,6 +55,16 @@ module Spree
             self.calculator = Calculator::FlatPercentItemTotal.new
           end
 
+          def deals_with_adjustments
+            adjustment_scope = self.adjustments.joins("LEFT OUTER JOIN spree_orders ON spree_orders.id = spree_adjustments.adjustable_id")
+            # For incomplete orders, remove the adjustment completely.
+            adjustment_scope.where("spree_orders.completed_at IS NULL").readonly(false).destroy_all
+
+            # For complete orders, the source will be invalid.
+            # Therefore we nullify the source_id, leaving the adjustment in place.
+            # This would mean that the order's total is not altered at all.
+            adjustment_scope.where("spree_orders.completed_at IS NOT NULL").update_all("source_id = NULL")
+          end
       end
     end
   end

data/app/models/spree/promotion/actions/create_item_adjustments.rb

@@ -3,14 +3,13 @@ module Spree
     module Actions
       class CreateItemAdjustments < PromotionAction
         include Spree::Core::CalculatedAdjustments
-        include Spree::Core::AdjustmentSource
 
         has_many :adjustments, as: :source
 
         delegate :eligible?, to: :promotion
 
         before_validation :ensure_action_has_calculator
-        before_destroy :deals_with_adjustments_for_deleted_source
+        before_destroy :deals_with_adjustments
 
         def perform(payload = {})
           order = payload[:order]
@@ -63,6 +62,24 @@ module Spree
             self.calculator = Calculator::PercentOnLineItem.new
           end
 
+          def deals_with_adjustments
+            adjustment_scope = self.adjustments.includes(:order).references(:spree_orders)
+
+            # For incomplete orders, remove the adjustment completely.
+            adjustment_scope.where("spree_orders.completed_at IS NULL").each do |adjustment|
+              adjustment.destroy
+            end
+
+            # For complete orders, the source will be invalid.
+            # Therefore we nullify the source_id, leaving the adjustment in place.
+            # This would mean that the order's total is not altered at all.
+            adjustment_scope.where("spree_orders.completed_at IS NOT NULL").each do |adjustment|
+              adjustment.update_columns(
+                source_id: nil,
+                updated_at: Time.now,
+              )
+            end
+          end
       end
     end
   end

data/app/models/spree/promotion/actions/create_line_items.rb

@@ -39,23 +39,13 @@ module Spree
           order = options[:order]
           return unless self.eligible? order
 
-          action_taken = false
           promotion_action_line_items.each do |item|
             current_quantity = order.quantity_of(item.variant)
-            if current_quantity < item.quantity && item_available?(item)
-              line_item = order.contents.add(item.variant, item.quantity - current_quantity)
-              action_taken = true if line_item.try(:valid?)
+            if current_quantity < item.quantity
+              order.contents.add(item.variant, item.quantity - current_quantity)
             end
           end
-          action_taken
         end
-
-        # Checks that there's enough stock to add the line item to the order
-        def item_available?(item)
-          quantifier = Spree::Stock::Quantifier.new(item.variant)
-          quantifier.can_supply? item.quantity
-        end
-
       end
     end
   end

data/app/models/spree/promotion/rules/user.rb

@@ -3,8 +3,12 @@ module Spree
     module Rules
       class User < PromotionRule
         belongs_to :user, class_name: "::#{Spree.user_class.to_s}"
-        has_and_belongs_to_many :users, class_name: "::#{Spree.user_class.to_s}", join_table: 'spree_promotion_rules_users', foreign_key: 'promotion_rule_id'
 
+        has_and_belongs_to_many :users, class_name: "::#{Spree.user_class.to_s}",
+          join_table: 'spree_promotion_rules_users',
+          foreign_key: 'promotion_rule_id',
+          association_foreign_key: :user_id
+        
         def applicable?(promotable)
           promotable.is_a?(Spree::Order)
         end

data/app/models/spree/promotion_action.rb

@@ -1,7 +1,7 @@
 # Base class for all types of promotion action.
 # PromotionActions perform the necessary tasks when a promotion is activated by an event and determined to be eligible.
 module Spree
-  class PromotionAction < ActiveRecord::Base
+  class PromotionAction < Spree::Base
     acts_as_paranoid
 
     belongs_to :promotion, class_name: 'Spree::Promotion'

data/app/models/spree/promotion_action_line_item.rb

@@ -1,5 +1,5 @@
 module Spree
-  class PromotionActionLineItem < ActiveRecord::Base
+  class PromotionActionLineItem < Spree::Base
     belongs_to :promotion_action, class_name: 'Spree::Promotion::Actions::CreateLineItems'
     belongs_to :variant, class_name: 'Spree::Variant'
   end

data/app/models/spree/promotion_handler/cart.rb

@@ -29,21 +29,9 @@ module Spree
       end
 
       private
-        def promotions
-          promo_table = Promotion.arel_table
-          join_table = Arel::Table.new(:spree_orders_promotions)
-
-          join_condition = promo_table.join(join_table, Arel::Nodes::OuterJoin).on(
-            promo_table[:id].eq(join_table[:promotion_id])
-          ).join_sources
 
-          Promotion.active.includes(:promotion_rules).
-            joins(join_condition).
-            where(
-              promo_table[:code].eq(nil).and(
-                promo_table[:path].eq(nil)
-              ).or(join_table[:order_id].eq(order.id))
-            ).distinct
+        def promotions
+          Promotion.active.includes(:promotion_rules).where(:code => nil, :path => nil)
         end
     end
   end

data/app/models/spree/promotion_handler/coupon.rb

@@ -72,27 +72,17 @@ module Spree
           end
         }
 
-        # Check for applied adjustments.
         discount = order.line_item_adjustments.promotion.detect(&detector)
         discount ||= order.shipment_adjustments.promotion.detect(&detector)
         discount ||= order.adjustments.promotion.detect(&detector)
 
-        # Check for applied line items.
-        created_line_items = promotion.actions.detect { |a| a.type == 'Spree::Promotion::Actions::CreateLineItems' }
-
-        if (discount && discount.eligible) || created_line_items
+        if discount.eligible
           order.update_totals
           order.persist_totals
           self.success = Spree.t(:coupon_code_applied)
         else
-          # if the promotion exists on an order, but wasn't found above,
-          # we've already selected a better promotion
-          if order.promotions.with_coupon_code(order.coupon_code)
-            self.error = Spree.t(:coupon_code_better_exists)
-          else
-            # if the promotion was created after the order
-            self.error = Spree.t(:coupon_code_not_found)
-          end
+          # if the promotion was created after the order
+          self.error = Spree.t(:coupon_code_not_found)
         end
       end
     end

data/app/models/spree/promotion_rule.rb

@@ -1,6 +1,6 @@
 # Base class for all promotion rules
 module Spree
-  class PromotionRule < ActiveRecord::Base
+  class PromotionRule < Spree::Base
     belongs_to :promotion, class_name: 'Spree::Promotion', inverse_of: :promotion_rules
 
     scope :of_type, ->(t) { where(type: t) }

data/app/models/spree/property.rb

@@ -1,5 +1,5 @@
 module Spree
-  class Property < ActiveRecord::Base
+  class Property < Spree::Base
     has_and_belongs_to_many :prototypes, join_table: 'spree_properties_prototypes'
 
     has_many :product_properties, dependent: :delete_all, inverse_of: :property
@@ -11,8 +11,6 @@ module Spree
 
     after_touch :touch_all_products
 
-    self.whitelisted_ransackable_attributes = ['presentation']
-
     def self.find_all_by_prototype(prototype)
       id = prototype
       id = prototype.id if prototype.class == Prototype

data/app/models/spree/prototype.rb

@@ -1,5 +1,5 @@
 module Spree
-  class Prototype < ActiveRecord::Base
+  class Prototype < Spree::Base
     has_and_belongs_to_many :properties, join_table: :spree_properties_prototypes
     has_and_belongs_to_many :option_types, join_table: :spree_option_types_prototypes
 

data/app/models/spree/return_authorization.rb

@@ -1,8 +1,8 @@
 module Spree
-  class ReturnAuthorization < ActiveRecord::Base
-    belongs_to :order, class_name: 'Spree::Order', inverse_of: :return_authorizations
+  class ReturnAuthorization < Spree::Base
+    belongs_to :order, class_name: 'Spree::Order'
 
-    has_many :inventory_units, dependent: :nullify, inverse_of: :return_authorization
+    has_many :inventory_units
     belongs_to :stock_location
     before_create :generate_number
     before_save :force_positive_amount
@@ -22,12 +22,6 @@ module Spree
       end
     end
 
-    self.whitelisted_ransackable_attributes = ['reason']
-
-    def pre_tax_total
-      return_items.sum(:pre_tax_amount)
-    end
-
     def currency
       order.nil? ? Spree::Config[:currency] : order.currency
     end
@@ -68,7 +62,7 @@ module Spree
       order.shipped_shipments.collect{|s| s.inventory_units.to_a}.flatten
     end
 
-    # Used when Adjustment#update! wants to update the related adjustment
+    # Used when Adjustment#update! wants to update the related adjustmenrt
     def compute_amount(*args)
       amount.abs * -1
     end

data/app/models/spree/role.rb

@@ -1,5 +1,5 @@
 module Spree
-  class Role < ActiveRecord::Base
+  class Role < Spree::Base
     has_and_belongs_to_many :users, join_table: 'spree_roles_users', class_name: Spree.user_class.to_s
   end
 end

data/app/models/spree/shipment.rb

@@ -1,7 +1,7 @@
 require 'ostruct'
 
 module Spree
-  class Shipment < ActiveRecord::Base
+  class Shipment < Spree::Base
     belongs_to :order, class_name: 'Spree::Order', touch: true, inverse_of: :shipments
     belongs_to :address, class_name: 'Spree::Address', inverse_of: :shipments
     belongs_to :stock_location, class_name: 'Spree::StockLocation'
@@ -93,8 +93,6 @@ module Spree
       selected_shipping_rate.try(:shipping_method) || shipping_rates.first.try(:shipping_method)
     end
 
-    self.whitelisted_ransackable_attributes = ['number']
-
     def add_shipping_method(shipping_method, selected = false)
       shipping_rates.create(shipping_method: shipping_method, selected: selected, cost: cost)
     end
@@ -339,12 +337,6 @@ module Spree
         "#{Spree.t(:shipping)} (#{shipping_method.name})"
       end
 
-      def validate_shipping_method
-        unless shipping_method.nil?
-          errors.add :shipping_method, Spree.t(:is_not_available_to_shipment_address) unless shipping_method.include?(address)
-        end
-      end
-
       def after_ship
         inventory_units.each &:ship!
         send_shipped_email

data/app/models/spree/shipping_category.rb

@@ -1,8 +1,8 @@
 module Spree
-  class ShippingCategory < ActiveRecord::Base
+  class ShippingCategory < Spree::Base
     validates :name, presence: true
     has_many :products, inverse_of: :shipping_category
-    has_many :shipping_method_categories, inverse_of: :shipping_method
+    has_many :shipping_method_categories
     has_many :shipping_methods, through: :shipping_method_categories
   end
-end
+end

data/app/models/spree/shipping_method.rb

@@ -1,5 +1,5 @@
 module Spree
-  class ShippingMethod < ActiveRecord::Base
+  class ShippingMethod < Spree::Base
     acts_as_paranoid
     include Spree::Core::CalculatedAdjustments
     DISPLAY = [:both, :front_end, :back_end]

data/app/models/spree/shipping_method_category.rb

@@ -1,6 +1,6 @@
 module Spree
-  class ShippingMethodCategory < ActiveRecord::Base
+  class ShippingMethodCategory < Spree::Base
     belongs_to :shipping_method, class_name: 'Spree::ShippingMethod'
-    belongs_to :shipping_category, class_name: 'Spree::ShippingCategory', inverse_of: :shipping_method_categories
+    belongs_to :shipping_category, class_name: 'Spree::ShippingCategory'
   end
 end

data/app/models/spree/shipping_rate.rb

@@ -1,5 +1,5 @@
 module Spree
-  class ShippingRate < ActiveRecord::Base
+  class ShippingRate < Spree::Base
     belongs_to :shipment, class_name: 'Spree::Shipment'
     belongs_to :shipping_method, class_name: 'Spree::ShippingMethod', inverse_of: :shipping_rates
     belongs_to :tax_rate, class_name: 'Spree::TaxRate'
@@ -23,10 +23,10 @@ module Spree
           if tax_rate.included_in_price?
             if tax_amount > 0
               amount = "#{display_tax_amount(tax_amount)} #{tax_rate.name}"
-              price += " (#{Spree.t(:incl)} #{amount})"
+              price += " (incl. #{amount})"
             else
               amount = "#{display_tax_amount(tax_amount*-1)} #{tax_rate.name}"
-              price += " (#{Spree.t(:excl)} #{amount})"
+              price += " (excl. #{amount})"
             end
           else
             amount = "#{display_tax_amount(tax_amount)} #{tax_rate.name}"

data/app/models/spree/state.rb

@@ -1,5 +1,5 @@
 module Spree
-  class State < ActiveRecord::Base
+  class State < Spree::Base
     belongs_to :country, class_name: 'Spree::Country'
     has_many :addresses, dependent: :nullify
 

data/app/models/spree/state_change.rb

@@ -1,5 +1,5 @@
 module Spree
-  class StateChange < ActiveRecord::Base
+  class StateChange < Spree::Base
     belongs_to :user
     belongs_to :stateful, polymorphic: true
     before_create :assign_user

data/app/models/spree/stock/availability_validator.rb

@@ -2,9 +2,13 @@ module Spree
   module Stock
     class AvailabilityValidator < ActiveModel::Validator
       def validate(line_item)
-        unit_count = line_item.inventory_units.size
-        return if unit_count >= line_item.quantity
-        quantity = line_item.quantity - unit_count
+        if shipment = line_item.target_shipment
+          units = shipment.inventory_units_for(line_item.variant)
+          return if units.count > line_item.quantity
+          quantity = line_item.quantity - units.count
+        else
+          quantity = line_item.quantity
+        end
 
         quantifier = Stock::Quantifier.new(line_item.variant)