From b0e1664e09855445a5e58f4705e479520c47efb0 Mon Sep 17 00:00:00 2001
From: Katharina Bogad <katharina@bogad.at>
Date: Fri, 25 Jun 2021 23:46:47 +0200
Subject: [PATCH] Fix stockentryform

---
 js/viewjs/stockentryform.js    |  2 +-
 views/layout/json.blade.php    |  4 ++--
 views/stockentryform.blade.php | 10 +++++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/js/viewjs/stockentryform.js b/js/viewjs/stockentryform.js
index c715e6ff..44f6c0d8 100644
--- a/js/viewjs/stockentryform.js
+++ b/js/viewjs/stockentryform.js
@@ -26,12 +26,12 @@ function stockentryformView(Grocy, scope = null)
 		var jsonForm = $scope('#stockentry-form').serializeJSON();
 		Grocy.FrontendHelpers.BeginUiBusy("stockentry-form");
 
+		var jsonData = {};
 		if (!jsonForm.price.toString().isEmpty())
 		{
 			jsonData.price = parseFloat(jsonForm.price).toFixed(Grocy.UserSettings.stock_decimal_places_prices);
 		}
 
-		var jsonData = {};
 		jsonData.amount = jsonForm.amount;
 		jsonData.best_before_date = datetimepicker.GetValue();
 		jsonData.purchased_date = datetimepicker2.GetValue();
diff --git a/views/layout/json.blade.php b/views/layout/json.blade.php
index 9bdb77e4..d40f6180 100644
--- a/views/layout/json.blade.php
+++ b/views/layout/json.blade.php
@@ -9,13 +9,13 @@ $content = $__env->yieldContent('content');
 $config = "{\n" . $__env->yieldContent('grocyConfigProps') . '}';
 $config = preg_replace('/(\n[\t ]*)([a-zA-Z0-9_]+):/','${1}"${2}":', $config);
 $config = preg_replace('/: *\'(.*?)\',?\n/', ':"${1}",', $config);
-$config = preg_replace('/,(\n[\t ]+)?}$/', '}', $config);
+$config = preg_replace('/,(\n[\t ]*)?}$/', '}', $config);
 $grocy_options = json_decode($config, true);
 
 $usersettings = "{\n" . $__env->yieldContent('forceUserSettings') . '}';
 $usersettings = preg_replace('/(\n[\t ]*)([a-zA-Z0-9_]+):/','${1}"${2}":', $usersettings);
 $usersettings = preg_replace('/: *\'(.*?)\',?\n/', ':"${1}",', $usersettings);
-$usersettings = preg_replace('/,(\n[\t ]+)?}$/', '}', $usersettings);
+$usersettings = preg_replace('/,(\n[\t ]*)?}$/', '}', $usersettings);
 $usersettings = json_decode($usersettings, true);
 if($usersettings != null)
 	$grocy_options["UserSettings"] = $usersettings;
diff --git a/views/stockentryform.blade.php b/views/stockentryform.blade.php
index fedf54c1..cbba7311 100644
--- a/views/stockentryform.blade.php
+++ b/views/stockentryform.blade.php
@@ -4,9 +4,9 @@
 @section('viewJsName', 'stockentryform')
 
 @section('grocyConfigProps')
-EditMode: '{{ $mode }}',
+EditMode: "edit",
 EditObjectId: {{ $stockEntry->id }},
-EditObjectProductId: {{ $stockEntry->product_id },
+EditObjectProductId: {{ $stockEntry->product_id }},
 @endsection
 
 @section('content')
@@ -18,8 +18,12 @@ EditObjectProductId: {{ $stockEntry->product_id },
 
 <hr class="my-2">
 
+@php
+$classes = $embedded ? '' : 'col-md-6 col-xl-4'
+@endphp
+
 <div class="row">
-	<div class="col-12 col-md-6 col-xl-4 pb-3">
+	<div class="col-12 {{ $classes }} pb-3">
 
 		<form id="stockentry-form"
 			novalidate>