spree_core 2.0.13 → 2.1.0

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

@@ -9,8 +9,8 @@ module Spree
       end
 
       def total_on_hand
-        if @variant.should_track_inventory?
-          stock_items.sum(:count_on_hand)
+        if Spree::Config.track_inventory_levels
+          stock_items.to_a.sum(&:count_on_hand)
         else
           Float::INFINITY
         end
@@ -23,7 +23,6 @@ module Spree
       def can_supply?(required)
         total_on_hand >= required || backorderable?
       end
-
     end
   end
 end

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

@@ -8,7 +8,7 @@ module Spree
           @packer = packer
           @next_splitter = next_splitter
         end
-        delegate :stock_location, :order, :to => :packer
+        delegate :stock_location, :order, to: :packer
 
         def split(packages)
           return_next(packages)

data/app/models/spree/stock_item.rb

@@ -7,11 +7,9 @@ module Spree
     has_many :stock_movements
 
     validates_presence_of :stock_location, :variant
-    validates_uniqueness_of :variant_id, scope: [:stock_location_id, :deleted_at]
+    validates_uniqueness_of :variant_id, scope: :stock_location_id
 
-    attr_accessible :count_on_hand, :variant, :stock_location, :backorderable, :variant_id
-
-    delegate :weight, :should_track_inventory?, to: :variant
+    delegate :weight, to: :variant
 
     def backordered_inventory_units
       Spree::InventoryUnit.backordered_for_stock_item(self)
@@ -24,7 +22,7 @@ module Spree
     def adjust_count_on_hand(value)
       self.with_lock do
         self.count_on_hand = self.count_on_hand + value
-        process_backorders(count_on_hand - count_on_hand_was)
+        process_backorders if in_stock?
 
         self.save!
       end
@@ -32,7 +30,7 @@ module Spree
 
     def set_count_on_hand(value)
       self.count_on_hand = value
-      process_backorders(count_on_hand - count_on_hand_was)
+      process_backorders if in_stock?
 
       self.save!
     end
@@ -46,23 +44,15 @@ module Spree
       self.in_stock? || self.backorderable?
     end
 
-    def variant
-      Spree::Variant.unscoped { super }
-    end
-
     private
       def count_on_hand=(value)
         write_attribute(:count_on_hand, value)
       end
 
-      # Process backorders based on amount of stock received
-      # If stock was -20 and is now -15 (increase of 5 units), then we should process 5 inventory orders.
-      # If stock was -20 but then was -25 (decrease of 5 units), do nothing.
-      def process_backorders(number)
-        if number > 0
-          backordered_inventory_units.first(number).each do |unit|
-            unit.fill_backorder
-          end
+      def process_backorders
+        backordered_inventory_units.each do |unit|
+          return unless in_stock?
+          unit.fill_backorder
         end
       end
   end

data/app/models/spree/stock_location.rb

@@ -1,6 +1,6 @@
 module Spree
   class StockLocation < ActiveRecord::Base
-    has_many :stock_items, dependent: :destroy
+    has_many :stock_items, dependent: :delete_all
     has_many :stock_movements, through: :stock_items
 
     belongs_to :state, class_name: 'Spree::State'
@@ -8,15 +8,11 @@ module Spree
 
     validates_presence_of :name
 
-    attr_accessible :name, :active, :address1, :address2, :city, :zipcode,
-        :backorderable_default, :state_name, :state_id, :country_id, :phone,
-        :country_id, :propagate_all_variants, :admin_name
-
     scope :active, -> { where(active: true) }
 
     after_create :create_stock_items, :if => "self.propagate_all_variants?"
 
-    # Wrapper for creating a new stock item respecting the backorderable config 
+    # 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)
     end
@@ -48,11 +44,6 @@ module Spree
       move(variant, quantity, originator)
     end
 
-    def restock_backordered(variant, quantity, originator = nil)
-      item = stock_item_or_create(variant)
-      item.update_column(:count_on_hand, item.count_on_hand + quantity)
-    end
-
     def unstock(variant, quantity, originator = nil)
       move(variant, -quantity, originator)
     end

data/app/models/spree/stock_movement.rb

@@ -3,26 +3,23 @@ module Spree
     belongs_to :stock_item, class_name: 'Spree::StockItem'
     belongs_to :originator, polymorphic: true
 
-    attr_accessible :quantity, :stock_item, :stock_item_id, :originator, :action
 
     after_create :update_stock_item_quantity
 
     validates :stock_item, presence: true
     validates :quantity, presence: true
 
-    scope :recent, order("#{quoted_table_name}.created_at DESC")
+    scope :recent, -> { order('created_at DESC') }
 
     def readonly?
       !new_record?
     end
 
     private
-
     def update_stock_item_quantity
-      return unless self.stock_item.should_track_inventory?
+      return unless Spree::Config[:track_inventory_levels]
       stock_item.adjust_count_on_hand quantity
     end
-
   end
 end
 

data/app/models/spree/stock_transfer.rb

@@ -7,8 +7,6 @@ module Spree
 
     make_permalink field: :number, prefix: 'T'
 
-    attr_accessible :reference
-
     def to_param
       number
     end

data/app/models/spree/tax_category.rb

@@ -5,8 +5,6 @@ module Spree
 
     has_many :tax_rates, dependent: :destroy
 
-    attr_accessible :name, :description, :is_default
-
     before_save :set_default_category
 
     def set_default_category

data/app/models/spree/tax_rate.rb

@@ -21,15 +21,12 @@ module Spree
 
     scope :by_zone, ->(zone) { where(zone_id: zone) }
 
-    attr_accessible :amount, :tax_category_id, :calculator, :zone_id, :name,
-                    :included_in_price, :show_rate_in_label
-
     # Gets the array of TaxRates appropriate for the specified order
     def self.match(order)
-      order_zone = order.tax_zone
-      return [] unless order_zone
-      includes(zone: { zone_members: :zoneable }).all.select do |rate|
-        rate.zone == order_zone || rate.zone.contains?(order_zone) || rate.zone.default_tax
+      return [] unless order.tax_zone
+      all.select do |rate|
+        (!rate.included_in_price && (rate.zone == order.tax_zone || rate.zone.contains?(order.tax_zone) || (order.tax_address.nil? && rate.zone.default_tax))) ||
+        (rate.included_in_price && !order.tax_address.nil? && !rate.zone.contains?(order.tax_zone) && rate.zone.default_tax)
       end
     end
 
@@ -64,11 +61,14 @@ module Spree
         else
           amount = -1 * calculator.compute(order)
           label = Spree.t(:refund) + label
-          order.adjustments.create({ amount: amount,
-                                     source: order,
-                                     originator: self,
-                                     state: "closed",
-                                     label: label }, without_protection: true)
+
+          order.adjustments.create(
+            amount: amount,
+            source: order,
+            originator: self,
+            state: "closed",
+            label: label
+          )
         end
       else
         create_adjustment(label, order, order)

data/app/models/spree/taxon.rb

@@ -2,15 +2,12 @@ module Spree
   class Taxon < ActiveRecord::Base
     acts_as_nested_set dependent: :destroy
 
-    belongs_to :taxonomy, class_name: 'Spree::Taxonomy'
+    belongs_to :taxonomy, class_name: 'Spree::Taxonomy', :touch => true
     has_many :classifications, dependent: :delete_all
     has_many :products, through: :classifications
 
     before_create :set_permalink
 
-    attr_accessible :name, :parent_id, :icon, :description, :permalink, :taxonomy_id,
-                    :meta_description, :meta_keywords, :meta_title, :child_index
-
     validates :name, presence: true
 
     has_attached_file :icon,
@@ -72,14 +69,5 @@ module Spree
       ancestor_chain + "#{name}"
     end
 
-    # awesome_nested_set sorts by :lft and :rgt. This call re-inserts the child
-    # node so that its resulting position matches the observable 0-indexed position.
-    # ** Note ** no :position column needed - a_n_s doesn't handle the reordering if
-    #  you bring your own :order_column.
-    #
-    #  See #3390 for background.
-    def child_index=(idx)
-      move_to_child_with_index(parent, idx.to_i)
-    end
   end
 end

data/app/models/spree/taxonomy.rb

@@ -2,22 +2,19 @@ module Spree
   class Taxonomy < ActiveRecord::Base
     validates :name, presence: true
 
-    attr_accessible :name
-
     has_many :taxons
-    has_one :root, conditions: { parent_id: nil }, class_name: "Spree::Taxon",
-                   dependent: :destroy
+    has_one :root, -> { where parent_id: nil }, class_name: "Spree::Taxon", dependent: :destroy
 
     after_save :set_name
 
-    default_scope order: "#{quoted_table_name}.position"
+    default_scope -> { order("#{self.table_name}.position") }
 
     private
       def set_name
         if root
           root.update_column(:name, name)
         else
-          self.root = Taxon.create!({ taxonomy_id: id, name: name }, without_protection: true)
+          self.root = Taxon.create!(taxonomy_id: id, name: name)
         end
       end
 

data/app/models/spree/tracker.rb

@@ -1,7 +1,5 @@
 module Spree
   class Tracker < ActiveRecord::Base
-    attr_accessible :analytics_id, :environment, :active
-
     def self.current
       tracker = where(active: true, environment: Rails.env).first
       tracker.analytics_id.present? ? tracker : nil if tracker

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

@@ -1,14 +1,14 @@
 module Spree
   class Variant < ActiveRecord::Base
     #FIXME WARNING tested only under sqlite and postgresql
-    scope :descend_by_popularity, order("COALESCE((SELECT COUNT(*) FROM  #{LineItem.quoted_table_name} GROUP BY #{LineItem.quoted_table_name}.variant_id HAVING #{LineItem.quoted_table_name}.variant_id = #{Variant.quoted_table_name}.id), 0) DESC")
+    scope :descend_by_popularity, -> { order("COALESCE((SELECT COUNT(*) FROM  #{LineItem.quoted_table_name} GROUP BY #{LineItem.quoted_table_name}.variant_id HAVING #{LineItem.quoted_table_name}.variant_id = #{Variant.quoted_table_name}.id), 0) DESC") }
 
     class << self
       # Returns variants that match a given option value
       #
       # Example:
       #
-      # product.variants_including_master.has_option(OptionType.find_by_name("shoe-size"),OptionValue.find_by_name("8"))
+      # product.variants_including_master.has_option(OptionType.find_by(name: 'shoe-size'), OptionValue.find_by(name: '8'))
       def has_option(option_type, *option_values)
         option_types = OptionType.table_name
 

data/app/models/spree/variant.rb

@@ -8,25 +8,19 @@ module Spree
                         :tax_category_id, :shipping_category_id, :meta_description,
                         :meta_keywords, :tax_category, :shipping_category
 
-    attr_accessible :name, :presentation, :cost_price, :lock_version,
-                    :position, :option_value_ids,
-                    :product_id, :option_values_attributes, :price,
-                    :weight, :height, :width, :depth, :sku, :cost_currency,
-                    :track_inventory, :options
-
     has_many :inventory_units
     has_many :line_items
 
-    has_many :stock_items, dependent: :destroy, :order => "id ASC"
+    has_many :stock_items, dependent: :destroy
     has_many :stock_locations, through: :stock_items
     has_many :stock_movements
 
     has_and_belongs_to_many :option_values, join_table: :spree_option_values_variants
-    has_many :images, as: :viewable, order: :position, dependent: :destroy, class_name: "Spree::Image"
+    has_many :images, -> { order(:position) }, as: :viewable, dependent: :destroy, class_name: "Spree::Image"
 
     has_one :default_price,
+      -> { where currency: Spree::Config[:currency] },
       class_name: 'Spree::Price',
-      conditions: proc { { currency: Spree::Config[:currency] } },
       dependent: :destroy
 
     delegate_belongs_to :default_price, :display_price, :display_amount, :price, :price=, :currency if Spree::Price.table_exists?
@@ -36,7 +30,7 @@ module Spree
       dependent: :destroy
 
     validate :check_price
-    validates :price, numericality: { greater_than_or_equal_to: 0 }
+    validates :price, numericality: { greater_than_or_equal_to: 0 }, presence: true, if: proc { Spree::Config[:require_master_price] }
     validates :cost_price, numericality: { greater_than_or_equal_to: 0, allow_nil: true } if self.table_exists? && self.column_names.include?('cost_price')
 
     before_validation :set_cost_currency
@@ -45,7 +39,7 @@ module Spree
     after_create :set_position
 
     # default variant scope only lists non-deleted variants
-    scope :deleted, lambda { where("#{quoted_table_name}.deleted_at IS NOT NULL") }
+    scope :deleted, lambda { where('deleted_at IS NOT NULL') }
 
     def self.active(currency = nil)
       joins(:prices).where(deleted_at: nil).where('spree_prices.currency' => currency || Spree::Config[:currency]).where('spree_prices.amount IS NOT NULL')
@@ -61,7 +55,7 @@ module Spree
     end
 
     def options_text
-      values = self.option_values.joins(:option_type).order("#{Spree::OptionType.quoted_table_name}.position asc")
+      values = self.option_values.joins(:option_type).order("#{Spree::OptionType.table_name}.position asc")
 
       values.map! do |ov|
         "#{ov.option_type.presentation}: #{ov.presentation}"
@@ -78,13 +72,7 @@ module Spree
     # allows extensions to override deleted? if they want to provide
     # their own definition.
     def deleted?
-      !!deleted_at
-    end
-
-    def options=(options = {})
-      options.each do |option|
-        set_option_value(option[:name], option[:value])
-      end
+      deleted_at
     end
 
     def set_option_value(opt_name, opt_value)
@@ -138,25 +126,19 @@ module Spree
       "#{name} - #{sku}"
     end
 
-    def in_stock?(quantity=1)
-      Spree::Stock::Quantifier.new(self).can_supply?(quantity)
-    end
-
-    def total_on_hand
-      Spree::Stock::Quantifier.new(self).total_on_hand
-    end
-
     # Product may be created with deleted_at already set,
     # which would make AR's default finder return nil.
     # This is a stopgap for that little problem.
     def product
       Spree::Product.unscoped { super }
     end
+    
+    def in_stock?(quantity=1)
+      Spree::Stock::Quantifier.new(self).can_supply?(quantity)
+    end
 
-    # 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
+    def total_on_hand
+      Spree::Stock::Quantifier.new(self).total_on_hand
     end
 
     private

data/app/models/spree/zone.rb

@@ -2,9 +2,7 @@ module Spree
   class Zone < ActiveRecord::Base
     has_many :zone_members, dependent: :destroy, class_name: "Spree::ZoneMember"
     has_many :tax_rates, dependent: :destroy
-    has_and_belongs_to_many :shipping_methods, :join_table => 'spree_shipping_methods_zones',
-                                               :class_name => 'Spree::ShippingMethod',
-                                               :foreign_key => 'zone_id'
+    has_and_belongs_to_many :shipping_methods, :join_table => 'spree_shipping_methods_zones'
 
     validates :name, presence: true, uniqueness: true
     after_save :remove_defunct_members
@@ -13,9 +11,6 @@ module Spree
     alias :members :zone_members
     accepts_nested_attributes_for :zone_members, allow_destroy: true, reject_if: proc { |a| a['zoneable_id'].blank? }
 
-    attr_accessible :name, :description, :default_tax, :kind, :zone_members,
-                    :zone_members_attributes, :state_ids, :country_ids
-
     def kind
       if members.any? && !members.any? { |member| member.try(:zoneable_type).nil? }
         members.last.zoneable_type.demodulize.underscore
@@ -133,7 +128,7 @@ module Spree
 
       def remove_defunct_members
         if zone_members.any?
-          zone_members.where('zoneable_id IS NULL OR zoneable_type != ?', "Spree::#{kind.classify}").destroy_all
+          zone_members.where('zoneable_id IS NULL OR zoneable_type != ?', "Spree::#{kind.capitalize}").destroy_all
         end
       end
 

data/app/models/spree/zone_member.rb

@@ -3,8 +3,6 @@ module Spree
     belongs_to :zone, class_name: 'Spree::Zone', counter_cache: true
     belongs_to :zoneable, polymorphic: true
 
-    attr_accessible :zone, :zone_id, :zoneable, :zoneable_id, :zoneable_type
-
     def name
       return nil if zoneable.nil?
       zoneable.name

data/app/views/spree/payments/_payment.html.erb

@@ -4,9 +4,7 @@
     <% unless (cc_type = source.cc_type).blank? %>
       <%= image_tag "credit_cards/icons/#{cc_type}.png" %>
     <% end %>
-    <% if source.last_digits %>
-      <%= Spree.t(:ending_in) %> <%= source.last_digits %>
-    <% end %>
+    <%= Spree.t(:ending_in) %> <%= source.last_digits %>
   </span>
   <br />
   <span class="full-name">

data/config/locales/en.yml

@@ -18,6 +18,7 @@ en:
         name: Name
         numcode: ISO Code
       spree/credit_card:
+        base: ''
         cc_type: Type
         month: Month
         number: Number
@@ -63,7 +64,6 @@ en:
         zipcode: Shipping address zipcode
       spree/payment:
         amount: Amount
-        one: "Payment"
       spree/payment_method:
         name: Name
       spree/product:
@@ -214,10 +214,6 @@ en:
         other: Zones
     errors:
       models:
-        spree/classification:
-          attributes:
-            taxon_id:
-              already_linked: "is already linked to this product"
         spree/credit_card:
           attributes:
             base:
@@ -318,18 +314,13 @@ en:
           delivery_success: Test Mail sent successfully
           error: ! 'Test Mail error: %{e}'
       tab:
-        configuration: Configuration
-        option_types: Option Types
-        orders: Orders
-        overview: Overview
-        products: Products
-        promotions: Promotions
-        properties: Properties
-        prototypes: Prototypes
-        reports: Reports
-        taxonomies: Taxonomies
-        taxons: Taxons
-        users: Users
+        overview: "Overview"
+        orders: "Orders"
+        products: "Products"
+        reports: "Reports"
+        configuration: "Configuration"
+        promotions: "Promotions"
+        users: "Users"
     administration: Administration
     agree_to_privacy_policy: Agree to Privacy Policy
     agree_to_terms_of_service: Agree to Terms of Service
@@ -404,7 +395,6 @@ en:
     capture: Capture
     card_code: Card Code
     card_number: Card Number
-    card_type: Brand
     card_type_is: Card type is
     cart: Cart
     categories: Categories
@@ -649,6 +639,7 @@ en:
     login_name: Login
     logout: Logout
     look_for_similar_items: Look for similar items
+    maestro_or_solo_cards: Maestro/Solo cards
     mail_method_settings: Mail Method Settings
     mail_methods: Mail Methods
     make_refund: Make refund
@@ -707,7 +698,6 @@ en:
     no_rules_added: No rules added
     no_resource_found: ! 'No %{resource} found'
     no_shipping_methods_found: No shipping methods found
-    no_eligible_shipping_methods_found: No eligible shipping methods found
     no_trackers_found: No Trackers Found
     no_stock_locations_found: No stock locations found
     no_tracking_present: No tracking details provided.
@@ -761,7 +751,6 @@ en:
     order_number: Order
     order_populator:
       out_of_stock: ! '%{item} is out of stock.'
-      selected_quantity_not_available: ! 'Selected quantity of %{item} is not available.'
       please_enter_reasonable_quantity: Please enter a reasonable quantity.
     order_processed_successfully: Your order has been processed successfully
     order_state:
@@ -795,8 +784,8 @@ en:
     payment_information: Payment Information
     payment_method: Payment Method
     payment_methods: Payment Methods
-    payment_processing_failed: Payment could not be processed, please check the details you entered
     payment_method_not_supported: That payment method is unsupported. Please choose another one.
+    payment_processing_failed: Payment could not be processed, please check the details you entered
     payment_processor_choose_banner_text: If you need help choosing a payment processor, please visit
     payment_processor_choose_link: our payments page
     payment_state: Payment State
@@ -960,7 +949,6 @@ en:
     shipment_state: Shipment State
     shipment_states:
       backorder: backorder
-      canceled: canceled
       partial: partial
       pending: pending
       ready: ready
@@ -1001,9 +989,8 @@ en:
     special_instructions: Special Instructions
     split: Split
     spree_gateway_error_flash_for_checkout: There was a problem with your payment information. Please check your information and try again.
-    ssl:
-      change_protocol: "Please switch to using HTTP (rather than HTTPS) and retry this request."
     start: Start
+    start_date: Valid from
     state: State
     state_based: State Based
     states: States
@@ -1059,8 +1046,6 @@ en:
     time: Time
     to_add_variants_you_must_first_define: To add variants, you must first define
     total: Total
-    total_price: Total price
-    track_inventory: Track Inventory
     tracking: Tracking
     tracking_number: Tracking Number
     tracking_url: Tracking URL