Skip to content

Commit f6928a5

Browse files
cz-lucascz-lucas
authored
Merge branch 'develop' into refactor-modal
2 parents 694ad5c + ecee732 commit f6928a5

File tree

5 files changed

+24
-26
lines changed

5 files changed

+24
-26
lines changed

‎app/Http/Controllers/Api/AssetsController.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class AssetsController extends Controller
5757
* @param int $assetId
5858
* @since [v4.0]
5959
*/
60-
public function index(Request $request, $action = null, $upcoming_status = null): JsonResponse|array
60+
public function index(Request $request, $action = null, $upcoming_status = null):JsonResponse|array
6161
{
6262

6363

@@ -78,7 +78,7 @@ public function index(Request $request, $action = null, $upcoming_status = null)
7878
* It was either this mess, or repeating ALL of the searching and sorting and filtering code,
7979
* which would have been far worse of a mess. *sad face* - snipe (Sept 1, 2021)
8080
*/
81-
if (Route::currentRouteName() == 'api.depreciation-report.index') {
81+
if (Route::currentRouteName()=='api.depreciation-report.index') {
8282
$filter_non_deprecable_assets = true;
8383
$transformer = 'App\Http\Transformers\DepreciationReportTransformer';
8484
$this->authorize('reports.view');
@@ -481,7 +481,7 @@ public function index(Request $request, $action = null, $upcoming_status = null)
481481
* @since [v4.2.1]
482482
* @author [A. Gianotto] [<snipe@snipe.net>]
483483
*/
484-
public function showByTag(Request $request, $tag): JsonResponse|array
484+
public function showByTag(Request $request, $tag): JsonResponse | array
485485
{
486486
$this->authorize('index', Asset::class);
487487
$assets = Asset::where('asset_tag', $tag)->with('assetstatus')->with('assignedTo');
@@ -517,7 +517,7 @@ public function showByTag(Request $request, $tag): JsonResponse|array
517517
* @since [v4.2.1]
518518
* @return \Illuminate\Http\JsonResponse
519519
*/
520-
public function showBySerial(Request $request, $serial): JsonResponse|array
520+
public function showBySerial(Request $request, $serial): JsonResponse | array
521521
{
522522
$this->authorize('index', Asset::class);
523523
$assets = Asset::where('serial', $serial)->with([
@@ -606,7 +606,7 @@ public function selectlist(Request $request): array
606606
])->with('model', 'assetstatus', 'assignedTo')
607607
->NotArchived();
608608

609-
if ((Setting::getSettings()->full_multiple_companies_support == '1') && ($request->filled('companyId'))) {
609+
if ((Setting::getSettings()->full_multiple_companies_support=='1') && ($request->filled('companyId'))) {
610610
$assets->where('assets.company_id', $request->input('companyId'));
611611
}
612612

@@ -921,7 +921,7 @@ public function checkout(AssetCheckoutRequest $request, $asset_id): JsonResponse
921921
$this->authorize('checkout', Asset::class);
922922
$asset = Asset::findOrFail($asset_id);
923923

924-
if (!$asset->availableForCheckout()) {
924+
if (! $asset->availableForCheckout()) {
925925
return response()->json(Helper::formatStandardApiResponse('error', ['asset' => e($asset->asset_tag)], trans('admin/hardware/message.checkout.not_available')));
926926
}
927927

@@ -957,7 +957,7 @@ public function checkout(AssetCheckoutRequest $request, $asset_id): JsonResponse
957957
$asset->status_id = $request->get('status_id');
958958
}
959959

960-
if (!isset($target)) {
960+
if (! isset($target)) {
961961
return response()->json(Helper::formatStandardApiResponse('error', $error_payload, 'Checkout target for asset ' . e($asset->asset_tag) . ' is invalid - ' . $error_payload['target_type'] . ' does not exist.'));
962962
}
963963

@@ -1147,7 +1147,7 @@ public function audit(Request $request, Asset $asset): JsonResponse
11471147
if (($asset->model) && ($asset->model->fieldset)) {
11481148
$payload['custom_fields'] = [];
11491149
foreach ($asset->model->fieldset->fields as $field) {
1150-
if (($field->display_audit == '1') && ($request->has($field->db_column))) {
1150+
if (($field->display_audit=='1') && ($request->has($field->db_column))) {
11511151
if ($field->field_encrypted == '1') {
11521152
if (Gate::allows('assets.view.encrypted_custom_fields')) {
11531153
if (is_array($request->input($field->db_column))) {
@@ -1223,7 +1223,7 @@ public function audit(Request $request, Asset $asset): JsonResponse
12231223
* @author [A. Gianotto] [<snipe@snipe.net>]
12241224
* @since [v4.0]
12251225
*/
1226-
public function requestable(Request $request): JsonResponse|array
1226+
public function requestable(Request $request): JsonResponse | array
12271227
{
12281228
$this->authorize('viewRequestable', Asset::class);
12291229

@@ -1306,7 +1306,7 @@ public function requestable(Request $request): JsonResponse|array
13061306
}
13071307

13081308

1309-
public function assignedAssets(Request $request, Asset $asset): JsonResponse|array
1309+
public function assignedAssets(Request $request, Asset $asset) : JsonResponse | array
13101310
{
13111311
$this->authorize('view', Asset::class);
13121312
$this->authorize('view', $asset);
@@ -1323,7 +1323,7 @@ public function assignedAssets(Request $request, Asset $asset): JsonResponse|arr
13231323
return (new AssetsTransformer)->transformAssets($assets, $total);
13241324
}
13251325

1326-
public function assignedAccessories(Request $request, Asset $asset): JsonResponse|array
1326+
public function assignedAccessories(Request $request, Asset $asset) : JsonResponse | array
13271327
{
13281328
$this->authorize('view', Asset::class);
13291329
$this->authorize('view', $asset);
@@ -1412,7 +1412,7 @@ public function getLabels(Request $request): JsonResponse
14121412
// Generate PDF using callback function
14131413
// The callback captures the PDF content in $pdf_content variable
14141414
$pdf_content = '';
1415-
$label->render(function ($pdf) use (&$pdf_content) {
1415+
$label->render(function($pdf) use (&$pdf_content) {
14161416
$pdf_content = $pdf->Output('', 'S');
14171417
return $pdf;
14181418
});

‎app/Http/Controllers/Api/GroupsController.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class GroupsController extends Controller
1919
* @author [A. Gianotto] [<snipe@snipe.net>]
2020
* @since [v4.0]
2121
*/
22-
public function index(Request $request): JsonResponse|array
22+
public function index(Request $request) : JsonResponse | array
2323
{
2424
$this->authorize('superadmin');
2525

@@ -72,7 +72,7 @@ public function index(Request $request): JsonResponse|array
7272
* @since [v4.0]
7373
* @param \Illuminate\Http\Request $request
7474
*/
75-
public function store(Request $request): JsonResponse
75+
public function store(Request $request) : JsonResponse
7676
{
7777
$this->authorize('superadmin');
7878
$group = new Group;
@@ -99,7 +99,7 @@ public function store(Request $request): JsonResponse
9999
* @since [v4.0]
100100
* @param int $id
101101
*/
102-
public function show($id): array
102+
public function show($id) : array
103103
{
104104
$this->authorize('superadmin');
105105
$group = Group::findOrFail($id);

‎app/Http/Transformers/SelectlistTransformer.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public function transformSelectlist(LengthAwarePaginator $select_items)
3535
$items_array[] = $item;
3636
}
3737

38-
3938
$results = [
4039
'results' => $items_array,
4140
'pagination' => [

‎resources/views/hardware/index.blade.php‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,7 @@
4747
<div class="table-section">
4848
<div class="box">
4949
<div class="box-body">
50-
@include('partials.asset-bulk-actions', ['status' => Request::get('status')])
51-
<!-- Toggle Button -->
52-
<div class="filter-toggle-container text-left" style="margin-bottom: 15px;">
53-
<button type="button" class="btn btn-default" id="toggleFilterBtn">
54-
<i class="fa-solid fa-filter"></i>
55-
<span class="filter-btn-text">{{ trans('general.open_filters') }}</span>
56-
</button>
57-
</div>
58-
59-
<livewire:partials.advancedsearch.modal />
50+
@include('partials.asset-bulk-actions', ['status' => Request::get('status'), 'showFiltersTogglebutton' => true])
6051

6152
<table data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
6253
data-cookie-id-table="{{ request()->has('status') ? e(request()->input('status')) : '' }}assetsListingTable"

‎resources/views/partials/asset-bulk-actions.blade.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,13 @@ class="form-inline"
4343
</select>
4444

4545
<button class="btn btn-primary" id="{{ (isset($id_button)) ? $id_button : 'bulkAssetEditButton' }}" disabled>{{ trans('button.go') }}</button>
46+
47+
@if((!isset($showFiltersTogglebutton)) || ($showFiltersTogglebutton === true))
48+
<!-- Toggle Button -->
49+
<button type="button" class="btn btn-default" id="toggleFilterBtn">
50+
<i class="fa-solid fa-filter"></i>
51+
<span class="filter-btn-text">{{ trans('general.open_filters') }}</span>
52+
</button>
53+
@endif
4654
</form>
4755
</div>

0 commit comments

Comments
 (0)