spree_core 1.2.0.rc2 → 1.2.0

data/app/assets/javascripts/admin/admin.js.erb

@@ -1,3 +1,4 @@
+//<%#encoding: UTF-8%>
 //= require_self
 //= require admin/product_autocomplete
 //= require select2

data/app/assets/javascripts/admin/product_autocomplete.js.erb

@@ -1,3 +1,4 @@
+//<%#encoding: UTF-8%>
 // Product autocompletion
 image_html = function(item){
   return "<img src='" + item['images'][0]["mini_url"] + "'/>";

data/app/assets/javascripts/admin/shipping_methods.js.coffee

@@ -0,0 +1,10 @@
+$ ->
+  ($ 'input[type=checkbox]:not(:checked)').attr 'disabled', true  if ($ '.categories input:checked').length > 0
+  categoryCheckboxes = '.categories input[type=checkbox]'
+  $(categoryCheckboxes).change ->
+    if ($ this).is(':checked')
+      ($ categoryCheckboxes + ':not(:checked)').attr 'disabled', true
+      ($ this).removeAttr 'disabled'
+    else
+      ($ 'input[type=checkbox]').removeAttr 'disabled'
+

data/app/assets/javascripts/admin/zone.js.coffee

@@ -0,0 +1,39 @@
+$ ->
+  if ($ '#country_based').is(':checked')
+    show_country()
+  else
+    show_state()
+  ($ '#country_based').click ->
+    show_country()
+
+  ($ '#state_based').click ->
+    show_state()
+
+
+show_country = ->
+  ($ '#state_members :input').each ->
+    ($ this).prop 'disabled', true
+
+  ($ '#state_members').hide()
+  ($ '#zone_members :input').each ->
+    ($ this).prop 'disabled', true
+
+  ($ '#zone_members').hide()
+  ($ '#country_members :input').each ->
+    ($ this).prop 'disabled', false
+
+  ($ '#country_members').show()
+
+show_state = ->
+  ($ '#country_members :input').each ->
+    ($ this).prop 'disabled', true
+
+  ($ '#country_members').hide()
+  ($ '#zone_members :input').each ->
+    ($ this).prop 'disabled', true
+
+  ($ '#zone_members').hide()
+  ($ '#state_members :input').each ->
+    ($ this).prop 'disabled', false
+
+  ($ '#state_members').show()

data/app/assets/javascripts/store/cart.js.coffee

@@ -1,7 +1,6 @@
 $ ->
   if ($ 'form#update-cart').is('*')
-    ($ 'form#update-cart a.delete').show().on 'click', (e) ->
-      $(this).parents('.line-item').first().find('input.line_item_quantity').val 0
-      $(this).parents('form').first().submit()
-      e.preventDefault()
-      return
+    ($ 'form#update-cart a.delete').show().on 'click', ->
+      ($ this).parents('.line-item').first().find('input.line_item_quantity').val 0
+      ($ this).parents('form').first().submit()
+      false

data/app/assets/javascripts/store/product.js.coffee

@@ -7,7 +7,6 @@ add_image_handlers = ->
     ($ this).mouseout ->
       ($ 'ul.thumbnails li').removeClass 'selected'
       ($ event.currentTarget).parent('li').addClass 'selected'
-
     false
 
   ($ 'ul.thumbnails li').on 'mouseenter', (event) ->
@@ -31,6 +30,6 @@ show_variant_images = (variant_id) ->
 
 $ ->
   add_image_handlers()
-  show_variant_images ($ '#product-variants input[type="radio"]').eq(0).attr('value') if ($ '#product-variants input[type=radio]').length > 0
+  show_variant_images ($ '#product-variants input[type="radio"]').eq(0).attr('value') if ($ '#product-variants input[type="radio"]').length > 0
   ($ '#product-variants input[type="radio"]').click (event) ->
     show_variant_images @value

data/app/controllers/spree/admin/general_settings_controller.rb

@@ -10,7 +10,7 @@ module Spree
         @preferences = [:site_name, :default_seo_title, :default_meta_keywords,
                         :default_meta_description, :site_url, :allow_ssl_in_production,
                         :allow_ssl_in_staging, :allow_ssl_in_development_and_test,
-                        :check_for_spree_alerts]
+                        :check_for_spree_alerts, :display_currency]
       end
 
       def update

data/app/controllers/spree/admin/images_controller.rb

@@ -19,30 +19,22 @@ module Spree
 
 
       private
-  
+
         def location_after_save
           admin_product_images_url(@product)
         end
 
         def load_data
-          @product = Product.find_by_permalink(params[:product_id])
+          @product = Product.where(:permalink => params[:product_id]).first
           @variants = @product.variants.collect do |variant|
             [variant.options_text, variant.id]
           end
-          @variants.insert(0, [I18n.t(:all), 'All'])
+          @variants.insert(0, [I18n.t(:all), @product.master.id])
         end
 
         def set_viewable
-          if params[:image].has_key? :viewable_id
-            if params[:image][:viewable_id] == 'All'
-              @image.viewable = @product.master
-            else
-              @image.viewable_type = 'Spree::Variant'
-              @image.viewable_id = params[:image][:viewable_id]
-            end
-          else
-            @image.viewable = @product.master
-          end
+          @image.viewable_type = 'Spree::Variant'
+          @image.viewable_id = params[:image][:viewable_id]
         end
 
         def destroy_before

data/app/controllers/spree/admin/orders_controller.rb

@@ -20,6 +20,8 @@ module Spree
         created_at_gt = params[:q][:created_at_gt]
         created_at_lt = params[:q][:created_at_lt]
 
+        params[:q].delete(:inventory_units_shipment_id_null) if params[:q][:inventory_units_shipment_id_null] == "0"
+
         if !params[:q][:created_at_gt].blank?
           params[:q][:created_at_gt] = Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day rescue ""
         end
@@ -34,7 +36,7 @@ module Spree
         end
 
         @search = Order.ransack(params[:q])
-        @orders = @search.result.includes([:user, :shipments, :payments]).page(params[:page]).per(Spree::Config[:orders_per_page])
+        @orders = @search.result(:distinct => true).includes([:user, :shipments, :payments]).page(params[:page]).per(Spree::Config[:orders_per_page])
 
         # Restore dates
         params[:q][:created_at_gt] = created_at_gt

data/app/controllers/spree/admin/products_controller.rb

@@ -19,13 +19,9 @@ module Spree
         end
       end
 
-      # override the destory method to set deleted_at value
-      # instead of actually deleting the product.
       def destroy
-        @product = Product.find_by_permalink!(params[:id])
-        @product.update_column(:deleted_at, Time.now)
-
-        @product.variants_including_master.update_all(:deleted_at => Time.now)
+        @product = Product.where(:permalink => params[:id]).first!
+        @product.delete
 
         flash.notice = I18n.t('notice_messages.product_deleted')
 

data/app/controllers/spree/admin/prototypes_controller.rb

@@ -29,8 +29,8 @@ module Spree
       private
 
         def set_habtm_associations
-          @prototype.property_ids = params[:property][:id] if params[:property]
-          @prototype.option_type_ids = params[:option_type][:id] if params[:option_type]
+          @prototype.property_ids = params[:option_type].blank? ? [] : params[:property][:id]
+          @prototype.option_type_ids = params[:option_type].blank? ? [] : params[:option_type][:id]
         end
     end
   end

data/app/controllers/spree/checkout_controller.rb

@@ -39,14 +39,21 @@ module Spree
 
     private
       def ensure_valid_state
-        if params[:state] && params[:state] != 'cart' &&
-           !@order.checkout_steps.include?(params[:state])
-          params[:state] == 'cart'
-          @order.state = 'cart'
-          redirect_to checkout_path
+        unless skip_state_validation?
+          if (params[:state] && !@order.checkout_steps.include?(params[:state])) ||
+             (!params[:state] && !@order.checkout_steps.include?(@order.state))
+            @order.state = 'cart'
+            redirect_to checkout_state_path(@order.checkout_steps.first)
+          end
         end
       end
 
+      # Should be overriden if you have areas of your checkout that don't match
+      # up to a step within checkout_steps, such as a registration step
+      def skip_state_validation?
+        false
+      end
+
       def load_order
         @order = current_order
         redirect_to cart_path and return unless @order and @order.checkout_allowed?
@@ -56,24 +63,6 @@ module Spree
         state_callback(:before)
       end
 
-      def associate_user
-        if try_spree_current_user && @order
-          if @order.user.blank? || @order.email.blank?
-            @order.associate_user!(try_spree_current_user)
-          end
-        end
-
-        # This will trigger any "first order" promotions to be triggered
-        # Assuming of course that this session variable was set correctly in
-        # the authentication provider's registrations controller
-        if session[:spree_user_signup]
-          fire_event('spree.user.signup', :user => try_spree_current_user, :order => current_order(true))
-        end
-
-        session[:guest_token] = nil
-        session[:spree_user_signup] = nil
-      end
-
       # Provides a route to redirect after order completion
       def completion_route
         order_path(@order)

data/app/controllers/spree/orders_controller.rb

@@ -24,6 +24,7 @@ module Spree
     # Shows the current incomplete order from the session
     def edit
       @order = current_order(true)
+      associate_user
     end
 
     # Adds a new item to the order (creating a new order if none already exists)

data/app/helpers/spree/admin/general_settings_helper.rb

@@ -0,0 +1,13 @@
+module Spree
+  module Admin
+    module GeneralSettingsHelper
+      def currency_options
+        currencies = ::Money::Currency.table.map do |code, details|
+          iso = details[:iso_code]
+          [iso, "#{details[:name]} (#{iso})"]
+        end
+        options_from_collection_for_select(currencies, :first, :last)
+      end
+    end
+  end
+end

data/app/helpers/spree/admin/users_helper.rb

@@ -3,7 +3,7 @@ module Spree
     module UsersHelper
       def list_roles(user)
         # while testing spree-core itself user model does not have method roles
-        user.respond_to?(:roles) ? user.roles.collect { |role| role.name }.join(", ") : []
+        user.respond_to?(:spree_roles) ? user.spree_roles.collect { |role| role.name }.join(", ") : []
       end
     end
   end

data/app/helpers/spree/base_helper.rb

@@ -22,22 +22,13 @@ module Spree
         text = "#{text}: (#{t('empty')})"
         css_class = 'empty'
       else
-        text = "#{text}: (#{current_order.item_count})  <span class='amount'>#{order_subtotal(current_order)}</span>".html_safe
+        text = "#{text}: (#{current_order.item_count})  <span class='amount'>#{current_order.display_total}</span>".html_safe
         css_class = 'full'
       end
 
       link_to text, cart_path, :class => css_class
     end
 
-    def order_subtotal(order, options={})
-      options.assert_valid_keys(:format_as_currency, :show_vat_text)
-      options.reverse_merge! :format_as_currency => true, :show_vat_text => true
-
-      amount =  order.total
-
-      options.delete(:format_as_currency) ? number_to_currency(amount) : amount
-    end
-
     def todays_short_date
       utc_to_local(Time.now.utc).to_ordinalized_s(:stub)
     end
@@ -96,12 +87,12 @@ module Spree
     end
 
     def flash_messages(opts = {})
-      flash.reject do |msg_type, text|
-        opts[:ignore_types] && opts[:ignore_types].include?(msg_type)
-      end
+      opts[:ignore_types] = [:commerce_tracking].concat(opts[:ignore_types] || [])
 
       flash.each do |msg_type, text|
-        concat(content_tag :div, text, :class => "flash #{msg_type}") unless msg_type == :commerce_tracking
+        unless opts[:ignore_types].include?(msg_type)
+          concat(content_tag :div, text, :class => "flash #{msg_type}")
+        end
       end
       nil
     end
@@ -149,16 +140,6 @@ module Spree
       end.sort { |a, b| a.name <=> b.name }
     end
 
-    def format_price(price, options={})
-      options.assert_valid_keys(:show_vat_text)
-      formatted_price = number_to_currency price
-      if options[:show_vat_text]
-        I18n.t(:price_with_vat_included, :price => formatted_price)
-      else
-        formatted_price
-      end
-    end
-
     # generates nested url to product based on supplied taxon
     def seo_url(taxon, product = nil)
       return spree.nested_taxons_path(taxon.permalink) if product.nil?
@@ -183,6 +164,10 @@ module Spree
        Gem.available?(name)
     end
 
+    def money(amount)
+      Spree::Money.new(amount)
+    end
+
     def method_missing(method_name, *args, &block)
       if image_style = image_style_from_method_name(method_name)
         define_image_method(image_style)

data/app/helpers/spree/products_helper.rb

@@ -6,9 +6,9 @@ module Spree
       diff = variant.price - variant.product.price
       return nil if diff == 0
       if diff > 0
-        "(#{t(:add)}: #{number_to_currency diff.abs})"
+        "(#{t(:add)}: #{Spree::Money.new(diff.abs)})"
       else
-        "(#{t(:subtract)}: #{number_to_currency diff.abs})"
+        "(#{t(:subtract)}: #{Spree::Money.new(diff.abs)})"
       end
     end
 
@@ -17,10 +17,6 @@ module Spree
       raw(product.description.gsub(/(.*?)\r?\n\r?\n/m, '<p>\1</p>'))
     end
 
-    def variant_images_hash(product)
-      product.variant_images.inject({}) { |h, img| (h[img.viewable_id] ||= []) << img; h }
-    end
-
     def line_item_description(variant)
       description = variant.product.description
       if description.present?

data/app/models/spree/ability.rb

@@ -36,13 +36,13 @@ module Spree
         can :manage, :all
       else
         #############################
-        can :read, LegacyUser do |resource|
+        can :read, Spree.user_class do |resource|
           resource == user
         end
-        can :update, LegacyUser do |resource|
+        can :update, Spree.user_class do |resource|
           resource == user
         end
-        can :create, LegacyUser
+        can :create, Spree.user_class
         #############################
         can :read, Order do |order, token|
           order.user == user || order.token && token == order.token

data/app/models/spree/address.rb

@@ -36,7 +36,7 @@ module Spree
     end
 
     def state_text
-      state.nil? ? state_name : (state.abbr.blank? ? state.name : state.abbr)
+      state.try(:abbr) || state.try(:name) || state_name 
     end
 
     def same_as?(other)

data/app/models/spree/adjustment.rb

@@ -65,6 +65,10 @@ module Spree
       set_eligibility
     end
 
+    def display_amount
+      Spree::Money.new(amount).to_s
+    end
+
     private
 
       def update_adjustable

data/app/models/spree/app_configuration.rb

@@ -41,6 +41,8 @@ module Spree
     preference :checkout_zone, :string, :default => nil # replace with the name of a zone if you would like to limit the countries
     preference :company, :boolean, :default => false # Request company field for billing and shipping addr
     preference :create_inventory_units, :boolean, :default => true # should only be false when track_inventory_levels is false, also disables RMA's
+    preference :currency, :string, :default => "USD"
+    preference :display_currency, :boolean, :default => false
     preference :default_country_id, :integer, :default => 214
     preference :default_locale, :string, :default => Rails.application.config.i18n.default_locale || :en
     preference :default_meta_description, :string, :default => 'Spree demo site'
@@ -48,7 +50,7 @@ module Spree
     preference :default_seo_title, :string, :default => ''
     preference :dismissed_spree_alerts, :string, :default => ''
     preference :last_check_for_spree_alerts, :string, :default => nil
-    preference :layout, :string, :default => '/spree/layouts/spree_application'
+    preference :layout, :string, :default => 'spree/layouts/spree_application'
     preference :logo, :string, :default => 'admin/bg/spree_50.png'
     preference :max_level_in_taxons_menu, :integer, :default => 1 # maximum nesting level in taxons menu
     preference :orders_per_page, :integer, :default => 15

data/app/models/spree/credit_card.rb

@@ -30,7 +30,7 @@ module Spree
 
     # sets self.cc_type while we still have the card number
     def set_card_type
-      self.cc_type ||= CardDetector.type?(number)
+      self.cc_type ||= CardDetector.brand?(number)
     end
 
     def name?

data/app/models/spree/inventory_unit.rb

@@ -107,7 +107,7 @@ module Spree
       end
 
       def restock_variant
-        variant.on_hand = (variant.on_hand + 1)
+        variant.on_hand += 1
         variant.save
       end
   end