spree_core 1.2.5 → 1.3.0.rc1

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

@@ -8,7 +8,7 @@ module Spree
 
       def fire
         @return_authorization.send("#{params[:e]}!")
-        flash.notice = t(:return_authorization_updated)
+        flash[:success] = t(:return_authorization_updated)
         respond_with(@return_authorization) { |format| format.html { redirect_to :back } }
       end
 

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

@@ -19,7 +19,7 @@ module Spree
         build_shipment
         assign_inventory_units
         if shipment.save
-          flash[:notice] = flash_message_for(shipment, :successfully_created)
+          flash[:success] = flash_message_for(shipment, :successfully_created)
           respond_with(shipment) do |format|
             format.html { redirect_to edit_admin_order_shipment_path(order, shipment) }
           end
@@ -41,7 +41,7 @@ module Spree
           order.shipping_method = order.shipment.shipping_method
           order.save
 
-          flash[:notice] = flash_message_for(shipment, :successfully_updated)
+          flash[:success] = flash_message_for(shipment, :successfully_updated)
           return_path = order.completed? ? edit_admin_order_shipment_path(order, shipment) : admin_order_adjustments_path(order)
           respond_with(@object) do |format|
             format.html { redirect_to return_path }
@@ -58,7 +58,7 @@ module Spree
 
       def fire
         if shipment.send("#{params[:e]}")
-          flash.notice = t(:shipment_updated)
+          flash[:success] = t(:shipment_updated)
         else
           flash[:error] = t(:cannot_perform_operation)
         end

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

@@ -7,7 +7,7 @@ module Spree
       def destroy
         @object.touch :deleted_at
 
-        flash.notice = flash_message_for(@object, :successfully_removed)
+        flash[:success] = flash_message_for(@object, :successfully_removed)
 
         respond_with(@object) do |format|
           format.html { redirect_to collection_url }

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

@@ -3,7 +3,7 @@ module Spree
     class TaxCategoriesController < ResourceController
       def destroy
         if @object.mark_deleted!
-          flash.notice = flash_message_for(@object, :successfully_removed)
+          flash[:success] = flash_message_for(@object, :successfully_removed)
           respond_with(@object) do |format|
             format.html { redirect_to collection_url }
             format.js   { render :partial => "spree/admin/shared/destroy" }

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

@@ -32,7 +32,7 @@ module Spree
         @taxon = @taxonomy.taxons.find(params[:id])
         @permalink_part = @taxon.permalink.split("/").last
 
-        respond_with(:admin, @taxon) 
+        respond_with(:admin, @taxon)
       end
 
       def update
@@ -67,7 +67,7 @@ module Spree
           end
           # Reset legacy position, if any extensions still rely on it
           new_parent.children.reload.each{|t| t.update_column(:position, t.position)}
-      
+
           if parent_id
             @taxon.reload
             @taxon.set_permalink
@@ -85,7 +85,7 @@ module Spree
         @update_children = true if params[:taxon][:name] != @taxon.name || params[:taxon][:permalink] != @taxon.permalink
 
         if @taxon.update_attributes(params[:taxon])
-          flash.notice = flash_message_for(@taxon, :successfully_updated)
+          flash[:success] = flash_message_for(@taxon, :successfully_updated)
         end
 
         #rename child taxons
@@ -96,7 +96,7 @@ module Spree
             taxon.save!
           end
         end
-    
+
         respond_with(@taxon) do |format|
           format.html {redirect_to edit_admin_taxonomy_url(@taxonomy) }
           format.json {render :json => @taxon.to_json }

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

@@ -6,22 +6,23 @@ module Spree
       new_action.before :new_before
 
       def index
-        respond_with(collection) do |format|
-          format.html
-          format.json { render :json => json_data }
-        end
+        respond_with(collection)
+      end
+
+      def search
+        search_params = { :product_name_cont => params[:q], :sku_cont => params[:q] }
+        @variants = Spree::Variant.ransack(search_params.merge(:m => 'or')).result
       end
 
       # override the destory method to set deleted_at value
       # instead of actually deleting the product.
       def destroy
         @variant = Variant.find(params[:id])
-
         @variant.deleted_at = Time.now()
         if @variant.save
-          flash.notice = I18n.t('notice_messages.variant_deleted')
+          flash[:success] = I18n.t('notice_messages.variant_deleted')
         else
-          flash.notice = I18n.t('notice_messages.variant_not_deleted')
+          flash[:success] = I18n.t('notice_messages.variant_not_deleted')
         end
 
         respond_with(@variant) do |format|
@@ -42,10 +43,12 @@ module Spree
         def new_before
           @object.attributes = @object.product.master.attributes.except('id', 'created_at', 'deleted_at',
                                                                         'sku', 'is_master', 'count_on_hand')
+          # Shallow Clone of the default price to populate the price field.
+          @object.default_price = @object.product.master.default_price.clone
         end
 
         def collection
-          @deleted = (params.key?(:deleted)  && params[:deleted] == "on") ? "checked" : ""
+          @deleted = (params.key?(:deleted) && params[:deleted] == "on") ? "checked" : ""
 
           if @deleted.blank?
             @collection ||= super
@@ -54,13 +57,6 @@ module Spree
           end
           @collection
         end
-
-        def json_data
-          ( parent.variants.presence || [parent.master] ).map do |v|
-            { :label => v.options_text.presence || v.name, :id => v.id }
-          end
-        end
-
     end
   end
 end

data/app/controllers/spree/base_controller.rb

@@ -1,5 +1,8 @@
 require 'cancan'
 
 class Spree::BaseController < ApplicationController
-  include Spree::Core::ControllerHelpers
+  include Spree::Core::ControllerHelpers::Auth
+  include Spree::Core::ControllerHelpers::RespondWith
+  include Spree::Core::ControllerHelpers::Common
+
 end

data/app/controllers/spree/checkout_controller.rb

@@ -2,12 +2,12 @@ module Spree
   # Handles checkout logic.  This is somewhat contrary to standard REST convention since there is not actually a
   # Checkout object.  There's enough distinct logic specific to checkout which has nothing to do with updating an
   # order that this approach is waranted.
-  #
+
   # Much of this file, especially the update action is overriden in the promo gem.
   # This is to allow for the promo behavior but also allow the promo gem to be 
   # removed if the functionality is not needed. 
 
-  class CheckoutController < Spree::BaseController
+  class CheckoutController < Spree::StoreController
     ssl_required
 
     before_filter :load_order
@@ -76,7 +76,7 @@ module Spree
 
       def object_params
         # For payment step, filter order parameters to produce the expected nested attributes for a single payment and its source, discarding attributes for payment methods other than the one selected
-        if @order.has_checkout_step?("payment") && @order.payment?
+        if @order.payment?
           if params[:payment_source].present? && source_params = params.delete(:payment_source)[params[:order][:payments_attributes].first[:payment_method_id].underscore]
             params[:order][:payments_attributes].first[:source_attributes] = source_params
           end

data/app/controllers/spree/content_controller.rb

@@ -1,5 +1,5 @@
 module Spree
-  class ContentController < BaseController
+  class ContentController < Spree::StoreController
     # Don't serve local files or static assets
     before_filter { render_404 if params[:path] =~ /(\.|\\)/ }
 

data/app/controllers/spree/countries_controller.rb

@@ -0,0 +1,12 @@
+module Spree
+  class CountriesController < BaseController
+    ssl_allowed :index
+
+    respond_to :js
+
+    def index
+      respond_with @states_required = Spree::Country.states_required_by_country_id.to_json, :layout => nil
+    end
+  end
+end
+

data/app/controllers/spree/home_controller.rb

@@ -1,11 +1,12 @@
 module Spree
-  class HomeController < BaseController
+  class HomeController < Spree::StoreController
     helper 'spree/products'
     respond_to :html
 
     def index
       @searcher = Spree::Config.searcher_class.new(params)
       @searcher.current_user = try_spree_current_user
+      @searcher.current_currency = current_currency
       @products = @searcher.retrieve_products
       respond_with(@products)
     end

data/app/controllers/spree/locale_controller.rb

@@ -1,11 +1,11 @@
 module Spree
-  class LocaleController < BaseController
+  class LocaleController < Spree::StoreController
     def set
       if request.referer && request.referer.starts_with?('http://' + request.host)
         session['user_return_to'] = request.referer
       end
-      if params[:locale] && I18n.available_locales.map(&:to_s).include?(params[:locale])
-        session[:locale] = I18n.locale = params[:locale]
+      if params[:locale] && I18n.available_locales.include?(params[:locale].to_sym)
+        session[:locale] = I18n.locale = params[:locale].to_sym
         flash.notice = t(:locale_changed)
       else
         flash[:error] = t(:locale_not_changed)

data/app/controllers/spree/orders_controller.rb

@@ -1,5 +1,5 @@
 module Spree
-  class OrdersController < BaseController
+  class OrdersController < Spree::StoreController
     ssl_required :show
 
     rescue_from ActiveRecord::RecordNotFound, :with => :render_404
@@ -15,7 +15,7 @@ module Spree
     def update
       @order = current_order
       if @order.update_attributes(params[:order])
-        @order.line_items = @order.line_items.select { |li| li.quantity > 0 }
+        @order.line_items = @order.line_items.select {|li| li.quantity > 0 }
         fire_event('spree.order.contents_changed')
         respond_with(@order) do |format|
           format.html do
@@ -54,12 +54,12 @@ module Spree
       params[:products].each do |product_id,variant_id|
         quantity = params[:quantity].to_i if !params[:quantity].is_a?(Hash)
         quantity = params[:quantity][variant_id].to_i if params[:quantity].is_a?(Hash)
-        @order.add_variant(Variant.find(variant_id), quantity) if quantity > 0
+        @order.add_variant(Variant.find(variant_id), quantity, current_currency) if quantity > 0
       end if params[:products]
 
       params[:variants].each do |variant_id, quantity|
         quantity = quantity.to_i
-        @order.add_variant(Variant.find(variant_id), quantity) if quantity > 0
+        @order.add_variant(Variant.find(variant_id), quantity, current_currency) if quantity > 0
       end if params[:variants]
 
       fire_event('spree.cart.add')
@@ -75,10 +75,8 @@ module Spree
       redirect_to spree.cart_path
     end
 
-    private
-
-      def accurate_title
-        @order && @order.completed? ? "#{I18n.t(:order)} #{@order.number}" : t(:shopping_cart)
-      end
+    def accurate_title
+      @order && @order.completed? ? "#{Order.model_name.human} #{@order.number}" : t(:shopping_cart)
+    end
   end
 end

data/app/controllers/spree/products_controller.rb

@@ -1,5 +1,5 @@
 module Spree
-  class ProductsController < BaseController
+  class ProductsController < Spree::StoreController
     before_filter :load_product, :only => :show
     rescue_from ActiveRecord::RecordNotFound, :with => :render_404
     helper 'spree/taxons'
@@ -9,6 +9,7 @@ module Spree
     def index
       @searcher = Config.searcher_class.new(params)
       @searcher.current_user = try_spree_current_user
+      @searcher.current_currency = current_currency
       @products = @searcher.retrieve_products
       respond_with(@products)
     end
@@ -16,8 +17,8 @@ module Spree
     def show
       return unless @product
 
-      @variants = Variant.active.includes([:option_values, :images]).where(:product_id => @product.id)
-      @product_properties = ProductProperty.includes(:property).where(:product_id => @product.id)
+      @variants = @product.variants_including_master.active(current_currency).includes([:option_values, :images])
+      @product_properties = @product.product_properties.includes(:property)
 
       referer = request.env['HTTP_REFERER']
       if referer
@@ -45,7 +46,7 @@ module Spree
         if try_spree_current_user.try(:has_spree_role?, "admin")
           @product = Product.find_by_permalink!(params[:id])
         else
-          @product = Product.active.find_by_permalink!(params[:id])
+          @product = Product.active(current_currency).find_by_permalink!(params[:id])
         end
       end
   end

data/app/controllers/spree/states_controller.rb

@@ -1,5 +1,5 @@
 module Spree
-  class StatesController < BaseController
+  class StatesController < Spree::StoreController
     ssl_allowed :index
 
     respond_to :js

data/app/controllers/spree/store_controller.rb

@@ -0,0 +1,11 @@
+module Spree
+  class StoreController < Spree::BaseController
+    include Spree::Core::ControllerHelpers::Order
+
+    def unauthorized
+      render 'spree/shared/unauthorized', :layout => Spree::Config[:layout], :status => 401
+    end
+
+  end
+end
+

data/app/controllers/spree/taxons_controller.rb

@@ -1,5 +1,5 @@
 module Spree
-  class TaxonsController < BaseController
+  class TaxonsController < Spree::StoreController
     rescue_from ActiveRecord::RecordNotFound, :with => :render_404
     helper 'spree/products'
 
@@ -11,6 +11,7 @@ module Spree
 
       @searcher = Spree::Config.searcher_class.new(params.merge(:taxon => @taxon.id))
       @searcher.current_user = try_spree_current_user
+      @searcher.current_currency = current_currency
       @products = @searcher.retrieve_products
 
       respond_with(@taxon)

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

@@ -3,10 +3,11 @@ module Spree
     module BaseHelper
       def field_container(model, method, options = {}, &block)
         css_classes = options[:class].to_a
+        css_classes << 'field'
         if error_message_on(model, method).present?
           css_classes << 'withError'
         end
-        content_tag('p', capture(&block), :class => css_classes.join(' '), :id => "#{model}_#{method}_field")
+        content_tag(:div, capture(&block), :class => css_classes.join(' '), :id => "#{model}_#{method}_field")
       end
 
       def error_message_on(object, method, options = {})
@@ -21,11 +22,6 @@ module Spree
         end
       end
 
-      def class_for_error(model, method)
-        if error_message_on :product, :name
-        end
-      end
-
       # This method demonstrates the use of the :child_index option to render a
       # form partial for, for instance, client side addition of new nested
       # records.
@@ -106,16 +102,17 @@ module Spree
           {}
         when :string
           { :size => 10,
-            :class => 'input_string' }
+            :class => 'input_string fullwidth' }
         when :password
           { :size => 10,
-            :class => 'password_string' }
+            :class => 'password_string fullwidth' }
         when :text
           { :rows => 15,
-            :cols => 85 }
+            :cols => 85,
+            :class => 'fullwidth' }
         else
           { :size => 10,
-            :class => 'input_string' }
+            :class => 'input_string fullwidth' }
         end
 
         field_options.merge!({
@@ -142,14 +139,18 @@ module Spree
         %(<input type="text" name="#{name}" value="#{value}" class="tokeninput products" data-names='#{product_names.to_json}' data-pre='#{product_rules.to_json}'/>).html_safe
       end
 
-      def link_to_add_fields(name, target)
-        link_to icon('add') + name, 'javascript:', :data => { :target => target }, :class => "add_fields"
+      def link_to_add_fields(name, target, options = {})
+        name = '' if options[:no_text]
+        css_classes = options[:class] ? options[:class] + " add_fields" : "add_fields"
+        link_to_with_icon('icon-plus', name, 'javascript:', :data => { :target => target }, :class => css_classes)
       end
 
       # renders hidden field and link to remove record using nested_attributes
-      def link_to_remove_fields(name, f)
-        url = f.object.persisted? ? [:admin, f.object] : '#'
-        f.hidden_field(:_destroy) + link_to_with_icon(:delete, name, url, :class => 'remove_fields')
+      def link_to_remove_fields(name, f, options = {})
+        name = '' if options[:no_text]
+        options[:class] = '' unless options[:class]
+        options[:class] += 'no-text with-tip' if options[:no_text]
+        link_to_with_icon('icon-trash', name, '#', :class => "remove_fields #{options[:class]}", :data => {:action => 'remove'}, :title => t(:remove)) + f.hidden_field(:_destroy)
       end
 
       def spree_dom_id(record)

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

@@ -17,10 +17,15 @@ module Spree
 
         titleized_label = t(options[:label], :default => options[:label]).titleize
 
-        link = link_to(titleized_label, destination_url)
-
         css_classes = []
 
+        if options[:icon]
+          link = link_to_with_icon(options[:icon], titleized_label, destination_url)
+          css_classes << 'tab-with-icon'
+        else
+          link = link_to(titleized_label, destination_url)
+        end
+
         selected = if options[:match_path]
           request.fullpath.starts_with?("#{root_path}admin#{options[:match_path]}")
         else
@@ -35,44 +40,48 @@ module Spree
       end
 
       def link_to_clone(resource, options={})
-        link_to_with_icon('exclamation', t(:clone), clone_admin_product_url(resource), options)
+        options[:data] = {:action => 'clone'}
+        link_to_with_icon('icon-copy', t(:clone), clone_admin_product_url(resource), options)
       end
 
       def link_to_new(resource)
-        link_to_with_icon('add', t(:new), edit_object_url(resource))
+        options[:data] = {:action => 'new'}
+        link_to_with_icon('icon-plus', t(:new), edit_object_url(resource))
       end
 
       def link_to_edit(resource, options={})
-        link_to_with_icon('edit', t(:edit), edit_object_url(resource), options)
+        options[:data] = {:action => 'edit'}
+        link_to_with_icon('icon-edit', t(:edit), edit_object_url(resource), options)
       end
 
       def link_to_edit_url(url, options={})
-        link_to_with_icon('edit', t(:edit), url, options)
-      end
-
-      def link_to_clone(resource, options={})
-        link_to_with_icon('exclamation', t(:clone), clone_admin_product_url(resource), options)
+        options[:data] = {:action => 'edit'}
+        link_to_with_icon('icon-edit', t(:edit), url, options)
       end
 
       def link_to_delete(resource, options={})
         url = options[:url] || object_url(resource)
-        name = options[:name] || icon('delete') + ' ' + t(:delete)
-        link_to name, url,
-          :class => "delete-resource",
-          :data => { :confirm => t(:are_you_sure) }
+        name = options[:name] || t(:delete)
+        options[:class] = "delete-resource"
+        options[:data] = { :confirm => t(:are_you_sure), :action => 'remove' }
+        link_to_with_icon 'icon-trash', name, url, options
       end
 
       def link_to_with_icon(icon_name, text, url, options = {})
-        options[:class] = (options[:class].to_s + ' icon_link').strip
-        link_to(icon(icon_name) + ' ' + text, url, options)
+        options[:class] = (options[:class].to_s + " icon_link with-tip #{icon_name}").strip
+        options[:class] += ' no-text' if options[:no_text]
+        options[:title] = text if options[:no_text]
+        text = options[:no_text] ? '' : raw("<span class='text'>#{text}</span>")
+        options.delete(:no_text)
+        link_to(text, url, options)
       end
 
       def icon(icon_name)
-        icon_name ? image_tag("admin/icons/#{icon_name}.png") : ''
+        icon_name ? content_tag(:i, '', :class => icon_name) : ''
       end
 
       def button(text, icon_name = nil, button_type = 'submit', options={})
-        button_tag(content_tag('span', icon(icon_name) + ' ' + text), options.merge(:type => button_type))
+        button_tag(text, options.merge(:type => button_type, :class => "#{icon_name} button"))
       end
 
       def button_link_to(text, url, html_options = {})
@@ -87,22 +96,22 @@ module Spree
             object_name, action = url.split('/')[-2..-1]
             html_options['data-update'] = [action, object_name.singularize].join('_')
           end
+          
           html_options.delete('data-update') unless html_options['data-update']
-          link_to(text_for_button_link(text, html_options), url, html_options_for_button_link(html_options))
+          
+          html_options[:class] = 'button'
+
+          if html_options[:icon]
+            html_options[:class] += " #{html_options[:icon]}"
+          end
+          link_to(text_for_button_link(text, html_options), url, html_options)
         end
       end
 
       def text_for_button_link(text, html_options)
         s = ''
-        if html_options[:icon]
-          s << icon(html_options.delete(:icon)) + ' '
-        end
         s << text
-        content_tag('span', raw(s))
-      end
-
-      def html_options_for_button_link(html_options)
-        options = { :class => 'button' }.update(html_options)
+        raw(s)
       end
 
       def configurations_menu_item(link_text, url, description = '')
@@ -114,7 +123,8 @@ module Spree
       end
 
       def configurations_sidebar_menu_item(link_text, url, options = {})
-        options.merge!(:class => url.include?(controller.controller_name) ? 'active' : nil)
+        is_active = url.ends_with?(controller.controller_name) || url.ends_with?( "#{controller.controller_name}/edit")
+        options.merge!(:class => is_active ? 'active' : nil)
         content_tag(:li, options) do
           link_to(link_text, url)
         end