diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index 84a2e57..f1ff050 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -1,4 +1,5 @@ class OrdersController < ApplicationController + include OrdersHelper def new @user = User.find(params[:user_id]) @@ -17,7 +18,7 @@ class OrdersController < ApplicationController @products = Product.all @order_products = @order.order_products if @order.save - flash[:success] = "Ordered things! Get your stuff!" + flash[:success] = order_to_sentence(@order) + " ordered. Enjoy it!" redirect_to root_path else render 'new' diff --git a/app/helpers/orders_helper.rb b/app/helpers/orders_helper.rb index 443227f..96d4633 100644 --- a/app/helpers/orders_helper.rb +++ b/app/helpers/orders_helper.rb @@ -1,2 +1,9 @@ module OrdersHelper + include ActionView::Helpers::TextHelper + + def order_to_sentence(order) + order.order_products.map { + |op| pluralize(op.count, op.product.name) + }.to_sentence + end end diff --git a/app/views/orders/new.html.erb b/app/views/orders/new.html.erb index 4d42f29..916e9d9 100644 --- a/app/views/orders/new.html.erb +++ b/app/views/orders/new.html.erb @@ -1,4 +1,4 @@ -

Order for <%= @user.nickname %>

+

Order for <%= @user.nickname %> (<%= euro(@user.balance) %>)

<%= form_for @order, url: user_orders_path(@user) do |f| %> @@ -7,7 +7,7 @@
<%= f.fields_for :order_products do |op_field| %> <%= render 'order_products/form_row', f: op_field %> - <% end %> + <% end %>