allow printing/editing orders

controllers/cartItemController.go

@@ -515,47 +515,50 @@ func (rc *cartItemController) OrdersView(c *gin.Context) {
 }
 
 func (rc *cartItemController) OrdersHandler(c *gin.Context) {
-	confirmation := c.PostForm("confirm-order")
+	token := c.Param("token")
 
-	if confirmation == "" {
-		c.HTML(http.StatusBadRequest, "error.html", gin.H{"error": "Something went wrong, try again later"})
+	if token == "" {
+		c.HTML(http.StatusBadRequest, "error.html", gin.H{"error": "EmptyToken"})
 		return
 	}
 
-	if confirmation != "true" {
-		c.HTML(http.StatusBadRequest, "error.html", gin.H{"error": "Order was not confirmed."})
-		return
+	action := c.PostForm("action")
+
+	if action == "update" {
+		order, err := repositories.Orders.GetByToken(token)
+
+		if err != nil {
+			c.HTML(http.StatusBadRequest, "error.html", gin.H{"error": "No order with given token found"})
+			return
+		}
+
+		status := c.PostForm("order-status")
+
+		//TODO validate status
+		if status == "" {
+			c.HTML(http.StatusBadRequest, "error.html", gin.H{"error": "Invalid Order Status"})
+			return
+		}
+
+		order.Status = models.OrderStatus(status)
+
+		_, err = repositories.Orders.Update(order)
+
+		if err != nil {
+			c.HTML(http.StatusBadRequest, "error.html", gin.H{"error": err})
+			return
+		}
 	}
 
-	sessionId := GetSessionId(c)
-	order, err := repositories.Orders.GetBySession(sessionId)
+	if action == "delete" {
+		fmt.Println("Deleting Order ", token)
+		err := repositories.Orders.DeleteByToken(token)
 
-	if err != nil {
-		c.HTML(http.StatusBadRequest, "error.html", gin.H{"error": "Something went wrong, try again later"})
-		return
+		if err != nil {
+			c.HTML(http.StatusBadRequest, "error.html", gin.H{"error": err})
+			return
+		}
 	}
 
-	order.Status = models.AwaitingPayment
-
-	err = order.Validate()
-	if err != nil {
-		c.HTML(http.StatusBadRequest, "error.html", gin.H{"error": err})
-		return
-	}
-
-	for idx := range order.CartItems {
-		order.CartItems[idx].SessionId = "0"
-		repositories.CartItems.Update(order.CartItems[idx])
-	}
-
-	_, err = repositories.Orders.Update(order)
-
-	if err != nil {
-		c.HTML(http.StatusBadRequest, "error.html", gin.H{"error": err})
-		return
-	}
-
-	//TODO: cartItemRepository delete all by session - otherwise items stay in cart after completing order..
-
-	c.Redirect(http.StatusFound, fmt.Sprintf("/order/%s", order.Token))
+	c.Redirect(http.StatusFound, "/orders")
 }

controllers/printController.go

@@ -63,18 +63,8 @@ func (rc *printController) PrintCartView(c *gin.Context) {
 		return
 	}
 
-	type ShopItemVariantPair struct {
-		ShopItem    models.ShopItem
-		ItemVariant models.ItemVariant
-	}
-
-	var items []ShopItemVariantPair
-	for _, cartItem := range cartItems {
-		items = append(items, ShopItemVariantPair{ShopItem: cartItem.ShopItem, ItemVariant: cartItem.ItemVariant})
-	}
-
 	data := CreateSessionData(c, gin.H{
-		"itemVariants": items,
+		"cartItems": cartItems,
 	})
 
 	c.HTML(http.StatusOK, "printvariant.html", data)
@@ -90,18 +80,8 @@ func (rc *printController) PrintOrderView(c *gin.Context) {
 
 	cartItems := order.CartItems
 
-	type ShopItemVariantPair struct {
-		ShopItem    models.ShopItem
-		ItemVariant models.ItemVariant
-	}
-
-	var items []ShopItemVariantPair
-	for _, cartItem := range cartItems {
-		items = append(items, ShopItemVariantPair{ShopItem: cartItem.ShopItem, ItemVariant: cartItem.ItemVariant})
-	}
-
 	data := CreateSessionData(c, gin.H{
-		"itemVariants": items,
+		"cartItems": cartItems,
 	})
 
 	c.HTML(http.StatusOK, "printvariant.html", data)