Skip to content
Open
Show file tree
Hide file tree
Changes from 105 commits
Commits
Show all changes
130 commits
Select commit Hold shift + click to select a range
968abd2
add labelEditor extraction methods for 3490_A
Godmartinz Mar 23, 2026
b3b57ff
adds methods to _5267_A, _5520_A
Godmartinz Mar 23, 2026
fbea93e
adds methods to _5520B, L4736_A
Godmartinz Mar 23, 2026
18d1556
adds methods to L6009_A, L7162_A, L7162_B, L7163_A
Godmartinz Mar 23, 2026
17cf36b
adds methods to DefaultLabel
Godmartinz Mar 23, 2026
79334cd
adds crappy blade for now, label edit route
Godmartinz Mar 23, 2026
b4224eb
adds custom label table, adds more to the jank editor debug screen
Godmartinz Mar 23, 2026
f948f29
attempting to get the preview working
Godmartinz Mar 24, 2026
9aa596d
move labels template table to component, update label preview name wi…
Godmartinz Mar 24, 2026
b67e7b5
add clone button to labels table
Godmartinz Mar 24, 2026
5217001
formats label names, getting custom label heirarchy in order
Godmartinz Mar 25, 2026
997d143
Label preview is loading
Godmartinz Mar 25, 2026
ffa1b63
barcodes and fields appear in preview
Godmartinz Mar 26, 2026
5658e55
fixed field layout a bit, more needed, values missing
Godmartinz Mar 26, 2026
a5ae139
save preview label
Godmartinz Apr 2, 2026
621064d
1d barcode is available if you want it, field layout has been applied…
Godmartinz Apr 9, 2026
ca6b33d
adds tag alignment option
Godmartinz Apr 9, 2026
1d46fa0
convert units all into mm
Godmartinz Apr 14, 2026
659e649
maps correctly for Default Label
Godmartinz Apr 15, 2026
874884b
revert barcode sizing defaults
Godmartinz Apr 15, 2026
d7a07b9
Merge branch 'develop' into Label_customization
Godmartinz Apr 15, 2026
c9d3acb
refactor the write method, add barcode inputs
Godmartinz Apr 16, 2026
b007e81
clean up
Godmartinz Apr 20, 2026
0639334
building the store method, add customuserLabel model
Godmartinz Apr 21, 2026
5d7c9e6
adds label directory search for template match, override diff logic
Godmartinz Apr 23, 2026
9810fa1
add custom labels to label table, add doc blocks to CustomUserLabel m…
Godmartinz Apr 23, 2026
36b9139
add label actions, remove preview label from list, add destroy method…
Godmartinz Apr 24, 2026
4056894
fix share button, saving js changes for testing
Godmartinz Apr 25, 2026
c852697
adds import input, route, controller method, fixes config_snapshot
Godmartinz Apr 25, 2026
b347de6
add update and create methods, allow clone of a custom label, fix api…
Godmartinz Apr 25, 2026
0f88635
differentiate createURLs for cloning custom and base labels
Godmartinz Apr 27, 2026
4f04637
label preview on settings works with custom labels
Godmartinz Apr 29, 2026
8458529
save custom labels in the settings table, preload saved label in index
Godmartinz Apr 29, 2026
0b6c3d5
add json file and text option for gui
Godmartinz May 12, 2026
3799828
add validation for label import, fix footer on label edit blade
Godmartinz May 12, 2026
3c01a8e
move example asset to asset factory
Godmartinz May 12, 2026
345a06b
use setRelation for protected members in labelPreview
Godmartinz May 12, 2026
7205d82
remove reminder text from migration
Godmartinz May 12, 2026
f42bbad
tape labels preview in editor
Godmartinz May 12, 2026
358760e
Merge branch 'develop' into Label_customization
Godmartinz May 12, 2026
83a80ed
add getters for tze18mm and fixed layout for tapes and preview select
Godmartinz May 12, 2026
84a23cb
added an inline and block render bool and method for tapes
Godmartinz May 13, 2026
36d4219
adds custom placement of the 1d barcode
Godmartinz May 13, 2026
424b5f6
adds 24mm B and C getters
Godmartinz May 13, 2026
3efd1f9
add getters to 24mm D and E, remove previewtape from index
Godmartinz May 13, 2026
2e4aa33
working on page orientation for tapes, bit of cleanup
Godmartinz May 19, 2026
a6956bc
fixes label rotation, swaps logo and 2d code in config and gui
Godmartinz Jun 3, 2026
f3ac596
adds text_column positioning for the logo
Godmartinz Jun 3, 2026
57788ac
add Config getter for TZe_241
Godmartinz Jun 3, 2026
5cb4d69
add Config getter for labelwriter_11354
Godmartinz Jun 3, 2026
40fa588
add Config getter for labelwriter_1933081
Godmartinz Jun 3, 2026
300f280
add Config getter for labelwriter_2112283
Godmartinz Jun 3, 2026
75de698
adds a stacked view and getters for Continuous_53mm_A
Godmartinz Jun 3, 2026
cdbbb72
adds getters for Continuous_Landscape_59mm_A
Godmartinz Jun 3, 2026
e852458
adds getters for Tape_53mm_A
Godmartinz Jun 3, 2026
c3699fd
fix CustomSheet interactions with logo barcode alignment sync method
Godmartinz Jun 3, 2026
e852377
removed unused methods/fields, updated create/store methods for tapes
Godmartinz Jun 4, 2026
a5727ba
updated the update method for tapes
Godmartinz Jun 4, 2026
a72b391
move validation to requests and validator class, update import method
Godmartinz Jun 10, 2026
9e64f75
add ValidationException usage to CustomLabelimportValidator
Godmartinz Jun 10, 2026
d2b64ca
add font getters and setters and hydration for 3490A 5267A 5520A
Godmartinz Jun 10, 2026
65997a2
organize values in seeders hyrdrators and getContent
Godmartinz Jun 10, 2026
7a1d5a8
made traits for duplicate logic in Sheet/Tape classes, removed lines …
Godmartinz Jun 11, 2026
b8988ac
move seed method to trait for Sheets
Godmartinz Jun 11, 2026
1d0e49c
move hydration method to trait for Sheets
Godmartinz Jun 11, 2026
7c4a04d
Labels: refactor hydration and properties from Custom Tape to CustomL…
Godmartinz Jun 16, 2026
c206afd
Labels: refactor buildLayout into trait
Godmartinz Jun 16, 2026
d75632c
add create new label modal, partial create logic
Godmartinz Jun 24, 2026
f5d08cc
adds translation for editor inputs and sections
Godmartinz Jun 24, 2026
1bb7fb8
saving for test branch
Godmartinz Jun 25, 2026
ba0c856
adds translations to Create label modal
Godmartinz Jun 25, 2026
bfa6d1e
Create New Modal looks good, updating constructor for preview
Godmartinz Jun 25, 2026
b2ee1b5
format the edit page
Godmartinz Jun 29, 2026
707c888
fixed content mapping
Godmartinz Jun 30, 2026
f3121b1
fixed regression with saving cloned tape labels
Godmartinz Jul 1, 2026
b859a7b
add label gap for continous tape labels
Godmartinz Jul 7, 2026
ebd6c93
add defaults for standard tape label, fix textbox positioning, fix pr…
Godmartinz Jul 8, 2026
ac8f039
Merge branch 'develop' into Label_customization
Godmartinz Aug 5, 2026
f3d2a3d
add fonts and barcode size to L6009_A
Godmartinz Aug 5, 2026
565ab17
add fonts for L7162_A and vertical field stacking to custom sheet labels
Godmartinz Aug 5, 2026
894f592
label preview template name updates based on selected template
Godmartinz Aug 5, 2026
a668aa6
add vertical stacking to L7162B and fonts
Godmartinz Aug 5, 2026
06dbde1
add fonts and barcode sizing to 3490_A 5267_A
Godmartinz Aug 6, 2026
0ac50d6
adds titile position to custom sheet labels
Godmartinz Aug 11, 2026
47529ef
slight adjustments to label content sizing"
Godmartinz Aug 11, 2026
25fcc55
adjustments to 24mm_B
Godmartinz Aug 11, 2026
69da557
add more fonts and adjustments to labels
Godmartinz Aug 11, 2026
1204056
more adjustments to labels
Godmartinz Aug 11, 2026
23a38e0
all labels clone correctly
Godmartinz Aug 11, 2026
6443d55
get custom labels to preview again
Godmartinz Aug 11, 2026
d5fc871
toggle supported inputs in label editor
Godmartinz Aug 12, 2026
eb4372f
fix width and height not saving for tapes
Godmartinz Aug 12, 2026
8e31151
fix preview and create from existing for new label creations
Godmartinz Aug 12, 2026
6aa23ce
fixed preview fail when custom is set to default
Godmartinz Aug 12, 2026
6dc7ffa
move translations in to EditorSections trait
Godmartinz Aug 12, 2026
ec8ad7a
make LabelPreviewAsset class, fix cloning custom labels, a bit more r…
Godmartinz Aug 12, 2026
01430a0
fix show method label asset preview
Godmartinz Aug 12, 2026
933f966
moves import to livewire modal, rearranges label index
Godmartinz Aug 12, 2026
0d024f2
fix fields input sizing and label spacing for support row
Godmartinz Aug 13, 2026
9b738e6
prevent deletion of default labels, rename page field labels, add pag…
Godmartinz Aug 13, 2026
7de9c21
Merge branch 'develop' into Label_customization
Godmartinz Aug 13, 2026
1c9c216
fix phpstan issues with Label model
Godmartinz Aug 13, 2026
f4dbdcc
undo label model changes, and carbon parsing to label preview
Godmartinz Aug 13, 2026
20effdd
fix buildlayout 2 barcode layout
Godmartinz Aug 13, 2026
1ff4da4
Merge branch 'develop' into Label_customization
Godmartinz Aug 17, 2026
66c31ef
add Hema_1413306 and Hema_to label editor
Godmartinz Aug 20, 2026
82536c7
add font preference to hema label getContentEditorConfig
Godmartinz Aug 20, 2026
bcefde5
add zebra labels to editor
Godmartinz Aug 20, 2026
7b3e58b
add validation to font for label import
Godmartinz Aug 20, 2026
3027549
add validation for geometric inputs values in importer,store,update
Godmartinz Aug 20, 2026
e7da979
change rules for padding and border to min 0
Godmartinz Aug 20, 2026
3bd8979
undo pint changes
Godmartinz Aug 20, 2026
0d28a87
Merge branch 'develop' into Label_customization
Godmartinz Aug 20, 2026
f89a9e9
remove unnecessary code, update label edit to pull from config
Godmartinz Aug 20, 2026
4c23d22
add validation and normalization for fonts in label editor
Godmartinz Aug 20, 2026
b9df072
add TZe_241_B
Godmartinz Sep 1, 2026
d739edc
Merge branch 'develop' into Label_customization
Godmartinz Sep 1, 2026
199e4d9
merged develop
Godmartinz Sep 1, 2026
8dd304c
Merge branch 'adds_TZe_241_B' into Label_customization
Godmartinz Sep 1, 2026
7ad0baf
adds TZe_241_B and fixes cloning name
Godmartinz Sep 1, 2026
fcf0972
add validation for dimension when updating, add try/catch for bogus t…
Godmartinz Sep 1, 2026
7ad2575
add translations, remove unused route, other fixes
Godmartinz Sep 1, 2026
49e9d47
adds tests, and tape dimension validation in store method
Godmartinz Sep 1, 2026
7ae983d
slight visual adjustments to labels, add geometry rules, validate dim…
Godmartinz Sep 1, 2026
3ace3df
couple phpstan fixes
Godmartinz Sep 1, 2026
5087827
fix mapping in transformer for label padding
Godmartinz Sep 2, 2026
3d9482f
imported labels persist when refreshed until saved
Godmartinz Sep 2, 2026
0d65f41
small corrections
Godmartinz Sep 2, 2026
d9c8c49
fix api show method for custom labels
Godmartinz Sep 2, 2026
6c61efd
restore example asset support values and warranty months"
Godmartinz Sep 2, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Homestead.json
Homestead.yaml
output
phpDocumentor.phar
/public/build/
public/uploads/*.gif
public/uploads/barcodes/*.png
public/uploads/*.jpg
Expand Down
51 changes: 46 additions & 5 deletions app/Http/Controllers/Api/LabelsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
use App\Helpers\Helper;
use App\Http\Controllers\Controller;
use App\Http\Transformers\LabelsTransformer;
use App\Models\Labels\CustomLabels\PreviewSheetLabel;
use App\Models\Labels\CustomLabels\PreviewTapeLabel;
use App\Models\Labels\CustomUserLabel;
use App\Models\Labels\Label;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
Expand All @@ -21,12 +24,35 @@ public function index(Request $request): JsonResponse|array
{
$this->authorize('view', Label::class);

$labels = Label::find();
$baseLabels = Label::find()
->reject(fn(Label $label) => $label instanceof PreviewSheetLabel)
->reject(fn(Label $label) => $label instanceof PreviewTapeLabel)
->map(function (Label $label) {
return [
'source' => 'base',
'label' => $label,
];
});

$customLabels = CustomUserLabel::query()
->get()
->map(function ($label) {
return [
'source' => 'custom',
'label' => $label,
];
});

$labels = $baseLabels->merge($customLabels);

if ($request->filled('search')) {
$search = $request->input('search');
$labels = $labels->filter(function ($label, $index) use ($search) {
return stripos($label->getName(), $search) !== false;

$labels = $labels->filter(function ($row) use ($search) {
$label = $row['label'];
$name = $row['source'] === 'custom' ? $label->name : $label->getName();

return stripos($name, $search) !== false;
});
}

Expand All @@ -41,7 +67,7 @@ public function index(Request $request): JsonResponse|array

$labels = $labels->skip($offset)->take($limit);

return (new LabelsTransformer)->transformLabels($labels, $total, $request);
return (new LabelsTransformer)->transformLabels($labels, $total);
}

/**
Expand All @@ -51,6 +77,18 @@ public function index(Request $request): JsonResponse|array
*/
public function show(string $labelName): JsonResponse|array
{
$customLabel = CustomUserLabel::find($labelName);

if ($customLabel) {
$this->authorize('view', $customLabel);

return (new LabelsTransformer)->transformLabels(
collect([[
'source' => 'custom',
'label' => $customLabel,
]]), 1);
}

$labelName = str_replace('/', '\\', $labelName);
try {
$label = Label::find($labelName);
Expand All @@ -63,6 +101,9 @@ public function show(string $labelName): JsonResponse|array
}
$this->authorize('view', $label);

return (new LabelsTransformer)->transformLabel($label);
return (new LabelsTransformer)->transformLabels(collect([[
'source' => 'base',
'label' => $label,
]]), 1);
}
}
Loading
Loading