solidus_core 2.5.2 → 2.6.0.rc1

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Stock
     class Quantifier

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Stock
     class ShippingRateSelector

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Stock
     class ShippingRateSorter

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Stock
     # A simple implementation of Stock Coordination

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Stock
     module Splitter

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Stock
     module Splitter

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Stock
     module Splitter

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Stock
     module Splitter

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Stock
     class SplitterChain

data/app/models/spree/stock_item.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'discard'
 
 module Spree

data/app/models/spree/stock_location.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   # Records the name and addresses from which stock items are fulfilled in
   # cartons.

data/app/models/spree/stock_movement.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class StockMovement < Spree::Base
     belongs_to :stock_item, class_name: 'Spree::StockItem', inverse_of: :stock_movements

data/app/models/spree/stock_quantities.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   # A value object to hold a map of variants to their quantities
   class StockQuantities

data/app/models/spree/store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   # Records store specific configuration such as store name and URL.
   #
@@ -9,6 +11,10 @@ module Spree
   class Store < Spree::Base
     has_many :store_payment_methods, inverse_of: :store
     has_many :payment_methods, through: :store_payment_methods
+
+    has_many :store_shipping_methods, inverse_of: :store
+    has_many :shipping_methods, through: :store_shipping_methods
+
     has_many :orders, class_name: "Spree::Order"
 
     validates :code, presence: true, uniqueness: { allow_blank: true }
@@ -25,6 +31,24 @@ module Spree
       deprecate :by_url, "Spree::Store.by_url is DEPRECATED", deprecator: Spree::Deprecation
     end
 
+    def available_locales
+      locales = super()
+      if locales
+        super().split(",").map(&:to_sym)
+      else
+        Spree.i18n_available_locales
+      end
+    end
+
+    def available_locales=(locales)
+      locales = locales.reject(&:blank?)
+      if locales.empty?
+        super(nil)
+      else
+        super(locales.map(&:to_s).join(","))
+      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

data/app/models/spree/store_credit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'discard'
 
 class Spree::StoreCredit < Spree::PaymentSource
@@ -190,7 +192,7 @@ class Spree::StoreCredit < Spree::PaymentSource
       save
     else
       errors.add(:invalidated_at, I18n.t('spree.store_credit.errors.cannot_invalidate_uncaptured_authorization'))
-      return false
+      false
     end
   end
 
@@ -244,6 +246,7 @@ class Spree::StoreCredit < Spree::PaymentSource
     event.update_attributes!({
       amount: action_amount || amount,
       authorization_code: action_authorization_code || event.authorization_code || generate_authorization_code,
+      amount_remaining: amount_remaining,
       user_total_amount: user.available_store_credit_total(currency: currency),
       originator: action_originator,
       update_reason: update_reason

data/app/models/spree/store_credit_category.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Spree::StoreCreditCategory < Spree::Base
   class_attribute :non_expiring_credit_types
   self.non_expiring_credit_types = [Spree::StoreCreditType::NON_EXPIRING]

data/app/models/spree/store_credit_event.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'discard'
 
 module Spree
@@ -44,6 +46,10 @@ module Spree
       Spree::Money.new(user_total_amount, { currency: currency })
     end
 
+    def display_remaining_amount
+      Spree::Money.new(amount_remaining, { currency: currency })
+    end
+
     def display_event_date
       I18n.l(created_at.to_date, format: :long)
     end

data/app/models/spree/store_credit_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class StoreCreditType < Spree::Base
     EXPIRING = 'Expiring'

data/app/models/spree/store_credit_update_reason.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class Spree::StoreCreditUpdateReason < Spree::Base
 end

data/app/models/spree/store_payment_method.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class StorePaymentMethod < Spree::Base
     belongs_to :store, inverse_of: :store_payment_methods

data/app/models/spree/store_selector/by_server_name.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Default implementation for finding the current store is given an HTTP request
 #
 # This is the new default behaviour, starting in Solidus 2.3.0. For the old

data/app/models/spree/store_selector/legacy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This class provides the old behaviour for finding a matching Spree::Store
 # based on a request.
 #

data/app/models/spree/store_shipping_method.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Spree
+  class StoreShippingMethod < Spree::Base
+    belongs_to :store, inverse_of: :store_shipping_methods
+    belongs_to :shipping_method, inverse_of: :store_shipping_methods
+  end
+end

data/app/models/spree/tax/item_tax.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Tax
     # Simple object used to hold tax data for an item.

data/app/models/spree/tax/order_adjuster.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Tax
     # Add tax adjustments to all line items and shipments in an order

data/app/models/spree/tax/order_tax.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Tax
     # Simple object to pass back tax data from a calculator.

data/app/models/spree/tax/shipping_rate_taxer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Tax
     # Used to build shipping rate taxes

data/app/models/spree/tax/tax_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Tax
     module TaxHelpers

data/app/models/spree/tax/tax_location.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Tax
     # A class exclusively used as a drop-in replacement for a default tax address.

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module TaxCalculator
     # Default implementation for tax calculations. Will go through all line

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module TaxCalculator
     # Default implementation for tax calculations on shipping rates.
@@ -18,8 +20,7 @@ module Spree
 
       # Create a new tax calculator.
       #
-      # @param [Spree::ShippingRate] shipping_rate the shipping rate to
-      #   calculate taxes on
+      # @param [Spree::Order] order the order to calculate taxes on
       # @return [Spree::TaxCalculator::ShippingRate]
       def initialize(order)
         if order.is_a?(::Spree::ShippingRate)
@@ -35,6 +36,8 @@ module Spree
 
       # Calculate taxes for a shipping rate.
       #
+      # @param [Spree::ShippingRate] shipping_rate the shipping rate to
+      #   calculate taxes on
       # @return [Array<Spree::Tax::ItemTax>] the calculated taxes for the
       #   shipping rate
       def calculate(shipping_rate)

data/app/models/spree/tax_category.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class TaxCategory < Spree::Base
     acts_as_paranoid

data/app/models/spree/tax_rate.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'discard'
 
 module Spree
@@ -136,7 +138,7 @@ module Spree
       )
     end
 
-    def translation_key(amount)
+    def translation_key(_amount)
       key = included_in_price? ? "vat" : "sales_tax"
       key += "_with_rate" if show_rate_in_label?
       key.to_sym

data/app/models/spree/tax_rate_tax_category.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class TaxRateTaxCategory < Spree::Base
     belongs_to :tax_rate, class_name: 'Spree::TaxRate', inverse_of: :tax_rate_tax_categories

data/app/models/spree/taxon.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/core/product_filters'
 
 module Spree
@@ -36,6 +38,8 @@ module Spree
     # @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)

data/app/models/spree/taxonomy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class Taxonomy < Spree::Base
     acts_as_list

data/app/models/spree/unit_cancel.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This represents an inventory unit that has been canceled from an order after it has already been completed
 # The reason specifies why it was canceled.
 # This class should encapsulate logic related to canceling inventory after order complete

data/app/models/spree/user_address.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class UserAddress < Spree::Base
     belongs_to :user, class_name: UserClassHandle.new, foreign_key: "user_id"

data/app/models/spree/user_class_handle.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   # Configuration point for User model implementation.
   #

data/app/models/spree/user_stock_location.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class UserStockLocation < Spree::Base
     belongs_to :user, class_name: Spree::UserClassHandle.new, inverse_of: :user_stock_locations

data/app/models/spree/validations/db_maximum_length_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Validations
     ##

data/app/models/spree/variant.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'discard'
 
 module Spree
@@ -92,7 +94,7 @@ module Spree
     # a parameter, the scope is limited to variants that are in stock in the
     # provided stock locations.
     #
-    # If you want to also include backorderable variants see {[suppliable}}
+    # If you want to also include backorderable variants see {Spree::Variant.suppliable}
     #
     # @param stock_locations [Array<Spree::StockLocation>] the stock locations to check
     # @return [ActiveRecord::Relation]
@@ -136,11 +138,23 @@ module Spree
     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.
     #
     # @param pricing_options A Pricing Options object as defined on the price selector class
     # @return [ActiveRecord::Relation]
     def self.with_prices(pricing_options = Spree::Config.default_pricing_options)
-      joins(:prices).merge(Spree::Price.currently_valid.where(pricing_options.search_arguments))
+      where(
+        Spree::Price.
+          where(Spree::Variant.arel_table[:id].eq(Spree::Price.arel_table[:variant_id])).
+          # This next clause should just be `where(pricing_options.search_arguments)`, but ActiveRecord
+          # generates invalid SQL, so the SQL here is written manually.
+          where(
+            "spree_prices.currency = ? AND (spree_prices.country_iso IS NULL OR spree_prices.country_iso = ?)",
+            pricing_options.search_arguments[:currency],
+            pricing_options.search_arguments[:country_iso].compact
+          ).
+          arel.exists
+      )
     end
 
     # @return [Spree::TaxCategory] the variant's tax category
@@ -280,8 +294,6 @@ module Spree
     # Chooses an appropriate price for the given pricing options
     #
     # @see Spree::Variant::PriceSelector#price_for
-    # @param [Spree::Config.pricing_options_class] An instance of pricing options
-    # @return [Spree::Money] The chosen price as a Money object
     delegate :price_for, to: :price_selector
 
     # Returns the difference in price from the master variant

data/app/models/spree/variant/price_selector.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class Variant < Spree::Base
     # This class is responsible for selecting a price for a variant given certain pricing options.