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

Update designs so they reference Invoice or Quote

This commit is contained in:
Benjamin Beganović 2020-08-10 13:18:05 +02:00
parent 84e618d1b6
commit 2f40804568
6 changed files with 25 additions and 8 deletions

View File

@ -118,7 +118,7 @@ class HtmlEngine
$data['$invoice.total_taxes'] = &$data['$total_taxes'];
if ($this->entity_string == 'invoice') {
$data['$entity_label'] = ['value' => '', 'label' => ctrans('texts.invoice')];
$data['$entity'] = ['value' => '', 'label' => ctrans('texts.invoice')];
$data['$number'] = ['value' => $this->entity->number ?: ' ', 'label' => ctrans('texts.invoice_number')];
$data['$entity.terms'] = ['value' => $this->entity->terms ?: ' ', 'label' => ctrans('texts.invoice_terms')];
$data['$terms'] = &$data['$entity.terms'];
@ -126,7 +126,7 @@ class HtmlEngine
}
if ($this->entity_string == 'quote') {
$data['$entity_label'] = ['value' => '', 'label' => ctrans('texts.quote')];
$data['$entity'] = ['value' => '', 'label' => ctrans('texts.quote')];
$data['$number'] = ['value' => $this->entity->number ?: ' ', 'label' => ctrans('texts.quote_number')];
$data['$entity.terms'] = ['value' => $this->entity->terms ?: ' ', 'label' => ctrans('texts.quote_terms')];
$data['$terms'] = &$data['$entity.terms'];
@ -134,7 +134,7 @@ class HtmlEngine
}
if ($this->entity_string == 'credit') {
$data['$entity_label'] = ['value' => '', 'label' => ctrans('texts.credit')];
$data['$entity'] = ['value' => '', 'label' => ctrans('texts.credit')];
$data['$number'] = ['value' => $this->entity->number ?: ' ', 'label' => ctrans('texts.credit_number')];
$data['$entity.terms'] = ['value' => $this->entity->terms ?: ' ', 'label' => ctrans('texts.credit_terms')];
$data['$terms'] = &$data['$entity.terms'];
@ -177,9 +177,8 @@ class HtmlEngine
$data['$invoice.public_notes'] = ['value' => $this->entity->public_notes ?: ' ', 'label' => ctrans('texts.public_notes')];
$data['$entity.public_notes'] = &$data['$invoice.public_notes'];
$data['$entity_issued_to'] = ['value' => '', 'label' => ctrans("texts.{$this->entity_string}_issued_to")];
$data['$your_' . $this->entity_string] = ['value' => '', 'label' => ctrans("texts.your_{$this->entity_string}")];
$data['$entity_issued_to'] = ['value' => '', 'label' => ctrans("texts.{$this->entity_string}_issued_to")];
$data['$your_entity'] = ['value' => '', 'label' => ctrans("texts.your_{$this->entity_string}")];
$data['$quote.date'] = ['value' => $this->entity->date ?: ' ', 'label' => ctrans('texts.quote_date')];
$data['$quote.number'] = ['value' => $this->entity->number ?: ' ', 'label' => ctrans('texts.quote_number')];

View File

@ -34,7 +34,7 @@
</div>
<!-- Entity labels, client details -->
<p class="mt-10 text-xl text-blue-500 uppercase">$entity_label</p>
<p class="mt-10 px-2 text-xl text-blue-500 uppercase">$entity_label</p>
<div class="grid grid-cols-12 px-2 py-3 mt-4 border-t border-b">
<div class="col-span-6">
<table id="entity-details"></table>

View File

@ -24,6 +24,9 @@
<div class="flex flex-col items-end col-span-6">
<table id="entity-details"></table>
</div>
<div class="col-span-6">
<p class="text-xl font-semibold uppercase">$your_entity_label</p>
</div>
</div>
<!-- Client details, company details -->

View File

@ -30,6 +30,11 @@
<div class="$global-margin">
<!-- Company logo, client details -->
<div class="col-span-12 mb-10">
<p class="text-xl text-orange-600 font-semibold uppercase">
$your_entity_label
</p>
</div>
<div class="grid grid-cols-12">
<img
src="$company.logo"

View File

@ -34,6 +34,11 @@
<!-- Client details -->
<div class="grid grid-cols-12 mt-12">
<div class="col-span-12 mb-10">
<p class="text-xl text-black font-semibold uppercase">
$your_entity_label
</p>
</div>
<div class="col-span-6" id="client-details"></div>
</div>

View File

@ -15,7 +15,7 @@
#product-table tbody > tr > td:first-child {
color: #9b2c2c;
}
#product-table tbody > tr > td:last-child {
color: #9b2c2c;
font-weight: bold;
@ -39,6 +39,11 @@
<!-- Company details, client details -->
<div class="grid grid-cols-12 gap-12 mt-12">
<div class="col-span-12">
<p class="text-xl text-teal-600 font-semibold uppercase">
$your_entity_label
</p>
</div>
<div class="col-span-6">
<p class="px-4 font-semibold text-teal-600">$to_label:</p>
<div