Code

Harry web buttons#31

Code

Open

harryyang77 wants to merge 80 commits intoshashirajraja:mastershashirajraja/shopping-cart:masterfrom

Gabriel-Hh:harry_web-buttonsGabriel-Hh/shopping-cart:harry_web-buttonsCopy head branch name to clipboard

Commits

Commits on Sep 22, 2023

• config changes: auto changes from importing project.

  Gabriel-Hh

  committed
  87634ca

  Copy full SHA for 87634ca

Commits on Nov 28, 2023

• Added SQL and java backend changes for WebAnalytics

  Show description for 4ff4b7d
  Gabriel-Hh

  committed
  4ff4b7d

  Copy full SHA for 4ff4b7d

• Update mysql_query.sql

  Show description for 3b60d69
  Gabriel-Hh

  committed
  3b60d69

  Copy full SHA for 3b60d69

Commits on Nov 29, 2023

• Update mysql_query.sql

  Show description for 9978e18
  harryyang77

  committed
  9978e18

  Copy full SHA for 9978e18

• Update README.md

  Show description for 689343b
  Gabriel-Hh

  authored
  689343b

  Copy full SHA for 689343b

• Merge branch 'main' of https://github.com/harryyang77/shopping-cart

  harryyang77

  committed
  928efb1

  Copy full SHA for 928efb1

• Merge pull request #1 from harryyang77/main

  Show description for 0b34338
  Gabriel-Hh

  authored
  0b34338

  Copy full SHA for 0b34338

• Update userHome.jsp

  Show description for cf6b801
  harryyang77

  committed
  cf6b801

  Copy full SHA for cf6b801

• Update mysql_query.sql

  WenbooSu

  authored
  52d5a7f

  Copy full SHA for 52d5a7f

• Update ProductBean.java

  WenbooSu

  authored
  856851a

  Copy full SHA for 856851a

• Update ProductService.java

  WenbooSu

  authored
  ed51ee5

  Copy full SHA for ed51ee5

• Update ProductServiceImpl.java

  WenbooSu

  authored
  a72d031

  Copy full SHA for a72d031

• On low inv alert email + name change to "Concordia Shopping Cart App"

  YuYingLiWen

  committed
  44ad63b

  Copy full SHA for 44ad63b

• Update ProductServiceImpl.java

  WenbooSu

  authored
  9a847af

  Copy full SHA for 9a847af

• Update ProductService.java

  WenbooSu

  authored
  4925914

  Copy full SHA for 4925914

• Update mysql_query.sql

  WenbooSu

  authored
  08e1ee9

  Copy full SHA for 08e1ee9

• Admin now receives email alerts instead of clients

  YuYingLiWen

  committed
  64d4773

  Copy full SHA for 64d4773

• Name change: Ellison Electro >> Concordia

  YuYingLiWen

  committed
  d7b567a

  Copy full SHA for d7b567a

• Merge branch 'main' into YuDev

  Gabriel-Hh

  authored
  cf8955a

  Copy full SHA for cf8955a

• Merge pull request #2 from Gabriel-Hh/YuDev

  Show description for a35569d
  Gabriel-Hh

  authored
  a35569d

  Copy full SHA for a35569d

• Create saleProduct.jsp

  Pettiii

  authored
  4944cc9

  Copy full SHA for 4944cc9

• Update adminStock.jsp

  Pettiii

  authored
  27010d8

  Copy full SHA for 27010d8

• Update ProductServiceImpl.java

  WenbooSu

  authored
  a10d982

  Copy full SHA for a10d982

• Update ProductService.java

  WenbooSu

  authored
  e7bfec6

  Copy full SHA for e7bfec6

Commits on Nov 30, 2023

• sale section and addptoduct

  Show description for e4b74c9
  harryyang77

  committed
  e4b74c9

  Copy full SHA for e4b74c9

• book

  Show description for c5e1ae3
  harryyang77

  committed
  c5e1ae3

  Copy full SHA for c5e1ae3

• Merge pull request #4 from Gabriel-Hh/harry_web-buttons

  Show description for abb05c5
  YuYingLiWen

  authored
  abb05c5

  Copy full SHA for abb05c5

• Merge pull request #5 from Gabriel-Hh/harry_add-more-books

  Show description for a0b880d
  harryyang77

  authored
  a0b880d

  Copy full SHA for a0b880d

• working on interaction, NOT WORKING YET

  Gabriel-Hh

  committed
  a6a560e

  Copy full SHA for a6a560e

• Merge branch 'main' into harry_web-buttons

  harryyang77

  committed
  e0d496d

  Copy full SHA for e0d496d

• Create leaseSelling.jsp

  Pettiii

  authored
  8cf3321

  Copy full SHA for 8cf3321

• Update adminViewProduct.jsp

  Pettiii

  authored
  35187dd

  Copy full SHA for 35187dd

• Create bestSelling.jsp

  Pettiii

  authored
  7152f69

  Copy full SHA for 7152f69

• Update ProductService.java

  Pettiii

  authored
  c3d7f85

  Copy full SHA for c3d7f85

• Update ProductServiceImpl.java

  Pettiii

  authored
  fb6db01

  Copy full SHA for fb6db01

• Update header.jsp

  Pettiii

  authored
  8567ac5

  Copy full SHA for 8567ac5

• Textbook category and updateProduct

  Show description for b61fae1
  harryyang77

  committed
  b61fae1

  Copy full SHA for b61fae1

• Update CartServiceImpl.java, WebAnalyticsServiceImpl.java

  Show description for 7babc4a
  Gabriel-Hh

  committed
  7babc4a

  Copy full SHA for 7babc4a

• Update header.jsp

  harryyang77

  committed
  ed76c29

  Copy full SHA for ed76c29

• Merge branch 'main' into harry_web-buttons

  harryyang77

  committed
  d0b32e9

  Copy full SHA for d0b32e9

• Fixed file naming typo

  YuYingLiWen

  committed
  0f18d14

  Copy full SHA for 0f18d14

• Refactored Best/Least Selling code

  Show description for 795eb23
  YuYingLiWen

  committed
  795eb23

  Copy full SHA for 795eb23

• Finalized : Interaction triggers WORKS

  Show description for c929641
  Gabriel-Hh

  committed
  c929641

  Copy full SHA for c929641

• Centered best/least selling text

  YuYingLiWen

  committed
  14df8c7

  Copy full SHA for 14df8c7

• Merge pull request #7 from Gabriel-Hh/gabriel_frontend-analyitics-triggers

  Show description for 83e0021
  Gabriel-Hh

  authored
  83e0021

  Copy full SHA for 83e0021

• Update userHome, remove 2 buttons

  Show description for 8d8d5ca
  Gabriel-Hh

  committed
  8d8d5ca

  Copy full SHA for 8d8d5ca

• Merge branch 'main' of https://github.com/Gabriel-Hh/shopping-cart

  Gabriel-Hh

  committed
  cbb164c

  Copy full SHA for cbb164c

• Merge pull request #6 from Gabriel-Hh/harry_web-buttons

  Show description for fd8a890
  Gabriel-Hh

  authored
  fd8a890

  Copy full SHA for fd8a890

Commits on Dec 1, 2023

• Update adminViewProduct.jsp

  Pettiii

  authored
  6a372da

  Copy full SHA for 6a372da

• updated mysql default values and Productbean

  Gabriel-Hh

  committed
  0950bf0

  Copy full SHA for 0950bf0

• change prduct table, from condition (reserved word) to quality)

  Gabriel-Hh

  committed
  d4022d8

  Copy full SHA for d4022d8

• Change & Adding: Quality and Discount

  YuYingLiWen

  committed
  1cb9b7c

  Copy full SHA for 1cb9b7c

• updateProduct.jsp WORKING

  Show description for 4b471be
  Gabriel-Hh

  committed
  4b471be

  Copy full SHA for 4b471be

• Adding more: Quality and Discount

  YuYingLiWen

  committed
  e0e808f

  Copy full SHA for e0e808f

• Merge branch 'main' of https://github.com/Gabriel-Hh/shopping-cart

  YuYingLiWen

  committed
  3efdac9

  Copy full SHA for 3efdac9

• Update adminViewProduct.jsp

  Pettiii

  authored
  5ce5158

  Copy full SHA for 5ce5158

• Update saleProduct.jsp

  Pettiii

  authored
  fa5dbf6

  Copy full SHA for fa5dbf6

• Minor changes

  harryyang77

  committed
  b0bf828

  Copy full SHA for b0bf828

• Discount clamped between 0 and 100

  YuYingLiWen

  committed
  2bcced1

  Copy full SHA for 2bcced1

• Merge branch 'main' of https://github.com/Gabriel-Hh/shopping-cart

  YuYingLiWen

  committed
  b70da08

  Copy full SHA for b70da08

• Change Title to Concordia Shopping Cart App

  YuYingLiWen

  committed
  38c6288

  Copy full SHA for 38c6288

• Merge branch 'main' into harry_web-buttons

  harryyang77

  committed
  2210c28

  Copy full SHA for 2210c28

• userHome.jsp IN PROGRESS

  Show description for 3cd1166
  Gabriel-Hh

  committed
  3cd1166

  Copy full SHA for 3cd1166

• Merge branch 'main' of https://github.com/Gabriel-Hh/shopping-cart

  Gabriel-Hh

  committed
  bd3d526

  Copy full SHA for bd3d526

• Reverting 2 commits Read desc

  Show description for 3b48f88
  YuYingLiWen

  committed
  3b48f88

  Copy full SHA for 3b48f88

• Discount works until payment but orders amount doesnt update

  YuYingLiWen

  committed
  85fc7a9

  Copy full SHA for 85fc7a9

• show sale items at home screen

  Show description for 5b2f7b8
  harryyang77

  committed
  5b2f7b8

  Copy full SHA for 5b2f7b8

• Merge branch 'main' into harry_web-buttons

  harryyang77

  committed
  ad22fab

  Copy full SHA for ad22fab

• userHome.,jsp Working

  Show description for 9a99307
  Gabriel-Hh

  committed
  9a99307

  Copy full SHA for 9a99307

• Order discount price now saves to DB

  YuYingLiWen

  committed
  e0b9932

  Copy full SHA for e0b9932

• Merge branch 'main' of https://github.com/Gabriel-Hh/shopping-cart

  YuYingLiWen

  committed
  638970a

  Copy full SHA for 638970a

• made least selling availble to customer

  Show description for f84a137
  harryyang77

  committed
  f84a137

  Copy full SHA for f84a137

• Merge branch 'main' into harry_web-buttons

  harryyang77

  committed
  4954180

  Copy full SHA for 4954180

• Delete WebContent/bestSelling.jsp

  YuYingLiWen

  authored
  83cd848

  Copy full SHA for 83cd848

• Delete WebContent/index.jsp

  YuYingLiWen

  authored
  5b2df3a

  Copy full SHA for 5b2df3a

• Delete WebContent/leastSelling.jsp

  YuYingLiWen

  authored
  0bbde0f

  Copy full SHA for 0bbde0f

• Update addProduct.jsp

  YuYingLiWen

  authored
  d3c8908

  Copy full SHA for d3c8908

• Merge pull request #8 from Gabriel-Hh/harry_web-buttons

  Show description for 1b32673
  YuYingLiWen

  authored
  1b32673

  Copy full SHA for 1b32673

• Revert "Merge pull request #8 from Gabriel-Hh/harry_web-buttons"

  Show description for 1cc6d99
  YuYingLiWen

  committed
  1cc6d99

  Copy full SHA for 1cc6d99

• Update addProduct.jsp

  harryyang77

  committed
  a2d5a99

  Copy full SHA for a2d5a99