Merge branch 'main' into filter

CS179K-Summer23 · Aug 20, 2023 · 2f483f1 · 2f483f1
2 parents c1d7c7e + 83a937e
commit 2f483f1
Show file tree

Hide file tree

Showing 8 changed files with 325 additions and 328 deletions.
diff --git a/README.md b/README.md
@@ -121,7 +121,8 @@ Let's elevate your business operations with our state-of-the-art **Inventory Man
 Burndown chart:
 https://docs.google.com/spreadsheets/d/1PmEULxzyLe58C3dYHZTaqGl39ewRZSZj/edit#gid=2086879608
 
-![simpleFlow](https://github.com/CS179K-Summer23/cs179-project-marketme/assets/77028662/8ed5302f-b2b2-479a-b3ee-978703145c28)
+![image](https://github.com/CS179K-Summer23/cs179-project-marketme/assets/77028662/df374ed2-25ec-4f68-a2a6-dd62edf9160b)
+
 
 
 

diff --git a/TestFolder/Week2Lab1_Email_System → TestFolder/Week2Lab2_Email_System b/TestFolder/Week2Lab1_Email_System → TestFolder/Week2Lab2_Email_System
@@ -7,12 +7,12 @@ Sales/Price Changes
 
 Low Stock
 2.1. Product stock drops below threshold - alert triggered.
-2.2. Product stock is at threshold - alert triggered.
-2.3. Product stock is above threshold - no alert.
+2.2. Product stock is at a threshold - alert triggered.
+2.3. Product stock is above a threshold - no alert.
 
 Impending Expiration Dates
 3.1. Product expiration date approaching (e.g., within a week) - alert triggered.
-3.2. Product expiration date not close - no alert.
+3.2. Product expiration date not closed - no alert.
 3.3. Product has already expired - alert triggered.
 
 Regular Updates for Subscribers

diff --git a/TestFolder/Week2Lab1_Filter → TestFolder/Week3Lab1_Filter b/TestFolder/Week2Lab1_Filter → TestFolder/Week3Lab1_Filter
@@ -7,13 +7,13 @@ Filter by category
 
 Filter by price 
 2.1. Input a price that exists in the inventory
-2.2. Input a price that no products has
+2.2. Input a price that no product has
 2.3. Input a price range that includes multiple products from the inventory.
 
 Filter by Expiration Date
 3.1. Input an expiration range that is in the inventory
 3.2. Input an expiration range that is not in the inventory
-3.3. Input an expiration range that spans across multiple products in the inventory.
+3.3. Input an expiration range that spans multiple products in the inventory.
 
 Filter by name alphabetically:
 4.1. Input a valid starting letter for the product name that matches products in the inventory.

diff --git a/...lder/Week2Lab1_Registration and Login.txt → ...lder/Week3Lab1_Registration and Login.txt b/...lder/Week2Lab1_Registration and Login.txt → ...lder/Week3Lab1_Registration and Login.txt
diff --git a/burndownchart/Week3.png b/burndownchart/Week3.png
diff --git a/main.cpp b/main.cpp
@@ -18,8 +18,8 @@ void handleEmailOperations();
 void CheckoutSystem();
 
 int main() {
-  std::cout << "[Please be advised that some functions are not yet supported! -- MarketMe-Team]\n";
-  std::cout << "[This Version Supports Scanner]\n";
+  std::cout << "[This Version Supports Scanner, Keyboard]\n";
+  std::cout << "[Advance Search; Search; Emails Functions are not yet supported. -- MarketMe-Team]\n";
   displayMainMenu();
   return 0;
 }
@@ -350,7 +350,3 @@ void CheckoutSystem() {
 
   displayMainMenu();
 }
-
-
-
-