big progress

1 files changed, 6 insertions, 43 deletions

diff --git a/client/src/shoppingbasket.js b/client/src/shoppingbasket.js
index 56e717a..434b8cf 100644
--- a/client/src/shoppingbasket.js
+++ b/client/src/shoppingbasket.js
@@ -1,20 +1,15 @@
 import { Order } from "./templateImplementations.js"
-import { displayNumberOfItemsInShoppingBasketWithBadge, findParentWithTag, childKillerUsingTags } from "./utils.js";
+import {
+    displayNumberOfItemsInShoppingBasketWithBadge,
+    readOrderArrayFromLocalStorage,
+} from "./utils.js";
 
 
-function getOrderArray() {
-    var orders = JSON.parse(localStorage.getItem("shoppingBasketArray"));
-    return orders;
-}
-
 function displayOrders() {
     displayNumberOfItemsInShoppingBasketWithBadge();
     console.log("displaying orders in shopppingbasket");
-    const orderFunctionality = {
-        cancel: cancelOrder,
-    };
 
-    var orders = getOrderArray();
+    var orders = readOrderArrayFromLocalStorage();
     if (orders === null || orders.length === 0) {
         var button = document.querySelector("#finalizepaymentbutton");
         var front = button.querySelector(".front");
@@ -30,40 +25,10 @@ function displayOrders() {
 
     for (let i = 0; i < orders.length; i++) {
         var orderObj = new Order(orders[i], document.querySelector("#ticket"));
-        orderObj.addToNode(main, orderFunctionality);
+        orderObj.addToNode(main);
     }
 }
 
-function cancelOrder(event) {
-    //console.log(event.target);
-    console.log("cancel button clicked");
-    const article = findParentWithTag.bind(event.target)("article");
-
-    var previous = article.previousSibling;
-    var i = 0;
-    while (previous) {
-        if (previous.tagName === "ARTICLE") {
-            i = i+1;
-        }
-        previous = previous.previousSibling;
-    }
-
-    var orders = getOrderArray();
-    console.log("---> canceling order ");
-    console.log(orders[i]);
-    console.log("---> removing it from shoppingbasket")
-    orders.splice(i, 1);
-    localStorage.setItem("shoppingBasketArray", JSON.stringify(orders));
-
-    var main = document.querySelector("main");
-    console.log("---> refreshing displayed orders")
-    childKillerUsingTags(main)(main.firstChild)("article");
-    displayOrders();
-}
-
-
-
-
 function finalizePayment(event) {
     console.log("finalizing payments");
 
@@ -71,8 +36,6 @@ function finalizePayment(event) {
 
     window.location.replace("orderplaced.html");
 }
-
-
 document.querySelector("#finalizepaymentbutton").addEventListener("click", finalizePayment);
 
 displayOrders();