spree_core 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92fd29fe255bb2c31f173def5f8f34ea17620370
-  data.tar.gz: bfb2e716ea91a48d83f18df9fb25a1e926ddbb27
+  metadata.gz: 88ab16ad8f605d308074b823d9a7c70f6504bb08
+  data.tar.gz: 6bcb7afca77e7006f6eb12e4ba1177b66bd3a585
 SHA512:
-  metadata.gz: 6940b7c73074114e90bf31b084ca912ce042b2c6dc1d3b84e1fdebe4373f348363c5ef2fad136ed8e398d7f4d53b26d16e50336b0838a24e8029b9a683c3f410
-  data.tar.gz: 32dff2ab726e1acd863fbaaa7a7f439ffffb07ed343db015e0f223d653f225b2ba2dd5237d4ba20b38a84697022dc9f9a7848cbe5c88fd6298402908797c579d
+  metadata.gz: 91fa2acf65367622c4d6d526beb7d696dad6b2a143ee03a376c4045741620840c60b01f749feb8e771ca9fd618695872b37498d08369c35052c6b1d10cc2c176
+  data.tar.gz: 8e1596b38affe2af7d32a8dfefceea76e9626ad4b1540bf8ba3655d0d787fc6834544476ebfc0f7529413aac35ac132690574a6fbeb6afc83d333df7d7f253fa

data/app/helpers/spree/base_helper.rb

@@ -118,7 +118,7 @@ module Spree
       countries.collect do |country|
         country.name = Spree.t(country.iso, scope: 'country_names', default: country.name)
         country
-      end.sort { |a, b| a.name.parameterize <=> b.name.parameterize }
+      end.sort_by { |c| c.name.parameterize }
     end
 
     def seo_url(taxon)

data/app/models/spree/credit_card.rb

@@ -132,9 +132,13 @@ module Spree
 
     def expiry_not_in_the_past
       if year.present? && month.present?
-        time = "#{year}-#{month}-1".to_time
-        if time < Time.zone.now.to_time.beginning_of_month
-          errors.add(:base, :card_expired)
+        if month.to_i < 1 || month.to_i > 12
+          errors.add(:base, :expiry_invalid)
+        else
+          time = Time.zone.parse("#{year}-#{month}-1")
+          if time < Time.zone.now.to_time.beginning_of_month
+            errors.add(:base, :card_expired)
+          end
         end
       end
     end

data/app/models/spree/inventory_unit.rb

@@ -70,6 +70,7 @@ module Spree
       end
 
       def update_order
+        self.reload
         order.update!
       end
   end

data/app/models/spree/item_adjustments.rb

@@ -47,8 +47,9 @@ module Spree
       included_tax_total = 0
       additional_tax_total = 0
       run_callbacks :tax_adjustments do
-        included_tax_total = adjustments.tax.included.reload.map(&:update!).compact.sum
-        additional_tax_total = adjustments.tax.additional.reload.map(&:update!).compact.sum
+        tax = (item.respond_to?(:all_adjustments) ? item.all_adjustments : item.adjustments).tax
+        included_tax_total = tax.included.reload.map(&:update!).compact.sum
+        additional_tax_total = tax.additional.reload.map(&:update!).compact.sum
       end
 
       item.update_columns(

data/app/models/spree/line_item.rb

@@ -123,7 +123,7 @@ module Spree
 
       def ensure_proper_currency
         unless currency == order.currency
-          errors.add(:currency, t(:must_match_order_currency))
+          errors.add(:currency, :must_match_order_currency)
         end
       end
   end

data/app/models/spree/order.rb

@@ -3,16 +3,13 @@ require 'spree/order/checkout'
 
 module Spree
   class Order < ActiveRecord::Base
-    include Checkout
-    include CurrencyUpdater
+    include Spree::Order::Checkout
+    include Spree::Order::CurrencyUpdater
 
     checkout_flow do
       go_to_state :address
       go_to_state :delivery
-      go_to_state :payment, if: ->(order) do
-        order.set_shipments_cost if order.shipments.any?
-        order.payment_required?
-      end
+      go_to_state :payment, if: ->(order) { order.payment_required? }
       go_to_state :confirm, if: ->(order) { order.confirmation_required? }
       go_to_state :complete
       remove_transition from: :delivery, to: :confirm
@@ -76,6 +73,7 @@ module Spree
 
     validates :email, presence: true, if: :require_email
     validates :email, email: true, if: :require_email, allow_blank: true
+    validates :number, uniqueness: true
     validate :has_available_shipment
 
     make_permalink field: :number
@@ -91,6 +89,7 @@ module Spree
 
     scope :created_between, ->(start_date, end_date) { where(created_at: start_date..end_date) }
     scope :completed_between, ->(start_date, end_date) { where(completed_at: start_date..end_date) }
+    scope :reverse_chronological, -> { order(created_at: :desc) }
 
     def self.between(start_date, end_date)
       ActiveSupport::Deprecation.warn("Order#between will be deprecated in Spree 2.3, please use either Order#created_between or Order#completed_between instead.")
@@ -268,15 +267,18 @@ module Spree
       end
     end
 
-    # FIXME refactor this method and implement validation using validates_* utilities
-    def generate_order_number
-      record = true
-      while record
-        random = "R#{Array.new(9){rand(9)}.join}"
-        record = self.class.where(number: random).first
-      end
-      self.number = random if self.number.blank?
-      self.number
+    def generate_order_number(digits = 9)
+      self.number ||= loop do
+         # Make a random number.
+         random = "R#{Array.new(digits){rand(10)}.join}"
+         # Use the random  number if no other order exists with it.
+         if self.class.exists?(number: random)
+           # If over half of all possible options are taken add another digit.
+           digits += 1 if self.class.count > (10 ** digits / 2)
+         else
+           break random
+         end
+       end
     end
 
     def shipped_shipments
@@ -412,6 +414,12 @@ module Spree
      line_items.select(&:insufficient_stock?)
     end
 
+    def ensure_line_items_are_in_stock
+      if insufficient_stock_lines.present?
+        errors.add(:base, Spree.t(:insufficient_stock_lines_present)) and return false
+      end
+    end
+
     def merge!(order, user = nil)
       order.line_items.each do |line_item|
         next unless line_item.currency == currency
@@ -582,7 +590,7 @@ module Spree
       self.ensure_updated_shipments
     end
 
-    def reload
+    def reload(options=nil)
       remove_instance_variable(:@tax_zone) if defined?(@tax_zone)
       super
     end

data/app/models/spree/order/checkout.rb

@@ -92,9 +92,11 @@ module Spree
                 before_transition :from => :delivery, :do => :apply_free_shipping_promotions
               end
 
-              after_transition :to => :complete, :do => :finalize!
-              after_transition :to => :resumed,  :do => :after_resume
-              after_transition :to => :canceled, :do => :after_cancel
+              before_transition to: :resumed, do: :ensure_line_items_are_in_stock
+
+              after_transition to: :complete, do: :finalize!
+              after_transition to: :resumed,  do: :after_resume
+              after_transition to: :canceled, do: :after_cancel
 
               after_transition :from => any - :cart, :to => any - [:confirm, :complete] do |order|
                 order.update_totals
@@ -230,6 +232,7 @@ module Spree
               end
 
               success = self.update_attributes(attributes)
+              set_shipments_cost if self.shipments.any?
             end
             @updating_params = nil
             success

data/app/models/spree/order_contents.rb

@@ -9,6 +9,7 @@ module Spree
     def add(variant, quantity = 1, currency = nil, shipment = nil)
       line_item = add_to_line_item(variant, quantity, currency, shipment)
       reload_totals
+      shipment.present? ? shipment.update_amounts : order.ensure_updated_shipments
       PromotionHandler::Cart.new(order, line_item).activate
       ItemAdjustments.new(line_item).update
       reload_totals
@@ -18,6 +19,7 @@ module Spree
     def remove(variant, quantity = 1, shipment = nil)
       line_item = remove_from_line_item(variant, quantity, shipment)
       reload_totals
+      shipment.present? ? shipment.update_amounts : order.ensure_updated_shipments
       PromotionHandler::Cart.new(order, line_item).activate
       ItemAdjustments.new(line_item).update
       reload_totals
@@ -47,12 +49,7 @@ module Spree
 
       def reload_totals
         order_updater.update_item_count
-        order_updater.update_item_total
-        order_updater.update_adjustment_total
-
-        order_updater.update_payment_state if order.completed?
-        order_updater.persist_totals
-
+        order_updater.update
         order.reload
       end
 

data/app/models/spree/order_populator.rb

@@ -9,9 +9,9 @@ module Spree
       @errors = ActiveModel::Errors.new(self)
     end
 
-    
     def populate(variant_id, quantity)
       attempt_cart_add(variant_id, quantity)
+      order.ensure_updated_shipments
       valid?
     end
 

data/app/models/spree/order_updater.rb

@@ -38,6 +38,7 @@ module Spree
     # +payment_total+      The total value of all finalized Payments (NOTE: non-finalized Payments are excluded)
     # +item_total+         The total value of all LineItems
     # +adjustment_total+   The total value of all adjustments (promotions, credits, etc.)
+    # +promo_total+        The total value of all promotion adjustments
     # +total+              The so-called "order total."  This is equivalent to +item_total+ plus +adjustment_total+.
     def update_totals
       order.payment_total = payments.completed.sum(:amount)
@@ -49,7 +50,12 @@ module Spree
 
     # give each of the shipments a chance to update themselves
     def update_shipments
-      shipments.each { |shipment| shipment.update!(order) }
+      shipments.each do |shipment|
+        next unless shipment.persisted?
+        shipment.update!(order)
+        shipment.refresh_rates
+        shipment.update_amounts
+      end
     end
 
     def update_shipment_total
@@ -69,6 +75,10 @@ module Spree
       order.included_tax_total = line_items.sum(:included_tax_total) + shipments.sum(:included_tax_total)
       order.additional_tax_total = line_items.sum(:additional_tax_total) + shipments.sum(:additional_tax_total)
 
+      order.promo_total = line_items.sum(:promo_total) +
+                          shipments.sum(:promo_total) +
+                          adjustments.promotion.eligible.sum(:amount)
+
       update_order_total
     end
 
@@ -92,6 +102,7 @@ module Spree
         additional_tax_total: order.additional_tax_total,
         payment_total: order.payment_total,
         shipment_total: order.shipment_total,
+        promo_total: order.promo_total,
         total: order.total,
         updated_at: Time.now,
       )

data/app/models/spree/payment/processing.rb

@@ -5,7 +5,7 @@ module Spree
         if payment_method && payment_method.source_required?
           if source
             if !processing?
-              if payment_method.supports?(source)
+              if payment_method.supports?(source) || token_based?
                 if payment_method.auto_capture?
                   purchase!
                 else
@@ -219,6 +219,10 @@ module Spree
       def gateway_order_id
         "#{order.number}-#{self.identifier}"
       end
+
+      def token_based?
+        source.gateway_customer_profile_id.present? || source.gateway_payment_profile_id.present?
+      end
     end
   end
 end

data/app/models/spree/product.rb

@@ -65,7 +65,8 @@ module Spree
     after_create :add_properties_and_option_types_from_prototype
     after_create :build_variants_from_option_values_hash, if: :option_values_hash
     after_save :save_master
-    after_save :touch
+    after_save :run_touch_callbacks, if: :anything_changed?
+    after_save :reset_nested_changes
     after_touch :touch_taxons
 
     delegate :images, to: :master, prefix: true
@@ -201,10 +202,10 @@ module Spree
     end
 
     def total_on_hand
-      if self.variants_including_master.any? { |v| !v.should_track_inventory? }
+      if any_variants_not_track_inventory?
         Float::INFINITY
       else
-        self.stock_items.to_a.sum(&:count_on_hand)
+        stock_items.sum(:count_on_hand)
       end
     end
 
@@ -217,70 +218,93 @@ module Spree
 
     private
 
-      def normalize_slug
-        self.slug = normalize_friendly_id(slug)
-      end
-
-      # Builds variants from a hash of option types & values
-      def build_variants_from_option_values_hash
-        ensure_option_types_exist_for_values_hash
-        values = option_values_hash.values
-        values = values.inject(values.shift) { |memo, value| memo.product(value).map(&:flatten) }
-
-        values.each do |ids|
-          variant = variants.create(
-            option_value_ids: ids,
-            price: master.price
-          )
+    def add_properties_and_option_types_from_prototype
+      if prototype_id && prototype = Spree::Prototype.find_by(id: prototype_id)
+        prototype.properties.each do |property|
+          product_properties.create(property: property)
         end
-        save
+        self.option_types = prototype.option_types
       end
+    end
 
-      def add_properties_and_option_types_from_prototype
-        if prototype_id && prototype = Spree::Prototype.find_by(id: prototype_id)
-          prototype.properties.each do |property|
-            product_properties.create(property: property)
-          end
-          self.option_types = prototype.option_types
-        end
+    def any_variants_not_track_inventory?
+      if variants_including_master.loaded?
+        variants_including_master.any? { |v| !v.should_track_inventory? }
+      else
+        !Spree::Config.track_inventory_levels || variants_including_master.where(track_inventory: false).any?
       end
+    end
 
-      # ensures the master variant is flagged as such
-      def set_master_variant_defaults
-        master.is_master = true
+    # Builds variants from a hash of option types & values
+    def build_variants_from_option_values_hash
+      ensure_option_types_exist_for_values_hash
+      values = option_values_hash.values
+      values = values.inject(values.shift) { |memo, value| memo.product(value).map(&:flatten) }
+
+      values.each do |ids|
+        variant = variants.create(
+          option_value_ids: ids,
+          price: master.price
+        )
       end
+      save
+    end
 
-      # there's a weird quirk with the delegate stuff that does not automatically save the delegate object
-      # when saving so we force a save using a hook.
-      def save_master
-        master.save if master && (master.changed? || master.new_record? || (master.default_price && (master.default_price.changed? || master.default_price.new_record?)))
-      end
+    def ensure_master
+      return unless new_record?
+      self.master ||= Variant.new
+    end
 
-      def ensure_master
-        return unless new_record?
-        self.master ||= Variant.new
-      end
+    def normalize_slug
+      self.slug = normalize_friendly_id(slug)
+    end
 
-      # Iterate through this products taxons and taxonomies and touch their timestamps in a batch
-      def touch_taxons
-        taxons_to_touch = taxons.map(&:self_and_ancestors).flatten.uniq
-        Spree::Taxon.where(id: taxons_to_touch.map(&:id)).update_all(updated_at: Time.current)
+    def punch_slug
+      update_column :slug, "#{Time.now.to_i}_#{slug}" # punch slug with date prefix to allow reuse of original
+    end
 
-        taxonomy_ids_to_touch = taxons_to_touch.map(&:taxonomy_id).flatten.uniq
-        Spree::Taxonomy.where(id: taxonomy_ids_to_touch).update_all(updated_at: Time.current)
-      end
+    def anything_changed?
+      changed? || @nested_changes
+    end
 
-      # Try building a slug based on the following fields in increasing order of specificity.
-      def slug_candidates
-        [
-            :name,
-            [:name, :sku]
-        ]
-      end
+    def reset_nested_changes
+      @nested_changes = false
+    end
 
-      def punch_slug
-        update(slug: "#{Time.now.to_i}_#{slug}") # punch slug with date prefix to allow reuse of original
+    # there's a weird quirk with the delegate stuff that does not automatically save the delegate object
+    # when saving so we force a save using a hook.
+    def save_master
+      if master && (master.changed? || master.new_record? || (master.default_price && (master.default_price.changed? || master.default_price.new_record?)))
+        master.save
+        @nested_changes = true
       end
+    end
+
+    # ensures the master variant is flagged as such
+    def set_master_variant_defaults
+      master.is_master = true
+    end
+
+    # Try building a slug based on the following fields in increasing order of specificity.
+    def slug_candidates
+      [
+          :name,
+          [:name, :sku]
+      ]
+    end
+
+    def run_touch_callbacks
+      run_callbacks(:touch)
+    end
+
+    # Iterate through this products taxons and taxonomies and touch their timestamps in a batch
+    def touch_taxons
+      taxons_to_touch = taxons.map(&:self_and_ancestors).flatten.uniq
+      Spree::Taxon.where(id: taxons_to_touch.map(&:id)).update_all(updated_at: Time.current)
+
+      taxonomy_ids_to_touch = taxons_to_touch.map(&:taxonomy_id).flatten.uniq
+      Spree::Taxonomy.where(id: taxonomy_ids_to_touch).update_all(updated_at: Time.current)
+    end
 
   end
 end

data/app/models/spree/promotion/actions/create_adjustment.rb

@@ -3,13 +3,14 @@ module Spree
     module Actions
       class CreateAdjustment < PromotionAction
         include Spree::Core::CalculatedAdjustments
+        include Spree::Core::AdjustmentSource
 
         has_many :adjustments, as: :source
 
         delegate :eligible?, to: :promotion
 
         before_validation :ensure_action_has_calculator
-        before_destroy :deals_with_adjustments
+        before_destroy :deals_with_adjustments_for_deleted_source
 
         # Creates the adjustment related to a promotion for the order passed
         # through options hash
@@ -55,16 +56,6 @@ module Spree
             self.calculator = Calculator::FlatPercentItemTotal.new
           end
 
-          def deals_with_adjustments
-            adjustment_scope = self.adjustments.joins("LEFT OUTER JOIN spree_orders ON spree_orders.id = spree_adjustments.adjustable_id")
-            # For incomplete orders, remove the adjustment completely.
-            adjustment_scope.where("spree_orders.completed_at IS NULL").readonly(false).destroy_all
-
-            # For complete orders, the source will be invalid.
-            # Therefore we nullify the source_id, leaving the adjustment in place.
-            # This would mean that the order's total is not altered at all.
-            adjustment_scope.where("spree_orders.completed_at IS NOT NULL").update_all("source_id = NULL")
-          end
       end
     end
   end

data/app/models/spree/promotion/actions/create_item_adjustments.rb

@@ -3,13 +3,14 @@ module Spree
     module Actions
       class CreateItemAdjustments < PromotionAction
         include Spree::Core::CalculatedAdjustments
+        include Spree::Core::AdjustmentSource
 
         has_many :adjustments, as: :source
 
         delegate :eligible?, to: :promotion
 
         before_validation :ensure_action_has_calculator
-        before_destroy :deals_with_adjustments
+        before_destroy :deals_with_adjustments_for_deleted_source
 
         def perform(payload = {})
           order = payload[:order]
@@ -62,24 +63,6 @@ module Spree
             self.calculator = Calculator::PercentOnLineItem.new
           end
 
-          def deals_with_adjustments
-            adjustment_scope = self.adjustments.includes(:order).references(:spree_orders)
-
-            # For incomplete orders, remove the adjustment completely.
-            adjustment_scope.where("spree_orders.completed_at IS NULL").each do |adjustment|
-              adjustment.destroy
-            end
-
-            # For complete orders, the source will be invalid.
-            # Therefore we nullify the source_id, leaving the adjustment in place.
-            # This would mean that the order's total is not altered at all.
-            adjustment_scope.where("spree_orders.completed_at IS NOT NULL").each do |adjustment|
-              adjustment.update_columns(
-                source_id: nil,
-                updated_at: Time.now,
-              )
-            end
-          end
       end
     end
   end

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

@@ -29,9 +29,21 @@ module Spree
       end
 
       private
-
         def promotions
-          Promotion.active.includes(:promotion_rules).where(:code => nil, :path => nil)
+          promo_table = Promotion.arel_table
+          join_table = Arel::Table.new(:spree_orders_promotions)
+
+          join_condition = promo_table.join(join_table, Arel::Nodes::OuterJoin).on(
+            promo_table[:id].eq(join_table[:promotion_id])
+          ).join_sources
+
+          Promotion.active.includes(:promotion_rules).
+            joins(join_condition).
+            where(
+              promo_table[:code].eq(nil).and(
+                promo_table[:path].eq(nil)
+              ).or(join_table[:order_id].eq(order.id))
+            ).distinct
         end
     end
   end

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 < ActiveRecord::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/shipment.rb

@@ -287,6 +287,36 @@ module Spree
       end
     end
 
+    # Update Shipment and make sure Order states follow the shipment changes
+    def update_attributes_and_order(params = {})
+      if self.update_attributes params
+        if params.has_key? :selected_shipping_rate_id
+          # Changing the selected Shipping Rate won't update the cost (for now)
+          # so we persist the Shipment#cost before calculating order shipment
+          # total and updating payment state (given a change in shipment cost
+          # might change the Order#payment_state)
+          self.update_amounts
+
+          order.updater.update_shipment_total
+          order.updater.update_payment_state
+
+          # Update shipment state only after order total is updated because it
+          # (via Order#paid?) affects the shipment state (YAY)
+          self.update_columns(
+            state: determine_state(order),
+            updated_at: Time.now
+          )
+
+          # And then it's time to update shipment states and finally persist
+          # order changes
+          order.updater.update_shipment_state
+          order.updater.persist_totals
+        end
+
+        true
+      end
+    end
+
     private
 
       def manifest_unstock(item)

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/package.rb

@@ -98,6 +98,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
@@ -52,6 +53,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 < ActiveRecord::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
@@ -72,7 +75,7 @@ module Spree
     def self.adjust(order, items)
       rates = self.match(order)
       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 }
@@ -81,6 +84,13 @@ module Spree
           rate.adjust(order, 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)
+          Spree::ItemAdjustments.new(item).update
+        end
+      end
     end
 
     # For Vat the default rate is the rate that is configured for the default category
@@ -191,6 +201,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

@@ -202,8 +202,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/config/locales/en.yml

@@ -232,6 +232,7 @@ en:
           attributes:
             base:
               card_expired: "Card has expired"
+              expiry_invalid: "Card expiration is invalid"
         spree/line_item:
           attributes:
             currency:
@@ -404,6 +405,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
@@ -449,6 +451,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
@@ -588,6 +591,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
@@ -637,10 +641,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

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/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
@@ -104,6 +105,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

data/lib/spree/core.rb

@@ -69,6 +69,7 @@ require 'spree/core/delegate_belongs_to'
 require 'spree/core/permalinks'
 require 'spree/core/token_resource'
 require 'spree/core/calculated_adjustments'
+require 'spree/core/adjustment_source'
 require 'spree/core/product_duplicator'
 require 'spree/core/controller_helpers'
 require 'spree/core/controller_helpers/strong_parameters'

data/lib/spree/core/adjustment_source.rb

@@ -0,0 +1,26 @@
+module Spree
+  module Core
+    module AdjustmentSource
+      def self.included(klass)
+        klass.class_eval do
+          def deals_with_adjustments_for_deleted_source
+            adjustment_scope = self.adjustments.includes(:order).references(:spree_orders)
+
+            # For incomplete orders, remove the adjustment completely.
+            adjustment_scope.where("spree_orders.completed_at IS NULL").destroy_all
+
+            # For complete orders, the source will be invalid.
+            # Therefore we nullify the source_id, leaving the adjustment in place.
+            # This would mean that the order's total is not altered at all.
+            adjustment_scope.where("spree_orders.completed_at IS NOT NULL").each do |adjustment|
+              adjustment.update_columns(
+                source_id: nil,
+                updated_at: Time.now,
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/spree/core/controller_helpers/order.rb

@@ -13,7 +13,7 @@ module Spree
 
         # Used in the link_to_cart helper.
         def simple_current_order
-          @order ||= Spree::Order.find_by(id: session[:order_id], currency: current_currency)
+          @simple_current_order ||= Spree::Order.find_by(id: session[:order_id], currency: current_currency)
         end
 
         # The current incomplete order from the session for use in cart and during checkout

data/lib/spree/core/importer/order.rb

@@ -18,8 +18,7 @@ module Spree
             create_adjustments_from_params(params.delete(:adjustments_attributes), order)
             create_payments_from_params(params.delete(:payments_attributes), order)
 
-
-            if(completed_at = params.delete(:completed_at))
+            if completed_at = params.delete(:completed_at)
               order.completed_at = completed_at
               order.state = 'complete'
             end
@@ -30,9 +29,9 @@ module Spree
             end
 
             order.update_attributes!(params)
-            # Really ensure that the order totals are correct
-            order.update_totals
-            order.persist_totals
+
+            # Really ensure that the order totals & states are correct
+            order.updater.update
             order.reload
           rescue Exception => e
             order.destroy if order && order.persisted?
@@ -45,9 +44,14 @@ module Spree
           shipments_hash.each do |s|
             begin
               shipment = order.shipments.build
-              shipment.tracking = s[:tracking]
+              shipment.tracking       = s[:tracking]
               shipment.stock_location = Spree::StockLocation.find_by_name!(s[:stock_location])
 
+              if s[:shipped_at].present?
+                shipment.shipped_at = s[:shipped_at]
+                shipment.state      = 'shipped'
+              end
+
               inventory_units = s[:inventory_units] || []
               inventory_units.each do |iu|
                 ensure_variant_id_from_params(iu)
@@ -63,6 +67,7 @@ module Spree
               rate = shipment.shipping_rates.create!(:shipping_method => shipping_method,
                                                      :cost => s[:cost])
               shipment.selected_shipping_rate_id = rate.id
+              shipment.update_amounts
 
             rescue Exception => e
               raise "Order import shipments: #{e.message} #{s}"
@@ -104,9 +109,11 @@ module Spree
           return [] unless payments_hash
           payments_hash.each do |p|
             begin
-              payment = order.payments.build
+              payment = order.payments.build order: order
               payment.amount = p[:amount].to_f
-              payment.state = p.fetch(:state, 'completed')
+              # Order API should be using state as that's the normal payment field.
+              # spree_wombat serializes payment state as status so imported orders should fall back to status field.
+              payment.state = p[:state] || p[:status] || 'completed'
               payment.payment_method = Spree::PaymentMethod.find_by_name!(p[:payment_method])
               payment.save!
             rescue Exception => e

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.2.4"
+    "2.2.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: font-awesome-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.9
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +254,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.6
+        version: 4.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.6
+        version: 4.0.8
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -290,20 +318,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.9.2
-- !ruby/object:Gem::Dependency
-  name: font-awesome-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 description: The bare bones necessary for Spree.
 email: sean@spreecommerce.com
 executables: []
@@ -593,6 +607,7 @@ files:
 - db/migrate/20140601011216_set_shipment_total_for_users_upgrading.rb
 - db/migrate/20140609201656_add_deleted_at_to_spree_promotion_actions.rb
 - db/migrate/20140616202624_remove_uncaptured_amount_from_spree_payments.rb
+- db/migrate/20140804185157_add_default_to_shipment_cost.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
@@ -613,6 +628,7 @@ files:
 - lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.css
 - lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/frontend/all.css
 - lib/spree/core.rb
+- lib/spree/core/adjustment_source.rb
 - lib/spree/core/calculated_adjustments.rb
 - lib/spree/core/controller_helpers.rb
 - lib/spree/core/controller_helpers/auth.rb