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

Use OrderArticle#create in receive form instead of Order#add_article

Browse source
This commit is contained in:
Julius 2013-12-31 13:46:25 +01:00 • committed by wvengen
parent 59c118a171
commit 033aa90698
6 changed files with 36 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/controllers/orders_controller.rb
View file

@ -106,17 +106,6 @@ class OrdersController < ApplicationController
redirect_to orders_url, alert: I18n.t('errors.general_msg', :msg => error.message)
end
# ajax add article
def add_article
@order = Order.find(params[:id])
@order_article = @order.order_articles.where(:article_id => params[:article_id]).includes(:article).first
# we need to create the order article if it's not part of the current order
if @order_article.nil?
@order_article = @order.order_articles.build({order: @order, article_id: params[:article_id]})
@order_article.save!
end
end
def receive
@order = Order.find(params[:id])
unless request.post?
@ -127,6 +116,12 @@ class OrdersController < ApplicationController
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])