kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-28 09:01:14 +00:00
Code Issues Projects Releases Wiki Activity

Squashed commit

Browse Source 
Fixed recipe ingredient costs/calories calculation when having different QUs and when only_check_single_unit_in_stock is set (fixes #2529)
Added a new column "Product picture" on /products (closes #2640)
Fixed partly opening stock entries stock_id handling (fixes #2391)
This commit is contained in:
Bernd Bestel
2025-01-13 17:41:08 +01:00
parent e7cea3d949
commit f4d5f21832
13 changed files with 188 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
views/products.blade.php
View File

@@ -128,6 +128,7 @@
<th class="">{{ $__t('Product group') }}</th>
<th class="@if(!GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) d-none @endif allow-grouping">{{ $__t('Default store') }}</th>
<th class="">{{ $__t('Grocycode') }}</th>
<th>{{ $__t('Product picture') }}</th>
@include('components.userfields_thead', array(
'userfields' => $userfields
@@ -215,6 +216,12 @@
<img src="{{ $U('/product/' . $product->id . '/grocycode?size=25') }}"
loading="lazy">
</td>
<td>
@if(!empty($product->picture_file_name))
<img src="{{ $U('/api/files/productpictures/' . base64_encode($product->picture_file_name) . '?force_serve_as=picture&best_fit_width=64&best_fit_height=64') }}"
loading="lazy">
@endif
</td>
@include('components.userfields_tbody', array(
'userfields' => $userfields,