opensteam 0.9.1 → 0.9.2

data/CHANGELOG

@@ -1,4 +1,15 @@
-*edge*
+*0.9.2*
+
+
+* fixed bug in product-controller (generators): missing "::" between "Admin" namespace and ProductController
+
+* implemented filter methods for configurable tables in admin-backend (Opensteam::Helpers::ConfigTableHelper)
+
+* added partials for "filters"
+
+* updated views + controller in admin-backend for filter + sortable table (TODO: check if the POST to index for filter is neccessary, REST )
+
+* removed uuid for Order-ids due to association problems (e.g. no order_items for an order after checkout ) (TODO: implement!)
 
 * deleted unnecessary controllers + views (administration namespace)
 

data/generators/opensteam/opensteam_generator.rb

@@ -89,6 +89,11 @@ class OpensteamGenerator < Rails::Generator::NamedBase
     admin.users_admins "users/type/admin", :controller => 'users', :action => 'index', :type => 'admin'
     admin.users_customers "users/type/customer", :controller => 'users', :action => 'index', :type => 'customer'
     
+    admin.connect "users", :controller => 'users', :action => 'index' 
+    admin.connect "orders", :controller => 'orders', :action => 'index' 
+    admin.connect "invoices", :controller => 'invoices', :action => 'index' 
+    admin.connect "shipments", :controller => 'shipments', :action => 'index'
+    
     admin.resources :inventories
     admin.resources :users, :has_many => [ :orders ]
     admin.resources :orders, :has_many => [ :shipments, :invoices ]

data/generators/opensteam/templates/app/controllers/admin/invoices_controller.rb

@@ -1,37 +1,34 @@
 class Admin::InvoicesController < AdminController
+
   
   
-  include Opensteam::Helper::ConfigurableTableController
-  
-  def sort
-    if params[:sort]
-      if params[:order_id]
-        @order = Order.find( params[:order_id] )
-        conditions = { :order_id =>  params[:order_id] }
-      end
-      @results = sort_model( Invoice, @sort_column, conditions )
-      @invoices = @results
-    end
+  before_filter :set_sort_column
     
-    respond_to do |respond|
-      respond.html { render :action => :sort }
-      respond.js { render :partial => "invoice", :collection => @results, :layout => false }
-    end
-          
-  end
-  
-  
   def index
-    @invoices ||= Opensteam::InvoiceBase::Invoice.find( :all )
-    @order = Opensteam::OrderBase::Order.find( params[:order_id] ) if params[:order_id]
-
+    save_filter("Invoice") if request.post?
+    @invoices = apply_filter( "Invoice" )
+    
+    if params[:order_id]
+      @order = Opensteam::OrderBase::Order.find( params[:order_id] )
+      @invoices = ( @invoices || Opensteam::InvoiceBase::Invoice ).by_order( params[:order_id ] )
+    end
+      
+    @invoices = ( @invoices || Opensteam::InvoiceBase::Invoice ).order_by( @sort_column.order )
+      
+    if params[:sort]
+      @invoices.reverse! if session[:invoices]
+      session[:invoices] = session[:invoices] ? false : true
+    end
+      
     respond_to do |format|
-      format.html # index.html.erb
-      format.xml  { render :xml => @invoices }
-      format.js { render :partial => "invoices", :layout => false }
+      format.html
+      format.xml { render :xml => @invoices.to_xml( :root => "invoices" ) }
+      format.js { render :partial => "admin/invoices/invoice", :collection => @invoices, :layout => false }
     end
+      
   end
   
+
   
   def show
     @order = Opensteam::OrderBase::Order.find( params[:order_id] )
@@ -102,5 +99,14 @@ class Admin::InvoicesController < AdminController
 
   end
   
+  private
+  def set_sort_column
+    id = params[:sort] || "id"
+    @sort_column = Opensteam::InvoiceBase::Invoice.osteam_configtable.columns.find { |s| s.id.to_s == id }
+  end
+  
+  
+  
+  
    
 end

data/generators/opensteam/templates/app/controllers/admin/orders_controller.rb

@@ -1,67 +1,32 @@
 class Admin::OrdersController < AdminController
-  
-    
-  
-  include Opensteam::Helper::ConfigurableTableController
-  
-  helper :all
-  
-  
-  
-  def livesearch
-    if params[:livesearch]
-      
-      @result = Order.find(:all, :include => [:customer, :shipping_address, :payment_address ] )
-
-      @result = @result.select { |s| 
-        Order.configured_table.columns.collect { |c|
-          seek = s.__send__( c.id )
-          seek = seek.__send__( c.method ) if c.method
-          seek.to_s.include?( params[:livesearch] )
-        }.any?
-      }
-      render :partial => 'order', :collection => @result, :layout => false
-    end
-
-  end
-  
-  
 
+  helper :all
+  before_filter :set_sort_column
     
-  def sort
-    
-    if params[:sort]
-      if params[:user_id]
-        @customer = Opensteam::UserBase::User.find( params[:user_id] )
-        conditions = { :customer_id => params[:customer_id] }
-      end
-      @results = sort_model( Order, @sort_column, conditions, [:customer, :payment_address, :shipping_address ] )
-      @orders = @results
-    end
-    
-    respond_to do |respond|
-      respond.html { render :action => :sort }
-      respond.js { render :partial => "order", :collection => @results, :layout => false }
-    end
-          
-  end
-  
-  
   def index
+    save_filter("Order") if request.post?
+    @orders = apply_filter( "Order" )
+      
     if params[:user_id]
       @customer = Opensteam::UserBase::User.find( params[:user_id] )
-      @orders = @customer.orders
-    else
-      @orders ||= find_orders
+      @orders = ( @orders || Opensteam::OrderBase.Order ).by_user( params[:user_id ] )
     end
-    
+      
+    @orders = ( @orders || Opensteam::OrderBase::Order ).order_by( @sort_column.order )
+      
+    if params[:sort]
+      @orders.reverse! if session[:orders]
+      session[:orders] = session[:orders] ? false : true
+    end
+      
     respond_to do |format|
-      format.html # index.html.erb
-      format.xml  { render :xml => @orders }
-      format.js { render :partial => "orders", :layout => false }
+      format.html
+      format.xml { render :xml => @orders.to_xml( :root => "orders" ) }
+      format.js { render :partial => "admin/orders/order", :collection => @orders, :layout => false }
     end
+      
   end
-  
+
   
   def show
     @order ||= Opensteam::OrderBase::Order.find( params[:id] )
@@ -93,21 +58,9 @@ class Admin::OrdersController < AdminController
   
   private
 
-  def find_orders
-    if params[:filter] && (params[:filter][:enabled] == "1")
-      params[:state] = params[:filter][:state] || [""]
-      params[:last] = params[:filter][:last] unless params[:filter][:last].blank?
-    end
-    
-    scope = Opensteam::OrderBase::Order.scoped({})
-    
-    scope = scope.scoped :include => :state, :conditions => ["state_bases.name in (?)", params[:state] ] if params[:state]
-    
-    scope = scope.scoped :order => :state_id if params[:state]
-    scope = scope.scoped :conditions => { :customer_id => params[:customer_id] } if params[:customer_id]
-    scope = scope.scoped :conditions => ["orders.created_at >= ?", 1.send(params[:last]).ago ] if params[:last]
-    #  scope = scope.scoped :conditions => [ "orders.created_at < ?", params[:before]] if params[:before]
-    scope = scope.scoped :include => :customer
+  def set_sort_column
+    id = params[:sort] || "id"
+    @sort_column = Opensteam::OrderBase::Order.osteam_configtable[ id ]
   end
  
 end

data/generators/opensteam/templates/app/controllers/admin/shipments_controller.rb

@@ -1,35 +1,31 @@
 class Admin::ShipmentsController < AdminController
   
-  
-  include Opensteam::Helper::ConfigurableTableController
-  
-  def sort
-    if params[:sort]
-      if params[:order_id]
-        @customer = Order.find( params[:order_id] )
-        conditions = { :order_id =>  params[:order_id] }
-      end
-      @results = sort_model( Shipment, @sort_column, conditions )
-      @shipments = @results
-    end
+
+  before_filter :set_sort_column
     
-    respond_to do |respond|
-      respond.html { render :action => :sort }
-      respond.js { render :partial => "shipment", :collection => @results, :layout => false }
-    end
-          
-  end
-  
-  
   def index
-    @shipments ||= Opensteam::ShipmentBase::Shipment.find( :all )
-    @order = Opensteam::OrderBase::Order.find( params[:order_id] ) if params[:order_id]
-
+    save_filter("Shipment") if request.post?
+    @shipments = apply_filter( "Shipment" )
+      
+    @filter_entries = []
+    if params[:order_id]
+      @order = Opensteam::OrderBase::Order.find( params[:order_id] )
+      @shipments = ( @shipments || Opensteam::ShipmentBase::Shipment ).by_order( params[:order_id ] )
+    end
+      
+    @shipments = ( @shipments || Opensteam::ShipmentBase::Shipment ).order_by( @sort_column.order )
+      
+    if params[:sort]
+      @shipments.reverse! if session[:shipments]
+      session[:shipments] = session[:shipments] ? false : true
+    end
+      
     respond_to do |format|
-      format.html # index.html.erb
-      format.xml  { render :xml => @shipments }
-      format.js { render :partial => "shipments", :layout => false }
+      format.html
+      format.xml { render :xml => @shipments.to_xml( :root => "shipments" ) }
+      format.js { render :partial => "admin/shipments/shipment", :collection => @shipments, :layout => false }
     end
+      
   end
   
   
@@ -102,5 +98,12 @@ class Admin::ShipmentsController < AdminController
 
   end
   
+  private
+  def set_sort_column
+    id = params[:sort] || "id"
+    @sort_column = Opensteam::ShipmentBase::Shipment.osteam_configtable.columns.find { |s| s.id.to_s == id }
+  end
+  
+  
    
 end

data/generators/opensteam/templates/app/controllers/admin/users_controller.rb

@@ -1,19 +1,31 @@
 class Admin::UsersController < AdminController
   
+  before_filter :set_sort_column
+  
   
   def index
+    save_filter( "User" ) if request.post?
+    @users = apply_filter( "User" )
+    
     if params[:type]
-      @users = Opensteam::UserBase::User.by_profile( params[:type] )
-    else
-      @users = Opensteam::UserBase::User.all
+      @users = ( @users || Opensteam::UserBase::User ).by_profile( params[:type] )
+    end
+
+    @users = ( @users || Opensteam::UserBase::User ).order_by( @sort_column.order )
+    if params[:sort]
+      @users.reverse! if session[:users]
+      session[:users] = session[:users] ? false : true
     end
     
     respond_to do |format|
       format.html
       format.xml { render :xml => @users.to_xml( :root => params[:type] || "users" ) }
+      format.js { render :partial => "admin/users/#{ params[:type] ? params[:type] + 's' : 'users' }", :collection => @users, :layout => false }
     end
   end
-
+  
+  
+  
   def show
     @user = Opensteam::UserBase::User.find( params[:id] )
     
@@ -25,25 +37,18 @@ class Admin::UsersController < AdminController
   end
   
   
-  
-  
   def edit
     @user = Opensteam::UserBase::User.find( params[:id] )
     @profiles = Opensteam::UserBase::Profile.all
-    
-
-
   end
   
   
   
-  
-  
   def update
     @user = Opensteam::UserBase::User.find( params[:id] )
     
     if params[:type]
-      @profile = Opensteam::UserBase::Profile.find_or_create_by_name( :name => params[:type].classify )
+      @profile = Opensteam::UserBase::Profile.find( params[:type] )
     end
     
     
@@ -68,6 +73,7 @@ class Admin::UsersController < AdminController
   def new
     @user = Opensteam::UserBase::User.new
     @profiles = Opensteam::UserBase::Profile.all
+    @user.profile_id = Opensteam::UserBase::Profile.find_by_name( params[:type].classify ).id if params[:type]
   end
 
 
@@ -75,7 +81,7 @@ class Admin::UsersController < AdminController
     @user = Opensteam::UserBase::User.new( params[:user] )
     
     if params[:type]
-      @profile = Opensteam::UserBase::Profile.find_or_create_by_name( :name => params[:type].classify )
+      @profile = Opensteam::UserBase::Profile.find( params[:type] )
     end
     
     respond_to do |format|
@@ -96,4 +102,13 @@ class Admin::UsersController < AdminController
   
   end
   
+  
+  private
+  def set_sort_column
+    id = params[:sort] || "id"
+    @sort_column = Opensteam::UserBase::User.osteam_configtable.columns.find { |s| s.id.to_s == id }
+  end
+  
+    
+  
 end

data/generators/opensteam/templates/app/controllers/admin_controller.rb

@@ -11,7 +11,7 @@ class AdminController < ApplicationController
  
   def index
     @extensions = []
- #   @extensions = Opensteam::ExtensionBase::Extension.active
+    #   @extensions = Opensteam::ExtensionBase::Extension.active
   end
 
   # show product classes
@@ -25,10 +25,17 @@ class AdminController < ApplicationController
   end				
   
   
+  def delete_filter
+    #  FilterEntry.find( params[:id] ).destroy
+    session[:filter][ params[:model] ].delete( params[:id].to_i )
+    redirect_to :action => :index
+  end
+  
   
   private
   def authorized?
     unless logged_in? && is_admin?
+      store_location
       redirect_to login_path
       return false
     end
@@ -36,5 +43,36 @@ class AdminController < ApplicationController
   end
   
   
+  def save_filter( model )
+    return nil unless params[:filter]
+    session[:filter] ||= {}
+    ( session[:filter][ model ] ||= [] ).push( *params[:filter].collect { |f| FilterEntry.create( f ).id } )
+  end
+  
+    
+  
+  def apply_filter( model )
+    
+    session[:filter] ||= {}
+    session[:filter][ model ] ||= []
+    if session[:filter][ model ].empty?
+      @filter_entries = []
+      return nil
+    end
+    
+    @filter_entries = FilterEntry.find( :all, :conditions => { :id => session[:filter][ model ] } )
+    return nil if @filter_entries.empty?
+    
+    model.classify.constantize.scoped(
+      { :conditions => [ @filter_entries.collect(&:to_sql).join(" AND "), 
+          @filter_entries.collect(&:to_val).inject({}) { |r,v| r.merge(v) } ]
+      } 
+    )
+  end
+  
+  
+  
+  
+  
 end
   

data/generators/opensteam/templates/app/controllers/profile/orders_controller.rb

@@ -1,75 +1,29 @@
 class Profile::OrdersController < ProfileController
-  
-  include Opensteam::Helper::ConfigurableTableController
-  include AuthenticatedSystem
-  
-  def livesearch
-    if params[:livesearch]
-      
-      @result = @customer.orders
-      @result = @result.select { |s| 
-        
-        Order.configured_table.columns.collect { |c|
-          seek = s.__send__( c.id )
-          seek = seek.__send__( c.method ) if c.method
-          seek.to_s.include?( params[:livesearch] )
-        }.any?
-      }
-      render :partial => 'order', :collection => @result, :layout => false
-    end
 
-  end
-
-  
-  
-  def sort
-    if params[:sort]
-      @results = sort_model( @customer.orders, @sort_column )
-      @orders = @results
-    end
-    
-    respond_to do |respond|
-      respond.html { render :action => :sort }
-      respond.js { render :partial => "order", :collection => @results, :layout => false }
-    end
-          
-  end
-  
-  
-  def sort_model( collection, column, conditions = nil )
-    finder_args = {}
-    finder_args[:conditions] = conditions if conditions
-          
-    if column.order_ruby?
-      result = collection.find( :all, finder_args )
-      result.sort!(&column.order)
-    else
-      finder_args[:order] = column.order
-      result = collection.find(:all, finder_args )
-    end
-    toggle_sorted("Orders" )
-    result.reverse! if sorted?( "Orders" )
-    result
-  end
-        
-          
+  include AuthenticatedSystem
   
+  before_filter :set_sort_column
   
   def index
+    @orders = Opensteam::OrderBase::Order.by_user( @customer.id )
+    
     if params[:state]
       if ( params[:state].collect(&:to_sym) - Order.available_states.collect(&:name).collect(&:to_sym) ).empty?
-        @orders = params[:state].collect { |s| @customer.orders.scoped :conditions => { :state => s } }.flatten
-      else
-        @orders = []
+        @orders = @orders.scoped :conditions => { :state => params[:state] }
       end
-    else
-      @orders = @customer.orders
+    end
+    
+    @orders = ( @orders || Opensteam::OrderBase::Order ).order_by( @sort_column.order )
+    
+    if params[:sort]
+      @orders.reverse! if session[:orders]
+      session[:orders] = session[:orders] ? false : true
     end
 
     respond_to do |format|
       format.html # index.html.erb
       format.xml  { render :xml => @orders.to_xml( :root => 'orders' ) }
-      format.js { render :partial => "orders", :layout => false }
+      format.js { render :partial => "order", :collection => @orders, :layout => false }
     end
   end
   
@@ -101,5 +55,12 @@ class Profile::OrdersController < ProfileController
 
   end
   
+  private
+  
+  def set_sort_column
+    id = params[:sort] || "id"
+    @sort_column = Opensteam::OrderBase::Order.osteam_configtable[ id ]
+  end
+    
  
 end