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
This commit is contained in:
Frank Schubert
2025-07-29 13:35:31 +02:00
parent fdf1291d17 04a0f57312
commit bb32e7aca4
62 changed files with 3160 additions and 1517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Layout/default/ConstructionConsent/Index.php
View File

@@ -431,6 +431,8 @@ $pagination_entity_name = "Zustimmungserklärungen";
$approve_override = $item->approve_override;
if (isset($approve_override) && $approve_override) {
$status_class = 'green'; // Blue if approve override
} if (isset($item->owner_result_counts['new']) && $item->owner_result_counts['new'] > 0) {
$status_class = 'blue';
} elseif (isset($item->owner_result_counts['denied']) && $item->owner_result_counts['denied'] > 0) {
$status_class = 'red';
// Red if at least one denied

8
Layout/default/ConstructionConsent/View.php
View File

@@ -295,7 +295,7 @@ $pagination_entity_name = "Adressen";
<h5>Zusammenfassung Status (von <?=count($item->owners)?>)</h5>
<table class="table table-sm">
<?php foreach($item->owner_status_counts as $type => $count): ?>
<tr class="ConstructionConsentOwnerResult-<?=$type?>">
<tr class="ConstructionConsentOwnerResult-s<?=$type?>">
<th><?=__($type, "consent")?></th>
<td><?=$count?></td>
</tr>
@@ -308,6 +308,8 @@ $pagination_entity_name = "Adressen";
$status_class = 'blue'; // Default to blue (all open)
if (isset($item->owner_result_counts['denied']) && $item->owner_result_counts['denied'] > 0) {
$status_class = 'red'; // Red if at least one denied
} elseif (isset($item->owner_result_counts['open']) && $item->owner_result_counts['open'] > 0) {
$status_class = 'blue'; // Blue if at least one open
} elseif (
(isset($item->owner_result_counts['unresolvable']) && $item->owner_result_counts['unresolvable'] > 0) ||
(isset($item->owner_result_counts['moved']) && $item->owner_result_counts['moved'] > 0) ||
@@ -1348,6 +1350,10 @@ $pagination_entity_name = "Adressen";
background-color: #337ab7; /* Blue */
}
.ConstructionConsentOwnerResult-new {
background-color: #9bcdff;
}
.ConstructionConsentOwnerResult-denied {
/*red background color here for this tr*/
background-color: #f9a39f

45
Layout/default/Cpeprovisioning/PDF_MAIN.php Normal file
View File

@@ -0,0 +1,45 @@
<?php
$maxLength = max(mb_strlen($firstline ?? ''), mb_strlen($secondline ?? ''));
$fontSize = '12px';
if ($maxLength <= 15) $fontSize = '24px';
elseif ($maxLength <= 24) $fontSize = '18px';
elseif ($maxLength <= 50) $fontSize = '16px';
$this->setReturnValue(['filename' => "xyz." . time() . "pdf"]);
?>
<!DOCTYPE html>
<html>
<head>
<title>CPE-Etikett</title>
<meta charset="utf-8"/>
<style>
html, body {
height: 100%;
margin: 0;
padding: 0;
font-family: "Open Sans", sans-serif, Verdana;
font-weight: bold;
text-align: center;
}
body {
display: flex;
align-items: center;
justify-content: center;
}
.content-block {
font-size: <?= $fontSize ?>;
}
</style>
</head>
<body>
<div class="content-block">
<div><?= $firstline ?></div>
<div><?= $secondline ?></div>
<div><?= $thirdline ?></div>
<div><?= $fourthline ?></div>
</div>
</body>
</html>

2
Layout/default/Preorder/Index.php
View File

@@ -519,7 +519,7 @@ $pagination_entity_name = "Vorbestellungen";
}
}
$requiredFlagIds = [1, 3, 4, 5];
$requiredFlagIds = [3, 4, 5];
$allFlagsChecked = true;
foreach ($requiredFlagIds as $flagId) {

1
Layout/default/VueViews/Vue.php
View File

@@ -23,6 +23,7 @@ $additionalCSS = [
'plugins/vue/tt-components/css/tt-table.css',
'plugins/vue/tt-components/css/tt-tooltip.css',
'plugins/vue/tt-components/css/tt-loader.css',
'plugins/vue/tt-components/css/tt-file-gallery.css',
'plugins/vue/tt-components/css/tt-position-manager.css',
];

12
Layout/default/footer.php
View File

@@ -22,11 +22,13 @@
<?php endif; ?>
<script type="text/javascript">
$(".selectpicker").selectpicker({
iconBase: "fas",
tickIcon: "check",
sanitize: false
});
if ($(".selectpicker").length) {
$(".selectpicker").selectpicker({
iconBase: "fas",
tickIcon: "check",
sanitize: false
});
}
$('.navbar-toggle').on('click', function (event) {
console.log('cracy');
$(this).toggleClass('open');

2
Layout/default/header.php
View File

@@ -56,7 +56,7 @@
<script type="text/javascript" src="<?=self::getResourcePath()?>js/bootstrap-autocomplete.min.js"></script>
<script type="text/javascript" src="<?=self::getResourcePath()?>datatables/datatables.min.js?<?=$git_merge_ts?>"></script>
<script type="text/javascript" src="<?=self::getResourcePath()?>plugins/notification/notify.js"></script>
<script type="text/javascript" src="<?=self::getResourcePath()?>plugins/bookstack/bookstackIntegration.js"></script>
<script type="text/javascript" src="<?=self::getResourcePath()?>plugins/bookstack/bookstackIntegration.min.js"></script>
<script type="text/javascript" src="<?=self::getResourcePath()?>assets/libs/switchery/switchery.min.js"></script>

10
Layout/default/menu.php
View File

@@ -162,7 +162,7 @@
<li class="has-submenu">
<a href="#">
<?php if ($me->can("WarehouseEShop") && !($me->can("WarehouseAdmin") || $me->can("WarehouseUser"))): ?>
<i class="fas fa-fw fa-shopping-cart"></i>E-Shop<div class="arrow-down"></div>
<i class="fas fa-fw fa-shopping-cart"></i><?= $me->address_id == 9633 ? "SBIDI Shop" : "E-Shop" ?><div class="arrow-down"></div>
<?php elseif ($me->can("WarehouseAdmin") || $me->can("WarehouseUser")): ?>
<i class="fas fa-fw fa-warehouse"></i>Lager<div class="arrow-down"></div>
<?php endif; ?>
@@ -179,9 +179,11 @@
<?php if($me->can("WarehouseAdmin")): ?><li><a href="<?=self::getUrl("WarehouseDistributor")?>"><i class="far fa-fw fa-cogs text-info"></i> Administration</a></li><?php endif; ?>
<?php if($me->can("WarehouseAdmin") || $me->can("WarehouseEShop")): ?><li class="has-sub-submenu font-weight-bold"><a>E-Stmk Shop</a></li><?php endif; ?>
<?php if($me->can("WarehouseEShop")): ?><li><a href="<?=self::getUrl("WarehouseEShop")?>"><i class="far fa-fw fa-shopping-cart text-info"></i> E-Shop</a></li><?php endif; ?>
<?php if($me->can("WarehouseAdmin")): ?><li><a href="<?=self::getUrl("WarehouseEShopOrder")?>"><i class="far fa-fw fa-shopping-basket text-info"></i> E-Shop Bestellungen</a></li><?php endif; ?>
<?php if($me->can("WarehouseAdmin") || $me->can("WarehouseEShop")): ?><li class="has-sub-submenu font-weight-bold"><a> <?= $me->address_id == 9633 ? "SBIDI Shop" : "E-Shop" ?></a></li><?php endif; ?>
<?php if($me->can("WarehouseEShop") && !$me->isAdmin()): ?><li><a href="<?=self::getUrl("WarehouseEShop")?>"><i class="far fa-fw fa-shopping-cart text-info"></i> <?=$me->address_id == 9633 ? "SBIDI Shop" : "E-Shop" ?></a></li><?php endif; ?>
<?php if($me->can("WarehouseEShop") && $me->isAdmin()): ?><li><a href="<?=self::getUrl("WarehouseEShop")?>?shop=e"><i class="far fa-fw fa-box text-info"></i> E-Shop</a></li><?php endif; ?>
<?php if($me->can("WarehouseEShop") && $me->isAdmin()): ?><li><a href="<?=self::getUrl("WarehouseEShop")?>?shop=sbidi"><i class="far fa-fw fa-box text-info"></i> SBIDI-Shop</a></li><?php endif; ?>
<?php if($me->can("WarehouseAdmin")): ?><li><a href="<?=self::getUrl("WarehouseEShopOrder")?>"><i class="far fa-fw fa-shopping-basket text-info"></i> E/SBIDI-Shop Bestellungen</a></li><?php endif; ?>
<?php if($me->can("WarehouseAdmin")): ?><li><a href="<?=self::getUrl("WarehouseArticlePacket")?>"><i class="far fa-fw fa-box text-info"></i> Artikel-Pakete</a></li><?php endif; ?>
</ul>
</li>

9
Layout/default/vueHeader.php
View File

@@ -39,11 +39,10 @@
</script>
<script type="text/javascript" src="<?=self::getResourcePath()?>js/jquery.min.js"></script>
<script type="text/javascript" src="<?=self::getResourcePath()?>js/popper.min.js"></script>
<script type="text/javascript" src="<?=self::getResourcePath()?>js/bootstrap.min.js"></script>
<script type="text/javascript" src="<?=self::getResourcePath()?>assets/js/bootstrap-select.min.js"></script>
<script type="text/javascript" src="<?=self::getResourcePath()?>plugins/notification/notify.js"></script>
<script type="text/javascript" src="<?=self::getResourcePath()?>plugins/bookstack/bookstackIntegration.js"></script>
<script type="text/javascript" src="<?=self::getResourcePath()?>js/popper.min.js" defer></script>
<script type="text/javascript" src="<?=self::getResourcePath()?>js/bootstrap.min.js" defer></script>
<script type="text/javascript" src="<?=self::getResourcePath()?>plugins/notification/notify.js" defer></script>
<script type="text/javascript" src="<?=self::getResourcePath()?>plugins/bookstack/bookstackIntegration.js" defer></script>
<?php if(isset($additionalJS) && is_array($additionalJS) && count($additionalJS)): ?>
<?php foreach($additionalJS as $js): ?>