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

fix articles with zero quantity showing

Browse source 
complements 8913ad615c
This commit is contained in:
wvengen 2014-09-11 13:47:03 +02:00
parent ee1874a15f
commit cf360335ee
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/orders_controller.rb
View file

@ -114,7 +114,7 @@ class OrdersController < ApplicationController
def receive def receive
@order = Order.find(params[:id]) @order = Order.find(params[:id])
unless request.post? unless request.post?
@order_articles = @order.order_articles.ordered.includes(:article).order('articles.order_number, articles.name') @order_articles = @order.order_articles.ordered_or_member.includes(:article).order('articles.order_number, articles.name')
else else
s = update_order_amounts s = update_order_amounts
flash[:notice] = (s ? I18n.t('orders.receive.notice', :msg => s) : I18n.t('orders.receive.notice_none')) flash[:notice] = (s ? I18n.t('orders.receive.notice', :msg => s) : I18n.t('orders.receive.notice_none'))

4
app/models/order_article.rb
View file

@ -12,9 +12,9 @@ class OrderArticle < ActiveRecord::Base
validate :article_and_price_exist validate :article_and_price_exist
validates_uniqueness_of :article_id, scope: :order_id validates_uniqueness_of :article_id, scope: :order_id
_ordered_sql = "units_to_order > 0 OR units_billed > 0 OR units_received > 0 OR order_articles.quantity > 0" _ordered_sql = "order_articles.units_to_order > 0 OR order_articles.units_billed > 0 OR order_articles.units_received > 0"
scope :ordered, -> { where(_ordered_sql) } scope :ordered, -> { where(_ordered_sql) }
scope :ordered_or_member, -> { includes(:group_order_articles).where("#{_ordered_sql} OR group_order_articles.result > 0") } scope :ordered_or_member, -> { includes(:group_order_articles).where("#{_ordered_sql} OR order_articles.quantity > 0 OR group_order_articles.result > 0") }
before_create :init_from_balancing before_create :init_from_balancing
after_destroy :update_ordergroup_prices after_destroy :update_ordergroup_prices