kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-10-31 02:36:54 +00:00
Code Issues Projects Releases Wiki Activity

Changelog/little naming changes/fixes/new translations strings for #1056

Browse Source
This commit is contained in:
Bernd Bestel
2020-10-17 11:03:47 +02:00
parent cd65195532
commit e24f3143b5
7 changed files with 98 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
views/purchase.blade.php
View File

@@ -53,7 +53,7 @@
class="text-info font-italic d-none">' . $__t('Tare weight handling enabled - please weigh the whole container, the amount to be posted will be automatically calculcated') . '</div>'
))
@if(boolval($userSettings['product_display_purchased_date']))
@if(boolval($userSettings['show_purchased_date_on_purchase']))
@include('components.datetimepicker2', array(
'id' => 'purchased_date',
'label' => 'Purchased date',
@@ -61,11 +61,9 @@
'initWithNow' => true,
'limitEndToNow' => false,
'limitStartToNow' => false,
'invalidFeedback' => $__t('A purchase date is required'),
'invalidFeedback' => $__t('A purchased date is required'),
'nextInputSelector' => '#best_before_date',
'additionalCssClasses' => 'date-only-datetimepicker2',
'earlierThanInfoLimit' => date('Y-m-d'),
'earlierThanInfoText' => $__t('The given date is earlier than today, are you sure?'),
'additionalGroupCssClasses' => $additionalGroupCssClasses,
'activateNumberPad' => GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_NUMBER_PAD
))

6
views/stocksettings.blade.php
View File

@@ -95,11 +95,11 @@
</label>
</div>
<div class="checkbox">
<label for="product_display_purchased_date">
<label for="show_purchased_date_on_purchase">
<input type="checkbox"
class="user-setting-control"
id="product_display_purchased_date"
data-setting-key="product_display_purchased_date"> {{ $__t('Show purchased date on product purchase form to allow editing from default todays date') }}
id="show_purchased_date_on_purchase"
data-setting-key="show_purchased_date_on_purchase"> {{ $__t('Show purchased date on purchase form (otherwise the purchased date defaults to today)') }}
</label>
</div>
</div>