Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for designs

This commit is contained in:
David Bomba 2025-02-05 11:24:20 +11:00
parent 2266b69c22
commit fb293c0a14
6 changed files with 20 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/SetupController.php
View File

@ -78,7 +78,7 @@ class SetupController extends Controller
$db_database = $request->input('db_database'); $db_database = $request->input('db_database');
$db_username = $request->input('db_username'); $db_username = $request->input('db_username');
$db_password = $request->input('db_password'); $db_password = $request->input('db_password');
$mail_port = $request->input('mail_port'); $mail_port = $request->input('mail_port',0);
$encryption = $request->input('encryption'); $encryption = $request->input('encryption');
$mail_host = $request->input('mail_host'); $mail_host = $request->input('mail_host');
$mail_username = $request->input('mail_username'); $mail_username = $request->input('mail_username');

17
resources/views/pdf-designs/calm.html
View File

@ -56,7 +56,13 @@
grid-template-areas: "a b c"; grid-template-areas: "a b c";
grid-auto-columns: minmax(0, 5fr); grid-auto-columns: minmax(0, 5fr);
grid-auto-flow: column; grid-auto-flow: column;
justify-content: left; justify-content: space-between;
}
.header-wrapper2 .entity-container {
justify-self: end;
align-self: start;
} }
.company-logo { .company-logo {
@ -95,7 +101,6 @@
} }
.header-wrapper #entity-details { .header-wrapper #entity-details {
padding-right: 0.5rem;
text-align: left; text-align: left;
line-height: var(--line-height); line-height: var(--line-height);
width: 100%; width: 100%;
@ -112,6 +117,10 @@
background-color: #e6e6e6; background-color: #e6e6e6;
} }
.entity-label {
padding-left: 1rem;
}
#entity-details { #entity-details {
text-align: left; text-align: left;
width: 100%; width: 100%;
@ -120,7 +129,7 @@
#entity-details th { #entity-details th {
font-weight: normal; font-weight: normal;
line-height: 1.5rem; line-height: 1.5rem;
padding-right: 2rem; padding-left: 1rem;
} }
#client-details { #client-details {
@ -404,7 +413,7 @@
<div id="client-details"></div> <div id="client-details"></div>
<div id="vendor-details"></div> <div id="vendor-details"></div>
<div id="shipping-details"></div> <div id="shipping-details"></div>
<div> <div class="entity-container">
<p class="entity-label" <p class="entity-label"
style="font-size:32px; font-weight: bold; color:$primary_color;">$entity_label</p> style="font-size:32px; font-weight: bold; color:$primary_color;">$entity_label</p>
<table id="entity-details" cellspacing="0" cellpadding="0" dir="ltr"></table> <table id="entity-details" cellspacing="0" cellpadding="0" dir="ltr"></table>

2
resources/views/pdf-designs/clean.html
View File

@ -93,7 +93,7 @@
.client-and-entity-wrapper { .client-and-entity-wrapper {
padding: 1rem; padding: 1rem;
display: grid; display: grid;
grid-template-columns: 1fr auto 1fr; grid-template-columns: minmax(0, 1fr) auto minmax(0, 1fr);
align-items: start; align-items: start;
border-top: 1px solid #d8d8d8; border-top: 1px solid #d8d8d8;
border-bottom: 1px solid #d8d8d8; border-bottom: 1px solid #d8d8d8;

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

@ -73,7 +73,7 @@
line-height: var(--line-height) !important; line-height: var(--line-height) !important;
white-space: nowrap; white-space: nowrap;
border: 0px solid #000; border: 0px solid #000;
float:right; float:right;
} }
#entity-details>tr, #entity-details>tr,
@ -111,7 +111,6 @@
min-width: 100%; min-width: 100%;
table-layout: fixed; table-layout: fixed;
overflow-wrap: break-word; overflow-wrap: break-word;
margin-bottom: 5px;
} }
.task-time-details { .task-time-details {
@ -146,7 +145,6 @@
margin-top: 0rem; margin-top: 0rem;
display: grid; display: grid;
grid-template-columns: 2fr 1fr; grid-template-columns: 2fr 1fr;
padding-top: .5rem;
margin-right: .75rem; margin-right: .75rem;
gap: 80px; gap: 80px;
page-break-inside: auto; page-break-inside: auto;
@ -241,54 +239,11 @@
[data-ref='product_table-product.description-td'], [data-ref='product_table-product.description-td'],
[data-ref='task_table-task.description-th']{ [data-ref='task_table-task.description-th']{
min-width: 100px !important; min-width: 150px !important;
overflow-wrap: break-word; overflow-wrap: break-word;
} }
[data-ref='product_table-product.item-th'],
[data-ref='product_table-product.unit_cost-th'],
[data-ref='task_table-task.service-th'],
[data-ref='task_table-task.cost-th']{
width: 12%;
}
[data-ref='product_table-product.quantity-th'],
[data-ref='task_table-task.hours-th'],
[data-ref='task_table-task.quantity-th'],
[data-ref='product_table-product.product1-th'],
[data-ref='product_table-product.product2-th'],
[data-ref='product_table-product.product3-th'],
[data-ref='product_table-product.product4-th'] {
width: 10%;
}
[data-ref='product_table-product.tax1-th'] {
width: 6%;
}
[data-ref='product_table-product.line_total-th'],
[data-ref='product_table-product.line_total-td'],
[data-ref='task_table-task.line_total-th'],
[data-ref='task_table-task.line_total-td'] {
width: 12%;
text-align: right;
}
[data-ref='task_table-task.discount-th'],
[data-ref='task_table-task.task1-th'],
[data-ref='task_table-task.task2-th'],
[data-ref='task_table-task.task3-th'],
[data-ref='task_table-task.task4-th'] {
width: 10%;
}
[data-ref='task_table-task.tax1-th'] {
width: 10%;
}
.stamp { .stamp {
transform: rotate(12deg); transform: rotate(12deg);
color: #555; color: #555;

47
resources/views/pdf-designs/tech.html
View File

@ -279,7 +279,7 @@
[data-ref='product_table-product.description-td'], [data-ref='product_table-product.description-td'],
[data-ref='task_table-task.description-td']{ [data-ref='task_table-task.description-td']{
min-width: 100px !important; min-width: 150px !important;
overflow-wrap: break-word; overflow-wrap: break-word;
} }
@ -288,51 +288,6 @@
width: 10%; width: 10%;
} }
[data-ref='product_table-product.unit_cost-th'],
[data-ref='task_table-task.cost-th'] {
width: 13%;
}
[data-ref='product_table-product.quantity-th'],
[data-ref='task_table-task.hours-th'],
[data-ref='product_table-product.product1-th'],
[data-ref='product_table-product.product2-th'],
[data-ref='product_table-product.product3-th'],
[data-ref='product_table-product.product4-th'] {
width: 8%;
}
[data-ref='product_table-product.tax1-th'] {
width: 6%;
}
[data-ref='product_table-product.line_total-th'],
[data-ref='product_table-product.line_total-td'] {
width: 13%;
text-align: right;
}
[data-ref='task_table-task.discount-th'],
[data-ref='task_table-task.quantity-th'],
[data-ref='task_table-task.task1-th'],
[data-ref='task_table-task.task2-th'],
[data-ref='task_table-task.task3-th'],
[data-ref='task_table-task.task4-th'] {
width: 10%;
}
[data-ref='task_table-task.tax1-th'] {
width: 10%;
}
[data-ref='task_table-task.line_total-th'],
[data-ref='task_table-task.line_total-td'] {
width: 13%;
text-align: right !important;
}
.stamp { .stamp {
transform: rotate(12deg); transform: rotate(12deg);
color: #555; color: #555;

2
tests/Pdf/PdfServiceTest.php
View File

@ -66,6 +66,7 @@ class PdfServiceTest extends TestCase
$settings->use_credits_payment = 'always'; $settings->use_credits_payment = 'always';
$settings->timezone_id = '1'; $settings->timezone_id = '1';
$settings->entity_send_time = 0; $settings->entity_send_time = 0;
$settings->hide_empty_columns_on_pdf = true;
$company = Company::factory()->create([ $company = Company::factory()->create([
'account_id' => $this->account->id, 'account_id' => $this->account->id,
@ -141,6 +142,7 @@ class PdfServiceTest extends TestCase
$settings->use_credits_payment = 'always'; $settings->use_credits_payment = 'always';
$settings->timezone_id = '1'; $settings->timezone_id = '1';
$settings->entity_send_time = 0; $settings->entity_send_time = 0;
$settings->hide_empty_columns_on_pdf = true;
$company = Company::factory()->create([ $company = Company::factory()->create([
'account_id' => $this->account->id, 'account_id' => $this->account->id,