From 537f9546f2e820399ed0bf5351a73a207ee3b053 Mon Sep 17 00:00:00 2001
From: "Butler, Alexis (UG - Computer Science)" <ab02259@surrey.ac.uk>
Date: Fri, 11 Dec 2020 09:34:15 +0000
Subject: [PATCH] Final touches and tests
---
app/views/admin/orders/_order.html.erb | 6 +++-
app/views/orders/_entry.html.erb | 50 +++++++++++++++++---------
app/views/products/show.html.erb | 7 ++++
config/locales/en.yml | 3 ++
4 files changed, 48 insertions(+), 18 deletions(-)
diff --git a/app/views/admin/orders/_order.html.erb b/app/views/admin/orders/_order.html.erb
index 27511c0..1134647 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 4dbecc0..4fa53c6 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 4a51400..fbb6aab 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 121eeee..2a068fb 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:
--
GitLab