add/remove from cart working

7 files changed, 109 insertions, 49 deletions

diff --git a/db/data.sql b/db/data.sql
index 01f18aa..e6ac757 100644
--- a/db/data.sql
+++ b/db/data.sql
@@ -27,14 +27,16 @@ insert into webs.user (`name`, `hash`) values
 	("willem", "$2b$12$vCDpn5fnGBL7dv3Ty1cgZegDKOguoRIgHNrUFYOCWoensgI4HnJde"); -- biege
 update webs.user set `privileges` = 1073741824 where `name` = "loek";
 
-insert into webs.cart (`product`, `user`) values
-	(4, 1),
-	(5, 1),
-	(6, 1),
-	(7, 1),
-	(8, 1);
-
 insert into webs.promotion (`product`, `price_buff`) values
 	(1, 0.80), -- 20% korting
 	(2, 0.80),
 	(3, 0.80);
+
+set @order_id = webs.cart(1); -- cart id voor loek
+insert into webs.orderproduct (`product`, `count`, `order`) values
+	(4, 1, @order_id),
+	(5, 1, @order_id),
+	(6, 1, @order_id),
+	(7, 1, @order_id),
+	(8, 1, @order_id);
+
diff --git a/db/functions.sql b/db/functions.sql
new file mode 100644
index 0000000..995e7e9
--- /dev/null
+++ b/db/functions.sql
@@ -0,0 +1,30 @@
+drop function if exists webs.cart;
+drop function if exists webs.add_to_cart;
+
+delimiter $$
+create function webs.cart(user_id int) -- get current order for user_id (cart order id)
+returns int
+begin
+	set @order_id = (select id from webs.order where status = 1 and user = user_id);
+	if @order_id is not null then
+		return @order_id;
+	end if;
+	insert into webs.order (`user`) values (user_id);
+	set @order_id = (select id from webs.order where status = 1 and user = user_id);
+	return @order_id;
+end$$
+
+create function webs.add_to_cart(product_id int, user_id int)
+returns boolean
+begin
+	set @orderproduct_id = (select id from webs.orderproduct where product = product_id and `order` = cart(user_id));
+	if @orderproduct_id is not null then
+		update orderproduct set count = count + 1 where id = @orderproduct_id;
+		return true;
+	end if;
+	insert into webs.orderproduct (`product`, `count`, `order`) values (product_id, 1, cart(user_id));
+	return false;
+end$$
+
+delimiter ;
+
diff --git a/db/init.sql b/db/init.sql
index b7b3310..df7aa30 100644
--- a/db/init.sql
+++ b/db/init.sql
@@ -33,19 +33,30 @@ create table if not exists webs.user (
   primary key (`id`)
 );
 
-create table if not exists webs.cart (
+create table if not exists webs.order (
   `id` int not null auto_increment,
-  `product` int not null,
+  `status` int not null default 1,
   `user` int not null,
+  primary key (`id`),
+  constraint `order_user_fk`
+    foreign key (`user`)
+    references webs.user (`id`)
+    on update cascade
+);
+
+create table if not exists webs.orderproduct (
+  `id` int not null auto_increment,
+  `product` int not null,
 	`count` int not null default 1,
+	`order` int not null,
   primary key (`id`),
   constraint `cart_product_fk`
     foreign key (`product`)
     references webs.product (`id`)
     on update cascade,
-  constraint `cart_user_fk`
-    foreign key (`user`)
-    references webs.user (`id`)
+  constraint `cart_order_fk`
+    foreign key (`order`)
+    references webs.order (`id`)
     on update cascade
 );
 
diff --git a/db/makefile b/db/makefile
index 0802fa6..59d9fc2 100644
--- a/db/makefile
+++ b/db/makefile
@@ -18,7 +18,7 @@ data: data.sql
 full: full.sql
 	$(SQL) < $<
 
-base.sql: reset.sql init.sql
+base.sql: reset.sql init.sql functions.sql
 	cat $^ > $@
 
 full.sql: base.sql data.sql
diff --git a/lib/login.php b/lib/login.php
index 0683031..05caf17 100644
--- a/lib/login.php
+++ b/lib/login.php
@@ -39,9 +39,10 @@ function check_login($username, $password) {
 }
 
 function get_cart_count() {
-	global $username, $cursor;
-	$statement = $cursor->prepare("select sum(cart.count) as count from cart join user on user.id = cart.user join product on product.id = cart.product where user.name = ?");
-	$statement->bind_param("s", $username);
+	global $user_id, $cursor;
+	if (!$user_id) return 0;
+	$statement = $cursor->prepare("select ifnull(sum(count), 0) as count from webs.orderproduct where `order` = webs.cart(?)");
+	$statement->bind_param("i", $user_id);
 	if (!$statement->execute()) return 0;
 	$res = $statement->get_result();
 	if (!mysqli_num_rows($res)) return 0;
diff --git a/public/cart.php b/public/cart.php
index 34cccbb..d4dfcc6 100644
--- a/public/cart.php
+++ b/public/cart.php
@@ -2,24 +2,31 @@
 <?php require "../lib/db.php" ?>
 <?php require "../lib/login.php" ?>
 <?php if_logged_in(false, "/login.php", true) ?>
-<?php
-do {
+<?php do {
 	if ($_SERVER['REQUEST_METHOD'] !== 'POST') break;
+	if (!$_POST['type']) break;
 	if (!$_POST['product_id']) break;
 
-	// TODO: add product to cart
-	// $statement = $cursor->prepare("select id, image, price, name, description from webs.product where id = ?");
-	// $statement->bind_param("i", $_GET['id']);
-	// if (!$statement->execute()) refuse();
-	// $res = $statement->get_result();
-	// if (!mysqli_num_rows($res)) refuse();
-	// $product = $res->fetch_object();
-
-
-	// if all guards passed, successful login occurred
-	cookie_redir($_POST['username'], $_POST['password']);
-} while (false);
-?>
+	switch($_POST['type']) {
+		case "delete": {
+			$statement = $cursor->prepare("delete from orderproduct where product = ? and `order` = cart(?)");
+			$statement->bind_param("ii", $_POST['product_id'], $user_id);
+			$statement->execute();
+			break;
+		}
+		case "add": {
+			// ik wou deze functie eigenlijk in een stored procedure doen maar het
+			// schijnt dat de knappe koppen bij mysql het geen goed idee vonden om
+			// gewoon 'return' toe te staan binnen de body van een stored
+			// procedure???
+			$statement = $cursor->prepare("select add_to_cart(?, ?)");
+			$statement->bind_param("ii", $_POST['product_id'], $user_id);
+			$statement->execute();
+			$statement->get_result()/*->fetch_object()*/;
+			break;
+		}
+	}
+} while (false); ?>
 <?php 
 function item_template($item) {
 	$image_path = $item->image ? "/img/product/$item->id-thumb.jpg" : "/img/placeholder.png";
@@ -28,8 +35,8 @@ function item_template($item) {
 		<img src="$image_path" alt="productafbeelding">
 		<span class="name">$item->name</span>
 		<label for="$item->id-count">hoeveelheid:</label>
-		<input type="number" value="$item->count" min="1" max="20" id="$item->id-count">
-		<button id="$item->id-delete">weghalen</button>
+		<input type="number" value="$item->count" min="1" max="20" id="$item->id-count" disabled>
+		<button type="submit" value="$item->id" name="product_id">weghalen</button>
 		<span class="price">$item->price</span>
 	</div>
 EOF;
@@ -45,20 +52,28 @@ EOF;
 	<?php include 'navbar.php' ?>
 	<div class="main limwidth">
 	<h2>dingen in de mand van <?php echo $username ?></h2>
-		<div class="products">
-			<?php do {
-				global $username;
-				$statement = $cursor->prepare("select product.id, product.name, product.price, product.image, cart.count from cart join user on user.id = cart.user join product on product.id = cart.product where user.name = ?");
-				$statement->bind_param("s", $username);
-				if (!$statement->execute()) break;
-				$res = $statement->get_result();
-				if (!mysqli_num_rows($res)) {
-					echo "mandje leeg";
-					break;
-				}
-				while ($product = $res->fetch_object()) item_template($product);
-			} while (false); ?>
-		</div>
+		<?php do {
+			global $username;
+			$statement = $cursor->prepare("select product.id, product.name, product.price, product.image, orderproduct.count from orderproduct join product on product.id = orderproduct.product where `order` = cart(?)");
+			$statement->bind_param("i", $user_id);
+			if (!$statement->execute()) break;
+			$res = $statement->get_result();
+			if (!mysqli_num_rows($res)) {
+				echo "mandje leeg";
+				break;
+			}
+			echo <<<"EOF"
+				<form class="products" method="post">
+					<input type="hidden" name="type" value="delete">
+			EOF;
+			while ($product = $res->fetch_object()) item_template($product);
+			echo <<<"EOF"
+				</form>
+				<form class="product-footer" method="post" action="/order-complete.php">
+					<input type="submit" value="Bestellen" class="buttonstyle filled">
+				</form>
+			EOF;
+		} while (false); ?>
 	</div>
 	<?php include 'footer.php' ?>
 </body>
diff --git a/public/product.php b/public/product.php
index 70c511d..18cc936 100644
--- a/public/product.php
+++ b/public/product.php
@@ -38,8 +38,9 @@ $product = $res->fetch_object();
 				<span class="price"><?php echo $product->price ?></span>
 				<p class="info"><?php echo $product->description ?></p>
 				<form action="/cart.php" method="post">
-					<input type="number" value="<?php echo $product->id ?>" hidden name="product_id">
-					<input type="submit" value="Toevoegen aan winkelwagen" class="button filled">
+					<input type="hidden" name="type" value="add">
+					<input type="hidden" name="product_id" value="<?php echo $product->id ?>">
+					<input type="submit" class="button filled" value="Toevoegen aan winkelwagen">
 				</form>
 			</div>
 		</div>