solidus_core 2.1.0.beta1 → 2.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d27a7b1fb09b6aa81702049ad833916e12b1aa1b
-  data.tar.gz: 6ece03114b6598ab2dc3bebe5469f48d442e8e2e
+  metadata.gz: 6c66409a6f87b3a90858c73c06bd98dc912c9dfa
+  data.tar.gz: '0148e46c9524d70114def79a9945127920e00289'
 SHA512:
-  metadata.gz: c100bab17654d3fabdf7fe3534f7a98881a9a177033b576cd3fe5fa1cf575bf2610b87e8dc8348dfa616566e3e32fa5b8795484fada7dc7c3e376890fb3d3345
-  data.tar.gz: ef65a5ccb1f92b9c9d7695db45cc98bada5b2343f70d6dc9435c9eb32e4110eea34c80dcb4db5ef0fde1bcb29f3584bbbdd0bf2e4dbb851bb0f4493aa2a121a3
+  metadata.gz: ae05f78d66d73feae17890ea3632d76c6712d1358cc1173613bdfd0c6fb214dbaad740fe1b9a12249397555bf3ec405b60aae833a69f3b96f76bcf86ffec1b44
+  data.tar.gz: 4f11abc46de577ac3aeff8cecc95e1f91fb1c8fd30c1546f3f7ad0b0da68a01161617c4a7b5ca6ec6acfe50bb4f7ede887815ae625dc86dc67142e729a436ea5

data/app/mailers/spree/base_mailer.rb

@@ -1,12 +1,7 @@
 module Spree
   class BaseMailer < ActionMailer::Base
-    def from_address(store = nil)
-      if store
-        store.mail_from_address
-      else
-        Spree::Deprecation.warn "A Spree::Store should be provided to determine the from address.", caller
-        Spree::Config[:mails_from]
-      end
+    def from_address(store)
+      store.mail_from_address
     end
 
     def money(amount, currency = Spree::Config[:currency])

data/app/mailers/spree/carton_mailer.rb

@@ -14,17 +14,9 @@ module Spree
     # signature is:
     #   def shipped_email(carton:, order:, resend: false)
     def shipped_email(options, deprecated_options = {})
-      if options.is_a?(Integer)
-        Spree::Deprecation.warn "Calling shipped_email with a carton_id is DEPRECATED. Instead use CartonMailer.shipped_email(order: order, carton: carton)"
-        @carton = Carton.find(options)
-        @order = @carton.orders.first # assume first order
-        @manifest = @carton.manifest # use the entire manifest, since we don't know the precise order
-        options = deprecated_options
-      else
-        @order = options.fetch(:order)
-        @carton = options.fetch(:carton)
-        @manifest = @carton.manifest_for_order(@order)
-      end
+      @order = options.fetch(:order)
+      @carton = options.fetch(:carton)
+      @manifest = @carton.manifest_for_order(@order)
       options = { resend: false }.merge(options)
       @store = @order.store
       subject = (options[:resend] ? "[#{Spree.t(:resend).upcase}] " : '')

data/app/mailers/spree/order_mailer.rb

@@ -1,7 +1,7 @@
 module Spree
   class OrderMailer < BaseMailer
     def confirm_email(order, resend = false)
-      @order = find_order(order)
+      @order = order
       @store = @order.store
       subject = build_subject(Spree.t('order_mailer.confirm_email.subject'), resend)
 
@@ -9,7 +9,7 @@ module Spree
     end
 
     def cancel_email(order, resend = false)
-      @order = find_order(order)
+      @order = order
       @store = @order.store
       subject = build_subject(Spree.t('order_mailer.cancel_email.subject'), resend)
 
@@ -17,7 +17,7 @@ module Spree
     end
 
     def inventory_cancellation_email(order, inventory_units, resend = false)
-      @order, @inventory_units = find_order(order), inventory_units
+      @order, @inventory_units = order, inventory_units
       @store = @order.store
       subject = build_subject(Spree.t('order_mailer.inventory_cancellation.subject'), resend)
 
@@ -26,15 +26,6 @@ module Spree
 
     private
 
-    def find_order(order)
-      if order.respond_to?(:id)
-        order
-      else
-        Spree::Deprecation.warn("Calling OrderMailer with an id is deprecated. Pass the Spree::Order object instead.")
-        Spree::Order.find(order)
-      end
-    end
-
     def build_subject(subject_text, resend)
       resend_text = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
       "#{resend_text}#{@order.store.name} #{subject_text} ##{@order.number}"

data/app/models/concerns/spree/default_price.rb

@@ -15,9 +15,8 @@ module Spree
       default_price || build_default_price(Spree::Config.default_pricing_options.desired_attributes)
     end
 
-    delegate :display_price, :display_amount, :price, :currency, to: :find_or_build_default_price
-    delegate :price=, :currency=, to: :find_or_build_default_price
-    deprecate :currency=, :currency, deprecator: Spree::Deprecation
+    delegate :display_price, :display_amount, :price, to: :find_or_build_default_price
+    delegate :price=, to: :find_or_build_default_price
 
     def has_default_price?
       !default_price.nil?

data/app/models/concerns/spree/user_methods.rb

@@ -11,7 +11,7 @@ module Spree
       extend Spree::DisplayMoney
 
       has_many :role_users, foreign_key: "user_id", class_name: "Spree::RoleUser", dependent: :destroy
-      has_many :spree_roles, through: :role_users, source: :role
+      has_many :spree_roles, through: :role_users, source: :role, class_name: "Spree::Role"
 
       has_many :user_stock_locations, foreign_key: "user_id", class_name: "Spree::UserStockLocation"
       has_many :stock_locations, through: :user_stock_locations

data/app/models/concerns/spree/user_payment_source.rb

@@ -13,11 +13,5 @@ module Spree
     def payment_sources
       credit_cards.with_payment_profile
     end
-
-    def drop_payment_source(source)
-      Spree::Deprecation.warn("User#drop_payment_source is deprecated", caller)
-      gateway = source.payment_method
-      gateway.disable_customer_profile(source)
-    end
   end
 end

data/app/models/spree/address.rb

@@ -33,15 +33,6 @@ module Spree
       new(country: Spree::Country.default)
     end
 
-    def self.default(user = nil, kind = "bill")
-      Spree::Deprecation.warn("Address.default is deprecated. Use User.default_address or Address.build_default", caller)
-      if user
-        user.send(:"#{kind}_address") || build_default
-      else
-        build_default
-      end
-    end
-
     # @return [Address] an equal address already in the database or a newly created one
     def self.factory(attributes)
       full_attributes = value_attributes(column_defaults, new(attributes).attributes)

data/app/models/spree/adjustment.rb

@@ -32,15 +32,7 @@ module Spree
     after_commit :repair_adjustments_associations_on_destroy, on: [:destroy]
 
     scope :not_finalized, -> { where(finalized: false) }
-    scope :open, -> do
-      Spree::Deprecation.warn "Adjustment.open is deprecated. Instead use Adjustment.not_finalized", caller
-      where(finalized: false)
-    end
     scope :finalized, -> { where(finalized: true) }
-    scope :closed, -> do
-      Spree::Deprecation.warn "Adjustment.closed is deprecated. Instead use Adjustment.finalized", caller
-      where(finalized: true)
-    end
     scope :cancellation, -> { where(source_type: 'Spree::UnitCancel') }
     scope :tax, -> { where(source_type: 'Spree::TaxRate') }
     scope :non_tax, -> do
@@ -78,55 +70,6 @@ module Spree
       update_attributes(finalized: false)
     end
 
-    # Deprecated methods
-    def state
-      Spree::Deprecation.warn "Adjustment#state is deprecated. Instead use Adjustment#finalized?", caller
-      finalized? ? "closed" : "open"
-    end
-
-    def state=(new_state)
-      Spree::Deprecation.warn "Adjustment#state= is deprecated. Instead use Adjustment#finalized=", caller
-      case new_state
-      when "open"
-        self.finalized = false
-      when "closed"
-        self.finalized = true
-      else
-        raise "invaliid adjustment state #{new_state}"
-      end
-    end
-
-    def open?
-      Spree::Deprecation.warn "Adjustment#open? is deprecated. Instead use Adjustment#finalized?", caller
-      !closed?
-    end
-
-    def closed?
-      Spree::Deprecation.warn "Adjustment#closed? is deprecated. Instead use Adjustment#finalized?", caller
-      finalized?
-    end
-
-    def open
-      Spree::Deprecation.warn "Adjustment#open is deprecated. Instead use Adjustment#unfinalize", caller
-      unfinalize
-    end
-
-    def open!
-      Spree::Deprecation.warn "Adjustment#open! is deprecated. Instead use Adjustment#unfinalize!", caller
-      unfinalize!
-    end
-
-    def close
-      Spree::Deprecation.warn "Adjustment#close is deprecated. Instead use Adjustment#finalize", caller
-      finalize
-    end
-
-    def close!
-      Spree::Deprecation.warn "Adjustment#close! is deprecated. Instead use Adjustment#finalize!", caller
-      finalize!
-    end
-    # End deprecated methods
-
     def currency
       adjustable ? adjustable.currency : Spree::Config[:currency]
     end
@@ -152,18 +95,14 @@ module Spree
     # If the adjustment has no source (such as when created manually from the
     # admin) or is closed, this is a noop.
     #
-    # @param target [Spree::LineItem,Spree::Shipment,Spree::Order] Deprecated: the target to calculate against
     # @return [BigDecimal] New amount of this adjustment
-    def update!(target = nil)
-      if target
-        Spree::Deprecation.warn("Passing a target to Adjustment#update! is deprecated. The adjustment will use the correct target from it's adjustable association.", caller)
-      end
+    def update!
       return amount if finalized?
 
       # If the adjustment has no source, do not attempt to re-calculate the amount.
       # Chances are likely that this was a manually created adjustment in the admin backend.
       if source.present?
-        self.amount = source.compute_amount(target || adjustable)
+        self.amount = source.compute_amount(adjustable)
 
         if promotion?
           self.eligible = source.promotion.eligible?(adjustable, promotion_code: promotion_code)

data/app/models/spree/app_configuration.rb

@@ -404,27 +404,5 @@ module Spree
         country: Spree::Country.find_by(iso: admin_vat_country_iso)
       )
     end
-
-    # all the following can be deprecated when store prefs are no longer supported
-    # @private
-    DEPRECATED_STORE_PREFERENCES = {
-      site_name: :name,
-      site_url: :url,
-      default_meta_description: :meta_description,
-      default_meta_keywords: :meta_keywords,
-      default_seo_title: :seo_title
-    }
-
-    DEPRECATED_STORE_PREFERENCES.each do |old_preference_name, store_method|
-      # Avoid warning about implementation details
-      bc = ActiveSupport::BacktraceCleaner.new
-      bc.add_silencer { |line| line =~ %r{spree/preferences} }
-
-      # support all the old preference methods with a warning
-      define_method "preferred_#{old_preference_name}" do
-        Spree::Deprecation.warn("#{old_preference_name} is no longer supported on Spree::Config, please access it through #{store_method} on Spree::Store", bc.clean(caller))
-        Spree::Store.default.send(store_method)
-      end
-    end
   end
 end

data/app/models/spree/calculator/flexi_rate.rb

@@ -2,8 +2,8 @@ require_dependency 'spree/calculator'
 
 module Spree
   class Calculator::FlexiRate < Calculator
-    preference :first_item,      :decimal, default: 0.0
-    preference :additional_item, :decimal, default: 0.0
+    preference :first_item,      :decimal, default: 0
+    preference :additional_item, :decimal, default: 0
     preference :max_items,       :integer, default: 0
     preference :currency,        :string,  default: ->{ Spree::Config[:currency] }
 
@@ -12,18 +12,13 @@ module Spree
     end
 
     def compute(object)
-      sum = 0
-      max = preferred_max_items.to_i
       items_count = object.quantity
-      items_count.times do |i|
-        if i == 0
-          sum += preferred_first_item.to_f
-        elsif ((max > 0) && (i <= (max - 1))) || (max == 0)
-          sum += preferred_additional_item.to_f
-        end
-      end
+      items_count = [items_count, preferred_max_items].min unless preferred_max_items.zero?
 
-      sum
+      return BigDecimal.new(0) if items_count == 0
+
+      additional_items_count = items_count - 1
+      preferred_first_item + preferred_additional_item * additional_items_count
     end
   end
 end

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

@@ -11,7 +11,7 @@ module Spree
 
       def compute_from_price(price)
         value = price * BigDecimal(preferred_flat_percent.to_s) / 100.0
-        (value * 100).round.to_f / 100
+        value.round(2)
       end
     end
   end

data/app/models/spree/calculator/tiered_flat_rate.rb

@@ -8,7 +8,9 @@ module Spree
     before_validation do
       # Convert tier values to decimals. Strings don't do us much good.
       if preferred_tiers.is_a?(Hash)
-        self.preferred_tiers = Hash[*preferred_tiers.flatten.map(&:to_f)]
+        self.preferred_tiers = preferred_tiers.map do |k, v|
+          [BigDecimal.new(k.to_s), BigDecimal.new(v.to_s)]
+        end.to_h
       end
     end
 

data/app/models/spree/calculator/tiered_percent.rb

@@ -8,7 +8,9 @@ module Spree
     before_validation do
       # Convert tier values to decimals. Strings don't do us much good.
       if preferred_tiers.is_a?(Hash)
-        self.preferred_tiers = Hash[*preferred_tiers.flatten.map(&:to_f)]
+        self.preferred_tiers = preferred_tiers.map do |k, v|
+          [BigDecimal.new(k.to_s), BigDecimal.new(v.to_s)]
+        end.to_h
       end
     end
 

data/app/models/spree/country.rb

@@ -6,13 +6,6 @@ module Spree
 
     validates :name, :iso_name, presence: true
 
-    def self.states_required_by_country_id
-      Spree::Deprecation.warn "Spree::Country.states_required_by_country_id is deprecated and will be removed from future releases, Implement it yourself.", caller
-      states_required = Hash.new(true)
-      all.each { |country| states_required[country.id.to_s] = country.states_required }
-      states_required
-    end
-
     def self.default
       if Spree::Config.default_country_id
         Spree::Deprecation.warn("Setting your default country via its ID is deprecated. Please set your default country via the `default_country_iso` setting.", caller)

data/app/models/spree/gateway.rb

@@ -42,15 +42,6 @@ module Spree
       source.has_payment_profile?
     end
 
-    def disable_customer_profile(source)
-      Spree::Deprecation.warn("Gateway#disable_customer_profile is deprecated")
-      if source.is_a? CreditCard
-        source.update_column :gateway_customer_profile_id, nil
-      else
-        raise 'You must implement disable_customer_profile method for this gateway.'
-      end
-    end
-
     def sources_by_order(order)
       source_ids = order.payments.where(payment_method_id: id).pluck(:source_id).uniq
       payment_source_class.where(id: source_ids).with_payment_profile

data/app/models/spree/order.rb

@@ -127,13 +127,6 @@ module Spree
     class_attribute :line_item_comparison_hooks
     self.line_item_comparison_hooks = Set.new
 
-    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) }
     scope :completed_between, ->(start_date, end_date) { where(completed_at: start_date..end_date) }
 
@@ -212,7 +205,7 @@ module Spree
 
     # Is this a free order in which case the payment step should be skipped
     def payment_required?
-      total.to_f > 0.0
+      total > 0
     end
 
     def confirmation_required?
@@ -605,13 +598,6 @@ 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,
       # records loaded from the DB on MySQL will have a precision of 1 second,

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

@@ -242,47 +242,6 @@ module Spree
             checkout_step_index(state) > checkout_step_index(self.state)
           end
 
-          define_callbacks :updating_from_params, terminator: deprecated_false_terminator
-
-          set_callback :updating_from_params, :before, :update_params_payment_source
-
-          # @deprecated Use {OrderUpdateAttributes} instead
-          def update_from_params(params, permitted_params, request_env = {})
-            Spree::Deprecation.warn "update_from_params is deprecated. Use the OrderUpdateAttributes class instead", caller
-            success = false
-            @updating_params = params
-            run_callbacks :updating_from_params do
-              attributes = @updating_params[:order] ? @updating_params[:order].permit(permitted_params).delete_if { |_k, v| v.nil? } : {}
-
-              # Set existing card after setting permitted parameters because
-              # rails would slice parameters containg ruby objects, apparently
-              existing_card_id = @updating_params[:order] ? @updating_params[:order][:existing_card] : nil
-
-              if existing_card_id.present?
-                credit_card = CreditCard.find existing_card_id
-                if credit_card.user_id != user_id || credit_card.user_id.blank?
-                  raise Core::GatewayError.new Spree.t(:invalid_credit_card)
-                end
-
-                credit_card.verification_value = params[:cvc_confirm] if params[:cvc_confirm].present?
-
-                attributes[:payments_attributes].first[:source] = credit_card
-                attributes[:payments_attributes].first[:payment_method_id] = credit_card.payment_method_id
-                attributes[:payments_attributes].first.delete :source_attributes
-              end
-
-              if attributes[:payments_attributes]
-                attributes[:payments_attributes].first[:request_env] = request_env
-              end
-
-              update = OrderUpdateAttributes.new(self, attributes, request_env: request_env)
-              success = update.apply
-            end
-
-            @updating_params = nil
-            success
-          end
-
           def bill_address_attributes=(attributes)
             self.bill_address = Address.immutable_merge(bill_address, attributes)
           end