|
|
@@ -13,7 +13,7 @@ $core = Core::getInstance();
|
|
|
|
|
|
$background_colour = "#000000";
|
|
|
$type_name = $document->getDisplayType();
|
|
|
-$number_title = $type_name . " #";
|
|
|
+$number_title = $type_name . " No.";
|
|
|
$delivery_note_number = null;
|
|
|
$is_proforma = false;
|
|
|
$is_commercial = false;
|
|
|
@@ -90,24 +90,6 @@ $is_part_of_aru = $document->isPartOfAru();
|
|
|
font-weight: bold;
|
|
|
}
|
|
|
|
|
|
- .card {
|
|
|
- border: none;
|
|
|
- border-color: var(--document-bg-color);
|
|
|
- border-radius: 0;
|
|
|
- }
|
|
|
-
|
|
|
- .card-header {
|
|
|
- padding: 0.25rem 0.5rem;
|
|
|
- border-radius: 0 !important;
|
|
|
- font-weight: bold;
|
|
|
- background: none;
|
|
|
- border: none;
|
|
|
- }
|
|
|
-
|
|
|
- .card-body {
|
|
|
- padding: 0.25rem 0.5rem;
|
|
|
- }
|
|
|
-
|
|
|
.large {
|
|
|
font-size: 125%;
|
|
|
}
|
|
|
@@ -160,27 +142,20 @@ $is_part_of_aru = $document->isPartOfAru();
|
|
|
</div>
|
|
|
|
|
|
<div class="row mb-4">
|
|
|
- <div class="col-8">
|
|
|
+ <div class="col-6">
|
|
|
|
|
|
<?php
|
|
|
if($document->isSalesOrder() || $document->isDeliveryNote()) {
|
|
|
?>
|
|
|
- <div class="card mb-2">
|
|
|
- <div class="card-header">
|
|
|
- Bill To
|
|
|
- </div>
|
|
|
- <div class="card-body">
|
|
|
- <?=$document->getBillingAddressHtml()?>
|
|
|
- </div>
|
|
|
+
|
|
|
+ <div class="mb-4">
|
|
|
+ <h6>Bill To</h6>
|
|
|
+ <?=$document->getBillingAddressHtml()?>
|
|
|
</div>
|
|
|
|
|
|
- <div class="card mb-2">
|
|
|
- <div class="card-header">
|
|
|
- Delivery Address
|
|
|
- </div>
|
|
|
- <div class="card-body">
|
|
|
- <?=$document->getDeliveryAddressHtml()?>
|
|
|
- </div>
|
|
|
+ <div class="mb-4">
|
|
|
+ <h6>Delivery Address</h6>
|
|
|
+ <?=$document->getDeliveryAddressHtml()?>
|
|
|
</div>
|
|
|
|
|
|
<?php
|
|
|
@@ -214,11 +189,11 @@ $is_part_of_aru = $document->isPartOfAru();
|
|
|
}
|
|
|
?>
|
|
|
</div>
|
|
|
- <div class="col-4">
|
|
|
+ <div class="col-6">
|
|
|
|
|
|
<?php
|
|
|
$render_card = static function(string $title, ?string $content): void {
|
|
|
- $content = trim($content) ? htmlspecialchars($content) : " ";
|
|
|
+ $content = trim($content) ? htmlspecialchars($content) : "-";
|
|
|
?>
|
|
|
<div class="row g-2 mb-1">
|
|
|
<div class="col-6 text-end">
|
|
|
@@ -283,7 +258,7 @@ $is_part_of_aru = $document->isPartOfAru();
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
|
- <table class="table">
|
|
|
+ <table class="table mb-4">
|
|
|
<colgroup>
|
|
|
<col style="width: 60%"/>
|
|
|
<col style="width: 20%"/>
|
|
|
@@ -336,10 +311,10 @@ $is_part_of_aru = $document->isPartOfAru();
|
|
|
}
|
|
|
?>
|
|
|
</td>
|
|
|
- <td class="font-monospace">
|
|
|
+ <td class="">
|
|
|
<?=$item->getSerialNumberHtml()?>
|
|
|
</td>
|
|
|
- <td class="text-end font-monospace">
|
|
|
+ <td class="text-end ">
|
|
|
<?=$item->quantity?>
|
|
|
</td>
|
|
|
<?php
|
|
|
@@ -347,10 +322,10 @@ $is_part_of_aru = $document->isPartOfAru();
|
|
|
$amount = $item->getAmount();
|
|
|
$subtotal = bcadd($amount, $subtotal, 2);
|
|
|
?>
|
|
|
- <td class="text-end font-monospace">
|
|
|
+ <td class="text-end">
|
|
|
<?=number_format($item->unit_price, 2)?>
|
|
|
</td>
|
|
|
- <td class="text-end font-monospace">
|
|
|
+ <td class="text-end">
|
|
|
<?=number_format($amount, 2)?>
|
|
|
</td>
|
|
|
<?php
|
|
|
@@ -370,44 +345,24 @@ $is_part_of_aru = $document->isPartOfAru();
|
|
|
|
|
|
?>
|
|
|
<tr>
|
|
|
- <td colspan="2" rowspan="5">
|
|
|
- <div class="mb-2">
|
|
|
- <strong><?=htmlspecialchars(__("Payment Details"))?></strong>
|
|
|
- </div>
|
|
|
-
|
|
|
- <div class="mb-2">
|
|
|
- <strong>Account Name:</strong> <?=htmlspecialchars($bank_details->bank_account_name ?? "")?>
|
|
|
- </div>
|
|
|
- <div class="mb-2">
|
|
|
- <strong>Address:</strong> <?=htmlspecialchars($bank_details->bank_address ?? "")?>
|
|
|
- </div>
|
|
|
- <div class="mb-2">
|
|
|
- <strong>Sort Code:</strong> <?=htmlspecialchars($bank_details->bank_sort_code ?? "")?>
|
|
|
- <span class="px-1"></span>
|
|
|
- <strong>Account:</strong> <?=htmlspecialchars($bank_details->bank_account_number ?? "")?>
|
|
|
- <span class="px-1"></span>
|
|
|
- <strong>Currency:</strong> <?=htmlspecialchars($bank_details->currency ?? "")?>
|
|
|
- </div>
|
|
|
- <div class="mb-2">
|
|
|
- <strong>IBAN:</strong> <?=htmlspecialchars($bank_details->bank_account_iban ?? "")?>
|
|
|
- </div>
|
|
|
+ <td class="border-bottom-0" colspan="2" rowspan="5">
|
|
|
</td>
|
|
|
<td class="text-uppercase" colspan="2">Subtotal</td>
|
|
|
- <td class="text-end font-monospace"><?=number_format($subtotal, 2)?></td>
|
|
|
+ <td class="text-end"><?=number_format($subtotal, 2)?></td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td class="text-uppercase" colspan="2">VAT Rate</td>
|
|
|
- <td class="text-end font-monospace"><?=$document->tax_rate?>%</td>
|
|
|
+ <td class="text-end"><?=$document->tax_rate?>%</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td class="text-uppercase" colspan="2">VAT</td>
|
|
|
- <td class="text-end font-monospace"><?=number_format($tax, 2)?></td>
|
|
|
+ <td class="text-end"><?=number_format($tax, 2)?></td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
- <td class="text-uppercase" colspan="2">
|
|
|
+ <td class="text-uppercase border-bottom-0" colspan="2">
|
|
|
<strong>Total</strong>
|
|
|
</td>
|
|
|
- <td class="text-end font-monospace">
|
|
|
+ <td class="text-end border-bottom-0">
|
|
|
<strong><?=number_format($total, 2)?></strong>
|
|
|
</td>
|
|
|
</tr>
|
|
|
@@ -416,6 +371,27 @@ $is_part_of_aru = $document->isPartOfAru();
|
|
|
?>
|
|
|
</table>
|
|
|
|
|
|
+ <section class="mb-4 border rounded p-3 d-flex flex-column gap-1">
|
|
|
+ <h6><?=htmlspecialchars(__("Payment Details"))?></h6>
|
|
|
+
|
|
|
+ <div>
|
|
|
+ <strong>Account Name:</strong> <?=htmlspecialchars($bank_details->bank_account_name ?? "")?>
|
|
|
+ </div>
|
|
|
+ <div>
|
|
|
+ <strong>Address:</strong> <?=htmlspecialchars($bank_details->bank_address ?? "")?>
|
|
|
+ </div>
|
|
|
+ <div>
|
|
|
+ <strong>Sort Code:</strong> <?=htmlspecialchars($bank_details->bank_sort_code ?? "")?>
|
|
|
+ <span class="px-1"></span>
|
|
|
+ <strong>Account:</strong> <?=htmlspecialchars($bank_details->bank_account_number ?? "")?>
|
|
|
+ <span class="px-1"></span>
|
|
|
+ <strong>Currency:</strong> <?=htmlspecialchars($bank_details->currency ?? "")?>
|
|
|
+ </div>
|
|
|
+ <div>
|
|
|
+ <strong>IBAN:</strong> <?=htmlspecialchars($bank_details->bank_account_iban ?? "")?>
|
|
|
+ </div>
|
|
|
+ </section>
|
|
|
+
|
|
|
<?php
|
|
|
if($document->isSalesOrder() && $company->invoice_footer) {
|
|
|
?>
|