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

Squashed commit

Browse Source 
Make it possible to actively not-check a mandatory checkbox Userfield (closes #2601)
Pluralize the "opened" localization string (closes #2280)
Added a trendline to the price history chart (closes #2237)
Various minor style/code refinements
This commit is contained in:
Bernd Bestel
2025-01-14 17:54:06 +01:00
parent c99dd46007
commit 11d28622e8
32 changed files with 134 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
views/components/camerabarcodescanner.blade.php
View File

@@ -10,7 +10,7 @@
@push('pageStyles')
<style>
#barcodescanner-start-button {
#camerabarcodescanner-start-button {
position: absolute;
right: 0;
margin-top: 4px;
@@ -18,8 +18,8 @@
cursor: pointer;
}
.combobox-container #barcodescanner-start-button {
margin-right: 36px !important;
.combobox-container #camerabarcodescanner-start-button {
margin-right: 38px !important;
}
</style>
@endpush

1
views/layout/default.blade.php
View File

@@ -747,6 +747,7 @@
<script src="{{ $U('/packages/chartjs-plugin-colorschemes/dist/chartjs-plugin-colorschemes.min.js?v=', true) }}{{ $version}}"></script>
<script src="{{ $U('/packages/chartjs-plugin-doughnutlabel/dist/chartjs-plugin-doughnutlabel.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/packages/chartjs-plugin-piechart-outlabels/dist/chartjs-plugin-piechart-outlabels.min.js?v=', true) }}{{ $version}}"></script>
<script src="{{ $U('/packages/chartjs-plugin-trendline/dist/chartjs-plugin-trendline.min.js?v=', true) }}{{ $version}}"></script>
@endif
<script src="{{ $U('/js/extensions.js?v=', true) }}{{ $version }}"></script>

3
views/shoppinglist.blade.php
View File

@@ -249,8 +249,11 @@
$productQuConversion = FindObjectInArrayByPropertyValue($productQuConversions, 'to_qu_id', $listItem->qu_id);
if ($productQuConversion)
{
if (is_numeric($listItem->amount) && is_numeric($productQuConversion->factor)) // However people manage to have a non-number here, happened at least a trilion times for Grocy Mobile (iOS) users
{
$listItem->amount = $listItem->amount * $productQuConversion->factor;
}
}
@endphp
@endif
<td>

2
views/stockentries.blade.php
View File

@@ -259,7 +259,7 @@
<span id="stock-{{ $stockEntry->id }}-amount"
class="locale-number locale-number-quantity-amount">{{ $stockEntry->amount }}</span> <span id="product-{{ $stockEntry->product_id }}-qu-name">{{ $__n($stockEntry->amount, FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $stockEntry->product_id)->qu_id_stock)->name, FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $stockEntry->product_id)->qu_id_stock)->name_plural, true) }}</span>
<span id="stock-{{ $stockEntry->id }}-opened-amount"
class="small font-italic">@if($stockEntry->open == 1){{ $__t('Opened') }}@endif</span>
class="small font-italic">@if($stockEntry->open == 1){{ $__n($stockEntry->amount, 'Opened', 'Opened') }}@endif</span>
</td>
<td class="@if(!GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING) d-none @endif">
<span id="stock-{{ $stockEntry->id }}-due-date">{{ $stockEntry->best_before_date }}</span>

2
views/stockentryform.blade.php
View File

@@ -137,7 +137,7 @@
<div class="custom-control custom-checkbox">
<input @if($stockEntry->open == 1) checked @endif class="form-check-input custom-control-input" type="checkbox" id="open" name="open" value="1">
<label class="form-check-label custom-control-label"
for="open">{{ $__t('Opened') }}</label>
for="open">{{ $__n(1, 'Opened', 'Opened') }}</label>
</div>
</div>
@endif