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

#779 Received state for orders (PR #789, #779)

Browse source
This commit is contained in:
lentschi 2021-02-03 20:57:53 +01:00 • committed by GitHub
parent 67ad202859
commit 085562dbf4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/finance/invoices_controller.rb
View file

@ -33,7 +33,7 @@ class Finance::InvoicesController < ApplicationController
def fill_deliveries_and_orders_collection(invoice_id, supplier_id)
@deliveries_collection = Delivery.where('invoice_id = ? OR (invoice_id IS NULL AND supplier_id = ?)', invoice_id, supplier_id).order(:date)
@orders_collection = Order.where('invoice_id = ? OR (invoice_id IS NULL AND supplier_id = ? AND state = ?)', invoice_id, supplier_id, 'finished').order(:ends)
@orders_collection = Order.where('invoice_id = ? OR (invoice_id IS NULL AND supplier_id = ? AND state IN (?))', invoice_id, supplier_id, %w[finished received]).order(:ends)
end
def create

8
app/controllers/orders_controller.rb
View file

@ -132,8 +132,12 @@ class OrdersController < ApplicationController
unless request.post?
@order_articles = @order.order_articles.ordered_or_member.includes(:article).order('articles.order_number, articles.name')
else
s = update_order_amounts
flash[:notice] = (s ? I18n.t('orders.receive.notice', :msg => s) : I18n.t('orders.receive.notice_none'))
Order.transaction do
s = update_order_amounts
@order.update_attribute(:state, 'received') if @order.state != 'received'
flash[:notice] = (s ? I18n.t('orders.receive.notice', :msg => s) : I18n.t('orders.receive.notice_none'))
end
if current_user.role_orders? || current_user.role_finance?
redirect_to @order
elsif current_user.role_pickup?