momo/invoiceplane-template
3
0
Fork 1
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request 'add check for user_company field, keep defaulting to user_name' (#4) from user_company into main

Browse source 
Reviewed-on: #4
Reviewed-by: b12f <b12f@noreply.git.pub.solar>
This commit is contained in:
teutat3s 2024-10-08 14:43:41 +00:00
parent 8fd252d743 099d168ef4
commit a4f2aa7658
Signed by: pub.solar gitea
GPG key ID: F0332B04B7054873
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
momo.php
View file

@ -104,9 +104,15 @@ footer .notes {
<div id="client"> <div id="client">
<div id="sichtfenster-absender"> <div id="sichtfenster-absender">
<?php if ($invoice->user_company !== ""): ?>
<?php
echo htmlsc($invoice->user_company) . ' - ' . htmlsc($invoice->user_address_1) . ' - ' . htmlsc($invoice->user_zip) . ' ' . htmlsc($invoice->user_city);
?>
<?php else: ?>
<?php <?php
echo htmlsc($invoice->user_name) . ' - ' . htmlsc($invoice->user_address_1) . ' - ' . htmlsc($invoice->user_zip) . ' ' . htmlsc($invoice->user_city); echo htmlsc($invoice->user_name) . ' - ' . htmlsc($invoice->user_address_1) . ' - ' . htmlsc($invoice->user_zip) . ' ' . htmlsc($invoice->user_city);
?> ?>
<?php endif; ?>
<hr /> <hr />
</div> </div>
<div> <div>
@ -159,7 +165,13 @@ footer .notes {
<!-- client is extracted due to absolute position --> <!-- client is extracted due to absolute position -->
<div id="company"> <div id="company">
<div><b><?php _htmlsc($invoice->user_name); ?></b></div> <div><b>
<?php if ($invoice->user_company !== "") : ?>
<?php _htmlsc($invoice->user_company); ?>
<?php else: ?>
<?php _htmlsc($invoice->user_name); ?>
<?php endif; ?>
</b></div>
<?php if ($invoice->user_vat_id) { <?php if ($invoice->user_vat_id) {
echo '<div>' . trans('vat_id_short') . ': ' . $invoice->user_vat_id . '</div>'; echo '<div>' . trans('vat_id_short') . ': ' . $invoice->user_vat_id . '</div>';
} }
@ -384,7 +396,12 @@ footer .notes {
<?php if (!$isPaid): ?> <?php if (!$isPaid): ?>
<p> <p>
Bitte überweisen Sie den Rechnungsbetrag innerhalb von <?php echo (-1 * $invoice->days_overdue); ?> Tagen auf untenstehendes Konto:<br /> Bitte überweisen Sie den Rechnungsbetrag innerhalb von <?php echo (-1 * $invoice->days_overdue); ?> Tagen auf untenstehendes Konto:<br />
Inhaber: <?php echo $invoice->user_name; ?><br /> Inhaber:
<?php if ($invoice->user_company !== "") : ?>
<?php echo $invoice->user_company; ?><br />
<?php else: ?>
<?php echo $invoice->user_name; ?><br />
<?php endif; ?>
IBAN: <?php echo $invoice->user_iban; ?><br /> IBAN: <?php echo $invoice->user_iban; ?><br />
<?php echo invoice_qrcode($invoice->invoice_id); ?> <?php echo invoice_qrcode($invoice->invoice_id); ?>
</p> </p>