1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00

Modern design

This commit is contained in:
Benjamin Beganović 2020-08-05 15:17:45 +02:00
parent 7a9c8ca9a0
commit 4f69a874cf
4 changed files with 222 additions and 48 deletions

View File

@ -12,12 +12,178 @@
namespace App\Services\PdfMaker\Designs;
class Modern
use App\Services\PdfMaker\Designs\Utilities\BaseDesign;
use App\Services\PdfMaker\Designs\Utilities\BuildTableHeader;
use App\Utils\Traits\MakesInvoiceValues;
class Modern extends BaseDesign
{
use MakesInvoiceValues, BuildTableHeader;
/** Global list of table elements, @var array */
public $elements;
/** @var App\Models\Client */
public $client;
/** @var App\Models\Invoice || @var App\Models\Quote */
public $entity;
/** Global state of the design, @var array */
public $context;
/** Type of entity => invoice||quote */
public $type;
public function html()
{
return file_get_contents(
base_path('resources/views/pdf-designs//modern.html')
base_path('resources/views/pdf-designs/modern.html')
);
}
public function elements(array $context, string $type = 'invoice'): array
{
$this->context = $context;
$this->type = $type;
$this->setup();
return [
'entity-details' => [
'id' => 'entity-details',
'elements' => $this->entityDetails(),
],
'client-details' => [
'id' => 'client-details',
'elements' => $this->clientDetails(),
],
'product-table' => [
'id' => 'product-table',
'elements' => $this->productTable(),
],
'company-details' => [
'id' => 'company-details',
'elements' => $this->companyDetails(),
],
'company-address' => [
'id' => 'company-address',
'elements' => $this->companyAddress(),
],
];
}
public function entityDetails(): array
{
$variables = $this->entity->company->settings->pdf_variables->invoice_details;
$elements = [];
foreach ($variables as $variable) {
$elements[] = ['element' => 'tr', 'content' => '', 'elements' => [
['element' => 'th', 'content' => $variable . '_label', 'properties' => ['class' => 'text-left pr-16 lg:pr-24 font-normal']],
['element' => 'th', 'content' => $variable, 'properties' => ['class' => 'text-left pr-16 lg:pr-24 font-normal']],
]];
}
return $elements;
}
public function clientDetails(): array
{
$variables = $this->entity->company->settings->pdf_variables->client_details;
$elements = [];
foreach ($variables as $variable) {
$elements[] = ['element' => 'p', 'content' => $variable];
}
return $elements;
}
public function productTable(): array
{
return [
['element' => 'thead', 'content' => '', 'properties' => ['class' => 'text-left text-white bg-gray-900'], 'elements' => $this->buildTableHeader()],
['element' => 'tbody', 'content' => '', 'elements' => $this->buildTableBody()],
['element' => 'tfoot', 'content' => '', 'elements' => [
['element' => 'tr', 'content' => '', 'elements' => [
['element' => 'td', 'content' => '$entity.public_notes', 'properties' => ['class' => 'border-l-4 border-white px-4 text-right', 'colspan' => '4']],
['element' => 'td', 'content' => '$subtotal_label', 'properties' => ['class' => 'px-4 py-4 text-right', 'colspan' => '2']],
['element' => 'td', 'content' => '$subtotal', 'properties' => ['class' => 'px-4 py-2 text-right']],
]],
['element' => 'tr', 'content' => '', 'elements' => [
['element' => 'td', 'content' => '$discount_label', 'properties' => ['class' => 'border-l-4 border-white px-4 text-right', 'colspan' => '6']],
['element' => 'td', 'content' => '$discount', 'properties' => ['class' => 'px-4 py-2 text-right']],
]],
['element' => 'tr', 'content' => '', 'properties' => ['class' => 'mt-8 px-4 py-2 bg-gray-900 text-white text-xl'], 'elements' => [
['element' => 'td', 'content' => '$balance_due_label', 'properties' => ['class' => 'border-l-4 border-white px-4 text-right font-semibold', 'colspan' => '6']],
['element' => 'td', 'content' => '$balance_due', 'properties' => ['class' => 'px-4 py-2 text-right']],
]],
]],
];
}
public function buildTableHeader(): array
{
$this->processTaxColumns();
$elements = [];
foreach ($this->context['product-table-columns'] as $column) {
$elements[] = ['element' => 'th', 'content' => $column . '_label', 'properties' => ['class' => 'px-4 py-2']];
}
return $elements;
}
public function buildTableBody(): array
{
$elements = [];
$items = $this->transformLineItems($this->entity->line_items);
if (count($items) == 0) {
return [];
}
foreach ($items as $row) {
$element = ['element' => 'tr', 'properties' => ['class' => 'border-t border-b border-gray-900'], 'content' => '', 'elements' => []];
foreach ($this->context['product-table-columns'] as $key => $cell) {
$element['elements'][] = ['element' => 'td', 'content' => $row[$cell], 'properties' => ['class' => 'px-4 py-4']];
}
$elements[] = $element;
}
return $elements;
}
public function companyDetails()
{
$variables = $this->entity->company->settings->pdf_variables->company_details;
$elements = [];
foreach ($variables as $variable) {
$elements[] = ['element' => 'p', 'content' => $variable];
}
return $elements;
}
public function companyAddress(): array
{
$variables = $this->entity->company->settings->pdf_variables->company_address;
$elements = [];
foreach ($variables as $variable) {
$elements[] = ['element' => 'p', 'content' => $variable];
}
return $elements;
}
}

View File

@ -9,10 +9,6 @@
<meta http-equiv="x-ua-compatible" content="ie=edge" />
<link rel="stylesheet" href="$css" />
<link
href="https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css"
rel="stylesheet"
/>
</head>
<body class="$global-margin antialiased break-words bg-white">
@ -45,7 +41,10 @@
<h1 class="mt-6 text-4xl font-semibold uppercase lg:text-5xl">
$entity
</h1>
<div id="entity-details" class="flex flex-wrap items-center space-x-4"></div>
<div
id="entity-details"
class="flex flex-wrap items-center space-x-4"
></div>
<!-- Product table -->
<table id="product-table" class="w-full mt-10 table-auto"></table>

View File

@ -1,51 +1,60 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>
<meta http-equiv="x-ua-compatible" content="ie=edge" />
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<link rel="stylesheet" href="$css" />
</head>
<link rel="stylesheet" href="$css">
</head>
<body class="antialiased break-words bg-white">
<!-- Company name, entity details -->
<div class="bg-orange-600">
<div class="$global-padding">
<div class="grid grid-cols-12">
<div class="col-span-4">
<h1 class="text-3xl font-bold text-white lg:text-4xl">$company-name</h1>
</div>
<div class="col-span-7 col-start-6 lg:col-start-7">
<table id="entity-details" class="text-white"></table>
<body class="antialiased break-words bg-white">
<!-- Company name, entity details -->
<div class="bg-orange-600">
<div class="$global-padding">
<div class="grid grid-cols-12">
<div class="col-span-4">
<h1 class="text-3xl font-bold text-white lg:text-4xl">
$company.name
</h1>
</div>
<div class="col-span-7 col-start-6 lg:col-start-7">
<table id="entity-details" class="text-white"></table>
</div>
</div>
</div>
</div>
</div>
<div class="$global-margin">
<!-- Company logo, client details -->
<div class="grid grid-cols-12">
<img src="$company-logo" alt="$company-name logo" class="grid w-24 col-span-4 sm:w-32">
<div id="client-details" class="col-span-8 col-start-6"></div>
<div class="$global-margin">
<!-- Company logo, client details -->
<div class="grid grid-cols-12">
<img
src="$company.logo"
alt="$company.name logo"
class="grid w-24 col-span-4 sm:w-32"
/>
<div id="client-details" class="col-span-8 col-start-6"></div>
</div>
<!-- Product table -->
<table id="product-table" class="w-full mt-8 table-auto"></table>
</div>
<!-- Product table -->
<table id="product-table" class="w-full mt-8 table-auto"></table>
</div>
<!-- Company details -->
<div class="bg-orange-600">
<div class="$global-padding">
<div class="grid grid-cols-12">
<div class="flex justify-between col-span-8 col-start-6 lg:col-span-6 lg:col-start-8">
<div id="company-details" class="text-white"></div>
<div id="company-address" class="text-white"></div>
<!-- Company details -->
<div class="bg-orange-600">
<div class="$global-padding">
<div class="grid grid-cols-12">
<div
class="flex justify-between col-span-8 col-start-6 lg:col-span-6 lg:col-start-8"
>
<div id="company-details" class="text-white"></div>
<div id="company-address" class="text-white"></div>
</div>
</div>
</div>
</div>
</div>
</body>
</html>
</body>
</html>

View File

@ -3,7 +3,7 @@
namespace Tests\Feature\PdfMaker;
use App\Models\Invoice;
use App\Services\PdfMaker\Designs\Hipster;
use App\Services\PdfMaker\Designs\Modern;
use App\Services\PdfMaker\PdfMaker;
use App\Utils\HtmlEngine;
use App\Utils\Traits\MakesInvoiceValues;
@ -19,7 +19,7 @@ class ExampleIntegrationTest extends TestCase
$invitation = $invoice->invitations()->first();
$engine = new HtmlEngine($invitation, 'invoice');
$design = new Hipster();
$design = new Modern();
$product_table_columns = json_decode(
json_encode($invoice->company->settings->pdf_variables),
@ -38,7 +38,7 @@ class ExampleIntegrationTest extends TestCase
$maker = new PdfMaker($state, 'invoice');
$maker
->design(Hipster::class)
->design(Modern::class)
->build();
exec('echo "" > storage/logs/laravel.log');