opensteam 0.9.1 → 0.9.2

data/generators/opensteam/templates/app/helpers/webshop_helper.rb

@@ -1,6 +1,9 @@
 # Methods added to this helper will be available to all templates in the application.
 ## TEMPLATE ##
 module <%= file_name.classify %>Helper
+  
+  include Opensteam::Helpers::ConfigTableHelper::HelperMethods
+  
 
   # return first partial-file that exist in *a
   def existing_partial( *a )

data/generators/opensteam/templates/app/models/filter_entry.rb

@@ -0,0 +1,17 @@
+class FilterEntry < ActiveRecord::Base
+  
+  validates_inclusion_of :op, :in => %w( LIKE = > < )
+  
+  def to_sql
+    m = model.classify.constantize.osteam_configtable[ key.downcase ] rescue nil
+    m ? "(" << Array(m.sql).collect { |s| "#{s} #{op} :#{key.downcase}" }.join(" OR ") << ")" : "#{key.tableize} #{op} :#{key.downcase}"
+  end
+  
+    
+  def to_val
+    op =~ /LIKE/ ? { key.downcase.to_sym => "%#{val}%" } : { key.downcase.to_sym => "#{val}" }
+  end
+ 
+  
+  
+end

data/generators/opensteam/templates/app/views/admin/filters/_filter.html.erb

@@ -0,0 +1,14 @@
+<%= link_to_function "add filter" do |page|
+  page.insert_html :bottom, :filter_fields, :partial => "admin/filters/filter_fields", :object => FilterEntry.new, :locals => { :model => model }
+end %>
+
+<div id="<%= id %>" >
+  <ul>
+    <%= render :partial => "admin/filters/filter_entry", :collection => @filter_entries %>
+  </ul>
+  <% form_tag( { :controller => "admin/#{model.tableize}", :action => 'index' } ) do %>
+    <div id="filter_fields"></div>
+    <br />
+    <%= submit_tag "find" %>
+  <% end %>
+</div>

data/generators/opensteam/templates/app/views/admin/filters/_filter_entry.html.erb

@@ -0,0 +1,6 @@
+<%- form_tag :action => 'delete_filter', :id => filter_entry.id, :model => filter_entry.model do -%>
+  <li>
+    <%=h filter_entry.key %> <%=h filter_entry.op %> <%= filter_entry.val %> <%=  submit_tag_with_image( "delete_filter", "cross.png", { :alt => "delete filter?" } ) -%>
+  </li>
+<%- end -%>
+

data/generators/opensteam/templates/app/views/admin/filters/_filter_fields.html.erb

@@ -0,0 +1,8 @@
+<% fields_for "filter[]", filter_fields do |filter| %>
+  <%= filter.hidden_field :id %>
+  <%= hidden_field_tag "filter[][model]", model %>
+
+  <%= filter.select :key, model.classify.constantize.osteam_configtable.columns.collect(&:id) %> - 
+  <%= filter.select :op, ["LIKE", "=", ">", "<" ]  %> - 
+  <%= filter.text_field :val, :size => 5 %><br />
+<% end %>

data/generators/opensteam/templates/app/views/admin/invoices/_invoices.html.erb

@@ -1,11 +1,11 @@
-<% render_configured_table :invoice do %>
-  <%= render_configured_table_header :invoice do |column|
-    url = { :controller =>"admin/invoices", :action => 'sort', :sort => column.id, :model => 'Invoice' }
+<% osteam_sort_table Opensteam::InvoiceBase::Invoice do |t| %>
+  <%= t.table_header do |column|
+    url = { :controller => "admin/invoices", :action => 'index', :sort => column.id  }
     url[:order_id] = @order.id if @order
-    link_to_remote( column.name,
-      :url => url,
-      :update => id  )
-  end %>
 
-  <%= render_configured_table_content( :partial => "admin/invoices/invoice", :collection => invoices, :id => id ) %>
-<% end %>
+    link_to_remote( column.name, :url => url, :update => id, :method => 'get' )
+  end %>
+  <tbody id="<%= id %>">
+    <%= render :partial => "admin/invoices/invoice", :collection => invoices, :id => id %>
+  </tbody>
+<% end %>

data/generators/opensteam/templates/app/views/admin/invoices/index.html.erb

@@ -1,6 +1,10 @@
 <h2> Invoices </h2>
 <br />
 <div id="invoices_content_div">
-  <%= render :partial => "invocies", :object => @invoices, :locals => { :id => "invoices_content_table1" } %>
+  <%= render :partial => "invoices", :object => @invoices, :locals => { :id => "invoices_content_table1" } %>
 </div>
 
+<% content_for( :admin_sidebar2 ) do %>
+  <%= render :partial => "admin/filters/filter", :locals => { :id => "invoice_filter", :model => "Invoice" } %>
+<% end %>
+

data/generators/opensteam/templates/app/views/admin/orders/_orders.html.erb

@@ -1,19 +1,18 @@
 
-<%= text_field_tag( :livesearch ) %>
-<% render_configured_table :order do %>
-  <%= render_configured_table_header :order do |column|
-	url = { :controller =>"admin/orders", :action => 'sort', :sort => column.id, :model => 'Order' }
-	link_to_remote( column.name,
-	:url => url,
-	:update => id  )
-	end %>
-	
-	<%= render_configured_table_content( :partial => "admin/orders/order", :collection => orders, :id => id ) %>
+
+<% osteam_sort_table Opensteam::OrderBase::Order do |t| %>
+  <%= t.table_header do |column|
+    url = { :controller => "admin/orders", :action => 'index', :sort => column.id  }
+    url[:customer_id] = @customer.id if @customer
+
+    link_to_remote( column.name, :url => url, :update => id, :method => 'get' )
+  end %>
+  <tbody id="<%= id %>">
+    <%= render :partial => "admin/orders/order", :collection => orders, :id => id %>
+  </tbody>
 <% end %>
 
-<%= observe_field :livesearch, 
-  :url => { :action => :livesearch, :controller => 'admin/orders', :update_id => id },
-  :update => id,
-  :frequency => 2,
-  :with => :livesearch
-%>
+
+<% content_for( :admin_sidebar2 ) do %>
+  <%= render :partial => "admin/filters/filter", :locals => { :id => "users_filter", :model => "Order" } %>
+<% end %>

data/generators/opensteam/templates/app/views/admin/orders/show.html.erb

@@ -11,6 +11,12 @@
 <h2>Order # <%= @order.id %></h2>
 <h3>State: <%= @order.state %></h3>
 
+<% @order.events.select { |s| s =~ /^view_link_to_/ }.each do |o| %>
+  <% o =~ /^view_link_to_(.+)$/ %>
+  <%= link_to $1 ? $1.humanize : o , @order.__send__( o ) %>
+<% end %>
+
+
 <div id="order_customer" class="sub_content_box">
   <h3>Customer <%= link_to "show", admin_user_path( @order.customer ) %></h3>
   <%= render :partial => "profile/infos/customer", :object => @order.customer %>
@@ -19,14 +25,8 @@
 <div id="order_shipments" class="sub_content_box" style="display:none;">
   <h3>Shipments</h3>
   
-  
-  <% @order.events.select { |s| s =~ /^view_link_to_/ }.each do |o| %>
-<% o =~ /^view_link_to_(.+)$/ %>
-    <%= link_to $1 ? $1.humanize : o , @order.__send__( o ) %>
-  <% end %>
-  
   <%#  unless @order.finished? %>
-    <%# = link_to "Create Shipment", :controller => 'shipments', :action => 'new', :order_id => @order.id %>
+  <%# = link_to "Create Shipment", :controller => 'shipments', :action => 'new', :order_id => @order.id %>
   <%#  end %>
   <%= render :partial => "admin/shipments/shipments", :object => @order.shipments, 
     :locals => { :id => "order_shipments_table" } %> 
@@ -34,7 +34,8 @@
 
 <div id="order_invoices" class="sub_content_box" style="display:none;">
   <h3>Invoices</h3>
-  <%= render :partial => "admin/invoices/invoices", :object => @order.invoices %>
+  <%= render :partial => "admin/invoices/invoices", :object => @order.invoices,
+    :locals => { :id => "order_invoices_table" } %>
 </div>
 
 <div id="order_order_items" class="sub_content_box" style="display:none;">

data/generators/opensteam/templates/app/views/admin/shipments/_shipments.html.erb

@@ -1,11 +1,11 @@
-<% render_configured_table :shipment do %>
-  <%= render_configured_table_header :shipment do |column|
-	url = { :controller =>"admin/shipments", :action => 'sort', :sort => column.id, :model => 'Shipment' }
-	url[:order_id] = @order.id if @order
-	link_to_remote( column.name,
-	:url => url,
-	:update => id  )
-	end %>
-	
-	<%= render_configured_table_content( :partial => "admin/shipments/shipment", :collection => shipments, :id => id ) %>
-<% end %>
+<% osteam_sort_table Opensteam::ShipmentBase::Shipment do |t| %>
+  <%= t.table_header do |column|
+    url = { :controller => "admin/shipments", :action => 'index', :sort => column.id  }
+    url[:order_id] = @order.id if @order
+
+    link_to_remote( column.name, :url => url, :update => id, :method => 'get' )
+  end %>
+  <tbody id="<%= id %>">
+    <%= render :partial => "admin/shipments/shipment", :collection => shipments, :id => id %>
+  </tbody>
+<% end %>

data/generators/opensteam/templates/app/views/admin/shipments/index.html.erb

@@ -4,3 +4,6 @@
   <%= render :partial => "shipments", :object => @shipments, :locals => { :id => "new_order" } %>
 </div>
 
+<% content_for( :admin_sidebar2 ) do %>
+  <%= render :partial => "admin/filters/filter", :locals => { :id => "shipment_filter", :model => "Shipment" } %>
+<% end %>

data/generators/opensteam/templates/app/views/admin/users/edit.html.erb

@@ -1,6 +1,8 @@
 <h3>Edit <%= params[:type] ? params[:type].humanize : "User" %></h3>
 
 <% form_for :user, @user, :url => { :controller => 'admin/users', :action => 'update', :type => params[:type] }, :html => { :method => 'put' } do |f| %>
-    <%= render :partial => "common/signup_fields", :locals => { :f => f } %>
+
+  <%= select_tag :type, options_for_select( @profiles.collect { |s| [s.name, s.id] }, @user.profile_id ) %>
+  <%= render :partial => "common/signup_fields", :locals => { :f => f } %>
 
 <% end %>

data/generators/opensteam/templates/app/views/admin/users/index.html.erb

@@ -1,7 +1,19 @@
 <h3><%= params[:type] ? params[:type].humanize : "Users" %></h3>
-<br />
-<br />
-<table>
-  <%= render :partial => "admin/users/#{ params[:type] ? params[:type] + 's_header' : 'users_header' }" %>
-  <%= render :partial => "admin/users/#{ params[:type] ? params[:type] + 's' : 'users' }", :collection => @users %>
-</table>
+
+
+<%= link_to "New #{params[:type] ? params[:type].classify : 'User'} ", new_admin_user_path %>
+
+<% osteam_sort_table Opensteam::UserBase::User do |t| %>
+  <%= t.table_header do |column|
+    url = { :controller => "admin/users", :action => 'index', :sort => column.id }
+    url[:type] = params[:type] if params[:type]
+    link_to_remote( column.name, :url => url, :update => "users_table1", :method => :get )
+  end %>
+  <tbody id="users_table1">
+    <%= render :partial => "admin/users/#{ params[:type] ? params[:type] + 's' : 'users' }", :collection => @users, :id => :users_tyble1 %>
+  </tbody>
+<% end %>
+
+<% content_for(:admin_sidebar) do  %>
+<%= render :partial => "admin/filters/filter", :locals => { :id => "users_filter", :model => "User" } %>
+<% end %>

data/generators/opensteam/templates/app/views/admin/users/new.html.erb

@@ -2,5 +2,7 @@
 
 <% form_for :user, @user, :url => { :controller => 'admin/users', :action => 'create', :type => params[:type] } do |f| %>
     <%= render :partial => "common/signup_fields", :locals => { :f => f } %>
+    <%= select_tag :type, options_for_select( @profiles.collect { |s| [s.name, s.id] }, @user.profile_id ) %>
+
 
 <% end %>

data/generators/opensteam/templates/app/views/layouts/admin.html.erb

@@ -33,6 +33,10 @@
         <div id="content">
           <%= yield %>
         </div>
+        
+        <div id="sidebar2">
+          <%= yield(:admin_sidebar2) || "" %>
+        </div>
       </div>
       
       <div id="footer">

data/generators/opensteam/templates/app/views/profile/orders/_orders.html.erb

@@ -1,19 +1,9 @@
-
-<%= text_field_tag( :livesearch ) %>
-<% render_configured_table :order do %>
-  <%= render_configured_table_header :order do |column|
-	url = { :controller =>"profile/orders", :action => 'sort', :sort => column.id, :model => 'Order' }
-	link_to_remote( column.name,
-	:url => url,
-	:update => id  )
-	end %>
-	
-	<%= render_configured_table_content( :partial => "profile/orders/order", :collection => orders, :id => id ) %>
-<% end %>
-
-<%= observe_field :livesearch, 
-  :url => { :action => :livesearch, :controller => 'profile/orders', :update_id => id },
-  :update => id,
-  :frequency => 2,
-  :with => :livesearch
-%>
+<% osteam_sort_table Opensteam::OrderBase::Order do |t| %>
+  <%= t.table_header do |column|
+    url = { :controller => "profile/orders", :action => 'index', :sort => column.id  }
+    link_to_remote( column.name, :url => url, :update => id, :method => 'get' )
+  end %>
+  <tbody id="<%= id %>">
+    <%= render :partial => "profile/orders/order", :collection => orders, :id => id %>
+  </tbody>
+<% end %>

data/generators/opensteam/templates/config/initializers/opensteam_model_tables.rb

@@ -1,57 +1,96 @@
-Order.class_eval do
-  
-  include Opensteam::Helper::ConfigurableTable
-  
-  configure_table :order do
-    default_sort_col :id
-    column :id, :name => "#"
+require 'opensteam/helpers/config_table_helper'
+require 'opensteam/user_base'
+
+
+Opensteam::OrderBase::Order.send( :include, Opensteam::Helpers::ConfigTableHelper )
+
+
+Opensteam::OrderBase::Order.class_eval do
+  opensteam_filter :order do
+    include_associations [:customer, :shipping_address, :payment_address, :order_items ]
+    
+    default_order_column :id
+    
+    column :id, :name => "#", :order => "orders.id"
     column :order_items, :name => "OrderItems", :method => :size
-    column :customer, :name => "Customer", :method => :email
-    column :shipping_address, :name => "Shipping Address", :method => :to_s
+    column :customer, :name => "Customer", :order => "users.email"
+    column :shipping_address, :name => "Shipping Address", :method => :to_s, :sql => ["addresses.street", "addresses.city" ]
     column :payment_address, :name => "Payment Address", :method => :to_s
-    column :state, :name => "State"
-    column :created_at, :name => "Created"
-    column :updated_at, :name => "Updated"
+    column :state, :name => "State", :order => "orders.state"
+    column :created_at, :name => "Created", :order => "orders.created_at"
+    column :updated_at, :name => "Updated", :order => "orders.updated_at"
+    
   end
   
   
+  
 end
 
+Opensteam::UserBase::User.send( :include, Opensteam::Helpers::ConfigTableHelper )
 
-Shipment.class_eval do
-  
-  include Opensteam::Helper::ConfigurableTable
-  
-  configure_table :shipment do
-    default_sort_col :id
-    column :id, :name => "#"
+
+Opensteam::UserBase::User.class_eval do
+  opensteam_filter :user do
+    include_associations [ :orders, :profile ]
+    
+    default_order_column :id
+    
+    column :id, :name => "#", :order => "users.id"
+    column :profile, :name => "Profile", :order => "profiles.name"
+    column :email, :name => "Email", :order => "users.email"
+    column :firstname, :name => "Firstname", :order => "users.firstname"
+    column :lastname, :name => "Lastname", :order => "users.lastname"
+    column :orders, :name => "Orders", :method => :size, :sql => "count(orders)"
+    column :created_at, :name => "Created", :order => "users.created_at"
+    column :updated_at, :name => "Updated", :order => "users.updated_at"
+    
+  end
+end
+
+
+Opensteam::ShipmentBase::Shipment.send( :include, Opensteam::Helpers::ConfigTableHelper )
+
+Opensteam::ShipmentBase::Shipment.class_eval do
+  opensteam_filter :shipment do
+    include_associations [ :order, :order_items, :address ]
+    
+    default_order_column :id
+    
+    column :id, :name => "#", :order => "shipments.id"
     column :order_items, :name => "OrderItems", :method => :size
-    column :address, :name => "Address", :method => :to_s
-    column :state, :name => "State"
-    column :comment, :name => "Comment"
-    column :created_at, :name => "Created"
-    column :updated_at, :name => "Updated"
+    column :address, :name => "Address", :method => :to_s, :sql => ["addresses.street", "addresses.city" ]
+    column :state, :name => "State", :order => "shipments.state"
+    column :comment, :name => "Comment", :order => "shipments.comment"
+    column :created_at, :name => "Created", :order => "shipments.created_at"
+    column :updated_at, :name => "Updated", :order => "shipments.updated_at"
+    
   end
-  
-  
-  
 end
 
-Invoice.class_eval do
-  
-  include Opensteam::Helper::ConfigurableTable
-  
-  configure_table :invoices do
-    default_sort_col :id
-    column :id, :name => "#"
+
+Opensteam::InvoiceBase::Invoice.send( :include, Opensteam::Helpers::ConfigTableHelper )
+
+Opensteam::InvoiceBase::Invoice.class_eval do
+  opensteam_filter :invoice do
+    include_associations [ :order, :order_items, :address ]
+    
+    default_order_column :id
+    
+    column :id, :name => "#", :order => "invoices.id"
     column :order_items, :name => "OrderItems", :method => :size
-    column :address, :name => "Address", :method => :to_s
-    column :state, :name => "State"
-    column :comment, :name => "Comment"
-    column :price, :name => "Price"
-    column :created_at, :name => "Created"
-    column :updated_at, :name => "Updated"
+    column :address, :name => "Address", :method => :to_s, :sql => ["addresses.street", "addresses.city" ]
+    column :state, :name => "State", :order => "invoices.state"
+    column :comment, :name => "Comment", :order => "invoices.comment"
+    column :price, :name => "Price", :order => "invoices.price"
+    column :created_at, :name => "Created", :order => "invoices.created_at"
+    column :updated_at, :name => "Updated", :order => "invoices.updated_at"
+    
   end
+end
+
+
+
+
   
   
-end
+

data/generators/opensteam/templates/db/migrate/20080609095728_create_order_items.rb

@@ -2,6 +2,7 @@ class CreateOrderItems < ActiveRecord::Migration
   def self.up
     create_table :order_items do |t|
       t.references :order
+      
       t.integer :quantity
       t.string :itemid
       t.references :inventory

data/generators/opensteam/templates/db/migrate/20080609095729_create_orders.rb

@@ -1,7 +1,7 @@
 class CreateOrders < ActiveRecord::Migration
   def self.up
-    create_table :orders, :id => false, :force => true do |t|
-      t.string :id, :null => false
+    create_table :orders, :force => true do |t|
+     #  t.string :id, :null => false
       t.references :customer
       
       t.references :payment_type