solidus_core 1.0.0.pre → 1.0.0.pre2

data/app/models/spree/item_adjustments.rb.orig

@@ -1,93 +0,0 @@
-module Spree
-  # Manage (recalculate) item (LineItem or Shipment) adjustments
-  class ItemAdjustments
-    attr_reader :item
-
-    # @param item [Order, LineItem, Shipment] the item whose adjustments should be updated
-    def initialize(item)
-      @item = item
-    end
-
-    # Update the item's adjustments and totals
-    #
-    # If the item is an {Order}, this will update and select the best
-    # promotion adjustment.
-    #
-    # If it is a {LineItem} or {Shipment}, it will update and select the best
-    # promotion adjustment, update tax adjustments, update cancellation
-    # adjustments, and then update the total fields (promo_total,
-    # included_tax_total, additional_tax_total, and adjustment_total) on the
-    # item.
-    #
-    # This is a noop if the item is not persisted.
-    def update
-      return @item unless item.persisted?
-
-      # Promotion adjustments must be applied first, then tax adjustments.
-      # This fits the criteria for VAT tax as outlined here:
-      # http://www.hmrc.gov.uk/vat/managing/charging/discounts-etc.htm#1
-      #
-      # It also fits the criteria for sales tax as outlined here:
-      # http://www.boe.ca.gov/formspubs/pub113/
-      #
-      # Tax adjustments come in not one but *two* exciting flavours:
-      # Included & additional
-
-      # Included tax adjustments are those which are included in the price.
-      # These ones should not affect the eventual total price.
-      #
-      # Additional tax adjustments are the opposite, affecting the final total.
-
-      promotion_adjustments = adjustments.select(&:promotion?)
-      promotion_adjustments.each(&:update!)
-
-      promo_total = PromotionChooser.new(promotion_adjustments).update
-
-      # Calculating the totals for the order here would be incorrect. Order's
-      # totals are the sum of the adjustments on all child models, as well as
-      # its own.
-      #
-      # We want to select the best promotion for the order, but the remainder
-      # of the calculations here are done in the OrderUpdater instead.
-      return if Spree::Order === item
-
-      @item.promo_total = promo_total
-
-      tax = adjustments.select(&:tax?)
-
-      @item.included_tax_total = tax.select(&:included?).map(&:update!).compact.sum
-      @item.additional_tax_total = tax.reject(&:included?).map(&:update!).compact.sum
-
-      item_cancellation_total = adjustments.select(&:cancellation?).map(&:update!).compact.sum
-
-      @item.adjustment_total = @item.promo_total + @item.additional_tax_total + item_cancellation_total
-
-      @item.update_columns(
-        :promo_total => @item.promo_total,
-        :included_tax_total => @item.included_tax_total,
-        :additional_tax_total => @item.additional_tax_total,
-        :adjustment_total => @item.adjustment_total,
-        :updated_at => Time.now,
-      ) if @item.changed?
-
-      @item
-    end
-
-<<<<<<< HEAD
-    private
-    def adjustments
-      # This is done intentionally to avoid loading the association. If the
-      # association is loaded, the records may become stale due to code
-      # elsewhere in spree. When that is remedied, this should be changed to
-      # just item.adjustments
-      @adjustments ||= item.adjustments.all.to_a
-||||||| parent of 12bada8... Replace order strings with symbols/arel_table.
-    def best_promotion_adjustment
-      @best_promotion_adjustment ||= adjustments.promotion.eligible.reorder("amount ASC, created_at DESC, id DESC").first
-=======
-    def best_promotion_adjustment
-      @best_promotion_adjustment ||= adjustments.promotion.eligible.reorder(:amount, created_at: :desc, id: :desc).first
->>>>>>> 12bada8... Replace order strings with symbols/arel_table.
-    end
-  end
-end

data/app/models/spree/return_authorization_reason.rb

@@ -1,7 +0,0 @@
-module Spree
-  class ReturnAuthorizationReason < Spree::Base
-    include Spree::NamedType
-
-    has_many :return_authorizations
-  end
-end

data/app/models/spree/static_model_preferences.rb

@@ -1,32 +0,0 @@
-module Spree
-  class StaticModelPreferences
-    def initialize(model_class, name, preferences={})
-      @name = name
-      @model_class = model_class
-      @preferences = preferences.dup.freeze
-
-      validate_preferences
-    end
-
-    delegate :keys, :fetch, to: :@preferences
-
-    def []=(name, value)
-      puts "Ignoring assignment of preference #{name}"
-    end
-
-    private
-
-    def validate_preferences
-      model_preferences = @model_class.defined_preferences
-      defined_preferences = @preferences.keys
-
-      (model_preferences - defined_preferences).each do |pref|
-        puts "WARNING: Missing definition for #{pref}"
-      end
-
-      (defined_preferences - model_preferences).each do |pref|
-        puts "WARNING: Unknown preference #{pref}"
-      end
-    end
-  end
-end

data/config/initializers/user_class_extensions.rb

@@ -1,42 +0,0 @@
-Spree::Core::Engine.config.to_prepare do
-  if Spree.user_class
-    Spree.user_class.class_eval do
-
-      include Spree::UserApiAuthentication
-      include Spree::UserReporting
-
-      has_many :role_users, foreign_key: "user_id", class_name: "Spree::RoleUser"
-      has_many :spree_roles, through: :role_users, source: :role
-
-      has_many :user_stock_locations, foreign_key: "user_id", class_name: "Spree::UserStockLocation"
-      has_many :stock_locations, through: :user_stock_locations
-
-      has_many :spree_orders, foreign_key: "user_id", class_name: "Spree::Order"
-
-      has_many :store_credits, -> { includes(:credit_type) }, foreign_key: "user_id", class_name: "Spree::StoreCredit"
-      has_many :store_credit_events, through: :store_credits
-
-      belongs_to :ship_address, class_name: 'Spree::Address'
-      belongs_to :bill_address, class_name: 'Spree::Address'
-
-      # has_spree_role? simply needs to return true or false whether a user has a role or not.
-      def has_spree_role?(role_in_question)
-        spree_roles.any? { |role| role.name == role_in_question.to_s }
-      end
-
-      # @return [Spree::Order] the most-recently-created incomplete order
-      # since the customer's last complete order.
-      def last_incomplete_spree_order(store: nil, only_frontend_viewable: true)
-        self_orders = self.orders
-        self_orders = self_orders.where(frontend_viewable: true) if only_frontend_viewable
-        self_orders = self_orders.where(store: store) if store
-        last_order = self_orders.order(:created_at).last
-        last_order unless last_order.try!(:completed?)
-      end
-
-      def total_available_store_credit
-        store_credits.reload.to_a.sum{ |credit| credit.amount_remaining }
-      end
-    end
-  end
-end