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

Rename Delivery.delivered_on to date

Browse source 
This aligns it with column names of StockTaking and us to use inheritance
in a next step to share common code between the entities.
This commit is contained in:
Patrick Gansterer 2020-08-01 18:39:34 +02:00
parent 7b2072251e
commit a5582e9542
18 changed files with 35 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,7 @@ class Finance::InvoicesController < ApplicationController
end
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(:delivered_on)
@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)
end