Compare commits
No commits in common. "72ddfa42ef6f98c04c198dde582b3f6ded4b4180" and "b38ffdea34fc891f4469cbe317529fbe2b09c5e3" have entirely different histories.
72ddfa42ef
...
b38ffdea34
@ -1,5 +1,15 @@
|
||||
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.Category;
|
||||
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.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
|
||||
@RequestMapping("intern/articles")
|
||||
public class InternArticleController {
|
||||
@ -243,7 +243,6 @@ public class InternArticleController {
|
||||
public boolean shouldReorder;
|
||||
public String warehouseUnitsPerSlot;
|
||||
public String description;
|
||||
public int vatPercent;
|
||||
|
||||
public String getImgPath() {
|
||||
return imgPath;
|
||||
@ -269,10 +268,6 @@ public class InternArticleController {
|
||||
this.price = price;
|
||||
}
|
||||
|
||||
public int getVatPercent() {
|
||||
return vatPercent;
|
||||
}
|
||||
|
||||
public String getPrice_netto() {
|
||||
return price_netto;
|
||||
}
|
||||
@ -368,7 +363,6 @@ public class InternArticleController {
|
||||
this.shouldReorder = article.shouldReorder;
|
||||
this.warehouseUnitsPerSlot = String.valueOf(article.warehouseUnitsPerSlot);
|
||||
this.description = article.description;
|
||||
this.vatPercent = article.related.vatPercent;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -47,9 +47,8 @@
|
||||
<div class="s">
|
||||
<p>
|
||||
<label for="price">Preis (Netto)</label>
|
||||
<input class="" type="number" id="price" step="0.01" name="price_netto" required
|
||||
th:value="${ArticleID.price_netto}"/> EUR <br/>
|
||||
(<span th:text="${ArticleID.vatPercent}"></span>% Mwst.)
|
||||
<input class="" type="number" id="price" step="0.01" name="price_netto" required th:value="${ArticleID.price_netto}"/> EUR <br/>
|
||||
(19% Mwst.)
|
||||
<!-- Info von article ref--> <br/>
|
||||
= <span th:text="${ArticleID.price}"></span> EUR Brutto
|
||||
</p>
|
||||
|
Reference in New Issue
Block a user