From 3c7b396741ffb431525a10953951a99cb2f29c2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alperen=20KA=C3=87MAZ?= <alperen703.akm@gmail.com>
Date: Sun, 3 Jan 2021 21:07:18 +0300
Subject: [PATCH] new php adds

---
 Projects/project1_main/account.php            | 106 ++++++++++----
 Projects/project1_main/admin/adminAccount.php |   1 +
 Projects/project1_main/admin/adminBills.php   | 115 +++++++++++++++
 .../project1_main/admin/adminComplaint.php    |  79 +++++-----
 Projects/project1_main/admin/adminInfo.php    |   1 +
 Projects/project1_main/admin/adminPanel.php   |   1 +
 Projects/project1_main/admin/adminTODO.php    |  44 +++---
 .../project1_main/index/new_user_sign.php     |   1 +
 Projects/project1_main/index/payBill.php      | 137 ++++++++++++++++++
 Projects/project1_main/to-do.php              |  57 +++++---
 10 files changed, 438 insertions(+), 104 deletions(-)
 create mode 100644 Projects/project1_main/admin/adminBills.php
 create mode 100644 Projects/project1_main/index/payBill.php

diff --git a/Projects/project1_main/account.php b/Projects/project1_main/account.php
index a721397..08436eb 100644
--- a/Projects/project1_main/account.php
+++ b/Projects/project1_main/account.php
@@ -24,7 +24,7 @@
     <nav class="nav">
         <span>MANAGEMENT SYSTEM</span>
         <ul class="nav-ul">
-        <li class="nav-ul-li"><a href="main.php">MAIN</a></li>
+            <li class="nav-ul-li"><a href="main.php">MAIN</a></li>
             <li class="nav-ul-li"><a href="information.php">INFORMATION</a></li>
             <li class="nav-ul-li"><a href="to-do.php">TO/DO</a></li>
             <li class="nav-ul-li"><a href="complaint.php">COMPLAINT</a></li>
@@ -34,9 +34,6 @@
     </nav>
 
 
-
-
-
     <main class="main-content">
         <div class="main-item">
             <h2>Account Transactions</h2>
@@ -46,54 +43,107 @@
 
     <main class="main-content">
         <div class="main-item-3">
-            <h2>Your Information is ;</h2>
-            <p class="input-3">User name</p>
-            <p class="input-3">Name</p>
-            <p class="input-3">Surname</p>
-            <p class="input-3">Phone</p>
-            <p class="input-3">Email</p>
+            <h2>Your Information is ;</h2><br>
+            <p class="input-3">User name: <?php echo $_SESSION['userUsername'] ?></p><br>
+            <p class="input-3">Name: <?php echo $_SESSION['userName'] ?></p><br>
+            <p class="input-3">Surname: <?php echo $_SESSION['userSurname'] ?></p><br>
+            <p class="input-3">Phone: <?php echo $_SESSION['userGSM'] ?></p><br>
+            <p class="input-3">Email: <?php echo $_SESSION['userEmail'] ?></p><br>
+            <p class="input-3">Flat: <?php echo $_SESSION['userFlatno'] ?></p><br>
         </div>
     </main>
 
 
     <main class="main-content">
         <div class="main-item-2">
-            <form action="#">
+            <form action="account.php" method="POST">
                 <label for="username">User name</label>
-                <input type="text" name="username" id="username" class="input" required><br><br>
+                <input type="text" name="userUsername" id="username" class="input" placeholder="<?php echo $_SESSION['userUsername']?>" required><br><br>
                 <label for="name">Name</label>
-                <input type="text" name="name" id="name" class="input" required><br><br>
+                <input type="text" name="userName" id="name" class="input" required placeholder="<?php echo $_SESSION['userName']?>"><br><br>
                 <label for="surname">Surname</label>
-                <input type="text" name="surname" id="surname" class="input" required><br><br>
+                <input type="text" name="userSurname" id="surname" class="input" required placeholder="<?php echo $_SESSION['userSurname']?>"><br><br>
                 <label for="phone">Phone Number</label>
-                <input type="tel" name="phone" id="phone" class="input" placeholder="555-555-55-55" pattern="[0-9]{3}-[0-9]{3}-[0-9]{2}-[0-9]{2}" required><br><br>
+                <input type="tel" name="userGSM" id="phone" class="input" placeholder="<?php echo $_SESSION['userGSM']?>" required><br><br>
                 <label for="mail">E-mail</label>
-                <input type="email" name="mail" id="mail" class="input" placeholder="asd@asd.com" required><br><br>
+                <input type="email" name="userEmail" id="mail" class="input" placeholder="<?php echo $_SESSION['userEmail']?>" required><br><br>
                 <label for="password">Old Password</label>
-                <input type="password" name="password" id="password" class="input" required><br><br>
+                <input type="password" name="userPassword" id="passwordOld" class="input" required><br><br>
                 <label for="password">New Password</label>
-                <input type="password" name="password" id="password" class="input" required><br><br>
+                <input type="password" name="userPasswordNEW" id="passwordNew" class="input" required><br><br>
+                <label for="userFlatno">Flat</label>
+                <input type="int" name="userFlatno" id="userFlatno" class="input"  placeholder="<?php echo $_SESSION['userFlatno']?>" required><br><br>
+
                 <label for="submit"></label>
                 <input type="submit" name="submit" id="submit" class="btn" required>
                 <label for="reset"></label>
                 <input type="reset" name="reset" id="reset" class="btn" required>
             </form>
+            <?php
+            
+            if(isset($_GET['update'])){
+                if($_GET['update'] == "ok"){
+                    echo "güncelleme başırılı";
+                }
+                elseif($_GET['update'] == "no"){
+                    echo"güncelleme başarısız";
+                }
+            }
+            ?>
         </div>
+        <?php
+        if (isset($_POST['submit'])) {
+
+            $bilgilerim_id = $_SESSION['userID'];
+
+            $kaydet = $db->prepare("UPDATE usersinfo set
+		    userUsername=:userUsername,
+		    userName=:userName,
+		    userSurname=:userSurname,
+		    userEmail=:userEmail,
+		    userUsername=:userUsername,
+		    userFlatno=:userFlatno,
+		    userPassword=:userPassword,
+		    userGSM=:userGSM
+
+		    where userID={$_SESSION['userID']}
+		    ");
+
+            $insert = $kaydet->execute(array(
+
+                'userName' => $_POST['userName'],
+                'userSurname' => $_POST['userSurname'],
+                'userEmail' => $_POST['userEmail'],
+                'userUsername' => $_POST['userUsername'],
+                'userFlatno' => $_POST['userFlatno'],
+                'userPassword' => $_POST['userPasswordNEW'],
+                'userGSM' => $_POST['userGSM']
+            ));
+
+
+
+            if ($insert) {
+                //echo "kayıt başarılı";
+                Header("Location:account.php?update=ok&bilgilerim_id=$bilgilerim_id");
+                exit;
+            } else {
+                //echo "kayıt başarısız";
+                Header("Location:account.php?update=no&bilgilerim_id=$bilgilerim_id");
+                exit;
+            }
+        }
+
+
+
+        ?>
     </main>
 
     <footer class="footer">
         <div class="links">
             <ul>
-                <li class="link"><a href="https://www.linkedin.com/in/alperen-ka%C3%A7maz-2202/" title="LinkedIn"
-                        target="_blanced"><img
-                            src="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcTMdFqfhP3dTNKjtRennSsHXGUmiF9yJ2AfVQ&usqp=CAU"
-                            height="50" width="50" alt="LinkedIn"></a></li>
-                <li class="link"><a href="https://www.instagram.com/mr.kacmaz" title="Instagram" target="_blanced"><img
-                            src="https://pazarlamasyon.com/wp-content/uploads/2018/01/new-instagram-logo-clipart-16.jpg"
-                            height="50" width="50" alt="Instagram"></a></li>
-                <li class="link"><a href="https://github.com/MrKacmaz" title="GitHub" target="_blanced"> <img
-                            src="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcSUP7RN0hZaqZpljtz9c0nz5eSc2DFY-XSRQA&usqp=CAU"
-                            width="50" height="50" alt="GitHub"> </a></li>
+                <li class="link"><a href="https://www.linkedin.com/in/alperen-ka%C3%A7maz-2202/" title="LinkedIn" target="_blanced"><img src="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcTMdFqfhP3dTNKjtRennSsHXGUmiF9yJ2AfVQ&usqp=CAU" height="50" width="50" alt="LinkedIn"></a></li>
+                <li class="link"><a href="https://www.instagram.com/mr.kacmaz" title="Instagram" target="_blanced"><img src="https://pazarlamasyon.com/wp-content/uploads/2018/01/new-instagram-logo-clipart-16.jpg" height="50" width="50" alt="Instagram"></a></li>
+                <li class="link"><a href="https://github.com/MrKacmaz" title="GitHub" target="_blanced"> <img src="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcSUP7RN0hZaqZpljtz9c0nz5eSc2DFY-XSRQA&usqp=CAU" width="50" height="50" alt="GitHub"> </a></li>
             </ul>
         </div>
 
diff --git a/Projects/project1_main/admin/adminAccount.php b/Projects/project1_main/admin/adminAccount.php
index f2b17d6..c0c3249 100644
--- a/Projects/project1_main/admin/adminAccount.php
+++ b/Projects/project1_main/admin/adminAccount.php
@@ -27,6 +27,7 @@
             <li class="nav-ul-li"><a href="adminPanel.php">MAIN</a></li>
             <li class="nav-ul-li"><a href="adminInfo.php">USERS</a></li>
             <li class="nav-ul-li"><a href="adminTODO.php">TO/DO</a></li>
+            <li class="nav-ul-li"><a href="adminBills.php">BILLS</a></li>
             <li class="nav-ul-li"><a href="adminComplaint.php">COMPLAINTS</a></li>
             <li class="nav-ul-li"><a href="adminAccount.php">USER ADD</a></li>
             <li class="nav-ul-li"><a href="adminLogOut.php">LOG-OUT</a></li>
diff --git a/Projects/project1_main/admin/adminBills.php b/Projects/project1_main/admin/adminBills.php
new file mode 100644
index 0000000..32d1281
--- /dev/null
+++ b/Projects/project1_main/admin/adminBills.php
@@ -0,0 +1,115 @@
+<?php
+include '../database/adminDB.php';
+session_start();
+?>
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+    <link rel="stylesheet" href="../css/admin/adminTODO.css">
+
+</head>
+
+<body>
+
+    <!--welcome header bar-->
+    <header class="header">
+        <div class="welcome">
+            <p id="welcome">to-do page</p>
+        </div>
+    </header>
+
+
+    <!--MENU BAR-->
+    <nav class="nav">
+        <span>MANAGEMENT SYSTEM</span>
+        <ul class="nav-ul">
+            <li class="nav-ul-li"><a href="adminPanel.php">MAIN</a></li>
+            <li class="nav-ul-li"><a href="adminInfo.php">USERS</a></li>
+            <li class="nav-ul-li"><a href="adminTODO.php">TO/DO</a></li>
+            <li class="nav-ul-li"><a href="adminBills.php">BILLS</a></li>
+            <li class="nav-ul-li"><a href="adminComplaint.php">COMPLAINTS</a></li>
+            <li class="nav-ul-li"><a href="adminAccount.php">USER ADD</a></li>
+            <li class="nav-ul-li"><a href="adminLogOut.php">LOG-OUT</a></li>
+        </ul>
+    </nav>
+
+    <main class="section">
+        <table id="payment">
+
+            <tr>
+                <th class="text-table">Bill ID</th>
+                <th class="text-table">Bill Date</th>
+                <th class="text-table">is ok</th>
+                <th class="text-table">Rent</th>
+                <th class="text-table">Corridor Electric Bill</th>
+                <th class="text-table">Maintenance Bill</th>
+                <th class="text-table">Corridor Cleaning Bill</th>
+                <th class="text-table">Fuel Bill</th>
+                <th class="text-table">SUM</th>
+                <th class="text-table">UPDATE</th>
+
+            </tr>
+            <?php
+            $checkUserInDB = $db->prepare("SELECT * FROM bills");
+            $checkUserInDB->execute();
+            while ($pullinfo = $checkUserInDB->fetch(PDO::FETCH_ASSOC)) {
+            ?>
+
+                <?php
+                $sum = $pullinfo['rent'] + ($pullinfo['corridorLight'] / 10) + ($pullinfo['corridorWater'] / 10) + ($pullinfo['corridorCleaning'] / 10) + ($pullinfo['fuel'] / 10);
+                ?>
+                <tr>
+                    <td><?php echo $pullinfo['billID'] ?></td>
+                    <td><?php echo $pullinfo['billDate'] ?></td>
+                    <td><?php echo $pullinfo['isOK'] ?></td>
+                    <td><?php echo $pullinfo['rent'] ?></td>
+                    <td><?php echo $pullinfo['corridorLight'] ?></td>
+                    <td><?php echo $pullinfo['corridorWater'] ?></td>
+                    <td><?php echo $pullinfo['corridorCleaning'] ?></td>
+                    <td><?php echo $pullinfo['fuel'] ?></td>
+                    <td><?php echo $sum ?></td>
+                    <td><a href="../index/payBill.php?billID=<?php echo $pullinfo['billID'] ?>"><button>UPDATE</button></a></td>
+                </tr>
+            <?php
+            }
+            ?>
+        </table><br><br>
+
+        <!--UPDATE VEYA ADD İŞLEMİNİN SONUCUNU YAZDIRIR-->
+        <?php
+        if (isset($_GET['addNewBill'])) {
+            if ($_GET['addNewBill'] == "ok") {
+                echo "kayıt başarılı";
+            } elseif ($_GET['addNewBill'] == "no") {
+                echo "kayıt başarısız";
+            }
+        }
+
+        if (isset($_GET['update'])) {
+            if ($_GET['update'] == "ok") {
+                echo  $_GET['billID'] . " nolu güncelleme başarılı";
+            } elseif ($_GET['update'] == "no") {
+                echo $_GET['billID'] . " nolu güncelleme başarısız";
+            }
+        }
+        ?>
+        <br><br><a href="../index/payBill.php?addNewBill=1"><button>ADD NEW BILL</button></a>
+    </main>
+
+    <footer class="footer">
+        <div class="links">
+            <ul>
+                <li class="link"><a href="https://www.linkedin.com/in/alperen-ka%C3%A7maz-2202/" title="LinkedIn" target="_blanced"><img src="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcTMdFqfhP3dTNKjtRennSsHXGUmiF9yJ2AfVQ&usqp=CAU" height="50" width="50" alt="LinkedIn"></a></li>
+                <li class="link"><a href="https://www.instagram.com/mr.kacmaz" title="Instagram" target="_blanced"><img src="https://pazarlamasyon.com/wp-content/uploads/2018/01/new-instagram-logo-clipart-16.jpg" height="50" width="50" alt="Instagram"></a></li>
+                <li class="link"><a href="https://github.com/MrKacmaz" title="GitHub" target="_blanced"> <img src="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcSUP7RN0hZaqZpljtz9c0nz5eSc2DFY-XSRQA&usqp=CAU" width="50" height="50" alt="GitHub"> </a></li>
+            </ul>
+        </div>
+
+    </footer>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/Projects/project1_main/admin/adminComplaint.php b/Projects/project1_main/admin/adminComplaint.php
index f826c18..d056180 100644
--- a/Projects/project1_main/admin/adminComplaint.php
+++ b/Projects/project1_main/admin/adminComplaint.php
@@ -28,6 +28,7 @@
             <li class="nav-ul-li"><a href="adminPanel.php">MAIN</a></li>
             <li class="nav-ul-li"><a href="adminInfo.php">USERS</a></li>
             <li class="nav-ul-li"><a href="adminTODO.php">TO/DO</a></li>
+            <li class="nav-ul-li"><a href="adminBills.php">BILLS</a></li>
             <li class="nav-ul-li"><a href="adminComplaint.php">COMPLAINTS</a></li>
             <li class="nav-ul-li"><a href="adminAccount.php">USER ADD</a></li>
             <li class="nav-ul-li"><a href="adminLogOut.php">LOG-OUT</a></li>
@@ -36,48 +37,48 @@
 
 
     <main class="main">
-            <table style="width: 60%" border="1">
+        <table style="width: 60%" border="1">
+            <tr>
+                <th>S.NO</th>
+                <th>Complain ID</th>
+                <th>Name</th>
+                <th>Surname</th>
+                <th>User Name</th>
+                <th>Flat No</th>
+                <th>About</th>
+                <th>Complain</th>
+                <th>Delete</th>
+            </tr>
+            <?php
+            $checkUserInDB = $db->prepare("SELECT * FROM complains");
+            $checkUserInDB->execute();
+            $say = 0;
+            while ($pullinfo = $checkUserInDB->fetch(PDO::FETCH_ASSOC)) {
+                $say++
+            ?>
                 <tr>
-                    <th>S.NO</th>
-                    <th>Complain ID</th>
-                    <th>Name</th>
-                    <th>Surname</th>
-                    <th>User Name</th>
-                    <th>Flat No</th>
-                    <th>About</th>
-                    <th>Complain</th>
-                    <th>Delete</th>
+                    <td><?php echo $say; ?></td>
+                    <td><?php echo $pullinfo['complainID']; ?></td>
+                    <td><?php echo $pullinfo['userName']; ?></td>
+                    <td><?php echo $pullinfo['userSurname']; ?></td>
+                    <td><?php echo $pullinfo['userUsername']; ?></td>
+                    <td><?php echo $pullinfo['userFlatno']; ?></td>
+                    <td><?php echo $pullinfo['about']; ?></td>
+                    <td><?php echo $pullinfo['userComplain']; ?></td>
+                    <td align="center"><a href="../index/delete.php?complainID=<?php echo $pullinfo['complainID'] ?>&userComplaintdelete=delete"><button>Delete</button></td></a>
                 </tr>
-                <?php
-                $checkUserInDB = $db->prepare("SELECT * FROM complains");
-                $checkUserInDB->execute();
-                $say = 0;
-                while ($pullinfo = $checkUserInDB->fetch(PDO::FETCH_ASSOC)) {
-                    $say++
-                ?>
-                    <tr>
-                        <td><?php echo $say; ?></td>
-                        <td><?php echo $pullinfo['complainID']; ?></td>
-                        <td><?php echo $pullinfo['userName']; ?></td>
-                        <td><?php echo $pullinfo['userSurname']; ?></td>
-                        <td><?php echo $pullinfo['userUsername']; ?></td>
-                        <td><?php echo $pullinfo['userFlatno']; ?></td>
-                        <td><?php echo $pullinfo['about']; ?></td>
-                        <td><?php echo $pullinfo['userComplain']; ?></td>
-                        <td align="center"><a href="../index/delete.php?complainID=<?php echo $pullinfo['complainID'] ?>&userComplaintdelete=delete"><button>Delete</button></td></a>
-                    </tr>
-                <?php } ?>
-            </table>
-            <?php
-            if(isset($_GET['delete'])){
-                if($_GET['delete'] == "ok"){
-                    echo"Successfully deleted";
-                }elseif($_GET['delete'] == "no"){
-                    echo"Failed deleted";
-                }
+            <?php } ?>
+        </table>
+        <?php
+        if (isset($_GET['delete'])) {
+            if ($_GET['delete'] == "ok") {
+                echo "Successfully deleted";
+            } elseif ($_GET['delete'] == "no") {
+                echo "Failed deleted";
             }
-            
-            ?>
+        }
+
+        ?>
     </main>
 
 
diff --git a/Projects/project1_main/admin/adminInfo.php b/Projects/project1_main/admin/adminInfo.php
index 2fdcf1c..c6219bb 100644
--- a/Projects/project1_main/admin/adminInfo.php
+++ b/Projects/project1_main/admin/adminInfo.php
@@ -27,6 +27,7 @@
             <li class="nav-ul-li"><a href="adminPanel.php">MAIN</a></li>
             <li class="nav-ul-li"><a href="adminInfo.php">USERS</a></li>
             <li class="nav-ul-li"><a href="adminTODO.php">TO/DO</a></li>
+            <li class="nav-ul-li"><a href="adminBills.php">BILLS</a></li>
             <li class="nav-ul-li"><a href="adminComplaint.php">COMPLAINTS</a></li>
             <li class="nav-ul-li"><a href="adminAccount.php">USER ADD</a></li>
             <li class="nav-ul-li"><a href="adminLogOut.php">LOG-OUT</a></li>
diff --git a/Projects/project1_main/admin/adminPanel.php b/Projects/project1_main/admin/adminPanel.php
index 6f4e097..a67d4b0 100644
--- a/Projects/project1_main/admin/adminPanel.php
+++ b/Projects/project1_main/admin/adminPanel.php
@@ -27,6 +27,7 @@
             <li class="nav-ul-li"><a href="adminPanel.php">MAIN</a></li>
             <li class="nav-ul-li"><a href="adminInfo.php">USERS</a></li>
             <li class="nav-ul-li"><a href="adminTODO.php">TO/DO</a></li>
+            <li class="nav-ul-li"><a href="adminBills.php">BILLS</a></li>
             <li class="nav-ul-li"><a href="adminComplaint.php">COMPLAINTS</a></li>
             <li class="nav-ul-li"><a href="adminAccount.php">USER ADD</a></li>
             <li class="nav-ul-li"><a href="adminLogOut.php">LOG-OUT</a></li>
diff --git a/Projects/project1_main/admin/adminTODO.php b/Projects/project1_main/admin/adminTODO.php
index 720d1ad..28e4115 100644
--- a/Projects/project1_main/admin/adminTODO.php
+++ b/Projects/project1_main/admin/adminTODO.php
@@ -28,6 +28,7 @@
             <li class="nav-ul-li"><a href="adminPanel.php">MAIN</a></li>
             <li class="nav-ul-li"><a href="adminInfo.php">USERS</a></li>
             <li class="nav-ul-li"><a href="adminTODO.php">TO/DO</a></li>
+            <li class="nav-ul-li"><a href="adminBills.php">BILLS</a></li>
             <li class="nav-ul-li"><a href="adminComplaint.php">COMPLAINTS</a></li>
             <li class="nav-ul-li"><a href="adminAccount.php">USER ADD</a></li>
             <li class="nav-ul-li"><a href="adminLogOut.php">LOG-OUT</a></li>
@@ -44,21 +45,22 @@
                 $checkUserInDB->execute();
                 while ($pullinfo = $checkUserInDB->fetch(PDO::FETCH_ASSOC)) {
                 ?>
-                    <br><li class="mainl-list">ID: <?php echo $pullinfo['toDoID']?></li>
-                    <li class="mainl-list"> <?php echo $pullinfo['toDo']?></li>
-                    <a href="../index/updateArrangements.php?arrangement=0&toDoID=<?php echo $pullinfo['toDoID']?>"><button>Update</button></a><br>
+                    <br>
+                    <li class="mainl-list">ID: <?php echo $pullinfo['toDoID'] ?></li>
+                    <li class="mainl-list"> <?php echo $pullinfo['toDo'] ?></li>
+                    <a href="../index/updateArrangements.php?arrangement=0&toDoID=<?php echo $pullinfo['toDoID'] ?>"><button>Update</button></a><br>
                 <?php
                 }
                 ?>
             </ul><br>
             <?php
-                if(isset($_GET['UPDATE'])){
-                    if($_GET['UPDATE'] == "ok"){
-                        echo "The arrangement with id number ". $_GET['toDoID'] ." has been updated";
-                    }elseif ($_GET['UPDATE'] == "no") {
-                        echo "An error occurred with the problem with id number ". $_GET['toDoID'];
-                    }
+            if (isset($_GET['UPDATE'])) {
+                if ($_GET['UPDATE'] == "ok") {
+                    echo "The arrangement with id number " . $_GET['toDoID'] . " has been updated";
+                } elseif ($_GET['UPDATE'] == "no") {
+                    echo "An error occurred with the problem with id number " . $_GET['toDoID'];
                 }
+            }
             ?>
         </div>
 
@@ -71,24 +73,26 @@
                 $checkUserInDB->execute();
                 while ($pullinfo = $checkUserInDB->fetch(PDO::FETCH_ASSOC)) {
                 ?>
-                    <br><li class="mainl-list">ID:<?php echo $pullinfo['expensesID'] ?></li>
+                    <br>
+                    <li class="mainl-list">ID:<?php echo $pullinfo['expensesID'] ?></li>
                     <li class="mainl-list">Date:<?php echo $pullinfo['expensesTime'] ?></li>
-                    <li class="mainl-list">Light: ₺<?php echo $pullinfo['corridorLight'] ?></li>
-                    <li class="mainl-list">Water: ₺<?php echo $pullinfo['corridorWater'] ?></li>
+                    <li class="mainl-list">Lights: ₺<?php echo $pullinfo['corridorLight'] ?></li>
+                    <li class="mainl-list">Pool Maintenance: ₺<?php echo $pullinfo['corridorWater'] ?></li>
                     <li class="mainl-list">Extra: ₺<?php echo $pullinfo['corridorExtra'] ?></li>
-                    <a href="../index/updateExpenses.php?expensesID=<?php echo$pullinfo['expensesID']?>"><button>Update</button></a><br>
+                    <li class="mainl-list">IS OK:<?php echo $pullinfo['isOK'] ?></li>
+                    <a href="../index/updateExpenses.php?expensesID=<?php echo $pullinfo['expensesID'] ?>"><button>Update</button></a><br>
                 <?php
                 }
                 ?>
             </ul><br>
             <?php
-                if(isset($_GET['expensesUpdated'])){
-                    if($_GET['expensesUpdated'] == "ok"){
-                        echo "The expenses with id number ". $_GET['expensesID'] ." has been updated";
-                    }elseif ($_GET['expensesUpdated'] == "no") {
-                        echo "An error occurred with the problem with id number ". $_GET['expensesID'];
-                    }
+            if (isset($_GET['expensesUpdated'])) {
+                if ($_GET['expensesUpdated'] == "ok") {
+                    echo "The expenses with id number " . $_GET['expensesID'] . " has been updated";
+                } elseif ($_GET['expensesUpdated'] == "no") {
+                    echo "An error occurred with the problem with id number " . $_GET['expensesID'];
                 }
+            }
             ?>
         </div>
     </main>
@@ -98,6 +102,8 @@
 
 
 
+
+
     <footer class="footer">
         <div class="links">
             <ul>
diff --git a/Projects/project1_main/index/new_user_sign.php b/Projects/project1_main/index/new_user_sign.php
index 7b596b8..2fe0a66 100644
--- a/Projects/project1_main/index/new_user_sign.php
+++ b/Projects/project1_main/index/new_user_sign.php
@@ -19,6 +19,7 @@
 
     if ($int == 1) {
         $pullinfo = $checkUserInDB->fetch(PDO::FETCH_ASSOC);
+        $_SESSION['userID'] = $pullinfo['userID'];
         $_SESSION['userUsername'] = $userUsername;
         $_SESSION['userName'] = $pullinfo['userName'];
         $_SESSION['userSurname'] = $pullinfo['userSurname'];
diff --git a/Projects/project1_main/index/payBill.php b/Projects/project1_main/index/payBill.php
new file mode 100644
index 0000000..bba25af
--- /dev/null
+++ b/Projects/project1_main/index/payBill.php
@@ -0,0 +1,137 @@
+<?php
+require_once '../database/logDB.php';
+require_once '../database/adminDB.php';
+session_start(); ?>
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+</head>
+
+<body>
+
+    <!-- START ADD NEW BILL IN DATABASE-->
+    <?php
+    //NEW FORM
+    if (isset($_GET['addNewBill'])) {
+        if ($_GET['addNewBill'] == 1) {
+            echo "
+        <form action='payBill.php' method='POST'>
+        rent:<input type='text' name='rent' id='rent'><br><br>
+        corridorLight:<input type='text' name='corridorLight' id='corridorLight'><br><br>
+        corridorWater:<input type='text' name='corridorWater' id='corridorWater'><br><br>
+        corridorCleaning:<input type='text' name='corridorCleaning' id='corridorCleaning'><br><br>
+        fuel:<input type='text' name='fuel' id='fuel'><br><br>
+        isOK:<input type='text' name='isOK' id='isOK'><br><br>
+        <input type='submit' name='submitBill' id='submitBill'>
+    </form>";
+        }
+    }
+    //INSERTION
+    if (isset($_POST['submitBill'])) {
+        $kaydet = $db->prepare("INSERT into bills set
+		    rent=:rent,
+		    corridorLight=:corridorLight,
+		    corridorWater=:corridorWater,
+		    corridorCleaning=:corridorCleaning,
+            fuel =:fuel,
+            isOK =:isOK
+            ");
+
+        $insert = $kaydet->execute(array(
+            'rent' => $_POST['rent'],
+            'corridorLight' => $_POST['corridorLight'],
+            'corridorWater' => $_POST['corridorWater'],
+            'corridorCleaning' => $_POST['corridorCleaning'],
+            'fuel' => $_POST['fuel'],
+            'isOK' => $_POST['isOK']
+        ));
+        if ($insert) {
+            header("Location:../admin/adminBills.php?addNewBill=ok");
+            exit;
+        } else {
+            header("Location:../admin/adminBills.php?addNewBill=no");
+            exit;
+        }
+    }
+    ?>
+    <!-- END ADD NEW BILL IN DATABASE-->
+
+
+
+
+
+
+    <!-- START UPDATE BILL-->
+    <?php
+    if (isset($_GET['billID'])) {
+        $bilgilerimsor = $db->prepare("SELECT * from bills where billID=:billID");
+        $bilgilerimsor->execute(array(
+            'billID' => $_GET['billID']
+        ));
+
+        $bilgilerimcek = $bilgilerimsor->fetch(PDO::FETCH_ASSOC);
+        $billID = $bilgilerimcek['billID'];
+        $billDate = $bilgilerimcek['billDate'];
+        $rent = $bilgilerimcek['rent'];
+        $corridorLight = $bilgilerimcek['corridorLight'];
+        $corridorWater = $bilgilerimcek['corridorWater'];
+        $corridorCleaning = $bilgilerimcek['corridorCleaning'];
+        $fuel = $bilgilerimcek['fuel'];
+        $isOK = $bilgilerimcek['isOK'];
+
+        echo "
+        <form action='payBill.php?billID=$billID' method='POST'>
+        bill ID:<input type='text' name='rent' id='rent' value='$billID'><br><br>
+        bill Date:<input type='text' name='rent' id='rent' value='$billDate'><br><br>
+        rent:<input type='text' name='rent' id='rent' value='$rent'><br><br>
+        corridorLight:<input type='text' name='corridorLight' id='corridorLight' value='$corridorLight'><br><br>
+        corridorWater:<input type='text' name='corridorWater' id='corridorWater' value='$corridorWater'><br><br>
+        corridorCleaning:<input type='text' name='corridorCleaning' id='corridorCleaning' value='$corridorCleaning'><br><br>
+        fuel:<input type='text' name='fuel' id='fuel' value='$fuel'><br><br>
+        isOK:<input type='text' name='isOK' id='isOK' value='$isOK'><br><br>
+        <input type='submit' name='updateBill' id='updateBill'>
+    </form>";
+    }
+
+    if (isset($_POST['updateBill'])) {
+		$kaydet = $db->prepare("UPDATE bills set
+		    rent=:rent,
+		    corridorLight=:corridorLight,
+		    corridorWater=:corridorWater,
+		    corridorCleaning=:corridorCleaning,
+            fuel =:fuel,
+            isOK =:isOK
+
+		where billID={$billID}
+		");
+
+		$insert = $kaydet->execute(array(
+            'rent' => $_POST['rent'],
+            'corridorLight' => $_POST['corridorLight'],
+            'corridorWater' => $_POST['corridorWater'],
+            'corridorCleaning' => $_POST['corridorCleaning'],
+            'fuel' => $_POST['fuel'],
+            'isOK' => $_POST['isOK']
+        ));
+        
+        if ($insert) {
+			//echo "kayıt başarılı";
+			Header("Location:../admin/adminBills.php?update=ok&billID=$billID");
+			exit;
+		} else {
+			//echo "kayıt başarısız";
+			Header("Location:../admin/adminBills.php?update=no&billID=$billID");
+			exit;
+		}
+    }
+    ?>
+    <!-- END UPDATE BILL-->
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/Projects/project1_main/to-do.php b/Projects/project1_main/to-do.php
index 46b9d39..f19992a 100644
--- a/Projects/project1_main/to-do.php
+++ b/Projects/project1_main/to-do.php
@@ -63,8 +63,8 @@
                 $checkUserInDB->execute();
                 while ($pullinfo = $checkUserInDB->fetch(PDO::FETCH_ASSOC)) {
                 ?>
-                    <li class="mainl-list">Light: ₺<?php echo $pullinfo['corridorLight'] ?></li>
-                    <li class="mainl-list">Water: ₺<?php echo $pullinfo['corridorWater'] ?></li>
+                    <li class="mainl-list">Lights: ₺<?php echo $pullinfo['corridorLight'] ?></li>
+                    <li class="mainl-list">Pool Maintenance: ₺<?php echo $pullinfo['corridorWater'] ?></li>
                     <li class="mainl-list">Extra: ₺<?php echo $pullinfo['corridorExtra'] ?></li>
                 <?php
                 }
@@ -76,29 +76,50 @@
 
 
 
-
-
     <main class="section">
         <table id="payment">
+
             <tr>
-                <th class="text-table">RENT</th>
-                <th class="text-table">CORRIDOR ELECTRIC BILL</th>
-                <th class="text-table">CORRIDOR WATER BILL</th>
-                <th class="text-table">CORRIDOR CLEANING BILL</th>
-                <th class="text-table">FUEL BILL</th>
+                <th class="text-table">Bill ID</th>
+                <th class="text-table">Bill Date</th>
+                <th class="text-table">Rent</th>
+                <th class="text-table">Corridor Electric Bill</th>
+                <th class="text-table">Maintenance Bill</th>
+                <th class="text-table">Corridor Cleaning Bill</th>
+                <th class="text-table">Fuel Bill</th>
                 <th class="text-table">SUM</th>
             </tr>
-            <tr>
-                <td>10</td>
-                <td>20</td>
-                <td>100</td>
-                <td>50</td>
-                <td>50</td>
-                <td>230</td>
-            </tr>
+            <?php
+            $checkUserInDB = $db->prepare("SELECT * FROM bills WHERE isOK = 0");
+            $checkUserInDB->execute();
+            while ($pullinfo = $checkUserInDB->fetch(PDO::FETCH_ASSOC)) {
+            ?>
+                <?php
+                $sum = $pullinfo['rent'] + ($pullinfo['corridorLight'] / 10) + ($pullinfo['corridorWater'] / 10) + ($pullinfo['corridorCleaning'] / 10) + ($pullinfo['fuel'] / 10);
+                ?>
+                <tr>
+                    <td><?php echo $pullinfo['billID'] ?></td>
+                    <td><?php echo $pullinfo['billDate'] ?></td>
+                    <td><?php echo $pullinfo['rent'] ?></td>
+                    <td><?php echo $pullinfo['corridorLight'] ?></td>
+                    <td><?php echo $pullinfo['corridorWater'] ?></td>
+                    <td><?php echo $pullinfo['corridorCleaning'] ?></td>
+                    <td><?php echo $pullinfo['fuel'] ?></td>
+                    <td><?php echo $sum ?></td>
+                </tr>
+            <?php
+            }
+            ?>
         </table>
         <div class="btn-class">
-            <button type="button" class="btn" id="btn-todo">PAY THE RECENT BILL</button>
+            <?php
+            if (isset($sum)) {
+                echo "<button type='button' class='btn' id='btn-todo'>PAY THE RECENT BILL</button>";
+            } else {
+                echo "<p><b>no invoices to be paid</b></p>";
+            }
+            ?>
+
         </div>
 
     </main>