spree_core 0.50.4 → 0.60.0.RC1

data/app/controllers/admin/payment_methods_controller.rb

@@ -1,31 +1,42 @@
-class Admin::PaymentMethodsController < Admin::BaseController
-  resource_controller
+class Admin::PaymentMethodsController < Admin::ResourceController
+  skip_before_filter :load_resource, :only => [:create]
   before_filter :load_data
 
-  update.before :update_before
+  def create
+    @payment_method = params[:payment_method][:type].constantize.new(params[:payment_method])
+    @object = @payment_method
+    invoke_callbacks(:create, :before)
+    if @payment_method.save
+      invoke_callbacks(:create, :after)
+      flash[:notice] = I18n.t(:successfully_created, :resource => I18n.t(:payment_method))
+      respond_with(@payment_method, :location => edit_admin_payment_method_path(@payment_method))
+    else
+      invoke_callbacks(:create, :fails)
+      render :new
+    end
+  end
 
-  update.wants.html { redirect_to edit_object_url }
-  create.wants.html { redirect_to edit_object_url }
+  def update
+    invoke_callbacks(:update, :before)
+    payment_method_type = params[:payment_method].delete(:type)
+    if @payment_method['type'].to_s != payment_method_type
+      @payment_method.update_attribute(:type, payment_method_type)
+      @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)) 
+      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
+    end
+  end
 
   private
-  def build_object
-		if params[:payment_method] && params[:payment_method][:type]
-			@object ||= params[:payment_method][:type].constantize.send parent? ? :build : :new, object_params
-		else
-			@object ||= end_of_association_chain.send parent? ? :build : :new, object_params
-		end
-  end
 
   def load_data
-    @providers = Gateway.providers
-  end
-
-  def update_before
-		if params[:payment_method] && params[:payment_method][:type] && @object['type'].to_s != params[:payment_method][:type]
-			@object.update_attribute(:type, params[:payment_method][:type])
-			
-			load_object			
-		end
- 		@object.update_attributes params[@object.class.name.underscore.gsub("/", "_")]
+    @providers = Gateway.providers.sort{|p1, p2| p1.name <=> p2.name }
   end
 end

data/app/controllers/admin/payments_controller.rb

@@ -1,12 +1,21 @@
 class Admin::PaymentsController < Admin::BaseController
+  before_filter :load_order, :only => [:create, :new, :index, :fire]
+  before_filter :load_payment, :except => [:create, :new, :index]
   before_filter :load_data
-  before_filter :load_amount, :except => :country_changed
-  resource_controller
-  belongs_to :order
+
+  def index
+    @payments = @order.payments
+  end
+
+  def new
+    @payment = @order.payments.build
+  end
 
   def create
-    build_object
-    load_object
+    @payment = @order.payments.build(object_params)
+    if @payment.payment_method.is_a?(Gateway) && @payment.payment_method.payment_profiles_supported? && params[:card].present? and params[:card] != 'new'
+      @payment.source = Creditcard.find_by_id(params[:card])
+    end
 
     begin
       unless @payment.save
@@ -16,8 +25,8 @@ class Admin::PaymentsController < Admin::BaseController
 
       if @order.completed?
         @payment.process!
-        set_flash :create
-        redirect_to collection_path
+        flash[:notice] = I18n.t(:successfully_created, :resource => 'payment')
+        redirect_to admin_order_payments_path(@order)
       else
         #This is the first payment (admin created order)
         until @order.completed?
@@ -29,13 +38,12 @@ class Admin::PaymentsController < Admin::BaseController
 
     rescue Spree::GatewayError => e
       flash[:error] = "#{e.message}"
-      redirect_to new_object_path
+      redirect_to new_admin_payment_path(@order)
     end
   end
 
   def fire
     # TODO: consider finer-grained control for this type of action (right now anyone in admin role can perform)
-    load_object
     return unless event = params[:e] and @payment.payment_source
     if @payment.payment_source.send("#{event}", @payment)
       flash.notice = t('payment_updated')
@@ -45,16 +53,11 @@ class Admin::PaymentsController < Admin::BaseController
   rescue Spree::GatewayError => ge
     flash[:error] = "#{ge.message}"
   ensure
-    redirect_to collection_path
+    redirect_to admin_order_payments_path(@order)
   end
 
   private
 
-  def object
-    @object ||= Payment.find(param) unless param.nil?
-    @object
-  end
-
   def object_params
     if params[:payment] and params[:payment_source] and source_params = params.delete(:payment_source)[params[:payment][:payment_method_id]]
       params[:payment][:source_attributes] = source_params
@@ -63,27 +66,22 @@ class Admin::PaymentsController < Admin::BaseController
   end
 
   def load_data
-    load_object
+    @amount = params[:amount] || load_order.total
     @payment_methods = PaymentMethod.available(:back_end)
-    if object and object.payment_method
-      @payment_method = object.payment_method
+    if @payment and @payment.payment_method
+      @payment_method = @payment.payment_method
     else
       @payment_method = @payment_methods.first
     end
     @previous_cards = @order.creditcards.with_payment_profile
   end
 
-  def load_amount
-    @amount = params[:amount] || @order.total
+  def load_order
+    @order ||= Order.find_by_number! params[:order_id]
   end
 
-  def build_object
-    @object = model.new(object_params)
-    @object.order = parent_object
-    if @object.payment_method.is_a?(Gateway) and @object.payment_method.payment_profiles_supported? and params[:card].present? and params[:card] != 'new'
-      @object.source = Creditcard.find_by_id(params[:card])
-    end
-    @object
+  def load_payment
+    @payment ||= Payment.find params[:id]
   end
 
 end

data/app/controllers/admin/product_groups_controller.rb

@@ -1,26 +1,35 @@
-class Admin::ProductGroupsController < Admin::BaseController
-  resource_controller
-
-  create.response do |wants|
-    wants.html { redirect_to edit_object_path }
-  end
-  update.response do |wants|
-    wants.html { redirect_to edit_object_path }
-    wants.js { render :action => 'update', :layout => false}
-  end
-
+class Admin::ProductGroupsController < Admin::ResourceController
+  before_filter :patch_params, :only => [:update]
+  
   def preview
     @product_group = ProductGroup.new(params[:product_group])
     @product_group.name = "for_preview"
     render :partial => 'preview', :layout => false
   end
 
+  protected
 
+    def find_resource
+      ProductGroup.find_by_permalink(params[:id])
+    end
+     
+    def location_after_save
+      edit_admin_product_group_path(@product_group)
+    end
+
+    def collection
+      params[:search] ||= {}
+      params[:search][:meta_sort] ||= "name.asc"
+      @search = super.metasearch(params[:search])
+      @collection = @search.paginate( :per_page => Spree::Config[:per_page],
+                                      :page     => params[:page])
+    end
+    
   private
 
     # Consolidate argument arrays for nested product_scope attributes
     # Necessary for product scopes with multiple arguments
-    def object_params
+    def patch_params
       if params["product_group"] and params["product_group"]["product_scopes_attributes"].is_a?(Array)
         params["product_group"]["product_scopes_attributes"] = params["product_group"]["product_scopes_attributes"].group_by {|a| a["id"]}.map do |scope_id, attrs|
           a = { "id" => scope_id, "arguments" => attrs.map{|a| a["arguments"] }.flatten }
@@ -30,15 +39,8 @@ class Admin::ProductGroupsController < Admin::BaseController
           a
         end
       end
-      params["product_group"]
     end
 
-    def collection
-      params[:search] ||= {}
-      params[:search][:meta_sort] ||= "name.desc"
-      @search = ProductGroup.metasearch(params[:search])
-      @collection = @search.paginate( :per_page => Spree::Config[:per_page],
-                                      :page     => params[:page])
-    end
+
 
 end

data/app/controllers/admin/product_properties_controller.rb

@@ -1,11 +1,7 @@
-class Admin::ProductPropertiesController < Admin::BaseController
-  resource_controller
+class Admin::ProductPropertiesController < Admin::ResourceController
+  belongs_to :product, :find_by => :permalink
   before_filter :find_properties
 
-  # note: we're using attribute_fu to manage the product_properties so the products controller will be
-  # doing most of the work
-  belongs_to :product
-
   private
 
   def find_properties

data/app/controllers/admin/product_scopes_controller.rb

@@ -1,27 +1,31 @@
 class Admin::ProductScopesController < Admin::BaseController
   helper 'admin/product_groups'
-
-  resource_controller
-
-  belongs_to :product_group
-
-  actions :create, :destroy
   
-  destroy.after :update_memberships
-
-  create.response do |wants|
-    wants.html { redirect_to edit_admin_product_group_path(parent_object) }
-    wants.js { render :action => 'create', :layout => false}
-  end
-  destroy.response do |wants|
-    wants.html { redirect_to edit_admin_product_group_path(parent_object) }
-    wants.js { render :action => 'destroy', :layout => false}
+  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|
+        format.html { redirect_to edit_admin_product_group_path(@product_group) }
+        format.js   { render :layout => false }
+      end
+    else
+      render :new
+    end
   end
   
-  private
+  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|
+        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)
+    end
+  end  
   
-  def update_memberships
-    object.product_group.update_memberships
-  end
-
 end

data/app/controllers/admin/products_controller.rb

@@ -1,28 +1,13 @@
-class Admin::ProductsController < Admin::BaseController
-  resource_controller
+class Admin::ProductsController < Admin::ResourceController
   before_filter :check_json_authenticity, :only => :index
   before_filter :load_data, :except => :index
-
-  index.response do |wants|
-    wants.html { render :action => :index }
-    wants.json { render :json => json_data }
-  end
-
-  new_action.response do |wants|
-    wants.html {render :action => :new, :layout => !request.xhr?}
-  end
-
   update.before :update_before
 
-  create.response do |wants|
-    # go to edit form after creating as new product
-    wants.html {redirect_to edit_admin_product_url(@product) }
-  end
-
-  update.response do |wants|
-    # override the default redirect behavior of r_c
-    # need to reload Product in case name / permalink has changed
-    wants.html {redirect_to edit_admin_product_url(@product) }
+  def index
+    respond_to do |format|
+      format.html
+      format.json { render :json => json_data }
+    end
   end
 
   # override the destory method to set deleted_at value
@@ -49,7 +34,6 @@ class Admin::ProductsController < Admin::BaseController
   end
 
   def clone
-    load_object
     @new = @product.duplicate
 
     if @new.save
@@ -60,7 +44,17 @@ class Admin::ProductsController < Admin::BaseController
 
     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'
@@ -88,7 +82,7 @@ class Admin::ProductsController < Admin::BaseController
       end
 
       params[:search][:meta_sort] ||= "name.asc"
-      @search = end_of_association_chain.metasearch(params[:search])
+      @search = super.metasearch(params[:search])
 
       pagination_options = {:include   => {:variants => [:images, :option_values]},
                             :per_page  => Spree::Config[:admin_products_per_page],
@@ -98,10 +92,10 @@ class Admin::ProductsController < Admin::BaseController
     else
       includes = [{:variants => [:images,  {:option_values => :option_type}]}, :master, :images]
 
-      @collection = end_of_association_chain.where(["name LIKE ?", "%#{params[:q]}%"])
+      @collection = super.where(["name #{LIKE} ?", "%#{params[:q]}%"])
       @collection = @collection.includes(includes).limit(params[:limit] || 10)
 
-      tmp = end_of_association_chain.where(["variants.sku LIKE ?", "%#{params[:q]}%"])
+      tmp = super.where(["variants.sku #{LIKE} ?", "%#{params[:q]}%"])
       tmp = tmp.includes(:variants_including_master).limit(params[:limit] || 10)
       @collection.concat(tmp)
 

data/app/controllers/admin/properties_controller.rb

@@ -1,27 +1,9 @@
-class Admin::PropertiesController < Admin::BaseController
-  resource_controller
-
-  before_filter :load_object, :only => :filtered
-  belongs_to :product
+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
   end
 
-  new_action.response do |wants|
-    wants.html {render :action => :new, :layout => !request.xhr? }
-  end
-
-  # redirect to index (instead of r_c default of show view)
-  update.response do |wants|
-    wants.html {redirect_to collection_url}
-  end
-
-  # redirect to index (instead of r_c default of show view)
-  create.response do |wants|
-    wants.html {redirect_to collection_url}
-  end
-
-  destroy.success.wants.js { render_js_for_destroy }
 end

data/app/controllers/admin/prototypes_controller.rb

@@ -1,5 +1,4 @@
-class Admin::PrototypesController < Admin::BaseController
-  resource_controller
+class Admin::PrototypesController < Admin::ResourceController
   after_filter :set_habtm_associations, :only => [:create, :update]
 
   helper 'admin/product_properties'
@@ -12,41 +11,14 @@ class Admin::PrototypesController < Admin::BaseController
   end
 
   def select
-    load_object
+    @prototype ||= Prototype.find(params[:id])
     @prototype_properties = @prototype.properties
   end
 
-  new_action.response do |wants|
-    wants.html {
-      render :action => :new, :layout => !request.xhr?
-    }
-  end
-
-  # redirect to index (instead of r_c default of show view)
-  update.response do |wants|
-    wants.html {redirect_to collection_url}
-  end
-
-  # redirect to index (instead of r_c default of show view)
-  create.response do |wants|
-    wants.html {redirect_to collection_url}
-  end
-
-  destroy.success.wants.js { render_js_for_destroy }
-
   private
+  
   def set_habtm_associations
-    object.property_ids = params[:property][:id] if params[:property]
-    object.option_type_ids = params[:option_type][:id] if params[:option_type]
-  end
-
-  def specified_rights(type)
-    rights = []
-    key = "#{type}_ids".to_sym
-    params[:permission][key] ||= []
-    params[:permission][key].each do |id|
-      rights << type.classify.constantize.find(id)
-    end
-    rights
+    @prototype.property_ids = params[:property][:id] if params[:property]
+    @prototype.option_type_ids = params[:option_type][:id] if params[:option_type]
   end
 end