solidus_core 1.1.4 → 1.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9161c98f377c58e982a151cdeb6c8ac7a2b5f656
-  data.tar.gz: 480fc65e5d85570f6eef9ae0f29cb45ca5f47e28
+  metadata.gz: 72bff98276c20b404df01879d91ae3c97a36aab8
+  data.tar.gz: f4b3d7cada13eb253db7f60ec9d735bbd2194a12
 SHA512:
-  metadata.gz: 752f95c291e1810aa18c3973920e6e7cbdd279447de14da7a781d22962e946b41747867ee9c7c2c0c739ced9aa6f05fd357f2756d234b46228593f821f4295ee
-  data.tar.gz: 3c049638968609ca75f2d49b878c334e7cfa2532a9684b565d1d2c2e0382320ed72841529a6d8610b80c22ecbc2311da70c38c9085e63d07e1c1b6ae39e0f9c5
+  metadata.gz: ad9a001cd90d86458f532cf0df351c2d1199f2cbc7abdb61b92ccd5e5eb0fe88603e87a61f8d04d192005fb8b226e77c2e0249a1bdb0b147bcd4065b1da09436
+  data.tar.gz: acce15cf134e34e2c8184d53cde1ecd391d6d13f606f62ad5a46b39ce4a1cae936902331f29c855362ea81984ba7380eb295a96d638f4261a1858bb46bc93e82

data/app/helpers/spree/base_helper.rb

@@ -107,14 +107,13 @@ module Spree
     def taxons_tree(root_taxon, current_taxon, max_level = 1)
       return '' if max_level < 1 || root_taxon.children.empty?
       content_tag :ul, class: 'taxons-list' do
-        taxons = root_taxon.children.map do |taxon|
+        root_taxon.children.map do |taxon|
           css_class = (current_taxon && current_taxon.self_and_ancestors.include?(taxon)) ? 'current' : nil
           content_tag :li, class: css_class do
            link_to(taxon.name, seo_url(taxon)) +
            taxons_tree(taxon, current_taxon, max_level - 1)
           end
-        end
-        safe_join(taxons, "\n")
+        end.join("\n").html_safe
       end
     end
 

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

@@ -14,7 +14,7 @@ module Spree
         # This would mean that the order's total is not altered at all.
         attrs = {
           source_id: nil,
-          updated_at: Time.now
+          updated_at: Time.current
         }
         adjustment_scope.where.not(spree_orders: { completed_at: nil }).update_all(attrs)
       end

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

@@ -6,7 +6,9 @@ module Spree
       has_one :default_price,
         -> { where currency: Spree::Config[:currency], is_default: true },
         class_name: 'Spree::Price',
-        dependent: :destroy
+        inverse_of: :variant,
+        dependent: :destroy,
+        autosave: true
 
       def find_or_build_default_price
         default_price || build_default_price

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

@@ -6,7 +6,7 @@ module Spree
       scope :active, -> { where(active: true) }
       default_scope -> { order(arel_table[:name].lower) }
 
-      validates :name, presence: true, uniqueness: { case_sensitive: false }
+      validates :name, presence: true, uniqueness: { case_sensitive: false, allow_blank: true }
     end
   end
 end

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

@@ -23,6 +23,8 @@ module Spree
       has_many :store_credit_events, through: :store_credits
       money_methods :total_available_store_credit
 
+      after_create :auto_generate_spree_api_key
+
       include Spree::RansackableAttributes unless included_modules.include?(Spree::RansackableAttributes)
 
       self.whitelisted_ransackable_associations = %w[addresses]
@@ -34,6 +36,14 @@ module Spree
       spree_roles.any? { |role| role.name == role_in_question.to_s }
     end
 
+    def auto_generate_spree_api_key
+      return if !respond_to?(:spree_api_key) || spree_api_key.present?
+
+      if Spree::Config.generate_api_key_for_all_roles || (spree_roles.map(&:name) & Spree::Config.roles_for_auto_api_key).any?
+        generate_spree_api_key!
+      end
+    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)

data/app/models/spree/adjustment.rb

@@ -170,7 +170,7 @@ module Spree
         # Persist only if changed
         # This is only not a save! to avoid the extra queries to load the order
         # (for validations) and to touch the adjustment.
-        update_columns(eligible: eligible, amount: amount, updated_at: Time.now) if changed?
+        update_columns(eligible: eligible, amount: amount, updated_at: Time.current) if changed?
       end
       amount
     end

data/app/models/spree/adjustment_reason.rb

@@ -2,10 +2,8 @@ module Spree
   class AdjustmentReason < Spree::Base
     has_many :adjustments, inverse_of: :adjustment_reason
 
-    validates :name, presence: true
-    validates :name, uniqueness: {case_sensitive: false}
-    validates :code, presence: true
-    validates :code, uniqueness: {case_sensitive: false}
+    validates :name, presence: true, uniqueness: { case_sensitive: false, allow_blank: true }
+    validates :code, presence: true, uniqueness: { case_sensitive: false, allow_blank: true }
 
     scope :active, -> { where(active: true) }
   end

data/app/models/spree/app_configuration.rb

@@ -17,6 +17,7 @@
 #
 require "spree/core/search/base"
 require "spree/core/search/variant"
+require 'spree/core/stock_configuration'
 
 module Spree
   class AppConfiguration < Preferences::Configuration
@@ -136,6 +137,11 @@ module Spree
     #     charged (default: +14+)
     preference :expedited_exchanges_days_window, :integer, default: 14
 
+    # @!attribute [rw] generate_api_key_for_all_roles
+    #   @return [Boolean] Allow generating api key automatically for user
+    #   at role_user creation for all roles. (default: +false+)
+    preference :generate_api_key_for_all_roles, :boolean, default: false
+
     # @!attribute [rw] layout
     #   @return [String] template to use for layout on the frontend (default: +"spree/layouts/spree_application"+)
     preference :layout, :string, default: 'spree/layouts/spree_application'
@@ -193,6 +199,12 @@ module Spree
     #   @return [Integer] default: 365
     preference :return_eligibility_number_of_days, :integer, default: 365
 
+    # @!attribute [rw] roles_for_auto_api_key
+    #   @return [Array] An array of roles where generating an api key for a user
+    #   at role_user creation is desired when user has one of these roles.
+    #   (default: +['admin']+)
+    preference :roles_for_auto_api_key, :array, default: ['admin']
+
     # @!attribute [rw] shipping_instructions
     #   @return [Boolean] Request instructions/info for shipping (default: +false+)
     preference :shipping_instructions, :boolean, default: false
@@ -265,6 +277,16 @@ module Spree
       @promotion_chooser_class ||= Spree::PromotionChooser
     end
 
+    attr_writer :shipping_rate_sorter_class
+    def shipping_rate_sorter_class
+      @shipping_rate_sorter_class ||= Spree::Stock::ShippingRateSorter
+    end
+
+    attr_writer :shipping_rate_selector_class
+    def shipping_rate_selector_class
+      @shipping_rate_selector_class ||= Spree::Stock::ShippingRateSelector
+    end
+
     # Allows providing your own Mailer for shipped cartons.
     #
     # @!attribute [rw] carton_shipped_email_class
@@ -276,10 +298,24 @@ module Spree
       @carton_shipped_email_class ||= Spree::CartonMailer
     end
 
+    # Allows providing your own class for merging two orders.
+    #
+    # @!attribute [rw] order_merger_class
+    # @return [Class] a class with the same public interfaces
+    #   as Spree::OrderMerger.
+    attr_writer :order_merger_class
+    def order_merger_class
+      @order_merger_class ||= Spree::OrderMerger
+    end
+
     def static_model_preferences
       @static_model_preferences ||= Spree::Preferences::StaticModelPreferences.new
     end
 
+    def stock
+      Spree::StockConfiguration
+    end
+
     # all the following can be deprecated when store prefs are no longer supported
     # @private
     DEPRECATED_STORE_PREFERENCES = {

data/app/models/spree/base.rb

@@ -4,12 +4,21 @@ class Spree::Base < ActiveRecord::Base
 
   include Spree::RansackableAttributes
 
-  after_initialize do
+  def initialize_preference_defaults
     if has_attribute?(:preferences)
       self.preferences = default_preferences.merge(preferences)
     end
   end
 
+  # Only run preference initialization on models which requires it. Improves
+  # performance of record initialization slightly.
+  def self.preference(*args)
+    # after_initialize can be called multiple times with the same symbol, it
+    # will only be called once on initialization.
+    after_initialize :initialize_preference_defaults
+    super
+  end
+
   if Kaminari.config.page_method_name != :page
     def self.page num
       send Kaminari.config.page_method_name, num

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

@@ -23,7 +23,8 @@ module Spree
     end
 
     def compute(object)
-      base, percent = preferred_tiers.sort.reverse.detect{ |b,_| object.amount >= b }
+      order = object.is_a?(Order) ? object : object.order
+      base, percent = preferred_tiers.sort.reverse.detect{ |b,_| order.item_total >= b }
       (object.amount * (percent || preferred_base_percent) / 100).round(2)
     end
 

data/app/models/spree/classification.rb

@@ -5,7 +5,7 @@ module Spree
     belongs_to :product, class_name: "Spree::Product", inverse_of: :classifications
     belongs_to :taxon, class_name: "Spree::Taxon", inverse_of: :classifications, touch: true
 
-    # For #3494
+    # For https://github.com/spree/spree/issues/3494
     validates_uniqueness_of :taxon_id, scope: :product_id, message: :already_linked
   end
 end

data/app/models/spree/country.rb

@@ -13,9 +13,9 @@ module Spree
     end
 
     def self.default
-      find(Spree::Config[:default_country_id])
-    rescue ActiveRecord::RecordNotFound
-      first
+      if default_country_id = Spree::Config[:default_country_id]
+        find_by_id(default_country_id)
+      end || first
     end
 
     def <=>(other)

data/app/models/spree/credit_card.rb

@@ -11,8 +11,8 @@ module Spree
 
     accepts_nested_attributes_for :address
 
+    attr_reader :number
     attr_accessor :encrypted_data,
-                    :number,
                     :imported,
                     :verification_value
 
@@ -181,7 +181,7 @@ module Spree
     def ensure_one_default
       if self.user_id && self.default
         CreditCard.where(default: true).where.not(id: self.id).where(user_id: self.user_id).each do |ucc|
-          ucc.update_columns(default: false, updated_at: Time.now)
+          ucc.update_columns(default: false, updated_at: Time.current)
         end
       end
     end

data/app/models/spree/customer_return.rb

@@ -19,6 +19,9 @@ module Spree
     money_methods pre_tax_total: { currency: Spree::Config[:currency] },
                   total: { currency: Spree::Config[:currency] }
 
+
+    delegate :id, to: :order, prefix: true, allow_nil: true
+
     def total
       return_items.map(&:total).sum
     end
@@ -33,10 +36,6 @@ module Spree
       return_items.first.inventory_unit.order
     end
 
-    def order_id
-      order.try(:id)
-    end
-
     def fully_reimbursed?
       completely_decided? && return_items.accepted.includes(:reimbursement).all? { |return_item| return_item.reimbursement.try(:reimbursed?) }
     end

data/app/models/spree/inventory_unit.rb

@@ -2,9 +2,9 @@ module Spree
   class InventoryUnit < Spree::Base
     PRE_SHIPMENT_STATES = %w(backordered on_hand)
     POST_SHIPMENT_STATES = %w(returned)
-    CANCELABLE_STATES = ['on_hand', 'backordered']
+    CANCELABLE_STATES = ['on_hand', 'backordered', 'shipped']
 
-    belongs_to :variant, class_name: "Spree::Variant", inverse_of: :inventory_units
+    belongs_to :variant, -> { with_deleted }, class_name: "Spree::Variant", inverse_of: :inventory_units
     belongs_to :order, class_name: "Spree::Order", inverse_of: :inventory_units
     belongs_to :shipment, class_name: "Spree::Shipment", touch: true, inverse_of: :inventory_units
     belongs_to :return_authorization, class_name: "Spree::ReturnAuthorization", inverse_of: :inventory_units
@@ -35,6 +35,16 @@ module Spree
         .where('spree_orders.completed_at is not null')
         .backordered.order(Spree::Order.arel_table[:completed_at].asc)
     end
+
+    # @param stock_item [Spree::StockItem] the stock item of the desired
+    #   inventory units
+    # @return [ActiveRecord::Relation<Spree::InventoryUnit>] backordered
+    # inventory units for the given stock item
+    scope :backordered_for_stock_item, ->(stock_item) do
+      backordered_per_variant(stock_item)
+        .where(spree_shipments: { stock_location_id: stock_item.stock_location_id })
+    end
+
     scope :shippable, -> { on_hand }
 
     # state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)
@@ -57,20 +67,6 @@ module Spree
       end
     end
 
-    # @param stock_item [Spree::StockItem] the stock item of the desired
-    #   inventory units
-    # @return [Array<Spree::InventoryUnit>] an array of backordered inventory
-    #   units for the given stock item
-    def self.backordered_for_stock_item(stock_item)
-      # This was refactored from a simpler query because the previous
-      # implementation led to issues once users tried to modify the objects
-      # returned. That's due to ActiveRecord `joins(shipment: :stock_location)`
-      # only returning readonly objects
-      backordered_per_variant(stock_item).select do |unit|
-        unit.shipment.stock_location == stock_item.stock_location
-      end
-    end
-
     # Updates the given inventory units to not be pending.
     #
     # @param inventory_units [<Spree::InventoryUnit>] the inventory to be
@@ -79,7 +75,7 @@ module Spree
       inventory_units.map do |iu|
         iu.update_columns(
           pending: false,
-          updated_at: Time.now,
+          updated_at: Time.current,
         )
       end
     end
@@ -91,13 +87,6 @@ module Spree
         variant_id: variant_id).first
     end
 
-    # @note This returns the variant regardless of whether it was soft
-    #   deleted.
-    # @return [Spree::Variant] this inventory unit's variant.
-    def variant
-      Spree::Variant.unscoped { super }
-    end
-
     # @return [Spree::ReturnItem] a valid return item for this inventory unit
     #   if one exists, or a new one if one does not
     def current_or_new_return_item

data/app/models/spree/item_adjustments.rb

@@ -63,11 +63,11 @@ module Spree
       @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,
+        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.current,
       ) if @item.changed?
 
       @item

data/app/models/spree/line_item.rb

@@ -2,7 +2,7 @@ module Spree
   class LineItem < Spree::Base
     before_validation :invalid_quantity_check
     belongs_to :order, class_name: "Spree::Order", inverse_of: :line_items, touch: true
-    belongs_to :variant, class_name: "Spree::Variant", inverse_of: :line_items
+    belongs_to :variant, -> { with_deleted }, class_name: "Spree::Variant", inverse_of: :line_items
     belongs_to :tax_category, class_name: "Spree::TaxCategory"
 
     has_one :product, through: :variant
@@ -34,6 +34,11 @@ module Spree
     after_create :update_tax_charge
 
     delegate :name, :description, :sku, :should_track_inventory?, to: :variant
+    # @note This will return the product even if it has been deleted.
+    # @return [Spree::Product, nil] the product associated with this line
+    #   item, if there is one
+    delegate :product, to: :variant
+
 
     attr_accessor :target_shipment
 
@@ -114,20 +119,6 @@ module Spree
       !sufficient_stock?
     end
 
-    # @note This will return the product even if it has been deleted.
-    # @return [Spree::Product, nil] the product associated with this line
-    #   item, if there is one
-    def product
-      variant.product
-    end
-
-    # @note This will return the variant even if it has been deleted.
-    # @return [Spree::Variant, nil] the variant associated with this line
-    #   item, if there is one
-    def variant
-      Spree::Variant.unscoped { super }
-    end
-
     # Sets the options on the line item according to the order's currency or
     # one passed in.
     #

data/app/models/spree/log_entry.rb

@@ -2,7 +2,7 @@ module Spree
   class LogEntry < Spree::Base
     belongs_to :source, polymorphic: true
 
-    # Fix for #1767
+    # Fix for https://github.com/spree/spree/issues/1767
     # If a payment fails, we want to make sure we keep the record of it failing
     after_rollback :save_anyway
 

data/app/models/spree/option_type.rb

@@ -12,9 +12,11 @@ module Spree
     has_many :option_values, -> { order(:position) }, dependent: :destroy, inverse_of: :option_type
     has_many :product_option_types, dependent: :destroy, inverse_of: :option_type
     has_many :products, through: :product_option_types
-    has_and_belongs_to_many :prototypes, join_table: 'spree_option_types_prototypes'
 
-    validates :name, presence: true, uniqueness: true
+    has_many :option_type_prototypes
+    has_many :prototypes, through: :option_type_prototypes
+
+    validates :name, presence: true, uniqueness: { allow_blank: true }
     validates :presentation, presence: true
 
     default_scope -> { order(:position) }