From 1b1210b3764815a297936d9e987445fdcab2cd81 Mon Sep 17 00:00:00 2001 From: wilfredainsworth Date: Fri, 20 Feb 2026 00:26:39 -0500 Subject: [PATCH 1/3] First commit - CoffeeItem.java & Customer.java mostly complete. Still working on main method and functionality. --- .idea/encodings.xml | 7 ++ .idea/misc.xml | 10 ++- .idea/vcs.xml | 6 ++ .../java/org/codedifferently/CoffeeItem.java | 45 +++++++++++ .../java/org/codedifferently/Customer.java | 75 +++++++++++++++++++ src/main/java/org/codedifferently/Main.java | 60 ++++++++++++--- 6 files changed, 193 insertions(+), 10 deletions(-) create mode 100644 .idea/encodings.xml create mode 100644 .idea/vcs.xml create mode 100644 src/main/java/org/codedifferently/CoffeeItem.java create mode 100644 src/main/java/org/codedifferently/Customer.java diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..aa00ffa --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 4b151ab..b08581c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,14 @@ - + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/org/codedifferently/CoffeeItem.java b/src/main/java/org/codedifferently/CoffeeItem.java new file mode 100644 index 0000000..ce4d4f4 --- /dev/null +++ b/src/main/java/org/codedifferently/CoffeeItem.java @@ -0,0 +1,45 @@ +package org.codedifferently; + +import java.util.Scanner; + +public class CoffeeItem { +private String itemName; +private double price; +private static int coffeeCount = 0; +static Scanner sc = new Scanner(System.in); + static CoffeeItem drink1 = new CoffeeItem("Sugar Cookie Latte", 8); + static CoffeeItem drink2 = new CoffeeItem("Acai Berry Blast", 7); + static CoffeeItem drink3 = new CoffeeItem("Henny y Horchata", 13); + + public CoffeeItem(String itemName, double price){ + this.itemName=itemName; + this.price=price; + } + public CoffeeItem(){ + coffeeCount++; + } + + public String getItemName() { + return itemName; + } + + public void setItemName(String itemName) { + this.itemName = itemName; + } + + public double getPrice() { + return this.price; + } + + public void setPrice(double price) { + this.price = price; + } + + public void showMenu(){ + System.out.println("What would you like to order?"); + System.out.println("1." + drink1.getItemName() + "- $" + drink1.getPrice()); + System.out.println("2." + drink2.getItemName() + "- $" + drink2.getPrice()); + System.out.println("3." + drink3.getItemName() + "- $" + drink3.getPrice()); + } + +} diff --git a/src/main/java/org/codedifferently/Customer.java b/src/main/java/org/codedifferently/Customer.java new file mode 100644 index 0000000..5c6689b --- /dev/null +++ b/src/main/java/org/codedifferently/Customer.java @@ -0,0 +1,75 @@ +package org.codedifferently; + +import java.util.Scanner; + +public class Customer { + private String name; + private String email; + private static int drinksPurchased; + private static double budget; + private static String itemSelected; + private static double tab; + CoffeeItem coffee = new CoffeeItem(); + + static Scanner sc = new Scanner(System.in); + + + public Customer(String name, String email, int drinksPurchased){ + this.name=name; + this.email=email; + this.drinksPurchased=drinksPurchased; + } + public Customer(String name, String email){ + this.name=name; + this.email=email; + } + public String getName() { + return this.name; + } + public void setName(String name) { + this.name = name; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public static int getDrinksPurchased() { + return drinksPurchased; + } + + public void setDrinksPurchased(int drinksPurchased) { + this.drinksPurchased = drinksPurchased; + } + + public int addDrink(CoffeeItem coffee){ + itemSelected=coffee.getItemName(); + if(drinksPurchased%5!=0){ + tab += coffee.getPrice(); + System.out.println(itemSelected +" has been and added to cart."); + System.out.println("Your tab is: "+ tab); + }else + System.out.println("Every 5th drink is free, so this one's on us!"); + System.out.println("Your tab is: "+ tab); + drinksPurchased++; + return drinksPurchased; + } + public double calcTotalCost(CoffeeItem item){ + tab+=item.getPrice(); + return tab; + } + public static Customer greetCustomer(){ + System.out.println("Welcome to Triple C's!"); + System.out.println("Can I get a name for you order? "); + String name = sc.nextLine(); + System.out.println("Enter your email for rewards: "); + String email = sc.nextLine(); + return new Customer(name, email); + } + +} + diff --git a/src/main/java/org/codedifferently/Main.java b/src/main/java/org/codedifferently/Main.java index 435139b..077710a 100644 --- a/src/main/java/org/codedifferently/Main.java +++ b/src/main/java/org/codedifferently/Main.java @@ -1,17 +1,59 @@ package org.codedifferently; +import java.util.Random; +import java.util.Scanner; + //TIP To Run code, press or // click the icon in the gutter. public class Main { public static void main(String[] args) { - //TIP Press with your caret at the highlighted text - // to see how IntelliJ IDEA suggests fixing it. - System.out.printf("Hello and welcome!"); - - for (int i = 1; i <= 5; i++) { - //TIP Press to start debugging your code. We have set one breakpoint - // for you, but you can always add more by pressing . - System.out.println("i = " + i); + Scanner sc = new Scanner(System.in); + int drinkCount =1; + boolean storeOpen = true; + CoffeeItem drink1 = new CoffeeItem("Sugar Cookie Latte", 8); + CoffeeItem drink2 = new CoffeeItem("Acai Berry Blast", 7); + CoffeeItem drink3 = new CoffeeItem("Henny y Horchata", 13); + double tab = 0; + Customer cust1 = null; + while (storeOpen) { + cust1 = Customer.greetCustomer(); + System.out.println("What would you like to order?"); + System.out.println("1." + drink1.getItemName() + "- $" + drink1.getPrice()); + System.out.println("2." + drink2.getItemName() + "- $" + drink2.getPrice()); + System.out.println("3." + drink3.getItemName() + "- $" + drink3.getPrice()); + int menuSelection = sc.nextInt(); + switch (menuSelection) { + case 1: + drinkCount+=cust1.addDrink(drink1); + tab += cust1.calcTotalCost(drink1); + break; + case 2: + drinkCount+=cust1.addDrink(drink2); + tab += cust1.calcTotalCost(drink2); + break; + case 3: + drinkCount+=cust1.addDrink(drink3); + tab += cust1.calcTotalCost(drink3); + break; + case 4: + System.out.println("Store closing. See you next business day!"); + storeOpen = false; + break; + case 0: + break; + default: + System.out.println("Invalid selection - please try again:"); + } + if (!storeOpen) break; } + int menuSelection; + int drinksPurchased; + System.out.println("Customer: " + cust1.getName() + "| Drinks purchased: " + drinkCount); + System.out.println("You're total due is "+ tab); + + } + + + } -} \ No newline at end of file + From 5ffd2950a15c6049b0dee8ad0d2b1a2564dff128 Mon Sep 17 00:00:00 2001 From: wilfredainsworth Date: Sat, 21 Feb 2026 03:50:17 -0500 Subject: [PATCH 2/3] Udpates made. App not complete. --- .../java/org/codedifferently/Customer.java | 39 +++++----- src/main/java/org/codedifferently/Main.java | 72 ++++++++++--------- 2 files changed, 61 insertions(+), 50 deletions(-) diff --git a/src/main/java/org/codedifferently/Customer.java b/src/main/java/org/codedifferently/Customer.java index 5c6689b..3d31ca8 100644 --- a/src/main/java/org/codedifferently/Customer.java +++ b/src/main/java/org/codedifferently/Customer.java @@ -5,15 +5,13 @@ public class Customer { private String name; private String email; - private static int drinksPurchased; + private int drinksPurchased; private static double budget; - private static String itemSelected; private static double tab; CoffeeItem coffee = new CoffeeItem(); static Scanner sc = new Scanner(System.in); - public Customer(String name, String email, int drinksPurchased){ this.name=name; this.email=email; @@ -38,28 +36,35 @@ public void setEmail(String email) { this.email = email; } - public static int getDrinksPurchased() { + public int getDrinksPurchased() { return drinksPurchased; } - public void setDrinksPurchased(int drinksPurchased) { - this.drinksPurchased = drinksPurchased; - } - - public int addDrink(CoffeeItem coffee){ - itemSelected=coffee.getItemName(); - if(drinksPurchased%5!=0){ + public int addDrink(CoffeeItem coffee) { + String itemSelected = coffee.getItemName(); + drinksPurchased++; + if (drinksPurchased % 5 != 0) { tab += coffee.getPrice(); - System.out.println(itemSelected +" has been and added to cart."); - System.out.println("Your tab is: "+ tab); - }else + System.out.println(itemSelected + " has been and added to cart."); + } else { System.out.println("Every 5th drink is free, so this one's on us!"); - System.out.println("Your tab is: "+ tab); - drinksPurchased++; + System.out.println("Your tab is: "+ tab); + } return drinksPurchased; } + public double addDrinkCost(CoffeeItem coffee){ + String itemSelected = coffee.getItemName(); + if (drinksPurchased % 5 != 0) { + tab += coffee.getPrice(); + System.out.println("Your tab is: " + tab); + } else { + System.out.println("Every 5th drink is free, so this one's on us!"); + System.out.println("Your tab is: "+ tab); + }return tab; + } + public double calcTotalCost(CoffeeItem item){ - tab+=item.getPrice(); + tab=item.getPrice(); return tab; } public static Customer greetCustomer(){ diff --git a/src/main/java/org/codedifferently/Main.java b/src/main/java/org/codedifferently/Main.java index 077710a..6429e56 100644 --- a/src/main/java/org/codedifferently/Main.java +++ b/src/main/java/org/codedifferently/Main.java @@ -8,48 +8,54 @@ public class Main { public static void main(String[] args) { Scanner sc = new Scanner(System.in); - int drinkCount =1; + int drinkCount =0; boolean storeOpen = true; CoffeeItem drink1 = new CoffeeItem("Sugar Cookie Latte", 8); CoffeeItem drink2 = new CoffeeItem("Acai Berry Blast", 7); CoffeeItem drink3 = new CoffeeItem("Henny y Horchata", 13); double tab = 0; Customer cust1 = null; + while (storeOpen) { cust1 = Customer.greetCustomer(); - System.out.println("What would you like to order?"); - System.out.println("1." + drink1.getItemName() + "- $" + drink1.getPrice()); - System.out.println("2." + drink2.getItemName() + "- $" + drink2.getPrice()); - System.out.println("3." + drink3.getItemName() + "- $" + drink3.getPrice()); - int menuSelection = sc.nextInt(); - switch (menuSelection) { - case 1: - drinkCount+=cust1.addDrink(drink1); - tab += cust1.calcTotalCost(drink1); - break; - case 2: - drinkCount+=cust1.addDrink(drink2); - tab += cust1.calcTotalCost(drink2); - break; - case 3: - drinkCount+=cust1.addDrink(drink3); - tab += cust1.calcTotalCost(drink3); - break; - case 4: - System.out.println("Store closing. See you next business day!"); - storeOpen = false; - break; - case 0: - break; - default: - System.out.println("Invalid selection - please try again:"); - } - if (!storeOpen) break; + boolean isOrdering = true; + while (isOrdering) { + System.out.println("What would you like to order?"); + System.out.println("1." + drink1.getItemName() + "- $" + drink1.getPrice()); + System.out.println("2." + drink2.getItemName() + "- $" + drink2.getPrice()); + System.out.println("3." + drink3.getItemName() + "- $" + drink3.getPrice()); + int menuSelection = sc.nextInt(); + switch (menuSelection) { + case 1: + drinkCount += cust1.addDrink(drink1); + tab += cust1.addDrinkCost(drink1); + break; + case 2: + drinkCount += cust1.addDrink(drink2); + tab += cust1.addDrinkCost(drink2); + break; + case 3: + drinkCount += cust1.addDrink(drink3); + tab += cust1.addDrinkCost(drink3); + break; + case 4: + System.out.println("Store closing. See you next business day!"); + storeOpen = false; + break; + case 0: + System.out.println("Order complete. Your total is: " + tab); + isOrdering = false; + break; + default: + System.out.println("Invalid selection - please try again:"); + } + System.out.println("Customer: " + cust1.getName() + "| Drinks purchased: " + drinkCount); + System.out.println("You're total due is "+ tab); + tab=0; + }if (!storeOpen) break; } - int menuSelection; - int drinksPurchased; - System.out.println("Customer: " + cust1.getName() + "| Drinks purchased: " + drinkCount); - System.out.println("You're total due is "+ tab); + + } From dc9dcb5515fe3662bffc71edc4f337bb119b0888 Mon Sep 17 00:00:00 2001 From: wilfredainsworth Date: Sat, 21 Feb 2026 03:51:14 -0500 Subject: [PATCH 3/3] Udpates made. App not complete. --- CoffeeShopRewards/.idea/misc.xml | 6 ++++ CoffeeShopRewards/.idea/modules.xml | 8 +++++ CoffeeShopRewards/.idea/workspace.xml | 43 +++++++++++++++++++++++++++ 3 files changed, 57 insertions(+) create mode 100644 CoffeeShopRewards/.idea/misc.xml create mode 100644 CoffeeShopRewards/.idea/modules.xml create mode 100644 CoffeeShopRewards/.idea/workspace.xml diff --git a/CoffeeShopRewards/.idea/misc.xml b/CoffeeShopRewards/.idea/misc.xml new file mode 100644 index 0000000..7b50ef4 --- /dev/null +++ b/CoffeeShopRewards/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/CoffeeShopRewards/.idea/modules.xml b/CoffeeShopRewards/.idea/modules.xml new file mode 100644 index 0000000..92ac236 --- /dev/null +++ b/CoffeeShopRewards/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/CoffeeShopRewards/.idea/workspace.xml b/CoffeeShopRewards/.idea/workspace.xml new file mode 100644 index 0000000..4460ac2 --- /dev/null +++ b/CoffeeShopRewards/.idea/workspace.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + 1771278333616 + + + + \ No newline at end of file