solidus_core 2.11.10 → 3.0.2

data/app/models/spree/shipping_method.rb

@@ -6,11 +6,6 @@ module Spree
   class ShippingMethod < Spree::Base
     include Spree::SoftDeletable
     include Spree::CalculatedAdjustments
-    DISPLAY = ActiveSupport::Deprecation::DeprecatedObjectProxy.new(
-      [:both, :front_end, :back_end],
-      "Spree::ShippingMethod::DISPLAY is deprecated",
-      Spree::Deprecation
-    )
 
     has_many :shipping_method_categories, dependent: :destroy
     has_many :shipping_categories, through: :shipping_method_categories
@@ -95,26 +90,6 @@ module Spree
       tracking_url.gsub(/:tracking/, ERB::Util.url_encode(tracking)) # :url_encode exists in 1.8.7 through 2.1.0
     end
 
-    def display_on
-      if available_to_users?
-        "both"
-      else
-        "back_end"
-      end
-    end
-    deprecate display_on: :available_to_users?, deprecator: Spree::Deprecation
-
-    def display_on=(value)
-      self.available_to_users = (value != "back_end")
-    end
-    deprecate 'display_on=': :available_to_users=, deprecator: Spree::Deprecation
-
-    # Some shipping methods are only meant to be set via backend
-    def frontend?
-      available_to_users?
-    end
-    deprecate frontend?: :available_to_users?, deprecator: Spree::Deprecation
-
     private
 
     def at_least_one_shipping_category

data/app/models/spree/shipping_rate.rb

@@ -19,8 +19,6 @@ module Spree
     delegate :code, to: :shipping_method, prefix: true
     alias_attribute :amount, :cost
 
-    alias_method :discounted_amount, :amount
-    deprecate discounted_amount: :total_before_tax, deprecator: Spree::Deprecation
     alias_method :total_before_tax, :amount
 
     extend DisplayMoney

data/app/models/spree/state.rb

@@ -14,10 +14,6 @@ module Spree
         )
       )
     end
-    class << self
-      alias_method :find_all_by_name_or_abbr, :with_name_or_abbr
-      deprecate find_all_by_name_or_abbr: :with_name_or_abbr, deprecator: Spree::Deprecation
-    end
 
     self.whitelisted_ransackable_attributes = %w[name]
 

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

@@ -73,11 +73,16 @@ module Spree
         packages = split_packages(packages)
 
         # Turn the Stock::Packages into a Shipment with rates
-        packages.map do |package|
+        shipments = packages.map do |package|
           shipment = package.shipment = package.to_shipment
           shipment.shipping_rates = Spree::Config.stock.estimator_class.new.shipping_rates(package)
           shipment
         end
+
+        # Make sure we don't add the proposed shipments to the order
+        order.shipments = order.shipments - shipments
+
+        shipments
       end
 
       def split_packages(initial_packages)
@@ -87,20 +92,6 @@ module Spree
         end
       end
 
-      def allocate_inventory(availability_by_location)
-        sorted_availability = sort_availability(availability_by_location)
-
-        sorted_availability.transform_values do |available|
-          # Find the desired inventory which is available at this location
-          packaged = available & @desired
-          # Remove found inventory from desired
-          @desired -= packaged
-          packaged
-        end
-      end
-      deprecate allocate_inventory: 'allocate_inventory is deprecated. Please write your own allocator defining' \
-        'a Spree::Stock::Allocator::Base subclass', deprecator: Spree::Deprecation
-
       def sort_availability(availability)
         sorted_availability = availability.sort_by do |stock_location_id, _|
           @stock_locations.find_index do |stock_location|

data/app/models/spree/stock/splitter/base.rb

@@ -6,13 +6,8 @@ module Spree
       class Base
         attr_reader :stock_location, :next_splitter
 
-        def initialize(stock_location_or_packer, next_splitter = nil)
-          if stock_location_or_packer.is_a?(Spree::StockLocation)
-            @stock_location = stock_location_or_packer
-          else
-            Spree::Deprecation.warn("Initializing Splitters with a Packer is DEPRECATED. Pass a StockLocation instead.")
-            @stock_location = stock_location_or_packer.stock_location
-          end
+        def initialize(stock_location, next_splitter = nil)
+          @stock_location = stock_location
           @next_splitter = next_splitter
         end
 

data/app/models/spree/stock_item.rb

@@ -110,13 +110,7 @@ module Spree
     end
 
     def inventory_cache_threshold
-      # only warn if store is setting binary_inventory_cache (default = false)
-      @cache_threshold ||= if Spree::Config.binary_inventory_cache
-        Spree::Deprecation.warn "Spree::Config.binary_inventory_cache=true is DEPRECATED. Instead use Spree::Config.inventory_cache_threshold=1"
-        1
-      else
-        Spree::Config.inventory_cache_threshold
-      end
+      @cache_threshold ||= Spree::Config.inventory_cache_threshold
     end
   end
 end

data/app/models/spree/store.rb

@@ -25,12 +25,6 @@ module Spree
     before_save :ensure_default_exists_and_is_unique
     before_destroy :validate_not_default
 
-    scope :by_url, lambda { |url| where("url like ?", "%#{url}%") }
-
-    class << self
-      deprecate by_url: "Spree::Store.by_url is DEPRECATED", deprecator: Spree::Deprecation
-    end
-
     def available_locales
       locales = super()
       if locales
@@ -49,12 +43,6 @@ module Spree
       end
     end
 
-    def self.current(store_key)
-      Spree::Deprecation.warn "Spree::Store.current is DEPRECATED"
-      current_store = Store.find_by(code: store_key) || Store.by_url(store_key).first if store_key
-      current_store || Store.default
-    end
-
     def self.default
       where(default: true).first || new
     end

data/app/models/spree/store_credit_category.rb

@@ -7,39 +7,7 @@ class Spree::StoreCreditCategory < Spree::Base
   class_attribute :non_expiring_credit_types
   self.non_expiring_credit_types = [Spree::StoreCreditType::NON_EXPIRING]
 
-  # @deprecated
-  class_attribute :reimbursement_category_name
-  self.reimbursement_category_name = I18n.t('spree.store_credit_category.default')
-
-  # @deprecated
-  def self.reimbursement_category(reimbursement)
-    reimbursement.store_credit_category
-  end
-
   def non_expiring?
     self.class.non_expiring_credit_types.include? name
   end
-
-  public_instance_methods.grep(/^reimbursement_category_name/).each do |method|
-    deprecate(
-      method => 'Use Spree::Reimbursement#store_credit_category.name instead',
-      deprecator: Spree::Deprecation
-    )
-  end
-
-  class << self
-    public_instance_methods.grep(/^reimbursement_category_name/).each do |method|
-      deprecate(
-        method => 'Use Spree::Reimbursement.store_credit_category.name instead',
-        deprecator: Spree::Deprecation
-      )
-    end
-
-    public_instance_methods.grep(/^reimbursement_category$/).each do |method|
-      deprecate(
-        method => 'Use Spree::Reimbursement.store_credit_category instead',
-        deprecator: Spree::Deprecation
-      )
-    end
-  end
 end

data/app/models/spree/tax_calculator/shipping_rate.rb

@@ -13,22 +13,12 @@ module Spree
     class ShippingRate
       include Spree::Tax::TaxHelpers
 
-      attr_reader :shipping_rate
-
       # Create a new tax calculator.
       #
       # @param [Spree::Order] order the order to calculate taxes on
       # @return [Spree::TaxCalculator::ShippingRate]
       def initialize(order)
-        if order.is_a?(::Spree::ShippingRate)
-          Spree::Deprecation.warn "passing a single shipping rate to Spree::TaxCalculator::ShippingRate is DEPRECATED. It now expects an order"
-          shipping_rate = order
-          @order = shipping_rate.order
-          @shipping_rate = shipping_rate
-        else
-          @order = order
-          @shipping_rate = nil
-        end
+        @order = order
       end
 
       # Calculate taxes for a shipping rate.
@@ -38,7 +28,6 @@ module Spree
       # @return [Array<Spree::Tax::ItemTax>] the calculated taxes for the
       #   shipping rate
       def calculate(shipping_rate)
-        shipping_rate ||= @shipping_rate
         rates_for_item(shipping_rate).map do |rate|
           amount = rate.compute_amount(shipping_rate)
 

data/app/models/spree/tax_rate.rb

@@ -87,23 +87,6 @@ module Spree
     end
     scope :included_in_price, -> { where(included_in_price: true) }
 
-    # Creates necessary tax adjustments for the order.
-    #
-    # @deprecated Please use `Spree::Tax::OrderAdjuster#adjust!` instead
-    def adjust(_order_tax_zone, item)
-      Spree::Deprecation.warn("`Spree::TaxRate#adjust` is deprecated. Please use `Spree::Tax::OrderAdjuster#adjust!` instead.", caller)
-
-      amount = compute_amount(item)
-
-      item.adjustments.create!(
-        source: self,
-        amount: amount,
-        order_id: item.order_id,
-        label: adjustment_label(amount),
-        included: included_in_price
-      )
-    end
-
     # This method is used by Adjustment#update to recalculate the cost.
     def compute_amount(item)
       calculator.compute(item)
@@ -123,16 +106,6 @@ module Spree
       )
     end
 
-    def tax_category=(category)
-      self.tax_categories = [category]
-    end
-
-    def tax_category
-      tax_categories[0]
-    end
-
-    deprecate :tax_category => :tax_categories, :tax_category= => :tax_categories=, deprecator: Spree::Deprecation
-
     private
 
     def amount_for_adjustment_label

data/app/models/spree/taxon/active_storage_attachment.rb

@@ -10,9 +10,4 @@ module Spree::Taxon::ActiveStorageAttachment
                    default_style: :mini
     validate :icon_is_an_image
   end
-
-  def attachment_partial_name
-    Spree::Deprecation.warn("calling #attachment_partial_name on Spree::Taxon is deprecated without replacement.")
-    'paperclip'
-  end
 end

data/app/models/spree/taxon/paperclip_attachment.rb

@@ -19,11 +19,6 @@ module Spree::Taxon::PaperclipAttachment
     icon.present?
   end
 
-  def attachment_partial_name
-    Spree::Deprecation.warn("calling #attachment_partial_name on Spree::Taxon is deprecated without replacement.")
-    'paperclip'
-  end
-
   def destroy_attachment(definition)
     return false unless respond_to?(definition)
 

data/app/models/spree/taxon.rb

@@ -29,17 +29,6 @@ module Spree
 
     self.whitelisted_ransackable_attributes = %w[name]
 
-    # @note This method is meant to be overridden on a store by store basis.
-    # @return [Array] filters that should be used for a taxon
-    def applicable_filters
-      Spree::Deprecation.warn "Spree::Taxon#applicable_filters is deprecated, if you are using this functionality please move it into your own application."
-
-      fs = []
-      fs << Spree::Core::ProductFilters.price_filter if Spree::Core::ProductFilters.respond_to?(:price_filter)
-      fs << Spree::Core::ProductFilters.brand_filter if Spree::Core::ProductFilters.respond_to?(:brand_filter)
-      fs
-    end
-
     # @return [String] meta_title if set otherwise a string containing the
     #   root name and taxon name
     def seo_title

data/app/models/spree/user_address.rb

@@ -19,11 +19,6 @@ module Spree
     scope :default_billing, -> { where(default_billing: true) }
     scope :active, -> { where(archived: false) }
 
-    scope :default, -> do
-      Spree::Deprecation.warn "This scope is deprecated. Please start using ::default_shipping."
-      default_shipping
-    end
-
     default_scope -> { order([default: :desc, updated_at: :desc]) }
   end
 end

data/app/models/spree/variant.rb

@@ -30,7 +30,7 @@ module Spree
     attr_writer :rebuild_vat_prices
     include Spree::DefaultPrice
 
-    belongs_to :product, -> { with_discarded }, touch: true, class_name: 'Spree::Product', inverse_of: :variants, optional: false
+    belongs_to :product, -> { with_discarded }, touch: true, class_name: 'Spree::Product', inverse_of: :variants_including_master, optional: false
     belongs_to :tax_category, class_name: 'Spree::TaxCategory', optional: true
 
     delegate :name, :description, :slug, :available_on, :discontinue_on, :discontinued?,
@@ -83,7 +83,7 @@ module Spree
     after_save :clear_in_stock_cache
     after_touch :clear_in_stock_cache
 
-    after_real_destroy :destroy_option_values_variants
+    after_destroy :destroy_option_values_variants
 
     # Returns variants that are in stock. When stock locations are provided as
     # a parameter, the scope is limited to variants that are in stock in the
@@ -121,17 +121,6 @@ module Spree
     self.whitelisted_ransackable_associations = %w[option_values product prices default_price]
     self.whitelisted_ransackable_attributes = %w[weight sku]
 
-    # Returns variants that are not deleted and have a price in the given
-    # currency.
-    #
-    # @deprecated Please use the .with_prices scope instead
-    # @param currency [String] the currency to filter by; defaults to Spree's default
-    # @return [ActiveRecord::Relation]
-    def self.active(currency = nil)
-      Spree::Deprecation.warn("`Variant.active(currency)` is deprecated. Please use `Variant.with_prices(pricing_options)` instead.", caller)
-      joins(:prices).where(deleted_at: nil).where('spree_prices.currency' => currency || Spree::Config[:currency]).where('spree_prices.amount IS NOT NULL')
-    end
-
     # Returns variants that have a price for the given pricing options
     # If you have modified the pricing options class, you might want to modify this scope too.
     #
@@ -304,26 +293,6 @@ module Spree
       diff && diff.zero?
     end
 
-    # Converts the variant's price to the given currency.
-    #
-    # @deprecated Please use #price_for(pricing_options) instead
-    # @param currency [String] the desired currency
-    # @return [Spree::Price] the price in the desired currency
-    def price_in(currency)
-      prices.currently_valid.find_by(currency: currency)
-    end
-    deprecate price_in: :price_for, deprecator: Spree::Deprecation
-
-    # Fetches the price amount in the specified currency.
-    #
-    # @deprecated Please use #price_for instead and use a money object rathern than a BigDecimal.
-    # @param currency (see #price)
-    # @return [Float] the amount in the specified currency.
-    def amount_in(currency)
-      price_in(currency).try(:amount)
-    end
-    deprecate amount_in: :price_for, deprecator: Spree::Deprecation
-
     # Generates a friendly name and sku string.
     #
     # @return [String]
@@ -367,19 +336,6 @@ module Spree
       track_inventory? && Spree::Config.track_inventory_levels
     end
 
-    # Image that can be used for the variant.
-    #
-    # Will first search for images on the variant. If it doesn't find any,
-    # it'll fallback to any variant image (unless +fallback+ is +false+) or to
-    # a new {Spree::Image}.
-    # @param fallback [Boolean] whether or not we should fallback to an image
-    #   not from this variant
-    # @return [Spree::Image] the image to display
-    def display_image(fallback: true)
-      Spree::Deprecation.warn('Spree::Variant#display_image is DEPRECATED. Choose an image from Spree::Variant#gallery instead')
-      images.first || (fallback && product.variant_images.first) || Spree::Image.new
-    end
-
     # Determines the variant's property values by verifying which of the product's
     # variant property rules apply to itself.
     #

data/config/locales/en.yml

@@ -26,8 +26,6 @@ en:
         address2: Street Address (cont'd)
         city: City
         company: Company
-        firstname: First Name
-        lastname: Last Name
         name: Name
         phone: Phone
         zipcode: Zip Code
@@ -76,7 +74,6 @@ en:
         created_at: Date/Time
         name: Name
         number: Return Number
-        pre_tax_total: Pre-Tax Total
         reimbursement_status: Reimbursement status
         total: Total
         total_excluding_vat: Pre-Tax Total
@@ -130,8 +127,6 @@ en:
       spree/order/bill_address:
         address1: Billing address street
         city: Billing address city
-        firstname: Billing address first name
-        lastname: Billing address last name
         name: Billing address name
         phone: Billing address phone
         state: Billing address state
@@ -139,8 +134,6 @@ en:
       spree/order/ship_address:
         address1: Shipping address street
         city: Shipping address city
-        firstname: Shipping address first name
-        lastname: Shipping address last name
         name: Shipping address name
         phone: Shipping address phone
         state: Shipping address state
@@ -282,7 +275,6 @@ en:
         type: Type
       spree/return_authorization:
         amount: Amount
-        pre_tax_total: Pre-Tax Total
         total_excluding_vat: Pre-Tax Total
       spree/return_item:
         acceptance_status: Acceptance Status