spree_core 0.60.0.RC1 → 0.60.0

data/app/controllers/admin/return_authorizations_controller.rb

@@ -7,7 +7,7 @@ class Admin::ReturnAuthorizationsController < Admin::ResourceController
   def fire
     @return_authorization.send("#{params[:e]}!")
     flash.notice = t('return_authorization_updated')
-    redirect_to :back
+    respond_with(@return_authorization) { |format| format.html { redirect_to :back } }
   end
 
   protected

data/app/controllers/admin/shipments_controller.rb

@@ -23,11 +23,11 @@ class Admin::ShipmentsController < Admin::BaseController
     assign_inventory_units
     if @shipment.save
       flash[:notice] = I18n.t(:successfully_created, :resource => 'shipment')
-      respond_with(@object) do |format|
+      respond_with(@shipment) do |format|
         format.html { redirect_to edit_admin_order_shipment_path(@order, @shipment) }
       end
     else
-      render :action => 'new'
+      respond_with(@shipment) { |format| format.html { render :action => 'new' } }
     end
   end
 
@@ -43,22 +43,20 @@ class Admin::ShipmentsController < Admin::BaseController
       @order.special_instructions = object_params[:special_instructions] if Spree::Config[:shipping_instructions]
       @order.shipping_method = @order.shipment.shipping_method
       @order.save
-      
+
       flash[:notice] = I18n.t(:successfully_updated, :resource => I18n.t('shipment'))
       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 }
       end
     else
-      render :action => 'edit'
+      respond_with(@shipment) { |format| format.html { render :action => 'edit' } }
     end
   end
 
   def destroy
     @shipment.destroy
-    respond_to do |format|
-      format.js { render_js_for_destroy }
-    end
+    respond_with(@shipment) { |format| format.js { render_js_for_destroy } }
   end
 
   def fire
@@ -67,7 +65,8 @@ class Admin::ShipmentsController < Admin::BaseController
     else
       flash[:error] = t('cannot_perform_operation')
     end
-    redirect_to :back
+
+    respond_with(@shipment) { |format| format.html { redirect_to :back } }
   end
 
   private

data/app/controllers/admin/states_controller.rb

@@ -3,17 +3,17 @@ class Admin::StatesController < Admin::ResourceController
   before_filter :load_data
 
   def index
-    respond_to do |format|
+    respond_with(@collection) do |format|
       format.html
       format.js  { render :partial => 'state_list.html.erb' }
     end
   end
 
   protected
-  
+
   def location_after_save
     admin_country_states_url(@country)
-  end  
+  end
 
   def collection
     super.order(:name)

data/app/controllers/admin/taxonomies_controller.rb

@@ -1,11 +1,14 @@
 class Admin::TaxonomiesController < Admin::ResourceController
+  respond_to :json, :only => [:get_children]
 
   def get_children
     @taxons = Taxon.find(params[:parent_id]).children
+
+    respond_with(@taxons)
   end
-  
+
   private
-  
+
   def location_after_save
     if @taxonomy.created_at == @taxonomy.updated_at
       edit_admin_taxonomy_url(@taxonomy)

data/app/controllers/admin/taxons_controller.rb

@@ -1,14 +1,29 @@
 class Admin::TaxonsController < Admin::BaseController
   include Railslove::Plugins::FindByParam::SingletonMethods
 
+  respond_to :html, :json, :js
+
   def create
     @taxonomy = Taxonomy.find(params[:taxonomy_id])
     @taxon = @taxonomy.taxons.build(params[:taxon])
     if @taxon.save
-      render :text => @taxon
+      respond_with(@taxon) do |format|
+        format.json {render :json => @taxon.to_json }
+      end
     else
       flash[:error] = I18n.t('errors.messages.could_not_create_taxon')
-      redirect_to @taxonomy ? edit_admin_taxonomy_url(@taxonomy) : admin_taxonomies_url
+      respond_with(@taxon) do |format|
+        format.html { redirect_to @taxonomy ? edit_admin_taxonomy_url(@taxonomy) : admin_taxonomies_url }
+      end
+    end
+  end
+
+  def update
+    update_before
+    update_after
+    respond_with(@taxon) do |format|
+      format.html { redirect_to edit_admin_taxonomy_url(@taxonomy) }
+      format.json { render :json => @taxon.to_json }
     end
   end
 
@@ -16,6 +31,8 @@ class Admin::TaxonsController < Admin::BaseController
     @taxonomy = Taxonomy.find(params[:taxonomy_id])
     @taxon = @taxonomy.taxons.find(params[:id])
     @permalink_part = @taxon.permalink.split("/").last
+
+    respond_with(:admin, @taxon) 
   end
 
   def update
@@ -80,7 +97,7 @@ class Admin::TaxonsController < Admin::BaseController
       end
     end
     
-    respond_to do |format|
+    respond_with(@taxon) do |format|
       format.html {redirect_to edit_admin_taxonomy_url(@taxonomy) }
       format.json {render :json => @taxon.to_json }
     end
@@ -89,28 +106,22 @@ class Admin::TaxonsController < Admin::BaseController
   def destroy
     @taxon = Taxon.find(params[:id])
     @taxon.destroy
-    respond_to do |format|
-      format.html { render :text => '' }
-      format.js { render_js_for_destroy }
-    end
+    respond_with(@taxon) { |format| format.json { render :json => '' } }
   end
 
   def selected
     @product = load_product
     @taxons = @product.taxons
+
+    respond_with(:admin, @taxons)
   end
 
   def available
     @product = load_product
-    if params[:q].blank?
-      @available_taxons = []
-    else
-      @available_taxons = Taxon.where('lower(name) LIKE ?', "%#{params[:q].mb_chars.downcase}%")
-    end
-    @available_taxons.delete_if { |taxon| @product.taxons.include?(taxon) }
-    respond_to do |format|
-      format.js {render :layout => false}
-    end
+    @taxons = params[:q].blank? ? [] : Taxon.where('lower(name) LIKE ?', "%#{params[:q].mb_chars.downcase}%")
+    @taxons.delete_if { |taxon| @product.taxons.include?(taxon) }
+
+    respond_with(:admin, @taxons)
   end
 
   def remove
@@ -119,7 +130,8 @@ class Admin::TaxonsController < Admin::BaseController
     @product.taxons.delete(@taxon)
     @product.save
     @taxons = @product.taxons
-    render_js_for_destroy
+
+    respond_with(@taxon) { |format| format.js { render_js_for_destroy } }
   end
 
   def select
@@ -128,7 +140,16 @@ class Admin::TaxonsController < Admin::BaseController
     @product.taxons << @taxon
     @product.save
     @taxons = @product.taxons
-    render :layout => false
+
+    respond_with(:admin, @taxons)
+  end
+
+  def batch_select
+    @product = load_product
+    @taxons = params[:taxon_ids].map{|id| Taxon.find(id)}.compact
+    @product.taxons = @taxons
+    @product.save
+    redirect_to selected_admin_product_taxons_url(@product)
   end
 
   private

data/app/controllers/admin/users_controller.rb

@@ -7,14 +7,14 @@ class Admin::UsersController < Admin::ResourceController
   update.before :save_user_roles
 
   def index
-    respond_to do |format|
+    respond_with(@collection) do |format|
       format.html
       format.json { render :json => json_data }
     end
   end
 
   protected
-  
+
   def collection
     return @collection if @collection.present?
     unless request.xhr?
@@ -30,8 +30,8 @@ class Admin::UsersController < Admin::ResourceController
                                {:search => "#{params[:q].strip}%"}).
                         limit(params[:limit] || 100)
     end
-  end  
-  
+  end
+
   def save_user_roles
     return unless params[:user]
     return unless @user.respond_to?(:roles) # since roles are technically added by the auth module
@@ -42,7 +42,7 @@ class Admin::UsersController < Admin::ResourceController
     }
     params[:user].delete(:role)
   end
-  
+
   private
 
   # Allow different formats of json data to suit different ajax calls

data/app/controllers/admin/variants_controller.rb

@@ -14,18 +14,18 @@ class Admin::VariantsController < Admin::ResourceController
       flash.notice = I18n.t("notice_messages.variant_not_deleted")
     end
 
-    respond_to do |format|
+    respond_with(@variant) do |format|
       format.html { redirect_to admin_product_variants_url(params[:product_id]) }
       format.js  { render_js_for_destroy }
     end
   end
-  
+
   def update_positions
     params[:positions].each do |id, index|
       Variant.update_all(['position=?', index], ['id=?', id])
     end
-    
-    respond_to do |format|
+
+    respond_with(@variant) do |format|
       format.html { redirect_to admin_product_variants_url(params[:product_id]) }
       format.js  { render :text => 'Ok' }
     end

data/app/controllers/admin/zones_controller.rb

@@ -1,10 +1,11 @@
 class Admin::ZonesController < Admin::ResourceController
   before_filter :load_data, :except => [:index]
-  
+
   def new
     @zone.zone_members.build
+    respond_with(@zone)
   end
-  
+
   protected
 
   def collection

data/app/controllers/checkout_controller.rb

@@ -7,6 +7,8 @@ class CheckoutController < Spree::BaseController
   before_filter :load_order
   rescue_from Spree::GatewayError, :with => :rescue_from_spree_gateway_error
 
+  respond_to :html
+
   # Updates the order and advances to the next state (when possible.)
   def update
     if @order.update_attributes(object_params)
@@ -14,19 +16,18 @@ class CheckoutController < Spree::BaseController
         state_callback(:after)
       else
         flash[:error] = I18n.t(:payment_processing_failed)
-        redirect_to checkout_state_path(@order.state) and return
+        respond_with(@order, :location => checkout_state_path(@order.state)) and return
       end
 
       if @order.state == "complete" || @order.completed?
         flash[:notice] = I18n.t(:order_processed_successfully)
         flash[:commerce_tracking] = "nothing special"
-        redirect_to completion_route
+        respond_with(@order, :location => completion_route)
       else
-        redirect_to checkout_state_path(@order.state)
+        respond_with(@order, :location => checkout_state_path(@order.state))
       end
-
     else
-      render :edit
+      respond_with(@order) { |format| format.html { render :edit } }
     end
   end
 

data/app/controllers/content_controller.rb

@@ -5,11 +5,17 @@ class ContentController < Spree::BaseController
   rescue_from ActionView::MissingTemplate, :with => :render_404
   caches_page :show, :index, :if => Proc.new { Spree::Config[:cache_static_content] }
 
+  respond_to :html
+
   def show
-    render :template => params[:path]
+    respond_with do |format|
+      format.html { render :template => params[:path] }
+    end
   end
 
   def cvv
-    render "cvv", :layout => false
+    respond_with do |format|
+      format.html {  render "cvv", :layout => false }
+    end
   end
 end

data/app/controllers/orders_controller.rb

@@ -1,7 +1,9 @@
 class OrdersController < Spree::BaseController
+  respond_to :html
 
   helper :products
 
+
   def show
     @order = Order.find_by_number(params[:id])
   end
@@ -10,9 +12,9 @@ class OrdersController < Spree::BaseController
     @order = current_order
     if @order.update_attributes(params[:order])
       @order.line_items = @order.line_items.select {|li| li.quantity > 0 }
-      redirect_to cart_path
+      respond_with(@order) { |format| format.html { redirect_to cart_path } }
     else
-      render :edit
+      respond_with(@order) 
     end
   end
 
@@ -45,17 +47,18 @@ class OrdersController < Spree::BaseController
       @order.add_variant(Variant.find(variant_id), quantity) if quantity > 0
     end if params[:variants]
 
-    redirect_to cart_path
+    respond_with(@order) { |format| format.html { redirect_to cart_path } }
   end
 
   def empty
     if @order = current_order
       @order.line_items.destroy_all
     end
-    redirect_to cart_path
+    
+    respond_with(@order) { |format| format.html { redirect_to cart_path } }
   end
 
   def accurate_title
-    I18n.t(:shopping_cart)
+    @order && @order.completed? ? "#{Order.human_name} #{@order.number}" : I18n.t(:shopping_cart)
   end
 end

data/app/controllers/products_controller.rb

@@ -3,19 +3,21 @@ class ProductsController < Spree::BaseController
   rescue_from ActiveRecord::RecordNotFound, :with => :render_404
   helper :taxons
 
+  respond_to :html
+
   def index
     @searcher = Spree::Config.searcher_class.new(params)
     @products = @searcher.retrieve_products
+
+    respond_with(@products)
   end
 
   def show
     @product = Product.find_by_permalink!(params[:id])
     return unless @product
-    
-    @variants = Variant.active.find_all_by_product_id(@product.id,
-                :include => [:option_values, :images])
-    @product_properties = ProductProperty.find_all_by_product_id(@product.id,
-                          :include => [:property])
+
+    @variants = Variant.active.includes([:option_values, :images]).where(:product_id => @product.id)
+    @product_properties = ProductProperty.includes(:property).where(:product_id => @product.id)
     @selected_variant = @variants.detect { |v| v.available? }
 
     referer = request.env['HTTP_REFERER']
@@ -23,6 +25,8 @@ class ProductsController < Spree::BaseController
     if referer && referer.match(HTTP_REFERER_REGEXP)
       @taxon = Taxon.find_by_permalink($1)
     end
+
+    respond_with(@product)
   end
 
   private

data/app/controllers/spree/base_controller.rb

@@ -1,3 +1,4 @@
 class Spree::BaseController < ActionController::Base
   include SpreeBase
+  include SpreeRespondWith
 end

data/app/controllers/taxons_controller.rb

@@ -2,12 +2,16 @@ class TaxonsController < Spree::BaseController
   rescue_from ActiveRecord::RecordNotFound, :with => :render_404
   helper :products
 
+  respond_to :html
+
   def show
     @taxon = Taxon.find_by_permalink!(params[:id])
     return unless @taxon
-    
+
     @searcher = Spree::Config.searcher_class.new(params.merge(:taxon => @taxon.id))
     @products = @searcher.retrieve_products
+
+    respond_with(@taxon)
   end
 
   private

data/app/helpers/admin/taxons_helper.rb

@@ -2,4 +2,17 @@ module Admin::TaxonsHelper
   def taxon_path(taxon)
     taxon.ancestors.reverse.collect { |ancestor| ancestor.name }.join( " >> ")
   end
-end
+  
+  def taxons_checkbox_tree(root, product)
+    return '' if root.children.blank?
+    content_tag 'ul' do
+      root.children.map do |taxon|
+        content_tag 'li' do
+          [check_box_tag("taxon_ids[]", taxon.id, product.taxons.include?(taxon), :id => "taxon_ids_#{taxon.id}"),
+           label_tag("taxon_ids_#{taxon.id}", taxon.name)].join(' ').html_safe +
+          taxons_checkbox_tree(taxon, product)
+        end.html_safe
+      end.join("\n").html_safe
+    end
+  end
+end