Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/Enumerations/OrderStatus.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Enumerations/OrderStatus.java	(revision 497d1291ce2544d5bd75549d5adaa45c875c717c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/Enumerations/OrderStatus.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -3,4 +3,5 @@
 public enum OrderStatus {
     CREATED("Created"),
+    SENT("Sent"),
     APPROVED("Approved"),
     CANCELED("Canceled"),
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/OrderedArticles.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/OrderedArticles.java	(revision 497d1291ce2544d5bd75549d5adaa45c875c717c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/OrderedArticles.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -18,6 +18,5 @@
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Integer oarticleid;
-    @Min(0)
-    private int price;
+    private Integer price;
     @Column(nullable = false)
     @NotNull(message = "Ordered Article must have quantity")
@@ -43,4 +42,5 @@
         this.location = location;
         this.article = article;
+        this.price= null;
     }
 }
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/ArticlesAndCategoriesReport.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/ArticlesAndCategoriesReport.java	(revision 497d1291ce2544d5bd75549d5adaa45c875c717c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/ArticlesAndCategoriesReport.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -1,4 +1,5 @@
 package com.bazi.fullystocked.Models.SqlViews;
 
+import lombok.Getter;
 import org.hibernate.annotations.Immutable;
 
@@ -10,4 +11,5 @@
 @Entity
 @Immutable
+@Getter
 @Table(name = "articles_and_cats_report")
 public class ArticlesAndCategoriesReport {
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/ArticlesAtLocationReport.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/ArticlesAtLocationReport.java	(revision 497d1291ce2544d5bd75549d5adaa45c875c717c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/ArticlesAtLocationReport.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -1,4 +1,5 @@
 package com.bazi.fullystocked.Models.SqlViews;
 
+import lombok.Getter;
 import org.hibernate.annotations.Immutable;
 
@@ -9,4 +10,5 @@
 @Entity
 @Immutable
+@Getter
 @Table(name = "articles_at_location")
 public class ArticlesAtLocationReport {
@@ -14,4 +16,5 @@
     private Integer sarticleid;
     private Integer locationid;
+    private String locationname;
     private Integer articleid;
     private String description;
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/InvoicedArticlesReport.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/InvoicedArticlesReport.java	(revision 497d1291ce2544d5bd75549d5adaa45c875c717c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/InvoicedArticlesReport.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -2,4 +2,5 @@
 
 import com.bazi.fullystocked.Models.Enumerations.ArticleStatus;
+import lombok.Getter;
 import org.hibernate.annotations.Immutable;
 
@@ -8,4 +9,5 @@
 @Entity
 @Immutable
+@Getter
 @Table(name = "invoiced_articles_report")
 public class InvoicedArticlesReport {
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/OrderedArticlesReport.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/OrderedArticlesReport.java	(revision 497d1291ce2544d5bd75549d5adaa45c875c717c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/OrderedArticlesReport.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -2,4 +2,6 @@
 
 import com.bazi.fullystocked.Models.Enumerations.ArticleStatus;
+import lombok.Getter;
+import lombok.ToString;
 import org.hibernate.annotations.Immutable;
 
@@ -8,4 +10,6 @@
 @Entity
 @Immutable
+@Getter
+@ToString
 @Table(name = "ordered_articles_report")
 public class OrderedArticlesReport {
@@ -19,5 +23,5 @@
     private int quantity;
     private Integer locationid;
-    private int price;
+    private Integer price;
     @Enumerated(EnumType.STRING)
     private ArticleStatus articlestatus;
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/OrdersReport.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/OrdersReport.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/OrdersReport.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -0,0 +1,29 @@
+package com.bazi.fullystocked.Models.SqlViews;
+
+import com.bazi.fullystocked.Models.Enumerations.OrderPriority;
+import com.bazi.fullystocked.Models.Enumerations.OrderStatus;
+import lombok.Getter;
+import org.apache.tomcat.jni.Local;
+import org.hibernate.annotations.Immutable;
+
+import javax.persistence.*;
+import java.time.LocalDateTime;
+
+@Immutable
+@Entity
+@Getter
+@Table(name="orders_report")
+public class OrdersReport {
+    @Id
+    Integer orderid;
+    String supplierremark;
+    String managerremark;
+    @Enumerated(EnumType.STRING)
+    OrderStatus status;
+    LocalDateTime datecreated;
+    @Enumerated(EnumType.STRING)
+    OrderPriority priority;
+    Integer supplieruserid;
+    String supplierinfo;
+    Integer manageruserid;
+}
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/SupplierSuppliesArticleReport.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/SupplierSuppliesArticleReport.java	(revision 497d1291ce2544d5bd75549d5adaa45c875c717c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/SupplierSuppliesArticleReport.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -1,4 +1,5 @@
 package com.bazi.fullystocked.Models.SqlViews;
 
+import lombok.Getter;
 import org.hibernate.annotations.Immutable;
 
@@ -9,4 +10,5 @@
 @Entity
 @Immutable
+@Getter
 @Table(name = "supplier_supplies_article")
 public class SupplierSuppliesArticleReport {
@@ -14,3 +16,4 @@
     private SupplierSuppliesArticleReportId id;
     private String articlename;
+    private String imageurl;
 }
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/SuppliersReport.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/SuppliersReport.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/SuppliersReport.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -0,0 +1,25 @@
+package com.bazi.fullystocked.Models.SqlViews;
+
+import lombok.Getter;
+import org.hibernate.annotations.Immutable;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Immutable
+@Getter
+@Table(name = "suppliers_report")
+public class SuppliersReport {
+    @Id
+    Integer userid;
+    String username;
+    String firstname;
+    String lastname;
+    String street;
+    int streetnumber;
+    String city;
+    String phone;
+    String supplierinfo;
+}
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/ArticlesAtLocationRepository.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/ArticlesAtLocationRepository.java	(revision 497d1291ce2544d5bd75549d5adaa45c875c717c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/ArticlesAtLocationRepository.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -9,3 +9,4 @@
 public interface ArticlesAtLocationRepository extends JpaRepository<ArticlesAtLocationReport, Integer> {
     List<ArticlesAtLocationReport> findAllByLocationid(Integer id);
+    List<ArticlesAtLocationReport> findAllByArticleid(Integer id);
 }
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/OrderedArticlesRepository.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/OrderedArticlesRepository.java	(revision 497d1291ce2544d5bd75549d5adaa45c875c717c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/OrderedArticlesRepository.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -17,4 +17,5 @@
     List<OrderedArticles> findAllByOrder(Orders order);
     Optional<OrderedArticles> findByOrderAndArticle(Orders order, Articles article);
+    Optional<OrderedArticles> findByOrderAndArticleAndLocation(Orders order, Articles article, Locations location);
     List<OrderedArticles> findAllByArticlestatus(ArticleStatus status);
     List<OrderedArticles> findAllByLocationAndArticlestatus(Locations location, ArticleStatus status);
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/OrdersReportRepository.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/OrdersReportRepository.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/OrdersReportRepository.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -0,0 +1,10 @@
+package com.bazi.fullystocked.Repositories;
+
+import com.bazi.fullystocked.Models.SqlViews.OrdersReport;
+import org.springframework.data.jpa.repository.JpaRepository;
+import java.util.*;
+
+public interface OrdersReportRepository extends JpaRepository<OrdersReport, Integer> {
+    List<OrdersReport> findAllBySupplieruserid(Integer id);
+    List<OrdersReport> findAllByManageruserid(Integer id);
+}
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/SuppliersReportRepository.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/SuppliersReportRepository.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/SuppliersReportRepository.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -0,0 +1,10 @@
+package com.bazi.fullystocked.Repositories;
+
+import com.bazi.fullystocked.Models.SqlViews.SuppliersReport;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SuppliersReportRepository extends JpaRepository<SuppliersReport, Integer> {
+
+}
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Services/ArticlesService.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Services/ArticlesService.java	(revision 497d1291ce2544d5bd75549d5adaa45c875c717c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Services/ArticlesService.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -2,4 +2,8 @@
 
 import com.bazi.fullystocked.Models.Articles;
+import com.bazi.fullystocked.Models.Categories;
+import com.bazi.fullystocked.Models.SqlViews.ArticlesAtLocationReport;
+import com.bazi.fullystocked.Models.SqlViews.SupplierSuppliesArticleReport;
+
 import java.util.*;
 
@@ -8,3 +12,7 @@
     Optional<Articles> create(String description, String articlename, String imageurl, int maxquantityperlocation);
     Optional<Articles> addToCategory(Integer articleId, Integer categoryId);
+    List<Categories> findAllCategoriesByArticle(Integer articleId);
+    List<SupplierSuppliesArticleReport> findAllBySupplier(Integer id);
+    List<ArticlesAtLocationReport> findAvailabilityAtAllLocations(Integer id);
+
 }
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/ArticlesServiceImpl.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/ArticlesServiceImpl.java	(revision 497d1291ce2544d5bd75549d5adaa45c875c717c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/ArticlesServiceImpl.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -4,10 +4,15 @@
 import com.bazi.fullystocked.Models.Categories;
 import com.bazi.fullystocked.Models.Exceptions.InvalidArgumentsException;
+import com.bazi.fullystocked.Models.SqlViews.ArticlesAtLocationReport;
+import com.bazi.fullystocked.Models.SqlViews.SupplierSuppliesArticleReport;
+import com.bazi.fullystocked.Repositories.ArticlesAtLocationRepository;
 import com.bazi.fullystocked.Repositories.ArticlesRepository;
 import com.bazi.fullystocked.Repositories.CategoriesRepository;
+import com.bazi.fullystocked.Repositories.SupplierSuppliesArticleRepository;
 import com.bazi.fullystocked.Services.ArticlesService;
 import org.springframework.stereotype.Service;
 
 import javax.transaction.Transactional;
+import java.util.List;
 import java.util.Optional;
 
@@ -16,8 +21,12 @@
     private final ArticlesRepository articlesRepository;
     private final CategoriesRepository categoriesRepository;
+    private final SupplierSuppliesArticleRepository supplierSuppliesArticleRepository;
+    private final ArticlesAtLocationRepository articlesAtLocationRepository;
 
-    public ArticlesServiceImpl(ArticlesRepository articlesRepository, CategoriesRepository categoriesRepository) {
+    public ArticlesServiceImpl(ArticlesRepository articlesRepository, CategoriesRepository categoriesRepository, SupplierSuppliesArticleRepository supplierSuppliesArticleRepository, ArticlesAtLocationRepository articlesAtLocationRepository) {
         this.articlesRepository = articlesRepository;
         this.categoriesRepository = categoriesRepository;
+        this.supplierSuppliesArticleRepository = supplierSuppliesArticleRepository;
+        this.articlesAtLocationRepository = articlesAtLocationRepository;
     }
 
@@ -49,3 +58,19 @@
         return Optional.of(articles);
     }
+
+    @Override
+    public List<Categories> findAllCategoriesByArticle(Integer articleId) {
+        Articles articles=articlesRepository.findById(articleId).orElseThrow(InvalidArgumentsException::new);
+        return articles.getCategoryList();
+    }
+
+    @Override
+    public List<SupplierSuppliesArticleReport> findAllBySupplier(Integer supplierId) {
+        return supplierSuppliesArticleRepository.findAllById_Userid(supplierId);
+    }
+
+    @Override
+    public List<ArticlesAtLocationReport> findAvailabilityAtAllLocations(Integer id) {
+        return articlesAtLocationRepository.findAllByArticleid(id);
+    }
 }
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/LocationServiceImpl.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/LocationServiceImpl.java	(revision 497d1291ce2544d5bd75549d5adaa45c875c717c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/LocationServiceImpl.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -1,6 +1,8 @@
 package com.bazi.fullystocked.Services.Implementations;
 
+import com.bazi.fullystocked.Models.Locations;
 import com.bazi.fullystocked.Models.SqlViews.ArticlesAtLocationReport;
 import com.bazi.fullystocked.Repositories.ArticlesAtLocationRepository;
+import com.bazi.fullystocked.Repositories.LocationsRepository;
 import com.bazi.fullystocked.Services.LocationsService;
 import org.springframework.stereotype.Service;
@@ -11,7 +13,9 @@
 public class LocationServiceImpl implements LocationsService {
     private final ArticlesAtLocationRepository articlesAtLocationRepository;
+    private final LocationsRepository locationsRepository;
 
-    public LocationServiceImpl(ArticlesAtLocationRepository articlesAtLocationRepository) {
+    public LocationServiceImpl(ArticlesAtLocationRepository articlesAtLocationRepository, LocationsRepository locationsRepository) {
         this.articlesAtLocationRepository = articlesAtLocationRepository;
+        this.locationsRepository = locationsRepository;
     }
 
@@ -20,3 +24,8 @@
         return articlesAtLocationRepository.findAllByLocationid(locationid);
     }
+
+    @Override
+    public List<Locations> findAll() {
+        return locationsRepository.findAll();
+    }
 }
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/OrdersServiceImpl.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/OrdersServiceImpl.java	(revision 497d1291ce2544d5bd75549d5adaa45c875c717c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/OrdersServiceImpl.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -8,4 +8,5 @@
 import com.bazi.fullystocked.Models.Exceptions.ArticleMaxQuantityException;
 import com.bazi.fullystocked.Models.Exceptions.InvalidArgumentsException;
+import com.bazi.fullystocked.Models.SqlViews.OrdersReport;
 import com.bazi.fullystocked.Repositories.*;
 import com.bazi.fullystocked.Services.OrdersService;
@@ -13,4 +14,5 @@
 
 import javax.transaction.Transactional;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
@@ -25,6 +27,7 @@
     private final LocationsRepository locationsRepository;
     private final OrderedArticlesRepository orderedArticlesRepository;
+    private final OrdersReportRepository ordersReportRepository;
 
-    public OrdersServiceImpl(OrdersRepository ordersRepository, ManagersRepository managersRepository, SuppliersRepository suppliersRepository, ArticlesRepository articlesRepository, LocationsRepository locationsRepository, OrderedArticlesRepository orderedArticlesRepository) {
+    public OrdersServiceImpl(OrdersRepository ordersRepository, ManagersRepository managersRepository, SuppliersRepository suppliersRepository, ArticlesRepository articlesRepository, LocationsRepository locationsRepository, OrderedArticlesRepository orderedArticlesRepository, OrdersReportRepository ordersReportRepository) {
         this.ordersRepository = ordersRepository;
         this.managersRepository = managersRepository;
@@ -33,4 +36,5 @@
         this.locationsRepository = locationsRepository;
         this.orderedArticlesRepository = orderedArticlesRepository;
+        this.ordersReportRepository = ordersReportRepository;
     }
 
@@ -49,4 +53,9 @@
 
     @Override
+    public List<OrdersReport> findAllByManagerReport(Integer managerId) {
+        return ordersReportRepository.findAllByManageruserid(managerId);
+    }
+
+    @Override
     public List<Orders> findAllByManagerAndStatus(Integer managerId, OrderStatus status) {
         Managers manager=managersRepository.findById(managerId).orElseThrow(InvalidArgumentsException::new);
@@ -60,5 +69,9 @@
         Articles article=articlesRepository.findById(articleId).orElseThrow(InvalidArgumentsException::new);
         Orders order=ordersRepository.findById(orderId).orElseThrow(InvalidArgumentsException::new);
-        if(orderedArticlesRepository.findByOrderAndArticle(order, article).isPresent())
+        if(!order.getStatus().equals(OrderStatus.CREATED))
+        {
+            throw new InvalidArgumentsException();
+        }
+        if(orderedArticlesRepository.findByOrderAndArticleAndLocation(order, article, location).isPresent())
         {
             throw new ArticleAlreadyInOrderException();
@@ -102,4 +115,9 @@
 
     @Override
+    public List<OrdersReport> findAllBySupplierReport(Integer supplierId) {
+        return ordersReportRepository.findAllBySupplieruserid(supplierId);
+    }
+
+    @Override
     public List<Orders> findAllBySupplierAndStatus(Integer supplierId, OrderStatus status) {
         Suppliers supplier=suppliersRepository.findById(supplierId).orElseThrow(InvalidArgumentsException::new);
@@ -113,4 +131,9 @@
 
     @Override
+    public Optional<OrdersReport> findByIdReport(Integer orderId) {
+        return ordersReportRepository.findById(orderId);
+    }
+
+    @Override
     public Optional<Orders> updateStatus(Integer orderId, OrderStatus status) {
         Orders order=ordersRepository.findById(orderId).orElseThrow(InvalidArgumentsException::new);
@@ -119,9 +142,13 @@
             throw new InvalidArgumentsException();
         }
-        if(status.equals(OrderStatus.APPROVED) && !order.getStatus().equals(OrderStatus.CREATED))
+        if(status.equals(OrderStatus.SENT) && !order.getStatus().equals(OrderStatus.CREATED))
         {
             throw new InvalidArgumentsException();
         }
-        if(status.equals(OrderStatus.REJECTED) && !order.getStatus().equals(OrderStatus.CREATED))
+        if(status.equals(OrderStatus.APPROVED) && !order.getStatus().equals(OrderStatus.SENT))
+        {
+            throw new InvalidArgumentsException();
+        }
+        if(status.equals(OrderStatus.REJECTED) && !(order.getStatus().equals(OrderStatus.CREATED) || order.getStatus().equals(OrderStatus.SENT)))
         {
             throw new InvalidArgumentsException();
@@ -157,4 +184,8 @@
             }
         }
+        if(status.equals(OrderStatus.APPROVED))
+        {
+            order.setDateapproved(LocalDateTime.now());
+        }
         order.setStatus(status);
         return Optional.of(ordersRepository.save(order));
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/StoredArticlesServiceImpl.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/StoredArticlesServiceImpl.java	(revision 497d1291ce2544d5bd75549d5adaa45c875c717c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/StoredArticlesServiceImpl.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -1,4 +1,5 @@
 package com.bazi.fullystocked.Services.Implementations;
 
+import com.bazi.fullystocked.Models.Categories;
 import com.bazi.fullystocked.Models.Enumerations.ArticleStatus;
 import com.bazi.fullystocked.Models.Enumerations.OrderStatus;
@@ -22,5 +23,4 @@
 @Service
 public class StoredArticlesServiceImpl implements StoredArticlesService {
-    private final SupplierSuppliesArticleRepository supplierSuppliesArticleRepository;
     private final OrderedArticlesRepository orderedArticlesRepository;
     private final StoredArticlesRepository storedArticlesRepository;
@@ -28,6 +28,5 @@
     private final ArticlesReportRepository articlesReportRepository;
 
-    public StoredArticlesServiceImpl(SupplierSuppliesArticleRepository supplierSuppliesArticleRepository, OrderedArticlesRepository orderedArticlesRepository, StoredArticlesRepository storedArticlesRepository, OrdersService ordersService, ArticlesReportRepository articlesReportRepository) {
-        this.supplierSuppliesArticleRepository = supplierSuppliesArticleRepository;
+    public StoredArticlesServiceImpl(OrderedArticlesRepository orderedArticlesRepository, StoredArticlesRepository storedArticlesRepository, OrdersService ordersService, ArticlesReportRepository articlesReportRepository) {
         this.orderedArticlesRepository = orderedArticlesRepository;
         this.storedArticlesRepository = storedArticlesRepository;
@@ -36,8 +35,4 @@
     }
 
-    @Override
-    public List<SupplierSuppliesArticleReport> findAllBySupplier(Integer supplierId) {
-        return supplierSuppliesArticleRepository.findAllById_Userid(supplierId);
-    }
 
     @Override
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/SuppliersServiceImpl.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/SuppliersServiceImpl.java	(revision 497d1291ce2544d5bd75549d5adaa45c875c717c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/SuppliersServiceImpl.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -1,5 +1,7 @@
 package com.bazi.fullystocked.Services.Implementations;
 
+import com.bazi.fullystocked.Models.SqlViews.SuppliersReport;
 import com.bazi.fullystocked.Models.Suppliers;
+import com.bazi.fullystocked.Repositories.SuppliersReportRepository;
 import com.bazi.fullystocked.Repositories.SuppliersRepository;
 import com.bazi.fullystocked.Services.SuppliersService;
@@ -7,11 +9,14 @@
 
 import java.util.List;
+import java.util.Optional;
 
 @Service
 public class SuppliersServiceImpl implements SuppliersService {
     private final SuppliersRepository suppliersRepository;
+    private final SuppliersReportRepository suppliersReportRepository;
 
-    public SuppliersServiceImpl(SuppliersRepository suppliersRepository) {
+    public SuppliersServiceImpl(SuppliersRepository suppliersRepository, SuppliersReportRepository suppliersReportRepository) {
         this.suppliersRepository = suppliersRepository;
+        this.suppliersReportRepository = suppliersReportRepository;
     }
 
@@ -20,3 +25,18 @@
         return suppliersRepository.findAll();
     }
+
+    @Override
+    public Optional<SuppliersReport> findByIdReport(Integer id) {
+        return suppliersReportRepository.findById(id);
+    }
+
+    @Override
+    public List<SuppliersReport> findAllSuppliersReport() {
+        return suppliersReportRepository.findAll();
+    }
+
+    @Override
+    public Optional<Suppliers> findById(Integer id) {
+        return suppliersRepository.findById(id);
+    }
 }
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Services/LocationsService.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Services/LocationsService.java	(revision 497d1291ce2544d5bd75549d5adaa45c875c717c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Services/LocationsService.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -2,4 +2,5 @@
 
 
+import com.bazi.fullystocked.Models.Locations;
 import com.bazi.fullystocked.Models.SqlViews.ArticlesAtLocationReport;
 
@@ -8,3 +9,4 @@
 public interface LocationsService {
     List<ArticlesAtLocationReport> findAllArticlesAtLocation(Integer locationid);
+    List<Locations> findAll();
 }
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Services/OrdersService.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Services/OrdersService.java	(revision 497d1291ce2544d5bd75549d5adaa45c875c717c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Services/OrdersService.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -4,4 +4,7 @@
 import com.bazi.fullystocked.Models.Enumerations.OrderStatus;
 import com.bazi.fullystocked.Models.Orders;
+import com.bazi.fullystocked.Models.SqlViews.OrdersReport;
+import com.bazi.fullystocked.Repositories.OrdersReportRepository;
+
 import java.util.*;
 
@@ -9,4 +12,5 @@
     Optional<Orders> create(OrderPriority priority, Integer managerId, Integer supplierId);
     List<Orders> findAllByManager(Integer managerId);
+    List<OrdersReport> findAllByManagerReport(Integer managerId);
     List<Orders> findAllByManagerAndStatus(Integer managerId, OrderStatus status);
     Optional<Orders> addArticleToOrder(int quantity, Integer locationId, Integer articleId, Integer orderId);
@@ -14,6 +18,8 @@
     Optional<Orders> addSupplierRemark(Integer orderId, String remark);
     List<Orders> findAllBySupplier(Integer supplierId);
+    List<OrdersReport> findAllBySupplierReport(Integer supplierId);
     List<Orders> findAllBySupplierAndStatus(Integer supplierId, OrderStatus status);
     Optional<Orders> findById(Integer orderId);
+    Optional<OrdersReport> findByIdReport(Integer orderId);
     Optional<Orders> updateStatus(Integer orderId, OrderStatus status);
 
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Services/StoredArticlesService.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Services/StoredArticlesService.java	(revision 497d1291ce2544d5bd75549d5adaa45c875c717c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Services/StoredArticlesService.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -2,4 +2,5 @@
 
 
+import com.bazi.fullystocked.Models.Categories;
 import com.bazi.fullystocked.Models.SqlViews.ArticlesReport;
 import com.bazi.fullystocked.Models.SqlViews.SupplierSuppliesArticleReport;
@@ -9,5 +10,4 @@
 
 public interface StoredArticlesService {
-    List<SupplierSuppliesArticleReport> findAllBySupplier(Integer supplierId);
     Optional<StoredArticles> updateFromOrder(Integer oarticleid);
     List<ArticlesReport> findByLocation(Integer locationId);
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Services/SuppliersService.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Services/SuppliersService.java	(revision 497d1291ce2544d5bd75549d5adaa45c875c717c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Services/SuppliersService.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -1,4 +1,5 @@
 package com.bazi.fullystocked.Services;
 
+import com.bazi.fullystocked.Models.SqlViews.SuppliersReport;
 import com.bazi.fullystocked.Models.Suppliers;
 
@@ -7,3 +8,6 @@
 public interface SuppliersService {
     List<Suppliers> findAll();
+    Optional<SuppliersReport> findByIdReport(Integer id);
+    List<SuppliersReport> findAllSuppliersReport();
+    Optional<Suppliers> findById(Integer id);
 }
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/InvoiceController.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/InvoiceController.java	(revision 497d1291ce2544d5bd75549d5adaa45c875c717c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/InvoiceController.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -64,5 +64,5 @@
         if(invoicesService.findById(invoiceId).isEmpty())
         {
-            return "redirect:/create";
+            return "redirect:/invoices/create";
         }
         try{
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/OrderController.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/OrderController.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/OrderController.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -0,0 +1,299 @@
+package com.bazi.fullystocked.Web.Controller;
+
+import com.bazi.fullystocked.Models.*;
+import com.bazi.fullystocked.Models.Enumerations.OrderPriority;
+import com.bazi.fullystocked.Models.Enumerations.OrderStatus;
+import com.bazi.fullystocked.Models.Exceptions.InvalidArgumentsException;
+import com.bazi.fullystocked.Models.SqlViews.ArticlesAtLocationReport;
+import com.bazi.fullystocked.Services.*;
+import org.springframework.stereotype.Controller;
+import org.springframework.stereotype.Repository;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+import java.util.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Controller
+@RequestMapping("/orders")
+public class OrderController {
+    private final SuppliersService suppliersService;
+    private final OrdersService ordersService;
+    private final ArticlesService articlesService;
+    private final LocationsService locationsService;
+    private final OrderedArticlesService orderedArticlesService;
+
+    public OrderController(SuppliersService suppliersService, OrdersService ordersService, ArticlesService articlesService, LocationsService locationsService, OrderedArticlesService orderedArticlesService) {
+        this.suppliersService = suppliersService;
+        this.ordersService = ordersService;
+        this.articlesService = articlesService;
+        this.locationsService = locationsService;
+        this.orderedArticlesService = orderedArticlesService;
+    }
+
+    @GetMapping("/create")
+    public String createOrder(Model model)
+    {
+        model.addAttribute("suppliers", suppliersService.findAllSuppliersReport());
+        return "createOrder";
+    }
+    @PostMapping("/create")
+    public String createOrder(@RequestParam OrderPriority priority,
+                              @RequestParam String remark,
+                              @RequestParam Integer supplierId,
+                              HttpServletRequest request,
+                              Model model)
+    {
+        Orders order = null;
+        Managers manager = null;
+        try {
+            manager = (Managers) request.getSession().getAttribute("user");
+            order=ordersService.create(priority, manager.getUserid(), supplierId).orElseThrow(InvalidArgumentsException::new);
+            if(remark!=null && !remark.isEmpty())
+            {
+                ordersService.addManagerRemark(order.getOrderid(), remark);
+            }
+
+        }
+        catch (Exception e) {
+            return "redirect:/orders/createOrder?error="+e.getMessage();
+        }
+        model.addAttribute("orderId", order.getOrderid());
+        model.addAttribute("articles", articlesService.findAllBySupplier(supplierId));
+        return "selectOrderArticle";
+    }
+
+    @PostMapping("/articles/select")
+    public String getDetails(@RequestParam int orderId, @RequestParam int articleId, Model model)
+    {
+        if(ordersService.findById(orderId).isEmpty())
+        {
+            return "redirect:/orders/create";
+        }
+        try{
+            model.addAttribute("orderId", orderId);
+            List<ArticlesAtLocationReport> articlesReport=articlesService.findAvailabilityAtAllLocations(articleId);
+            model.addAttribute("articlesReport",articlesReport);
+            model.addAttribute("locations", locationsService.findAll());
+            return "addOrderArticle";
+        }
+        catch(Exception e)
+        {
+            return "redirect:/orders/backToList/"+orderId+"?"+e.getMessage();
+        }
+    }
+
+    @PostMapping("/articles/add")
+    public String getDetails(@RequestParam int orderId, @RequestParam int articleId, @RequestParam int quantity, @RequestParam int locationId, HttpServletRequest request, Model model)
+    {
+        if(ordersService.findById(orderId).isEmpty())
+        {
+            return "redirect:/orders/create";
+        }
+        try
+        {
+            Managers u= (Managers) request.getSession().getAttribute("user");
+            Orders order=ordersService.findById(orderId).orElseThrow(InvalidArgumentsException::new);
+            ordersService.addArticleToOrder(quantity, locationId, articleId, orderId);
+            model.addAttribute("orderId", orderId);
+            model.addAttribute("articles", articlesService.findAllBySupplier(order.getSupplier().getUserid()));
+            return "selectOrderArticle";
+        }
+        catch(Exception e)
+        {
+            return "redirect:/orders/backToList/"+orderId+"?"+e.getMessage();
+        }
+    }
+
+    @GetMapping("/backToList/{orderId}")
+    public String backToList(@PathVariable int orderId, HttpServletRequest request, Model model, @RequestParam(required = false) String error)
+    {
+        Managers u=null;
+        try
+        {
+            u=(Managers) request.getSession().getAttribute("user");
+        }
+        catch (Exception e)
+        {
+            return "redirect:/login";
+        }
+        if(ordersService.findById(orderId).isEmpty())
+        {
+            return "redirect:/orders/create";
+        }
+        Orders order=ordersService.findById(orderId).get();
+        if(!order.getManager().getUserid().equals(u.getUserid()))
+        {
+            return "redirect:/login";
+
+        }
+        model.addAttribute("orderId", orderId);
+        model.addAttribute("articles", articlesService.findAllBySupplier(order.getSupplier().getUserid()));
+        return "selectOrderArticle";
+    }
+
+    @PostMapping("/send")
+    public String sendOrder(@RequestParam Integer orderId)
+    {
+        if(ordersService.findById(orderId).isEmpty())
+        {
+            return "redirect:/orders/create";
+        }
+        ordersService.updateStatus(orderId, OrderStatus.SENT);
+        return "redirect:/manager";
+    }
+
+    @GetMapping("/manager/list")
+    public String listOrdersMan(Model model, HttpServletRequest request)
+    {
+        Managers m = (Managers) request.getSession().getAttribute("user");
+        model.addAttribute("orders", ordersService.findAllByManagerReport(m.getUserid()));
+        return "managerOrders";
+    }
+    @GetMapping("/supplier/list")
+    public String listOrdersSup(Model model, HttpServletRequest request)
+    {
+        Suppliers s = (Suppliers) request.getSession().getAttribute("user");
+        model.addAttribute("orders", ordersService.findAllBySupplierReport(s.getUserid()));
+        return "supplierOrders";
+    }
+    @GetMapping("/supplier/details/{id}")
+    public String orderDetailsSupplier(@PathVariable Integer id, Model model)
+    {
+        try
+        {
+            model.addAttribute("order", ordersService.findById(id).orElseThrow(InvalidArgumentsException::new));
+            model.addAttribute("articles", orderedArticlesService.findAllByOrder(id));
+        }
+        catch (Exception e)
+        {
+            return "redirect:/orders/supplier/list?error"+e.getMessage();
+        }
+        return "suppOrderDetails";
+    }
+    @GetMapping("/manager/details/{id}")
+    public String orderDetailsManager(@PathVariable Integer id, Model model)
+    {
+        try
+        {
+            model.addAttribute("order", ordersService.findById(id).orElseThrow(InvalidArgumentsException::new));
+            model.addAttribute("articles", orderedArticlesService.findAllByOrder(id));
+        }
+        catch (Exception e)
+        {
+            return "redirect:/orders/manager/list?error"+e.getMessage();
+        }
+        return "managerOrderDetails";
+    }
+
+    @PostMapping("/supplier/offer")
+    public String createOffer(@RequestParam Integer articleId, @RequestParam Integer orderId, HttpServletRequest request, Model model)
+    {
+        Suppliers u=null;
+        try
+        {
+            u=(Suppliers) request.getSession().getAttribute("user");
+        }
+        catch (Exception e)
+        {
+            return "redirect:/login";
+        }
+        if(ordersService.findById(orderId).isEmpty())
+        {
+            return "redirect:/orders/supplier/list";
+        }
+        Orders order=ordersService.findById(orderId).get();
+        if(!order.getSupplier().getUserid().equals(u.getUserid()))
+        {
+            return "redirect:/login";
+        }
+        model.addAttribute("orderId", orderId);
+        try {
+            model.addAttribute("article", orderedArticlesService.findById(articleId).orElseThrow(InvalidArgumentsException::new));
+        }
+        catch (Exception e)
+        {
+            return "redirect:/orders/supplier/list?error"+e.getMessage();
+        }
+        return "createOffer";
+    }
+
+    @PostMapping("/supplier/offer/save")
+    public String saveOffer(@RequestParam int price, @RequestParam int quantity, @RequestParam int orderId, @RequestParam int articleId)
+    {
+        try {
+            orderedArticlesService.update(articleId, price, quantity);
+        }
+        catch (Exception e)
+        {
+            return "redirect:/orders/supplier/details/"+orderId+"?error="+e.getMessage();
+        }
+        return "redirect:/orders/supplier/details/"+orderId;
+    }
+
+    @PostMapping("/supplier/approve")
+    public String approveOrder(@RequestParam Integer orderId, HttpServletRequest request)
+    {
+        Suppliers u=null;
+        try
+        {
+            u=(Suppliers) request.getSession().getAttribute("user");
+        }
+        catch (Exception e)
+        {
+            return "redirect:/login";
+        }
+        if(ordersService.findById(orderId).isEmpty())
+        {
+            return "redirect:/orders/supplier/list";
+        }
+        Orders order=ordersService.findById(orderId).get();
+        if(!order.getSupplier().getUserid().equals(u.getUserid()))
+        {
+            return "redirect:/login";
+        }
+        try {
+            ordersService.updateStatus(orderId, OrderStatus.APPROVED);
+        }
+        catch (Exception e)
+        {
+            return "redirect:/orders/supplier/details/"+orderId+"?error="+e.getMessage();
+        }
+        return "redirect:/orders/supplier/details/"+orderId;
+    }
+    @PostMapping("/manager/initiate")
+    public String initiateOrder(@RequestParam Integer orderId, HttpServletRequest request)
+    {
+        Managers u=null;
+        try
+        {
+            u=(Managers) request.getSession().getAttribute("user");
+        }
+        catch (Exception e)
+        {
+            return "redirect:/login";
+        }
+        if(ordersService.findById(orderId).isEmpty())
+        {
+            return "redirect:/orders/manager/list";
+        }
+        Orders order=ordersService.findById(orderId).get();
+        if(!order.getManager().getUserid().equals(u.getUserid()))
+        {
+            return "redirect:/login";
+        }
+        try{
+        ordersService.updateStatus(orderId, OrderStatus.IN_PROGRESS);}
+        catch (Exception e)
+        {
+            return "redirect:/orders/manager/details/"+orderId+"?error="+e.getMessage();
+        }
+        return "redirect:/orders/manager/details/"+orderId;
+    }
+    @PostMapping("/worker/accept")
+    public String acceptOrder(@RequestParam Integer orderId)
+    {
+        ordersService.updateStatus(orderId, OrderStatus.DELIVERED);
+        return "redirect:/worker";
+    }
+}
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/WorkerController.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/WorkerController.java	(revision 497d1291ce2544d5bd75549d5adaa45c875c717c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/WorkerController.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -2,7 +2,6 @@
 
 import com.bazi.fullystocked.Models.SqlViews.ArticlesReport;
-import com.bazi.fullystocked.Models.StoredArticles;
-import com.bazi.fullystocked.Models.User;
 import com.bazi.fullystocked.Models.Workers;
+import com.bazi.fullystocked.Services.ArticlesService;
 import com.bazi.fullystocked.Services.StoredArticlesService;
 import org.springframework.stereotype.Controller;
@@ -14,5 +13,4 @@
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
-import java.util.Optional;
 
 @Controller
@@ -20,7 +18,9 @@
 public class WorkerController {
    private final StoredArticlesService storedArticlesService;
+   private final ArticlesService articlesService;
 
-    public WorkerController(StoredArticlesService storedArticlesService) {
+    public WorkerController(StoredArticlesService storedArticlesService, ArticlesService articlesService) {
         this.storedArticlesService = storedArticlesService;
+        this.articlesService = articlesService;
     }
 
@@ -46,4 +46,5 @@
             ArticlesReport articlesReport=this.storedArticlesService.findById(id).get();
             model.addAttribute("article",articlesReport);
+            model.addAttribute("categories", articlesService.findAllCategoriesByArticle(articlesReport.getArticleid()));
             return "detailsArticle";
         }
Index: FullyStocked/src/main/resources/templates/addInvoiceArticle.html
===================================================================
--- FullyStocked/src/main/resources/templates/addInvoiceArticle.html	(revision 497d1291ce2544d5bd75549d5adaa45c875c717c)
+++ FullyStocked/src/main/resources/templates/addInvoiceArticle.html	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -64,5 +64,5 @@
                             <span class="input-group-text inputGroup-sizing-sm">Количина</span>
                         </div>
-                        <input type="text" name="quantity" class="form-control" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
+                        <input type="number" name="quantity" class="form-control" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
                     </div>
                     <div class="input-group input-group-sm mb-3">
@@ -70,5 +70,5 @@
                             <span class="input-group-text inputGroup-sizing-sm">Цена</span>
                         </div>
-                        <input type="text" name="price" class="form-control" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
+                        <input type="number" name="price" class="form-control" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
                     </div>
                     <input type="hidden" name="invoiceId" th:value="${invId}">
Index: FullyStocked/src/main/resources/templates/addOrderArticle.html
===================================================================
--- FullyStocked/src/main/resources/templates/addOrderArticle.html	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
+++ FullyStocked/src/main/resources/templates/addOrderArticle.html	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:sec="http://www.w3.org/1999/xhtml">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+
+<head>
+    <meta charset="UTF-8">
+    <title>Worker</title>
+</head>
+
+<body>
+<nav class="navbar navbar-expand-md navbar-dark bg-dark">
+    <div class="container">
+        <a class="navbar-brand" href="/homeManager">FULLYSTOCKED</a>
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
+                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+
+        <div class="collapse navbar-collapse justify-content-end" id="navbarsExampleDefault">
+            <ul class="navbar-nav m-auto">
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Одговори прашање</a>
+                </li>
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Креирај нарчка</a>
+                </li>
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Внеси нови артикли</a>
+                </li>
+            </ul>
+
+            <ul class="nav navbar-nav navbar-right">
+
+                <li class="nav-item">
+                    <a class="btn btn-light btn-sm ml-3" href="/logout">
+                        <i class="fa fa-shopping-cart"></i> Logout
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </div>
+</nav>
+<div class="container mt-2">
+    <div class="row">
+        <div class="col-md-5">
+            <div class="project-info-box mt-0">
+                <h5 th:text="${articlesReport.get(0).getArticlename()}"></h5>
+                <p class="mb-0" th:text="${articlesReport.get(0).getDescription()}"></p>
+                <hr>
+            </div><!-- / project-info-box -->
+
+            <div class="project-info-box">
+                <p><b>Максимум дозволена количина по локација: </b><span th:text="${articlesReport.get(0).getMaxquantityperlocation()}"></span></p>
+            </div><!-- / project-info-box -->
+
+            <div class="project-info-box mt-0 mb-0">
+                <p class="mb-0">
+                <form action="/orders/articles/add" method="POST">
+                    <div class="input-group input-group-sm mb-3">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text inputGroup-sizing-sm">Количина</span>
+                        </div>
+                        <input type="number" name="quantity" class="form-control" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
+                    </div>
+                    <div class="input-group input-group-sm mb-3">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text inputGroup-sizing-sm">За локација</span>
+                        </div>
+                        <select name="locationId" class="form-control" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
+                            <option th:each="loc : ${locations}" th:value="${loc.getLocationid()}" th:text="${loc.getLocationname()}"></option>
+                        </select>
+                    </div>
+                    <input type="hidden" name="orderId" th:value="${orderId}">
+                    <input type="hidden" name="articleId" th:value="${articlesReport.get(0).getArticleid()}">
+                    <button class="btn btn-primary" >Додади</button>
+                </form>
+                </p>
+            </div>
+            <div class="project-info-box">
+                <p>Достапност по магацини</p>
+                <ul>
+                    <li th:each="perLoc : ${articlesReport}">
+                        <th:block th:text="${perLoc.getLocationname()}"></th:block>
+                        :
+                        <th:block th:text="${perLoc.getQuantity()}"></th:block> парчиња
+                    </li>
+                </ul>
+            </div>
+            <div class="project-info-box mt-0 mb-0">
+                <p class="mb-0">
+                <form th:action="@{'/orders/backToList/{orderId}' (orderId=${orderId})}" method="GET">
+                    <button class="btn btn-primary" >Назад</button>
+                </form>
+                </p>
+            </div><!-- / project-info-box -->
+
+        </div><!-- / column -->
+
+        <div class="col-md-7 mt-3">
+            <img th:src="${articlesReport.get(0).getImageurl()}" alt="project-image" class="rounded img-fluid">
+        </div>
+    </div>
+</div>
+</body>
+</html>
Index: FullyStocked/src/main/resources/templates/createOffer.html
===================================================================
--- FullyStocked/src/main/resources/templates/createOffer.html	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
+++ FullyStocked/src/main/resources/templates/createOffer.html	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:sec="http://www.w3.org/1999/xhtml">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+
+<head>
+    <meta charset="UTF-8">
+    <title>Worker</title>
+</head>
+
+<body>
+<nav class="navbar navbar-expand-md navbar-dark bg-dark">
+    <div class="container">
+        <a class="navbar-brand" href="/homeSupplier">FULLYSTOCKED</a>
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
+                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+
+        <div class="collapse navbar-collapse justify-content-end" id="navbarsExampleDefault">
+            <ul class="navbar-nav m-auto">
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Нарачки</a>
+                </li>
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Категории</a>
+                </li>
+            </ul>
+
+            <ul class="nav navbar-nav navbar-right">
+
+                <li class="nav-item">
+                    <a class="btn btn-light btn-sm ml-3" href="/logout">
+                        <i class="fa fa-shopping-cart"></i> Logout
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </div>
+</nav>
+</header>
+<div class="container mt-2">
+    <div class="row">
+        <div class="col-md-5">
+            <div class="project-info-box mt-0">
+                <h5 th:text="${article.getArticlename()}"></h5>
+                <p class="mb-0" th:text="${article.getDescription()}"></p>
+                <hr>
+            </div><!-- / project-info-box -->
+
+
+            <div class="project-info-box mt-0 mb-0">
+                <p class="mb-0">
+                <form action="/orders/supplier/offer/save" method="POST">
+                    <div class="input-group input-group-sm mb-3">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text inputGroup-sizing-sm">Количина</span>
+                        </div>
+                        <input type="number" name="quantity" th:value="${article.getQuantity()}" class="form-control" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
+                    </div>
+                    <div class="input-group input-group-sm mb-3">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text inputGroup-sizing-sm">Цена</span>
+                        </div>
+                        <input type="number" name="price" class="form-control" th:value="${article.getPrice()==null ? 0 : article.getPrice()}" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
+                    </div>
+                    <input type="hidden" name="orderId" th:value="${orderId}">
+                    <input type="hidden" name="articleId" th:value="${article.getOarticleid()}">
+                    <button class="btn btn-primary" >Додади</button>
+                </form>
+                </p>
+            </div>
+
+            <div class="project-info-box mt-0 mb-0">
+                <p class="mb-0">
+                <form th:action="@{'/invoices/backToList/{invoiceId}' (invoiceId=${invId})}" method="GET">
+                    <button class="btn btn-primary" >Назад</button>
+                </form>
+                </p>
+            </div><!-- / project-info-box -->
+        </div><!-- / column -->
+
+        <div class="col-md-7 mt-3">
+            <img th:src="${article.getImageurl()}" alt="project-image" class="rounded img-fluid">
+        </div>
+    </div>
+</div>
+</body>
+</html>
Index: FullyStocked/src/main/resources/templates/createOrder.html
===================================================================
--- FullyStocked/src/main/resources/templates/createOrder.html	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
+++ FullyStocked/src/main/resources/templates/createOrder.html	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -0,0 +1,90 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:sec="http://www.w3.org/1999/xhtml">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+
+<head>
+    <meta charset="UTF-8">
+    <title>Worker</title>
+</head>
+
+<body>
+<nav class="navbar navbar-expand-md navbar-dark bg-dark">
+    <div class="container">
+        <a class="navbar-brand" href="/homeManager">FULLYSTOCKED</a>
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
+                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+
+        <div class="collapse navbar-collapse justify-content-end" id="navbarsExampleDefault">
+            <ul class="navbar-nav m-auto">
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Одговори прашање</a>
+                </li>
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Креирај нарчка</a>
+                </li>
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Внеси нови артикли</a>
+                </li>
+            </ul>
+
+            <ul class="nav navbar-nav navbar-right">
+
+                <li class="nav-item">
+                    <a class="btn btn-light btn-sm ml-3" href="/logout">
+                        <i class="fa fa-shopping-cart"></i> Logout
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </div>
+</nav>
+<div class="text-center">
+    <h2 class="m-2">Креирај нарачка</h2>
+</div>
+<form method="POST" action="/orders/create">
+    <div class="mt-4">
+        <div class="form-group row">
+            <div class="col-md-3"></div>
+            <label for="priority" class="col-form-label col-md-2 font-weight-bold text-left">Приоритет</label>
+            <div class="col-md-4">
+                <select name="priority" id="priority" class="form-control">
+                    <option value="LOW">Низок</option>
+                    <option value="MEDIUM">Среден</option>
+                    <option value="HIGH">Висок</option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group row">
+            <div class="col-md-3"></div>
+            <label for="remark" class="col-form-label col-md-2 font-weight-bold text-left">Забелешка</label>
+            <div class="col-md-4">
+                <textarea name="remark" id="remark" class="form-control"></textarea>
+            </div>
+        </div>
+        <div class="form-group row">
+            <div class="col-md-3"></div>
+            <label for="supplier" class="col-form-label col-md-2 font-weight-bold text-left">Добавувач</label>
+            <div class="col-md-4">
+                <select name="supplierId" id="supplier" class="form-control">
+                    <option th:each="supp : ${suppliers}" th:value="${supp.getUserid()}">
+                        <th:block th:text="${supp.getUsername()}"></th:block>
+                        (
+                        <th:block th:text="${supp.getSupplierinfo()}"></th:block>
+                        )
+                    </option>
+                </select>
+            </div>
+        </div>
+        <div class="row mt-4">
+            <div class="col-md-3">
+            </div>
+            <div class="col-md-6">
+                <input type="submit" value="Креирај" class="btn btn-default w-100" />
+            </div>
+        </div>
+    </div>
+</form>
+</body>
+</html>
Index: FullyStocked/src/main/resources/templates/detailsArticle.html
===================================================================
--- FullyStocked/src/main/resources/templates/detailsArticle.html	(revision 497d1291ce2544d5bd75549d5adaa45c875c717c)
+++ FullyStocked/src/main/resources/templates/detailsArticle.html	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -57,4 +57,13 @@
       </div><!-- / project-info-box -->
 
+      <div class="project-info-box">
+        <p><b>Категории: </b></p>
+        <ul>
+          <li th:each="cat : ${categories}">
+            <span th:text="${cat.getCategoryname()}"></span>
+          </li>
+        </ul>
+      </div><!-- / project-info-box -->
+
       <div class="project-info-box mt-0 mb-0">
         <p class="mb-0">
Index: FullyStocked/src/main/resources/templates/managerOrderDetails.html
===================================================================
--- FullyStocked/src/main/resources/templates/managerOrderDetails.html	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
+++ FullyStocked/src/main/resources/templates/managerOrderDetails.html	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -0,0 +1,125 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:sec="http://www.w3.org/1999/xhtml">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+
+<head>
+    <meta charset="UTF-8">
+    <title>Worker</title>
+</head>
+
+<body>
+<nav class="navbar navbar-expand-md navbar-dark bg-dark">
+    <div class="container">
+        <a class="navbar-brand" href="/homeManager">FULLYSTOCKED</a>
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
+                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+
+        <div class="collapse navbar-collapse justify-content-end" id="navbarsExampleDefault">
+            <ul class="navbar-nav m-auto">
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Одговори прашање</a>
+                </li>
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Креирај нарчка</a>
+                </li>
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Внеси нови артикли</a>
+                </li>
+            </ul>
+
+            <ul class="nav navbar-nav navbar-right">
+
+                <li class="nav-item">
+                    <a class="btn btn-light btn-sm ml-3" href="/logout">
+                        <i class="fa fa-shopping-cart"></i> Logout
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </div>
+</nav>
+</header>
+<div class="d-flex justify-content-center">
+    <h2 class="m-2">Детален приказ на нарачкa</h2>
+</div>
+<div class="container mt-2">
+    <div class="row">
+        <div class="col-md-5">
+            <div class="project-info-box mt-0">
+                <h5>Статус</h5>
+                <p class="mb-0" th:text="${order.getStatus()}"></p>
+                <hr>
+            </div><!-- / project-info-box -->
+            <div class="project-info-box mt-0">
+                <h5>Креирана на</h5>
+                <p class="mb-0" th:text="${order.getDatecreated()}"></p>
+                <hr>
+            </div>
+            <div class="project-info-box mt-0">
+                <h5>Приоритет</h5>
+                <p class="mb-0" th:text="${order.getPriority()}"></p>
+                <hr>
+            </div>
+            <div class="project-info-box mt-0 mb-0">
+                <p class="mb-0">
+                <form th:action="@{'/orders/manager/initiate'}" th:method="POST">
+                    <input type="hidden" name="orderId" th:value="${order.getOrderid()}">
+                    <button class="btn btn-primary" >Прифати</button>
+                </form>
+
+                </p>
+            </div>
+            <div class="project-info-box mt-0 mb-0">
+                <p class="mb-0">
+                    <a class="btn btn-danger" href="/orders/manager/list" role="button">&laquo; Назад</a>
+
+                </p>
+            </div><!-- / project-info-box -->
+        </div><!-- / column -->
+
+        <div class="col-md-7 mt-3">
+            <div class="project-info-box mt-0">
+                <h5>Забелешка на менаџер</h5>
+                <p class="mb-0" th:text="${order.getManagerremark()==null ? 'Нема забелешка' : order.getManagerremark()}"></p>
+                <hr>
+            </div>
+            <div class="project-info-box mt-0">
+                <h5>Забелешка на добавувач</h5>
+                <p class="mb-0" th:text="${order.getSupplierremark()==null ? 'Нема забелешка' : order.getSupplierremark()}"></p>
+                <hr>
+            </div>
+
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12">
+            <div class="project-info-box mt-0" th:each="a : ${articles}">
+                <h5 th:text="${a.getArticlename()}"></h5>
+                <p class="mb-0">
+                    Кванитет: <th:block th:text="${a.getQuantity()}"></th:block> <br />
+                    Цена: <th:block th:text="${a.getPrice()==null ? 'Не е додадена' : a.getPrice()}"></th:block>
+                </p>
+                <hr>
+            </div>
+        </div>
+    </div>
+</div>
+
+<style>
+    .link {
+        font-size: 20px;
+    }
+
+    .link1 {
+        font-size: 18px;
+    }
+
+    th {
+        font-size: 16px;
+    }
+
+</style>
+</body>
+</html>
Index: FullyStocked/src/main/resources/templates/managerOrders.html
===================================================================
--- FullyStocked/src/main/resources/templates/managerOrders.html	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
+++ FullyStocked/src/main/resources/templates/managerOrders.html	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:sec="http://www.w3.org/1999/xhtml">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+
+<head>
+    <meta charset="UTF-8">
+    <title>Worker</title>
+</head>
+
+<body>
+<nav class="navbar navbar-expand-md navbar-dark bg-dark">
+    <div class="container">
+        <a class="navbar-brand" href="/homeManager">FULLYSTOCKED</a>
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
+                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+
+        <div class="collapse navbar-collapse justify-content-end" id="navbarsExampleDefault">
+            <ul class="navbar-nav m-auto">
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Одговори прашање</a>
+                </li>
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Креирај нарчка</a>
+                </li>
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Внеси нови артикли</a>
+                </li>
+            </ul>
+
+            <ul class="nav navbar-nav navbar-right">
+
+                <li class="nav-item">
+                    <a class="btn btn-light btn-sm ml-3" href="/logout">
+                        <i class="fa fa-shopping-cart"></i> Logout
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </div>
+</nav>
+</header>
+
+<div class="d-flex justify-content-center">
+    <h2 class="m-2">Нарачки</h2>
+</div>
+<table class="table">
+    <thead>
+    <tr>
+        <th>
+
+        </th>
+        <th>
+            Добавувач
+        </th>
+        <th>
+            Статус
+        </th>
+        <th>
+            Приоритет
+        </th>
+        <th>
+            Забелешка
+        </th>
+        <th>
+            Датум креирана
+        </th>
+        <th>
+
+        </th>
+    </tr>
+    </thead>
+    <tbody>
+        <tr th:each="order : ${orders}">
+            <td></td>
+            <td th:text="${order.getSupplierinfo()}" class="link"></td>
+            <td th:text="${order.getStatus()}" class="link"></td>
+            <td th:text="${order.getPriority()}" class="link"></td>
+            <td th:text="${order.getManagerremark()}" class="link"></td>
+            <td th:text="${order.getDatecreated()}" class="link"></td>
+            <td>
+                <form th:action="@{'/orders/manager/details/{id}' (id=${order.getOrderid()})} " th:method="GET">
+                    <button class="btn btn-primary" >Детален преглед</button>
+                </form>
+            </td>
+        </tr>
+
+
+    </tbody>
+</table>
+
+<style>
+    .link {
+        font-size: 20px;
+    }
+
+    .link1 {
+        font-size: 18px;
+    }
+
+    th {
+        font-size: 16px;
+    }
+
+</style>
+</body>
+</html>
Index: FullyStocked/src/main/resources/templates/selectOrderArticle.html
===================================================================
--- FullyStocked/src/main/resources/templates/selectOrderArticle.html	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
+++ FullyStocked/src/main/resources/templates/selectOrderArticle.html	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:sec="http://www.w3.org/1999/xhtml">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+
+<head>
+    <meta charset="UTF-8">
+    <title>Worker</title>
+</head>
+
+<body>
+<nav class="navbar navbar-expand-md navbar-dark bg-dark">
+    <div class="container">
+        <a class="navbar-brand" href="/homeManager">FULLYSTOCKED</a>
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
+                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+
+        <div class="collapse navbar-collapse justify-content-end" id="navbarsExampleDefault">
+            <ul class="navbar-nav m-auto">
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Одговори прашање</a>
+                </li>
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Креирај нарчка</a>
+                </li>
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Внеси нови артикли</a>
+                </li>
+            </ul>
+
+            <ul class="nav navbar-nav navbar-right">
+
+                <li class="nav-item">
+                    <a class="btn btn-light btn-sm ml-3" href="/logout">
+                        <i class="fa fa-shopping-cart"></i> Logout
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </div>
+</nav>
+<div class="d-flex justify-content-center">
+    <h2 class="m-2">Избери артикл</h2>
+</div>
+<table class="table">
+    <thead>
+    <tr>
+        <th>
+
+        </th>
+        <th>
+            Слика
+        </th>
+        <th>
+            Име
+        </th>
+        <th>
+
+        </th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr th:each="article : ${articles}">
+        <td></td>
+        <td>
+            <img style="width:300px; max-height:200px " th:src="${article.getImageurl()}">
+        </td>
+        <td th:text="${article.getArticlename()}" class="link">
+        </td>
+
+        <td>
+            <form  action="/orders/articles/select" method="POST">
+                <input type="hidden" name="orderId" th:value="${orderId}">
+                <input type="hidden" name="articleId" th:value="${article.getId().getArticleid()}">
+                <input type="submit" class="btn btn-primary" value="Додади во нарачка">
+            </form>
+
+        </td>
+
+    </tr>
+    </tbody>
+</table>
+<div class="row">
+    <div class="col-md-4"></div>
+    <div class="col-md-4">
+        <form action="/orders/send" method="POST">
+            <input type="hidden" name="orderId" th:value="${orderId}">
+            <input type="submit" class="btn btn-primary w-100" value="Испрати нарачка">
+        </form>
+    </div>
+</div>
+<style>
+    .link {
+        font-size: 20px;
+    }
+
+    .link1 {
+        font-size: 18px;
+    }
+
+    th {
+        font-size: 16px;
+    }
+
+</style>
+</body>
+</html>
Index: FullyStocked/src/main/resources/templates/suppOrderDetails.html
===================================================================
--- FullyStocked/src/main/resources/templates/suppOrderDetails.html	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
+++ FullyStocked/src/main/resources/templates/suppOrderDetails.html	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -0,0 +1,127 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:sec="http://www.w3.org/1999/xhtml">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+
+<head>
+    <meta charset="UTF-8">
+    <title>Worker</title>
+</head>
+
+<body>
+<nav class="navbar navbar-expand-md navbar-dark bg-dark">
+    <div class="container">
+        <a class="navbar-brand" href="/homeSupplier">FULLYSTOCKED</a>
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
+                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+
+        <div class="collapse navbar-collapse justify-content-end" id="navbarsExampleDefault">
+            <ul class="navbar-nav m-auto">
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Нарачки</a>
+                </li>
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Категории</a>
+                </li>
+            </ul>
+
+            <ul class="nav navbar-nav navbar-right">
+
+                <li class="nav-item">
+                    <a class="btn btn-light btn-sm ml-3" href="/logout">
+                        <i class="fa fa-shopping-cart"></i> Logout
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </div>
+</nav>
+</header>
+<div class="d-flex justify-content-center">
+    <h2 class="m-2">Детален приказ на нарачкa</h2>
+</div>
+<div class="container mt-2">
+    <div class="row">
+        <div class="col-md-5">
+            <div class="project-info-box mt-0">
+                <h5>Статус</h5>
+                <p class="mb-0" th:text="${order.getStatus()}"></p>
+                <hr>
+            </div><!-- / project-info-box -->
+            <div class="project-info-box mt-0">
+                <h5>Креирана на</h5>
+                <p class="mb-0" th:text="${order.getDatecreated()}"></p>
+                <hr>
+            </div>
+            <div class="project-info-box mt-0">
+                <h5>Приоритет</h5>
+                <p class="mb-0" th:text="${order.getPriority()}"></p>
+                <hr>
+            </div>
+            <div class="project-info-box mt-0 mb-0">
+                <p class="mb-0">
+                <form th:action="@{'/orders/supplier/approve'}" th:method="POST">
+                    <input type="hidden" name="orderId" th:value="${order.getOrderid()}">
+                    <button class="btn btn-primary" >Одобри</button>
+                </form>
+
+                </p>
+            </div>
+            <div class="project-info-box mt-2 mb-0">
+                <p class="mb-0">
+                    <a class="btn btn-danger" href="/orders/supplier/list" role="button">&laquo; Назад</a>
+
+                </p>
+            </div><!-- / project-info-box -->
+        </div><!-- / column -->
+
+        <div class="col-md-7 mt-3">
+            <div class="project-info-box mt-0">
+                <h5>Забелешка на менаџер</h5>
+                <p class="mb-0" th:text="${order.getManagerremark()==null ? 'Нема забелешка' : order.getManagerremark()}"></p>
+                <hr>
+            </div>
+            <div class="project-info-box mt-0">
+                <h5>Забелешка на добавувач</h5>
+                <p class="mb-0" th:text="${order.getSupplierremark()==null ? 'Нема забелешка' : order.getSupplierremark()}"></p>
+                <hr>
+            </div>
+
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12">
+            <div class="project-info-box mt-0" th:each="a : ${articles}">
+                <h5 th:text="${a.getArticlename()}"></h5>
+                <p class="mb-0">
+                    Кванитет: <th:block th:text="${a.getQuantity()}"></th:block> <br />
+                    Цена: <th:block th:text="${a.getPrice()==null ? 'Не е додадена' : a.getPrice()}"></th:block>
+                </p>
+                <form th:action="@{'/orders/supplier/offer'}" th:method="POST">
+                    <input type="hidden" name="orderId" th:value="${order.getOrderid()}">
+                    <input type="hidden" name="articleId" th:value="${a.getOarticleid()}">
+                    <button class="btn btn-primary" >Креирај понуда</button>
+                </form>
+                <hr>
+            </div>
+        </div>
+    </div>
+</div>
+
+<style>
+    .link {
+        font-size: 20px;
+    }
+
+    .link1 {
+        font-size: 18px;
+    }
+
+    th {
+        font-size: 16px;
+    }
+
+</style>
+</body>
+</html>
Index: FullyStocked/src/main/resources/templates/supplierOrders.html
===================================================================
--- FullyStocked/src/main/resources/templates/supplierOrders.html	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
+++ FullyStocked/src/main/resources/templates/supplierOrders.html	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:sec="http://www.w3.org/1999/xhtml">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+
+<head>
+    <meta charset="UTF-8">
+    <title>Worker</title>
+</head>
+
+<body>
+<nav class="navbar navbar-expand-md navbar-dark bg-dark">
+    <div class="container">
+        <a class="navbar-brand" href="/homeSupplier">FULLYSTOCKED</a>
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
+                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+
+        <div class="collapse navbar-collapse justify-content-end" id="navbarsExampleDefault">
+            <ul class="navbar-nav m-auto">
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Нарачки</a>
+                </li>
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Категории</a>
+                </li>
+            </ul>
+
+            <ul class="nav navbar-nav navbar-right">
+
+                <li class="nav-item">
+                    <a class="btn btn-light btn-sm ml-3" href="/logout">
+                        <i class="fa fa-shopping-cart"></i> Logout
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </div>
+</nav>
+</header>
+<div class="d-flex justify-content-center">
+    <h2 class="m-2">Нарачки</h2>
+</div>
+<table class="table">
+    <thead>
+    <tr>
+        <th>
+
+        </th>
+        <th>
+            Добавувач
+        </th>
+        <th>
+            Статус
+        </th>
+        <th>
+            Приоритет
+        </th>
+        <th>
+            Забелешка
+        </th>
+        <th>
+            Датум креирана
+        </th>
+        <th>
+
+        </th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr th:each="order : ${orders}">
+        <td></td>
+        <td th:text="${order.getManagerremark()}" class="link"></td>
+        <td th:text="${order.getSupplierremark()}" class="link"></td>
+        <td th:text="${order.getStatus()}" class="link"></td>
+        <td th:text="${order.getPriority()}" class="link"></td>
+        <td th:text="${order.getDatecreated()}" class="link"></td>
+        <td>
+            <form th:action="@{'/orders/supplier/details/{id}' (id=${order.getOrderid()})} " th:method="GET">
+                <button class="btn btn-primary" >Детален преглед</button>
+            </form>
+        </td>
+    </tr>
+
+
+    </tbody>
+</table>
+
+<style>
+    .link {
+        font-size: 20px;
+    }
+
+    .link1 {
+        font-size: 18px;
+    }
+
+    th {
+        font-size: 16px;
+    }
+
+</style>
+</body>
+</html>