Merge branch 'fronkdev' into 'master'
small layout change See merge request fronk/thetool!616
This commit is contained in:
@@ -166,7 +166,7 @@ $pagination_entity_name = "Rechnungen";
|
||||
<td class="finished"><?=$job->finished?></td>
|
||||
<td>
|
||||
<strong class="status text-monospace <?=(($job->status == "finished") ? "text-success" : ($job->status == "timeout" ? "text-danger" : "text-info"))?>"><?=($job->status) ? $job->status : "neu"?></strong><br />
|
||||
<span class="status-text"><?=$job->getResult("created") ? $job->getResult("created")." Rechungs-PDFs erstellt" : ""?></span>
|
||||
<span class="status-text"><?=$job->getResult("created") ? $job->getResult("created")." PDFs erstellt" : ""?></span>
|
||||
</td>
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
@@ -421,7 +421,7 @@ $pagination_entity_name = "Rechnungen";
|
||||
let count = 0;
|
||||
|
||||
if(job.task == "make-invoice-pdf") {
|
||||
status_text = status.created + " Emails versendet";
|
||||
status_text = status.created + " PDFs erstellt";
|
||||
count = status.created;
|
||||
} else if(job.task == "send-invoice-email") {
|
||||
status_text = status.sent + " Emails versendet";
|
||||
|
||||
@@ -75,7 +75,7 @@
|
||||
<?php if($me->is(["Admin"])): ?>
|
||||
<li class="mobile-hide"><a href="<?=self::getUrl("OpenAccessId")?>"><i class="fad fa-fw fa-link-simple text-info"></i> Open Access IDs</a></li>
|
||||
<li class="mobile-hide"><a href="<?=self::getUrl("Producttech")?>"><i class="fad fa-fw fa-microchip text-info"></i> Technologien</a></li>
|
||||
<li class=""><a href="<?=self::getUrl("Mailtemplate")?>"><i class="fad fa-fw fa-users text-info"></i> Emailtemplates</a></li>
|
||||
<li class=""><a href="<?=self::getUrl("Mailtemplate")?>"><i class="fad fa-fw fa-mail-bulk text-info"></i> Emailtemplates</a></li>
|
||||
<li class="mobile-hide"><a href="<?=self::getUrl("HistoricTicket")?>"><i class="fad fa-fw fa-headset text-info"></i> Historische Tickets</a></li>
|
||||
<?php if($me->can("Fibu")): ?><li class="mobile-hide"><a href="<?=self::getUrl("Vatgroup")?>"><i class="fas fa-fw fa-circle-dollar-to-slot text-info"></i> Steuersätze</a></li><?php endif; ?>
|
||||
<!--<li><a href="<?=self::getUrl("Contractconfig")?>"><i class="fad fa-gear text-info"></i> ContractConfig</a></li>-->
|
||||
|
||||
Reference in New Issue
Block a user