Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev
This commit is contained in:
Frank Schubert
@@ -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 ?>,
|
||||
|
||||
@@ -269,6 +269,8 @@
|
||||
<p>Energie Steiermark Breitband GmbH</p>
|
||||
</div>
|
||||
|
||||
<div class="page"> </div>
|
||||
|
||||
<div class="page">
|
||||
|
||||
<p class="text-right">
|
||||
@@ -410,7 +412,7 @@
|
||||
<div class="borderpoint">
|
||||
<h3>Übersichtsplan / Planskizze</h3>
|
||||
|
||||
<?php if($consent->file): ?>
|
||||
<?php if($consent->file && $consent->file->file_id && $consent->file->file->fileExists()): ?>
|
||||
<img src="<?=$consent->file->file->asDataUrl()?>" style="max-width: 640px; max-height: 640px; border: 1px solid #000" />
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -119,57 +119,61 @@
|
||||
</div>
|
||||
|
||||
<hr />
|
||||
<h4>Nutzung</h4>
|
||||
|
||||
<div class="form-group row">
|
||||
<label class="col-lg-2 col-form-label" for="usage_length">Länge auf Grundstück (in m)</label>
|
||||
<div class="col-lg-10">
|
||||
<input type="text" class="form-control" name="usage_length" id="usage_length" value="<?=(isset($item)) ? $item->usage_length : ""?>" />
|
||||
</div>
|
||||
</div>
|
||||
<div id="usage-container">
|
||||
<h4>Nutzung</h4>
|
||||
|
||||
<div class="form-group row mt-3">
|
||||
<div class="col-lg-2"></div>
|
||||
<div class="col-lg-10">
|
||||
<label>
|
||||
<input type="checkbox" name="usage_pipe_on_plot" id="usage_pipe_on_plot" value="1" <?=(isset($item) && $item->usage_pipe_on_plot ? "checked='checked'" : "")?> />
|
||||
Verlegung von Rohren und Lichtwellenleitern am Grundstück
|
||||
</label>
|
||||
<div class="form-group row">
|
||||
<label class="col-lg-2 col-form-label" for="usage_length">Länge auf Grundstück (in m)</label>
|
||||
<div class="col-lg-10">
|
||||
<input type="text" class="form-control" name="usage_length" id="usage_length" value="<?=(isset($item)) ? $item->usage_length : ""?>" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<div class="col-lg-2"></div>
|
||||
<div class="col-lg-10">
|
||||
<label>
|
||||
<input type="checkbox" name="usage_pipe_in_building" id="usage_pipe_in_building" value="1" <?=(isset($item) && $item->usage_pipe_in_building ? "checked='checked'" : "")?> />
|
||||
Verlegung von Rohren und Lichtwellenleitern in den darauf befindlichen Gebäuden
|
||||
</label>
|
||||
<div id="usage-checkbox-container" class="<?=(isset($item) && $item->object_type == "building") ? "hidden": ""?>">
|
||||
<div class="form-group row mt-3">
|
||||
<div class="col-lg-2"></div>
|
||||
<div class="col-lg-10">
|
||||
<label>
|
||||
<input type="checkbox" name="usage_pipe_on_plot" id="usage_pipe_on_plot" value="1" <?=(isset($item) && $item->usage_pipe_on_plot ? "checked='checked'" : "")?> />
|
||||
Verlegung von Rohren und Lichtwellenleitern am Grundstück
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<div class="col-lg-2"></div>
|
||||
<div class="col-lg-10">
|
||||
<label>
|
||||
<input type="checkbox" name="usage_manhole" id="usage_manhole" value="1" <?=(isset($item) && $item->usage_manhole ? "checked='checked'" : "")?> />
|
||||
Errichtung eines Schachtes/einer Kabelmontagegrube und/oder eines LWL-Verteilschrankes/einer LWL-Abschlussbox
|
||||
</label>
|
||||
<div class="form-group row">
|
||||
<div class="col-lg-2"></div>
|
||||
<div class="col-lg-10">
|
||||
<label>
|
||||
<input type="checkbox" name="usage_pipe_in_building" id="usage_pipe_in_building" value="1" <?=(isset($item) && $item->usage_pipe_in_building ? "checked='checked'" : "")?> />
|
||||
Verlegung von Rohren und Lichtwellenleitern in den darauf befindlichen Gebäuden
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<div class="col-lg-2"></div>
|
||||
<div class="col-lg-10">
|
||||
<label>
|
||||
<input type="checkbox" name="usage_owner" id="usage_owner" value="1" <?=(isset($item) && $item->usage_owner ? "checked='checked'" : "")?> />
|
||||
Die Nutzung der Liegenschaft seitens BB dient der Eigenversorgung der GE und/oder dessen Nutzer(in) und wird dieser entgeltlos zugestimmt
|
||||
</label>
|
||||
<div class="form-group row">
|
||||
<div class="col-lg-2"></div>
|
||||
<div class="col-lg-10">
|
||||
<label>
|
||||
<input type="checkbox" name="usage_manhole" id="usage_manhole" value="1" <?=(isset($item) && $item->usage_manhole ? "checked='checked'" : "")?> />
|
||||
Errichtung eines Schachtes/einer Kabelmontagegrube und/oder eines LWL-Verteilschrankes/einer LWL-Abschlussbox
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<div class="col-lg-2"></div>
|
||||
<div class="col-lg-10">
|
||||
<label>
|
||||
<input type="checkbox" name="usage_owner" id="usage_owner" value="1" <?=(isset($item) && $item->usage_owner ? "checked='checked'" : "")?> />
|
||||
Die Nutzung der Liegenschaft seitens BB dient der Eigenversorgung der GE und/oder dessen Nutzer(in) und wird dieser entgeltlos zugestimmt
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<hr />
|
||||
|
||||
<h4>Planskizze / Bilddatei</h4>
|
||||
<div class="form-group row">
|
||||
<label class="col-lg-2 col-form-label"></label>
|
||||
@@ -197,18 +201,10 @@
|
||||
|
||||
|
||||
<div class="card">
|
||||
<h5 class="card-header">Plan Vorschau</h5>
|
||||
<h5 class="card-header">Plan Vorschau <button type='button' id="delete-rimo-plan" class='ml-2 btn btn-sm btn-outline-danger pointer <?=($item->file && $item->file->file && $item->file->file->fileExists()) ? "" : "hidden" ?>' onclick='deletePlan()'><i class='fas fa-fw fa-trash'></i> Plan löschen</button></h5>
|
||||
<div class="card-body" id="rimo-plan-container">
|
||||
<input type="hidden" name="submit_plan_file_id" id="submit_plan_file_id" value="" />
|
||||
<img id="plan_preview" style="max-width: 1200px;" <?=($item->file) ? "src=".$item->file->file->asDataUrl()."" : "" ?> />
|
||||
<div class="row mt-2">
|
||||
<div class="col">
|
||||
<button type="button" class="btn btn-outline-danger hidden" id="delete-rimo-plan" onclick="deleteRimoPlan()">
|
||||
<i class="far fa-fw fa-trash-alt"></i> Plan löschen
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<img id="plan_preview" style="max-width: 1200px;" <?=($item->file && $item->file->file && $item->file->file->fileExists()) ? "src=".$item->file->file->asDataUrl()."" : "" ?> />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -268,11 +264,13 @@
|
||||
$("#adb_hausnummer_id").val("").change();
|
||||
|
||||
$("#street-search").show();
|
||||
$("#usage-checkbox-container").show();
|
||||
} else {
|
||||
$("#street-search").hide();
|
||||
$("#adb_strasse_id").val("").change();
|
||||
|
||||
$("#address-search").show();
|
||||
$("#usage-checkbox-container").hide();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -363,6 +361,7 @@
|
||||
var [file] = $("#consent_plan_image").prop("files");
|
||||
if(file) {
|
||||
$("#plan_preview").attr("src", URL.createObjectURL(file));
|
||||
$("#delete-rimo-plan").show();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -371,11 +370,19 @@
|
||||
$("#adb_strasse_id").val("").change();
|
||||
});
|
||||
|
||||
function deleteRimoPlan() {
|
||||
$('#plan_adb_hausnummer_id').val("");
|
||||
$("#submit_plan_file_id").val();
|
||||
function deletePlan() {
|
||||
$('#plan_adb_hausnummer_id').val("").change();
|
||||
$("#submit_plan_file_id").val("");
|
||||
$("#plan_preview").attr("src", "");
|
||||
$("#delete-rimo-plan").hide();
|
||||
$("#consent_plan_image").val("");
|
||||
|
||||
<?php if(isset($item) && $item->id): ?>
|
||||
$.post("<?=self::getUrl("ConstructionConsent", "api")?>", {
|
||||
do: "deleteRimoPlan",
|
||||
id: <?=$item->id?>
|
||||
});
|
||||
<?php endif; ?>
|
||||
|
||||
}
|
||||
|
||||
@@ -391,6 +398,30 @@
|
||||
$("#gstnr").val(kg + gst);
|
||||
}
|
||||
|
||||
$(window).bind("paste", (e) => {
|
||||
var files = e.originalEvent.clipboardData.files;
|
||||
if(files.length > 0) {
|
||||
$("#consent_plan_image").prop("files", files);
|
||||
$("#consent_plan_image").change();
|
||||
window.notify("info", "Plan aus Zwischenablage übernommen.");
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
$(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"); ?>
|
||||
@@ -112,11 +112,7 @@ $pagination_entity_name = "Zustimmungserklärungen";
|
||||
<th>Name</th>
|
||||
<th>Objekttyp</th>
|
||||
<th>Objektadresse</th>
|
||||
<!-- <th title="Grundstücksnummer">GST-Nr.</th>-->
|
||||
<!-- <th title="Grundbuch Einlagezahl">EZ</th>-->
|
||||
<!-- <th>Besitzer</th>-->
|
||||
<!-- <th>Besitzer Adresse</th>-->
|
||||
<!-- <th>Besitzer Kontakt</th>-->
|
||||
<th>GST-Nr.</th>
|
||||
<th>Anfragestatus</th>
|
||||
<th>Anfrageresultat</th>
|
||||
<th></th>
|
||||
@@ -137,24 +133,7 @@ $pagination_entity_name = "Zustimmungserklärungen";
|
||||
<?=$item->adb_hausnummer->strasse->gemeinde->name?>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
<!-- <td>--><?php //=$item->gstnr?><!--</td>-->
|
||||
<!-- <td>--><?php //=$item->ez?><!--</td>-->
|
||||
<!-- <td>--><?php //=$item->owner_name?><!--</td>-->
|
||||
<!-- <td>-->
|
||||
<!-- --><?php //=$item->owner_street?><!--<br />-->
|
||||
<!-- --><?php //=$item->owner_zip?><!-- --><?php //=$item->owner_city?><!--<br />-->
|
||||
<!-- </td>-->
|
||||
<!-- <td>-->
|
||||
<!-- --><?php //if($item->phone): ?>
|
||||
<!-- Tel: --><?php //=$item->phone?><!--<br />-->
|
||||
<!-- --><?php //endif; ?>
|
||||
<!-- --><?php //if($item->fax): ?>
|
||||
<!-- Fax: --><?php //=$item->fax?><!--<br />-->
|
||||
<!-- --><?php //endif; ?>
|
||||
<!-- --><?php //if($item->email): ?>
|
||||
<!-- Email: --><?php //=$item->email?>
|
||||
<!-- --><?php //endif; ?>
|
||||
<!-- </td>-->
|
||||
<td><?=$item->gst?></td>
|
||||
<td><?=($item->status) ? __($item->status,"consent") : ""?></td>
|
||||
<td>
|
||||
<?php
|
||||
@@ -177,9 +156,8 @@ $pagination_entity_name = "Zustimmungserklärungen";
|
||||
<?php if(!$item->result): ?>
|
||||
<a href="<?=self::getUrl("ConstructionConsent", "edit", ["id" => $item->id])?>"><i class="far fa-edit" title="Bearbeiten"></i></a>
|
||||
|
||||
<?php if($item->status == "new"): ?>
|
||||
<a href="<?=self::getUrl("ConstructionConsent", "delete", ["id" => $item->id])?>" onclick="if(!confirm('Zustimmungserklärung wirklich löschen?')) return false;" class="text-danger" title="Löschen"><i class="fas fa-trash"></i></a>
|
||||
<?php endif; ?>
|
||||
<a href="<?=self::getUrl("ConstructionConsent", "delete", ["id" => $item->id])?>" onclick="if(!confirm('Zustimmungserklärung wirklich löschen?')) return false;" class="text-danger" title="Löschen"><i class="fas fa-trash"></i></a>
|
||||
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
@@ -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>
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user