opensteam 0.9.2 → 0.9.3

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

@@ -11,44 +11,16 @@
 <%= error_messages_for :invoice %>
 <%= error_messages_for :address %>
 
+<% form_for :invoice, @invoice, :url => { :action => 'create', :controller => 'invoices' },
+  :html => { :id => "new_invoice", :method => 'post' } do |f| %>
+  <%= f.hidden_field :order_id  %>
 
-
-<% form_for :invoice, @nivoice, :url => { :action => 'create', :controller => 'invoices' }, :html => { :method => 'post' } do |f| %>
-
-  <% fields_for :address, @invoice.address do |a| %>
-    <p>Street<br />
-      <%= a.text_field :street %>
-    </p>
-    <p>Postal<br />
-      <%= a.text_field :postal %>
-    </p>
-    <p>City<br />
-      <%= a.text_field :city %>
-    </p>
-    <p>Land<br />
-      <%= a.text_field :land %>
-    </p>
-  <% end %>
-
-  <p>Comment<br />
-    <%= f.text_area :comment, :rows => 5%>
-  </p>
-  <p>Price<br />
-    <%= f.text_field :price, :rows => 5%>
-  </p>
-  <% fields_for :order_items, nil do |a| %>
-    <p>Select Order Items
-      <ul>
-        <% for oi in @order.order_items.select { |s| s.invoice == nil } %>
-          <li>  <%= a.check_box "#{oi.id}", {} , 1, 0 %> <%=h oi.inventory.product.name %> (<%=h oi.inventory.product.class %>)
-            | <%- unless oi.inventory.properties.empty? -%><b>Configuration:</b> <%=h oi.inventory.properties.collect(&:name) * "," %><%- end -%>
-          | <%=h oi.quantity %> | <%=h oi.quantity * oi.inventory.price %></li>
-        <% end %>
-      </ul>		
-    </p>
-  <% end %>
-
-
+  <%= render :partial => "admin/invoices/invoice_fields", :object => f %>
 
   <%= submit_tag "save" %>
 <% end %>
+
+
+<%= observe_form :new_invoice,
+  :url => { :action => :update_price }
+%>

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

@@ -6,50 +6,24 @@
   <% end %>
 <% end %>
 
-<h2>Shipment # <%= @invoice.id %></h2>
+<h2>Invoice # <%= @invoice.id %></h2>
 <div id="invoice_information">
-  
-  <p>
-    <b>State</b>:
-<%- form_for :invoice, @invoice, :url => { :action => 'update', :controller => 'invoices' }, :html => { :method => 'put' } do |f| -%>
-<%= f.select :state, Invoice.available_states.collect(&:name).collect(&:to_s) %>
-<%= submit_tag "update" %>
-<%- end -%>
-  </p>
-  <p>
-    <b>CreatedAt</b>: <%=h @invoice.created_at %>
-  </p>
   <p>
+    <b>CreatedAt</b>: <%=h @invoice.created_at %><br />
     <b>UpdatedAt</b>: <%=h @invoice.updated_at %>
   </p>
   <p>
-    <b>Sent to:</b><br />
-    <%= render :partial => "admin/address", :object => @invoice.address %>
+    <b>Comment</b>: <%=h @invoice.comment %>
   </p>
   <p>
-    <b>Comment</b>: <%=h @invoice.comment %>
+    <b>Amount:</b> <%=h @invoice.price %>
   </p>
 </div>
+<div id="billing_information">
+  <h3>Address</h3>
+  <%= render :partial => "admin/address", :object => @invoice.address %>
+</div>
 <div id="invoice_order_items">
-  <p>
-    <b>OrderItems</b>
-    <br />
-    <ul>
-      <% for oi in @invoice.order_items %>
-        <li> <%=h oi.inventory.product.name %> (<%=h oi.inventory.product.class %>)
-          | <%- unless oi.inventory.properties.empty? -%><b>Configuration:</b> <%=h oi.inventory.properties.collect(&:name) * "," %><%- end -%>
-        | <%=h oi.quantity %> | <%=h oi.quantity * oi.inventory.price %></li>
-      <% end %>
-    </ul>
-  </p>
-</div>		
-
-<div id="invoice_history" class="sub_content_box" style="">
-  <h3>History</h3>
-  <ul>
-    <% for h in @invoice.history %>
-      <li><%=h h.message %> (<%=h ordinalized_time( h.created_at ) %>)</li>
-    <% end %>
-  </ul>
-  
+  <h3>Order Items</h3>
+  <%= render :partial => "admin/order_items/items_table", :object => @invoice %>
 </div>

data/generators/opensteam/templates/app/views/admin/invoices/show.pdf.prawn

@@ -0,0 +1,59 @@
+pdf.image RAILS_ROOT + '/public/images/opensteam_store_logo.jpg', :scale => 0.3
+
+pdf.text "Invoice ##{@invoice.id}, Order ##{@order.id}", :size => 25, :align => :center
+pdf.stroke_horizontal_rule
+
+pdf.text "\n\n"
+
+pdf.text "Customer Information", :style => :bold
+pdf.text "\n"
+pdf.text "Email: #{@order.customer.email}", :size => 8
+pdf.text "Firstname: #{@order.customer.firstname}", :size => 8
+pdf.text "Lastname: #{@order.customer.lastname}", :size => 8
+pdf.text "\n\n"
+pdf.text "Shipping Information", :style => :bold
+pdf.text "\n"
+pdf.font.size(8) do
+    pdf.text "Shipping Type: #{@order.shipping_type}"
+    pdf.text "\n"
+    pdf.text "Address", :style => :bold, :size => 8
+    pdf.text @order.shipping_address.to_a
+end
+
+pdf.text "\n\n"
+
+pdf.text "Billing Information", :style => :bold
+pdf.text "\n"
+pdf.font.size(8) do
+    pdf.text "Payment Type: #{Opensteam::Payment::Base[ @order.payment_type ].display_name}"
+    pdf.text "\n"
+    pdf.text "Address", :style => :bold, :size => 8
+    pdf.text @order.payment_address.to_a
+end
+
+pdf.text "\n\n"
+
+pdf.text "Order Items", :style => :bold
+pdf.text "\n"
+pdf.table( @invoice.items.collect { |i|
+    [ i.item.id, i.item.name, i.item.product.class, i.item.properties.join(","), i.quantity, i.price, i.tax, i.total_price ] } +
+    [   [ "", "Total Netto Price", "", "", "", "", "", @invoice.items.collect(&:total_price).sum - @invoice.items.collect(&:tax).sum ],
+        [ "", "Total Tax", "", "", "", "", "", @invoice.items.collect(&:tax).sum ],
+        [ "", "Shipping Rate", "", "", "", "", "", @order.shipping_rate ],
+        [ "", "", "", "", "", "", "", "" ],
+        [ "", "Total Price", "", "", "", "", "", @invoice.price + @order.shipping_rate ] 
+    ],
+    :font_size => 7,
+    :horizontal_padding => 10,
+    :vertical_padding   => 3,
+:row_colors => ["FFFFFF", "DDDDDD" ],
+    :border_width       => 1,
+    :position           => :left,
+    :headers            => ["ID","Name", "Class", "Information", "Quantity", "Single Price", "Tax", "Total Price"] )
+
+
+pdf.text "\n\n"
+
+pdf.text "Comment", :style => :bold
+pdf.text "\n"
+pdf.text @invoice.comment, :size => 8

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

@@ -0,0 +1,5 @@
+<ul>
+  <li><%= link_to "Tax Zones", admin_tax_zones_path %></li>
+  <li><%= link_to "Tax Groups", admin_tax_groups_path %></li>
+  <li><%= link_to "Shipping Rate Groups", admin_shipping_rate_groups_path %></li>
+</ul>

data/generators/opensteam/templates/app/views/admin/order_items/_item_entry.html.erb

@@ -0,0 +1,9 @@
+<tr>
+  <td><%= item_entry.item.id %></td>
+  <td><%= item_entry.item.product.name %> (<%= item_entry.item.product.class.to_s %>)</td>
+  <td><%= item_entry.item.properties.collect(&:name).join(", ") %></td>
+  <td><%= item_entry.price %></td>
+  <td><%= item_entry.tax %> (<%= get_rate_for( item_entry, @order.shipping_address.country ) %>)</td>
+  <td><%= item_entry.quantity %></td>
+  <td><%= item_entry.total_price %></td>
+</tr>

data/generators/opensteam/templates/app/views/admin/order_items/_items_table.html.erb

@@ -0,0 +1,16 @@
+<table>
+  <thead>
+    <tr>
+      <th>#</th>
+      <th>Name (Class)</th>
+      <th>Information</th>
+      <th>Price</th>
+      <th>Tax</th>
+      <th>Quantity</th>
+      <th>Total Price</th>
+    </tr>
+  </thead>
+  <tbody>
+    <%= render :partial => "admin/order_items/item_entry", :collection => items_table.items %>
+  </tbody>
+</table>

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

@@ -1,11 +1,11 @@
 <tr class="<%= cycle('odd','even') %>">
-	<td><%=h order.id %></td>
-	<td><%=h order.order_items.size %></td>
-	<td><%= link_to order.customer.email, admin_user_path( order.customer ) %></td>
-	<td><%=h order.shipping_address.to_s %></td>
-	<td><%=h order.shipping_address.to_s %></td>
-	<td><%=h order.state %></td>
-	<td><%=h ordinalized_time order.created_at %></td>
-	<td><%=h ordinalized_time order.updated_at %></td>
-	<td><%= link_to "show", admin_order_path( order ) %></td>
+  <td><%=h order.id %></td>
+  <td><%=h order.items.size %></td>
+  <td><%= link_to order.customer.email, admin_user_path( order.customer ) %></td>
+  <td><%=h order.shipping_address.to_s %></td>
+  <td><%=h order.shipping_address.to_s %></td>
+  <td><%=h order.state %></td>
+  <td><%=h ordinalized_time order.created_at %></td>
+  <td><%=h ordinalized_time order.updated_at %></td>
+  <td><%= link_to "show", admin_order_path( order ) %></td>
 </tr>	

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

@@ -3,7 +3,7 @@
 <% 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
+    url[:user_id] = @customer.id if @customer
 
     link_to_remote( column.name, :url => url, :update => id, :method => 'get' )
   end %>

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

@@ -1,15 +1,17 @@
 <% content_for :admin_sidebar do %>
   <% admin_sidebar_links do %>
     <%= admin_sidebar_link "Information", "#", :function => "toggle_admin_display('order_customer');"  %>
+    <%= admin_sidebar_link "Payment", "#", :function => "toggle_admin_display('order_payment');" %>
     <%= admin_sidebar_link "Shipments", "#", :function => "toggle_admin_display('order_shipments');" %>
-    <%= admin_sidebar_link "Invoices", "#", :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%>
 <% end %>
 
 <h2>Order # <%= @order.id %></h2>
-<h3>State: <%= @order.state %></h3>
+<b>State:</b> <%=h @order.state %><br />
+<b>Payment State:</b> <%= @order.payments.first.state unless @order.payments.empty? %><br />
+<b>Shipments States:</b> <%= @order.shipments.collect(&:state).join(", ") %><br />
 
 <% @order.events.select { |s| s =~ /^view_link_to_/ }.each do |o| %>
   <% o =~ /^view_link_to_(.+)$/ %>
@@ -24,10 +26,9 @@
 
 <div id="order_shipments" class="sub_content_box" style="display:none;">
   <h3>Shipments</h3>
-  
-  <%#  unless @order.finished? %>
-  <%# = link_to "Create Shipment", :controller => 'shipments', :action => 'new', :order_id => @order.id %>
-  <%#  end %>
+  <b>Shipping Type:</b> <%= @order.shipping_type %><br />
+  <b>Shipping Rate:</b> <%= @order.shipping_rate %><br />
+  <br />
   <%= render :partial => "admin/shipments/shipments", :object => @order.shipments, 
     :locals => { :id => "order_shipments_table" } %> 
 </div>
@@ -38,17 +39,32 @@
     :locals => { :id => "order_invoices_table" } %>
 </div>
 
+<div id="order_payment" style="display:none;" class="sub_content_box" >
+  <h3>Payment</h3>
+  
+  <h4>Information</h4>
+  <%- unless @order.payments.empty? -%>  
+    <%= render :partial => "admin/payments/#{@order.payments.first.class.payment_id}_payment", :object => @order.payments.first %>
+  <%- end -%>
+  <h4>Invoices</h4>
+  <%= 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;">
   <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.total_price %>
+  <div id="order_items_table">
+    <%= render :partial => "admin/order_items/items_table", :object => @order %>
+  </div>
 </div>
 
 <div id="order_history" class="sub_content_box" style="display:none;">
   <h3>History</h3>
   <ul>
     <% for h in @order.history %>
-      <li><%=h h.message %> (<%=h ordinalized_time h.created_at %>)</li>
+      <li><%=h h.message %> (<%=h ordinalized_time( h.created_at )%>)</li>
     <% end %>
   </ul>
   

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

@@ -0,0 +1,27 @@
+<h2>Payment Types</h2>
+<table>
+  <thead>
+    <tr>
+      <th>#</th>
+      <th>Name</th>
+      <th>Description</th>
+      <th>Class</th>
+      <th>Active?</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% for payment_type in @payment_types %>
+      <tr>
+        <td><%=h payment_type.id %></td>
+        <td><%=h payment_type.name %></td>
+        <td><%=h payment_type.klass.classify.constantize.display_name %></td>
+        <td><%=h payment_type.klass %></td>
+        <td>
+        <% form_tag toggle_admin_payment_type_path( payment_type ) do %>  
+          <%= image_submit_tag( payment_type.active? ? "tick.png" : "cross.png" ) %>
+        <% end %> 
+              
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/generators/opensteam/templates/app/views/admin/payments/_credit_card_payment.html.erb

@@ -0,0 +1,26 @@
+<% payment = credit_card_payment %>
+<p>
+  <b><u>Type:</u></b> <%= payment.class.display_name %>
+</p>
+<p>
+  <b>State:</b> <%=h payment.state %><br />
+  <b>Test?:</b> <%=h payment.test %><br />
+  <b>Amount:</b> <%=h payment.amount %><br />
+  <b>Description:</b> <%=h payment.description %><br />
+  <b>Message</b> <%=h payment.message %><br />
+</p>
+<h4>CreditCard</h4>
+<b>Number:</b> <%= payment.data[:number] %><br />
+<b>Name: </b> <%= payment.data[:first_name] %> <%= payment.data[:last_name] %><br />
+
+<ul>
+  <% for transaction in payment.transactions %>
+    <li><b><u><%= transaction.action %></u></b><br />
+      <b>Amount:</b> <%= transaction.amount %><br />
+      <b>Success:</b> <%= transaction.success %><br />
+      <b>Test:</b> <%= transaction.test %><br />
+      <b>Message:</b> <%= transaction.message %><br />
+      <b>Reference:</b> <%= transaction.reference %><br />
+    </li>
+  <% end %>
+</ul>

data/generators/opensteam/templates/app/views/admin/payments/_credit_card_payment_info.html.erb

@@ -0,0 +1,15 @@
+<% payment = credit_card_payment_info %>
+<p>
+  <b><u>Type:</u></b> <%= payment.class.display_name %>
+</p>
+<p>
+  <b>State:</b> <%=h payment.state %><br />
+  <b>Test?:</b> <%=h payment.test %><br />
+  <b>Amount:</b> <%=h payment.amount %><br />
+  <b>Description:</b> <%=h payment.description %><br />
+  <b>Message</b> <%=h payment.message %><br />
+</p>
+<h4>CreditCard</h4>
+<b>Number:</b> <%= payment.data[:number] %><br />
+<b>Name: </b> <%= payment.data[:first_name] %> <%= payment.data[:last_name] %><br />
+

data/generators/opensteam/templates/app/views/admin/payments/_direct_debit_payment.html.erb

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

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

@@ -1,9 +1,9 @@
 <% content_for :admin_sidebar do %>
-	<% admin_sidebar_links do %>
-		<%= admin_sidebar_link "Show Order", admin_order_path( @order ) %>
-		<%= admin_sidebar_link "Show Order Shipments", admin_order_shipments_path %>
-		<%= admin_sidebar_link "Show Order Invoices", admin_order_invoices_path %>
-	<% end %>
+  <% admin_sidebar_links do %>
+    <%= admin_sidebar_link "Show Order", admin_order_path( @order ) %>
+    <%= admin_sidebar_link "Show Order Shipments", admin_order_shipments_path %>
+    <%= admin_sidebar_link "Show Order Invoices", admin_order_invoices_path %>
+  <% end %>
 <% end %>
 
 <h2>New Shipment</h2>
@@ -16,36 +16,51 @@
 <% form_for :shipment, @shipment, :url => { :action => 'create', :controller => 'shipments' }, :html => { :method => 'post' } do |f| %>
 
   <% fields_for :address, @shipment.address do |a| %>
-    <p>Street<br />
-      <%= a.text_field :street %>
-    </p>
-    <p>Postal<br />
-      <%= a.text_field :postal %>
+
+    <% 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 :shipping_rate %>
+      <%= f.text_field :shipping_rate, :size => 5 %>
     </p>
-    <p>City<br />
-      <%= a.text_field :city %>
+    <p>
+      <%= f.label :comment %>
+      <%= f.text_area :comment, :rows => 5%>
     </p>
-    <p>Land<br />
-      <%= a.text_field :land %>
+  <% end %>
+
+  <% fields_for :order_items, nil do |a| %>
+    <p>Select Order Items
+      <ul>
+        <% for oi in @order.items.select { |s| s.shipment == nil } %>
+          <li>  <%= a.check_box "#{oi.id}", {} , 1, 0 %> <%= a.label oi.id, oi.product.name %> (<%=h oi.product.class %>)
+            | <%- unless oi.properties.empty? -%><b>Configuration:</b> <%=h oi.properties.collect(&:name) * "," %><%- end -%>
+          | <%=h oi.quantity %> | <%=h oi.quantity * oi.price %></li>
+        <% end %>
+      </ul>		
     </p>
   <% end %>
 
-  <p>Comment<br />
-    <%= f.text_area :comment, :rows => 5%>
-  </p>
-<% fields_for :order_items, nil do |a| %>
-<p>Select Order Items
-	<ul>
-	<% for oi in @order.order_items.select { |s| s.shipment == nil } %>
-		<li>  <%= a.check_box "#{oi.id}", {} , 1, 0 %> <%=h oi.inventory.product.name %> (<%=h oi.inventory.product.class %>)
-		| <%- unless oi.inventory.properties.empty? -%><b>Configuration:</b> <%=h oi.inventory.properties.collect(&:name) * "," %><%- end -%>
-		| <%=h oi.quantity %> | <%=h oi.quantity * oi.inventory.price %></li>
-	<% end %>
-	</ul>		
-	</p>
-	<% end %>
-	
-			
+
 
   <%= submit_tag "save" %>
 <% end %>