Index: src/main/resources/templates/currentOrder.html
===================================================================
--- src/main/resources/templates/currentOrder.html	(revision 7d439571c01d0fa2a353ddb15d617c2037647352)
+++ src/main/resources/templates/currentOrder.html	(revision 7d439571c01d0fa2a353ddb15d617c2037647352)
@@ -0,0 +1,23 @@
+<div>
+    <h1 th:if="${hasError}" th:text="${error}"></h1>
+    <div th:if="${!hasError}">
+        <h3 th:text="${order.getUser().getUsername()}"></h3>
+        <table>
+            <thead>
+            <tr>
+                <th>Name</th>
+                <th>Manufacturer</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr th:each="part : ${parts}">
+                <td th:text="${part.getName()}"></td>
+                <td th:text="${part.getManufacturer().getName()}"></td>
+            </tr>
+            </tbody>
+        </table>
+        <form th:action="@{'/part/delivery/'}">
+            <button class="btn btn-primary btn-block btn-lg" type="submit">Испрати нарачка</button>
+        </form>
+    </div>
+</div>
Index: src/main/resources/templates/fragments/header.html
===================================================================
--- src/main/resources/templates/fragments/header.html	(revision ab952abe294f21c5f425327ed185a0698e231ff4)
+++ src/main/resources/templates/fragments/header.html	(revision 7d439571c01d0fa2a353ddb15d617c2037647352)
@@ -1,3 +1,3 @@
-<header xmlns:sec="http://www.w3.org/1999/xhtml">
+<header xmlns:sec="http://www.w3.org/1999/xhtml" >
   <nav class="navbar navbar-expand-md navbar-dark bg-dark">
     <div class="container">
@@ -16,4 +16,9 @@
             <a class="nav-link active" href="/services">Сервиси</a>
           </li>
+          <th:block sec:authorize="hasAuthority('ROLE_CLIENT')">
+          <li class="nav-item m-auto">
+            <a class="nav-link active" href="/currentOrder">Моја нарачка</a>
+          </li>
+          </th:block>
         </ul>
 
Index: src/main/resources/templates/master-template.html
===================================================================
--- src/main/resources/templates/master-template.html	(revision ab952abe294f21c5f425327ed185a0698e231ff4)
+++ src/main/resources/templates/master-template.html	(revision 7d439571c01d0fa2a353ddb15d617c2037647352)
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
+>
 <head>
   <meta charset="UTF-8"/>
Index: src/main/resources/templates/partinfo.html
===================================================================
--- src/main/resources/templates/partinfo.html	(revision ab952abe294f21c5f425327ed185a0698e231ff4)
+++ src/main/resources/templates/partinfo.html	(revision 7d439571c01d0fa2a353ddb15d617c2037647352)
@@ -4,9 +4,9 @@
 <p th:text="${part.getManufacturer().getName()}"></p>
 <p><span th:text="${amount}"></span><span> денари</span></p>
-<form th:action="@{'/part/delivery/{id}' (id=${part.getId()}) }">
+<form method="post" th:action="@{'/part/addToOrder/{id}' (id=${part.getId()}) }">
     <label>
-        <input type="number" required min="1" placeholder="Количина"/>
+        <input type="number" name="quantity" required min="1" placeholder="Количина"/>
     </label>
-    <button type="submit">Купи</button>
+    <button class="btn btn-primary btn-block btn-lg" type="submit">Додај во нарачка</button>
 </form>
 </div>
Index: src/main/resources/templates/products.html
===================================================================
--- src/main/resources/templates/products.html	(revision ab952abe294f21c5f425327ed185a0698e231ff4)
+++ src/main/resources/templates/products.html	(revision 7d439571c01d0fa2a353ddb15d617c2037647352)
@@ -1,7 +1,10 @@
-<div>
+<div xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
+>
 <header>
+    <th:block sec:authorize="hasAuthority('ROLE_CLIENT')">
     <a th:href="${'/orders'}">Мои нарачки</a>
     <a th:href="${'/repairs'}">Мои поправки</a>
     <a th:href="${'/reviews'}">Мои критики</a>
+    </th:block>
 </header>
 <main>
Index: src/main/resources/templates/register.html
===================================================================
--- src/main/resources/templates/register.html	(revision ab952abe294f21c5f425327ed185a0698e231ff4)
+++ src/main/resources/templates/register.html	(revision 7d439571c01d0fa2a353ddb15d617c2037647352)
@@ -28,4 +28,13 @@
                 <input type="password" id="rpassword" name="rpassword" class="form-control" placeholder="*********" required=""/>
             </p>
+            <p>
+                <label for="role" class="sr-only">
+                    Одбери улога
+                </label><select class="form-control" id="role" name="role" required>
+                    <option value="client">CLIENT</option>
+                    <option value="warehouseman">WAREHOUSEMAN</option>
+                    <option value="deliveryman">DELIVERYMAN</option>
+                </select>
+            </p>
         </form>
         <button class="btn btn-lg btn-primary btn-block" type="submit">Регистрирај се</button>
Index: src/main/resources/templates/repairsForUser.html
===================================================================
--- src/main/resources/templates/repairsForUser.html	(revision ab952abe294f21c5f425327ed185a0698e231ff4)
+++ src/main/resources/templates/repairsForUser.html	(revision 7d439571c01d0fa2a353ddb15d617c2037647352)
@@ -6,5 +6,5 @@
     <th>Датум на нарачка</th>
     <th>Нарачан дел</th>
-    <th>Број на шасија</th>
+    <th>Број на нарачка</th>
     <th>Име на сервис</th>
   </tr>
@@ -14,5 +14,5 @@
     <td th:text="${repair.getOrderdate}"></td>
     <td th:text="${repair.getPartname()}"></td>
-    <td th:text="${repair.getVin()}"></td>
+    <td th:text="${repair.getOrderid()}"></td>
     <td th:text="${repair.getRsname()}"></td>
   </tr>
Index: src/main/resources/templates/selectWarehouse.html
===================================================================
--- src/main/resources/templates/selectWarehouse.html	(revision 7d439571c01d0fa2a353ddb15d617c2037647352)
+++ src/main/resources/templates/selectWarehouse.html	(revision 7d439571c01d0fa2a353ddb15d617c2037647352)
@@ -0,0 +1,11 @@
+<div>
+  <form class="form-signin mt-xl-5" method="post" action="/finishRegister">
+    <label for="location"></label><select class="form-control" id="location" required name="location">
+    <option  th:each="loc : ${locations}"
+             th:text="${loc.getLocation()}"
+             th:value="${loc.getLocation()}">
+    </option>
+  </select>
+    <button type="submit" class="btn btn-primary btn-lg btn-block">Заврши со регистрација</button>
+  </form>
+</div>
