Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/views/products/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<% @products.each_slice(3) do |product| %>
<% @products.each_slice(3) do |split_product| %>
<div class="row">
<% @products.each do |product| %>
<% split_product.each do |product| %>
<div class="col-md-4"><%= product.name %>
<p class="caption center-block"><%= link_to product_path(product.id) do %></p>
<p class="img"><%= image_tag "#{product.photo_url}"%></p>
Expand Down
4 changes: 2 additions & 2 deletions app/views/products/merchant_products.html.erb
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<section>
<h3><%= @merchant.username%>'s Shop</h3>
<% @merchant.products.each_slice(3) do |product| %>
<% @merchant.products.each_slice(3) do |split_product| %>
<div class="row">
<% if @merchant.products.length == 0 %>
<p>No products currently for sale</p>
<% end %>
<% @merchant.products.each do |product| %>
<% split_product.each do |product| %>
<% if product.retired == false%>
<div class="col-md-4"><%= product.name %>
<p class="caption center-block"><%= link_to product_path(product.id) do %></p>
Expand Down