Skip to content

Commit 6554d0c

Browse files
committed
Merge remote-tracking branch 'origin/develop'
2 parents 41ffd55 + feaa714 commit 6554d0c

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

app/Http/Controllers/Api/AssetsController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -598,6 +598,7 @@ public function store(StoreAssetRequest $request): JsonResponse
598598
$asset->model()->associate(AssetModel::find((int) $request->get('model_id')));
599599

600600
$asset->fill($request->validated());
601+
$asset->company_id = Company::getIdForCurrentUser($request->validated()['company_id']);
601602
$asset->created_by = auth()->id();
602603

603604
/**

resources/views/account/view-assets.blade.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,8 @@
144144
</button>
145145
</form>
146146
@else
147-
<button style="width: 100%;" class="btn btn-sm btn-primary hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_email') }}">
147+
<button style="width: 100%;" class="btn btn-sm btn-primary btn-social btn-block hidden-print disabled" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_email') }}">
148+
<x-icon type="email" class="fa-fw" />
148149
{{ trans('admin/users/general.email_assigned') }}
149150
</button>
150151
@endif

0 commit comments

Comments
 (0)