Merge branch 'feature/inv' into develop
This commit is contained in:
@@ -51,7 +51,7 @@ class InvItemController extends BaseController
|
|||||||
$data['company_name'] = Corp::where('id', $data['company_id'])->value('name');
|
$data['company_name'] = Corp::where('id', $data['company_id'])->value('name');
|
||||||
if (isset($data['manage_user_id']))
|
if (isset($data['manage_user_id']))
|
||||||
$data['manage_user_name'] = User::where('id', $data['manage_user_id'])->value('name');
|
$data['manage_user_name'] = User::where('id', $data['manage_user_id'])->value('name');
|
||||||
if (isset($data['qr_code']))
|
if (!empty($data['qr_code']))
|
||||||
$data['qr_code_pull'] = (new OssService)->generatePrivateUrl($data['qr_code']);;
|
$data['qr_code_pull'] = (new OssService)->generatePrivateUrl($data['qr_code']);;
|
||||||
return $data;
|
return $data;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user