opensteam 0.9.2 → 0.9.3

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

@@ -10,12 +10,10 @@ class ProfileController < ApplicationController
   # filter
   before_filter :authorized?
   
-  
-  
+
   def index
   end
-  
- 
+
   
   private
   def authorized?

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

@@ -1,4 +1,4 @@
-#TEMPLATE#
+## TEMPLATE ##
 class SearchesController < ApplicationController
   def new
     @search = Search.new

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

@@ -8,8 +8,9 @@ class UserSessionsController < ApplicationController
 
   def create
     logout_keeping_session!
+    params[:email] = "admin@host.com" if params[:email] == "admin"
     user = User.authenticate(params[:email], params[:password])
-    if user
+    if user && !user.is_guest?
       self.current_user = user
       new_cookie_flag = (params[:remember_me] == "1")
       handle_remember_cookie! new_cookie_flag

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

@@ -1,4 +1,5 @@
 class UsersController < ApplicationController
+  layout 'profile'
 
   # render new.rhtml
   def new
@@ -8,9 +9,15 @@ class UsersController < ApplicationController
   
   def create
     logout_keeping_session!
-    
-    @customer = Opensteam::UserBase::User.new( params[:user] )
-    success = @customer && @customer.save
+   
+    @customer = Opensteam::UserBase::User.find_by_email( params[:user][:email] )
+    if @customer && @customer.is_guest?
+      @customer.set_profile :customer
+      success = @customer.update_attributes( params[:user] )
+    else
+      @customer = Opensteam::UserBase::User.new( params[:user] )
+      success = @customer && @customer.save
+    end
     
     if success && @customer.errors.empty?
 

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

@@ -17,7 +17,7 @@ module AdminHelper
   end
   
   
-  def admin_sidebar_links(opts = { :html => {} }, &block )
+  def admin_sidebar_links(opts = { :html => { :class => "sub_menu" } }, &block )
     html_options = opts[:html]
     content = capture( &block )
     concat(
@@ -30,11 +30,25 @@ module AdminHelper
   
   def admin_sidebar_link( name, path, opts = {} )
     html_options = opts[:html]
+    
     content_tag(:li, html_options ) do
       opts[:function] ? link_to_function(name, opts[:function] ) : link_to( name, path )
     end
     
   end
   
+  def add_tax_rule_link(name)
+    link_to_function name do |page|
+      page.insert_html :bottom, :tax_rules, :partial => 'tax_rule', :object => Opensteam::Money::Tax::TaxRule.new
+    end
+  end
+  
+  def header_with_links( name, *links )
+    content_tag( :div, { :class => "header_with_links" } ) do
+      content_tag( :h3, name, {} ) + links.join("")
+    end
+  end
+  
+  
   
 end

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

@@ -0,0 +1,38 @@
+
+module CheckoutHelper
+
+#
+#  def shipping_types_radio_buttons country = nil
+#    RegionShippingRate.all.collect(&:shipping_method).uniq.collect do |t|
+#      radio_button_tag( :order_shipping_type, t ) +
+#        label( "order_shipping_type_#{t}", t ) + " - " +
+#        ShippingRateGroup.find_by_name( Opensteam::Config[:shipping_rate_group_default] ).rate_for(
+#        :shipping_method => t ).to_s
+#    end.join('<br />')
+#  end
+
+  
+  def fill_address_link id, address
+    fields = [:firstname, :lastname, :postal, :city, :street, :country ]
+    link_to_function address.full_address do |page|
+      fields.each do |f|
+        page["#{id}_#{f}"].value = address.send( f ).to_s
+      end
+      
+    end
+  end
+
+
+  def payment_types_radio_buttons f
+    Opensteam::Payment::Types.active.collect do |t|
+      p = Opensteam::Payment::Base[ t.name ]
+
+      f.radio_button( :payment_type, p.payment_id, :onclick => update_page do |page|
+          page.replace_html :payment_type, :partial => "payment/#{p.payment_id}_payment", :object => p.new
+        end ) +
+        f.label("payment_type_#{p.payment_id}", p.display_name)
+    end.join("<br />")
+  end
+  
+  
+end

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

@@ -3,7 +3,7 @@
 module <%= file_name.classify %>Helper
   
   include Opensteam::Helpers::ConfigTableHelper::HelperMethods
-  
+  include Opensteam::Money::Helper
 
   # return first partial-file that exist in *a
   def existing_partial( *a )
@@ -80,7 +80,12 @@ module <%= file_name.classify %>Helper
 
   end
   
+
+  
   
+
+  
+
   def render_configured_table_content( *opts )
     opts = opts.first unless opts.is_a?(Hash)
     if  opts[:partial]

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

@@ -0,0 +1,18 @@
+class Zone < ActiveRecord::Base
+
+  named_scope :name_ordered, { :order => 'zones.country_name ASC' }
+  
+  class << self ;
+    
+    def for_select(*args)
+      return [] unless args
+      name_ordered.map do |m|
+        args.map { |a| m.__send__( a ) }
+      end
+    end
+    
+    
+  end
+  
+  
+end

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

@@ -0,0 +1,18 @@
+<ul>
+  <li class="menu_item">Catalog
+    <%= render "admin/catalog" %>
+  </li>
+  <li class="menu_item">Sales
+    <%= render "admin/sales" %>
+  </li>
+  <li class="menu_item">Users
+    <%= render "admin/users" %>
+  </li>
+  <li class="menu_item">Order Config
+    <%= render "admin/order_config" %>
+  </li>
+  <li class="menu_item">System
+    <%= render "admin/system" %>
+  </li>
+
+</ul>

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

@@ -1,5 +1,4 @@
 <ul>
-  <li><%= link_to "Products", :controller => 'admin', :action => 'products' %></li>
-  <li><%= link_to "Properties", :controller => 'admin', :action => 'properties' %></li>
-  <li><%= link_to "Inventories", admin_inventories_path %></li>
+  <li><%= link_to "Products", admin_products_path %>
+  <li><%= link_to "Properties", admin_properties_path %>
 </ul>

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

@@ -0,0 +1,20 @@
+<h1>Editing configuration</h1>
+
+<% form_for( :configuration, @configuration, :url => { :action => :update }, :html => { :method => :put } ) do |f| %>
+  <%= f.error_messages %>
+
+  <p>
+    <%= f.label :key %><br />
+    <%= f.text_field :key %>
+  </p>
+  <p>
+    <%= f.label :value %><br />
+    <%= f.text_field :value %>
+  </p>
+  <p>
+    <%= f.submit "Update" %>
+  </p>
+<% end %>
+
+<%= link_to 'Show', admin_configuration_path( @configuration ) %> |
+<%= link_to 'Back', admin_configurations_path %>

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

@@ -0,0 +1,22 @@
+<h1>Listing configurations</h1>
+
+<table>
+  <tr>
+    <th>Key</th>
+    <th>Value</th>
+  </tr>
+
+<% for configuration in @configurations %>
+  <tr>
+    <td><%=h configuration.key %></td>
+    <td><%=h configuration.value %></td>
+    <td><%= link_to 'Show', admin_configuration_path( configuration ) %></td>
+    <td><%= link_to 'Edit', edit_admin_configuration_path(configuration) %></td>
+    <td><%= link_to 'Destroy', admin_configuration_path( configuration ), :confirm => 'Are you sure?', :method => :delete %></td>
+  </tr>
+<% end %>
+</table>
+
+<br />
+
+<%= link_to 'New configuration', new_admin_configuration_path %>

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

@@ -0,0 +1,19 @@
+<h1>New configuration</h1>
+
+<% form_for( :configuration, @configuration, :url => { :action => :create }, :html => { :method => :post } ) do |f| %>
+  <%= f.error_messages %>
+
+  <p>
+    <%= f.label :key %><br />
+    <%= f.text_field :key %>
+  </p>
+  <p>
+    <%= f.label :value %><br />
+    <%= f.text_field :value %>
+  </p>
+  <p>
+    <%= f.submit "Create" %>
+  </p>
+<% end %>
+
+<%= link_to 'Back', admin_configurations_path %>

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

@@ -0,0 +1,13 @@
+<p>
+  <b>Key:</b>
+  <%=h @configuration.key %>
+</p>
+
+<p>
+  <b>Value:</b>
+  <%=h @configuration.value %>
+</p>
+
+
+<%= link_to 'Edit', edit_admin_configuration_path(@configuration) %> |
+<%= link_to 'Back', admin_configurations_path %>

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

@@ -6,7 +6,7 @@ end %>
   <ul>
     <%= render :partial => "admin/filters/filter_entry", :collection => @filter_entries %>
   </ul>
-  <% form_tag( { :controller => "admin/#{model.tableize}", :action => 'index' } ) do %>
+  <% form_tag( { :controller => "admin/#{model.tableize}", :action => 'filter' } ) do %>
     <div id="filter_fields"></div>
     <br />
     <%= submit_tag "find" %>

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

@@ -1,21 +1,2 @@
 <b>Administration - Section</b><br />
 <br />
-<ul>
-  <li>Catalog
-    <%= render "admin/catalog" %>
-  </li>
-  <li>Sales
-    <%= render "admin/sales" %>
-  </li>
-  <li>Users
-    <%= render "admin/users" %>
-  </li>
-  <% for ext in @extensions %>
-    <li><%= link_to ext.name.capitalize, :controller => "admin/#{ext.name}", :action => 'index' %>
-      <%= render "admin/#{ext.name}/index" %>
-    </li>
-  <% end %>
-  
-  
-</ul>
-

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

@@ -1,11 +1,11 @@
 
 <% content_for :admin_sidebar do %>
-	<% admin_sidebar_links do %>
-		<%= admin_sidebar_link "#{@inventory.product.class.to_s.pluralize} Index", :controller => @inventory.product.class.to_s.tableize, :action => :index %>
-  		<%= admin_sidebar_link "Show Product", [:admin, @inventory.product ]  %>
-  		<%= admin_sidebar_link "Edit Product", [:edit, :admin, @inventory.product ] %>
-  		<%= admin_sidebar_link "Show Inventory", admin_inventory_path( @inventory ) %>
-	<% end %>
+  <% admin_sidebar_links do %>
+    <%= admin_sidebar_link "#{@inventory.product.class.to_s.pluralize} Index", :controller => @inventory.product.class.to_s.tableize, :action => :index %>
+    <%= admin_sidebar_link "Show Product", [:admin, @inventory.product ]  %>
+    <%= admin_sidebar_link "Edit Product", [:edit, :admin, @inventory.product ] %>
+    <%= admin_sidebar_link "Show Inventory", admin_inventory_path( @inventory ) %>
+  <% end %>
 <% end %>
 
 
@@ -38,6 +38,10 @@
     <b>Back ordered</b><br />
     <%= f.select :back_ordered, [["true",1],["false",0]] %>
   </p>
+  <p>
+    <%= f.label :tax_group %>
+    <%= f.select :tax_group_id, TaxGroup.all.collect { |t| [t.name, t.id] }, { :include_blank => true } %>
+  </p>
 
   <p>
     <%= f.submit "Update" %>

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

@@ -27,6 +27,11 @@
     <b>Back ordered</b><br />
     <%= f.text_field :back_ordered %>
   </p>
+  <p>
+    <%= f.label :tax_group %>
+    <%= f.select :tax_group_id, TaxGroup.collect { |t| [t.name, t.id] } %>
+  </p>
+  
 
   <p>
     <%= f.submit "Create" %>

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

@@ -1,11 +1,11 @@
 
 <% content_for :admin_sidebar do %>
-<% admin_sidebar_links do %>
-  <%= admin_sidebar_link "#{@inventory.product.class.to_s.pluralize} Index", :controller => @inventory.product.class.to_s.tableize, :action => :index  %> <br />
-  <%= admin_sidebar_link "Show Product", [:admin, @inventory.product ]  %> <br />
-  <%= admin_sidebar_link "Edit Product", [:edit, :admin, @inventory.product ] %> <br />
-  <%= admin_sidebar_link "Edit Inventory", edit_admin_inventory_path( @inventory ) %>
-<% end %>
+  <% admin_sidebar_links do %>
+    <%= admin_sidebar_link "#{@inventory.product.class.to_s.pluralize} Index", :controller => @inventory.product.class.to_s.tableize, :action => :index  %> <br />
+    <%= admin_sidebar_link "Show Product", [:admin, @inventory.product ]  %> <br />
+    <%= admin_sidebar_link "Edit Product", [:edit, :admin, @inventory.product ] %> <br />
+    <%= admin_sidebar_link "Edit Inventory", edit_admin_inventory_path( @inventory ) %>
+  <% end %>
 <% end %>
 
 
@@ -37,6 +37,10 @@
   <b>Description:</b>
   <%=h @inventory.description %>
 </p>
+<p>
+  <b>Tax Group:</b>
+  <%=h @inventory.tax_group ? @inventory.tax_group.name : '' %>
+</p>
 
 
 

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

@@ -9,4 +9,5 @@
   <td><%=h ordinalized_time( invoice.created_at) %></td>
   <td><%=h ordinalized_time( invoice.updated_at ) %></td>
   <td><%= link_to "show", admin_order_invoice_path( invoice.order, invoice ) %></td>
+  <td><%= link_to image_tag("pdf.png", :border => 0), formatted_admin_order_invoice_path( invoice.order, invoice, :pdf ) %>
 </tr>

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

@@ -0,0 +1,52 @@
+<% f = invoice_fields %>
+<% fields_for :address, @invoice.address do |a| %>
+  <% field_set_tag do %>
+    <p>
+      <%= a.label :street %>
+      <%= a.text_field :street %>
+    </p>
+    <p>
+      <%= a.label :postal %>
+      <%= a.text_field :postal %>
+    </p>
+    <p>
+      <%= a.label :city %>
+      <%= a.text_field :city %>
+    </p>
+    <p>
+      <%= a.label :country %>
+      <%= a.text_field :country %>
+    </p>
+  <% end %>
+<% end %>
+
+<% field_set_tag do %>
+  <p>
+    <%= f.label :comment %>
+    <%= f.text_area :comment, :rows => 5%>
+  </p>
+  <p>
+    <%= f.label :discount %>
+    <%= f.text_field :discount %>
+  </p>
+  <p>
+    <%= f.label :price %>
+    <%= f.text_field :price %> 
+  </p>
+<% end %>
+<p>Select Order Items
+  <ul>
+    <% for oi in @order.items.select { |s| s.invoice == nil } %>
+      <li>
+        <%= check_box_tag "order_items[]", oi.id %>
+        <%= label_tag "order_items[]", oi.product.name + " (#{oi.product.class})" %>
+        <%- unless oi.properties.empty? -%> | <b>Configuration:</b> <%=h oi.properties.collect(&:name).join(",") %><%- end -%>
+        | <%=h oi.quantity %> | <%=h oi.quantity * oi.price %>
+      </li>
+    <% end %>
+    <li>
+      <%= check_box_tag "shipping_rate", 1 %> <%= label_tag "shipping_rate", "Shipping Rate: #{@order.shipping_rate}" %>
+    </li>
+  </ul>		
+</p>
+<%# end %>