spree_core 2.3.1 → 2.3.2

data/app/models/spree/promotion_handler/coupon.rb

@@ -81,8 +81,14 @@ module Spree
           order.persist_totals
           self.success = Spree.t(:coupon_code_applied)
         else
-          # if the promotion was created after the order
-          self.error = Spree.t(:coupon_code_not_found)
+          # if the promotion exists on an order, but wasn't found above,
+          # we've already selected a better promotion
+          if order.promotions.with_coupon_code(order.coupon_code)
+            self.error = Spree.t(:coupon_code_better_exists)
+          else
+            # if the promotion was created after the order
+            self.error = Spree.t(:coupon_code_not_found)
+          end
         end
       end
     end

data/app/models/spree/return_authorization.rb

@@ -2,7 +2,7 @@ module Spree
   class ReturnAuthorization < Spree::Base
     belongs_to :order, class_name: 'Spree::Order'
 
-    has_many :inventory_units
+    has_many :inventory_units, dependent: :nullify
     belongs_to :stock_location
     before_create :generate_number
     before_save :force_positive_amount
@@ -62,7 +62,7 @@ module Spree
       order.shipped_shipments.collect{|s| s.inventory_units.to_a}.flatten
     end
 
-    # Used when Adjustment#update! wants to update the related adjustmenrt
+    # Used when Adjustment#update! wants to update the related adjustment
     def compute_amount(*args)
       amount.abs * -1
     end

data/app/models/spree/shipping_rate.rb

@@ -23,10 +23,10 @@ module Spree
           if tax_rate.included_in_price?
             if tax_amount > 0
               amount = "#{display_tax_amount(tax_amount)} #{tax_rate.name}"
-              price += " (incl. #{amount})"
+              price += " (#{Spree.t(:incl)} #{amount})"
             else
               amount = "#{display_tax_amount(tax_amount*-1)} #{tax_rate.name}"
-              price += " (excl. #{amount})"
+              price += " (#{Spree.t(:excl)} #{amount})"
             end
           else
             amount = "#{display_tax_amount(tax_amount)} #{tax_rate.name}"

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

@@ -2,13 +2,9 @@ module Spree
   module Stock
     class AvailabilityValidator < ActiveModel::Validator
       def validate(line_item)
-        if shipment = line_item.target_shipment
-          units = shipment.inventory_units_for(line_item.variant)
-          return if units.count > line_item.quantity
-          quantity = line_item.quantity - units.count
-        else
-          quantity = line_item.quantity
-        end
+        unit_count = line_item.inventory_units.size
+        return if unit_count >= line_item.quantity
+        quantity = line_item.quantity - unit_count
 
         quantifier = Stock::Quantifier.new(line_item.variant)
 

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

@@ -54,7 +54,7 @@ module Spree
           begin
             ship_method.include?(order.ship_address) &&
             calculator.available?(package) &&
-            (calculator.preferences[:currency].nil? ||
+            (calculator.preferences[:currency].blank? ||
              calculator.preferences[:currency] == currency)
           rescue Exception => exception
             log_calculator_exception(ship_method, exception)

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

@@ -76,6 +76,7 @@ module Spree
 
       def to_shipment
         shipment = Spree::Shipment.new
+        shipment.address = order.ship_address
         shipment.order = order
         shipment.stock_location = stock_location
         shipment.shipping_rates = shipping_rates

data/app/models/spree/stock_item.rb

@@ -8,10 +8,11 @@ module Spree
 
     validates_presence_of :stock_location, :variant
     validates_uniqueness_of :variant_id, scope: [:stock_location_id, :deleted_at]
+    validates :count_on_hand, numericality: { greater_than_or_equal_to: 0 }, if: :verify_count_on_hand?
 
     delegate :weight, :should_track_inventory?, to: :variant
 
-    after_save :conditional_variant_touch
+    after_save :conditional_variant_touch, if: :changed?
     after_touch { variant.touch }
 
     def backordered_inventory_units
@@ -56,6 +57,10 @@ module Spree
     end
 
     private
+      def verify_count_on_hand?
+        count_on_hand_changed? && !backorderable? && (count_on_hand < count_on_hand_was) && (count_on_hand < 0)
+      end
+
       def count_on_hand=(value)
         write_attribute(:count_on_hand, value)
       end

data/app/models/spree/stock_location.rb

@@ -13,6 +13,10 @@ module Spree
 
     after_create :create_stock_items, :if => "self.propagate_all_variants?"
 
+    def state_text
+      state.try(:abbr) || state.try(:name) || state_name
+    end
+    
     # 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)

data/app/models/spree/tax_rate.rb

@@ -12,15 +12,18 @@ module Spree
   class TaxRate < Spree::Base
     acts_as_paranoid
     include Spree::Core::CalculatedAdjustments
+    include Spree::Core::AdjustmentSource
     belongs_to :zone, class_name: "Spree::Zone"
     belongs_to :tax_category, class_name: "Spree::TaxCategory"
 
-    has_many :adjustments, as: :source, dependent: :destroy
+    has_many :adjustments, as: :source
 
     validates :amount, presence: true, numericality: true
     validates :tax_category_id, presence: true
     validates_with DefaultTaxZoneValidator
 
+    before_destroy :deals_with_adjustments_for_deleted_source
+
     scope :by_zone, ->(zone) { where(zone_id: zone) }
 
     # Gets the array of TaxRates appropriate for the specified order
@@ -71,7 +74,7 @@ module Spree
     def self.adjust(order_tax_zone, items)
       rates = self.match(order_tax_zone)
       tax_categories = rates.map(&:tax_category)
-      relevant_items = items.select { |item| tax_categories.include?(item.tax_category) }
+      relevant_items, non_relevant_items = items.partition { |item| tax_categories.include?(item.tax_category) }
       relevant_items.each do |item|
         item.adjustments.tax.delete_all
         relevant_rates = rates.select { |rate| rate.tax_category == item.tax_category }
@@ -80,6 +83,13 @@ module Spree
           rate.adjust(order_tax_zone, item)
         end
       end
+      non_relevant_items.each do |item|
+        if item.adjustments.tax.present?
+          item.adjustments.tax.delete_all
+          item.update_column(:pre_tax_amount, nil)
+          item.send(:recalculate_adjustments)
+        end
+      end
     end
 
     # Tax rates can *potentially* be applicable to an order.
@@ -176,6 +186,9 @@ module Spree
         label = ""
         label << (name.present? ? name : tax_category.name) + " "
         label << (show_rate_in_label? ? "#{amount * 100}%" : "")
+        label << " (#{Spree.t(:included_in_price)})" if included_in_price?
+        label
       end
+
   end
 end

data/app/models/spree/variant.rb

@@ -11,6 +11,7 @@ module Spree
 
     has_many :inventory_units
     has_many :line_items, inverse_of: :variant
+    has_many :orders, through: :line_items
 
     has_many :stock_items, dependent: :destroy, inverse_of: :variant
     has_many :stock_locations, through: :stock_items
@@ -32,9 +33,9 @@ module Spree
       inverse_of: :variant
 
     validate :check_price
-    validates :price, numericality: { greater_than_or_equal_to: 0 }
-
     validates :cost_price, numericality: { greater_than_or_equal_to: 0, allow_nil: true }
+    validates :price, numericality: { greater_than_or_equal_to: 0 }
+    validates_uniqueness_of :sku, allow_blank: true, conditions: -> { where(deleted_at: nil) }
 
     before_validation :set_cost_currency
     after_save :save_default_price
@@ -207,8 +208,12 @@ module Spree
         end
       end
 
+      def default_price_changed?
+        default_price && (default_price.changed? || default_price.new_record?)
+      end
+
       def save_default_price
-        default_price.save if default_price && (default_price.changed? || default_price.new_record?)
+        default_price.save if default_price_changed?
       end
 
       def set_cost_currency

data/app/models/spree/zone.rb

@@ -14,7 +14,7 @@ module Spree
     def self.default_tax
       where(default_tax: true).first
     end
-  
+
     # Returns the matching zone with the highest priority zone type (State, Country, Zone.)
     # Returns nil in the case of no matches.
     def self.match(address)
@@ -61,7 +61,7 @@ module Spree
       @countries ||= case kind
                      when 'country' then zoneables
                      when 'state' then zoneables.collect(&:country)
-                     else nil
+                     else []
                      end.flatten.compact.uniq
     end
 

data/config/locales/en.yml

@@ -11,6 +11,12 @@ en:
         phone: Phone
         state: State
         zipcode: Zip Code
+      spree/calculator/tiered_flat_rate:
+        preferred_base_amount: Base Amount
+        preferred_tiers: Tiers
+      spree/calculator/tiered_percent:
+        preferred_base_percent: Base Percent
+        preferred_tiers: Tiers
       spree/country:
         iso: ISO
         iso3: ISO3
@@ -230,6 +236,19 @@ en:
         other: Zones
     errors:
       models:
+        spree/calculator/tiered_flat_rate:
+          attributes:
+            base:
+              keys_should_be_positive_number: "Tier keys should all be numbers larger than 0"
+            preferred_tiers:
+              should_be_hash: "should be a hash"
+        spree/calculator/tiered_percent:
+          attributes:
+            base:
+              keys_should_be_positive_number: "Tier keys should all be numbers larger than 0"
+              values_should_be_percent: "Tier values should all be percentages between 0% and 100%"
+            preferred_tiers:
+              should_be_hash: "should be a hash"
         spree/classification:
           attributes:
             taxon_id:
@@ -238,6 +257,7 @@ en:
           attributes:
             base:
               card_expired: "Card has expired"
+              expiry_invalid: "Card expiration is invalid"
         spree/line_item:
           attributes:
             currency:
@@ -404,6 +424,7 @@ en:
     back_to_prototypes_list: Back To Prototypes List
     back_to_reports_list: Back To Reports List
     back_to_shipping_categories: Back To Shipping Categories
+    back_to_shipping_categories_list: Back To Shipping Categories List
     back_to_shipping_methods_list: Back To Shipping Methods List
     back_to_states_list: Back To States List
     back_to_stock_locations_list: Back to Stock Locations List
@@ -418,6 +439,8 @@ en:
     backorderable: Backorderable
     backorders_allowed: backorders allowed
     balance_due: Balance Due
+    base_amount: Base Amount
+    base_percent: Base Percent
     bill_address: Bill Address
     billing: Billing
     billing_address: Billing Address
@@ -449,6 +472,7 @@ en:
     choose_dashboard_locale: Choose Dashboard Locale
     choose_location: Choose location
     city: City
+    click_and_drag_on_the_products_to_sort_them: 'Click & drag on the products to sort them.'
     clone: Clone
     close: Close
     close_all_adjustments: Close All Adjustments
@@ -488,6 +512,7 @@ en:
     coupon_code_unknown_error: This coupon code could not be applied to the cart at this time.
     create: Create
     create_a_new_account: Create a new account
+    create_new_order: Create new order
     created_at: Created At
     credit: Credit
     credit_card: Credit Card
@@ -585,6 +610,7 @@ en:
           signup: User signup
     exceptions:
       count_on_hand_setter: Cannot set count_on_hand manually, as it is set automatically by the recalculate_count_on_hand callback. Please use `update_column(:count_on_hand, value)` instead.
+    excl: excl.
     expiration: Expiration
     extension: Extension
     existing_shipments: Existing shipments
@@ -634,10 +660,12 @@ en:
     image: Image
     images: Images
     inactive: Inactive
+    incl: incl.
     included_in_price: Included in Price
     included_price_validation: cannot be selected unless you have set a Default Tax Zone
     instructions_to_reset_password: Please enter your email on the form below
     insufficient_stock: Insufficient stock available, only %{on_hand} remaining
+    insufficient_stock_lines_present: Some line items in this order have insufficient quantity.
     intercept_email_address: Intercept Email Address
     intercept_email_instructions: Override email recipient and replace with this address.
     internal_name: Internal Name
@@ -739,6 +767,7 @@ en:
     new_zone: New Zone
     next: Next
     no_actions_added: No actions added
+    no_images_found: No images found
     no_orders_found: No orders found
     no_payment_methods_found: No payment methods found
     no_payment_found: No payment found
@@ -884,7 +913,7 @@ en:
       label: Order must contain %{select} of these products
       match_all: all
       match_any: at least one
-      match_none: none 
+      match_none: none
       product_source:
         group: From product group
         manual: Manually choose
@@ -1001,7 +1030,6 @@ en:
     shipment: Shipment
     shipment_adjustments: "Shipment adjustments"
     shipment_details: "From %{stock_location} via %{shipping_method}"
-    shipment_inc_vat: Shipment including VAT
     shipment_mailer:
       shipped_email:
         dear_customer: Dear Customer,
@@ -1082,7 +1110,6 @@ en:
     tax_category: Tax Category
     tax_rate_amount_explanation: Tax rates are a decimal amount to aid in calculations, (i.e. if the tax rate is 5% then enter 0.05)
     tax_rates: Tax Rates
-    tax_settings: Tax Settings
     taxon: Taxon
     taxon_edit: Edit Taxon
     taxon_placeholder: Add a Taxon
@@ -1103,6 +1130,9 @@ en:
     there_are_no_items_for_this_order: There are no items for this order. Please add an item to the order to continue.
     there_were_problems_with_the_following_fields: There were problems with the following fields
     thumbnail: Thumbnail
+    tiers: Tiers
+    tiered_flat_rate: Tiered Flat Rate
+    tiered_percent: Tiered Percent
     time: Time
     to_add_variants_you_must_first_define: To add variants, you must first define
     total: Total

data/db/default/spree/countries.rb

@@ -226,6 +226,7 @@ Spree::Country.create!([
   { name: "New Zealand", iso3: "NZL", iso: "NZ", iso_name: "NEW ZEALAND", numcode: "554" },
   { name: "Saint Kitts and Nevis", iso3: "KNA", iso: "KN", iso_name: "SAINT KITTS AND NEVIS", numcode: "659", states_required: true },
   { name: "Serbia", iso3: "SRB", iso: "RS", "iso_name" => "SERBIA", numcode: "999" },
-  { name: "Montenegro", iso3: "MNE", iso: "ME", iso_name: "MONTENEGRO", numcode: "499" }
+  { name: "Montenegro", iso3: "MNE", iso: "ME", iso_name: "MONTENEGRO", numcode: "499" },
+  { name: "Jersey", iso3: "JEY", iso: "JE", iso_name: "JERSEY", numcode: "44" }
 ])
 Spree::Config[:default_country_id] = Spree::Country.find_by(name: "United States").id

data/db/migrate/20130807024302_rename_adjustment_fields.rb

@@ -7,11 +7,8 @@ class RenameAdjustmentFields < ActiveRecord::Migration
 
     # This enables the Spree::Order#all_adjustments association to work correctly
     Spree::Adjustment.reset_column_information
-    Spree::Adjustment.find_each do |adjustment|
-      if adjustment.adjustable.is_a?(Spree::Order)
-        adjustment.order = adjustment.adjustable
-        adjustment.save
-      end
+    Spree::Adjustment.where(adjustable_type: "Spree::Order").find_each do |adjustment|
+      adjustment.update_column(:order_id, adjustment.adjustable_id)
     end
   end
 end

data/db/migrate/20140804185157_add_default_to_shipment_cost.rb

@@ -0,0 +1,10 @@
+class AddDefaultToShipmentCost < ActiveRecord::Migration
+  def up
+    change_column :spree_shipments, :cost, :decimal, precision: 10, scale: 2, default: 0.0
+    Spree::Shipment.where(cost: nil).update_all(cost: 0)
+  end
+
+  def down
+    change_column :spree_shipments, :cost, :decimal, precision: 10, scale: 2
+  end
+end

data/lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt

@@ -1,15 +1,20 @@
 module Spree
-  module AuthenticationHelpers
+  module CurrentUserHelpers
     def self.included(receiver)
-      receiver.send :helper_method, :spree_login_path
-      receiver.send :helper_method, :spree_signup_path
-      receiver.send :helper_method, :spree_logout_path
       receiver.send :helper_method, :spree_current_user
     end
 
     def spree_current_user
       current_user
     end
+  end
+
+  module AuthenticationHelpers
+    def self.included(receiver)
+      receiver.send :helper_method, :spree_login_path
+      receiver.send :helper_method, :spree_signup_path
+      receiver.send :helper_method, :spree_logout_path
+    end
 
     def spree_login_path
       main_app.login_path
@@ -26,3 +31,6 @@ module Spree
 end
 
 ApplicationController.send :include, Spree::AuthenticationHelpers
+ApplicationController.send :include, Spree::CurrentUserHelpers
+
+Spree::Api::BaseController.send :include, Spree::CurrentUserHelpers

data/lib/generators/spree/install/install_generator.rb

@@ -13,6 +13,7 @@ module Spree
     class_option :admin_email, :type => :string
     class_option :admin_password, :type => :string
     class_option :lib_name, :type => :string, :default => 'spree'
+    class_option :enforce_available_locales, :type => :boolean, :default => nil
 
     def self.source_paths
       paths = self.superclass.source_paths
@@ -100,6 +101,13 @@ Disallow: /account
       end
     end
       APP
+
+      if !options[:enforce_available_locales].nil?
+        application <<-APP
+    # Prevent this deprecation message: https://github.com/svenfuchs/i18n/commit/3b6e56e
+    I18n.enforce_available_locales = #{options[:enforce_available_locales]}
+        APP
+      end
     end
 
     def include_seed_data