From 16b17b25a458606efaef517d171572c0d5ff2ea4 Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Sat, 14 Nov 2020 11:07:36 +0100
Subject: [PATCH] Reordered input fields

---
 views/consume.blade.php  | 26 +++++++++++++-------------
 views/transfer.blade.php | 30 +++++++++++++++---------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/views/consume.blade.php b/views/consume.blade.php
index 3fbdf2b9..c1fde9df 100644
--- a/views/consume.blade.php
+++ b/views/consume.blade.php
@@ -93,6 +93,19 @@
 			</div>
 			@endif
 
+			<div class="form-group">
+				<div class="custom-control custom-checkbox">
+					<input class="form-check-input custom-control-input"
+						type="checkbox"
+						id="spoiled"
+						name="spoiled"
+						value="1">
+					<label class="form-check-label custom-control-label"
+						for="spoiled">{{ $__t('Spoiled') }}
+					</label>
+				</div>
+			</div>
+
 			<div class="form-group">
 				<div class="custom-control custom-checkbox">
 					<input class="form-check-input custom-control-input"
@@ -115,19 +128,6 @@
 				</select>
 			</div>
 
-			<div class="form-group">
-				<div class="custom-control custom-checkbox">
-					<input class="form-check-input custom-control-input"
-						type="checkbox"
-						id="spoiled"
-						name="spoiled"
-						value="1">
-					<label class="form-check-label custom-control-label"
-						for="spoiled">{{ $__t('Spoiled') }}
-					</label>
-				</div>
-			</div>
-
 			@if (GROCY_FEATURE_FLAG_RECIPES)
 			@include('components.recipepicker', array(
 			'recipes' => $recipes,
diff --git a/views/transfer.blade.php b/views/transfer.blade.php
index 4cedccfc..f4827bad 100644
--- a/views/transfer.blade.php
+++ b/views/transfer.blade.php
@@ -47,6 +47,21 @@
 				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>'
 			))
 
+			<div class="form-group">
+				<label for="location_id_to">{{ $__t('To location') }}</label>
+				<select required
+					class="form-control location-combobox"
+					id="location_id_to"
+					name="location_id_to">
+					<option></option>
+					@foreach($locations as $location)
+					<option value="{{ $location->id }}"
+						data-is-freezer="{{ $location->is_freezer }}">{{ $location->name }}</option>
+					@endforeach
+				</select>
+				<div class="invalid-feedback">{{ $__t('A location is required') }}</div>
+			</div>
+
 			<div class="form-group">
 				<div class="custom-control custom-checkbox">
 					<input class="form-check-input custom-control-input"
@@ -69,21 +84,6 @@
 				</select>
 			</div>
 
-			<div class="form-group">
-				<label for="location_id_to">{{ $__t('To location') }}</label>
-				<select required
-					class="form-control location-combobox"
-					id="location_id_to"
-					name="location_id_to">
-					<option></option>
-					@foreach($locations as $location)
-					<option value="{{ $location->id }}"
-						data-is-freezer="{{ $location->is_freezer }}">{{ $location->name }}</option>
-					@endforeach
-				</select>
-				<div class="invalid-feedback">{{ $__t('A location is required') }}</div>
-			</div>
-
 			<button id="save-transfer-button"
 				class="btn btn-success">{{ $__t('OK') }}</button>