opensteam 0.9.0 → 0.9.1

data/generators/opensteam/opensteam_generator.rb

@@ -1,3 +1,19 @@
+#	openSteam - http://www.opensteam.net
+#  Copyright (C) 2008  DiamondDogs Webconsulting
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; version 2 of the License.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License along
+#  with this program; if not, write to the Free Software Foundation, Inc.,
+#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
 class OpensteamGenerator < Rails::Generator::NamedBase
 
 		
@@ -12,195 +28,109 @@ class OpensteamGenerator < Rails::Generator::NamedBase
 	
   end
 
+  require 'find'
+  require 'yaml'
+
+  def ffind_in_file(file,*strs)
+    if File.file?( file )
+      strs.each { |str| File.open(file).grep(/#{str}/) { |line| return :template  } }
+      return :file
+    end
+    return :directory
+  end
+
+  
   def manifest
     record do |m|
 
       m.class_collisions class_path, class_name, "#{class_name}Test"
       m.class_collisions class_path, "#{controller_class_name}"
-	
-      
-      
-      ### Controllers ###
-
-      ## directories ##
-      m.directory( File.join('app/controllers', 'administration') )
-			
-      # app/controllers/* #
-      %w(administration webshop checkout ).each { |f|
-        if f =~ /webshop/
-          m.template("controllers/#{f}_controller.rb", "app/controllers/#{file_name}_controller.rb" )
-        else
-          m.template("controllers/#{f}_controller.rb", "app/controllers/#{f}_controller.rb")
-        end
-      }
-      
-      # app/controllers/administration/* #
-      %w( customers inventories orders ).each { |f|
-        m.file( "controllers/administration/#{f}_controller.rb", "app/controllers/administration/#{f}_controller.rb" )
-      }			
-				
-      
-      ### Helpers ###
-      m.template( "helpers/webshop_helper.rb", "app/helpers/#{file_name}_helper.rb")
-      
-					
-      ### Initializers ###
-      m.directory( File.join('config', 'initializers') )
-      m.file('init/opensteam.rb', 'config/initializers/opensteam.rb')
-      
-      
-
-      ### Views ###
 
-      ## directories ##
-      %w( administration layouts checkout administration_mailer common ).each { |f|
-        m.directory( File.join('app/views',"#{f}") )
-      }
-      m.directory( File.join('app/views', file_name) )
-
-      # app/views/administration/* #
-      %w( _address orders admin_info _nav order  show_order_item _update_tree index login products properties signup tree update_products update_properties ).each { |f|
-        m.file("views/administration/#{f}.html.erb", "app/views/administration/#{f}.html.erb" ) }
-      m.file("views/administration/update_tree.rjs", "app/views/administration/update_tree.rjs")
-      
-      # app/views/layouts/* #
-      m.template("views/layouts/webshop.html.erb", "app/views/layouts/#{file_name}.html.erb" )
-      m.template("views/layouts/administration.html.erb", "app/views/layouts/administration.html.erb")
-      
-   
-      # app/views/administration_mailer/* #
-      %w( order_admin order_customer ).each { |f| 
-        m.file( "views/administration_mailer/#{f}.erb", "app/views/administration_mailer/#{f}.erb")
-      }
-      
-      # app/views/common/* #
-      %w( _cart _cart_content _header ).each { |f| 
-        m.file( "views/common/#{f}.html.erb", "app/views/common/#{f}.html.erb" )
-      }
-
-      # app/views/webshop/* #
-      %w( _inventory_content ).each { |f|
-        m.file("views/webshop/#{f}.html.erb", "app/views/#{file_name}/#{f}.html.erb" )
-      }
-      %w( add_to_cart_with_parameters del_item inventory add_inventory_to_cart ).each { |f|
-        m.file("views/webshop/#{f}.rjs", "app/views/#{file_name}/#{f}.rjs" )
-      }			
-      %w( index show ).each { |f| 
-        m.template("views/webshop/#{f}.html.erb", "app/views/#{file_name}/#{f}.html.erb")
-      }
-
-      
-      # app/views/checkout/* #
-      %w( intro outro shipping ).each { |f|
-        m.file("views/checkout/#{f}.html.erb", "app/views/checkout/#{f}.html.erb")
-      }
-      m.template("views/checkout/show_cart.html.erb", "app/views/checkout/show_cart.html.erb")
-      m.file( "views/checkout/update_cart_content.rjs", "app/views/checkout/update_cart_content.rjs")
-			
-      
-      ## app/views/administration directories ##
-      %w( inventories customers orders).each do |d|
-        m.directory( File.join( 'app/views', 'administration', "#{d}") )
+      Dir.chdir( File.dirname(__FILE__) )
+      Find.find("./templates/"  ) do |f|
+        ret = ffind_in_file(f, "<%%", "## TEMPLATE ##" )
+        f = f.gsub(/^\.\/templates\//,'')
+        ret == :directory ? m.send( ret, f =~ /webshop/ ? f.gsub(/webshop/,"#{file_name}") : f ) : m.send(ret,f , f =~ /webshop/ ? f.gsub(/webshop/,"#{file_name}") : f )
       end
       
-      # app/views/administration/inventories/* #
-      %w( edit index new show ).each do |f|
-        m.file( "views/administration/inventories/#{f}.html.erb", "app/views/administration/inventories/#{f}.html.erb" )
-      end
 
-      
-      # app/views/administration/orders/* #
-      %w( _order_item index show ).each { |f|
-        m.file( "views/administration/orders/#{f}.html.erb", "app/views/administration/orders/#{f}.html.erb")
-      }
-      
-      # app/views/administration/customers/* #
-      %w( index show ).each { |f|
-        m.file( "views/administration/customers/#{f}.html.erb", "app/views/administration/customers/#{f}.html.erb" )
-      }
-      
-      ### Tasks ###
-      m.file("tasks/opensteam.rake", "lib/tasks/opensteam.rake")
-      
-      
-      ### Fixtures ###
-      %w( inventories inventories_properties product_animals product_dog_foods properties ).each do |f|
-        m.file("fixtures/#{f}.yml", "test/fixtures/#{f}.yml")
-      end
-      
-      		
-      ### Public ###
-      m.directory("public/stylesheets")
-      m.file("public/stylesheets/webshop.css", "public/stylesheets/#{file_name}.css", :collision => :force )
-      m.directory("public/images")
-      %w( bullet_arrow_down bullet_arrow_up cancel minus plus palette folder_database).each { |f|
-        m.file("public/images/#{f}.png", "public/images/#{f}.png")
-      }
-      m.file("public/images/opensteam_logo_web.jpg", "public/images/opensteam_logo_web.jpg")			
-      m.file("public/images/indicator.gif", "public/images/indicator.gif")			
-      m.file("public/index.html", "public/index.html", :collision => :force )
-		
-      
-      
-      ### Migrations ###
-      unless options[:skip_migration] 
-        %w( create_properties create_sessions create_orders create_order_items create_addresses
-        create_users create_payment_types create_customers create_dummy_users
-	create_inventories create_inventories_properties ).each { |f|
-          m.migration_template "migrations/#{f}.rb", "db/migrate", :assigns => {
-            :migration_name => "#{f.classify}" }, :migration_file_name => "#{f}.rb"
-        }
-      end
-	
-      
-      ### Routes ###
-      map_namedroutes(file_name, "/#{file_name}", :controller => "#{file_name}", :action => "index" )
-      map_namedroutes("logout", "/logout", :controller => "administration", :action => "logout" )
-      map_namedroutes("login", "/login", :controller => "administration", :action => "login" )
-      map_namedroutes("signup", "/signup", :controller => "administration", :action => "signup" )
-      map_namedroutes("administration", "/administration", :controller => "administration", :action => "index" )
-      map_namedroutes("shop_index", "/#{file_name}", :controller => "#{file_name}", :action => "signup" )
-      map_namedroutes("#{file_name}_index", "/#{file_name}", :action => "index", :controller => "#{file_name}")
-      map_namedroutes("opensteam_index", "/#{file_name}", :action => "index", :controller => "#{file_name}")
-      map_namedroutes("connect", "/administration/:action", :controller => "administration" )
-      map_namedroutes("connect", "/checkout/:action", :controller => "checkout" )
-      map_namedroutes("connect", "/#{file_name}/:action", :controller => "#{file_name}" )
-      map_namedroutes("connect", "/#{file_name}/:action/:type/:id", :controller => "#{file_name}" )
-      map_namedroutes("connect", "/#{file_name}", :controller => "#{file_name}", :action => "index" )
-      
-      administration_routes = <<END_ADMIN_ROUTES
-  require 'opensteam/finder'
-  map.namespace :administration do |administration|
-	
-    administration.resources :inventories
-    administration.resources :customers
-    administration.resources :orders
+      administration_routes = <<END_OPENSTEAM_ROUTES
+    require 'opensteam/finder'
+
+    # authentication
+    map.logout '/logout', :controller => 'user_sessions', :action => 'destroy'
+    map.login '/login', :controller => 'user_sessions', :action => 'new'
+    map.register '/register', :controller => 'users', :action => 'create'
+    map.signup '/signup', :controller => 'users', :action => 'new'
+    # ---
+  
+  map.resources :searches
+  map.resources :users, :has_many => [ :orders ]
+  map.resources :orders, :belongs_to => [ :users ]
+  map.resource :user_session
+  
+  map.cart "/cart", :controller => 'cart', :action => 'index'
+  map.order_state '/orders/state/*state', :controller => 'orders', :action => 'index'
+  map.connect "/admin", :controller => 'admin', :action => 'index'
+  map.show_cart_item '/#{file_name}/show_cart_item/:id', :controller => '#{file_name}', :action => 'show_cart_item'
+
+  map.namespace :profile do |profile|
+    profile.orders_state "orders/state/*state", :controller => 'orders', :action => 'index'
+    profile.orders_state_formatted "orders.:format/state/*state", :controller => 'orders', :action => 'index'
+    profile.index "profile", :controller => 'profile', :action => 'index'
+    profile.resource :infos
+    profile.resources :orders
+  end
+
 
+  map.namespace :admin do |admin|
+    
+    admin.orders_sort "orders/sort/:sort", :controller => 'orders', :action => 'sort'
+    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.resources :inventories
+    admin.resources :users, :has_many => [ :orders ]
+    admin.resources :orders, :has_many => [ :shipments, :invoices ]
+    admin.resources :shipments
+    admin.resources :invoices
+    
     Opensteam::Find.find_product_tables.collect(&:to_sym).each do |m|
       if m.to_s.classify.constantize.column_names.include? m.to_s.classify.constantize.inheritance_column
         m.to_s.classify.constantize.find(:all).collect(&:type).collect(&:tableize).uniq.collect(&:to_sym).each do |mm|
-        administration.resources mm, :controller => m
+          admin.resources mm, :controller => m
+        end
       end
+      admin.resources m
     end
-    administration.resources m
-  end
 				
-  Opensteam::Find.find_property_tables.collect(&:to_sym).each do |m|
-    administration.resources m
+    Opensteam::Find.find_property_tables.collect(&:to_sym).each do |m|
+      admin.resources m
+    end
+
   end
-	
-end
-END_ADMIN_ROUTES
+
+  map.#{file_name} "/#{file_name}", :controller => "#{file_name}", :action => "index"  
+  map.connect "/#{file_name}/:action/:type/:id", :controller => "#{file_name}"  
+  map.connect "/#{file_name}/:action", :controller => "#{file_name}"  
+  map.connect "/checkout/:action", :controller => "checkout"  
+
+  map.opensteam_index "/#{file_name}", :controller => "#{file_name}", :action=>"index"  
+  map.#{file_name}_index "/#{file_name}", :controller => "#{file_name}", :action=>"index" 
+  map.connect "/store", :controller => "#{file_name}", :action => "index"
+  map.shop_index "/#{file_name}", :controller => "#{file_name}", :action => "index"
+  map.admin "/admin", :controller=>"admin", :action=>"index"  
+  map.administration "/admin", :controller=>"admin", :action=>"index"  
+
+END_OPENSTEAM_ROUTES
 			
       map_namespaceroutes( administration_routes )
-			
-			
 
       
       ### Patch application.rb ###
       sentinel = 'class ApplicationController < ActionController::Base'
       app_contr = 'app/controllers/application.rb'
-      incl = 'include Opensteam::UserBase::Helper'
+      incl = "layout '#{file_name}'\n\n  public :render_to_string\n  include AuthenticatedSystem\n  helper :all\n"
       gsub_file app_contr, /(#{Regexp.escape(sentinel)})/mi do |match|
         "#{match}\n  #{incl}"
       end
@@ -208,19 +138,8 @@ END_ADMIN_ROUTES
       
       ### Patch environment.rb ###
       sentinel = 'Rails::Initializer.run do |config|'
-      
-  #    incl  = 'RAILS_DEFAULT_LOGGER = Logger.new("#{RAILS_ROOT}/log/#{RAILS_ENV}.log") unless defined? RAILS_DEFAULT_LOGGER'
-  #    incl += "\nrequire 'has_many_polymorphs'"
       incl = "require 'opensteam'"
-      
-      incl2  = "  config.after_initialize do"
-      incl2 += "\n    require 'opensteam/user_base'"
-      incl2 += "\n    require 'opensteam/shopping_cart'"
-      incl2 += "\n    require 'opensteam/checkout'"
-      incl2 += "\n  end\n\n"
-      
       gsub_file 'config/environment.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
-#        "#{incl}\n\n#{match}\n\n#{incl2}"
         "#{incl}\n\n#{match}\n"
       end
 
@@ -251,24 +170,6 @@ END_ADMIN_ROUTES
       end
     end
   end
-		
-		
-  def map_namedroutes(name, path, *r)
-    route_list = r.inspect.gsub(/[\[\]{}]/, " ")
-    sentinel = 'ActionController::Routing::Routes.draw do |map|'
-			
-    logger.route "map.#{name} \"#{path}\", #{route_list}"
-    unless options[:pretend]
-      gsub_file 'config/routes.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
-        "#{match}\n  map.#{name} \"#{path}\", #{route_list}\n"
-      end
-    end
-  end
-		
-  def map_customroutes
-  end
-		
-		
 	
 	
   # Override with your own usage banner.

data/generators/opensteam/templates/{controllers/administration → app/controllers/admin}/inventories_controller.rb

@@ -1,4 +1,4 @@
-class Administration::InventoriesController < AdministrationController
+class Admin::InventoriesController < AdminController
   # GET /inventories
   # GET /inventories.xml
   
@@ -48,7 +48,7 @@ class Administration::InventoriesController < AdministrationController
     respond_to do |format|
       if @inventory.save
         flash[:notice] = 'Inventory was successfully created.'
-        format.html { redirect_to( administration_inventory_path( @inventory )  ) }
+        format.html { redirect_to( admin_inventory_path( @inventory )  ) }
         format.xml  { render :xml => @inventory, :status => :created, :location => @inventory }
       else
         format.html { render :action => "new" }
@@ -65,7 +65,7 @@ class Administration::InventoriesController < AdministrationController
     respond_to do |format|
       if @inventory.update_attributes(params[:inventory])
         flash[:notice] = 'Inventory was successfully updated.'
-        format.html { redirect_to( administration_inventory_path( @inventory ) ) }
+        format.html { redirect_to( admin_inventory_path( @inventory ) ) }
         format.xml  { head :ok }
       else
         format.html { render :action => "edit" }
@@ -81,7 +81,7 @@ class Administration::InventoriesController < AdministrationController
     @inventory.destroy
 
     respond_to do |format|
-      format.html { redirect_to(administration_inventories_url) }
+      format.html { redirect_to(admin_inventories_url) }
       format.xml  { head :ok }
     end
   end

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

@@ -0,0 +1,106 @@
+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
+    
+    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]
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.xml  { render :xml => @invoices }
+      format.js { render :partial => "invoices", :layout => false }
+    end
+  end
+  
+  
+  def show
+    @order = Opensteam::OrderBase::Order.find( params[:order_id] )
+    @invoice ||= Opensteam::InvoiceBase::Invoice.find( params[:id] )
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.xml  { render :xml => @invoice.to_xml( :root => 'invoice' ) }
+    end
+  end
+  
+  
+  def new
+    @order = Opensteam::OrderBase::Order.find( params[:order_id] )
+    @invoice = @order.invoices.new
+    
+    if @order.order_items.all_invoiced?
+      flash[:error] = "Cannot create invoice :  All order-items have an invoice!"
+      redirect_to admin_order_path( @order )
+    end
+
+  end
+  
+  
+  
+  def create
+    @order = Opensteam::OrderBase::Order.find( params[:order_id] )
+    @invoice = @order.invoices.new( params[:invoice] )
+    @address = @invoice.address
+    
+    @order_items = @order.order_items.select { |o|
+      params[:order_items].keys.include?( o.id.to_s ) && params[:order_items][ o.id.to_s ] == "1"
+    }
+
+    @invoice.order_items << @order_items
+    
+    ret = @address.update_attributes( params[:address] ) &&
+      @invoice.save
+    
+    
+    
+    respond_to do |format|
+      if ret
+        flash[:notice] = 'Invoice was successfully created.'
+        format.html { redirect_to( admin_order_path( @order ) ) }
+        format.xml  { render :xml => @invoice.to_xml( :root => 'invoice') , :status => :created, :location => @invoice }
+      else
+        format.html { render :action => "new" }
+        format.xml  { render :xml => @invoice.errors, :status => :unprocessable_entity }
+      end
+    end
+    
+  end
+  
+  def update
+    @invoice = Opensteam::InvoiceBase::Invoice.find( params[:id] )
+
+    respond_to do |format|
+      if @invoice.update_attributes( params[:invoice] )
+        format.html { redirect_to( admin_order_path( @invoice.order ) ) }
+        format.xml { head :ok }
+      else
+        format.html { render :action => "show" }
+        format.xml { render :xml => @invoice.errors, :status => :unprocessable_entity }
+      end
+    end
+ 
+
+  end
+  
+   
+end

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

@@ -0,0 +1,113 @@
+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
+  
+  
+
+    
+  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
+    if params[:user_id]
+      @customer = Opensteam::UserBase::User.find( params[:user_id] )
+      @orders = @customer.orders
+    else
+      @orders ||= find_orders
+    end
+    
+    respond_to do |format|
+      format.html # index.html.erb
+      format.xml  { render :xml => @orders }
+      format.js { render :partial => "orders", :layout => false }
+    end
+  end
+  
+  
+  def show
+    @order ||= Opensteam::OrderBase::Order.find( params[:id] )
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.xml  { render :xml => @order }
+    end
+  end
+  
+  
+  
+  def update
+    @order = Opensteam::OrderBase::Order.find( params[:id] )
+
+    respond_to do |format|
+      if @order.update_attributes( params[:order] )
+        format.html { redirect_to admin_order_path( @order ) }
+        format.xml { head :ok }
+      else
+        format.html { render :action => "show" }
+        format.xml { render :xml => @order.errors, :status => :unprocessable_entity }
+      end
+    end
+ 
+
+  end
+  
+  
+  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
+  end
+ 
+end

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

@@ -0,0 +1,17 @@
+class Admin::SearchController < AdminController
+
+
+  def sort
+    if params[:sort]
+      model = params[:model].demodulize.classify.constantize rescue nil
+      @result = sort_model( model, @sort_column )
+    end
+    render :partial => params[:partial], :collection => @result
+  end
+  
+  
+  
+
+
+  
+end