Fixed LABEL_PRINTER_HOOK_JSON check was missing when running label printer WebHooks client side (fixes #1978)

changelog/69_UNRELEASED_xxxx-xx-xx.md

@@ -57,6 +57,7 @@
 
 ### General
 
+- Fixed that when running label printer WebHooks client side (so when `LABEL_PRINTER_RUN_SERVER` = `false`), the setting `LABEL_PRINTER_HOOK_JSON` was ignored (the WebHook data was always sent as form data)
 - New translations: (thanks all the translators)
   - Lithuanian (demo available at <https://lt.demo.grocy.info>)
 

public/js/grocy.js

@@ -504,6 +504,19 @@ Grocy.FrontendHelpers.RunWebhook = function(webhook, data, repetitions = 1)
 	var hasAlreadyFailed = false;
 
 	for (i = 0; i < repetitions; i++)
+	{
+		if (webhook.json)
+		{
+			$.ajax(webhook.hook, { "data": JSON.stringify(data), "contentType": "application/json", "type": "POST" }).fail(function(req, status, errorThrown)
+			{
+				if (!hasAlreadyFailed)
+				{
+					hasAlreadyFailed = true;
+					Grocy.FrontendHelpers.ShowGenericError(__t("Error while executing WebHook", { "status": status, "errorThrown": errorThrown }));
+				}
+			});
+		}
+		else
 		{
 			$.post(webhook.hook, data).fail(function(req, status, errorThrown)
 			{
@@ -515,6 +528,7 @@ Grocy.FrontendHelpers.RunWebhook = function(webhook, data, repetitions = 1)
 			});
 		}
 	}
+}
 
 $(document).on("keyup paste change", "input, textarea", function()
 {

views/layout/default.blade.php

@@ -104,7 +104,8 @@
 		@if(GROCY_FEATURE_FLAG_LABEL_PRINTER && !GROCY_LABEL_PRINTER_RUN_SERVER)
 			"labelprinter" : {
 				"hook": "{{ GROCY_LABEL_PRINTER_WEBHOOK }}",
-				"extra_data" : {!! json_encode(GROCY_LABEL_PRINTER_PARAMS) !!}
+				"extra_data": {!! json_encode(GROCY_LABEL_PRINTER_PARAMS) !!},
+				"json": {{ BoolToString(GROCY_LABEL_PRINTER_HOOK_JSON) }}
 			}
 		@endif
 		};