spree_core 0.60.0.RC1 → 0.60.0

data/app/controllers/admin/line_items_controller.rb

@@ -3,47 +3,46 @@ class Admin::LineItemsController < Admin::BaseController
   before_filter :load_order
   before_filter :load_line_item, :only => [:destroy, :update]
 
+  respond_to :html
+
   def create
     variant = Variant.find(params[:line_item][:variant_id])
-    @order.add_variant(variant, params[:line_item][:quantity].to_i)
+    @line_item = @order.add_variant(variant, params[:line_item][:quantity].to_i)
 
     if @order.save
-      respond_to do |format|
-        format.html do
-          render :partial => "admin/orders/form", :locals => {:order => @order.reload}, :layout => false
-        end
+      respond_with(@line_item) do |format| 
+        format.html { render :partial => "admin/orders/form", :locals => {:order => @order.reload}, :layout => false }
       end
     else
+      #TODO Handle failure gracefully, patches welcome.
     end
   end
 
   def destroy
     if @line_item.destroy
-      respond_to do |format|
+      respond_with(@line_item) do |format| 
         format.html { render :partial => "admin/orders/form", :locals => {:order => @order.reload}, :layout => false }
       end
     else
-      respond_to do |format|
-        format.html do
-          render :partial => "admin/orders/form", :locals => {:order => @order.reload}, :layout => false
-        end
+      respond_with(@line_item) do |format| 
+        format.html { render :partial => "admin/orders/form", :locals => {:order => @order.reload}, :layout => false }
       end
     end
   end
 
   def new
-    respond_to do |format|
+    respond_with do |format| 
       format.html { render :action => :new, :layout => false }
     end
   end
 
   def update
     if @line_item.update_attributes(params[:line_item])
-      respond_to do |format|
+      respond_with(@line_item) do |format| 
         format.html { render :partial => "admin/orders/form", :locals => {:order => @order.reload}, :layout => false}
       end
     else
-      respond_to do |format|
+      respond_with(@line_item) do |format| 
         format.html { render :partial => "admin/orders/form", :locals => {:order => @order.reload}, :layout => false}
       end
     end

data/app/controllers/admin/orders_controller.rb

@@ -4,6 +4,8 @@ class Admin::OrdersController < Admin::BaseController
   before_filter :initialize_order_events
   before_filter :load_order, :only => [:fire, :resend, :history, :user]
 
+  respond_to :html
+
   def index
     params[:search] ||= {}
     params[:search][:completed_at_is_not_null] ||= '1' if Spree::Config[:show_only_complete_orders_by_default]
@@ -29,18 +31,23 @@ class Admin::OrdersController < Admin::BaseController
                                    :include  => [:user, :shipments, :payments],
                                    :per_page => Spree::Config[:orders_per_page],
                                    :page     => params[:page])
+
+    respond_with(@orders)
   end
 
   def show
     load_order
+    respond_with(@order)
   end
 
   def new
     @order = Order.create
+    respond_with(@order)
   end
 
   def edit
     load_order
+    respond_with(@order)
   end
 
   def update
@@ -70,7 +77,7 @@ class Admin::OrdersController < Admin::BaseController
       @order.errors.add(:line_items, t('errors.messages.blank'))
     end
     
-    respond_to do |format|
+    respond_with(@order) do |format|
       format.html do
         if return_path
           redirect_to return_path
@@ -94,13 +101,14 @@ class Admin::OrdersController < Admin::BaseController
   rescue Spree::GatewayError => ge
     flash[:error] = "#{ge.message}"
   ensure
-    redirect_to :back
+    respond_with(@order) { |format| format.html { redirect_to :back } }
   end
 
   def resend
     OrderMailer.confirm_email(@order, true).deliver
     flash.notice = t('order_email_resent')
-    redirect_to :back
+
+    respond_with(@order) { |format| format.html { redirect_to :back } }
   end
 
   def user

data/app/controllers/admin/payment_methods_controller.rb

@@ -12,7 +12,7 @@ class Admin::PaymentMethodsController < Admin::ResourceController
       respond_with(@payment_method, :location => edit_admin_payment_method_path(@payment_method))
     else
       invoke_callbacks(:create, :fails)
-      render :new
+      respond_with(@payment_method)
     end
   end
 
@@ -24,13 +24,13 @@ class Admin::PaymentMethodsController < Admin::ResourceController
       @payment_method = PaymentMethod.find(params[:id])
     end
     payment_method_params = params[@payment_method.class.name.underscore.gsub("/", "_")] || {}
-    if @payment_method.update_attributes(params[:payment_method].merge(payment_method_params)) 
+    if @payment_method.update_attributes(params[:payment_method].merge(payment_method_params))
       invoke_callbacks(:update, :after)
       flash[:notice] = I18n.t(:successfully_updated, :resource => I18n.t(:payment_method))
       respond_with(@payment_method, :location => edit_admin_payment_method_path(@payment_method))
     else
       invoke_callbacks(:update, :fails)
-      render :edit
+      respond_with(@payment_method)
     end
   end
 

data/app/controllers/admin/payments_controller.rb

@@ -3,12 +3,17 @@ class Admin::PaymentsController < Admin::BaseController
   before_filter :load_payment, :except => [:create, :new, :index]
   before_filter :load_data
 
+  respond_to :html
+
   def index
     @payments = @order.payments
+
+    respond_with(@payments)
   end
 
   def new
     @payment = @order.payments.build
+    respond_with(@payment)
   end
 
   def create
@@ -19,26 +24,28 @@ class Admin::PaymentsController < Admin::BaseController
 
     begin
       unless @payment.save
-        response_for :create_fails
+        respond_with(@payment) { |format| format.html { redirect_to admin_order_payments_path(@order) } }
         return
       end
 
       if @order.completed?
         @payment.process!
         flash[:notice] = I18n.t(:successfully_created, :resource => 'payment')
-        redirect_to admin_order_payments_path(@order)
+
+        respond_with(@payment) { |format| format.html { redirect_to admin_order_payments_path(@order) } }
       else
         #This is the first payment (admin created order)
         until @order.completed?
           @order.next!
         end
         flash.notice = t('new_order_completed')
-        redirect_to admin_order_url(@order)
+        respond_with(@payment) { |format| format.html { redirect_to admin_order_url(@order) } }
       end
 
     rescue Spree::GatewayError => e
       flash[:error] = "#{e.message}"
-      redirect_to new_admin_payment_path(@order)
+      
+      respond_with(@payment) { |format| format.html { redirect_to new_admin_payment_path(@order) } }
     end
   end
 
@@ -53,7 +60,7 @@ class Admin::PaymentsController < Admin::BaseController
   rescue Spree::GatewayError => ge
     flash[:error] = "#{ge.message}"
   ensure
-    redirect_to admin_order_payments_path(@order)
+    respond_with(@payment) { |format| format.html { redirect_to admin_order_payments_path(@order) } }
   end
 
   private

data/app/controllers/admin/product_groups_controller.rb

@@ -4,7 +4,7 @@ class Admin::ProductGroupsController < Admin::ResourceController
   def preview
     @product_group = ProductGroup.new(params[:product_group])
     @product_group.name = "for_preview"
-    render :partial => 'preview', :layout => false
+    respond_with(@product_group) { |format| format.html { render :partial => 'preview', :layout => false } }
   end
 
   protected

data/app/controllers/admin/product_scopes_controller.rb

@@ -1,31 +1,35 @@
 class Admin::ProductScopesController < Admin::BaseController
   helper 'admin/product_groups'
-  
+
+  respond_to :html, :js
+
   def create
     @product_group = ProductGroup.find_by_permalink(params[:product_group_id])
     @product_scope = @product_group.product_scopes.build(params[:product_scope])
     if @product_scope.save
-      respond_to do |format|
+      respond_with(@product_scope) do |format|
         format.html { redirect_to edit_admin_product_group_path(@product_group) }
         format.js   { render :layout => false }
       end
     else
-      render :new
+      respond_with(@product_scope)
     end
   end
-  
+
   def destroy
     @product_scope = ProductScope.find(params[:id])
     if @product_scope.destroy
       @product_group = @product_scope.product_group
       @product_group.update_memberships
-      respond_to do |format|
+      respond_with(@product_scope) do |format|
         format.html { redirect_to edit_admin_product_group_path(@product_group) }
         format.js   { render :layout => false }
       end
     else
-      redirect_to edit_admin_product_group_path(@product_scope.product_group)
+      respond_with(@product_scope) do |format|
+        format.html { redirect_to edit_admin_product_group_path(@product_scope.product_group) }
+      end
     end
-  end  
-  
+  end
+
 end

data/app/controllers/admin/products_controller.rb

@@ -4,7 +4,7 @@ class Admin::ProductsController < Admin::ResourceController
   update.before :update_before
 
   def index
-    respond_to do |format|
+    respond_with(@collection) do |format|
       format.html
       format.json { render :json => json_data }
     end
@@ -27,7 +27,7 @@ class Admin::ProductsController < Admin::ResourceController
       flash.notice = I18n.t("notice_messages.product_not_deleted")
     end
 
-    respond_to do |format|
+    respond_with(@product) do |format|
       format.html { redirect_to collection_url }
       format.js  { render_js_for_destroy }
     end
@@ -42,19 +42,19 @@ class Admin::ProductsController < Admin::ResourceController
       flash.notice = I18n.t("notice_messages.product_not_cloned")
     end
 
-    redirect_to edit_admin_product_url(@new)
+    respond_with(@new) { |format| format.html { redirect_to edit_admin_product_url(@new) } }
   end
-  
+
   protected
-  
+
   def find_resource
     Product.find_by_permalink(params[:id])
   end
-  
+
   def location_after_save
     edit_admin_product_url(@product)
   end
-  
+
   # Allow different formats of json data to suit different ajax calls
   def json_data
     json_format = params[:json_format] or 'default'

data/app/controllers/admin/properties_controller.rb

@@ -3,7 +3,9 @@ class Admin::PropertiesController < Admin::ResourceController
   # Looks like this action is unused
   def filtered
     @properties = Property.where('lower(name) LIKE ?', "%#{params[:q].mb_chars.downcase}%").order(:name)
-    render :template => "admin/properties/filtered.html.erb", :layout => false
+    respond_with(@properties) do |format| 
+      format.html { render :template => "admin/properties/filtered.html.erb", :layout => false } 
+    end
   end
 
 end

data/app/controllers/admin/prototypes_controller.rb

@@ -5,14 +5,16 @@ class Admin::PrototypesController < Admin::ResourceController
 
   def available
     @prototypes = Prototype.order('name asc')
-    respond_to do |wants|
-      wants.html { render :layout => !request.xhr? }
+    respond_with(@prototypes) do |format|
+      format.html { render :layout => !request.xhr? }
     end
   end
 
   def select
     @prototype ||= Prototype.find(params[:id])
     @prototype_properties = @prototype.properties
+
+    respond_with(@prototypes)
   end
 
   private

data/app/controllers/admin/reports_controller.rb

@@ -1,12 +1,14 @@
 class Admin::ReportsController < Admin::BaseController
   before_filter :load_data
+  respond_to :html
 
   AVAILABLE_REPORTS = {
-    :sales_total => {:name => "Sales Total", :description => "Sales Total For All Orders"}
+    :sales_total => {:name => I18n.t(:sales_total), :description => I18n.t(:sales_total_description)}
   }
 
   def index
     @reports = AVAILABLE_REPORTS
+    respond_with(@reports)
   end
 
   def sales_total
@@ -36,6 +38,8 @@ class Admin::ReportsController < Admin::BaseController
     @item_total = @search.sum(:item_total)
     @adjustment_total = @search.sum(:adjustment_total)
     @sales_total = @search.sum(:total)
+
+    respond_with
   end
 
   private

data/app/controllers/admin/resource_controller.rb

@@ -4,15 +4,22 @@ class Admin::ResourceController < Admin::BaseController
   before_filter :load_resource
 
   respond_to :html
-  
+  respond_to :js, :except => [:show, :index]
+
   def new
-    render :layout => !request.xhr?
+    respond_with(@object) do |format|
+      format.html { render :layout => !request.xhr? }
+      format.js { render :layout => false }
+    end
   end
-  
+
   def edit
-    render :layout => !request.xhr?
+    respond_with(@object) do |format|
+      format.html { render :layout => !request.xhr? }
+      format.js { render :layout => false }
+    end
   end
-    
+
   def update
     invoke_callbacks(:update, :before)
     if @object.update_attributes(params[object_name])
@@ -20,13 +27,13 @@ class Admin::ResourceController < Admin::BaseController
       resource_desc = I18n.t(object_name)
       resource_desc += " \"#{@object.name}\"" if @object.respond_to?(:name)
       flash[:notice] = I18n.t(:successfully_updated, :resource => resource_desc)
-      respond_to do |format|
+      respond_with(@object) do |format|
         format.html { redirect_to location_after_save }
-        format.js   { render :layout => false }      
+        format.js   { render :layout => false }
       end
     else
       invoke_callbacks(:update, :fails)
-      render :edit
+      respond_with(@object)
     end
   end
 
@@ -37,16 +44,16 @@ class Admin::ResourceController < Admin::BaseController
       resource_desc = I18n.t(object_name)
       resource_desc += " \"#{@object.name}\"" if @object.respond_to?(:name)
       flash[:notice] = I18n.t(:successfully_created, :resource => resource_desc)
-      respond_to do |format|
+      respond_with(@object) do |format|
         format.html { redirect_to location_after_save }
-        format.js   { render :layout => false }      
+        format.js   { render :layout => false }
       end
     else
       invoke_callbacks(:create, :fails)
-      render :new
+      respond_with(@object)
     end
   end
-  
+
   def destroy
     invoke_callbacks(:destroy, :before)
     if @object.destroy
@@ -54,39 +61,41 @@ class Admin::ResourceController < Admin::BaseController
       resource_desc = I18n.t(object_name)
       resource_desc += " \"#{@object.name}\"" if @object.respond_to?(:name)
       flash[:notice] = I18n.t(:successfully_removed, :resource => resource_desc)
-      respond_to do |format|
+      respond_with(@object) do |format|
         format.html { redirect_to collection_url }
         format.js   { render :partial => "/admin/shared/destroy" }
       end
     else
       invoke_callbacks(:destroy, :fails)
-      redirect_to collection_url
+      respond_with(@object) do |format|
+        format.html { redirect_to collection_url }
+      end
     end
   end
- 
+
   protected
 
   class << self
     attr_accessor :parent_data
     attr_accessor :callbacks
-  
+
     def belongs_to(model_name, options = {})
       @parent_data ||= {}
       @parent_data[:model_name] = model_name
       @parent_data[:model_class] = model_name.to_s.classify.constantize
       @parent_data[:find_by] = options[:find_by] || :id
     end
-    
+
     def create
       @callbacks ||= {}
       @callbacks[:create] ||= Spree::ActionCallbacks.new
     end
-    
+
     def update
       @callbacks ||= {}
       @callbacks[:update] ||= Spree::ActionCallbacks.new
     end
-    
+
     def destroy
       @callbacks ||= {}
       @callbacks[:destroy] ||= Spree::ActionCallbacks.new
@@ -96,11 +105,11 @@ class Admin::ResourceController < Admin::BaseController
   def model_class
     controller_name.classify.constantize
   end
-  
+
   def object_name
     controller_name.singularize
   end
-  
+
   def load_resource
     if member_action?
       @object ||= load_resource_instance
@@ -110,7 +119,7 @@ class Admin::ResourceController < Admin::BaseController
       instance_variable_set("@#{controller_name}", @collection)
     end
   end
-  
+
   def load_resource_instance
     if new_actions.include?(params[:action].to_sym)
       build_resource
@@ -122,7 +131,7 @@ class Admin::ResourceController < Admin::BaseController
   def parent_data
     self.class.parent_data
   end
-  
+
   def parent
     if parent_data.present?
       @parent ||= parent_data[:model_class].where(parent_data[:find_by] => params["#{parent_data[:model_name]}_id"]).first
@@ -139,7 +148,7 @@ class Admin::ResourceController < Admin::BaseController
       model_class.find(params[:id])
     end
   end
-  
+
   def build_resource
     if parent_data.present?
       parent.send(controller_name).build(params[object_name])
@@ -147,17 +156,17 @@ class Admin::ResourceController < Admin::BaseController
       model_class.new(params[object_name])
     end
   end
-  
+
   def collection
     return parent.send(controller_name) if parent_data.present?
-    
+
     if model_class.respond_to?(:accessible_by) && !current_ability.has_block?(params[:action], model_class)
       model_class.accessible_by(current_ability)
     else
       model_class.scoped
     end
   end
-  
+
   def location_after_save
     collection_url
   end
@@ -181,7 +190,7 @@ class Admin::ResourceController < Admin::BaseController
       new_polymorphic_url([:admin, model_class], options)
     end
   end
-  
+
   def edit_object_url(object, options = {})
     if parent_data.present?
       send "edit_admin_#{parent_data[:model_name]}_#{object_name}_url", parent, object, options
@@ -189,7 +198,7 @@ class Admin::ResourceController < Admin::BaseController
       send "edit_admin_#{object_name}_url", object, options
     end
   end
-  
+
   def object_url(object = nil, options = {})
     target = object ? object : @object
     if parent_data.present?
@@ -198,7 +207,7 @@ class Admin::ResourceController < Admin::BaseController
       send "admin_#{object_name}_url", target, options
     end
   end
-  
+
   def collection_url(options = {})
     if parent_data.present?
       polymorphic_url([:admin, parent, model_class], options)
@@ -206,7 +215,7 @@ class Admin::ResourceController < Admin::BaseController
       polymorphic_url([:admin, model_class], options)
     end
   end
-  
+
   def collection_actions
     [:index]
   end