diff --git a/app/views/admin/orders/_order.html.erb b/app/views/admin/orders/_order.html.erb index 27511c073c24b26f51597f8221600939fcad8063..1134647e0a0c104d05b04a1c3306c0ef9cd2927f 100644 --- a/app/views/admin/orders/_order.html.erb +++ b/app/views/admin/orders/_order.html.erb @@ -8,7 +8,11 @@ </td> <td> <% order.order_entries.each do |i| %> - <p><%=i.product.name%> x <%=i.quantity %></p> + <%if i.product.presence%> + <p><%=i.product.name%> x <%=i.quantity %></p> + <%else %> + <p><%=t('.no_longer') %></p> + <%end %> <%end %> </td> <td> diff --git a/app/views/orders/_entry.html.erb b/app/views/orders/_entry.html.erb index 4dbecc01d1938d63e96c8368dd87076c07b0942c..4fa53c60e412574108e2aef3b84e08bb31840f08 100644 --- a/app/views/orders/_entry.html.erb +++ b/app/views/orders/_entry.html.erb @@ -1,18 +1,34 @@ <!--Collect and display entry info in a table row --> -<% @order.order_entries.each do |i| %> - <tr> - <td> - <%= image_tag i.product.image.small.url %> - </td> - <td> - <h5><%=i.product.name %></h5><br> - <p><%=i.product.description %></p> - </td> - <td> - <%=i.quantity %> - </td> - <td> - <%= humanized_money_with_symbol i.totalprice %> - </td> - </tr> -<% end %> +<% @order.order_entries.each do |i|%> + <%if i.product.presence%> + <tr> + <td> + <%= image_tag i.product.image.small.url %> + </td> + <td> + <h5><%=i.product.name %></h5><br> + <p><%=i.product.description %></p> + </td> + <td> + <%=i.quantity %> + </td> + <td> + <%= humanized_money_with_symbol i.totalprice %> + </td> + </tr> + <%else %> + <tr> + <td> + </td> + <td> + <h5><%=t('orders.show.no_longer')%></h5> + </td> + <td> + <%=i.quantity %> + </td> + <td> + <%= humanized_money_with_symbol i.totalprice %> + </td> + </tr> + <%end %> +<%end%> diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 4a514006390b39b232ea45137e9945fe12b3ab4c..fbb6aab9f843b8da295a51852d218ced1d0b3efa 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -16,6 +16,13 @@ <dd><%= @product.stockCount %></dd> <dt><%=t('.price_title') %></dt> <dd><%= humanized_money_with_symbol @product.price %></dd> + <dd> + <% if @product.stockCount >0 %> + <%= link_to add_item_carts_path(product_id: @product.id), method: :put do %> + <%= fa_icon "shopping-cart", text: t('.add_cart') %> + <%end%> + <%end%> + </dd> </dl> </div> <div class="col-lg-8 col-sm-9 col-xs-8"> diff --git a/config/locales/en.yml b/config/locales/en.yml index 121eeee257d407b20b83516e8a06ada1817dfbab..2a068fb4333777bfdbab7d71f0651246278bbc70 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -64,6 +64,7 @@ en: lvl0: "Give me my money back" sub_button: "Submit review and rating" remove_button: "Remove Review" + add_cart: "Add To Cart" product: add_cart: "Add To Cart" @@ -86,6 +87,7 @@ en: quan_title: "Quantity" price_title: "Price" total_title: "Total spend" + no_longer: "Product No longer stocked/tracked" contact: new: @@ -144,6 +146,7 @@ en: email_title: "customer email" order: confirm: "Are you sure?" + no_longer: "Product No longer stocked/tracked" products: new: