localhorst
/
e-commerce
Archived
4
1
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

add offered article to listed article

This commit is contained in:
Hendrik Schutter 2020-05-19 16:30:27 +02:00
parent d8032c2bd7
commit 9cfb1cd0ad
7 changed files with 119 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
prototype/e-commerce.db.copy
View File

Binary file not shown.

84
prototype/src/main/java/org/hso/ecommerce/controller/intern/InternArticleController.java
View File

@ -5,8 +5,10 @@ import java.util.List;
import org.hso.ecommerce.entities.shop.Article;
import org.hso.ecommerce.entities.shop.Category;
import org.hso.ecommerce.entities.supplier.ArticleOffer;
import org.hso.ecommerce.repos.shop.ArticleRepository;
import org.hso.ecommerce.repos.shop.CategoryRepository;
import org.hso.ecommerce.repos.shop.OffersRepository;
import org.hso.ecommerce.repos.warehouse.WarehouseBookingPositionSlotEntryRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@ -26,6 +28,9 @@ public class InternArticleController {
@Autowired
private final CategoryRepository categoryRepository = null;
@Autowired
private final OffersRepository offersRepository = null;
@GetMapping("/")
public String internListedArticles(Model model) {
@ -57,39 +62,65 @@ public class InternArticleController {
}
@PostMapping("/{id}/saveChanges")
public RedirectView saveChanges(
@PathVariable int id,
@RequestParam("title") String title,
@RequestParam("description") String description,
@RequestParam("units-per-slot") String warehouseUnitsPerSlot,
@RequestParam("price_netto") String pricenetto,
@RequestParam("reorderMaxPrice") String reorderMaxPrice,
@RequestParam("autobuy") Boolean shouldReorder,
@RequestParam("categories") String categories) {
public RedirectView saveChanges(@PathVariable(required = true) int id,
@RequestParam(value = "title", required = true) String title,
@RequestParam(value = "description", required = true) String description,
@RequestParam(value = "units-per-slot", required = true) String warehouseUnitsPerSlot,
@RequestParam(value = "price_netto", required = true) String pricenetto,
@RequestParam(value = "reorderMaxPrice", required = true) String reorderMaxPrice,
@RequestParam(value = "autobuy", required = true) Boolean shouldReorder,
@RequestParam(value = "categories", required = true) String categories) {
Article oldArticle = articleRepository.findArticleById(id);
Article tmpArticle = articleRepository.findArticleById(id); // get the old article
// TODO img
String[] separatedCategories = categories.split("\n");
oldArticle.categories.clear();
tmpArticle.categories.clear();
// loop through all categories strings and create a new category if a new one; also adds the categorys to the article
// loop through all categories strings and create a new category if a new one;
// also adds the categorys to the article
for (String category : separatedCategories) {
oldArticle.categories.add(categoryRepository.findCategoryByName(category.trim())
tmpArticle.categories.add(categoryRepository.findCategoryByName(category.trim())
.orElseGet(() -> new Category(category.trim())));
}
oldArticle.shouldReorder = shouldReorder;
oldArticle.reorderMaxPrice = (int) (Float.parseFloat(reorderMaxPrice) * 100);
oldArticle.shopPricePerUnitNetCent = (int) (Float.parseFloat(pricenetto) * 100);
oldArticle.warehouseUnitsPerSlot = Integer.parseInt(warehouseUnitsPerSlot);
oldArticle.title = title;
oldArticle.description = description;
tmpArticle.shouldReorder = shouldReorder;
tmpArticle.reorderMaxPrice = (int) (Float.parseFloat(reorderMaxPrice) * 100);
tmpArticle.shopPricePerUnitNetCent = (int) (Float.parseFloat(pricenetto) * 100);
tmpArticle.warehouseUnitsPerSlot = Integer.parseInt(warehouseUnitsPerSlot);
tmpArticle.title = title;
tmpArticle.description = description;
articleRepository.save(oldArticle); // save updated article
articleRepository.save(tmpArticle); // save updated article
return new RedirectView("../"); // return to overview page
}
@PostMapping("/addArticle/{id}")
public RedirectView addArticle(@PathVariable(required = true) String id) {
// article is not already listed, create new one
int offeredArticleID = Integer.parseInt(id);
Article tmpArticle = new Article();
ArticleOffer offeredArticle = offersRepository.findOfferedArticleById(offeredArticleID);
// set default values
tmpArticle.description = "";
tmpArticle.reorderMaxPrice = 0;
tmpArticle.shopPricePerUnitNetCent = offeredArticle.pricePerUnitNet;
tmpArticle.shouldReorder = false;
tmpArticle.title = offeredArticle.title;
tmpArticle.warehouseUnitsPerSlot = 1;
tmpArticle.image = articleRepository.findAll().get(0).image; // TODO set any static default image
tmpArticle.related = offeredArticle;
articleRepository.save(tmpArticle); // save new article
// return to edit article page
return new RedirectView("../" + articleRepository.findArticleIDByRelatedID(offeredArticleID).get());
}
public static class UImodelArticles {
@ -115,13 +146,13 @@ public class InternArticleController {
this.title = article.title;
this.price_netto = String.format("%.2f", ((float) article.shopPricePerUnitNetCent / 100));
this.price = String.format("%.2f", ((float) article.getPriceGross() / 100));
StringBuilder result = new StringBuilder();
for (Category temp : article.categories) {
result.append(temp.name + " ");
}
this.categorie = result.toString();
this.categorie = result.toString();
this.stock = stock;
this.offer_id = article.related.id;
@ -143,8 +174,7 @@ public class InternArticleController {
public boolean shouldReorder;
public String warehouseUnitsPerSlot;
public String description;
public String getImgPath() {
return imgPath;
}
@ -246,15 +276,15 @@ public class InternArticleController {
this.title = article.title;
this.price_netto = String.format("%.2f", ((float) article.shopPricePerUnitNetCent / 100));
this.price = String.format("%.2f", ((float) article.getPriceGross() / 100));
StringBuilder result = new StringBuilder();
for (Category temp : article.categories) {
result.append(temp.name);
result.append("\n");
}
this.categorie = result.toString();
this.categorie = result.toString();
this.stock = stock;
this.offer_id = article.related.id;
this.id = article.id;

46
prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOfferController.java
View File

@ -2,17 +2,16 @@ package org.hso.ecommerce.controller.intern.suppliers;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import org.hso.ecommerce.entities.supplier.ArticleOffer;
import org.hso.ecommerce.repos.shop.CategoryRepository;
import org.hso.ecommerce.repos.shop.ArticleRepository;
import org.hso.ecommerce.repos.shop.OffersRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@Controller
@RequestMapping("/intern/")
@ -21,6 +20,9 @@ public class SupplierOfferController {
@Autowired
private final OffersRepository offersRepository = null;
@Autowired
private final ArticleRepository articleRepository = null;
@GetMapping("supplierOffers")
public String internListedArticles(Model model) {
@ -28,7 +30,7 @@ public class SupplierOfferController {
for (ArticleOffer article : offersRepository.findAll()) {
UImodelOfferedArticle tmp = new UImodelOfferedArticle();
tmp.addData(article,"supplierName01", 4884, 5);
tmp.addData(article, "supplierName01", 4884, articleRepository.findArticleIDByRelatedID(article.id)); //TODO display supplier name with link
totals.add(tmp);
}
@ -38,6 +40,7 @@ public class SupplierOfferController {
public class UImodelOfferedArticle {
long offer_id;
String title;
String manufacturer;
String articlenumber;
@ -46,6 +49,23 @@ public class SupplierOfferController {
String price;
String ads;
int listedArticleId;
boolean offerIsListed; //true --> offered article is listed
public long getOffer_id() {
return offer_id;
}
public void setOffer_id(long offer_id) {
this.offer_id = offer_id;
}
public boolean isOfferIsListed() {
return offerIsListed;
}
public void setOfferIsListed(boolean offerIsListed) {
this.offerIsListed = offerIsListed;
}
public String getTitle() {
return title;
@ -111,18 +131,26 @@ public class SupplierOfferController {
this.listedArticleId = listedArticleId;
}
public void addData(ArticleOffer article, String supplierName, int supplierId, int listedArticleId) {
public void addData(ArticleOffer article, String supplierName, int supplierId,
Optional<Integer> listedArticleId) {
this.offer_id = article.id;
this.title = article.title;
this.manufacturer = article.manufacturer;
this.articlenumber = article.articleNumber;
this.supplierName = supplierName;
this.supplierId = supplierId;
this.price = String.format("%.2f", ((float) article.pricePerUnitNet / 100));
this.ads = (article.shouldBeAdvertised) ? "Ja" : "Nein";
this.listedArticleId = listedArticleId;
this.ads = (article.shouldBeAdvertised) ? "Ja" : "Nein";
if (listedArticleId.isPresent()) {
// this offer is listed --> show link
this.listedArticleId = listedArticleId.get();
offerIsListed = true;
} else {
// this offer is not listed
offerIsListed = false;
}
}
}
}

5
prototype/src/main/java/org/hso/ecommerce/repos/shop/ArticleRepository.java
View File

@ -7,6 +7,7 @@ import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.Optional;
@Repository
public interface ArticleRepository extends JpaRepository<Article, Long> {
@ -26,5 +27,7 @@ public interface ArticleRepository extends JpaRepository<Article, Long> {
@Query("SELECT a FROM CustomerOrderPosition cop JOIN cop.order co JOIN co.customer c JOIN cop.article a WHERE c.id = :customerId ORDER BY co.id DESC")
List<Article> getOrderedArticles(long customerId);
@Query(value = "SELECT a.id FROM articles a WHERE a.related_id = :relatedId", nativeQuery = true)
Optional<Integer> findArticleIDByRelatedID(@Param("relatedId") long relatedId);
}

4
prototype/src/main/java/org/hso/ecommerce/repos/shop/OffersRepository.java
View File

@ -5,6 +5,7 @@ import java.util.List;
import org.hso.ecommerce.entities.supplier.ArticleOffer;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
@Repository
@ -12,5 +13,8 @@ public interface OffersRepository extends JpaRepository<ArticleOffer, Long> {
@Query("SELECT a FROM ArticleOffer a")
List<ArticleOffer> findAll();
@Query("SELECT a FROM ArticleOffer a WHERE a.id = :offeredarticleId")
ArticleOffer findOfferedArticleById(@Param("offeredarticleId") long offeredarticleId);
}

7
prototype/src/main/resources/templates/intern/listedArticles/id.html
View File

@ -28,7 +28,12 @@
</p>
<p class="s">
<label for="ref-article">Refernzierter Artikel</label>
<input class="" type="text" name="ref-article" th:value="${ArticleID.offer_id}" disabled/>
<input class="" type="text" th:value="${ArticleID.offer_id}" disabled/>
<input type="hidden" th:value="${ArticleID.offer_id}" name="ref-article" />
<td><a th:href="${'/intern/supplierOffers/#q=' + {ArticleID.id}}">Details</a></td>
</p>
<div class="spacer"></div>

12
prototype/src/main/resources/templates/intern/offeredArticles/index.html
View File

@ -47,7 +47,17 @@
<td><a th:href="@{/intern/suppliers/{id}(id = ${article.supplierId})}" th:text="${article.supplierName}"></a></td>
<td><span th:text="${article.price}"></span> €</td>
<td><span th:text="${article.ads}"></span></td>
<td><a th:href="@{/intern/articles/{id}(id = ${article.listedArticleId})}" th:text="${article.listedArticleId}"></a></td>
<td>
<div th:if="${article.offerIsListed}">
<a th:href="@{/intern/articles/{id}(id = ${article.listedArticleId})}">Artikel gelistet</a>
</div>
<!-- ELSE -->
<div th:unless="${article.offerIsListed}">
<form class="detailgrid" action="#" th:action="@{/intern/articles/addArticle/{id}(id = ${article.offer_id})}" method="POST">
<input type="submit" value="Hinzufügen" />
</form>
</div>
</td>
</tr>
</tbody>
</table>