tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
ivan-sim
2024-05-15 14:58:25 +07:00
parent c4cf1bc64e
commit 4cc3df9859
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/Internal/Http/Controllers/Api/FormulariumTemplateController.php
View File

@@ -33,13 +33,14 @@ class FormulariumTemplateController extends Controller
}) })
->join('corporate_formulariums', 'formularium_templates.id', '=', 'corporate_formulariums.formularium_template_id') ->join('corporate_formulariums', 'formularium_templates.id', '=', 'corporate_formulariums.formularium_template_id')
->where('corporate_formulariums.corporate_id', '=', $request->corporate_id) ->where('corporate_formulariums.corporate_id', '=', $request->corporate_id)
->orderBy('formularium_templates.id', 'ASC')
->paginate(15); ->paginate(15);
} else { } else {
$diagnosisTemplate = FormulariumTemplate::query() $diagnosisTemplate = FormulariumTemplate::query()
// ->filter($request->toArray()) // ->filter($request->toArray())
->join('corporate_formulariums', 'formularium_templates.id', '=', 'corporate_formulariums.formularium_template_id') ->join('corporate_formulariums', 'formularium_templates.id', '=', 'corporate_formulariums.formularium_template_id')
->where('corporate_formulariums.corporate_id', '=', $request->corporate_id) ->where('corporate_formulariums.corporate_id', '=', $request->corporate_id)
->orderBy('name', 'ASC') ->orderBy('formularium_templates.id', 'ASC')
->paginate(15); ->paginate(15);
return $diagnosisTemplate; return $diagnosisTemplate;
} }