From 7aa9e5748ed01a9d77a961bbf2dfe8733c99f351 Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Sun, 19 Sep 2021 16:06:16 +0200
Subject: [PATCH] Allow to add a product picture on product creation (closes
 #1620)

---
 changelog/64_UNRELEASED_xxxx.xx.xx.md |  1 +
 views/productform.blade.php           | 12 +++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/changelog/64_UNRELEASED_xxxx.xx.xx.md b/changelog/64_UNRELEASED_xxxx.xx.xx.md
index 612d59a3..0fcbeb1e 100644
--- a/changelog/64_UNRELEASED_xxxx.xx.xx.md
+++ b/changelog/64_UNRELEASED_xxxx.xx.xx.md
@@ -2,6 +2,7 @@
 - Fixed that plural form handling (e.g. for quantity units) was wrong for negative numbers
 - Fixed that the context menu entries Consume and Transfer on the stock overview page were disabled when the amount in stock was < 1
 - The product and chore edit pages now have bottom-sticky save buttons
+- A product picture can now be added when creating a product (was currently only possible when editing a product)
 
 ### API
 - Fixed that international characters were not allowed in API query filters
diff --git a/views/productform.blade.php b/views/productform.blade.php
index 588b1148..7d0fedfd 100644
--- a/views/productform.blade.php
+++ b/views/productform.blade.php
@@ -506,9 +506,9 @@
 
 	</div>
 
-	<div class="col-lg-6 col-12 @if($mode == 'create') d-none @endif">
+	<div class="col-lg-6 col-12">
 
-		<div class="row @if(!GROCY_FEATURE_FLAG_STOCK) d-none @endif">
+		<div class="row @if($mode == 'create' || !GROCY_FEATURE_FLAG_STOCK) d-none @endif">
 			<div class="col">
 				<div class="title-related-links">
 					<h4>
@@ -615,7 +615,7 @@
 			</div>
 		</div>
 
-		<div class="row mt-2">
+		<div class="row mt-2 @if($mode == 'create') d-none @endif">
 			<div class="col clearfix">
 				<div class="title-related-links">
 					<h4>
@@ -646,7 +646,7 @@
 			</div>
 		</div>
 
-		<div class="row @if(GROCY_FEATURE_FLAG_STOCK) mt-5 @endif">
+		<div class="row @if(GROCY_FEATURE_FLAG_STOCK) mt-5 @endif @if($mode == 'create') d-none @endif">
 			<div class="col">
 				<div class="title-related-links">
 					<h4>
@@ -733,7 +733,7 @@
 			</div>
 		</div>
 
-		<div class="row mt-5">
+		<div class="row @if($mode == 'edit') mt-5 @endif">
 			<div class="col">
 				<div class="title-related-links">
 					<h4>
@@ -746,7 +746,6 @@
 									class="custom-file-input"
 									id="product-picture"
 									accept="image/*">
-								@if($mode == "edit")
 								<label id="product-picture-label"
 									class="custom-file-label @if(empty($product->picture_file_name)) d-none @endif"
 									for="product-picture">
@@ -757,7 +756,6 @@
 									for="product-picture">
 									{{ $__t('No file selected') }}
 								</label>
-								@endif
 							</div>
 							<div class="input-group-append">
 								<span class="input-group-text"><i class="fas fa-trash"