Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-show-percent-sign-in-views

Gemfile

@@ -55,4 +55,7 @@ group :development do
 
   # Get infos when not using proper eager loading
   gem 'bullet'
+
+  # Hide assets requests in log
+  gem 'quiet_assets'
 end

Gemfile.lock

@@ -126,6 +126,8 @@ GEM
     prawn (0.12.0)
       pdf-reader (>= 0.9.0)
       ttfunk (~> 1.0.2)
+    quiet_assets (1.0.2)
+      railties (>= 3.1, < 5.0)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -237,6 +239,7 @@ DEPENDENCIES
   meta_search
   mysql2
   prawn
+  quiet_assets
   rails (~> 3.2.9)
   resque
   ruby-prof

app/controllers/articles_controller.rb

@@ -74,12 +74,12 @@ class ArticlesController < ApplicationController
   end
 
   # Updates all article of specific supplier
-  # deletes all articles from params[outlisted_articles]
   def update_all
+    invalid_articles = false
+
     begin
       Article.transaction do
         unless params[:articles].blank?
-          invalid_articles = false
           # Update other article attributes...
           @articles = Article.find(params[:articles].keys)
           @articles.each do |article|
@@ -88,25 +88,18 @@ class ArticlesController < ApplicationController
             end
           end
 
-          raise "Artikel sind fehlerhaft. Bitte überprüfe Deine Eingaben." if invalid_articles
+          raise ActiveRecord::Rollback  if invalid_articles # Rollback all changes
-        end
-        # delete articles
-        if params[:outlisted_articles]
-          params[:outlisted_articles].keys.each {|id| Article.find(id).mark_as_deleted }
         end
       end
+    end
+
+    if invalid_articles
+      # An error has occurred, transaction has been rolled back.
+      flash.now.alert = 'Artikel sind fehlerhaft. Bitte überprüfen.'
+      render :edit_all
+    else
       # Successfully done.
       redirect_to supplier_articles_path(@supplier), notice: "Alle Artikel und Preise wurden aktalisiert"
-
-    rescue => e
-      # An error has occurred, transaction has been rolled back.
-      if params[:sync]
-        flash[:error] = "Es trat ein Fehler beim Aktualisieren des Artikels '#{current_article.name}' auf: #{e.message}"
-        redirect_to(supplier_articles_path(@supplier))
-      else
-        flash.now.alert = e.message
-        render :edit_all
-      end
     end
   end
   
@@ -232,4 +225,33 @@ class ArticlesController < ApplicationController
       redirect_to supplier_articles_path(@supplier), :notice => "Der Katalog ist aktuell."
     end
   end
+
+  # Updates, deletes articles when sync form is submitted
+  def update_synchronized
+    begin
+      Article.transaction do
+        # delete articles
+        if params[:outlisted_articles]
+          Article.find(params[:outlisted_articles].keys).each(&:mark_as_deleted)
+        end
+
+        # Update articles
+        params[:articles].each do |id, attrs|
+          Article.find(id).update_attributes! attrs
+        end
+      end
+
+      # Successfully done.
+      redirect_to supplier_articles_path(@supplier), notice: "Alle Artikel und Preise wurden aktalisiert"
+
+    rescue ActiveRecord::RecordInvalid => invalid
+      # An error has occurred, transaction has been rolled back.
+      redirect_to supplier_articles_path(@supplier),
+                  alert: "Es trat ein Fehler beim Aktualisieren des Artikels '#{invalid.record.name}' auf: #{invalid.record.errors.full_messages}"
+
+    rescue => error
+      redirect_to supplier_articles_path(@supplier),
+                  alert: "Es trat ein Fehler auf: #{error.message}"
+    end
+  end
 end

app/models/article.rb

@@ -18,7 +18,8 @@ class Article < ActiveRecord::Base
   validates_presence_of :name, :unit, :price, :tax, :deposit, :unit_quantity, :supplier_id, :article_category
   validates_length_of :name, :in => 4..60
   validates_length_of :unit, :in => 2..15
-  validates_numericality_of :price, :unit_quantity, :greater_than => 0
+  validates_numericality_of :price, :greater_than_or_equal_to => 0
+  validates_numericality_of :unit_quantity, :greater_than => 0
   validates_numericality_of :deposit, :tax
   validates_uniqueness_of :name, :scope => [:supplier_id, :deleted_at, :type]
   

app/models/article_price.rb

@@ -4,7 +4,8 @@ class ArticlePrice < ActiveRecord::Base
   has_many :order_articles
 
   validates_presence_of :price, :tax, :deposit, :unit_quantity
-  validates_numericality_of :price, :unit_quantity, :greater_than => 0
+  validates_numericality_of :price, :greater_than_or_equal_to => 0
+  validates_numericality_of :unit_quantity, :greater_than => 0
   validates_numericality_of :deposit, :tax
 
   localize_input_of :price, :tax, :deposit

app/models/order.rb

@@ -158,7 +158,7 @@ class Order < ActiveRecord::Base
             goa.save_results!
             # Delete no longer required order-history (group_order_article_quantities) and
             # TODO: Do we need articles, which aren't ordered? (units_to_order == 0 ?)
-            goa.group_order_article_quantities.clear
+            #goa.group_order_article_quantities.clear
           end
         end
 

app/models/task.rb

@@ -66,13 +66,10 @@ class Task < ActiveRecord::Base
   # and makes the users responsible for the task
   # TODO: check for maximal number of users
   def user_list=(ids)
-    list = ids.split(",")
+    list = ids.split(",").map(&:to_i)
     new_users = (list - users.collect(&:id)).uniq
     old_users = users.reject { |user| list.include?(user.id) }
     
-    logger.debug "[debug] New users: #{new_users}"
-    logger.debug "Old users: #{old_users}"
-    
     self.class.transaction do
       # delete old assignments
       if old_users.any?
@@ -84,7 +81,7 @@ class Task < ActiveRecord::Base
         if user.blank?
           errors.add(:user_list)
         else
-          if  id == current_user_id
+          if  id == current_user_id.to_i
             # current_user will accept, when he puts himself to the list of users
             self.assignments.build :user => user, :accepted => true
           else

app/views/articles/_form.html.haml

@@ -2,7 +2,7 @@
   = f.hidden_field :shared_updated_on
   = f.hidden_field :supplier_id
   .modal-header
-    = button_tag "x", class: 'close', data: {dismiss: 'modal'}
+    = link_to 'x', '#', class: 'close', data: {dismiss: 'modal'}
     %h3 Neuen Artikel einfügen
   .modal-body
     = f.input :availability
@@ -21,6 +21,6 @@
       %span.add-on %
     = f.input :deposit
   .modal-footer
-    = button_tag "Schließen", class: 'btn', data: {dismiss: 'modal'}
+    = link_to 'Schließen', '#', class: 'btn', data: {dismiss: 'modal'}
     = f.submit class: 'btn btn-primary'
 

app/views/articles/sync.html.haml

@@ -1,6 +1,6 @@
 - title 'Artikel mit externer Datenbank synchronisieren'
 
-= form_tag update_all_supplier_articles_path(@supplier, :sync => "1") do
+= form_tag update_synchronized_supplier_articles_path(@supplier) do
   %h2 Auslisten ...
   %p
   - unless @outlisted_articles.empty?
@@ -11,6 +11,9 @@
         %li
           = hidden_field_tag "outlisted_articles[#{article.id}]", '1'
           = article.name
+          - if article.in_open_order
+            .alert
+              Achtung, #{article.name} wird gerade in einer laufenden Bestellung verwendet. Bitte erst Bestellung anpassen.
   - else
     %i Es müssen keine Artikel gelöscht werden.
   %hr/

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

@@ -1,9 +1,9 @@
 = simple_form_for @order, url: update_note_finance_order_path(@order), remote: true, method: :put do |f|
   .modal-header
-    = button_tag "x", class: 'close', data: {dismiss: 'modal'}
+    = link_to 'x', '#', class: 'close', data: {dismiss: 'modal'}
     %h3 Notiz bearbeiten
   .modal-body
     = f.input :note, input_html: {class: 'input-xlarge'}
   .modal-footer
-    = button_tag "Schließen", class: 'btn', data: {dismiss: 'modal'}
+    = link_to 'Schließen', '#', class: 'btn', data: {dismiss: 'modal'}
     = f.submit "Speichern", class: 'btn btn-primary'

app/views/finance/group_order_articles/_form.html.haml

@@ -1,11 +1,11 @@
 = simple_form_for [:finance, @group_order_article], remote: true do |form|
   = form.hidden_field :order_article_id
   .modal-header
-    = button_tag "x", class: 'close', data: {dismiss: 'modal'}
+    = link_to 'x', '#', class: 'close', data: {dismiss: 'modal'}
     %h3 Mengenänderung für #{@order_article.article.name}
   .modal-body
     = form.input :ordergroup_id, as: :select, collection: Ordergroup.all.map { |g| [g.name, g.id] }
     = form.input :result, hint: "Einheit: #{@order_article.article.unit}"
   .modal-footer
-    = button_tag "Schließen", class: 'btn', data: {dismiss: 'modal'}
+    = link_to 'Schließen', '#', class: 'btn', data: {dismiss: 'modal'}
     = form.submit "Speichern", class: 'btn btn-primary'

app/views/finance/order_articles/_edit.html.haml

@@ -1,6 +1,6 @@
 = simple_form_for [:finance, @order, @order_article], remote: true do |form|
   .modal-header
-    = button_tag "x", class: 'close', data: {dismiss: 'modal'}
+    = link_to 'x', '#', class: 'close', data: {dismiss: 'modal'}
     %h3 Artikel aktualisieren
   .modal-body
     = form.input :units_to_order
@@ -20,5 +20,5 @@
         = f.input :deposit
       = form.input :update_current_price, as: :boolean
   .modal-footer
-    = button_tag "Schließen", class: 'btn', data: {dismiss: 'modal'}
+    = link_to 'Schließen', '#', class: 'btn', data: {dismiss: 'modal'}
     = form.submit class: 'btn btn-primary'

app/views/finance/order_articles/_new.html.haml

@@ -1,9 +1,9 @@
 = simple_form_for [:finance, @order, @order_article], remote: true do |form|
   .modal-header
-    = button_tag "x", class: 'close', data: {dismiss: 'modal'}
+    = link_to 'x', '#', class: 'close', data: {dismiss: 'modal'}
     %h3 Neuer gelieferter Artikel die Bestellung
   .modal-body
     = form.input :article_id, as: :select, collection: new_order_articles_collection
   .modal-footer
-    = button_tag "Schließen", class: 'btn', data: {dismiss: 'modal'}
+    = link_to 'Schließen', '#', class: 'btn', data: {dismiss: 'modal'}
     = form.submit class: 'btn btn-primary'

app/views/finance/order_articles/create.js.haml

@@ -1,2 +1,3 @@
 $('#modalContainer').modal('hide');
 $('#result_table').prepend('#{j(render('finance/balancing/order_article_result', order_article: @order_article))}');
+$('#summaryChangedWarning').show();

app/views/finance/order_articles/update.js.haml

@@ -1,2 +1,4 @@
 $('#modalContainer').modal('hide');
 $('#order_article_#{@order_article.id}').html('#{j(render('finance/balancing/order_article', order_article: @order_article))}');
+$('#group_order_articles_#{@order_article.id}').html('#{j(render('finance/balancing/group_order_articles', order_article: @order_article))}');
+$('#summaryChangedWarning').show();

app/views/group_orders/show.html.haml

@@ -47,7 +47,6 @@
                 Erhalten
             %th Gesamtpreis
         %tbody
-          - total = 0 #set counter for order-sum
           - for category_name, order_articles in @order.articles_grouped_by_category
             %tr.article-category
               %td
@@ -74,7 +73,7 @@
                   %td{colspan: "6"}=h oa.article.note
           %tr{class: cycle('even', 'odd', name: 'articles')}
             %th{colspan: "5"} Summe
-            %th= number_to_currency(total)
+            %th= number_to_currency(@group_order.price)
       %br/
       = link_to_top
     - else

app/views/invites/_modal_form.html.haml

@@ -1,6 +1,6 @@
 = simple_form_for @invite, remote: true do |form|
   .modal-header
-    = button_tag "x", class: 'close', data: {dismiss: 'modal'}
+    = link_to 'x', '#', class: 'close', data: {dismiss: 'modal'}
     %h3 Person einladen
   .modal-body
     %p
@@ -13,5 +13,5 @@
     = form.hidden_field :group_id
     = form.input :email
   .modal-footer
-    = button_tag "Schließen", class: 'btn', data: {dismiss: 'modal'}
+    = link_to 'Schließen', '#', class: 'btn', data: {dismiss: 'modal'}
     = form.submit class: 'btn btn-primary'

app/views/shared/_user_form_fields.html.haml

@@ -9,6 +9,7 @@
   .controls
     - for setting in User::setting_keys.keys
       %label.checkbox{:for => "user[setting_attributes][#{setting}]"}
+        = hidden_field_tag "user[setting_attributes][#{setting}]", '0'
         = check_box_tag "user[setting_attributes][#{setting}]", '1',
         f.object.settings[setting] == '1' || f.object.settings_default(setting)
         = User::setting_keys[setting]

config/routes.rb

@@ -117,6 +117,7 @@ Foodsoft::Application.routes.draw do
           get :shared
           get :import
           post :sync
+          post :update_synchronized
         end
       end
     end