Merge branch master into i18n

app/assets/javascripts/application.js

@@ -35,11 +35,14 @@ $(function() {
 
     // Check/Uncheck all checkboxes for a specific form
     $('input[data-check-all]').live('click', function() {
-        var status = $(this).is(':checked')
-        $($(this).data('check-all')).find('input[type="checkbox"]').each(function() {
-            $(this).attr('checked', status);
-            highlightRow($(this));
-        });
+        var status = $(this).is(':checked');
+        var context = $(this).data('check-all');
+        var elms = $('input[type="checkbox"]', context);
+        for(i=elms.length-1; i>=0; --i) { // performance can be an issue here, so use native loop
+          var elm = elms[i];
+          elm.checked = status;
+          highlightRow($(elm));
+        }
     });
 
     // Submit form when changing a select menu.
@@ -102,7 +105,7 @@ $(function() {
 
 // gives the row an yellow background
 function highlightRow(checkbox) {
-    var row = checkbox.parents('tr');
+    var row = checkbox.closest('tr');
     if (checkbox.is(':checked')) {
         row.addClass('selected');
     } else {

app/controllers/admin/workgroups_controller.rb

@@ -13,8 +13,8 @@ class Admin::WorkgroupsController < Admin::BaseController
   def destroy
     @workgroup = Workgroup.find(params[:id])
     @workgroup.destroy
-    redirect_to admin_workgroups_url, notice: t('admin.ordergroups.destroy.notice')
+    redirect_to admin_workgroups_url, notice: t('admin.workgroups.destroy.notice')
   rescue => error
-    redirect_to admin_workgroups_url, alert: t('admin.ordergroups.destroy.error')
+    redirect_to admin_workgroups_url, alert: t('admin.workgroups.destroy.error')
   end
 end

app/controllers/suppliers_controller.rb

@@ -18,7 +18,7 @@ class SuppliersController < ApplicationController
   def new
     if params[:shared_supplier_id]
       shared_supplier =  SharedSupplier.find(params[:shared_supplier_id])
-      @supplier = shared_supplier.build_supplier(shared_supplier.attributes)
+      @supplier = shared_supplier.build_supplier(shared_supplier.autofill_attributes)
     else
       @supplier = Supplier.new
     end

app/documents/order_fax.rb

@@ -47,7 +47,7 @@ class OrderFax < OrderPdf
 
     # Articles
     data = [I18n.t('documents.order_fax.rows')]
-    data = @order.order_articles.ordered.all(include: :article).collect do |a|
+    data += @order.order_articles.ordered.all(include: :article).collect do |a|
       [a.article.order_number,
        a.units_to_order,
        a.article.name,

app/helpers/deliveries_helper.rb

@@ -11,7 +11,7 @@ module DeliveriesHelper
   end
 
   def stock_articles_for_select(supplier)
-    supplier.stock_articles.undeleted.map {|a| ["#{a.name} (#{number_to_currency a.price}/#{a.unit})", a.id] }
+    supplier.stock_articles.undeleted.reorder('articles.name ASC').map {|a| ["#{a.name} (#{number_to_currency a.price}/#{a.unit})", a.id] }
   end
 
 end

app/models/order_article.rb

@@ -148,7 +148,10 @@ class OrderArticle < ActiveRecord::Base
   end
 
   def update_ordergroup_prices
-    group_order_articles.each { |goa| goa.group_order.update_price! }
+    # updates prices of ALL ordergroups - these are actually too many
+    # in case of performance issues, update only ordergroups, which ordered this article
+    # CAUTION: in after_destroy callback related records (e.g. group_order_articles) are already non-existent
+    order.group_orders.each { |go| go.update_price! }
   end
 
 end

app/models/ordergroup.rb

@@ -108,17 +108,7 @@ class Ordergroup < Group
 
   # Make sure, the name is uniq, add usefull message if uniq group is already deleted
   def uniqueness_of_name
-    id = new_record? ? '' : self.id
-    group = Ordergroup.with_deleted.where('groups.id != ? AND groups.name = ?', id, name).first
-    if group.present?
-      message = group.deleted? ? :taken_with_deleted : :taken
-      errors.add :name, message
-    end
-  end
-
-  # Make sure, the name is uniq, add usefull message if uniq group is already deleted
-  def uniqueness_of_name
-    id = new_record? ? '' : self.id
+    id = new_record? ? nil : self.id
     group = Ordergroup.where('groups.id != ? AND groups.name = ?', id, name).first
     if group.present?
       message = group.deleted? ? :taken_with_deleted : :taken

app/models/shared_supplier.rb

@@ -7,6 +7,12 @@ class SharedSupplier < ActiveRecord::Base
 
   has_one :supplier
   has_many :shared_articles, :foreign_key => :supplier_id
-  
+
+  # These set of attributes are used to autofill attributes of new supplier,
+  # when created by import from shared supplier feature.
+  def autofill_attributes
+    whitelist = %w(name address phone fax email url delivery_days note)
+    attributes.select { |k,_v| whitelist.include?(k) }
+  end
 end
 

app/models/supplier.rb

@@ -82,7 +82,7 @@ class Supplier < ActiveRecord::Base
 
   # Make sure, the name is uniq, add usefull message if uniq group is already deleted
   def uniqueness_of_name
-    id = new_record? ? '' : self.id
+    id = new_record? ? nil : self.id
     supplier = Supplier.where('suppliers.id != ? AND suppliers.name = ?', id, name).first
     if supplier.present?
       message = supplier.deleted? ? :taken_with_deleted : :taken

app/views/finance/balancing/_invoice.html.haml

@@ -22,5 +22,5 @@
   = link_to t('.edit'), edit_finance_invoice_path(invoice)
 
 - else
-  Eine Rechnung für diese Bestellung anlegen:
+  = t '.new_body'
   = link_to t('.new'), new_finance_invoice_path(:order_id => @order, :supplier_id => @order.supplier)

app/views/finance/balancing/_orders.html.haml

@@ -15,7 +15,7 @@
         %tr{:class => cycle("even","odd", :name => "order")}
           %td= link_to truncate(order.name), new_finance_order_path(order_id: order.id)
           %td=h format_time(order.ends) unless order.ends.nil?
-          %td= order.closed? ? t('.cleared', amount: number_to_currency(order.foodcoop_result)) : "beendet"
+          %td= order.closed? ? t('.cleared', amount: number_to_currency(order.foodcoop_result)) : t('.ended')
           %td= order.updated_by.nil? ? '??' : order.updated_by.nick
           %td
             - unless order.closed?
@@ -23,4 +23,4 @@
               = link_to t('.close'), close_direct_finance_order_path(order),
                 :confirm => t('.confirm'), :method => :put, class: 'btn btn-mini'
 - else
-  %i= t('.no_closed_orders')
+  %i= t('.no_closed_orders')

app/views/mailer/reset_password.text.haml

@@ -1 +1 @@
-= t '.text', user: @user.nick, link: @link, expires: I18n.l(@user.reset_password_expires)
+= raw t '.text', user: @user.nick, link: @link, expires: I18n.l(@user.reset_password_expires)