From 9de3699c618ab5024d34b0aa4ac76fa53ecac01b Mon Sep 17 00:00:00 2001
From: Jude Hutton <jude2.hutton@live.uwe.ac.uk>
Date: Mon, 27 Mar 2023 12:02:28 +0100
Subject: [PATCH] Added correct route to add set to basket
---
store/routes.py | 24 ++++++++++++++++++++++++
store/templates/ItemPage.html | 2 +-
store/templates/ItemSetPage.html | 2 +-
store/templates/Items.html | 2 +-
store/templates/itemSets.html | 2 +-
5 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/store/routes.py b/store/routes.py
index a3ae6f7..a7e6463 100644
--- a/store/routes.py
+++ b/store/routes.py
@@ -388,6 +388,7 @@ def ChangePhNumber():
@app.route("/add_to_basket", methods=["POST"])
def add_to_basket():
item_id = request.form["item_id"]
+
item_obj = get_item_by_id(item_id)
item_dict = {
@@ -407,6 +408,29 @@ def add_to_basket():
return redirect(url_for("ItemPage", item_id=item_id))
+@app.route("/add_to_basket_set", methods=["POST"])
+def add_to_basket_set():
+ item_id = request.form["item_id"]
+
+ item_obj = get_item_set_by_id(item_id)
+
+ item_dict = {
+ "id": item_obj.id,
+ "description": item_obj.description,
+ "price": item_obj.price,
+ }
+ if "basket" not in session:
+ session["basket"] = {}
+
+ if item_id in session["basket"]:
+ flash("Item already in basket")
+ else:
+ session["basket"][item_id] = item_dict
+ flash("Item added to basket: " + item_obj.description)
+ print(session["basket"])
+ return redirect(url_for("ItemSetPage", item_id=item_id))
+
+
@app.route("/remove_item", methods=["POST"])
def remove_item():
if request.method == "POST":
diff --git a/store/templates/ItemPage.html b/store/templates/ItemPage.html
index 7fec52b..3f4434c 100644
--- a/store/templates/ItemPage.html
+++ b/store/templates/ItemPage.html
@@ -3,7 +3,7 @@
{% block content %}
{% block title %} Item Page | Antiques Online {% endblock %}
<div>
- <img src='static\image_placeholder.png' alt="Image Placeholder" width="200" height="170">
+ <img src='..\static\image_placeholder.png' alt="Image Placeholder" width="200" height="170">
<br />
Item price: £{{item_price}}
<br />
diff --git a/store/templates/ItemSetPage.html b/store/templates/ItemSetPage.html
index ca0be6a..d2b0b01 100644
--- a/store/templates/ItemSetPage.html
+++ b/store/templates/ItemSetPage.html
@@ -22,7 +22,7 @@
<br>
Item description: {{item_description}}
<br>
- <form method="POST" action="{{url_for ('add_to_basket') }}">
+ <form method="POST" action="{{url_for ('add_to_basket_set') }}">
<input type="hidden" name="item_id" value="{{ item_id }}">
<input class="button" type="submit" value="Add to basket">
</form>
diff --git a/store/templates/Items.html b/store/templates/Items.html
index 961714a..15b866e 100644
--- a/store/templates/Items.html
+++ b/store/templates/Items.html
@@ -42,7 +42,7 @@
<img src="static\image_placeholder.png" alt="{{ item.description }}">
<h2>{{ item.description }}</h2>
- <p>{{ item.price }}</p>
+ <p>£{{ item.price }}</p>
<a href="{{url_for('ItemPage', item_id = item.id)}}">View
Details</a>
diff --git a/store/templates/itemSets.html b/store/templates/itemSets.html
index 039728a..a98b764 100644
--- a/store/templates/itemSets.html
+++ b/store/templates/itemSets.html
@@ -42,7 +42,7 @@
<img src="static\image_placeholder.png" alt="{{ item.description }}">
<h2>{{ item.description }}</h2>
- <p>{{ item.price }}</p>
+ <p>£{{ item.price }}</p>
<a href="{{url_for('ItemSetPage', item_id = item.id)}}">View
Details</a>
--
GitLab