<%=message%>
+ -->
+
+
@@ -66,6 +68,7 @@
int cartQty = new CartServiceImpl().getCartItemCount(userName, product.getProdId());
%>
+
%>)
@@ -92,6 +95,8 @@
+
+
<%
} else {
%>
From 52d5a7ffdf3c5e6e1c1861d9ececedf6d46ea7a5 Mon Sep 17 00:00:00 2001
From: WenbooSu <105067670+WenbooSu@users.noreply.github.com>
Date: Wed, 29 Nov 2023 14:33:13 -0500
Subject: [PATCH 07/61] Update mysql_query.sql
---
databases/mysql_query.sql | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/databases/mysql_query.sql b/databases/mysql_query.sql
index 85671938..722bdcee 100644
--- a/databases/mysql_query.sql
+++ b/databases/mysql_query.sql
@@ -265,3 +265,33 @@ INSERT INTO `shopping-cart`.`usercart` (`username`, `prodid`, `quantity`) VALUES
COMMIT;
+ -- -----------------------------------------------------
+-- Data for table `shopping-cart`.`product` with condition column
+-- -----------------------------------------------------
+START TRANSACTION;
+USE `shopping-cart`;
+ALTER TABLE `shopping-cart`.`product`
+ADD `condition` ENUM('new', 'used') DEFAULT NULL;
+
+COMMIT;
+
+-- -----------------------------------------------------
+-- Data for table `shopping-cart`.`product` with sold column
+-- -----------------------------------------------------
+START TRANSACTION;
+USE `shopping-cart`;
+ALTER TABLE `shopping-cart`.`product`
+ADD `sold` int DEFAULT NULL;
+
+COMMIT;
+
+
+-- -----------------------------------------------------
+-- Data for table `shopping-cart`.`product` with discount column
+-- -----------------------------------------------------
+START TRANSACTION;
+USE `shopping-cart`;
+ALTER TABLE `shopping-cart`.`product`
+ADD `discount` int DEFAULT NULL;
+
+COMMIT;
From 856851a24e6bfa90e7d327e0f01d38cebb8b9bee Mon Sep 17 00:00:00 2001
From: WenbooSu <105067670+WenbooSu@users.noreply.github.com>
Date: Wed, 29 Nov 2023 14:34:05 -0500
Subject: [PATCH 08/61] Update ProductBean.java
---
src/com/shashi/beans/ProductBean.java | 36 +++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/src/com/shashi/beans/ProductBean.java b/src/com/shashi/beans/ProductBean.java
index c67c754e..5778362f 100644
--- a/src/com/shashi/beans/ProductBean.java
+++ b/src/com/shashi/beans/ProductBean.java
@@ -16,6 +16,9 @@ public ProductBean() {
private double prodPrice;
private int prodQuantity;
private InputStream prodImage;
+ private String pordCondition;
+ private int prodSold;
+ private int prodDiscount;
public ProductBean(String prodId, String prodName, String prodType, String prodInfo, double prodPrice,
int prodQuantity, InputStream prodImage) {
@@ -27,6 +30,9 @@ public ProductBean(String prodId, String prodName, String prodType, String prodI
this.prodPrice = prodPrice;
this.prodQuantity = prodQuantity;
this.prodImage = prodImage;
+ this.pordCondition = "";
+ this.prodSold = 0;
+ this.prodDiscount = 0;
}
public String getProdId() {
@@ -56,6 +62,21 @@ public void setProdType(String prodType) {
public String getProdInfo() {
return prodInfo;
}
+
+ public String getProdCondition()
+ {
+ return this.pordCondition;
+ }
+
+ public int getProdSold()
+ {
+ return this.prodSold;
+ }
+
+ public int getProdDiscount()
+ {
+ return this.prodDiscount;
+ }
public void setProdInfo(String prodInfo) {
this.prodInfo = prodInfo;
@@ -84,5 +105,20 @@ public InputStream getProdImage() {
public void setProdImage(InputStream prodImage) {
this.prodImage = prodImage;
}
+
+ public void setProdCondition(String prodCondition) // either 'new' or 'used;
+ {
+ this.pordCondition = prodCondition;
+ }
+
+ public void setProdSold(int sold)
+ {
+ this.prodSold = sold;
+ }
+
+ public void setProdDiscount(int discount)
+ {
+ this.prodDiscount = discount;
+ }
}
From ed51ee5ceee30fc480d2d2541b3685761d999a1c Mon Sep 17 00:00:00 2001
From: WenbooSu <105067670+WenbooSu@users.noreply.github.com>
Date: Wed, 29 Nov 2023 14:34:43 -0500
Subject: [PATCH 09/61] Update ProductService.java
---
src/com/shashi/service/ProductService.java | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/src/com/shashi/service/ProductService.java b/src/com/shashi/service/ProductService.java
index 0611f972..fdcd5594 100644
--- a/src/com/shashi/service/ProductService.java
+++ b/src/com/shashi/service/ProductService.java
@@ -1,9 +1,15 @@
package com.shashi.service;
import java.io.InputStream;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
import java.util.List;
import com.shashi.beans.ProductBean;
+import com.shashi.utility.DBUtil;
public interface ProductService {
@@ -35,4 +41,14 @@ public String addProduct(String prodName, String prodType, String prodInfo, doub
public boolean sellNProduct(String prodId, int n);
public int getProductQuantity(String prodId);
+
+ // Wenbo 2023/11/28
+ public List getProductsByConditions(String type, String condition);
+
+ public List getProductsByDiscounts(String type);
+
+ public List getProductsBySales(String type);
+
+
}
+
From a72d031274a4abbf6e4bc15b83fdf439877d1326 Mon Sep 17 00:00:00 2001
From: WenbooSu <105067670+WenbooSu@users.noreply.github.com>
Date: Wed, 29 Nov 2023 14:36:31 -0500
Subject: [PATCH 10/61] Update ProductServiceImpl.java
---
.../service/impl/ProductServiceImpl.java | 99 +++++++++++++++++++
1 file changed, 99 insertions(+)
diff --git a/src/com/shashi/service/impl/ProductServiceImpl.java b/src/com/shashi/service/impl/ProductServiceImpl.java
index 7c85a5de..c13cc067 100644
--- a/src/com/shashi/service/impl/ProductServiceImpl.java
+++ b/src/com/shashi/service/impl/ProductServiceImpl.java
@@ -533,5 +533,104 @@ public int getProductQuantity(String prodId) {
return quantity;
}
+
+ public List getProductsByConditions(String type, String condition) {
+ List products = new ArrayList<>();
+
+ String query = "SELECT * FROM `shopping-cart`.product WHERE lower(ptype) LIKE ? AND `condition` = ?;";
+
+ try (Connection con = DBUtil.provideConnection();
+ PreparedStatement ps = con.prepareStatement(query)) {
+
+ ps.setString(1, "%" + type.toLowerCase() + "%");
+ ps.setString(2, condition);
+
+ try (ResultSet rs = ps.executeQuery()) {
+ while (rs.next()) {
+ ProductBean product = new ProductBean();
+ product.setProdId(rs.getString(1));
+ product.setProdName(rs.getString(2));
+ product.setProdType(rs.getString(3));
+ product.setProdInfo(rs.getString(4));
+ product.setProdPrice(rs.getDouble(5));
+ product.setProdQuantity(rs.getInt(6));
+ product.setProdImage(rs.getAsciiStream(7));
+ product.setProdCondition(rs.getString(8));
+
+ products.add(product);
+ }
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+
+ return products;
+ }
+
+ public List getProductsBySales(String type) {
+ List products = new ArrayList<>();
+
+ String query = "SELECT * FROM `shopping-cart`.product WHERE lower(ptype) LIKE ? AND sold > 0 ORDER BY sold DESC;";
+
+ try (Connection con = DBUtil.provideConnection();
+ PreparedStatement ps = con.prepareStatement(query)) {
+
+ ps.setString(1, "%" + type.toLowerCase() + "%");
+
+ try (ResultSet rs = ps.executeQuery()) {
+ while (rs.next()) {
+ ProductBean product = new ProductBean();
+ product.setProdId(rs.getString(1));
+ product.setProdName(rs.getString(2));
+ product.setProdType(rs.getString(3));
+ product.setProdInfo(rs.getString(4));
+ product.setProdPrice(rs.getDouble(5));
+ product.setProdQuantity(rs.getInt(6));
+ product.setProdImage(rs.getAsciiStream(7));
+ product.setProdSold(rs.getInt(9));
+
+ products.add(product);
+ }
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+
+ return products;
+ }
+
+ public List getProductsByDiscounts(String type) {
+ List products = new ArrayList<>();
+
+ String query = "SELECT * FROM `shopping-cart`.product WHERE lower(ptype) LIKE ? AND discount > 0 ORDER BY discount DESC;";
+
+ try (Connection con = DBUtil.provideConnection();
+ PreparedStatement ps = con.prepareStatement(query)) {
+
+ ps.setString(1, "%" + type.toLowerCase() + "%");
+
+ try (ResultSet rs = ps.executeQuery()) {
+ while (rs.next()) {
+ ProductBean product = new ProductBean();
+ product.setProdId(rs.getString(1));
+ product.setProdName(rs.getString(2));
+ product.setProdType(rs.getString(3));
+ product.setProdInfo(rs.getString(4));
+ product.setProdPrice(rs.getDouble(5));
+ product.setProdQuantity(rs.getInt(6));
+ product.setProdImage(rs.getAsciiStream(7));
+ product.setProdDiscount(rs.getInt(10));
+
+ products.add(product);
+ }
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+
+ return products;
+ }
+
+
}
From 44ad63b4b84c810a39f83ebe6751cf1621a04065 Mon Sep 17 00:00:00 2001
From: Yu Ying Li Wen
Date: Wed, 29 Nov 2023 15:20:38 -0500
Subject: [PATCH 11/61] On low inv alert email + name change to "Concordia
Shopping Cart App"
---
src/application.properties | 4 +-
src/com/shashi/service/ProductService.java | 2 +
.../service/impl/ProductServiceImpl.java | 20 +++++++
src/com/shashi/srv/ShipmentServlet.java | 3 +
src/com/shashi/utility/MailMessage.java | 60 +++++++++++++++----
5 files changed, 74 insertions(+), 15 deletions(-)
diff --git a/src/application.properties b/src/application.properties
index 339768c9..f8830e86 100644
--- a/src/application.properties
+++ b/src/application.properties
@@ -5,5 +5,5 @@ db.username = root
db.password = root
#Mailer Credentials
-mailer.email=your_email
-mailer.password=your_app_password_generated_from_email
\ No newline at end of file
+mailer.email=concordiashoppingcartapp@gmail.com
+mailer.password=ardqkbnzikcuzvdf
diff --git a/src/com/shashi/service/ProductService.java b/src/com/shashi/service/ProductService.java
index 0611f972..dfeffac9 100644
--- a/src/com/shashi/service/ProductService.java
+++ b/src/com/shashi/service/ProductService.java
@@ -35,4 +35,6 @@ public String addProduct(String prodName, String prodType, String prodInfo, doub
public boolean sellNProduct(String prodId, int n);
public int getProductQuantity(String prodId);
+
+ public void SendMailOnMinStockThreshold(String userName, String prodId);
}
diff --git a/src/com/shashi/service/impl/ProductServiceImpl.java b/src/com/shashi/service/impl/ProductServiceImpl.java
index 7c85a5de..740d189d 100644
--- a/src/com/shashi/service/impl/ProductServiceImpl.java
+++ b/src/com/shashi/service/impl/ProductServiceImpl.java
@@ -17,6 +17,8 @@
public class ProductServiceImpl implements ProductService {
+ public static final int minStockQuantity = 3;
+
@Override
public String addProduct(String prodName, String prodType, String prodInfo, double prodPrice, int prodQuantity,
InputStream prodImage) {
@@ -534,4 +536,22 @@ public int getProductQuantity(String prodId) {
return quantity;
}
+ public void SendMailOnMinStockThreshold(String userName, String prodId)
+ {
+ try
+ {
+ ProductBean product = getProductDetails(prodId);
+
+ if(product == null) throw new Exception("Unexpected result: Product was null. Mail not sent.");
+
+ if(product.getProdQuantity() <= minStockQuantity)
+ {
+ MailMessage.lowQuantity(userName, product.getProdName(), product.getProdId(), product.getProdQuantity(), minStockQuantity);
+ }
+ }
+ catch(Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
}
diff --git a/src/com/shashi/srv/ShipmentServlet.java b/src/com/shashi/srv/ShipmentServlet.java
index 476d30d4..0f949f15 100644
--- a/src/com/shashi/srv/ShipmentServlet.java
+++ b/src/com/shashi/srv/ShipmentServlet.java
@@ -12,6 +12,7 @@
import javax.servlet.http.HttpSession;
import com.shashi.service.impl.OrderServiceImpl;
+import com.shashi.service.impl.ProductServiceImpl;
import com.shashi.service.impl.UserServiceImpl;
import com.shashi.utility.MailMessage;
@@ -47,6 +48,8 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
pagename = "unshippedItems.jsp";
} else {
MailMessage.orderShipped(userName, new UserServiceImpl().getFName(userName), orderId, amount);
+
+ new ProductServiceImpl().SendMailOnMinStockThreshold(userName, prodId);
}
PrintWriter pw = response.getWriter();
response.setContentType("text/html");
diff --git a/src/com/shashi/utility/MailMessage.java b/src/com/shashi/utility/MailMessage.java
index 5c78528c..42e66d25 100644
--- a/src/com/shashi/utility/MailMessage.java
+++ b/src/com/shashi/utility/MailMessage.java
@@ -3,33 +3,35 @@
import jakarta.mail.MessagingException;
public class MailMessage {
+
+ private static final String appName = "Concordia Shopping Cart App";
+
public static void registrationSuccess(String emailId, String name) {
String recipient = emailId;
String subject = "Registration Successfull";
String htmlTextMessage = "" + "" + ""
- + "
Thanks for singing up with Ellison Electronics.
" + + "
Thanks for singing up with "+ appName + "
" + "We are glad that you choose us. We invite you to check out our latest collection of new electonics appliances." + "
We are providing upto 60% OFF on most of the electronic gadgets. So please visit our site and explore the collections." + "
Our Online electronics is growing in a larger amount these days and we are in high demand so we thanks all of you for " + "making us up to that level. We Deliver Product to your house with no extra delivery charges and we also have collection of most of the" + "branded items.
As a Welcome gift for our New Customers we are providing additional 10% OFF Upto 500 Rs for the first product purchase. " + "
To avail this offer you only have " - + "to enter the promo code given below.
PROMO CODE: " + "ELLISON500
" + + "to enter the promo code given below.
PROMO CODE: " + "CONCORDIA69420
" + "Have a good day!
" + "" + "" + ""; try { JavaMailUtil.sendMail(recipient, subject, htmlTextMessage); } catch (MessagingException e) { - // TODO Auto-generated catch block e.printStackTrace(); } } public static void transactionSuccess(String recipientEmail, String name, String transId, double transAmount) { String recipient = recipientEmail; - String subject = "Order Placed at Ellison Electronics"; + String subject = "Order Placed at " + appName; String htmlTextMessage = "" + " " + "
" + " Here is Your Transaction Details:
" + "
" @@ -37,7 +39,7 @@ public static void transactionSuccess(String recipientEmail, String name, String + " " + transId + "
" + "
" + " Amount Paid: " + transAmount + "" + "
" + " Thanks for shopping with us!
" - + " Come Shop Again!
Ellison Electronics." + + " Come Shop Again!
" + appName + "." + " " + " " + " " + ""; try { @@ -49,9 +51,9 @@ public static void transactionSuccess(String recipientEmail, String name, String public static void orderShipped(String recipientEmail, String name, String transId, double transAmount) { String recipient = recipientEmail; - String subject = "Hurray!!, Your Order has been Shipped from Ellison Electronics"; + String subject = "Hurray!!, Your Order has been Shipped from " + appName ; String htmlTextMessage = "" + " " + "
" + " Here is Your Transaction Details:
" + "
" @@ -59,7 +61,7 @@ public static void orderShipped(String recipientEmail, String name, String trans + " " + transId + "
" + "
" + " Amount Paid: " + transAmount + "" + "
" + " Thanks for shopping with us!
" - + " Come Shop Again!
Ellison Electronics." + + " Come Shop Again!
" + appName + "." + " " + " " + " " + ""; try { @@ -71,9 +73,9 @@ public static void orderShipped(String recipientEmail, String name, String trans public static void productAvailableNow(String recipientEmail, String name, String prodName, String prodId) { String recipient = recipientEmail; - String subject = "Product " + prodName + " is Now Available at Ellison Electronics"; + String subject = "Product " + prodName + " is Now Available at " + appName; String htmlTextMessage = "" + " " + " getProductsByConditions(String type, String condition)
return products;
}
-
+ // get a product sold of a specific type
public List getProductsBySales(String type) {
List products = new ArrayList<>();
- String query = "SELECT * FROM `shopping-cart`.product WHERE lower(ptype) LIKE ? AND sold > 0 ORDER BY sold DESC;";
+ //String query = "SELECT * FROM `shopping-cart`.product WHERE lower(ptype) LIKE ? AND sold > 0 ORDER BY sold DESC;";
+ String query = "SELECT product.*, SUM(orders.quantity) as sold "
+ + "FROM `shopping-cart`.product LEFT JOIN `shopping-cart`.orders "
+ + "ON product.pid = orders.prodid "
+ + "WHERE lower(product.ptype) LIKE ? GROUP BY product.pid ORDER BY sold DESC";
try (Connection con = DBUtil.provideConnection();
PreparedStatement ps = con.prepareStatement(query)) {
@@ -599,6 +603,38 @@ public List getProductsBySales(String type) {
return products;
}
+ public List getAllProductsSold()
+ {
+ List products = new ArrayList<>();
+ String query = "SELECT product.*, SUM(orders.quantity) as sold "
+ + "FROM `shopping-cart`.product LEFT JOIN `shopping-cart`.orders "
+ + "ON product.pid = orders.prodid "
+ + "GROUP BY product.pid ORDER BY sold DESC";
+ try (Connection con = DBUtil.provideConnection();
+ PreparedStatement ps = con.prepareStatement(query)) {
+
+ try (ResultSet rs = ps.executeQuery()) {
+ while (rs.next()) {
+ ProductBean product = new ProductBean();
+ product.setProdId(rs.getString("pid"));
+ product.setProdName(rs.getString("pname"));
+ product.setProdType(rs.getString("ptype"));
+ product.setProdInfo(rs.getString("pinfo"));
+ product.setProdPrice(rs.getDouble("pprice"));
+ product.setProdQuantity(rs.getInt("pquantity"));
+ product.setProdImage(rs.getAsciiStream("image"));
+ product.setProdSold(rs.getInt("totalSold")); // Set the total sold
+
+ products.add(product);
+ }
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+
+ return products;
+ }
+
public List getProductsByDiscounts(String type) {
List products = new ArrayList<>();
From 492591467280f939a74836c62eae020d2796e150 Mon Sep 17 00:00:00 2001
From: WenbooSu <105067670+WenbooSu@users.noreply.github.com>
Date: Wed, 29 Nov 2023 15:45:37 -0500
Subject: [PATCH 13/61] Update ProductService.java
---
src/com/shashi/service/ProductService.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/com/shashi/service/ProductService.java b/src/com/shashi/service/ProductService.java
index fdcd5594..3bfbb5ea 100644
--- a/src/com/shashi/service/ProductService.java
+++ b/src/com/shashi/service/ProductService.java
@@ -49,6 +49,8 @@ public String addProduct(String prodName, String prodType, String prodInfo, doub
public List getProductsBySales(String type);
+ public List getAllProductsSold();
+
}
From 08e1ee95d76a2b82d9cc6cffb0950c10ee544ba5 Mon Sep 17 00:00:00 2001
From: WenbooSu <105067670+WenbooSu@users.noreply.github.com>
Date: Wed, 29 Nov 2023 15:47:04 -0500
Subject: [PATCH 14/61] Update mysql_query.sql
---
databases/mysql_query.sql | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/databases/mysql_query.sql b/databases/mysql_query.sql
index 722bdcee..babe7432 100644
--- a/databases/mysql_query.sql
+++ b/databases/mysql_query.sql
@@ -275,15 +275,6 @@ ADD `condition` ENUM('new', 'used') DEFAULT NULL;
COMMIT;
--- -----------------------------------------------------
--- Data for table `shopping-cart`.`product` with sold column
--- -----------------------------------------------------
-START TRANSACTION;
-USE `shopping-cart`;
-ALTER TABLE `shopping-cart`.`product`
-ADD `sold` int DEFAULT NULL;
-
-COMMIT;
-- -----------------------------------------------------
From 64d4773fff7d8c013f02054ba2945933496df6e6 Mon Sep 17 00:00:00 2001
From: Yu Ying Li Wen
Date: Wed, 29 Nov 2023 15:57:27 -0500
Subject: [PATCH 15/61] Admin now receives email alerts instead of clients
---
src/com/shashi/service/ProductService.java | 2 +-
src/com/shashi/service/impl/ProductServiceImpl.java | 5 +++--
src/com/shashi/srv/ShipmentServlet.java | 2 +-
src/com/shashi/utility/MailMessage.java | 9 +++++++--
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/com/shashi/service/ProductService.java b/src/com/shashi/service/ProductService.java
index dfeffac9..ec8b3eac 100644
--- a/src/com/shashi/service/ProductService.java
+++ b/src/com/shashi/service/ProductService.java
@@ -36,5 +36,5 @@ public String addProduct(String prodName, String prodType, String prodInfo, doub
public int getProductQuantity(String prodId);
- public void SendMailOnMinStockThreshold(String userName, String prodId);
+ public void SendMailOnMinStockThreshold(String prodId);
}
diff --git a/src/com/shashi/service/impl/ProductServiceImpl.java b/src/com/shashi/service/impl/ProductServiceImpl.java
index 740d189d..6a156747 100644
--- a/src/com/shashi/service/impl/ProductServiceImpl.java
+++ b/src/com/shashi/service/impl/ProductServiceImpl.java
@@ -536,7 +536,7 @@ public int getProductQuantity(String prodId) {
return quantity;
}
- public void SendMailOnMinStockThreshold(String userName, String prodId)
+ public void SendMailOnMinStockThreshold(String prodId)
{
try
{
@@ -546,7 +546,8 @@ public void SendMailOnMinStockThreshold(String userName, String prodId)
if(product.getProdQuantity() <= minStockQuantity)
{
- MailMessage.lowQuantity(userName, product.getProdName(), product.getProdId(), product.getProdQuantity(), minStockQuantity);
+ MailMessage.lowQuantity(product.getProdName(), product.getProdId(), product.getProdQuantity(), minStockQuantity);
+ System.out.println("");
}
}
catch(Exception e)
diff --git a/src/com/shashi/srv/ShipmentServlet.java b/src/com/shashi/srv/ShipmentServlet.java
index 0f949f15..9df82667 100644
--- a/src/com/shashi/srv/ShipmentServlet.java
+++ b/src/com/shashi/srv/ShipmentServlet.java
@@ -49,7 +49,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
} else {
MailMessage.orderShipped(userName, new UserServiceImpl().getFName(userName), orderId, amount);
- new ProductServiceImpl().SendMailOnMinStockThreshold(userName, prodId);
+ new ProductServiceImpl().SendMailOnMinStockThreshold(prodId);
}
PrintWriter pw = response.getWriter();
response.setContentType("text/html");
diff --git a/src/com/shashi/utility/MailMessage.java b/src/com/shashi/utility/MailMessage.java
index 42e66d25..9e2e3650 100644
--- a/src/com/shashi/utility/MailMessage.java
+++ b/src/com/shashi/utility/MailMessage.java
@@ -1,5 +1,7 @@
package com.shashi.utility;
+import java.util.ResourceBundle;
+
import jakarta.mail.MessagingException;
public class MailMessage {
@@ -109,7 +111,7 @@ public static String sendMessage(String toEmailId, String subject, String htmlTe
}
// Sends an email to administrator when a certain product falls under a number
- public static void lowQuantity(String recipientEmail, String prodName, String prodId, int prodQuantity, int minThreshold)
+ public static void lowQuantity(String prodName, String prodId, int prodQuantity, int minThreshold)
{
String subject = "[ALERT: LOW QUANTITY] " + prodName + "is running out of stock!";
String htmlTextMessage =
@@ -134,7 +136,10 @@ public static void lowQuantity(String recipientEmail, String prodName, String pr
"
Welcome to Ellison Electronics
" + "" + "Hi " + name + "," - + "Thanks for singing up with Ellison Electronics.
" + + "
Welcome to "+ appName + "
" + "" + "Hi " + name + "," + + "Thanks for singing up with "+ appName + "
" + "We are glad that you choose us. We invite you to check out our latest collection of new electonics appliances." + "
We are providing upto 60% OFF on most of the electronic gadgets. So please visit our site and explore the collections." + "
Our Online electronics is growing in a larger amount these days and we are in high demand so we thanks all of you for " + "making us up to that level. We Deliver Product to your house with no extra delivery charges and we also have collection of most of the" + "branded items.
As a Welcome gift for our New Customers we are providing additional 10% OFF Upto 500 Rs for the first product purchase. " + "
To avail this offer you only have " - + "to enter the promo code given below.
PROMO CODE: " + "ELLISON500
" + + "to enter the promo code given below.
PROMO CODE: " + "CONCORDIA69420
" + "Have a good day!
" + "" + "" + ""; try { JavaMailUtil.sendMail(recipient, subject, htmlTextMessage); } catch (MessagingException e) { - // TODO Auto-generated catch block e.printStackTrace(); } } public static void transactionSuccess(String recipientEmail, String name, String transId, double transAmount) { String recipient = recipientEmail; - String subject = "Order Placed at Ellison Electronics"; + String subject = "Order Placed at " + appName; String htmlTextMessage = "" + " " + "
" + " Hey " + name + ",
"
- + " We are glad that you shop with Ellison Electronics!" + "
"
+ + " We are glad that you shop with " + appName + "!" + "
"
+ " Your order has been placed successfully and under process to be shipped."
+ "
Please Note that this is a demo projet Email and you have not made any real transaction with us till now!
" + "" + " Here is Your Transaction Details:
" + "
" @@ -37,7 +39,7 @@ public static void transactionSuccess(String recipientEmail, String name, String + " " + transId + "
" + "
" + " Amount Paid: " + transAmount + "" + "
" + " Thanks for shopping with us!
" - + " Come Shop Again!
Ellison Electronics." + + " Come Shop Again!
" + appName + "." + " " + " " + " " + ""; try { @@ -49,9 +51,9 @@ public static void transactionSuccess(String recipientEmail, String name, String public static void orderShipped(String recipientEmail, String name, String transId, double transAmount) { String recipient = recipientEmail; - String subject = "Hurray!!, Your Order has been Shipped from Ellison Electronics"; + String subject = "Hurray!!, Your Order has been Shipped from " + appName ; String htmlTextMessage = "" + " " + "
" + " Hey " + name + ",
"
- + " We are glad that you shop with Ellison Electronics!" + "
"
+ + " We are glad that you shop with " + appName + "!" + "
"
+ " Your order has been shipped successfully and on the way to be delivered."
+ "
Please Note that this is a demo projet Email and you have not made any real transaction with us till now!
" + "" + " Here is Your Transaction Details:
" + "
" @@ -59,7 +61,7 @@ public static void orderShipped(String recipientEmail, String name, String trans + " " + transId + "
" + "
" + " Amount Paid: " + transAmount + "" + "
" + " Thanks for shopping with us!
" - + " Come Shop Again!
Ellison Electronics." + + " Come Shop Again!
" + appName + "." + " " + " " + " " + ""; try { @@ -71,9 +73,9 @@ public static void orderShipped(String recipientEmail, String name, String trans public static void productAvailableNow(String recipientEmail, String name, String prodName, String prodId) { String recipient = recipientEmail; - String subject = "Product " + prodName + " is Now Available at Ellison Electronics"; + String subject = "Product " + prodName + " is Now Available at " + appName; String htmlTextMessage = "" + " " + "
" + " Hey " + name + ",
"
- + " We are glad that you shop with Ellison Electronics!" + "
"
+ + " We are glad that you shop with " + appName + "!" + "
"
+ " As per your recent browsing history, we seen that you were searching for an item that was not available in sufficient amount"
+ " at that time.
"
+ "We are glad to say that the product named " + prodName
@@ -86,7 +88,7 @@ public static void productAvailableNow(String recipientEmail, String name, Strin
+ prodId + " " + "
" + "
"
+ " Product Name: "
+ prodName + "" + "
" + " Thanks for shopping with us!
"
- + " Come Shop Again!
Ellison Electronics."
+ + " Come Shop Again!
" + appName + "."
+ "
"+ + "Dear Administrator,\n"+ + "\n"+ + "This is an automated alert email.\n"+ + "\n"+ + ""; + + try { + JavaMailUtil.sendMail(recipientEmail, subject, htmlTextMessage); + } catch (MessagingException e) { + e.printStackTrace(); + } + } } From 9a847af94aa8e0244e455eb3f68b2e2b86c52c17 Mon Sep 17 00:00:00 2001 From: WenbooSu <105067670+WenbooSu@users.noreply.github.com> Date: Wed, 29 Nov 2023 15:45:21 -0500 Subject: [PATCH 12/61] Update ProductServiceImpl.java --- .../service/impl/ProductServiceImpl.java | 40 ++++++++++++++++++- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/src/com/shashi/service/impl/ProductServiceImpl.java b/src/com/shashi/service/impl/ProductServiceImpl.java index c13cc067..b8bce0bc 100644 --- a/src/com/shashi/service/impl/ProductServiceImpl.java +++ b/src/com/shashi/service/impl/ProductServiceImpl.java @@ -566,11 +566,15 @@ public ListThe following product is running low on stock:\n"+ + "\tName: " + prodName +"\n"+ + "\tID: "+ prodId +"\n"+ + "\tRemaining quantity: "+ prodQuantity +"\n"+ + "The minimum stock threshold for this product is "+ minThreshold + " units.\n"+ + "\n"+ + "Please start restocking it as soon as possible unless specified otherwise.\n"+ + "\n"+ + "Thank you for your prompt attention, and have a great day!\n"+ + "\n"+ + "Best regards,\n"+ + "\n"+ + "Bot Mailer Steven"+ + "