spree_core 3.3.6 → 3.4.0.rc1

data/app/models/spree/stock_location.rb

@@ -21,14 +21,14 @@ module Spree
 
     # Wrapper for creating a new stock item respecting the backorderable config
     def propagate_variant(variant)
-      self.stock_items.create!(variant: variant, backorderable: self.backorderable_default)
+      stock_items.create!(variant: variant, backorderable: backorderable_default)
     end
 
     # Return either an existing stock item or create a new one. Useful in
     # scenarios where the user might not know whether there is already a stock
     # item for a given variant
     def set_up_stock_item(variant)
-      self.stock_item(variant) || propagate_variant(variant)
+      stock_item(variant) || propagate_variant(variant)
     end
 
     # Returns an instance of StockItem for the variant id.
@@ -68,7 +68,7 @@ module Spree
       move(variant, quantity, originator)
     end
 
-    def restock_backordered(variant, quantity, originator = nil)
+    def restock_backordered(variant, quantity, _originator = nil)
       item = stock_item_or_create(variant)
       item.update_columns(
         count_on_hand: item.count_on_hand + quantity,
@@ -104,16 +104,17 @@ module Spree
     end
 
     private
-      def create_stock_items
-        Variant.includes(:product).find_each do |variant|
-          propagate_variant(variant)
-        end
+
+    def create_stock_items
+      Variant.includes(:product).find_each do |variant|
+        propagate_variant(variant)
       end
+    end
 
-      def ensure_one_default
-        if self.default
-          StockLocation.where(default: true).where.not(id: self.id).update_all(default: false)
-        end
+    def ensure_one_default
+      if default
+        StockLocation.where(default: true).where.not(id: id).update_all(default: false)
       end
+    end
   end
 end

data/app/models/spree/stock_movement.rb

@@ -30,10 +30,8 @@ module Spree
     private
 
     def update_stock_item_quantity
-      return unless self.stock_item.should_track_inventory?
+      return unless stock_item.should_track_inventory?
       stock_item.adjust_count_on_hand quantity
     end
-
   end
 end
-

data/app/models/spree/stock_transfer.rb

@@ -31,7 +31,7 @@ module Spree
 
           self.source_location = source_location
           self.destination_location = destination_location
-          self.save!
+          save!
         end
       end
     end

data/app/models/spree/store.rb

@@ -1,6 +1,6 @@
 module Spree
   class Store < Spree::Base
-    has_many :orders, class_name: "Spree::Order"
+    has_many :orders, class_name: 'Spree::Order'
 
     with_options presence: true do
       validates :code, uniqueness: { case_sensitive: false, allow_blank: true }
@@ -10,7 +10,7 @@ module Spree
     before_save :ensure_default_exists_and_is_unique
     before_destroy :validate_not_default
 
-    scope :by_url, lambda { |url| where("url like ?", "%#{url}%") }
+    scope :by_url, ->(url) { where('url like ?', "%#{url}%") }
 
     after_commit :clear_cache
 
@@ -20,7 +20,7 @@ module Spree
     end
 
     def self.default
-      Rails.cache.fetch("default_store") do
+      Rails.cache.fetch('default_store') do
         where(default: true).first_or_initialize
       end
     end
@@ -43,7 +43,7 @@ module Spree
     end
 
     def clear_cache
-      Rails.cache.delete("default_store")
+      Rails.cache.delete('default_store')
     end
   end
 end

data/app/models/spree/store_credit.rb

@@ -204,9 +204,9 @@ module Spree
 
     def store_event
       return unless saved_change_to_amount? ||
-                    saved_change_to_amount_used? ||
-                    saved_change_to_amount_authorized? ||
-                    action == ELIGIBLE_ACTION
+          saved_change_to_amount_used? ||
+          saved_change_to_amount_authorized? ||
+          action == ELIGIBLE_ACTION
 
       event = if action
                 store_credit_events.build(action: action)

data/app/models/spree/tax_category.rb

@@ -8,7 +8,7 @@ module Spree
     before_save :set_default_category
 
     def set_default_category
-      #set existing default tax category to false if this one has been marked as default
+      # set existing default tax category to false if this one has been marked as default
 
       if is_default && tax_category = self.class.where(is_default: true).where.not(id: id).first
         tax_category.update_columns(is_default: false, updated_at: Time.current)

data/app/models/spree/tax_rate.rb

@@ -6,9 +6,9 @@ module Spree
     include Spree::AdjustmentSource
 
     with_options inverse_of: :tax_rates do
-      belongs_to :zone, class_name: "Spree::Zone", optional: true
+      belongs_to :zone, class_name: 'Spree::Zone', optional: true
       belongs_to :tax_category,
-                 class_name: "Spree::TaxCategory"
+                 class_name: 'Spree::TaxCategory'
     end
 
     with_options presence: true do
@@ -16,15 +16,15 @@ module Spree
       validates :tax_category
     end
 
-    scope :by_zone, -> (zone) { where(zone_id: zone.id) }
+    scope :by_zone, ->(zone) { where(zone_id: zone.id) }
     scope :potential_rates_for_zone,
-          -> (zone) do
+          ->(zone) do
             where(zone_id: Spree::Zone.potential_matching_zones(zone).pluck(:id))
           end
     scope :for_default_zone,
           -> { potential_rates_for_zone(Spree::Zone.default_tax) }
     scope :for_tax_category,
-          -> (category) { where(tax_category_id: category.try(:id)) }
+          ->(category) { where(tax_category_id: category.try(:id)) }
     scope :included_in_price, -> { where(included_in_price: true) }
 
     # Gets the array of TaxRates appropriate for the specified tax zone
@@ -44,7 +44,7 @@ module Spree
 
       included_rates = rates.select(&:included_in_price)
       if included_rates.any?
-        pre_tax_amount /= (1 + included_rates.map(&:amount).sum)
+        pre_tax_amount /= (1 + included_rates.sum(&:amount))
       end
 
       item.update_column(:pre_tax_amount, pre_tax_amount)
@@ -85,7 +85,7 @@ module Spree
       potential_rates_for_zone(options[:tax_zone]).
         included_in_price.
         for_tax_category(options[:tax_category]).
-        pluck(:amount).sum
+        sum(:amount)
     end
 
     def adjust(order, item)
@@ -100,14 +100,14 @@ module Spree
 
     def label
       Spree.t included_in_price? ? :including_tax : :excluding_tax,
-              scope: "adjustment_labels.tax_rates",
+              scope: 'adjustment_labels.tax_rates',
               name: name.presence || tax_category.name,
               amount: amount_for_label
     end
 
     def amount_for_label
-      return "" unless show_rate_in_label?
-      " " + ActiveSupport::NumberHelper::NumberToPercentageConverter.convert(
+      return '' unless show_rate_in_label?
+      ' ' + ActiveSupport::NumberHelper::NumberToPercentageConverter.convert(
         amount * 100,
         locale: I18n.locale
       )

data/app/models/spree/taxon.rb

@@ -1,4 +1,4 @@
-# TODO let friendly id take care of sanitizing the url
+# TODO: let friendly id take care of sanitizing the url
 require 'stringex'
 
 module Spree
@@ -31,14 +31,14 @@ module Spree
     after_touch :touch_ancestors_and_taxonomy
 
     has_attached_file :icon,
-      styles: { mini: '32x32>', normal: '128x128>' },
-      default_style: :mini,
-      url: '/spree/taxons/:id/:style/:basename.:extension',
-      path: ':rails_root/public/spree/taxons/:id/:style/:basename.:extension',
-      default_url: '/assets/default_taxon.png'
+                      styles: { mini: '32x32>', normal: '128x128>' },
+                      default_style: :mini,
+                      url: '/spree/taxons/:id/:style/:basename.:extension',
+                      path: ':rails_root/public/spree/taxons/:id/:style/:basename.:extension',
+                      default_url: '/assets/default_taxon.png'
 
     validates_attachment :icon,
-      content_type: { content_type: ["image/jpg", "image/jpeg", "image/png", "image/gif"] }
+                         content_type: { content_type: ['image/jpg', 'image/jpeg', 'image/png', 'image/gif'] }
 
     self.whitelisted_ransackable_associations = %w[taxonomy]
 
@@ -56,10 +56,10 @@ module Spree
 
     # Return meta_title if set otherwise generates from root name and/or taxon name
     def seo_title
-      unless meta_title.blank?
-        meta_title
-      else
+      if meta_title.blank?
         root? ? name : "#{root.name} - #{name}"
+      else
+        meta_title
       end
     end
 
@@ -77,10 +77,10 @@ module Spree
     end
 
     def pretty_name
-      ancestor_chain = self.ancestors.inject("") do |name, ancestor|
+      ancestor_chain = ancestors.inject('') do |name, ancestor|
         name += "#{ancestor.name} -> "
       end
-      ancestor_chain + "#{name}"
+      ancestor_chain + name.to_s
     end
 
     # awesome_nested_set sorts by :lft and :rgt. This call re-inserts the child
@@ -90,7 +90,7 @@ module Spree
     #
     #  See #3390 for background.
     def child_index=(idx)
-      move_to_child_with_index(parent, idx.to_i) unless self.new_record?
+      move_to_child_with_index(parent, idx.to_i) unless new_record?
     end
 
     private

data/app/models/spree/taxonomy.rb

@@ -5,20 +5,21 @@ module Spree
     validates :name, presence: true, uniqueness: { case_sensitive: false, allow_blank: true }
 
     has_many :taxons, inverse_of: :taxonomy
-    has_one :root, -> { where parent_id: nil }, class_name: "Spree::Taxon", dependent: :destroy
+    has_one :root, -> { where parent_id: nil }, class_name: 'Spree::Taxon', dependent: :destroy
 
     after_create :set_root
     after_save :set_root_taxon_name
 
-    default_scope { order("#{self.table_name}.position, #{self.table_name}.created_at") }
+    default_scope { order("#{table_name}.position, #{table_name}.created_at") }
 
     private
-      def set_root
-        self.root ||= Taxon.create!(taxonomy_id: id, name: name)
-      end
 
-      def set_root_taxon_name
-        root.update_attributes(name: name)
-      end
+    def set_root
+      self.root ||= Taxon.create!(taxonomy_id: id, name: name)
+    end
+
+    def set_root_taxon_name
+      root.update_attributes(name: name)
+    end
   end
 end

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

@@ -3,15 +3,14 @@ module Spree
     ##
     # Validates a field based on the maximum length of the underlying DB field, if there is one.
     class DbMaximumLengthValidator < ActiveModel::Validator
-
       def initialize(options)
         super
         @field = options[:field].to_s
-        raise ArgumentError.new("a field must be specified to the validator") if @field.blank?
+        raise ArgumentError, 'a field must be specified to the validator' if @field.blank?
       end
 
       def validate(record)
-        warn "`Spree::Validations::DbMaximumLengthValidator` is deprecated. Use `DbMaximumLengthValidator` instead."
+        warn '`Spree::Validations::DbMaximumLengthValidator` is deprecated. Use `DbMaximumLengthValidator` instead.'
         limit = record.class.columns_hash[@field].limit
         value = record[@field.to_sym]
         if value && limit && value.to_s.length > limit

data/app/models/spree/variant.rb

@@ -31,12 +31,12 @@ module Spree
     has_many :option_value_variants, class_name: 'Spree::OptionValueVariant'
     has_many :option_values, through: :option_value_variants, class_name: 'Spree::OptionValue'
 
-    has_many :images, -> { order(:position) }, as: :viewable, dependent: :destroy, class_name: "Spree::Image"
+    has_many :images, -> { order(:position) }, as: :viewable, dependent: :destroy, class_name: 'Spree::Image'
 
     has_many :prices,
-      class_name: 'Spree::Price',
-      dependent: :destroy,
-      inverse_of: :variant
+             class_name: 'Spree::Price',
+             dependent: :destroy,
+             inverse_of: :variant
 
     before_validation :set_cost_currency
 
@@ -67,12 +67,12 @@ module Spree
 
     scope :not_deleted, -> { where("#{Variant.quoted_table_name}.deleted_at IS NULL") }
 
-    scope :for_currency_and_available_price_amount, -> (currency) do
+    scope :for_currency_and_available_price_amount, ->(currency) do
       currency ||= Spree::Config[:currency]
-      joins(:prices).where("spree_prices.currency = ?", currency).where("spree_prices.amount IS NOT NULL").distinct
+      joins(:prices).where('spree_prices.currency = ?', currency).where('spree_prices.amount IS NOT NULL').distinct
     end
 
-    scope :active, -> (currency = nil) do
+    scope :active, ->(currency = nil) do
       not_discontinued.not_deleted.
         for_currency_and_available_price_amount(currency)
     end
@@ -92,11 +92,6 @@ module Spree
       !discontinued? && product.available?
     end
 
-    def self.having_orders
-      warn "`Spree::Variant#having_orders` is deprecated and will be removed in Spree 3.4"
-      joins(:line_items).distinct
-    end
-
     def tax_category
       if self[:tax_category_id].nil?
         product.tax_category
@@ -105,14 +100,8 @@ module Spree
       end
     end
 
-    # returns number of units currently on backorder for this variant.
-    def on_backorder
-      warn "`Spree::Variant#on_backorder` is deprecated and will be removed in Spree 3.4"
-      inventory_units.with_state('backordered').size
-    end
-
     def options_text
-      values = self.option_values.sort do |a, b|
+      values = option_values.sort do |a, b|
         a.option_type.position <=> b.option_type.position
       end
 
@@ -120,7 +109,7 @@ module Spree
         "#{ov.option_type.presentation}: #{ov.presentation}"
       end
 
-      values.to_sentence({ words_connector: ", ", two_words_connector: ", " })
+      values.to_sentence(words_connector: ', ', two_words_connector: ', ')
     end
 
     # Default to master name
@@ -154,23 +143,23 @@ module Spree
 
     def set_option_value(opt_name, opt_value)
       # no option values on master
-      return if self.is_master
+      return if is_master
 
       option_type = Spree::OptionType.where(name: opt_name).first_or_initialize do |o|
         o.presentation = opt_name
         o.save!
       end
 
-      current_value = self.option_values.detect { |o| o.option_type.name == opt_name }
+      current_value = option_values.detect { |o| o.option_type.name == opt_name }
 
-      unless current_value.nil?
-        return if current_value.name == opt_value
-        self.option_values.delete(current_value)
-      else
+      if current_value.nil?
         # then we have to check to make sure that the product has the option type
-        unless self.product.option_types.include? option_type
-          self.product.option_types << option_type
+        unless product.option_types.include? option_type
+          product.option_types << option_type
         end
+      else
+        return if current_value.name == opt_value
+        option_values.delete(current_value)
       end
 
       option_value = Spree::OptionValue.where(option_type_id: option_type.id, name: opt_value).first_or_initialize do |o|
@@ -178,12 +167,12 @@ module Spree
         o.save!
       end
 
-      self.option_values << option_value
-      self.save
+      option_values << option_value
+      save
     end
 
     def option_value(opt_name)
-      self.option_values.detect { |o| o.option_type.name == opt_name }.try(:presentation)
+      option_values.detect { |o| o.option_type.name == opt_name }.try(:presentation)
     end
 
     def price_in(currency)
@@ -197,27 +186,27 @@ module Spree
     def price_modifier_amount_in(currency, options = {})
       return 0 unless options.present?
 
-      options.keys.map { |key|
+      options.keys.map do |key|
         m = "#{key}_price_modifier_amount_in".to_sym
-        if self.respond_to? m
-          self.send(m, currency, options[key])
+        if respond_to? m
+          send(m, currency, options[key])
         else
           0
         end
-      }.sum
+      end.sum
     end
 
     def price_modifier_amount(options = {})
       return 0 unless options.present?
 
-      options.keys.map { |key|
+      options.keys.map do |key|
         m = "#{key}_price_modifier_amount".to_sym
-        if self.respond_to? m
-          self.send(m, options[key])
+        if respond_to? m
+          send(m, options[key])
         else
           0
         end
-      }.sum
+      end.sum
     end
 
     def name_and_sku
@@ -241,11 +230,11 @@ module Spree
     # Shortcut method to determine if inventory tracking is enabled for this variant
     # This considers both variant tracking flag and site-wide inventory tracking settings
     def should_track_inventory?
-      self.track_inventory? && Spree::Config.track_inventory_levels
+      track_inventory? && Spree::Config.track_inventory_levels
     end
 
     def track_inventory
-      self.should_track_inventory?
+      should_track_inventory?
     end
 
     def volume

data/app/models/spree/zone.rb

@@ -31,9 +31,9 @@ module Spree
     def self.potential_matching_zones(zone)
       if zone.country?
         # Match zones of the same kind with similar countries
-        joins(countries: :zones)
-          .where('zone_members_spree_countries_join.zone_id = ?', zone.id)
-          .distinct
+        joins(countries: :zones).
+          where('zone_members_spree_countries_join.zone_id = ?', zone.id).
+          distinct
       else
         # Match zones of the same kind with similar states in AND match zones
         # that have the states countries in
@@ -52,13 +52,13 @@ module Spree
     # Returns nil in the case of no matches.
     def self.match(address)
       return unless address &&
-                    matches = includes(:zone_members)
-                    .order('spree_zones.zone_members_count', 'spree_zones.created_at')
-                    .where("(spree_zone_members.zoneable_type = 'Spree::Country' AND " \
-                                      'spree_zone_members.zoneable_id = ?) OR ' \
-                                      "(spree_zone_members.zoneable_type = 'Spree::State' AND " \
-                                      'spree_zone_members.zoneable_id = ?)', address.country_id, address.state_id)
-                    .references(:zones)
+          matches = includes(:zone_members).
+                    order('spree_zones.zone_members_count', 'spree_zones.created_at').
+                    where("(spree_zone_members.zoneable_type = 'Spree::Country' AND " \
+                            'spree_zone_members.zoneable_id = ?) OR ' \
+                            "(spree_zone_members.zoneable_type = 'Spree::State' AND " \
+                            'spree_zone_members.zoneable_id = ?)', address.country_id, address.state_id).
+                    references(:zones)
 
       %w[state country].each do |zone_kind|
         if match = matches.detect { |zone| zone_kind == zone.kind }

data/app/validators/db_maximum_length_validator.rb

@@ -2,11 +2,11 @@
 # Validates a field based on the maximum length of the underlying DB field, if there is one.
 class DbMaximumLengthValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    if defined?(Globalize)
-      limit = record.class.translation_class.columns_hash[attribute.to_s].limit
-    else
-      limit = record.class.columns_hash[attribute.to_s].limit
-    end
+    limit = if defined?(Globalize)
+              record.class.translation_class.columns_hash[attribute.to_s].limit
+            else
+              record.class.columns_hash[attribute.to_s].limit
+            end
     value = record[attribute.to_sym]
     if value && limit && value.to_s.length > limit
       record.errors.add(attribute.to_sym, :too_long, count: limit)

data/config/initializers/acts_as_taggable_on.rb

@@ -1,9 +1,9 @@
-require "acts-as-taggable-on"
+require 'acts-as-taggable-on'
 
 ActsAsTaggableOn::Tag.class_eval do
-  self.table_name_prefix = "spree_"
+  self.table_name_prefix = 'spree_'
 end
 
 ActsAsTaggableOn::Tagging.class_eval do
-  self.table_name_prefix = "spree_"
+  self.table_name_prefix = 'spree_'
 end

data/config/initializers/assets.rb

@@ -1 +1 @@
-Rails.application.config.assets.precompile += %w( logo/spree_50.png noimage/*.png )
+Rails.application.config.assets.precompile += %w(logo/spree_50.png noimage/*.png)

data/config/initializers/friendly_id.rb

@@ -3,5 +3,5 @@
 FriendlyId.defaults do |config|
   config.use :reserved
   config.reserved_words = %w(new edit index session login logout users admin
-    stylesheets assets javascripts images)
+                             stylesheets assets javascripts images)
 end

data/config/initializers/premailer_assets.rb

@@ -1 +1 @@
-Rails.application.config.assets.precompile += %w( ink.css )
+Rails.application.config.assets.precompile += %w(ink.css)

data/config/locales/en.yml

@@ -540,7 +540,7 @@ en:
     back_to_resource_list: 'Back To %{resource} List'
     back_to_payment: Back To Payment
     back_to_rma_reason_list: Back To RMA Reason List
-    back_to_store: Go Back To Store
+    back_to_store: Back to Store
     back_to_users_list: Back To Users List
     backorderable: Backorderable
     backorderable_default: Backorderable default
@@ -749,6 +749,7 @@ en:
     excl: excl.
     expiration: Expiration
     extension: Extension
+    extensions_directory: Extensions Directory
     existing_shipments: Existing shipments
     failed_payment_attempts: Failed Payment Attempts
     filename: Filename
@@ -779,6 +780,7 @@ en:
     has_no_shipped_units: has no shipped units
     height: Height
     home: Home
+    help_center: Help Center
     i18n:
       available_locales: Available Locales
       fields: Fields
@@ -837,6 +839,7 @@ en:
     items_to_be_reimbursed: Items to be reimbursed
     items_reimbursed: Items reimbursed
     jirafe: Jirafe
+    join_slack: Join Slack
     last_name: Last Name
     last_name_begins_with: Last Name Begins With
     learn_more: Learn More
@@ -1364,7 +1367,10 @@ en:
     stock_movements: Stock Movements
     stock_movements_for_stock_location: Stock Movements for %{stock_location_name}
     stock_successfully_transferred: Stock was successfully transferred between locations.
-    stock_transfer: Stock Transfer
+    stock_transfer_name: Stock Transfer
+    stock_transfer:
+      errors:
+        must_have_variant: You must add atleast one variant.
     stock_transfers: Stock Transfers
     stop: Stop
     store: Store

data/db/default/spree/states.rb

@@ -4,6 +4,7 @@ state_inserts = []
 state_values = -> do
   Spree::Country.where(states_required: true).each do |country|
     carmen_country = Carmen::Country.named(country.name)
+    next if !carmen_country
     carmen_country.subregions.each do |subregion|
       name       = connection.quote subregion.name
       abbr       = connection.quote subregion.code