From b694a9e6e2484a36d75314a5b2b1b7a990ec6700 Mon Sep 17 00:00:00 2001
From: Logen Kain <logen@sudotask.com>
Date: Wed, 11 Nov 2020 15:26:52 -0500
Subject: [PATCH] Fuck the autograder

---
 Week-11-final-start/part-2/ShoppingCart.java  |  8 +--
 .../part-2/ShoppingCartManager.java           | 57 +++++++++++--------
 2 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/Week-11-final-start/part-2/ShoppingCart.java b/Week-11-final-start/part-2/ShoppingCart.java
index 94a2323..1fe8a60 100644
--- a/Week-11-final-start/part-2/ShoppingCart.java
+++ b/Week-11-final-start/part-2/ShoppingCart.java
@@ -72,13 +72,13 @@ public class ShoppingCart {
 	}
 
 	public void printTotal(){
-		if (cartItems.size() == 0){
-			System.out.println("SHOPPING CART IS EMPTY");
-			return;
-		}
 		printNameDate();
 		System.out.println("Number of Items: " + cartItems.size());
 		System.out.println();
+		if (cartItems.size() == 0){
+			System.out.println("SHOPPING CART IS EMPTY");
+		}
+		System.out.println();
 
 		for (int i=0; i<cartItems.size(); i++){
 			System.out.println(cartItems.get(i).getName() + " " +
diff --git a/Week-11-final-start/part-2/ShoppingCartManager.java b/Week-11-final-start/part-2/ShoppingCartManager.java
index 3e74448..5c48d11 100644
--- a/Week-11-final-start/part-2/ShoppingCartManager.java
+++ b/Week-11-final-start/part-2/ShoppingCartManager.java
@@ -14,15 +14,43 @@ public class ShoppingCartManager {
 		System.out.println();
 		System.out.println("Customer Name: "+custName);
 		System.out.println("Today's Date: "+curDate);
+		System.out.println();
 
-		printMenu(cart, scnr);
-	}
-
-	public static void printMenu(ShoppingCart cart, Scanner scnr){
+		printMenu();
 
 		char userInput;
 		userInput = 0;
 
+		while (userInput != 'q'){
+				userInput = scnr.next().charAt(0);
+				switch (userInput) {
+					case 'a':  addItem(cart, scnr);
+							   userInput = 0;
+							   printMenu();
+							   break;
+					case 'd':  removeItem(cart, scnr);
+							   userInput = 0;
+							   printMenu();
+							   break;
+					case 'c':  changeItemQuantity(cart, scnr);
+							   userInput = 0;
+							   printMenu();
+							   break;
+					case 'i': printDesc(cart);
+							  userInput = 0;
+							  printMenu();
+							  break;
+					case 'o': outputCart(cart);
+							  userInput = 0;
+							  printMenu();
+							  break;
+					default:
+							  System.out.println("Choose an option:");
+				}
+		}
+	}
+
+	public static void printMenu(){
 		System.out.println("MENU\n"+
 				"a - Add item to cart\n"+
 				"d - Remove item from cart\n"+
@@ -30,25 +58,7 @@ public class ShoppingCartManager {
 				"i - Output items' descriptions\n"+
 				"o - Output shopping cart\n"+
 				"q - Quit");
-		while (userInput != 'q'){
-				userInput = scnr.next().charAt(0);
-				scnr.nextLine();
-				switch (userInput) {
-					case 'a':  addItem(cart, scnr);
-							   break;
-					case 'd':  removeItem(cart, scnr);
-							   break;
-					case 'c':  changeItemQuantity(cart, scnr);
-							   break;
-					case 'i': printDesc(cart);
-							  break;
-					case 'o': outputCart(cart);
-							  break;
-					default:
-							  System.out.println("Choose an option:");
-
-				}
-		}
+		System.out.println();
 	}
 
 	public static void addItem(ShoppingCart cart, Scanner scnr){
@@ -89,7 +99,6 @@ public class ShoppingCartManager {
 	public static void outputCart(ShoppingCart cart){
 		System.out.println("OUTPUT SHOPPING CART");
 		cart.printTotal();
-
 	}
 
 }