Index: src/main/resources/templates/delivery.html
===================================================================
--- src/main/resources/templates/delivery.html	(revision 8d11f8c8bebea20f293d0a27e03c1e19c049ba9b)
+++ src/main/resources/templates/delivery.html	(revision 8d11f8c8bebea20f293d0a27e03c1e19c049ba9b)
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css"
+          integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+</head>
+<body>
+
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark" style="height: 55px">
+    <div class="collapse navbar-collapse" id="navbarSupportedContent">
+        <ul class="navbar-nav mr-auto">
+            <li class="nav-item"><a style="color: white; font-weight: bolder; text-decoration: none;"
+                                    th:href="@{/home}">Врати се назад</a></li>
+        </ul>
+    </div>
+</nav>
+<h1 class="display-4" style="margin-left: 1%; font-size: 33px;">Подготвени нарачки за достава</h1>
+<div style="width: 1500px; height: 1000px; margin-top: 20px; margin-left: 20px">
+    <div th:each="order : ${orders}"
+         style="width: 350px; padding-top: 10px; background-color: #f6f5f5; margin-bottom: 10px ; margin-right: 15px; height: 210px; display: inline-block; border: 1px solid black">
+        <p style="margin-left: 20px;" th:text="'Улица: ' + ${order.getConsumer().getLocation().getAddress()}"></p>
+        <p style="margin-left: 20px;" th:text="'Број: ' + ${order.getConsumer().getLocation().getNumber()}"></p>
+        <p style="margin-left: 20px;" th:if="${orderStat.index < costs.size()}"
+           th:text="'Цена: ' + ${costs.get(orderStat.index)}"></p>
+        <p style="margin-left: 20px;" th:text="'Продажно место: ' + ${order.getSalePlace().getSalePlaceName()}"></p>
+        <a style="margin-left: 15px; margin-top: -4px;" class="btn btn-success text-white "
+           th:href="@{'/takeOrder/{id}' (id = ${order.getOrderId()})}">Превземи нарачка</a>
+    </div>
+</div>
+</body>
+</html>
Index: src/main/resources/templates/home.html
===================================================================
--- src/main/resources/templates/home.html	(revision 8d11f8c8bebea20f293d0a27e03c1e19c049ba9b)
+++ src/main/resources/templates/home.html	(revision 8d11f8c8bebea20f293d0a27e03c1e19c049ba9b)
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css"
+      integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+<head>
+    <meta charset="UTF-8">
+    <title>Home</title>
+</head>
+<body>
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark" style="height: 55px">
+    <div class="collapse navbar-collapse" id="navbarSupportedContent">
+        <ul class="navbar-nav mr-auto" >
+            <!--<li class="nav-item"><a th:href="@{/home}"><img src="../images/logo.jpg" height="60px" width="121px"></a></li>-->
+            <li class="nav-item"><a style="color: white; font-weight: bolder; text-decoration: none; margin-right: 20px" th:href="@{/home}">FoodDelivery</a></li>
+            <li class="nav-item"><a style="color: white; font-weight: bolder; text-decoration: none; margin-right: 20px" th:href="@{/salePlaces}" sec:authorize="hasRole('ROLE_CONSUMER')">Продажни места</a></li>
+            <li class="nav-item"><a style="color: white; font-weight: bolder; text-decoration: none; margin-right: 20px" th:href="@{/checkOrderStatus}" sec:authorize="hasRole('ROLE_CONSUMER')">Статус нарачки</a></li>
+            <li class="nav-item"><a style="color: white; font-weight: bolder; text-decoration: none; margin-right: 20px" th:href="@{/salePlace/Orders}" sec:authorize="hasRole('ROLE_SALEPLACEEMPLOYEE')">Нарачки</a></li>
+            <li class="nav-item"><a style="color: white; font-weight: bolder; text-decoration: none; margin-right: 20px" th:href="@{/deliveryOrders}" sec:authorize="hasRole('ROLE_DELIVER')">Превземете нарачка</a></li>
+            <li class="nav-item"><a style="color: white; font-weight: bolder; text-decoration: none; margin-right: 20px" th:href="@{/showOrderDeliverer}" sec:authorize="hasRole('ROLE_DELIVER')">Ваши нарачки</a></li>
+
+            <li class="nav-item"><a style="color: white; font-weight: bolder; text-decoration: none; margin-right: 20px" th:href="@{/reports/bestPacketsEachSalePlace}" sec:authorize="hasRole('ROLE_ADMIN')">Најдобри пакети</a></li>
+            <li class="nav-item"><a style="color: white; font-weight: bolder; text-decoration: none; margin-right: 20px" th:href="@{/reports/mostLoyalCustomerForEachPlace}" sec:authorize="hasRole('ROLE_ADMIN')">Најверен потрошувач</a></li>
+            <li class="nav-item"><a style="color: white; font-weight: bolder; text-decoration: none; margin-right: 20px" th:href="@{/reports/franchizeEarningsBySalePlace}" sec:authorize="hasRole('ROLE_ADMIN')">Промет франшиза</a></li>
+            <li class="nav-item"><a style="color: white; font-weight: bolder; text-decoration: none; margin-right: 20px" th:href="@{/reports/DeliverNumberOfOrdersDeliveredBySalePlace}" sec:authorize="hasRole('ROLE_ADMIN')">Доставувач број достави</a></li>
+            <li class="nav-item"><a style="color: white; font-weight: bolder; text-decoration: none; margin-right: 20px" th:href="@{/reports/TotalCouponsByCustomer}" sec:authorize="hasRole('ROLE_ADMIN')">Купони</a></li>
+            <a href="/logout" style="color: #01ea01;position: absolute;margin-left: 90%;" sec:authorize="isAuthenticated()">Log out</a>
+            <a href="/login" style="color: #01ea01;position: absolute;margin-left: 90%;" sec:authorize="!isAuthenticated()">Log in</a>
+
+        </ul>
+    </div>
+
+</nav>
+
+
+
+    <img style = "height: 915px; width: 2000px;" class ='img-fluid' th:src = "@{/images/homepage.jpg}" />
+
+
+</body>
+</html>
Index: src/main/resources/templates/ordersfordeliver.html
===================================================================
--- src/main/resources/templates/ordersfordeliver.html	(revision 8d11f8c8bebea20f293d0a27e03c1e19c049ba9b)
+++ src/main/resources/templates/ordersfordeliver.html	(revision 8d11f8c8bebea20f293d0a27e03c1e19c049ba9b)
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css"
+          integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+</head>
+<body>
+
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark" style="height: 55px">
+    <div class="collapse navbar-collapse" id="navbarSupportedContent">
+        <ul class="navbar-nav mr-auto">
+            <li class="nav-item"><a style="color: white; font-weight: bolder; text-decoration: none;"
+                                    th:href="@{/home}">Врати се назад</a></li>
+        </ul>
+    </div>
+</nav>
+<h1 class="display-4" style="margin-left: 5%; font-size: 33px;">Ваши достави</h1>
+    <div th:each="order : ${orders}" style="width: 90%; margin-left: auto; margin-right: auto; margin-top:10px;" class="border">
+        <table class="table" >
+            <tr><th scope="col">Адреса</th><th scope="col">Број</th><th scope="col">Цена</th><th scope="col">Продажно место</th><th scope="col">Начин на плаќање</th><th scope="col"></th></tr>
+
+            <tr>
+                <td th:text="${order.getConsumer().getLocation().getAddress()}"></td>
+                <td th:text="${order.getConsumer().getLocation().getNumber()}"></td>
+                <td th:text="${costs.get(orderStat.index)}"></td>
+                <td th:text="${order.getSalePlace().getSalePlaceName()}"></td>
+                <td th:text="${order.getTypeOfPayment()}"></td>
+                <td><a class="btn btn-success text-white " th:href="@{'/orderPayment/{id}' (id = ${order.getOrderId()})}">Потврдете дека е платена</a></td>
+            </tr>
+        </table>
+    </div>
+
+
+</body>
+</html>
Index: src/main/resources/templates/reportsBestPacketsEachSalePlace.html
===================================================================
--- src/main/resources/templates/reportsBestPacketsEachSalePlace.html	(revision 8d11f8c8bebea20f293d0a27e03c1e19c049ba9b)
+++ src/main/resources/templates/reportsBestPacketsEachSalePlace.html	(revision 8d11f8c8bebea20f293d0a27e03c1e19c049ba9b)
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Najdobar Paket</title>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css"
+        integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+</head>
+<body>
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark" style="height: 55px">
+  <div class="collapse navbar-collapse" id="navbarSupportedContent">
+    <ul class="navbar-nav mr-auto">
+      <li class="nav-item"><a style="color: white; font-weight: bolder; text-decoration: none;"
+                              th:href="@{/home}">Врати се назад</a></li>
+    </ul>
+  </div>
+</nav>
+<h1 class="display-4">Најдобри пакети за продажно место</h1>
+<table class="table">
+
+  <thead class="thead-light">
+  <tr>
+    <th scope="col">Продажно место</th>
+    <th scope="col">Id Пакет</th>
+    <th scope="col">Содржи</th>
+    <th scope="col">Вкупно продадени</th>
+   <th scope="col">Вработен кој го додал</th></tr>
+  </thead>
+  <tbody>
+    <tr th:each ="res: ${report}" itemscope="row">
+      <td th:text = "${res.getNamePlace()}"></td>
+      <td th:text = "${res.getPacketId()}"> </td>
+      <td th:text = "${res.getContains()}"></td>
+      <td th:text = "${res.getTotalSold()}"></td>
+      <td th:text = "${res.getEmployeeThatAddedName()}"></td>
+
+    </tr>
+  </tbody>
+</table>
+</body>
+</html>
Index: src/main/resources/templates/reportsDeliverNumberOfOrdersDeliveredBySalePlace.html
===================================================================
--- src/main/resources/templates/reportsDeliverNumberOfOrdersDeliveredBySalePlace.html	(revision 8d11f8c8bebea20f293d0a27e03c1e19c049ba9b)
+++ src/main/resources/templates/reportsDeliverNumberOfOrdersDeliveredBySalePlace.html	(revision 8d11f8c8bebea20f293d0a27e03c1e19c049ba9b)
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Dostavuvach broj dostavi</title>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css"
+        integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+</head>
+<body>
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark" style="height: 55px">
+  <div class="collapse navbar-collapse" id="navbarSupportedContent">
+    <ul class="navbar-nav mr-auto">
+      <li class="nav-item"><a style="color: white; font-weight: bolder; text-decoration: none;"
+                              th:href="@{/home}">Врати се назад</a></li>
+    </ul>
+  </div>
+</nav>
+<h1 class="display-4">Број на достави на доставувач за секое продажно место</h1>
+<table class="table">
+
+  <thead class="thead-light">
+  <th>Доставувач</th>
+  <th>Продажно место</th>
+  <th>Број на нарачки</th>
+  <th>Сума</th>
+
+  </thead>
+  <tbody>
+  <tr th:each ="res: ${report}" itemscope="row">
+    <td th:text = "${res.getDeliverName()}"></td>
+    <td th:text = "${res.getSalePlaceName()}"> </td>
+    <td th:text = "${res.getNumberOfOrders()}"></td>
+    <td th:text = "${res.getTotalSum()}"></td>
+
+
+  </tr>
+  </tbody>
+</table>
+</body>
+</html>
Index: src/main/resources/templates/reportsFranchizeEarningsBySalePlace.html
===================================================================
--- src/main/resources/templates/reportsFranchizeEarningsBySalePlace.html	(revision 8d11f8c8bebea20f293d0a27e03c1e19c049ba9b)
+++ src/main/resources/templates/reportsFranchizeEarningsBySalePlace.html	(revision 8d11f8c8bebea20f293d0a27e03c1e19c049ba9b)
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Promet franshiza</title>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css"
+        integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+</head>
+<body>
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark" style="height: 55px">
+  <div class="collapse navbar-collapse" id="navbarSupportedContent">
+    <ul class="navbar-nav mr-auto">
+      <li class="nav-item"><a style="color: white; font-weight: bolder; text-decoration: none;"
+                              th:href="@{/home}">Врати се назад</a></li>
+    </ul>
+  </div>
+</nav>
+<h1 class="display-4">Промет франшиза за секое продажно место</h1>
+<table class="table">
+
+  <thead class="thead-light">
+  <tr>
+  <th>Име франшиза</th>
+  <th>Име продажно место</th>
+  <th>Промет</th>
+  </tr>
+  </thead>
+  <tbody>
+  <tr th:each ="res: ${report}" itemscope="row">
+    <td th:text = "${res.getFranchizeName()}"></td>
+    <td th:text = "${res.getSalePlaceName()}"> </td>
+    <td th:text = "${res.getTotalSold()}"></td>
+
+
+  </tr>
+  </tbody>
+</table>
+</body>
+</html>
Index: src/main/resources/templates/reportsMostLoyalCustomerForEachPlace.html
===================================================================
--- src/main/resources/templates/reportsMostLoyalCustomerForEachPlace.html	(revision 8d11f8c8bebea20f293d0a27e03c1e19c049ba9b)
+++ src/main/resources/templates/reportsMostLoyalCustomerForEachPlace.html	(revision 8d11f8c8bebea20f293d0a27e03c1e19c049ba9b)
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Najveren potroshuvach</title>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css"
+          integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+</head>
+<body>
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark" style="height: 55px">
+    <div class="collapse navbar-collapse" id="navbarSupportedContent">
+        <ul class="navbar-nav mr-auto">
+            <li class="nav-item"><a style="color: white; font-weight: bolder; text-decoration: none;"
+                                    th:href="@{/home}">Врати се назад</a></li>
+        </ul>
+    </div>
+</nav>
+<h1 class="display-4">Најверен потрошувач за секое продажно место</h1>
+<table class="table">
+
+    <thead class="thead-light">
+    <tr>
+    <th>Потрошувач</th>
+    <th>Продажно место</th>
+    <th>Адреса на потрошувач</th>
+    <th>Број на адреса</th>
+    <th>Број на нарачки</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr th:each ="res: ${report}" itemscope="row">
+        <td th:text = "${res.getCustomerName()}"></td>
+        <td th:text = "${res.getSalePlaceName()}"> </td>
+        <td th:text = "${res.getCustomerAdress()}"></td>
+        <td th:text = "${res.getCustomerAdressNumber()}"></td>
+        <td th:text = "${res.getOrderNumber()}"></td>
+
+    </tr>
+    </tbody>
+</table>
+</body>
+</html>
Index: src/main/resources/templates/reportsTotalCouponsByCustomer.html
===================================================================
--- src/main/resources/templates/reportsTotalCouponsByCustomer.html	(revision 8d11f8c8bebea20f293d0a27e03c1e19c049ba9b)
+++ src/main/resources/templates/reportsTotalCouponsByCustomer.html	(revision 8d11f8c8bebea20f293d0a27e03c1e19c049ba9b)
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Купони</title>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css"
+        integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+</head>
+<body>
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark" style="height: 55px">
+  <div class="collapse navbar-collapse" id="navbarSupportedContent">
+    <ul class="navbar-nav mr-auto">
+      <li class="nav-item"><a style="color: white; font-weight: bolder; text-decoration: none;"
+                              th:href="@{/home}">Врати се назад</a></li>
+    </ul>
+  </div>
+</nav>
+<h1 class="display-4">Купони на купувачи</h1>
+<table class="table">
+
+  <thead class="thead-light">
+  <th>Id на корисник</th>
+  <th>Username</th>
+  <th>Сума</th>
+
+
+  </thead>
+  <tbody>
+  <tr th:each ="res: ${report}" itemscope="row">
+    <td th:text = "${res.getUserId()}"></td>
+    <td th:text = "${res.getUserName()}"> </td>
+    <td th:text = "${res.getTotalSum()}"></td>
+  </tr>
+  </tbody>
+</table>
+</body>
+</html>
Index: src/main/resources/templates/saleplacefooditems.html
===================================================================
--- src/main/resources/templates/saleplacefooditems.html	(revision 8d11f8c8bebea20f293d0a27e03c1e19c049ba9b)
+++ src/main/resources/templates/saleplacefooditems.html	(revision 8d11f8c8bebea20f293d0a27e03c1e19c049ba9b)
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+
+    <meta charset="UTF-8">
+    <title>Title</title>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css"
+          integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+</head>
+
+<body>
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark" style="height: 55px">
+    <div class="collapse navbar-collapse" id="navbarSupportedContent">
+        <ul class="navbar-nav mr-auto">
+            <li class="nav-item"><a style="color: white; font-weight: bolder; text-decoration: none;"
+                                    th:href="@{/home}">Врати се назад</a></li>
+        </ul>
+    </div>
+</nav>
+
+<div th:if="${error != null}">
+    <p th:text="${error}"></p>
+</div>
+
+<table class="table">
+    <thead class="thead-light">
+    <tr>
+        <th scope="col">Продукт</th>
+        <th scope="col">Цена</th>
+        <th scope="col">Количина</th>
+    </tr>
+    </thead>
+
+    <tbody>
+    <form th:action="@{'/salePlace/{id}'(id = ${salePlaceId})}" th:method="POST">
+        <tr th:each="foodItem : ${foodItems}">
+            <td>
+                <input hidden th:text="${foodItem.getFoodItemName()}" th:value="${foodItem.getFoodItemId()}"
+                       name="foodIds"/>
+            </td>
+            <td>
+                <input hidden th:if="${foodItemStat.index < prices.size()}"
+                       th:value="${prices.get(foodItemStat.index).getCost()}"
+                       th:text="${prices.get(foodItemStat.index).getCost()}"
+                       name="foodPrice" class="cena">
+            </td>
+            <td>
+                <input type="number" name="quantity" class="kolichina">
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <select name="typeOfPayment" id="typeOfPayment">
+                    <option value="cash">Во готово</option>
+                    <option value="card">Картичка</option>
+                </select>
+            </td>
+            <td>Вкупно: <span id="totalPrice">0</span></td>
+            <td>
+                <input type="submit" value="Направете нарачка">
+            </td>
+        </tr>
+    </form>
+    </tbody>
+</table>
+
+</body>
+<script>
+    const totalPriceSpan = document.querySelector('#totalPrice');
+    const kolichini = document.getElementsByClassName("kolichina");
+    for(let j = 0; j<kolichini.length;j++){
+        kolichini[j].addEventListener('change',handleTotalPrice);
+    }
+    function handleTotalPrice(event){
+        const ceni = document.getElementsByClassName("cena");
+        let total = 0;
+        for(let i = 0; i<kolichini.length;i++){
+            total+=ceni[i].value * kolichini[i].value;
+        }
+        totalPriceSpan.innerHTML = total.toString();
+    }
+</script>
+</html>
Index: src/main/resources/templates/saleplaceorders.html
===================================================================
--- src/main/resources/templates/saleplaceorders.html	(revision 8d11f8c8bebea20f293d0a27e03c1e19c049ba9b)
+++ src/main/resources/templates/saleplaceorders.html	(revision 8d11f8c8bebea20f293d0a27e03c1e19c049ba9b)
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css"
+          integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+</head>
+<body>
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark" style="height: 55px">
+    <div class="collapse navbar-collapse" id="navbarSupportedContent">
+        <ul class="navbar-nav mr-auto">
+            <li class="nav-item"><a style="color: white; font-weight: bolder; text-decoration: none;"
+                                    th:href="@{/home}">Врати се назад</a></li>
+        </ul>
+    </div>
+</nav>
+<h1 class="display-4" style="margin-left: 5%; font-size: 33px;">Нарачки</h1>
+
+
+<div th:each="order : ${orders}" style="width: 90%; margin-left: auto; margin-right: auto; margin-top:10px;" class="border">
+    <table class="table container-fluid" >
+        <tr><th scope="col" style="width: 25%">Број</th><th scope="col"style="width: 25%">Статус</th><th scope="col" style="width: 25%">Производ</th><th scope="col"style="width: 25%"></th></tr>
+
+        <tr>
+            <td th:text="${order.getOrderId()}"></td>
+            <td th:text="${order.getOrderStatus()}"></td>
+            <td>
+                <div th:each="food : ${orderHasFoods.get(order.getOrderId())}" >
+                    <span th:text="${food.getFoodItemName()}"></span>
+                    <th:block th:each = "q1: ${quantity}">
+                        <th:block th:each = "q2 : ${q1}">
+                            <span th:if = "${q2.getOrderHasFoodKey().orderId == order.getOrderId() && food.getFoodItemId() == q2.getOrderHasFoodKey().foodItemId }" th:text = "${q2.quantity}">
+
+                            </span>
+                        </th:block>
+                    </th:block>
+                </div>
+
+            </td>
+
+            <td><a class="btn btn-success text-white " th:href="@{'/changeOrderStatus/{id}' (id = ${order.getOrderId()})}">Промени го статусот во спремна</a></td>
+        </tr>
+    </table>
+</div>
+
+</body>
+</html>
Index: src/main/resources/templates/saleplaces.html
===================================================================
--- src/main/resources/templates/saleplaces.html	(revision 8d11f8c8bebea20f293d0a27e03c1e19c049ba9b)
+++ src/main/resources/templates/saleplaces.html	(revision 8d11f8c8bebea20f293d0a27e03c1e19c049ba9b)
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css"
+          integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+</head>
+<body>
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark" style="height: 55px">
+    <div class="collapse navbar-collapse" id="navbarSupportedContent">
+        <ul class="navbar-nav mr-auto">
+            <li class="nav-item"><a style="color: white; font-weight: bolder; text-decoration: none;"
+                                    th:href="@{/home}">Врати се назад</a></li>
+        </ul>
+    </div>
+</nav>
+
+
+<h1 class="display-4" style="margin-left:15px; font-size: 33px;">Продажни места</h1>
+<br/>
+<table class="table">
+    <tbody>
+    <tr th:each="salePlace : ${salePlaces}">
+        <td>
+            <a th:href="@{'/salePlace/{id}'(id = ${salePlace.getSalePalceId()})}"
+               th:text="${salePlace.getSalePlaceName()}"
+               style="font-weight: bolder; text-decoration: none; margin-left: 10px; text-transform: uppercase; color:black;"></a>
+        </td>
+    </tr>
+    </tbody>
+</table>
+
+</body>
+</html>
Index: src/main/resources/templates/showOrderStatusCustomer.html
===================================================================
--- src/main/resources/templates/showOrderStatusCustomer.html	(revision 8d11f8c8bebea20f293d0a27e03c1e19c049ba9b)
+++ src/main/resources/templates/showOrderStatusCustomer.html	(revision 8d11f8c8bebea20f293d0a27e03c1e19c049ba9b)
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css"
+          integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+</head>
+<body>
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark" style="height: 55px">
+    <div class="collapse navbar-collapse" id="navbarSupportedContent">
+        <ul class="navbar-nav mr-auto">
+            <li class="nav-item"><a style="color: white; font-weight: bolder; text-decoration: none;"
+                                    th:href="@{/home}">Врати се назад</a></li>
+        </ul>
+    </div>
+</nav>
+<h1 class="display-4" style="margin-left:15px; font-size: 33px;">Историјат на вашите нарачки</h1>
+<table class="table">
+    <thead class="thead-light">
+    <tr>
+        <th scope="col">БР.</th>
+        <th scope="col">СТАТУС</th>
+        <th scope="col">СОДРЖИ</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr th:each="order: ${orders}" itemscope="row">
+        <td
+            th:text="${order.getOrderId()}"></td>
+        <td
+            th:text="${order.getOrderStatus()}"></td>
+        <td>
+            <div th:each = "foodObj : ${foodNames.get(order.getOrderId())}">
+                <span th:text = "${foodObj.getFoodName()}"></span>
+                <span th:text = "${foodObj.getFoodQuantity()}"></span>
+            </div>
+        </td>
+    </tr>
+    </tbody>
+</table>
+</body>
+</html>
