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

Compare commits

base: localhorst:72ddfa42ef6f98c04c198dde582b3f6ded4b4180
Branches Tags
localhorst:master
localhorst:release
localhorst:v1.0-final-1
localhorst:1.0.0
..
compare: localhorst:b38ffdea34fc891f4469cbe317529fbe2b09c5e3
Branches Tags
localhorst:master
localhorst:release
localhorst:v1.0-final-1
localhorst:1.0.0

No commits in common. "72ddfa42ef6f98c04c198dde582b3f6ded4b4180" and "b38ffdea34fc891f4469cbe317529fbe2b09c5e3" have entirely different histories.
72ddfa42ef ... b38ffdea34

2 changed files with 12 additions and 19 deletions
Show Stats Expand all files Collapse all files

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

@ -1,5 +1,15 @@
package org.hso.ecommerce.controller.intern; package org.hso.ecommerce.controller.intern;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import javax.imageio.ImageIO;
import org.hso.ecommerce.entities.shop.Article; import org.hso.ecommerce.entities.shop.Article;
import org.hso.ecommerce.entities.shop.Category; import org.hso.ecommerce.entities.shop.Category;
import org.hso.ecommerce.entities.shop.Image; import org.hso.ecommerce.entities.shop.Image;
@ -17,16 +27,6 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.view.RedirectView; import org.springframework.web.servlet.view.RedirectView;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
@Controller @Controller
@RequestMapping("intern/articles") @RequestMapping("intern/articles")
public class InternArticleController { public class InternArticleController {
@ -243,7 +243,6 @@ public class InternArticleController {
public boolean shouldReorder; public boolean shouldReorder;
public String warehouseUnitsPerSlot; public String warehouseUnitsPerSlot;
public String description; public String description;
public int vatPercent;
public String getImgPath() { public String getImgPath() {
return imgPath; return imgPath;
@ -269,10 +268,6 @@ public class InternArticleController {
this.price = price; this.price = price;
} }
public int getVatPercent() {
return vatPercent;
}
public String getPrice_netto() { public String getPrice_netto() {
return price_netto; return price_netto;
} }
@ -368,7 +363,6 @@ public class InternArticleController {
this.shouldReorder = article.shouldReorder; this.shouldReorder = article.shouldReorder;
this.warehouseUnitsPerSlot = String.valueOf(article.warehouseUnitsPerSlot); this.warehouseUnitsPerSlot = String.valueOf(article.warehouseUnitsPerSlot);
this.description = article.description; this.description = article.description;
this.vatPercent = article.related.vatPercent;
} }
} }

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

@ -47,9 +47,8 @@
<div class="s"> <div class="s">
<p> <p>
<label for="price">Preis (Netto)</label> <label for="price">Preis (Netto)</label>
<input class="" type="number" id="price" step="0.01" name="price_netto" required <input class="" type="number" id="price" step="0.01" name="price_netto" required th:value="${ArticleID.price_netto}"/>&nbsp;EUR <br/>
th:value="${ArticleID.price_netto}"/>&nbsp;EUR <br/> (19% Mwst.)
(<span th:text="${ArticleID.vatPercent}"></span>% Mwst.)
<!-- Info von article ref--> <br/> <!-- Info von article ref--> <br/>
= <span th:text="${ArticleID.price}"></span>&nbsp;EUR Brutto = <span th:text="${ArticleID.price}"></span>&nbsp;EUR Brutto
</p> </p>