Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Code Issues Releases Activity

Fixes for plain design

Browse Source
This commit is contained in:
David Bomba 2023-02-25 20:02:35 +11:00
parent c5c0dc6db9
commit 85029a03f4
3 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/Services/Pdf/PdfMock.php
View File

@ -69,7 +69,7 @@ class PdfMock
$html = $pdf_service->getHtml();
// nlog($html);
nlog($html);
return $pdf_service->resolvePdfEngine($html);
}
@ -135,8 +135,9 @@ class PdfMock
'$client.shipping_postal_code' => '46420',
'$client.billing_postal_code' => '11243',
'$company.city_state_postal' => '90210',
'$company.city_state_postal' => 'Beveley Hills, CA, 90210',
'$company.postal_city_state' => 'CA',
'$company.postal_city' => '90210, CA',
'$product.gross_line_total' => '100',
'$client.postal_city_state' => '11243 Aufderharchester, North Carolina',
'$client.postal_city' => '11243 Aufderharchester, North Carolina',
@ -200,7 +201,7 @@ class PdfMock
'$statement_amount' => '',
'$task.description' => '',
'$product.discount' => '',
'$entity_issued_to' => '',
'$entity_issued_to' => 'Bob JOnes',
'$assigned_to_user' => '',
'$product.quantity' => '',
'$total_tax_labels' => '',
@ -285,7 +286,7 @@ class PdfMock
'$quote.custom3' => ' ',
'$quote.custom4' => ' ',
'$company.email' => $this->settings->email,
'$client.number' => ' ',
'$client.number' => '12345',
'$company.phone' => $this->settings->phone,
'$company.state' => $this->settings->state,
'$credit.number' => '0029',
@ -298,9 +299,9 @@ class PdfMock
'$entity_footer' => 'Default invoice footer',
'$client.lang_2' => 'en',
'$product.date' => '',
'$client.email' => '',
'$client.email' => 'client@gmail.com',
'$product.item' => '',
'$public_notes' => '',
'$public_notes' => 'These are very public notes',
'$task.service' => '',
'$credit.total' => '$0.00',
'$net_subtotal' => '$0.00',
@ -308,7 +309,7 @@ class PdfMock
'$quote.amount' => '$0.00',
'$company.city' => $this->settings->city,
'$payment.date' => ' ',
'$client.phone' => ' ',
'$client.phone' => '555-123-3212',
'$number_short' => '0029',
'$quote.number' => '0029',
'$invoice.date' => '25/Feb/2023',
@ -438,7 +439,7 @@ EPD
'$number' => '0029',
'$footer' => 'Default invoice footer',
'$client' => 'cypress',
'$email' => '',
'$email' => 'email@invoiceninja.net',
'$notes' => '',
'_rate1' => '',
'_rate2' => '',
@ -447,12 +448,12 @@ EPD
'$total' => '$0.00',
'$phone' => ' ',
'$terms' => 'Default company invoice terms',
'$from' => '',
'$from' => 'Bob Jones',
'$item' => '',
'$date' => '25/Feb/2023',
'$tax' => '',
'$dir' => 'ltr',
'$to' => '',
'$to' => 'Jimmy Giggles',
'$show_paid_stamp' => $this->settings->show_paid_stamp ? 'flex' : 'none',
'$status_logo' => '<div class="stamp is-paid"> ' . ctrans('texts.paid') .'</div>',
'$show_shipping_address' => $this->settings->show_shipping_address ? 'flex' : 'none',
@ -465,6 +466,7 @@ EPD
'$client.billing_postal_code_label' => 'Postal Code',
'$company.city_state_postal_label' => 'City/State/Postal',
'$company.postal_city_state_label' => 'Postal/City/State',
'$company.postal_city_label' => 'Postal/City',
'$product.gross_line_total_label' => 'Gross line total',
'$client.postal_city_state_label' => 'Postal/City/State',
'$client.postal_city_label' => 'Postal/City',

27
resources/views/pdf-designs/plain.html
View File

@ -44,13 +44,14 @@
display: grid;
grid-template-columns: 1fr 1fr 1fr;
line-height: var(--line-height);
margin-bottom:10px;
}
.client-wrapper{
display: grid;
gap: 10px;
grid-template-columns: auto auto;
grid-template-areas: "a b";
grid-template-columns: 1fr 1fr 1fr;
grid-template-areas: "a b c ";
grid-auto-columns: minmax(0, 1fr);
grid-auto-flow: column;
justify-content:left;
@ -66,16 +67,15 @@
line-height: var(--line-height);
}
.header-wrapper #entity-details {
margin-top: 0.5rem;
#entity-details {
text-align: left;
width: 100%;
}
.header-wrapper #entity-details>tr,
.header-wrapper #entity-details th {
#entity-details>tr,
#entity-details th {
font-weight: normal;
padding-left: 0.9rem;
padding-left: 0rem;
padding-top: 0.3rem;
padding-bottom: 0.3rem;
}
@ -93,7 +93,7 @@
}
#shipping-details {
display: $show_shipping_address;
visibility: $show_shipping_address_visibility;
flex-direction: column;
line-height: var(--line-height);
white-space: nowrap;
@ -104,7 +104,7 @@
min-width: 100%;
table-layout: fixed;
overflow-wrap: break-word;
margin-bottom: 50px;
margin-bottom: 5px;
}
.task-time-details {
@ -140,7 +140,7 @@
display: grid;
grid-template-columns: 2fr 1fr;
padding-top: .5rem;
padding-left: 1rem;
padding-left: .5rem;
margin-right: .75rem;
gap: 80px;
page-break-inside: auto;
@ -166,7 +166,7 @@
#table-totals>.totals-table-right-side>*> :nth-child(2) {
text-align: right;
padding-right: 7px;
padding-right: 0px;
}
#table-totals>* [data-element='total-table-balance-due-label'],
@ -331,13 +331,16 @@
<div id="company-address"></div>
<div>
<img class="company-logo" src="$company.logo" alt="$company.name logo" />
<table id="entity-details" cellspacing="0" dir="$dir"></table>
</div>
</div>
<div class="client-wrapper">
<div id="client-details"></div>
<div id="vendor-details"></div>
<div id="shipping-details"></div>
<div>
<table id="entity-details" cellspacing="0" dir="$dir"></table>
</div>
</div>
<table id="product-table" cellspacing="0" data-ref="table"></table>
<table id="task-table" cellspacing="0" data-ref="table"></table>

1
resources/views/pdf-designs/playful.html
View File

@ -72,7 +72,6 @@
.contacts-wrapper {
display: grid;
/* grid-template-columns: 1fr 1fr; */
gap: 20px;
padding: 1rem 0rem 0rem 2rem;
grid-template-columns: 1fr 1fr auto;