kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-30 10:05:45 +00:00
Code Issues Projects Releases Wiki Activity

Added a new sub feature flag FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS

Browse Source
This commit is contained in:
Bernd Bestel 2019-10-05 13:10:56 +02:00
parent ff92e8235f
commit 700db9ae00
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/54_UNRELEASED_2019-xx-xx.md
View File

@ -4,6 +4,9 @@
### Recipe fixes ### Recipe fixes
- Fixed that recipes were displayed without ingredients if the total recipe count was > 100 - Fixed that recipes were displayed without ingredients if the total recipe count was > 100
### Shopping list improvements
- Added a new sub feature flag `FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS` to disable multiple shopping lists if you only need one (defaults to `true`, so no changed behavior when not configured)
### Chores improvements ### Chores improvements
- Added a new period type "yearly" (for yearly schedules) - Added a new period type "yearly" (for yearly schedules)
- Added a "period interval" option per chore to have more flexible schedules (possible for the daily/weekly/monthly/yearly schedules, means "schedule this chore only every x days/weeks/months" to have for example biweekly schedules) - Added a "period interval" option per chore to have more flexible schedules (possible for the daily/weekly/monthly/yearly schedules, means "schedule this chore only every x days/weeks/months" to have for example biweekly schedules)

1
config-dist.php
View File

@ -124,6 +124,7 @@ Setting('FEATURE_FLAG_STOCK_PRICE_TRACKING', true);
Setting('FEATURE_FLAG_STOCK_LOCATION_TRACKING', true); Setting('FEATURE_FLAG_STOCK_LOCATION_TRACKING', true);
Setting('FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING', true); Setting('FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING', true);
Setting('FEATURE_FLAG_STOCK_PRODUCT_OPENED_TRACKING', true); Setting('FEATURE_FLAG_STOCK_PRODUCT_OPENED_TRACKING', true);
Setting('FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS', true);
Setting('FEATURE_FLAG_CHORES_ASSIGNMENTS', true); Setting('FEATURE_FLAG_CHORES_ASSIGNMENTS', true);

2
views/shoppinglist.blade.php
View File

@ -16,6 +16,7 @@
@endpush @endpush
@section('content') @section('content')
@if(GROCY_FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS)
<div class="row border-bottom pb-2 mb-2 d-print-none"> <div class="row border-bottom pb-2 mb-2 d-print-none">
<div class="col-xs-12 col-md-4"> <div class="col-xs-12 col-md-4">
<label for="selected-shopping-list">{{ $__t('Selected shopping list') }}</label> <label for="selected-shopping-list">{{ $__t('Selected shopping list') }}</label>
@ -44,6 +45,7 @@
</div>--> </div>-->
</div> </div>
</div> </div>
@endif
<div class="row d-print-none"> <div class="row d-print-none">
<div class="col"> <div class="col">

4
views/shoppinglistitemform.blade.php
View File

@ -21,6 +21,7 @@
<form id="shoppinglist-form" novalidate> <form id="shoppinglist-form" novalidate>
@if(GROCY_FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS)
<div class="form-group"> <div class="form-group">
<label for="shopping_list_id">{{ $__t('Shopping list') }}</label> <label for="shopping_list_id">{{ $__t('Shopping list') }}</label>
<select class="form-control" id="shopping_list_id" name="shopping_list_id"> <select class="form-control" id="shopping_list_id" name="shopping_list_id">
@ -29,6 +30,9 @@
@endforeach @endforeach
</select> </select>
</div> </div>
@else
<input type="hidden" id="shopping_list_id" name="shopping_list_id" value="1">
@endif
@php if($mode == 'edit') { $productId = $listItem->product_id; } else { $productId = ''; } @endphp @php if($mode == 'edit') { $productId = $listItem->product_id; } else { $productId = ''; } @endphp
@include('components.productpicker', array( @include('components.productpicker', array(