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

Merge branch 'Preorderlogistics/fix-addresses' into 'master'

Browse Source 
fixed addr for preorderlogistics

See merge request fronk/thetool!1680
This commit is contained in:
Luca Haid
2025-08-26 11:18:34 +00:00
parent a8667df1ab dc2826ffb7
commit 68c4e50b20
2 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Layout/default/Preorderlogistics/Index.php
+4 -4
View File
@@ -103,12 +103,12 @@ include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php")
data-ucode="<?= $preorder->ucode ?>" data-ucode="<?= $preorder->ucode ?>"
data-oaid="<?= $preorder->oaid ?>" data-oaid="<?= $preorder->oaid ?>"
data-addr-name="<?= htmlspecialchars($preorder->company ?: "{$preorder->firstname} {$preorder->lastname}", ENT_QUOTES) ?>" data-addr-name="<?= htmlspecialchars($preorder->company ?: "{$preorder->firstname} {$preorder->lastname}", ENT_QUOTES) ?>"
data-addr-street="<?= htmlspecialchars(trim("{$preorder->street} {$preorder->housenumber}"), ENT_QUOTES) ?>" data-addr-street="<?= htmlspecialchars($preorder->adb_hausnummer_id ? "{$preorder->adb_hausnummer->strasse->name} {$preorder->adb_hausnummer->hausnummer}" : trim("{$preorder->street} {$preorder->housenumber}"), ENT_QUOTES) ?>"
data-addr-zip="<?= $preorder->zip ?>" data-addr-zip="<?= htmlspecialchars($preorder->adb_hausnummer_id ? $preorder->adb_hausnummer->plz->plz : $preorder->zip, ENT_QUOTES) ?>"
data-addr-city="<?= htmlspecialchars($preorder->city, ENT_QUOTES) ?>" data-addr-city="<?= htmlspecialchars($preorder->adb_hausnummer_id ? $preorder->adb_hausnummer->ortschaft->name : $preorder->city, ENT_QUOTES) ?>"
data-phone="<?= $preorder->phone ?>" data-phone="<?= $preorder->phone ?>"
data-email="<?= $preorder->email ?>"> data-email="<?= $preorder->email ?>">
<td class="text-right align-middle"> <td class="text-right align-middle">
<button type="button" class="btn btn-sm btn-success font-weight-bold" onclick="printShippingSlip(<?= $preorder->id ?>)"><i class="fas fa-fw fa-print"></i> DRUCKEN</button> <button type="button" class="btn btn-sm btn-success font-weight-bold" onclick="printShippingSlip(<?= $preorder->id ?>)"><i class="fas fa-fw fa-print"></i> DRUCKEN</button>
</td> </td>
<td class="text-center align-middle"> <td class="text-center align-middle">
Layout/default/Preorderlogistics/Print.template.php
+21 -12
View File
@@ -35,18 +35,27 @@
</div> </div>
<div style="margin-top: 28pt"> <div style="margin-top: 28pt">
<p> <p>
<?php if($preorder->company): ?> <?php if($preorder->company): ?>
<?=nl2br($preorder->company)?><br /> <?=nl2br(htmlspecialchars($preorder->company))?><br />
<?php else: ?> <?php else: ?>
<br /> <br />
<?php endif; ?> <?php endif; ?>
<?php if($preorder->lastname): ?> <?php if($preorder->lastname): ?>
<?=$preorder->firstname?> <?=$preorder->lastname?><br /> <?=htmlspecialchars($preorder->firstname)?> <?=htmlspecialchars($preorder->lastname)?><br />
<?php endif; ?> <?php endif; ?>
<?=$preorder->street?> <?=$preorder->housenumber?><br />
<?=$preorder->zip?> <?=$preorder->city?> <?php if ($preorder->adb_hausnummer_id): ?>
</p> <?= htmlspecialchars($preorder->adb_hausnummer->strasse->name) ?> <?= htmlspecialchars($preorder->adb_hausnummer->hausnummer) ?><br/>
<?php if ($preorder->adb_wohneinheit_id && (string)$preorder->adb_wohneinheit): ?>
<?= htmlspecialchars((string)$preorder->adb_wohneinheit) ?><br />
<?php endif; ?>
<?= htmlspecialchars($preorder->adb_hausnummer->plz->plz) ?> <?= htmlspecialchars($preorder->adb_hausnummer->ortschaft->name) ?>
<?php else: ?>
<?=htmlspecialchars($preorder->street)?> <?=htmlspecialchars($preorder->housenumber)?><br />
<?=htmlspecialchars($preorder->zip)?> <?=htmlspecialchars($preorder->city)?>
<?php endif; ?>
</p>
<p style="text-align: right; padding-top: 4pt;">Liezen, <?=date("d.m.Y")?></p> <p style="text-align: right; padding-top: 4pt;">Liezen, <?=date("d.m.Y")?></p>
<p style="padding-top: 4pt;">Liebe(r) <?=($preorder->firstname) ? $preorder->firstname : ""?> <?=($preorder->lastname) ? $preorder->lastname : ""?>,</p> <p style="padding-top: 4pt;">Liebe(r) <?=($preorder->firstname) ? $preorder->firstname : ""?> <?=($preorder->lastname) ? $preorder->lastname : ""?>,</p>