RomanNum3ral
/
kcal
mirror of https://github.com/kcal-app/kcal.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only evaluate serving name in summary when serving is used

This commit is contained in:
Christopher C. Wells 2021-03-02 20:02:20 -08:00
parent 73022ac167
commit 905635c022
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/JournalEntryController.php
View File

@ -187,11 +187,13 @@ class JournalEntryController extends Controller
// Update summary // Update summary
$unit = $ingredient['unit']; $unit = $ingredient['unit'];
if ($item instanceof Food) { if ($item instanceof Food) {
if (empty($item->serving_unit) && empty($item->serving_unit_name)) { if ($unit === 'serving') {
$unit = null; if (empty($item->serving_unit) && empty($item->serving_unit_name)) {
} $unit = null;
elseif (!empty($item->serving_unit_name)) { }
$unit = $item->serving_unit_formatted; elseif (!empty($item->serving_unit_name)) {
$unit = $item->serving_unit_formatted;
}
} }
} }
$entries[$entry_key]->summary .= (!empty($entries[$entry_key]->summary) ? ', ' : null); $entries[$entry_key]->summary .= (!empty($entries[$entry_key]->summary) ? ', ' : null);