Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'fronkdev'

Browse Source 
# Conflicts:
#   application/Preorder/PreorderController.php
This commit is contained in:
Frank Schubert
2025-09-17 10:17:18 +00:00
parent bad591e80d 2e8dbb1b56
commit daf7f5b9a7
123 changed files with 9982 additions and 3945 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Layout/default/Preorder/include/preorder-detail.php
+13 -4
View File
@@ -565,8 +565,12 @@
</table>
<?php endforeach; ?>
<?php else: ?>
<?php elseif($preorder->status->code != "20"): ?>
<button type="button" class="btn btn-outline-primary create-workorder" onclick="createWorkorder(<?=$preorder->id?>)"><i class="fas fa-fw fa-plus"></i> <i class="fas fa-r"></i><i class="fas fa-fw fa-gears"></i> Wokorder erstellen</button>
<?php elseif($preorder->status->code == "20"): ?>
<div class="alert alert-info mt-2" role="alert">
<i class="fas fa-info-circle"></i> Diese Preorder ist auf Hold gesetzt. Es kann keine Workorder erstellt werden.
</div>
<?php endif; ?>
</div>
@@ -586,8 +590,10 @@
<td class="text-monospace"><?=$preorder->adb_wohneinheit->ftu_data["id"]?>
</tr>
</table>
</div>
<h3>FCP</h3>
<div class="col row">
<h3 >FCP</h3>
<?php
if($preorder->fcp): ?>
<table class="table table-sm table-striped">
@@ -610,9 +616,12 @@
</tr>
</table>
<?php else: ?>
<p>Kein FCP zugewiesen</p>
<div class="col-12 p-0">
<div class="alert alert-info mt-2" role="alert">
<i class="fas fa-info-circle"></i> Kein FCP zugewiesen/importert.
</div>
</div>
<?php endif; ?>
</div>