Minor refactoring for ordering js data.

app/controllers/ordering_controller.rb

@@ -56,6 +56,19 @@ class OrderingController < ApplicationController
         i += 1
       end
     end
+
+    @add_data_to_js = []
+    if Foodsoft.config[:tolerance_is_costly]
+      for i in 0...@price.size
+        @add_data_to_js << [@price[i], @unit[i], @price[i] * (@tolerance[i] + @quantity[i]), @others_quantity[i],
+                           @others_tolerance[i], @used_quantity[i], 0]
+      end
+    else
+      for j in 0...@price.size
+        @add_data_to_js << [@price[j], @unit[j], @price[j] * @quantity[j], @others_quantity[j],
+                           @others_tolerance[j], @used_quantity[j], 0]
+      end
+    end
   end
 
   def stock_order

app/views/ordering/_data.html.erb

@@ -1,27 +1,9 @@
 <script>
 //<![CDATA[
     $(function() {
-        <% if Foodsoft.config[:tolerance_is_costly]
+        <% for row in @add_data_to_js %>
-    for i in 0...@price.size %>
+        addData(<%= row.join(", ") %>);
-        addData(<%= @price[i] %>,
+        <% end %>
-                <%= @unit[i] %>,
-                <%= @price[i] * (@tolerance[i] + @quantity[i])%>,
-                <%= @others_quantity[i] %>,
-                <%= @others_tolerance[i] %>,
-                <%= @used_quantity[i] %>,
-                0);
-        <%     end
-    else
-    for j in 0...@price.size -%>
-        addData(<%= @price[j] %>,
-                <%= @unit[j] %>,
-                <%= @price[j] * @quantity[j]%>,
-                <%= @others_quantity[j] %>,
-                <%= @others_tolerance[j] %>,
-                <%= @used_quantity[j] %>,
-                0);
-        <%    end
-        end%>
         setGroupBalance(<%= @availableFunds %>);
 
     // localization