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:
#   Layout/default/ConstructionConsent/Form.php
This commit is contained in:
Frank Schubert
2025-02-14 14:46:24 +00:00
parent 7c0ab4e45d 0b02aff72a
commit 61b192e1c9
24 changed files with 487 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Layout/default/Calendar/View.php
View File

@@ -34,6 +34,8 @@ endforeach;
type="text/css"/>
<link href="<?= self::getResourcePath() ?>css/pages/Calendar/View.css?<?= $git_merge_ts ?>" rel="stylesheet"
type="text/css"/>
<link href="<?= self::getResourcePath() ?>plugins/summernote/summernote-bs4.min.css" rel="stylesheet">
<script type="text/javascript"
src="<?= self::getResourcePath() ?>assets/js/calendar/rrule/rrule.min.js?<?= $git_merge_ts ?>"></script>
<script type="text/javascript"
@@ -645,7 +647,10 @@ endforeach;
</div>
<div id="output"></div>
<script type="text/javascript" src="<?= self::getResourcePath() ?>plugins/select2/js/i18n/de.js"></script>
<script type="text/javascript" src="<?= self::getResourcePath() ?>plugins/select2/js/i18n/de.js?<?= $git_merge_ts ?>"></script>
<script type="text/javascript" src="<?=self::getResourcePath()?>plugins/summernote/summernote-bs4.min.js?<?= $git_merge_ts ?>"></script>
<script type="text/javascript" src="<?=self::getResourcePath()?>plugins/summernote/lang/summernote-de-DE.min.js?<?= $git_merge_ts ?>"></script>
<script>
let requestUrl = "<?= self::getUrl("Calendar", "api", ['do' => 'getCalendarEvents']) ?>";
let requestEventUrl = "<?= self::getUrl("Calendar", "api", ['do' => 'getCalendarEvent']) ?>";
@@ -669,7 +674,7 @@ endforeach;
var birthdays = [];
<?php
$counter = 10000;
$counter = 1000000;
foreach ($timerecordingholidays as $timerecordingholiday) :?>
holiDays.push({
id: <?= $counter ?>,

20
Layout/default/ConstructionConsent/Form.php
View File

@@ -55,9 +55,9 @@
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="name">Name</label>
<label class="col-lg-2 col-form-label" for="name">Name*</label>
<div class="col-lg-10">
<input type="text" class="form-control" name="name" id="name" value="<?=(isset($item)) ? $item->name : ""?>" placeholder="z.B. Straße oder Adresse" />
<input type="text" class="form-control" name="name" id="name" value="<?=(isset($item)) ? $item->name : ""?>" placeholder="z.B. Straße oder Adresse" data-toggle="popover" data-trigger="focus" data-placement="left" data-content="Wird in der Zustimmungserklärung in der Objektanschrift verwendet." />
</div>
</div>
@@ -404,6 +404,22 @@
$("#consent_plan_image").change();
}
});
$(document).ready(function(){
$('[data-toggle="popover"]').popover();
});
</script>
<style>
.popover {
background-color: #ffff99;
}
.popover .arrow::after {
border-top-color: #ffff99;
}
</style>
<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>

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

@@ -112,6 +112,7 @@ $pagination_entity_name = "Zustimmungserklärungen";
<th>Name</th>
<th>Objekttyp</th>
<th>Objektadresse</th>
<th>GST-Nr.</th>
<!-- <th title="Grundstücksnummer">GST-Nr.</th>-->
<!-- <th title="Grundbuch Einlagezahl">EZ</th>-->
<!-- <th>Besitzer</th>-->
@@ -137,7 +138,7 @@ $pagination_entity_name = "Zustimmungserklärungen";
<?=$item->adb_hausnummer->strasse->gemeinde->name?>
<?php endif; ?>
</td>
<!-- <td>--><?php //=$item->gstnr?><!--</td>-->
<td><?=$item->gst?></td>
<!-- <td>--><?php //=$item->ez?><!--</td>-->
<!-- <td>--><?php //=$item->owner_name?><!--</td>-->
<!-- <td>-->

29
Layout/default/Timerecording/Index.php
View File

@@ -95,6 +95,10 @@ $mindate = date("Y-m-d", strtotime("+ 1 Month", $closedmonth));
.holiday-text {
color: #d70000;
}
.height-unset
{
height: unset;
}
</style>
<!-- start page title -->
@@ -314,16 +318,12 @@ $mindate = date("Y-m-d", strtotime("+ 1 Month", $closedmonth));
<div class="form-row">
<div class="col text-center">
<div class="input-group ">
<label class="col-form-label form-control"><span
class="text-bold">Sollzeit: </span><span id="must-time"
class="ml-1 text-normal"></span></label>
<label class="col-form-label form-control height-unset"><span class="text-bold">Sollzeit: </span><span id="must-time" class="ml-1 text-normal"></span></label>
</div>
</div>
<div class="col text-center">
<div class="input-group ">
<label class="col-form-label form-control"><span class="text-bold">Istzeit: </span><span
id="is-time"
class="ml-1 text-normal"></span></label>
<label class="col-form-label form-control height-unset"><span class="text-bold">Istzeit: </span><span id="is-time" class="ml-1 text-normal"></span></label>
</div>
</div>
</div>
@@ -332,19 +332,32 @@ $mindate = date("Y-m-d", strtotime("+ 1 Month", $closedmonth));
<div class="form-row">
<div class="col text-center">
<div class="input-group ">
<label class="col-form-label form-control fixed-state"><span
<label class="col-form-label form-control fixed-state height-unset"><span
class="text-bold">Urlaubstage: </span><span id="holidays"
class="ml-1 text-normal"></span></label>
</div>
</div>
<div class="col text-center">
<div class="input-group ">
<label id="plushours-label" class="col-form-label form-control fixed-state"><span
<label id="plushours-label" class="col-form-label form-control fixed-state height-unset"><span
class="text-bold">Gutzeit: </span><span
id="plushours"
class="ml-1 text-normal"></span></label>
</div>
</div>
</div>
</div>
<div class="col-lg-2" id="AllHours-div" style="display: none">
<div class="form-row">
<div class="col text-center">
<div class="input-group ">
<label class="col-form-label form-control height-unset"><span
class="text-bold">Gesamtzeit: </span><span id="AllHours"
class="ml-1 text-normal"></span></label>
</div>
</div>
</div>
</div>
</div>

25
Layout/default/WarehouseOrder/PDF_HEADER.html
View File

@@ -17,10 +17,8 @@
}
.customer-details {
vertical-align: bottom;
vertical-align: top;
font-size: 14px;
padding-left: 30pt;
width: 35%;
}
.invoice-details {
@@ -58,8 +56,8 @@
<table style="width: 100%; border-collapse: collapse;">
<tr>
<td class="customer-details" style="float: left">
<h3>Lieferant</h3>
<td class="customer-details">
<h3>{{ addressLine_header }}</h3>
<div>{{ addressLine_1 }}</div>
<div>{{ addressLine_2 }}</div>
<div>{{ addressLine_3 }}</div>
@@ -67,8 +65,15 @@
<div style="margin-bottom: 12pt"></div>
<div>{{ externalReference }}</div>
</td>
<td class="customer-details" align="top">
<h3>Rechnungsadresse</h3>
<td class="customer-details">
<h3>{{ shippingAddressLine_header }}</h3>
<div>{{ shippingAddressLine_1 }}</div>
<div>{{ shippingAddressLine_2 }}</div>
<div>{{ shippingAddressLine_3 }}</div>
<div>{{ shippingAddressLine_4 }}</div>
</td>
<td class="customer-details">
<h3>{{ billingAddressLine_header }}</h3>
<div>{{ billingAddressLine_1 }}</div>
<div>{{ billingAddressLine_2 }}</div>
<div>{{ billingAddressLine_3 }}</div>
@@ -76,12 +81,6 @@
<div>{{ billingAddressLine_5 }}</div>
<div>{{ billingAddressLine_6 }}</div>
</td>
<td class="customer-details" style="float: right">
<div>{{ shippingAddressLine_1 }}</div>
<div>{{ shippingAddressLine_2 }}</div>
<div>{{ shippingAddressLine_3 }}</div>
<div>{{ shippingAddressLine_4 }}</div>
</td>
</tr>
</table>

122
Layout/default/WarehouseOrder/PDF_MAIN.php
View File

@@ -6,13 +6,51 @@
* @var Array $textElements
*/
$this->setReturnValue(['filename' => $order["id"] . ".pdf"]);
$texts = [
'EN' => [
'header' => 'XINON Supplier Order from ' . date("d.m.Y", $order["create"]),
'sum' => 'Sum',
'vat' => '20% VAT',
'total' => 'Total',
'taxFree' => 'Please provide tax-free delivery according to § 6a UStG (Austrian Sales tax law).<br>Our VAT ID number: ATU68711968. Delivery to Austria.',
'orderConfirmation' => 'Please send the order confirmation to office@xinon.at',
'table' => [
'pos' => 'POS',
'article' => 'Article',
'articleNumber' => 'Dist. art. nr.',
'amount' => 'Amount',
'unitPrice' => 'Unit price',
'totalPrice' => 'Total price'
]
],
'DE' => [
'header' => 'XINON Lieferantenbestellung vom ' . date("d.m.Y", $order["create"]),
'sum' => 'Summe',
'vat' => '20% MwSt',
'total' => 'Gesamt',
'taxFree' => 'Bitte um steuerfreie Lieferung gemäß § 6a UStG.<br> Unsere UID-Nr.: ATU68711968. Lieferung nach Österreich.',
'orderConfirmation' => 'Wir bitten um Zusendung der Auftragsbestätigung für die Bestellung an office@xinon.at.',
'table' => [
'pos' => 'POS',
'article' => 'Artikel',
'articleNumber' => 'Art.-Nr. Lieferant',
'amount' => 'Menge',
'unitPrice' => 'Einzelpreis',
'totalPrice' => 'Gesamtpreis'
]
]];
$text = $texts[in_array($distributorCountryText, ["Österreich", "Deutschland", "Schweiz"]) ? "DE" : "EN"];
?>
<!DOCTYPE html>
<html>
<head>
<title>Bestellung</title>
<meta charset="utf-8" />
<title><?= $text['header'] ?></title>
<meta charset="utf-8"/>
<style>
body {
margin-top: 0;
@@ -76,58 +114,78 @@ $this->setReturnValue(['filename' => $order["id"] . ".pdf"]);
</head>
<body>
<div>
<!--
TODO: enable option for showing prices
vertauschen
Die gelieferte Ware bleibt bis zur vollständigen Bezahlung in unserem Eigentum.
-->
<h2 style="text-align: center;color: #005384">XINON Lieferantenbestellung vom <?=date("d.m.Y", $order["create"])?></h2>
<h2 style="text-align: center;color: #005384"><?= $text['header'] ?></h2>
<table style="border-collapse: collapse; width: 100%;" id="invoiceTable">
<tr style="font-weight: bold; border-bottom: 1px solid black;" class="uneven">
<th style="text-align: center;padding-right: 6pt">Position</th>
<th style="text-align: center;padding-right: 6pt">Artikel</th>
<th style="text-align: center;padding-right: 6pt">Art.-Nr. Lieferant</th>
<th style="text-align: right">Menge</th>
<th style="text-align: right">Einzelpreis</th>
<th style="text-align: right;padding-right: 8pt">Gesamtpreis</th>
<th style="text-align: center;padding-right: 6pt"><?= $text['table']['pos'] ?></th>
<th style="text-align: center;padding-right: 6pt"><?= $text['table']['article'] ?></th>
<th style="text-align: center;padding-right: 6pt"><?= $text['table']['articleNumber'] ?></th>
<th style="text-align: right"><?= $text['table']['amount'] ?></th>
<th style="text-align: right"><?= $text['table']['unitPrice'] ?></th>
<th style="text-align: right;padding-right: 8pt"><?= $text['table']['totalPrice'] ?></th>
</tr>
<?php $i = 0; foreach($order['positions'] as $p):?>
<?php $i = 0;
foreach ($order['positions'] as $p): ?>
<tr class="position <?=($i%2 == 0) ? "even" : "uneven" ?>">
<td style="text-align: center;"><?= $i + 1 ?></td>
<td style="text-align: left;padding-right: 8pt"><?=$p["articleName"]?></td>
<td style="text-align: center;padding-right: 8pt"><?=$p["distributorArticleNumber"]?></td>
<td style="text-align: right"><?=$p["amount"]?></td>
<td style="text-align: right"><?=number_format($p["buyPrice"], 2, ",", ".")?> €</td>
<td style="text-align: right;padding-right: 8pt"><?=number_format($p["amount"] * $p["buyPrice"], 2, ",", ".")?> €</td>
</tr>
<?php $i++; endforeach;?>
<!-- display a grey like header sum with top border to differentiate 2nd last td = Summe , last td is the calculated value both bold-->
<tr class="position <?= ($i % 2 == 0) ? "even" : "uneven" ?>">
<td style="text-align: center;"><?= $i + 1 ?></td>
<td style="text-align: left;padding-right: 8pt"><?= $p["articleName"] ?></td>
<td style="text-align: center;padding-right: 8pt"><?= $p["distributorArticleNumber"] ?></td>
<td style="text-align: right"><?= $p["amount"] ?></td>
<td style="text-align: right"><?= number_format($p["buyPrice"], 2, ",", ".") ?> €</td>
<td style="text-align: right;padding-right: 8pt"><?= number_format($p["amount"] * $p["buyPrice"], 2, ",", ".") ?> €</td>
</tr>
<tr class="<?= ($i % 2 == 0) ? "even" : "uneven" ?>">
<td></td>
<td style="text-align: left;max-width: 200px"><?= $p["articleDescription"] ?></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<?php $i++; endforeach; ?>
<tr class="uneven">
<?php
$sum = 0;
foreach($order['positions'] as $p){
foreach ($order['positions'] as $p) {
$sum += $p["amount"] * $p["buyPrice"];
}
?>
<td colspan="5" style="text-align: right;border-top: 1px solid black;font-weight: bold
;border-bottom: 1px solid black;
">Summe</td>
"><?= $text['sum'] ?>
</td>
<td style="text-align: right;border-top: 1px solid black;font-weight: bold
;border-bottom: 1px solid black;
"><?=number_format($sum, 2, ",", ".")?> €</td>
"><?= number_format($sum, 2, ",", ".") ?> €
</td>
</tr>
<?php if ($distributorCountryText === "Österreich"): ?>
<tr style="font-weight: bold; border-bottom: 1px solid black; background-color: #ebebeb;">
<td colspan="5" style="text-align: right;font-weight: bold;">20% MwSt</td>
<td style="text-align: right;font-weight: bold;"><?= number_format($sum * 0.2, 2, ",", ".") ?> €</td>
</tr>
<tr class="uneven" style="font-weight: bold; border-bottom: 3px double black; background-color: #ebebeb;">
<td colspan="5" style="text-align: right;font-weight: bold;"><?= $text['total'] ?></td>
<td style="text-align: right;font-weight: bold;"><?= number_format($sum * 1.2, 2, ",", ".") ?> €</td>
</tr>
<?php endif; ?>
</table>
<div>
<h3>Anmerkungen</h3>
<p>
<?=$order["note"]?>
</p>
<?php if ($distributorCountryText !== "Österreich"): ?>
<?= $text['taxFree'] ?>
<?php endif; ?>
<?= $text['orderConfirmation'] ?>
</div>
</body>
</html>

5
Layout/default/menu.php
View File

@@ -11,6 +11,9 @@
</a>
<ul class="submenu">
<li><a href="<?=self::getUrl("Preorder")?>"><i class="far fa-fw fa-calendar-lines text-info"></i> Vorbestellung</a></li>
<?php if($me->is(["Admin","netowner","salespartner"]) && in_array($me->address_id, [1,209,5908,2187])): ?>
<li><a href="<?=self::getUrl("ConstructionConsentProject")?>"><i class="far fa-fw fa-clipboard-question text-info"></i> Zustimmungserklärungen</a></li>
<?php endif; ?>
</ul>
</li>
<?php else: ?>
@@ -198,7 +201,7 @@
<?php if($me->is(["Admin","salespartner"]) && $me->can("Order")): ?>
<li><a href="<?=self::getUrl("Order")?>"><i class="far fa-fw fa-file-signature text-info"></i> Bestellungen</a></li>
<?php endif; ?>
<?php if($me->is(["Admin","netowner","salespartner"]) && in_array($me->address_id, [1,209,5908])): ?>
<?php if($me->is(["Admin","netowner","salespartner"]) && in_array($me->address_id, [1,209,5908,2187])): ?>
<li><a href="<?=self::getUrl("ConstructionConsentProject")?>"><i class="far fa-fw fa-clipboard-question text-info"></i> Zustimmungserklärungen</a></li>
<?php endif; ?>
</ul>

2
Layout/default/vueHeader.php
View File

@@ -61,6 +61,8 @@
</head>
<body>
<script src="https://cdn.jsdelivr.net/npm/sortablejs@1.14.0/Sortable.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/vue-draggable-next@2.1.0"></script>
<script type="text/javascript">
baseurl = '<?=self::getResourcePath()?>';
</script>