diff --git a/src/main/java/com/ecommerce/dao/OrderDao.java b/src/main/java/com/ecommerce/dao/OrderDao.java new file mode 100644 index 0000000..00750da --- /dev/null +++ b/src/main/java/com/ecommerce/dao/OrderDao.java @@ -0,0 +1,81 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package com.ecommerce.dao; + +import com.ecommerce.loginpack.model.*; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.util.*; + +/** + * + * @author oladimeji + */ +public class OrderDao { + private Connection con; + private String query; + private PreparedStatement pst; + private ResultSet rs; + + public OrderDao(Connection con){ + this.con = con; + } + + public boolean insertOrder(Order model){ + boolean result = false; + + try{ + query = "insert into orders (p_id, u_id, o_quantity, o_date) values(?,?,?,?)"; + + pst = this.con.prepareStatement(query); + pst.setInt(1, model.getProductid()); + pst.setInt(2, model.getUid()); + pst.setInt(3, model.getQuantity()); + pst.setString(4, model.getDate()); + pst.executeUpdate(); + result = true; + + } + catch(Exception e){ + e.printStackTrace(); + } + + return result; + + } + public List userOrders(int id){ + List list = new ArrayList<>(); + try{ + + query = "select * from orders where u_id=? order by orders.orderid desc"; + pst = this.con.prepareStatement(query); + pst.setInt(1, id); + rs = pst.executeQuery(); + + while(rs.next()){ + Order order = new Order(); + ProductDao productDao = new ProductDao(this.con); + int pId = rs.getInt("p_id"); + + Product product = productDao.getSingleProduct(pId); + order.setOrderId(rs.getInt("orderid")); + order.setProductid(pId); + order.setName(product.getName()); + order.setCategory(product.getCategory()); + order.setPrice(product.getPrice()*rs.getInt("o_quantity")); + order.setQuantity(rs.getInt("o_quantity")); + order.setDate(rs.getString("o_date")); + list.add(order); + + } + }catch(Exception e){ + e.printStackTrace(); + } + + return list; + } + +} diff --git a/src/main/java/com/ecommerce/dao/ProductDao.java b/src/main/java/com/ecommerce/dao/ProductDao.java index 50a3947..748bc91 100644 --- a/src/main/java/com/ecommerce/dao/ProductDao.java +++ b/src/main/java/com/ecommerce/dao/ProductDao.java @@ -51,6 +51,32 @@ public class ProductDao { } + + public Product getSingleProduct(int id) { + Product row = null; + try { + query = "select * from products where productid=? "; + + pst = this.con.prepareStatement(query); + pst.setInt(1, id); + rs = pst.executeQuery(); + + while (rs.next()) { + row = new Product(); + row.setProductid(rs.getInt("productid")); + row.setName(rs.getString("name")); + row.setCategory(rs.getString("category")); + row.setPrice(rs.getDouble("price")); + row.setImage(rs.getString("image")); + } + } catch (Exception e) { + e.printStackTrace(); + System.out.println(e.getMessage()); + } + + return row; + } + public List getCartProducts(ArrayList cartList){ List products = new ArrayList(); diff --git a/src/main/java/com/ecommerce/login/CheckOutServlet.java b/src/main/java/com/ecommerce/login/CheckOutServlet.java new file mode 100644 index 0000000..718a88c --- /dev/null +++ b/src/main/java/com/ecommerce/login/CheckOutServlet.java @@ -0,0 +1,84 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template + */ +package com.ecommerce.login; + +import com.ecommerce.connection.DbConnection; +import com.ecommerce.dao.OrderDao; +import com.ecommerce.loginpack.model.*; +import com.ecommerce.loginpack.model.UserModelClass; +import java.io.IOException; +import java.io.PrintWriter; +import java.text.SimpleDateFormat; +import java.util.*; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * + * @author oladimeji + */ +@WebServlet(name = "CheckOutServlet", urlPatterns = {"/check-out"}) +public class CheckOutServlet extends HttpServlet { + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + response.setContentType("text/html;charset=UTF-8"); + try ( PrintWriter out = response.getWriter()) { + + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + + Date date = new Date(); + + //retriving all cart products + ArrayList cart_list = (ArrayList) request.getSession().getAttribute("cart-list"); + + //checking if user has logged in/User authentication + UserModelClass auth = (UserModelClass) request.getSession().getAttribute("auth"); + + //Checking if the user has logged in and if the cart is empty + if(cart_list !=null && auth != null){ + + for(Cart c:cart_list){ + //we prepare the order object + Order order= new Order(); + order.setProductid(c.getProductid()); + order.setUid(auth.getId()); + order.setQuantity(c.getQuantity()); + order.setDate(formatter.format(date)); + + //instantiate the orderDao class + OrderDao oDao = new OrderDao(DbConnection.getConnection()); + //calling the insert method + + boolean result = oDao.insertOrder(order); + if(!result) break; + + + } + cart_list.clear(); + response.sendRedirect("orders.jsp"); + + }else{ + if(auth ==null) response.sendRedirect("login.jsp"); + response.sendRedirect("cart.jsp"); + } + + + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + doGet(request, response); + } + +} diff --git a/src/main/java/com/ecommerce/login/LoginServlet.java b/src/main/java/com/ecommerce/login/LoginServlet.java index b65f0ff..7ddd363 100644 --- a/src/main/java/com/ecommerce/login/LoginServlet.java +++ b/src/main/java/com/ecommerce/login/LoginServlet.java @@ -48,7 +48,7 @@ public class LoginServlet extends HttpServlet { UserModelClass user = udao.userLogin(username, password); if(user !=null){ - request.getSession().setAttribute("'auth", user); + request.getSession().setAttribute("auth", user); response.sendRedirect("index.jsp"); }else{ out.print("user login failed"); diff --git a/src/main/java/com/ecommerce/login/OrderNowServlet.java b/src/main/java/com/ecommerce/login/OrderNowServlet.java new file mode 100644 index 0000000..f9247bc --- /dev/null +++ b/src/main/java/com/ecommerce/login/OrderNowServlet.java @@ -0,0 +1,90 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template + */ +package com.ecommerce.login; + +import com.ecommerce.connection.DbConnection; +import com.ecommerce.dao.OrderDao; +import com.ecommerce.loginpack.model.Cart; +import com.ecommerce.loginpack.model.Order; +import com.ecommerce.loginpack.model.UserModelClass; +import java.io.IOException; +import java.io.PrintWriter; +import java.sql.SQLException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * + * @author oladimeji + */ +@WebServlet(name = "OrderNowServlet", urlPatterns = {"/order-now"}) +public class OrderNowServlet extends HttpServlet { + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + response.setContentType("text/html;charset=UTF-8"); + try ( PrintWriter out = response.getWriter()) { + + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + + Date date = new Date(); + + UserModelClass auth = (UserModelClass) request.getSession().getAttribute("auth"); + if (auth != null) { + + String productId = request.getParameter("id"); + int productQuantity = Integer.parseInt(request.getParameter("quantity")); + if (productQuantity <= 0) { + productQuantity = 1; + } + + Order orderModel = new Order(); + orderModel.setProductid(Integer.parseInt(productId)); + orderModel.setUid(auth.getId()); + orderModel.setQuantity(productQuantity); + orderModel.setDate(formatter.format(date)); + + OrderDao orderDao = new OrderDao(DbConnection.getConnection()); + boolean result = orderDao.insertOrder(orderModel); + + if (result) { + ArrayList cart_list = (ArrayList) request.getSession().getAttribute("cart-list"); + if(cart_list != null){ + for(Cart c:cart_list){ + if(c.getProductid()== Integer.parseInt(productId)){ + cart_list.remove(cart_list.indexOf(c)); + break; + } + } + } + response.sendRedirect("orders.jsp"); + } else { + out.print("order failed"); + } + + } else { + response.sendRedirect("login.jsp"); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + doGet(request, response); + } + +} diff --git a/src/main/java/com/ecommerce/login/RemoveItemServlet.java b/src/main/java/com/ecommerce/login/RemoveItemServlet.java new file mode 100644 index 0000000..43af586 --- /dev/null +++ b/src/main/java/com/ecommerce/login/RemoveItemServlet.java @@ -0,0 +1,51 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template + */ +package com.ecommerce.login; + +import com.ecommerce.loginpack.model.Cart; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.ArrayList; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * + * @author oladimeji + */ +@WebServlet(name = "RemoveItemServlet", urlPatterns = {"/remove-item"}) +public class RemoveItemServlet extends HttpServlet { + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + response.setContentType("text/html;charset=UTF-8"); + try(PrintWriter out = response.getWriter()){ + String id = request.getParameter("id"); + if(id!=null){ + ArrayList cart_list = (ArrayList) request.getSession().getAttribute("cart-list"); + if(cart_list != null){ + for(Cart c:cart_list){ + if(c.getProductid()== Integer.parseInt(id)){ + cart_list.remove(cart_list.indexOf(c)); + break; + } + + } + response.sendRedirect("cart.jsp"); + } + }else{ + response.sendRedirect("cart.jsp"); + + } + } + } + + + +} diff --git a/src/main/java/com/ecommerce/loginpack/model/Order.java b/src/main/java/com/ecommerce/loginpack/model/Order.java new file mode 100644 index 0000000..be950bc --- /dev/null +++ b/src/main/java/com/ecommerce/loginpack/model/Order.java @@ -0,0 +1,69 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package com.ecommerce.loginpack.model; + +/** + * + * @author oladimeji + */ +public class Order extends Product{ + private int orderId; + private int uid; + private int quantity; + private String date; + + public Order() { + } + + public Order(int orderId, int uid, int quantity, String date) { + super(); + this.orderId = orderId; + this.uid = uid; + this.quantity = quantity; + this.date = date; + } + + public Order(int uid, int quantity, String date) { + super(); + this.uid = uid; + this.quantity = quantity; + this.date = date; + } + + public int getOrderId() { + return orderId; + } + public void setOrderId(int orderId) { + this.orderId = orderId; + } + + public int getUid() { + return uid; + } + + public void setUid(int uid) { + this.uid = uid; + } + + public int getQuantity() { + return quantity; + } + public void setQuantity(int quantity) { + this.quantity = quantity; + } + public String getDate() { + return date; + } + public void setDate(String date) { + this.date = date; + } + + @Override + public String toString() { + return "Order{" + "orderId=" + orderId + ", uid=" + uid + ", quantity=" + quantity + ", date=" + date + '}'; + } + + +} diff --git a/src/main/webapp/Admin.jsp b/src/main/webapp/Admin.jsp new file mode 100644 index 0000000..3a98da7 --- /dev/null +++ b/src/main/webapp/Admin.jsp @@ -0,0 +1,17 @@ +<%-- + Document : Admin + Created on : 24 Aug 2022, 03:01:48 + Author : oladimeji +--%> + +<%@page contentType="text/html" pageEncoding="UTF-8"%> + + + + + JSP Page + + +

Hello World!

+ + diff --git a/src/main/webapp/cart.jsp b/src/main/webapp/cart.jsp index d3f4b60..77fd146 100644 --- a/src/main/webapp/cart.jsp +++ b/src/main/webapp/cart.jsp @@ -63,7 +63,7 @@

Total Price: £ ${(total>0)?total:0 }

- Check Out + Check Out
@@ -71,7 +71,7 @@ - + @@ -84,7 +84,7 @@ - + <% } diff --git a/src/main/webapp/checkout.jsp b/src/main/webapp/checkout.jsp new file mode 100644 index 0000000..088eb7c --- /dev/null +++ b/src/main/webapp/checkout.jsp @@ -0,0 +1,107 @@ +<%-- + Document : checkout + Created on : 24 Aug 2022, 15:30:13 + Author : oladimeji +--%> + +<%@page contentType="text/html" pageEncoding="UTF-8"%> + + + + + + + + JSP Page + + +
+ +
+
+

Make Payment

+
+
+
+
+
+
+
+ + +
+ +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Confirm Payment + + +
+
+ +
+
Select your paypal account type
+
+

+

Note: After clicking on the button, you will be directed to a secure gateway for payment. After completing the payment process, you will be redirected back to the website to view details of your order.

+
+ +
+
+
+

+
+

Note: After clicking on the button, you will be directed to a secure gateway for payment. After completing the payment process, you will be redirected back to the website to view details of your order.

+
+ +
+
+
+
+ + diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index a20cf66..ace250f 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -48,6 +48,7 @@ if(cart_list !=null){
  • Home
  • Log-in
  • Sign-up
    • +
  • orders
  • Cart${cart_list.size()}
    • @@ -67,7 +68,7 @@ if(cart_list !=null){
    Category: <%= p.getCategory()%>
    Add To Cart - Buy Now + Buy Now
    diff --git a/src/main/webapp/orders.jsp b/src/main/webapp/orders.jsp index c9daea1..41c64ec 100644 --- a/src/main/webapp/orders.jsp +++ b/src/main/webapp/orders.jsp @@ -4,14 +4,81 @@ Author : oladimeji --%> +<%@page import="com.ecommerce.loginpack.model.Order"%> +<%@page import="com.ecommerce.dao.OrderDao"%> +<%@page import="com.ecommerce.loginpack.model.UserModelClass"%> +<%@page import="com.ecommerce.connection.DbConnection"%> +<%@page import="java.util.ArrayList"%> +<%@page import="com.ecommerce.loginpack.model.Cart"%> +<%@page import="java.util.List"%> +<% + + UserModelClass auth = (UserModelClass) request.getSession().getAttribute("auth"); + List orders = null; + if (auth != null) { + request.setAttribute("auth", auth); + orders = new OrderDao(DbConnection.getConnection()).userOrders(auth.getId()); + //order = orderDao.userOrders(auth.getId()); + } else { + //response.sendRedirect("login.jsp"); + } + ArrayList cart_list = (ArrayList) session.getAttribute("cart-list"); + if (cart_list != null) { + request.setAttribute("cart_list", cart_list); + } + +%> + <%@page contentType="text/html" pageEncoding="UTF-8"%> + + JSP Page -

    Hello World!

    + + +
    +
    All Orders
    +
    Name Category PriceQuantityBuy Now Cancel
    <%= c.getCategory()%> <%= c.getPrice()%> -
    +
    @@ -92,9 +92,10 @@
    +
    		RemoveRemove
    + + + + + + + + + + + + + + <% + if (orders != null) { + for (Order o : orders) {%> + + + + + + + + + <%} + } + %> + + +
    DateNameCategoryQuantityPriceCancel
    <%=o.getDate()%><%=o.getName()%><%=o.getCategory()%><%=o.getQuantity()%><%=o.getPrice()%>Cancel Order
    + diff --git a/src/main/webapp/style.css b/src/main/webapp/style.css index dbbf59a..f27da24 100644 --- a/src/main/webapp/style.css +++ b/src/main/webapp/style.css @@ -16,7 +16,7 @@ ul { margin: 0; padding: 0; overflow: hidden; - background-color: gray; + background-color: purple; justify-content: space-between; } diff --git a/target/classes/com/ecommerce/dao/OrderDao.class b/target/classes/com/ecommerce/dao/OrderDao.class new file mode 100644 index 0000000..79e6e2e Binary files /dev/null and b/target/classes/com/ecommerce/dao/OrderDao.class differ diff --git a/target/classes/com/ecommerce/dao/ProductDao.class b/target/classes/com/ecommerce/dao/ProductDao.class index 744e104..797844a 100644 Binary files a/target/classes/com/ecommerce/dao/ProductDao.class and b/target/classes/com/ecommerce/dao/ProductDao.class differ diff --git a/target/classes/com/ecommerce/login/CheckOutServlet.class b/target/classes/com/ecommerce/login/CheckOutServlet.class new file mode 100644 index 0000000..0b6fa1d Binary files /dev/null and b/target/classes/com/ecommerce/login/CheckOutServlet.class differ diff --git a/target/classes/com/ecommerce/login/LoginServlet.class b/target/classes/com/ecommerce/login/LoginServlet.class index 1c1a98b..387c60d 100644 Binary files a/target/classes/com/ecommerce/login/LoginServlet.class and b/target/classes/com/ecommerce/login/LoginServlet.class differ diff --git a/target/classes/com/ecommerce/login/OrderNowServlet.class b/target/classes/com/ecommerce/login/OrderNowServlet.class new file mode 100644 index 0000000..907fc49 Binary files /dev/null and b/target/classes/com/ecommerce/login/OrderNowServlet.class differ diff --git a/target/classes/com/ecommerce/login/RemoveItemServlet.class b/target/classes/com/ecommerce/login/RemoveItemServlet.class new file mode 100644 index 0000000..f769cd9 Binary files /dev/null and b/target/classes/com/ecommerce/login/RemoveItemServlet.class differ diff --git a/target/classes/com/ecommerce/loginpack/model/Order.class b/target/classes/com/ecommerce/loginpack/model/Order.class new file mode 100644 index 0000000..366fddb Binary files /dev/null and b/target/classes/com/ecommerce/loginpack/model/Order.class differ diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 0bfa81c..e8dfc4f 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,8 +1,13 @@ +com/ecommerce/login/CheckOutServlet.class com/ecommerce/login/LoginServlet.class -com/ecommerce/dao/ProductDao.class +com/ecommerce/login/OrderNowServlet.class +com/ecommerce/dao/OrderDao.class com/ecommerce/registration/RegistrationServlet.class com/ecommerce/loginpack/model/Product.class +com/ecommerce/login/RemoveItemServlet.class +com/ecommerce/dao/ProductDao.class com/ecommerce/dao/UserDao.class +com/ecommerce/loginpack/model/Order.class com/ecommerce/connection/DbConnection.class com/ecommerce/login/AddCartServlet.class com/ecommerce/login/QIncreDerServlet.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 6725c37..7f85f0f 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,10 +1,15 @@ -/Users/oladimeji/NetBeansProjects/mavenproject3/src/main/java/com/ecommerce/dao/ProductDao.java -/Users/oladimeji/NetBeansProjects/mavenproject3/src/main/java/com/ecommerce/login/LoginServlet.java +/Users/oladimeji/NetBeansProjects/mavenproject3/src/main/java/com/ecommerce/login/CheckOutServlet.java +/Users/oladimeji/NetBeansProjects/mavenproject3/src/main/java/com/ecommerce/dao/OrderDao.java /Users/oladimeji/NetBeansProjects/mavenproject3/src/main/java/com/ecommerce/login/QIncreDerServlet.java /Users/oladimeji/NetBeansProjects/mavenproject3/src/main/java/com/ecommerce/loginpack/model/Product.java -/Users/oladimeji/NetBeansProjects/mavenproject3/src/main/java/com/ecommerce/loginpack/model/UserModelClass.java -/Users/oladimeji/NetBeansProjects/mavenproject3/src/main/java/com/ecommerce/loginpack/model/Cart.java +/Users/oladimeji/NetBeansProjects/mavenproject3/src/main/java/com/ecommerce/login/OrderNowServlet.java /Users/oladimeji/NetBeansProjects/mavenproject3/src/main/java/com/ecommerce/connection/DbConnection.java /Users/oladimeji/NetBeansProjects/mavenproject3/src/main/java/com/ecommerce/login/AddCartServlet.java +/Users/oladimeji/NetBeansProjects/mavenproject3/src/main/java/com/ecommerce/loginpack/model/Order.java +/Users/oladimeji/NetBeansProjects/mavenproject3/src/main/java/com/ecommerce/login/RemoveItemServlet.java +/Users/oladimeji/NetBeansProjects/mavenproject3/src/main/java/com/ecommerce/dao/ProductDao.java +/Users/oladimeji/NetBeansProjects/mavenproject3/src/main/java/com/ecommerce/login/LoginServlet.java +/Users/oladimeji/NetBeansProjects/mavenproject3/src/main/java/com/ecommerce/loginpack/model/UserModelClass.java +/Users/oladimeji/NetBeansProjects/mavenproject3/src/main/java/com/ecommerce/loginpack/model/Cart.java /Users/oladimeji/NetBeansProjects/mavenproject3/src/main/java/com/ecommerce/registration/RegistrationServlet.java /Users/oladimeji/NetBeansProjects/mavenproject3/src/main/java/com/ecommerce/dao/UserDao.java diff --git a/target/mavenproject3-1.0-SNAPSHOT.war b/target/mavenproject3-1.0-SNAPSHOT.war index a4abf06..e7ba1b4 100644 Binary files a/target/mavenproject3-1.0-SNAPSHOT.war and b/target/mavenproject3-1.0-SNAPSHOT.war differ diff --git a/target/mavenproject3-1.0-SNAPSHOT/Admin.jsp b/target/mavenproject3-1.0-SNAPSHOT/Admin.jsp new file mode 100644 index 0000000..3a98da7 --- /dev/null +++ b/target/mavenproject3-1.0-SNAPSHOT/Admin.jsp @@ -0,0 +1,17 @@ +<%-- + Document : Admin + Created on : 24 Aug 2022, 03:01:48 + Author : oladimeji +--%> + +<%@page contentType="text/html" pageEncoding="UTF-8"%> + + + + + JSP Page + + +

    Hello World!

    + + diff --git a/target/mavenproject3-1.0-SNAPSHOT/Tomcat.dpf b/target/mavenproject3-1.0-SNAPSHOT/Tomcat.dpf deleted file mode 100644 index d90830f..0000000 --- a/target/mavenproject3-1.0-SNAPSHOT/Tomcat.dpf +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/target/mavenproject3-1.0-SNAPSHOT/WEB-INF/classes/com/ecommerce/dao/OrderDao.class b/target/mavenproject3-1.0-SNAPSHOT/WEB-INF/classes/com/ecommerce/dao/OrderDao.class new file mode 100644 index 0000000..79e6e2e Binary files /dev/null and b/target/mavenproject3-1.0-SNAPSHOT/WEB-INF/classes/com/ecommerce/dao/OrderDao.class differ diff --git a/target/mavenproject3-1.0-SNAPSHOT/WEB-INF/classes/com/ecommerce/dao/ProductDao.class b/target/mavenproject3-1.0-SNAPSHOT/WEB-INF/classes/com/ecommerce/dao/ProductDao.class index 744e104..797844a 100644 Binary files a/target/mavenproject3-1.0-SNAPSHOT/WEB-INF/classes/com/ecommerce/dao/ProductDao.class and b/target/mavenproject3-1.0-SNAPSHOT/WEB-INF/classes/com/ecommerce/dao/ProductDao.class differ diff --git a/target/mavenproject3-1.0-SNAPSHOT/WEB-INF/classes/com/ecommerce/login/CheckOutServlet.class b/target/mavenproject3-1.0-SNAPSHOT/WEB-INF/classes/com/ecommerce/login/CheckOutServlet.class new file mode 100644 index 0000000..0b6fa1d Binary files /dev/null and b/target/mavenproject3-1.0-SNAPSHOT/WEB-INF/classes/com/ecommerce/login/CheckOutServlet.class differ diff --git a/target/mavenproject3-1.0-SNAPSHOT/WEB-INF/classes/com/ecommerce/login/LoginServlet.class b/target/mavenproject3-1.0-SNAPSHOT/WEB-INF/classes/com/ecommerce/login/LoginServlet.class index 1c1a98b..387c60d 100644 Binary files a/target/mavenproject3-1.0-SNAPSHOT/WEB-INF/classes/com/ecommerce/login/LoginServlet.class and b/target/mavenproject3-1.0-SNAPSHOT/WEB-INF/classes/com/ecommerce/login/LoginServlet.class differ diff --git a/target/mavenproject3-1.0-SNAPSHOT/WEB-INF/classes/com/ecommerce/login/OrderNowServlet.class b/target/mavenproject3-1.0-SNAPSHOT/WEB-INF/classes/com/ecommerce/login/OrderNowServlet.class new file mode 100644 index 0000000..907fc49 Binary files /dev/null and b/target/mavenproject3-1.0-SNAPSHOT/WEB-INF/classes/com/ecommerce/login/OrderNowServlet.class differ diff --git a/target/mavenproject3-1.0-SNAPSHOT/WEB-INF/classes/com/ecommerce/login/RemoveItemServlet.class b/target/mavenproject3-1.0-SNAPSHOT/WEB-INF/classes/com/ecommerce/login/RemoveItemServlet.class new file mode 100644 index 0000000..f769cd9 Binary files /dev/null and b/target/mavenproject3-1.0-SNAPSHOT/WEB-INF/classes/com/ecommerce/login/RemoveItemServlet.class differ diff --git a/target/mavenproject3-1.0-SNAPSHOT/WEB-INF/classes/com/ecommerce/loginpack/model/Order.class b/target/mavenproject3-1.0-SNAPSHOT/WEB-INF/classes/com/ecommerce/loginpack/model/Order.class new file mode 100644 index 0000000..366fddb Binary files /dev/null and b/target/mavenproject3-1.0-SNAPSHOT/WEB-INF/classes/com/ecommerce/loginpack/model/Order.class differ diff --git a/target/mavenproject3-1.0-SNAPSHOT/cart.jsp b/target/mavenproject3-1.0-SNAPSHOT/cart.jsp index d3f4b60..77fd146 100644 --- a/target/mavenproject3-1.0-SNAPSHOT/cart.jsp +++ b/target/mavenproject3-1.0-SNAPSHOT/cart.jsp @@ -63,7 +63,7 @@

    Total Price: £ ${(total>0)?total:0 }

    - Check Out + Check Out
    @@ -71,7 +71,7 @@ - + @@ -84,7 +84,7 @@ - + <% } diff --git a/target/mavenproject3-1.0-SNAPSHOT/checkout.jsp b/target/mavenproject3-1.0-SNAPSHOT/checkout.jsp new file mode 100644 index 0000000..088eb7c --- /dev/null +++ b/target/mavenproject3-1.0-SNAPSHOT/checkout.jsp @@ -0,0 +1,107 @@ +<%-- + Document : checkout + Created on : 24 Aug 2022, 15:30:13 + Author : oladimeji +--%> + +<%@page contentType="text/html" pageEncoding="UTF-8"%> + + + + + + + + JSP Page + + +
    + +
    +
    +

    Make Payment

    +
    +
    +
    +
    +
    +
    +
    + + +
    + +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + Confirm Payment + + +
    +
    + +
    +
    Select your paypal account type
    +
    +

    +

    Note: After clicking on the button, you will be directed to a secure gateway for payment. After completing the payment process, you will be redirected back to the website to view details of your order.

    +
    + +
    +
    +
    +

    +
    +

    Note: After clicking on the button, you will be directed to a secure gateway for payment. After completing the payment process, you will be redirected back to the website to view details of your order.

    +
    + +
    +
    +
    +
    + + diff --git a/target/mavenproject3-1.0-SNAPSHOT/index.jsp b/target/mavenproject3-1.0-SNAPSHOT/index.jsp index a20cf66..ace250f 100644 --- a/target/mavenproject3-1.0-SNAPSHOT/index.jsp +++ b/target/mavenproject3-1.0-SNAPSHOT/index.jsp @@ -48,6 +48,7 @@ if(cart_list !=null){
  • Home
  • Log-in
  • Sign-up
    • +
  • orders
  • Cart${cart_list.size()}
    • @@ -67,7 +68,7 @@ if(cart_list !=null){
    Category: <%= p.getCategory()%>
    Add To Cart - Buy Now + Buy Now
    diff --git a/target/mavenproject3-1.0-SNAPSHOT/orders.jsp b/target/mavenproject3-1.0-SNAPSHOT/orders.jsp index c9daea1..41c64ec 100644 --- a/target/mavenproject3-1.0-SNAPSHOT/orders.jsp +++ b/target/mavenproject3-1.0-SNAPSHOT/orders.jsp @@ -4,14 +4,81 @@ Author : oladimeji --%> +<%@page import="com.ecommerce.loginpack.model.Order"%> +<%@page import="com.ecommerce.dao.OrderDao"%> +<%@page import="com.ecommerce.loginpack.model.UserModelClass"%> +<%@page import="com.ecommerce.connection.DbConnection"%> +<%@page import="java.util.ArrayList"%> +<%@page import="com.ecommerce.loginpack.model.Cart"%> +<%@page import="java.util.List"%> +<% + + UserModelClass auth = (UserModelClass) request.getSession().getAttribute("auth"); + List orders = null; + if (auth != null) { + request.setAttribute("auth", auth); + orders = new OrderDao(DbConnection.getConnection()).userOrders(auth.getId()); + //order = orderDao.userOrders(auth.getId()); + } else { + //response.sendRedirect("login.jsp"); + } + ArrayList cart_list = (ArrayList) session.getAttribute("cart-list"); + if (cart_list != null) { + request.setAttribute("cart_list", cart_list); + } + +%> + <%@page contentType="text/html" pageEncoding="UTF-8"%> + + JSP Page -

    Hello World!

    + + +
    +
    All Orders
    +
    Name Category PriceQuantityBuy Now Cancel
    <%= c.getCategory()%> <%= c.getPrice()%> -
    +
    @@ -92,9 +92,10 @@
    +
    		RemoveRemove
    + + + + + + + + + + + + + + <% + if (orders != null) { + for (Order o : orders) {%> + + + + + + + + + <%} + } + %> + + +
    DateNameCategoryQuantityPriceCancel
    <%=o.getDate()%><%=o.getName()%><%=o.getCategory()%><%=o.getQuantity()%><%=o.getPrice()%>Cancel Order
    + diff --git a/target/mavenproject3-1.0-SNAPSHOT/style.css b/target/mavenproject3-1.0-SNAPSHOT/style.css index dbbf59a..f27da24 100644 --- a/target/mavenproject3-1.0-SNAPSHOT/style.css +++ b/target/mavenproject3-1.0-SNAPSHOT/style.css @@ -16,7 +16,7 @@ ul { margin: 0; padding: 0; overflow: hidden; - background-color: gray; + background-color: purple; justify-content: space-between; }