c0a1da23ec
save
2025-04-30 21:32:48 +02:00
Godfrey M
bc3b3cf86e
add psuedo example location_id for preview
2025-04-07 12:53:17 -07:00
Godfrey M
a69133e2ae
adds location qr code option to labels
2025-04-07 12:36:05 -07:00
Marcus Moore
d88fe1f48a
Merge branch 'develop' into chore/migrate-select-helper
2025-03-06 13:39:05 -08:00
Marcus Moore
c798df2920
Replace Form::label on label settings page
2025-03-04 16:34:22 -08:00
Marcus Moore
2a156776a4
Merge branch 'develop' into chore/migrate-select-helper
...
# Conflicts:
# resources/views/settings/branding.blade.php
# resources/views/settings/general.blade.php
2025-03-04 11:19:38 -08:00
Marcus Moore
a0dc056da8
Replace Form::checkbox on label settings page
2025-02-26 16:33:07 -08:00
snipe
071b4d1e67
Merge pull request #16245 from marcusmoore/chore/migrate-form-open-pt5
...
Replace Form::open and Form::close pt5
2025-02-18 21:23:15 +00:00
snipe
1fe170e6a1
Merge pull request #16040 from Godmartinz/template_validate_error
...
Adds a null check to label templates, adds return types for validation methods
2025-02-18 21:00:10 +00:00
Marcus Moore
2df995c2c7
Remove unneeded Form::open on label settings page
2025-02-12 13:29:02 -08:00
Marcus Moore
ad182a96fa
Migrate Form::open and Form::close on label settings
2025-02-12 13:28:40 -08:00
Marcus Moore
0797c4ac97
Merge branch 'develop' into chore/sc-28173
...
# Conflicts:
# resources/views/settings/saml.blade.php
# resources/views/settings/security.blade.php
# resources/views/setup/user.blade.php
2025-02-10 15:57:41 -08:00
Marcus Moore
00e7795414
Merge branch 'develop' into chore/migrate-select-helper
...
# Conflicts:
# resources/views/partials/forms/edit/company.blade.php
2025-02-10 15:44:02 -08:00
Marcus Moore
00cdb13803
Convert remaining Form:hidden in labels view
2025-01-27 11:23:01 -08:00
Marcus Moore
ef6d747b37
Convert some Form:hidden in labels view
2025-01-27 11:15:09 -08:00
Godfrey M
79a4c83879
add spaces
2025-01-16 13:23:16 -08:00
Marcus Moore
8e790fdc47
Replace Form::text in certain views
2025-01-15 13:37:00 -08:00
Marcus Moore
9a043da005
Convert additional Form::select to blade component
2025-01-13 16:16:49 -08:00
Nebel
9f0581275b
Merge branch 'develop' into feature/custom-data-options-for-2d-barcode
2025-01-13 15:49:32 +01:00
Godfrey M
0118504cd3
adds redirect to render and save if template is null
2025-01-08 15:32:23 -08:00
Godfrey M
94f44d1b77
fix label type values in db and defaults. update help text
2025-01-07 10:00:52 -08:00
NebelKreis
52e4414bc5
Feature: Added asset ID option to 2D barcode in label generation
2024-11-05 13:41:34 +01:00
NebelKreis
f96b7c5056
Feature: Added data type context for select options with "URL:" and "Data:" labels, including translations
2024-11-05 13:40:33 +01:00
Godfrey M
de77eda33d
another line indent
2024-10-31 14:38:32 -07:00
Godfrey M
ee58fcc898
moved lines in for labels
2024-10-31 14:37:08 -07:00
NebelKreis
e22296fd79
Feature: Added serial number option to 2D barcode in label generation
2024-10-29 13:49:05 +01:00
NebelKreis
6c17d7d732
Fix: Corrected path in translation function
...
Updated the translation function to use the correct path, ensuring that instead of displaying the translation path as plain text, the appropriate translation is now shown as intended.
2024-10-29 11:45:29 +01:00
NebelKreis
6f3fb47e4a
Feature: Added asset tag option to barcode in label generation
2024-10-28 15:39:04 +01:00
Godfrey M
c9854d43a5
fixes selection order
2024-09-17 16:56:02 -07:00
Godfrey M
04708ae2b2
only allows PDF417 for new label engine
2024-09-17 16:54:50 -07:00
Godfrey M
b33c0fc4dd
updates getbarcode method and labels view
2024-09-17 16:15:56 -07:00
Godfrey M
ce987b4f6d
added front end barcodes to labels
2024-09-17 11:23:38 -07:00
snipe
be5f3f38f8
Settings pages
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-19 14:48:12 +01:00
snipe
bffba02511
Updated icons
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-18 17:26:44 +01:00
snipe
ad6d09b6ad
Removed default label
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-16 16:43:51 +01:00
Marcus Moore
d4861a74df
Merge branch 'develop' into chore/sc-23725/livewire3
...
# Conflicts:
# composer.lock
2024-06-25 10:15:50 -07:00
snipe
6cbdbcb1f1
Merge pull request #14791 from Godmartinz/label-option-limit
...
Added some style changes in label field selector for the `DefaultLabel` template
2024-06-20 13:51:49 +01:00
Marcus Moore
c3e6e1144f
Merge branch 'develop' into chore/sc-23725/livewire3
2024-06-12 15:12:40 -07:00
Godfrey M
77e6058e4c
remembers chosen label
2024-06-06 13:55:15 -07:00
Godfrey M
4a60026162
moves preview down by field definitions
2024-06-06 13:42:06 -07:00
Godfrey M
6df1c36011
oops
2024-06-06 13:24:02 -07:00
Godfrey M
44dae22a3c
adjust label preview window
2024-06-06 13:18:19 -07:00
Marcus Moore
b2a0e7958b
Inject alpine on label engine page
2024-06-04 17:03:36 -07:00
Godfrey M
713ce7836f
add some css in label field selector
2024-05-29 13:07:33 -07:00
Godfrey M
feb78d00cf
conditionally shows label fields if on old label engine only
2024-03-06 11:25:49 -08:00
Godfrey M
b67ceab849
fields appear in preview, but not bulk generate labels
2024-02-27 11:29:19 -08:00
Godfrey M
550f9e2afa
removes visibility checkmarks for certain fields when in new label engine
2024-02-22 16:19:28 -08:00
Godfrey M
c0215baca5
minor changes
2024-02-22 11:41:04 -08:00
Godfrey M
c62758c5b5
adds custom field select to default label view
2024-02-22 11:36:39 -08:00
Marcus Moore
a47e36c1e5
Add custom fields as options
2023-09-27 16:51:53 -07:00
