From 520f2660d1ec38418be1cdf735d2540ee1295899 Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Sun, 6 Sep 2020 13:08:00 +0200
Subject: [PATCH] Moved the "Jounral summary" button to the stock journal page

---
 localization/strings.pot      |  6 +++---
 views/stockjournal.blade.php  | 11 +++++++----
 views/stockoverview.blade.php | 17 ++++++++---------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/localization/strings.pot b/localization/strings.pot
index 66e5dd37..55b40579 100644
--- a/localization/strings.pot
+++ b/localization/strings.pot
@@ -1901,8 +1901,8 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-msgid "Journal-Summary"
-msgstr ""
-
 msgid "Stock journal summary"
 msgstr ""
+
+msgid "Journal summary"
+msgstr ""
diff --git a/views/stockjournal.blade.php b/views/stockjournal.blade.php
index b2d0a913..a98622dd 100644
--- a/views/stockjournal.blade.php
+++ b/views/stockjournal.blade.php
@@ -5,12 +5,15 @@
 @section('viewJsName', 'stockjournal')
 
 @section('content')
-<div class="row">
-	<div class="col">
-		<h2 class="title">@yield('title')</h2>
+<div class="title-related-links">
+	<h2 class="title">@yield('title')</h2>
+	<div class="related-links">
+		<a class="btn btn-outline-dark responsive-button"
+			href="{{ $U('/stockjournal/summary') }}">
+			{{ $__t('Journal summary') }}
+		</a>
 	</div>
 </div>
-
 <hr>
 <div class="row my-3">
 	<div class="col-xs-12 col-md-6 col-xl-3">
diff --git a/views/stockoverview.blade.php b/views/stockoverview.blade.php
index c5d2ef3a..95b1768d 100644
--- a/views/stockoverview.blade.php
+++ b/views/stockoverview.blade.php
@@ -19,10 +19,6 @@
 		<div class="title-related-links">
 			<h2 class="title">@yield('title')</h2>
 			<div class="related-links">
-				<a class="btn btn-outline-dark responsive-button"
-				   href="{{ $U('/stockjournal/summary') }}">
-					{{ $__t('Stock journal summary') }}
-				</a>
 				<a class="btn btn-outline-dark responsive-button"
 					href="{{ $U('/stockjournal') }}">
 					{{ $__t('Journal') }}
@@ -146,7 +142,9 @@
 			<tbody class="d-none">
 				@foreach($currentStock as $currentStockEntry)
 				<tr id="product-{{ $currentStockEntry->product_id }}-row"
-					class="@if(GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING && $currentStockEntry->best_before_date < date('Y-m-d 23:59:59', strtotime('-1 days')) && $currentStockEntry->amount > 0) table-danger @elseif(GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING && $currentStockEntry->best_before_date < date('Y-m-d 23:59:59', strtotime("+$nextXDays days"))
+					class="@if(GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING && $currentStockEntry->best_before_date < date('Y-m-d 23:59:59', strtotime('-1 days')) && $currentStockEntry->amount > 0) table-danger @elseif(GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING && $currentStockEntry->best_before_date < date('Y-m-d 23:59:59', strtotime("
+					+$nextXDays
+					days"))
 					&&
 					$currentStockEntry->amount > 0) table-warning @elseif ($currentStockEntry->product_missing) table-info @endif">
 					<td class="fit-content border-right">
@@ -273,9 +271,9 @@
 								</a>
 								@endif
 								<a class="dropdown-item"
-								   type="button"
-								   href="{{ $U('/stockjournal/summary?product_id=') }}{{ $currentStockEntry->product_id }}">
-									<span class="dropdown-item-icon"><i class="fas fa-cocktail"></i></span> <span class="dropdown-item-text">{{ $__t('Journal-Summary') }}</span>
+									type="button"
+									href="{{ $U('/stockjournal/summary?product_id=') }}{{ $currentStockEntry->product_id }}">
+									<span class="dropdown-item-icon"><i class="fas fa-cocktail"></i></span> <span class="dropdown-item-text">{{ $__t('Journal summary') }}</span>
 								</a>
 							</div>
 						</div>
@@ -331,7 +329,8 @@
 							&&
 							$currentStockEntry->amount > 0) expired @elseif($currentStockEntry->best_before_date < date('Y-m-d
 								23:59:59',
-								strtotime("+$nextXDays days"))
+								strtotime("+$nextXDays
+								days"))
 								&&
 								$currentStockEntry->amount > 0) expiring @endif @if($currentStockEntry->product_missing) belowminstockamount @endif
 					</td>