mirror of
https://github.com/grocy/grocy.git
synced 2025-08-20 04:12:59 +00:00
Squashed commit
Use managed fonts Include userentities dynamically in grocy.openapi.json for /userfields/{entity}/{objectId} endpoints (closes #1218) Fixed userfieldsform load / save (for products and recipes) handling (fixes #1302) Fixed PUT/DELETE /objects/{entity}/{objectId} when the given object id was invalid (fixes #1396) Allow arrays in HTMLPurifier (fixes #1407)
This commit is contained in:
@@ -71,7 +71,7 @@
|
||||
rel="stylesheet">
|
||||
<link href="{{ $U('/node_modules/bootstrap-select/dist/css/bootstrap-select.min.css?v=', true) }}{{ $version }}"
|
||||
rel="stylesheet">
|
||||
<link href="{{ $U('/components_unmanaged/noto-sans-v11-latin/noto-sans-v11-latin.min.css?v=', true) }}{{ $version }}"
|
||||
<link href="{{ $U('/node_modules/@fontsource/noto-sans/latin.css?v=', true) }}{{ $version }}"
|
||||
rel="stylesheet">
|
||||
<link href="{{ $U('/css/grocy.css?v=', true) }}{{ $version }}"
|
||||
rel="stylesheet">
|
||||
@@ -97,8 +97,8 @@
|
||||
Grocy.FeatureFlags = {!! json_encode($featureFlags) !!};
|
||||
Grocy.Webhooks = {
|
||||
@if(GROCY_FEATURE_FLAG_LABELPRINTER && !GROCY_LABEL_PRINTER_RUN_SERVER)
|
||||
"labelprinter" : {
|
||||
"hook" : "{{ GROCY_LABEL_PRINTER_WEBHOOK}}",
|
||||
"labelprinter" : {
|
||||
"hook" : "{{ GROCY_LABEL_PRINTER_WEBHOOK}}",
|
||||
"extra_data" : {!! json_encode(GROCY_LABEL_PRINTER_PARAMS) !!}
|
||||
}
|
||||
@endif
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
<head>
|
||||
<title>{{ $product->name }}</title>
|
||||
<link href="{{ $U('/components_unmanaged/noto-sans-v11-latin/noto-sans-v11-latin.min.css?v=', true) }}{{ $version }}"
|
||||
<link href="{{ $U('/node_modules/@fontsource/noto-sans/latin.css?v=', true) }}{{ $version }}"
|
||||
rel="stylesheet">
|
||||
<style>
|
||||
body {
|
||||
@@ -22,12 +22,13 @@
|
||||
display: inline-block;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<p>
|
||||
<!-- Size gets determined by CSS, so printing works better (more pixels = sharper printed image).
|
||||
<!-- Size gets determined by CSS, so printing works better (more pixels = sharper printed image).
|
||||
Unfortunately, this also means the code is blurred on screen. -->
|
||||
<img src="{{ $U('/stockentry/'. $stockEntry->id . '/grocycode?size=100') }}">
|
||||
<span class="productname">{{ $product->name }}</span><br>
|
||||
|
Reference in New Issue
Block a user