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

Implement Warehouse.... #47

Merged
Seil0 merged 6 commits from feature/intern_warehouse into master 2020-06-08 13:40:11 +02:00
Conversation 3 Commits 6 Files Changed 19 +1417 -1173
57 changed files with 1417 additions and 1173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fc239983a7 - Show all commits

2
prototype/src/main/resources/templates/intern/warehouse/id_progress.html
View File

@ -44,7 +44,7 @@
</tr> </tr>
<tr th:each="pos : ${booking.positions}"> <tr th:each="pos : ${booking.positions}">
<td><img th:src="@{/shop/articles/{id}/image.jpg(id=${pos.article.id})}" class="s"/></td> <td><img th:src="@{/shop/articles/{id}/image.jpg(id=${pos.article.id})}" class="s"/></td>
<td><a th:href="@{/intern/listedArticles/{id}(id=${pos.article.id})}" <td><a th:href="@{/intern/articles/{id}(id=${pos.article.id})}"
th:text="${pos.article.title}"></a></td> th:text="${pos.article.title}"></a></td>
<th:block th:if="${pos.amount > 0}"> <th:block th:if="${pos.amount > 0}">
<td th:text="${pos.amount}"></td> <td th:text="${pos.amount}"></td>

2
prototype/src/main/resources/templates/intern/warehouse/index.html
View File

@ -78,7 +78,7 @@
<tr th:data-group="${booking.id}" th:each="pos : ${booking.positions}"> <tr th:data-group="${booking.id}" th:each="pos : ${booking.positions}">
<td></td> <td></td>
<td><a th:href="@{/intern/listedArticles/{id}(id=${pos.article.id})}" <td><a th:href="@{/intern/articles/{id}(id=${pos.article.id})}"
th:text="${pos.article.title}"></a></td> th:text="${pos.article.title}"></a></td>
<th:block th:if="${pos.amount > 0}"> <th:block th:if="${pos.amount > 0}">
<td th:text="${pos.amount}"></td> <td th:text="${pos.amount}"></td>

2
prototype/src/main/resources/templates/intern/warehouse/todo.html
View File

@ -78,7 +78,7 @@
<tr th:each="pos : ${booking.positions}" th:data-group="${booking.id}"> <tr th:each="pos : ${booking.positions}" th:data-group="${booking.id}">
<td><img th:src="@{/shop/articles/{id}/image.jpg(id=${pos.article.id})}" class="s"/></td> <td><img th:src="@{/shop/articles/{id}/image.jpg(id=${pos.article.id})}" class="s"/></td>
<td><a th:href="@{/intern/listedArticles/{id}(id=${pos.article.id})}" <td><a th:href="@{/intern/articles/{id}(id=${pos.article.id})}"
th:text="${pos.article.title}"></a></td> th:text="${pos.article.title}"></a></td>
<th:block th:if="${pos.amount > 0}"> <th:block th:if="${pos.amount > 0}">
<td th:text="${pos.amount}"></td> <td th:text="${pos.amount}"></td>