opensteam 0.9.2 → 0.9.3

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

@@ -26,11 +26,11 @@
       
       <div id="content_box">
         
-        <div id="sidebar">
+        <div class="sub_content" id="sidebar">
           <%%= yield(:admin_sidebar) || "" %>
         </div>
         
-        <div id="content">
+        <div class="sub_content" id="content">
           <%%= yield %>
         </div>
       </div>

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

@@ -25,16 +25,16 @@
       
       <div id="content_box">
         
-        <div id="sidebar">
+        <div class="sub_content" id="sidebar">
           <%%= yield(:store_sidebar) || "" %>
         </div>
         
-        <div id="content">
+        <div class="sub_content" id="content">
           <%%= yield %>
         </div>
         
-        <div id="cart" style="float:right;">
-          <%%= controller.controller_name.include?("<%= file_name %>") ? render( :partial => "common/cart" ) : "" %>
+        <div class="sub_content" id="cart" style="float:right;">
+          <%%= render :partial => "carts/cart" unless controller.controller_name.match(/checkout|search/) %>
           </div>
         
         
@@ -46,6 +46,7 @@
       </div>
       
     </div>
+    <div  style="display:none;" id="indicator_center_big"><%%= image_tag('indicator_big.gif') %></div>
   </body>
   
 </html>

data/generators/opensteam/templates/app/views/payment/_advance_payment_payment.html.erb

@@ -0,0 +1 @@
+<b>Advance Payment</b>

data/generators/opensteam/templates/app/views/payment/_credit_card_payment.html.erb

@@ -0,0 +1,37 @@
+<% fields_for :payment_fields, credit_card_payment do |ccp| %>
+  <h2>CreditCard</h2>
+  <% ccp.fields_for :set_credit_card, credit_card_payment.credit_card  do |cc| %>
+    <%= error_messages_for :set_credit_card, :object => credit_card_payment.credit_card %>
+    <% field_set_tag do %>
+      <p>
+        <%= cc.label :type %>
+        <%= cc.select :type, [ [""], ["visa"], ["bogus"] ] %>
+      </p>
+      <p>
+        <%= cc.label :number  %>
+        <%= cc.text_field :number %>
+      </p>
+      <p>
+        <%= cc.label :verification_value  %>
+        <%= cc.text_field :verification_value, :size => 3 %>
+      </p>
+      <p>
+        <%= cc.label :year  %>
+        <%= cc.text_field :year %>  
+      </p>
+      <p>
+        <%= cc.label :month  %>
+        <%= cc.text_field :month %>
+      </p>
+      <p>
+        <%= cc.label :first_name %>
+        <%= cc.text_field :first_name %>
+      </p>
+      <p>
+        <%= cc.label :last_name %>
+        <%= cc.text_field :last_name %>
+      </p>
+    <% end %>
+  <% end %>
+
+<% end %>

data/generators/opensteam/templates/app/views/payment/_credit_card_payment_confirmation.html.erb

@@ -0,0 +1,20 @@
+<% credit_card = credit_card_payment_confirmation.credit_card %>
+
+<% f.fields_for :set_credit_card, credit_card do |cc| %>
+
+  <h4>CreditCard:</h4>
+  <b>Brand:</b> <%= credit_card.type %><br />
+  <b>Number:</b> <%= credit_card.number %><br />
+  <b>Year:</b> <%= credit_card.year %> <b>Month:</b> <%= credit_card.month %><br />
+  <b>Firstname:</b> <%= credit_card.first_name %> <b>Lastname:</b> <%= credit_card.last_name %><br />
+  <br />
+
+  <%= cc.hidden_field :type %>
+  <%= cc.hidden_field :number %>
+  <%= cc.hidden_field :verification_value %>
+  <%= cc.hidden_field :year %>
+  <%= cc.hidden_field :month %>
+  <%= cc.hidden_field :first_name %>
+  <%= cc.hidden_field :last_name %>
+      
+<% end %>

data/generators/opensteam/templates/app/views/payment/_direct_debit_payment.html.erb

@@ -0,0 +1,5 @@
+.... Direct Debit....
+<br />
+<br />
+<br />
+not yet implemented....

data/generators/opensteam/templates/app/views/payment/_direct_debit_payment_confirmation.html.erb

@@ -0,0 +1,5 @@
+.... Direct Debit....
+<br />
+<br />
+<br />
+not yet implemented....

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

@@ -5,7 +5,7 @@
 
 <h3>Customer Information</h3>
 
-<div id="customer_information">
+<div class="sub_content" id="customer_information">
   <%= render :template => 'admin/users/show', :object => @customer %>
 </div>
 

data/generators/opensteam/templates/app/views/profile/infos/edit.html.erb

@@ -9,17 +9,25 @@
 
 <div id="edit_customer_information">
   
-  <%  form_for :customer, @customer, :url => { :controller => 'profile/infos', :action => 'update' }, :html => { :method => :put } do |f|  %>
-    <p>
-      <b>Email:</b> <%= f.text_field :email %>
-    </p>
-    <p>
-      <b>Firstname</b> <%= f.text_field :firstname %>
-    </p>
-    <p>
-      <b>Lastname</b> <%= f.text_field :lastname %>
-    </p>
-    <%= submit_tag "Update" %>
-  <% end %>
+  <% form_for :customer, @customer, :url => { :controller => 'profile/infos', :action => 'update' }, :html => { :method => :put } do |f|  %>
+    <% field_set_tag do %>
+      <p>
+        <%= f.label :email %>
+        <%= f.text_field :email %>
+      </p>
+  
+      <p>
+        <%= f.label :firstname %>
+        <%= f.text_field :firstname %>
+      </p>
+  
+      <p>
+        <%= f.label :lastname %>
+        <%= f.text_field :lastname %>
+      </p>
       
+      <%= submit_tag "Update" %>
+    <% end %>
+  <% end %>
+            
 </div>

data/generators/opensteam/templates/app/views/profile/infos/edit_password.html.erb

@@ -10,17 +10,21 @@
 <div id="edit_customer_password">
   
   <% form_for :customer, @customer, :url => { :controller => 'profile/infos', :action => 'change_password' }, :html => { :method => :put } do |f|  %>
-      
-    <p>
-      <b>Old Password: </b> <%= f.password_field :old_password %> </p>
-    <p>
-      <b>New Password:</b> <%= f.password_field :password %>
-    </p>
-    <p>
-      <b>New Password Confirmation: </b> <%= f.password_field :password_confirmation %>
-    </p>
-    
-    <%= submit_tag "Update" %>
+    <% field_set_tag do %>  
+      <p>
+        <%= f.label :old_password %>
+        <%= f.password_field :old_password %> </p>
+      <p>
+        <%= f.label :password %>
+        <%= f.password_field :password %>
+      </p>
+      <p>
+        <%= f.label :password_confirmation %>
+        <%= f.password_field :password_confirmation %>
+      </p>
+  
+      <%= submit_tag "Update" %>
+    <% end %>
   <% end %>
-        
+                  
 </div>

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

@@ -1,6 +1,6 @@
 <tr class="<%= cycle('odd','even') %>">
   <td><%=h order.id %></td>
-  <td><%=h order.order_items.size %></td>
+  <td><%=h order.items.size %></td>
   <td><%= order.customer.email %></td>
   <td><%=h order.shipping_address.to_s %></td>
   <td><%=h order.shipping_address.to_s %></td>

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

@@ -2,7 +2,7 @@
   <% admin_sidebar_links do %>
     <%= admin_sidebar_link "Information", "#", :function => "toggle_admin_display('order_customer');"  %>
     <%= admin_sidebar_link "Shipments", "#", :function => "toggle_admin_display('order_shipments');" %>
-    <%= admin_sidebar_link "Invoices", "#", :function => "toggle_admin_display('order_invoices');" %>
+    <%= admin_sidebar_link "Payment", "#", :function => "toggle_admin_display('order_invoices');" %>
     <%= admin_sidebar_link "Order Items", "#", :function => "toggle_admin_display('order_order_items');" %>
     <%= admin_sidebar_link "History", "#", :function => "toggle_admin_display('order_history');" %>
   <% end%>
@@ -18,19 +18,22 @@
 
 <div id="order_shipments" class="sub_content_box" style="display:none;">
   <h3>Shipments</h3>
-  <%= render :partial => "admin/shipments/shipments", :object => @order.shipments, 
-    :locals => { :id => "order_shipments_table" } %> 
+  <b>State:</b> <%= @order.shipments.collect(&:state).join(", ") %><br />
+  <b>Shipping Type:</b> <%= @order.shipping_type %><br />
+  <b>Shipping Rate:</b> <%= @order.shipping_rate %><br />
 </div>
 
 <div id="order_invoices" class="sub_content_box" style="display:none;">
-  <h3>Invoices</h3>
-  <%= render :partial => "admin/invoices/invoices", :object => @order.invoices %>
+  <h3>Payment</h3>
+  <%- unless @order.payments.empty? -%>  
+    <%= render :partial => "admin/payments/#{@order.payments.first.class.payment_id}_payment", :object => @order.payments.first %>
+  <%- end -%>
 </div>
 
 <div id="order_order_items" class="sub_content_box" style="display:none;">
   <h3>Order Items</h3>
-  <b>Total Price</b>: <%=h @order.order_items.collect(&:inventory).collect(&:price).sum %>
-  <%= render :partial => "order_item", :collection => @order.order_items %>
+  <b>Total Price</b>: <%=h @order.items.collect(&:total_price).sum %>
+  <%= render :partial => "admin/order_items/items_table", :object => @order %>
 </div>
 
 <div id="order_history" class="sub_content_box" style="display:none;">

data/generators/opensteam/templates/app/views/webshop/_inventory_content.html.erb

@@ -1,4 +1,5 @@
 <%- if inventory_content.is_active? %>
+  <%= hidden_field_tag "id", inventory_content.id %>
   <b>Price</b>: <%=h inventory_content.price %><br />
   <b>Storage</b>: <%=h inventory_content.storage %><br />
   <%- if inventory_content.storage <= 0 -%>

data/generators/opensteam/templates/app/views/webshop/show.html.erb

@@ -1,5 +1,7 @@
 <div id="details">
-  <%% form_remote_tag :url => { :action => :add_inventory_to_cart  }, :html => { :id => "show"} do  %>
+  <%% form_remote_tag :url => { :action => 'create', :controller => 'carts' }, :html => { :id => "show" } do %>
+  
+  
     <%% fields_for :product, @product do |f| %>
       <%%= render( :partial => existing_partial( "#{@product.class.to_s.demodulize.tableize}/details", "#{@product.class.superclass.to_s.demodulize.tableize}/details" ),
         :object => @product,

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

@@ -1,15 +1,11 @@
-
 if defined? RAILS_ROOT
-  
   Dir.glob("#{RAILS_ROOT}/lib/states/**/*.rb").collect { |f|
     require f
   }
-
 end
 
 
 
-
 Order.class_eval do
   include OrderStates::Finished
   include OrderStates::Pending
@@ -18,15 +14,14 @@ Order.class_eval do
   named_scope :open, :conditions => ["orders.state is not ?", :finished]
   
   
-  initial_state :pending
+  initial_state :created
   
   observe do |record|
-    if record.shipments.all_finished? && record.invoices.all_finished? && 
-        record.order_items.all_invoiced? && record.order_items.all_shipped?
-      
+
+    if record.shipments.all_finished? && record.items.all_shipped? && record.payments.all_captured?
       record.state = :finished unless record.state.to_sym == :finished
-    
     end
+
   end
 
 end
@@ -45,24 +40,18 @@ Shipment.class_eval do
   
 end
 
-# States for Opensteam::InvoiceBase::Invoice
-Invoice.class_eval do
-  
-  
+
+Opensteam::Payment::CreditCardPayment.class_eval do
+  include Opensteam::Payment::States::PaymentAuthorized
+  include Opensteam::Payment::States::PaymentDeclined
+  include Opensteam::Payment::States::PaymentFailed
+  include Opensteam::Payment::States::PaymentCaptured
   
   
-  include InvoiceStates::WaitingForPayment
-  include InvoiceStates::PaymentReceived
-  include InvoiceStates::Pending
-  include InvoiceStates::Finished
-
-  initial_state :pending
+  initial_state :payment_pending
   
   observe do |record|
-    notify :order
+    notify :order if record.order
   end
 
-  
-end
-
-
+end

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

@@ -10,6 +10,7 @@ class Array
   
 end
 
+
 class Class
   # get all subclasses of the given klass
   def self.get_subclasses(klass)
@@ -26,6 +27,7 @@ Dir.glob("#{RAILS_ROOT}/app/models/*.rb").collect { |f| require f }
 # define property_accessors for Inventory-objects
 Inventory.define_property_accessors
 
+Opensteam::Payment::Types.register_payment_types!if ActiveRecord::Base.connection.table_exists?( "payment_types" )
 
 
 ## Constants for restful_authenticated
@@ -34,3 +36,42 @@ REST_AUTH_DIGEST_STRETCHES = 10
 
 
 
+#module ActionView # :nodoc:
+#  require 'pdf/writer'
+#  class PDFRender
+#    PAPER = 'A4'
+#    include ApplicationHelper
+#    include ActionView::Helpers::AssetTagHelper
+#    include ActionView::Helpers::TextHelper      
+#    include ActionView::Helpers::TagHelper
+#    include ActionView::Helpers::UrlHelper
+# 
+#    def initialize(action_view)
+#      @action_view = action_view
+#    end
+# 
+#    # Render the PDF
+#    def render(template, local_assigns = {})
+#      @action_view.controller.headers["Content-Type"] ||= 'application/pdf'
+# 
+#      # Retrieve controller variables
+#      @action_view.controller.instance_variables.each do |v|
+#        instance_variable_set(v, @action_view.controller.instance_variable_get(v))
+#      end
+# 
+#      pdf = ::PDF::Writer.new( :paper => PAPER )
+#      pdf.compressed = true if RAILS_ENV != 'development'
+#      eval template.source, nil, "#{@action_view.base_path}/#{@action_view.first_render}.#{@action_view.finder.pick_template_extension(@action_view.first_render)}" 
+# 
+#      pdf.render
+#    end
+# 
+#    def self.compilable?
+#      false
+#    end
+# 
+#    def compilable?
+#      self.class.compilable?
+#    end
+#  end
+#end

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

@@ -7,25 +7,64 @@ Opensteam::OrderBase::Order.send( :include, Opensteam::Helpers::ConfigTableHelpe
 
 Opensteam::OrderBase::Order.class_eval do
   opensteam_filter :order do
-    include_associations [:customer, :shipping_address, :payment_address, :order_items ]
+    include_associations [:customer, :shipping_address, :payment_address, :items ]
     
     default_order_column :id
     
-    column :id, :name => "#", :order => "orders.id"
-    column :order_items, :name => "OrderItems", :method => :size
+    column :id, :name => "#", :order => "containers.id"
+    column :items, :name => "OrderItems", :method => :size, :order => "containers.items_count"
     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", :order => "orders.state"
-    column :created_at, :name => "Created", :order => "orders.created_at"
-    column :updated_at, :name => "Updated", :order => "orders.updated_at"
+    column :payment_address, :name => "Payment Address", :method => :to_s, :sql => ["addresses.street", "addresses.city" ]
+    column :state, :name => "State", :order => "containers.state"
+    column :created_at, :name => "Created", :order => "containers.created_at"
+    column :updated_at, :name => "Updated", :order => "containers.updated_at"
+    
+  end
+end
+
+
+TaxZone.send( :include, Opensteam::Helpers::ConfigTableHelper )
+
+TaxZone.class_eval do
+  opensteam_filter :tax_zone do
+    
+    include_associations []
+    
+    default_order_column :id
+    
+    column :id, :name => "#", :order => "tax_zones.id"
+    column :country, :name => "Country", :order => "tax_zones.country"
+    column :state, :name => "State", :order => "tax_zones.state"
+    column :rate, :name => "Rate", :order => "tax_zones.rate"
+    column :created_at, :name => "Created", :order => "tax_zones.created_at"
+    column :updated_at, :name => "Updated", :order => "tax_zones.updated_at"
     
   end
-  
-  
-  
 end
 
+
+
+TaxGroup.send( :include, Opensteam::Helpers::ConfigTableHelper )
+
+TaxGroup.class_eval do
+  opensteam_filter :tax_group do
+    
+    include_associations []
+    
+    default_order_column :id
+    
+    column :id, :name => "#", :order => "tax_groups.id"
+    column :name, :name => "Name", :order => "tax_groups.name"
+    column :created_at, :name => "Created", :order => "tax_groups.created_at"
+    column :updated_at, :name => "Updated", :order => "tax_groups.updated_at"
+    
+  end
+end
+
+
+
+
 Opensteam::UserBase::User.send( :include, Opensteam::Helpers::ConfigTableHelper )