Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
snipe committed Feb 9, 2024
2 parents 1c33060 + 55b3050 commit a60a24a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app/Http/Controllers/Assets/AssetsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ public function getQrCode($assetId = null)
public function getBarCode($assetId = null)
{
$settings = Setting::getSettings();
$asset = Asset::find($assetId);
$asset = Asset::withTrashed()->find($assetId);
$barcode_file = public_path().'/uploads/barcodes/'.str_slug($settings->alt_barcode).'-'.str_slug($asset->asset_tag).'.png';

if (isset($asset->id, $asset->asset_tag)) {
Expand Down

0 comments on commit a60a24a

Please sign in to comment.