New receive screen (ready)

app/assets/javascripts/application.js

@@ -107,6 +107,11 @@ $(function() {
         return false;
     });
 
+    // Disable action of disabled buttons
+    $(document).on('click', 'a.disabled', function() {
+        return false;
+    });
+
     // Show and hide loader on ajax callbacks
     $('*[data-remote]').bind('ajax:beforeSend', function() {
         $('#loader').show();

app/assets/stylesheets/bootstrap_and_overrides.css.less

@@ -30,7 +30,19 @@ body {
 // Example:
 // @linkColor: #ff0000;
 
-// Custom styles
+
+// main ui colours
+@mainRedColor: #ED0606;
+
+// article status
+@articleUsedColor: green;
+@articleUnusedColor: red;
+@articleUnavailColor: #999;
+@articleUpdatedColor: #468847;
+
+// dim colors by this amount when the information is less important
+@nonessentialDim: 35%;
+
 
 // Fix empty dd tags in horizontal dl, see https://github.com/twitter/bootstrap/issues/4062
 .dl-horizontal { 
@@ -39,7 +51,8 @@ body {
 
 // Do not use additional margin for input in table
 .form-horizontal .control-group.control-group-intable,
-.form-horizontal .controls.controls-intable {
+.form-horizontal .controls.controls-intable,
+.input-prepend.intable {
   margin: 0;
 }
 
@@ -53,7 +66,6 @@ body {
   margin-bottom: 0;
 }
 
-@mainRedColor: #ED0606;
 
 .logo {
   margin: 10px 0 0 30px;
@@ -134,11 +146,11 @@ table {
 }
 
 // ordering
-span.used {
-  color: green;
+.used {
+  color: @articleUsedColor;
 }
-span.unused {
-  color: red;
+.unused {
+  color: @articleUnusedColor;
 }
 
 #order-footer, .article-info {
@@ -202,11 +214,11 @@ tr.order-article:hover .article-info {
 // ********* Articles
 
 tr.just-updated {
-  color: #468847;
+  color: @articleUpdatedColor;
 }
 
 tr.unavailable {
-  color: #999;
+  color: @articleUnavailColor;
 }
 
 // articles edit all
@@ -216,6 +228,16 @@ tr.unavailable {
   }
 }
 
+// editable article list can be more compact
+.ordered-articles input {
+  margin-bottom: 0;
+}
+
+// allow content to appear without sudden table change (receive)
+.units_delta {
+  min-width: 3.5em;
+}
+
 // ********* Tweaks & fixes
 
 // need more space for supplier&order information (in German, at least)
@@ -242,11 +264,60 @@ tr.unavailable {
   }
 }
 
+// it's a bit distracting
+.icon-asterisk {
+  font-size: 80%;
+  vertical-align: middle;
+  padding-bottom: 0.4ex;
+}
+
 // allow buttons as input add-on (with proper height)
 .input-append button.add-on {
   height: inherit;
 }
 
+// inline form elements
+.inline {
+  display: inline;
+}
+
+// show package icon after amount of wholesale units
+.package-image (@align) {
+  background-image: url(package-bg.png);
+  background-repeat: no-repeat;
+  background-position: @align center;
+}
+input.package {
+  .package-image(right);
+  // disabled and readonly definitions though
+  &[disabled], &[readonly] {
+    background-color: @inputDisabledBackground;
+  }
+}
+i.package {
+  .package-image(left);
+  min-width: 18px;
+  min-height: 18px;
+  vertical-align: baseline;
+  font-style: normal;
+  padding-left: 20px;
+  @media (max-width: 979px) { padding-left: 0; }
+}
+i.package.icon-only {
+  padding-left: 6px;
+  background-position: right;
+  display: inline-block;
+}
+.package              { color: tint(@textColor, @nonessentialDim); }
+.used        .package { color: tint(@articleUsedColor, @nonessentialDim); }
+.unused      .package { color: tint(@articleUnusedColor, @nonessentialDim); }
+.unavailable .package { color: @articleUnavailColor; }
+
+// very small inputs - need !important for responsive selectors
+.input-nano {
+  width: 30px !important;
+}
+
 // get rid of extra space on bottom of dialog with form
 .modal form {
   margin: 0;
@@ -281,10 +352,22 @@ tr.unavailable {
         float: none;
       }
     }
+    // allow to add a hint for the whole line
+    > .help-block {
+      clear: both;
+      margin-left: 180px;
+      position: relative;
+      top: -2.5ex;
+    }
   }
 }
 // allow to have indicator text instead of input with same markup
 .control-text {
   margin-top: 5px;
 }
-
+
+// unlock button same size as warning sign
+.input-prepend button.unlocker {
+  padding-right: 6px;
+  padding-left: 7px;
+}

app/controllers/application_controller.rb

@@ -47,6 +47,7 @@ def authenticate(role = 'any')
       when "article_meta" then current_user.role_article_meta?
       when "suppliers"  then current_user.role_suppliers?
       when "orders" then current_user.role_orders?
+      when "finance_or_orders" then (current_user.role_finance? || current_user.role_orders?)
       when "any" then true        # no role required
       else false                  # any unknown role will always fail
       end
@@ -78,6 +79,10 @@ def authenticate_orders
     authenticate('orders')
   end
 
+  def authenticate_finance_or_orders
+    authenticate('finance_or_orders')
+  end
+
   # checks if the current_user is member of given group.
   # if fails the user will redirected to startpage
   def authenticate_membership_or_admin(group_id = params[:id])

app/controllers/finance/balancing_controller.rb

@@ -29,6 +29,18 @@ def new
 
     render layout: false if request.xhr?
   end
+
+  def new_on_order_article_create # See publish/subscribe design pattern in /doc.
+    @order_article = OrderArticle.find(params[:order_article_id])
+
+    render :layout => false
+  end
+
+  def new_on_order_article_update # See publish/subscribe design pattern in /doc.
+    @order_article = OrderArticle.find(params[:order_article_id])
+
+    render :layout => false
+  end
 
   def update_summary
     @order = Order.find(params[:id])

app/controllers/finance/order_articles_controller.rb → app/controllers/order_articles_controller.rb

@@ -1,28 +1,26 @@
-class Finance::OrderArticlesController < ApplicationController
+class OrderArticlesController < ApplicationController
 
-  before_filter :authenticate_finance
+  before_filter :authenticate_finance_or_orders
 
   layout false  # We only use this controller to serve js snippets, no need for layout rendering
 
   def new
     @order = Order.find(params[:order_id])
-    @order_article = @order.order_articles.build
+    @order_article = @order.order_articles.build(params[:order_article])
   end
 
   def create
     @order = Order.find(params[:order_id])
-    # The article may with zero units ordered - in that case find and set amount to nonzero.
+    # The article may be ordered with zero units - in that case do not complain.
     #   If order_article is ordered and a new order_article is created, an error message will be
     #   given mentioning that the article already exists, which is desired.
     @order_article = @order.order_articles.where(:article_id => params[:order_article][:article_id]).first
-    if @order_article and @order_article.units_to_order == 0
-      @order_article.units_to_order = 1
-    else
+    unless (@order_article and @order_article.units_to_order == 0)
       @order_article = @order.order_articles.build(params[:order_article])
     end
-    unless @order_article.save
-      render action: :new
-    end
+    @order_article.save!
+  rescue
+    render action: :new
   end
 
   def edit

app/controllers/orders_controller.rb

@@ -8,7 +8,8 @@ class OrdersController < ApplicationController
 
   # List orders
   def index
-    @open_orders = Order.open
+    @open_orders = Order.open.includes(:supplier)
+    @finished_orders = Order.finished_not_closed.includes(:supplier)
     @per_page = 15
     if params['sort']
       sort = case params['sort']
@@ -20,7 +21,7 @@ def index
     else
       sort = "ends DESC"
     end
-    @orders = Order.page(params[:page]).per(@per_page).order(sort).where("state != 'open'").includes(:supplier)
+    @orders = Order.closed.page(params[:page]).per(@per_page).includes(:supplier).order(sort)
   end
 
   # Gives a view for the results to a specific order
@@ -105,6 +106,29 @@ def finish
     redirect_to orders_url, alert: I18n.t('errors.general_msg', :msg => error.message)
   end
 
+  def receive
+    @order = Order.find(params[:id])
+    unless request.post?
+      @order_articles = @order.order_articles.ordered.includes(:article)
+    else
+      s = update_order_amounts
+      flash[:notice] = (s ? I18n.t('orders.receive.notice', :msg => s) : I18n.t('orders.receive.notice_none'))
+      redirect_to @order
+    end
+  end
+
+  def receive_on_order_article_create # See publish/subscribe design pattern in /doc.
+    @order_article = OrderArticle.find(params[:order_article_id])
+
+    render :layout => false
+  end
+
+  def receive_on_order_article_update # See publish/subscribe design pattern in /doc.
+    @order_article = OrderArticle.find(params[:order_article_id])
+
+    render :layout => false
+  end
+
   protected
 
   # Renders the fax-text-file
@@ -131,4 +155,46 @@ def text_fax_template
     end
     text
   end
+
+  def update_order_amounts
+    return if not params[:order_articles]
+    # where to leave remainder during redistribution
+    rest_to = []
+    rest_to << :tolerance if params[:rest_to_tolerance]
+    rest_to << :stock if params[:rest_to_stock]
+    rest_to << nil
+    # count what happens to the articles:
+    #   changed, rest_to_tolerance, rest_to_stock, left_over
+    counts = [0] * 4
+    cunits = [0] * 4
+    OrderArticle.transaction do
+      params[:order_articles].each do |oa_id, oa_params|
+        unless oa_params.blank?
+          oa = OrderArticle.find(oa_id)
+          # update attributes; don't use update_attribute because it calls save
+          # which makes received_changed? not work anymore
+          oa.attributes = oa_params
+          if oa.units_received_changed?
+            counts[0] += 1 
+            unless oa.units_received.blank?
+              cunits[0] += oa.units_received * oa.article.unit_quantity
+              oacounts = oa.redistribute oa.units_received * oa.price.unit_quantity, rest_to
+              oacounts.each_with_index {|c,i| cunits[i+1]+=c; counts[i+1]+=1 if c>0 }
+            end
+          end
+          oa.save!
+        end
+      end
+    end
+    return nil if counts[0] == 0
+    notice = []
+    notice << I18n.t('orders.update_order_amounts.msg1', count: counts[0], units: cunits[0])
+    notice << I18n.t('orders.update_order_amounts.msg2', count: counts[1], units: cunits[1]) if params[:rest_to_tolerance]
+    notice << I18n.t('orders.update_order_amounts.msg3', count: counts[2], units: cunits[2]) if params[:rest_to_stock]
+    if counts[3]>0 or cunits[3]>0
+      notice << I18n.t('orders.update_order_amounts.msg4', count: counts[3], units: cunits[3])
+    end
+    notice.join(', ')
+  end
+
 end

app/helpers/application_helper.rb

@@ -81,10 +81,10 @@ def sort_link_helper(text, key, options = {})
   #   heading, with an abbreviation title of 'foo'.
   #  Other options are passed through to I18n.
   def heading_helper(model, attribute, options = {})
-    i18nopts = options.select {|a| !['short'].include?(a) }
+    i18nopts = options.select {|a| !['short'].include?(a) }.merge({count: 2})
     s = model.human_attribute_name(attribute, i18nopts)
     if options[:short]
-      sshort = model.human_attribute_name("#{attribute}_short".to_sym, options.merge({fallback: true, default: ''}))
+      sshort = model.human_attribute_name("#{attribute}_short".to_sym, options.merge({fallback: true, default: '', count: 2}))
       s = raw "<abbr title='#{s}'>#{sshort}</abbr>" unless sshort.blank?
     end
     s

app/helpers/deliveries_helper.rb

@@ -10,12 +10,17 @@ def link_to_invoice(delivery)
     end
   end
 
-  def articles_for_select2(supplier)
-    supplier.articles.undeleted.reorder('articles.name ASC').map {|a| {:id => a.id, :text => "#{a.name} (#{number_to_currency a.price}/#{a.unit})"} }
+  def articles_for_select2(articles, except = [], &block)
+    articles = articles.reorder('articles.name ASC')
+    articles.reject! {|a| not except.index(a.id).nil? } if except
+    block_given? or block = Proc.new {|a| "#{a.name} (#{number_to_currency a.price}/#{a.unit})" }
+    articles.map do |a|
+      {:id => a.id, :text => block.call(a)}
+    end.unshift({:id => '', :text => ''})
   end
 
-  def stock_articles_for_table(supplier)
-    supplier.stock_articles.undeleted.reorder('articles.name ASC')
+  def articles_for_table(articles)
+    articles.undeleted.reorder('articles.name ASC')
   end
 
   def stock_change_remove_link(stock_change_form)

app/helpers/finance/order_articles_helper.rb → app/helpers/order_articles_helper.rb

@@ -1,4 +1,4 @@
-module Finance::OrderArticlesHelper
+module OrderArticlesHelper
 
   def new_order_articles_collection
     if @order.stockit?