Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

First part of stock-integratino. Orders with supplier_id == 0 become stockorders.

Browse source
This commit is contained in:
Benjamin Meichsner 2009-02-05 16:40:02 +01:00
parent 251ced4fa1
commit 1912a3fd80
30 changed files with 112 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/ordering/_orders.html.haml
View file

@ -11,7 +11,7 @@
- group_order = order.group_order(@ordergroup) # Get GroupOrder if possible
- order_class = group_order ? "" : "color:grey"
%tr{:class=> cycle('even', 'odd', :name => 'orders'), :style => order_class}
%td= link_to order.supplier.name, :action => 'my_order_result', :id => order
%td= link_to order.name, :action => 'my_order_result', :id => order
%td= format_time(order.ends)
%td{:class => "currency"}= group_order ? number_to_currency(group_order.price) : "--"

10
app/views/ordering/my_order_result.haml
View file

@ -1,10 +1,10 @@
- title "Dein Bestellergebnis für #{@order.supplier.name}"
- title "Dein Bestellergebnis für #{@order.name}"
#element_navigation
= link_to_unless @order.previous == @order, "<< #{@order.previous.supplier.name}", :action => "my_order_result", :id => @order.previous
= link_to_unless @order.previous == @order, "<< #{@order.previous.name}", :action => "my_order_result", :id => @order.previous
|
= link_to _("Overview"), :controller => 'ordering'
|
= link_to_unless @order.next == @order, "#{@order.next.supplier.name} >>", :action => "my_order_result", :id => @order.next
= link_to_unless @order.next == @order, "#{@order.next.name} >>", :action => "my_order_result", :id => @order.next
// Order summary
.left_column{:style => "width:45em"}
@ -16,7 +16,7 @@
%td{:style => "width:50%"}
%p
Lieferant:
%b=h @order.supplier.name
%b=h @order.name
- unless @order.note.blank?
%p
Notiz:
@ -43,7 +43,7 @@
%table
- for order in Order.open
%tr
%td= link_to order.supplier.name, :action => 'order', :id => order
%td= link_to order.name, :action => 'order', :id => order
%td= "("+ time_ago_in_words(order.ends) + ")" if order.ends
// Article box

46
app/views/ordering/order.rhtml
View file

@ -1,33 +1,33 @@
<h1>Bestellen</h1>
<div class="left_column" style="width:49em">
<div class="box_title"><h2><%=h @order.supplier.name %></h2></div>
<div class="box_title"><h2><%=h @order.name %></h2></div>
<div class="column_content">
<table>
<tr valign="top">
<td width="60%">
<p><b><%=_ "Supplier" %>:</b> <%=h @order.supplier.name %></p>
<p><b><%=_ "End" %>:</b> <%=h format_time(@order.ends) %></p>
<p><b>Lieferant:</b> <%=h @order.name %></p>
<p><b>Ende:</b> <%=h format_time(@order.ends) %></p>
<% if @group_order && @group_order.updated_by -%>
<p><b><%=_ "person ordered at last" %>:</b> <%=h @group_order.updated_by.nick if @group_order.updated_by %> (<%= format_time(@group_order.updated_on) %>)</p>
<p><b>Zuletzt bestellt:</b> <%=h @group_order.updated_by.nick if @group_order.updated_by %> (<%= format_time(@group_order.updated_on) %>)</p>
<% end -%>
<p><b><%=_ "Credit available"%>:</b> <%= number_to_currency(@availableFunds) %></p>
<p><b>Verfügbares Guthaben:</b> <%= number_to_currency(@availableFunds) %></p>
</td>
<td>
<% unless @order.note.empty? %>
<p>
<b><%=_ "Note" %>:</b>
<b>Notiz:</b>
</p>
<%= simple_format(@order.note) %>
<% end %>
<% unless @order.supplier.min_order_quantity.nil? || @order.supplier.min_order_quantity.empty? %>
<% unless @order.stockit? || @order.supplier.min_order_quantity.blank? -%>
<p>
<b><%=_ "Minimum order quantity" %>:</b>
<b>Mindestellmenge:</b>
<%=h @order.supplier.min_order_quantity %>
</p>
<% end %>
<% end -%>
<p>
<b><%=_ "Order quanitity so far" %>:</b>
<b>Gesamtbestellmenge bisher:</b>
<%= number_to_currency @order.sum %>
</p>
</td>
@ -39,14 +39,14 @@
<%- if !@other_orders.empty? -%>
<div class="right_column" style="width:22em">
<div class="box_title">
<h2><%=_ "Other orders" %></h2>
<h2>Andere Bestellungen</h2>
</div>
<div class="column_content">
<table>
<% for order in @other_orders -%>
<tr>
<td>
<%= link_to_function order.supplier.name, "if (confirmSwitchOrder()) (window.location = '#{ url_for(:action => 'order', :id => order) }' )" %>
<%= link_to_function order.name, "if (confirmSwitchOrder()) (window.location = '#{ url_for(:action => 'order', :id => order) }' )" %>
</td>
<td>noch <%= time_ago_in_words(order.ends) if order.ends -%></td>
</tr>
@ -61,21 +61,23 @@
<div class="single_column">
<% form_tag(:action => 'saveOrder', :id => @order) do %>
<div class="box_title">
<h2><%=_ "Articles" %></h2>
<h2>Artikel</h2>
</div>
<div class="column_content">
<table id="order" class="list">
<thead>
<tr>
<th><%=_ "Name" %></th>
<th>Name</th>
<th></th>
<th><%=_ "Manufacturer" %></th>
<th style="width:7em;"><%=_ "Package" %></th>
<th style="width:4.5em;"><%=_ "Price" %></th>
<th id="col_packages"><acronym title="<%=_ "totally ordered packages" %>"><%=_ "Ord."%></acronym></th>
<th id="col_required"><%=_ "Quantity" %></th>
<th id="col_tolerance"><%=_ "Tolerance" %></th>
<th><%=_ "Amount" %></th>
<th>Herstellerin</th>
<th style="width:7em;"><%= @order.stockit? ? "im Lager" : "Gebinde" -%></th>
<th style="width:4.5em;">Preis</th>
<th id="col_packages"><acronym title="insgesamt bestellte Gebinde">Best</acronym></th>
<th id="col_required">Menge</th>
<% unless @order.stockit? -%>
<th id="col_tolerance">Toleranz</th>
<% end -%>
<th>Summe</th>
</tr>
</thead>
<tbody>
@ -104,7 +106,7 @@
</td>
<td><%=h order_article.article.origin %></td>
<td><%=h truncate order_article.article.manufacturer, :length => 11 %></td>
<td><%= @unit[i] %> * <%=h order_article.article.unit %></td>
<td><%= @order.stockit? ? order_article.article.quantity_available : @unit[i] %> * <%=h order_article.article.unit %></td>
<td><%= number_to_currency(@price[i]) %></td>
<td id="units_<%= i %>"><%= order_article.units_to_order %></td>
<td style="text-align:right;">