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

Merge branch 'fronkdev' into 'master'

Browse Source 
everyone can create/delete workorders now in Preorder

See merge request fronk/thetool!992
This commit is contained in:
Frank Schubert
2025-02-05 12:49:41 +00:00
parent 2ce75b766d 30902fc094
commit ab2067ac10
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Layout/default/Preorder/Index.php
+1 -3
View File
@@ -479,9 +479,7 @@ $pagination_entity_name = "Vorbestellungen";
<span id="update-<?=$preorder->id?>"><?=date('d.m.Y H:i', $preorder->edit)?></span> <span id="update-<?=$preorder->id?>"><?=date('d.m.Y H:i', $preorder->edit)?></span>
</td> </td>
<?php if($me->is(["Admin", "netowner"])): ?> <td><?php if($preorder->adb_wohneinheit_id && is_array($preorder->adb_wohneinheit->rimo_workorders) && count($preorder->adb_wohneinheit->rimo_workorders)):?><i class="fas fa-r" title="Rimo Workorder erstellt"></i><?php endif; ?></td>
<td><?php if($preorder->adb_wohneinheit_id && is_array($preorder->adb_wohneinheit->rimo_workorders) && count($preorder->adb_wohneinheit->rimo_workorders)):?><i class="fas fa-r" title="Rimo Workorder erstellt"></i><?php endif; ?></td>
<?php endif; ?>
<td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;"> <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
<div class="preorder-campaign-table-actions"> <div class="preorder-campaign-table-actions">
<?php if(!$me->is(["preorderfront"]) && !$me->is("preorderreadonly")): ?> <?php if(!$me->is(["preorderfront"]) && !$me->is("preorderreadonly")): ?>
Layout/default/Preorder/include/preorder-detail.php
+2 -2
View File
@@ -428,8 +428,8 @@
</table> </table>
<?php endforeach; ?> <?php endforeach; ?>
<?php elseif($preorder->adb_wohneinheit_id && $me->is("Admin")): ?> <?php else: ?>
<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> <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 endif; ?> <?php endif; ?>
</div> </div>