Rename Delivery.delivered_on to date
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:
parent
7b2072251e
commit
a5582e9542
18 changed files with 35 additions and 30 deletions
|
|
@ -4,7 +4,7 @@ class DeliveriesController < ApplicationController
|
|||
before_action :find_supplier, :exclude => :fill_new_stock_article_form
|
||||
|
||||
def index
|
||||
@deliveries = @supplier.deliveries.order('delivered_on DESC')
|
||||
@deliveries = @supplier.deliveries.order('date DESC')
|
||||
end
|
||||
|
||||
def show
|
||||
|
|
@ -13,12 +13,12 @@ class DeliveriesController < ApplicationController
|
|||
|
||||
def new
|
||||
@delivery = @supplier.deliveries.build
|
||||
@delivery.delivered_on = Date.today #TODO: move to model/database
|
||||
@delivery.date = Date.today #TODO: move to model/database
|
||||
end
|
||||
|
||||
def create
|
||||
@delivery = Delivery.new(params[:delivery])
|
||||
|
||||
|
||||
if @delivery.save
|
||||
flash[:notice] = I18n.t('deliveries.create.notice')
|
||||
redirect_to [@supplier, @delivery]
|
||||
|
|
@ -30,7 +30,7 @@ class DeliveriesController < ApplicationController
|
|||
def edit
|
||||
@delivery = Delivery.find(params[:id])
|
||||
end
|
||||
|
||||
|
||||
def update
|
||||
@delivery = Delivery.find(params[:id])
|
||||
|
||||
|
|
@ -49,22 +49,22 @@ class DeliveriesController < ApplicationController
|
|||
flash[:notice] = I18n.t('deliveries.destroy.notice')
|
||||
redirect_to supplier_deliveries_url(@supplier)
|
||||
end
|
||||
|
||||
|
||||
def add_stock_change
|
||||
@stock_change = StockChange.new
|
||||
@stock_change.stock_article = StockArticle.find(params[:stock_article_id])
|
||||
render :layout => false
|
||||
end
|
||||
|
||||
|
||||
def form_on_stock_article_create # See publish/subscribe design pattern in /doc.
|
||||
@stock_article = StockArticle.find(params[:id])
|
||||
|
||||
|
||||
render :layout => false
|
||||
end
|
||||
|
||||
def form_on_stock_article_update # See publish/subscribe design pattern in /doc.
|
||||
@stock_article = StockArticle.find(params[:id])
|
||||
|
||||
|
||||
render :layout => false
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue