kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 12:20:22 +00:00
Code Issues Projects Releases Wiki Activity

Implemented notes and Userfields for stock entries (closes #443)

Browse Source
This commit is contained in:
Bernd Bestel
2022-03-30 17:32:53 +02:00
parent 2983687f34
commit d3a39270de
18 changed files with 438 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
views/stockentries.blade.php
View File

@@ -73,9 +73,14 @@
data-shadow-rowgroup-column="9">{{ $__t('Purchased date') }}</th>
<th class="d-none">Hidden purchased_date</th>
<th>{{ $__t('Timestamp') }}</th>
<th>{{ $__t('Note') }}</th>
@include('components.userfields_thead', array(
'userfields' => $userfields
'userfields' => $userfieldsProducts
))
@include('components.userfields_thead', array(
'userfields' => $userfieldsStock
))
</tr>
</thead>
@@ -274,10 +279,18 @@
<time class="timeago timeago-contextual"
datetime="{{ $stockEntry->row_created_timestamp }}"></time>
</td>
<td>
<span id="stock-{{ $stockEntry->id }}-note">{{ $stockEntry->note }}</span>
</td>
@include('components.userfields_tbody', array(
'userfields' => $userfields,
'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $stockEntry->product_id)
'userfields' => $userfieldsProducts,
'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValuesProducts, 'object_id', $stockEntry->product_id)
))
@include('components.userfields_tbody', array(
'userfields' => $userfieldsStock,
'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValuesStock, 'object_id', $stockEntry->stock_id)
))
</tr>