Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2024-02-09 20:42:48 +00:00
commit a60a24a4a8

View file

@ -521,7 +521,7 @@ class AssetsController extends Controller
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)) {