Skip to content

Feature/barcode content mailto #18378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
denzfarid wants to merge 11 commits into
base: develop
Choose a base branch
from
Open

Feature/barcode content mailto #18378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e95e8f5
Add Mailto
denzfarid Dec 24, 2025
47b2a51
Add Mailto in 2D Barcode Content label Settings
denzfarid Dec 24, 2025
894221b
Update company email retrieval logic
denzfarid Dec 28, 2025
1aa46c8
Refactor email retrieval to use MAIL_FROM_ADDR
denzfarid Dec 29, 2025
4379471
add general translation for mailto
denzfarid Dec 29, 2025
9ee8f82
Update Label.php mailto use translations
denzfarid Dec 29, 2025
7f63a70
update labels.blade.php mailto use translations
denzfarid Dec 29, 2025
32bc818
Remove mailto barcode translation settings
denzfarid Dec 30, 2025
7202396
Refactor mailto link handling in Label.php
denzfarid Dec 30, 2025
87bde2b
Remove body text from mailto link
denzfarid Dec 30, 2025
973773d
Remove asset URL assignment in Label.php
denzfarid Dec 30, 2025
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
31 changes: 22 additions & 9 deletions app/View/Label.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,17 +172,30 @@ public function render(callable $callback = null)
? route('locations.show', $asset->location_id)
: null;
break;
case 'hardware_id':
default:
$barcode2DTarget = route('hardware.show', $asset);
case 'mailto':
$companyEmail = $asset->company->email ?? env('MAIL_FROM_ADDR');
if (empty($companyEmail)) {
$barcode2DTarget = null;
break;
}
$subjectText = trans('admin/settings/general.mailto_subject', [
'asset_tag' => $asset->asset_tag,
]);

$subject = rawurlencode($subjectText);
$barcode2DTarget = "mailto:{$companyEmail}?subject={$subject}";
break;
case 'hardware_id':
default:
$barcode2DTarget = route('hardware.show', $asset);
break;
}
$assetData->put('barcode2d', (object)[
'type' => $barcode2DType,
'content' => $barcode2DTarget,
]);
}
}
$assetData->put('barcode2d', (object)[
'type' => $barcode2DType,
'content' => $barcode2DTarget,
]);
}
}

$fields = $fieldDefinitions
->map(fn($field) => $field->toArray($asset))
Expand Down
1 change: 1 addition & 0 deletions resources/views/settings/labels.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ class="form-control"
:options="[
'hardware_id'=> config('app.url').'/hardware/{id} ('.trans('admin/settings/general.default').')',
'ht_tag'=> config('app.url').'/ht/{asset_tag}',
'mailto' => trans('admin/settings/general.mailto_option'),
'location' => config('app.url').'/locations/{location_id}',
'plain_asset_id'=> trans('admin/settings/general.asset_id'),
'plain_asset_tag'=> trans('general.asset_tag'),
Expand Down
Loading