diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 3a2f8a4..37c04e6 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -70,10 +70,6 @@ footer ul li { } .overview{ - //margin-left: 2px; - width: 50%; - float: left; - border-radius: 0px; margin-bottom: 0px; border: 0px; diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index 0b4abc7..f092be6 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -8,6 +8,8 @@ class OrdersController < ApplicationController redirect_to root_path, flash: { error: "Koelkast can't order things." } if @user.koelkast? @order = @user.orders.build + # products = @user.products.select("products.*", "sum(order_items.count) as count").group(:product_id).order("count desc") + # @order.g_order_items(products) @order.g_order_items(Product.all) end @@ -39,8 +41,7 @@ class OrdersController < ApplicationController end def overview - @users_by_name = User.members.order(:name) - @users_by_order = User.members.order(:orders_count).reverse_order + @users = User.members.order(:name) end def quickpay diff --git a/app/models/product.rb b/app/models/product.rb index 01bee80..2e4d031 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -17,7 +17,7 @@ class Product < ActiveRecord::Base has_many :order_items - has_attached_file :avatar, styles: { medium: "100x100>" }, default_style: :medium, default_url: "http://lorempixel.com/70/70/" + has_attached_file :avatar, styles: { dagschotel: "80x80>", medium: "100x100>" }, default_style: :medium, default_url: "http://lorempixel.com/70/70/" enum category: %w(food beverages other) diff --git a/app/views/orders/_overview.html.erb b/app/views/orders/_overview.html.erb deleted file mode 100644 index da4601a..0000000 --- a/app/views/orders/_overview.html.erb +++ /dev/null @@ -1,6 +0,0 @@ -
-

Sort by name

- <% users.each do |user| %> - <%= render 'users/new_order', user: user %> - <% end %> -
diff --git a/app/views/orders/overview.html.erb b/app/views/orders/overview.html.erb index ed6fc68..95aa1bb 100644 --- a/app/views/orders/overview.html.erb +++ b/app/views/orders/overview.html.erb @@ -1,4 +1,7 @@ <%= render partial: 'flash' %> -<%= render 'overview', users: @users_by_name %> -<%= render 'overview', users: @users_by_order %> +
+ <% @users.each do |user| %> + <%= render 'users/new_order', user: user %> + <% end %> +
diff --git a/app/views/users/_new_order.html.erb b/app/views/users/_new_order.html.erb index fcc6e89..f13b704 100644 --- a/app/views/users/_new_order.html.erb +++ b/app/views/users/_new_order.html.erb @@ -1,10 +1,10 @@ -
+
<% unless user.dagschotel.nil? %> <%= link_to user_quickpay_path(user) do %> - <%= image_tag user.dagschotel.avatar, class: "img-circle dagschotel" %> + <%= image_tag user.dagschotel.avatar(:dagschotel), class: "img-circle dagschotel" %> <% end %> <% end %> <%= link_to image_tag(user.avatar(:large) , class: "img-circle avatar"), new_user_order_path(user) %> - <%= link_to user.name , new_user_order_path(user), class: "btn btn-info", style: get_color_style(user) %> + <%= link_to user.nickname , new_user_order_path(user), class: "btn btn-info", style: get_color_style(user) %>