mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
WOrking on invoice template layouts - css
This commit is contained in:
David Bomba
parent
43dc9158f6
commit
af601e0b03
@ -74,9 +74,9 @@ class Number
|
||||
if ($country->decimal_separator)
|
||||
$decimal = $country->decimal_separator;
|
||||
|
||||
|
||||
$value = number_format($value, $precision, $decimal, $thousand);
|
||||
$symbol = $currency->symbol;
|
||||
|
||||
if ($settings->show_currency_code == "TRUE") {
|
||||
return "{$value} {$code}";
|
||||
} elseif ($swapSymbol) {
|
||||
|
||||
@ -163,7 +163,6 @@ trait MakesInvoiceValues
|
||||
$data['$due_date'] = $this->due_date;
|
||||
$data['$invoice_number'] = $this->invoice_number;
|
||||
$data['$po_number'] = $this->po_number;
|
||||
$data['$discount'] = $this->calc()->getTotalDiscount();
|
||||
$data['$line_taxes'] = $this->makeLineTaxes();
|
||||
// $data['$tax'] = ;
|
||||
// $data['$item'] = ;
|
||||
@ -172,12 +171,13 @@ trait MakesInvoiceValues
|
||||
// $data['$quantity'] = ;
|
||||
// $data['$line_total'] = ;
|
||||
// $data['$paid_to_date'] = ;
|
||||
$data['$subtotal'] = $subtotal = $this->calc()->getSubTotal(); Number::formatMoney($subtotal, $this->client->currency(), $this->client->country, $this->client->getMergedSettings());
|
||||
$data['$discount'] = Number::formatMoney($this->calc()->getTotalDiscount(), $this->client->currency(), $this->client->country, $this->client->getMergedSettings());
|
||||
$data['$subtotal'] = Number::formatMoney($this->calc()->getSubTotal(), $this->client->currency(), $this->client->country, $this->client->getMergedSettings());
|
||||
$data['$balance_due'] = Number::formatMoney($this->balance, $this->client->currency(), $this->client->country, $this->client->getMergedSettings());
|
||||
$data['$partial_due'] = Number::formatMoney($this->partial, $this->client->currency(), $this->client->country, $this->client->getMergedSettings());
|
||||
$data['$total'] = $total = $this->calc()->getTotal(); Number::formatMoney($total, $this->client->currency(), $this->client->country, $this->client->getMergedSettings());
|
||||
$data['$balance'] = $balance = $this->calc()->getBalance(); Number::formatMoney($balance, $this->client->currency(), $this->client->country, $this->client->getMergedSettings());
|
||||
$data['$taxes'] = $taxes = $this->calc()->getTotalTaxes(); Number::formatMoney($taxes, $this->client->currency(), $this->client->country, $this->client->getMergedSettings());
|
||||
$data['$total'] = Number::formatMoney($this->calc()->getTotal(), $this->client->currency(), $this->client->country, $this->client->getMergedSettings());
|
||||
$data['$balance'] = Number::formatMoney($this->calc()->getBalance(), $this->client->currency(), $this->client->country, $this->client->getMergedSettings());
|
||||
$data['$taxes'] = Number::formatMoney($this->calc()->getTotalTaxes(), $this->client->currency(), $this->client->country, $this->client->getMergedSettings());
|
||||
$data['$terms'] = $this->terms;
|
||||
// $data['$your_invoice'] = ;
|
||||
// $data['$quote'] = ;
|
||||
@ -204,7 +204,7 @@ trait MakesInvoiceValues
|
||||
$data['$city_state_postal'] = $this->present()->cityStateZip($this->client->city, $this->client->state, $this->client->postal_code, FALSE);
|
||||
$data['$postal_city_state'] = $this->present()->cityStateZip($this->client->city, $this->client->state, $this->client->postal_code, TRUE);
|
||||
$data['$country'] = $this->client->country->name;
|
||||
$data['$email'] = isset($this->client->primary_contact()->first()->email) ?: 'no primary contact set';
|
||||
$data['$email'] = isset($this->client->primary_contact()->first()->email) ?: 'no contact email on record';
|
||||
$data['$contact_name'] = $this->client->present()->primary_contact_name();
|
||||
$data['$company_name'] = $this->company->present()->name();
|
||||
$data['$company_address'] = $this->company->present()->address();
|
||||
@ -245,7 +245,6 @@ trait MakesInvoiceValues
|
||||
$data['$amount'] = ;
|
||||
$data['$amount_paid'] =;
|
||||
*/
|
||||
|
||||
return $data;
|
||||
}
|
||||
|
||||
@ -259,7 +258,7 @@ trait MakesInvoiceValues
|
||||
public function table(array $columns) :?string
|
||||
{
|
||||
|
||||
$data = '<table class="table table-hover table-striped">';
|
||||
$data = '<table class="table table-striped items">';
|
||||
|
||||
$data .= '<thead><tr class="heading">';
|
||||
|
||||
|
||||
@ -3,158 +3,91 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>$invoice_number</title>
|
||||
<!--<link href="{{asset('/vendors/css/bootstrap.min.css') }}" rel="stylesheet">
|
||||
<link href="{{asset('/vendors/css/coreui.min.css') }}" rel="stylesheet">-->
|
||||
<link href="{{asset('/vendors/css/bootstrap.min.css') }}" rel="stylesheet">
|
||||
<link href="{{asset('/vendors/css/coreui.min.css') }}" rel="stylesheet">
|
||||
<style>
|
||||
|
||||
html {
|
||||
-webkit-print-color-adjust: exact;
|
||||
}
|
||||
.invoice-box {
|
||||
max-width: 800px;
|
||||
margin: auto;
|
||||
padding: 30px;
|
||||
border: 1px solid #eee;
|
||||
box-shadow: 0 0 10px rgba(0, 0, 0, .15);
|
||||
font-size: 16px;
|
||||
line-height: 24px;
|
||||
font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif;
|
||||
color: #555;
|
||||
font-size: 24px;
|
||||
font-family: Tahoma, 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif;
|
||||
|
||||
}
|
||||
|
||||
.invoice-box table {
|
||||
width: 100%;
|
||||
line-height: inherit;
|
||||
text-align: left;
|
||||
.totals td {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.invoice-box table td {
|
||||
padding: 5px;
|
||||
vertical-align: top;
|
||||
table {
|
||||
border-collapse: collapse;
|
||||
border:0;
|
||||
}
|
||||
|
||||
.invoice-box table tr td {
|
||||
table.items thead{
|
||||
background-color:yellow!important;
|
||||
border-collapse: collapse;
|
||||
font-weight:bold;
|
||||
overflow: auto;
|
||||
border:0;
|
||||
-webkit-print-color-adjust: exact;
|
||||
|
||||
}
|
||||
.items td {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.invoice-box table tr.top table td {
|
||||
padding-bottom: 20px;
|
||||
table.items.heading {
|
||||
background-color:#000;
|
||||
border-collapse: collapse;
|
||||
|
||||
}
|
||||
|
||||
.invoice-box table tr.top table td.title {
|
||||
font-size: 45px;
|
||||
line-height: 45px;
|
||||
color: #333;
|
||||
}
|
||||
.heading {
|
||||
|
||||
.invoice-box table tr.information table td {
|
||||
padding-bottom: 40px;
|
||||
}
|
||||
|
||||
.invoice-box table tr.heading td {
|
||||
background: #eee;
|
||||
border-bottom: 1px solid #ddd;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.invoice-box table tr.details td {
|
||||
padding-bottom: 20px;
|
||||
}
|
||||
|
||||
.invoice-box table tr.item td{
|
||||
border-bottom: 1px solid #eee;
|
||||
}
|
||||
|
||||
.invoice-box table tr.item.last td {
|
||||
border-bottom: none;
|
||||
}
|
||||
|
||||
.invoice-box table tr.total td:nth-child(2) {
|
||||
border-top: 0px solid #eee;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
table.totals tr td {
|
||||
text-align: right;
|
||||
}
|
||||
@media only screen and (max-width: 600px) {
|
||||
.invoice-box table tr.top table td {
|
||||
width: 100%;
|
||||
display: block;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.invoice-box table tr.information table td {
|
||||
width: 100%;
|
||||
display: block;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
||||
/** RTL **/
|
||||
.rtl {
|
||||
direction: rtl;
|
||||
font-family: Tahoma, 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif;
|
||||
}
|
||||
|
||||
.rtl table {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.rtl table tr td:nth-child(2) {
|
||||
background-color: rgb(255,0,0);;
|
||||
overflow: auto;
|
||||
text-align: left;
|
||||
color: #000;
|
||||
}
|
||||
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div class="invoice-box">
|
||||
<table>
|
||||
<tr class="top">
|
||||
<td colspan="2">
|
||||
<table>
|
||||
<tr>
|
||||
<td class="title">
|
||||
<img src="$company_logo" style="width:100%; max-width:150px;">
|
||||
</td>
|
||||
<div class="container-fluid">
|
||||
<div class="row mt-4">
|
||||
|
||||
<td>
|
||||
$invoice_number_label: $invoice_number <br>
|
||||
$invoice_date_label: $invoice_date <br>
|
||||
$invoice_due_date_label: $due_date
|
||||
<div class="col-md-4">
|
||||
<img src="$company_logo" style="width:100%; max-width:150px;">
|
||||
</div>
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
<div class="col-md-4 ml-auto">
|
||||
$invoice_number_label: $invoice_number <br>
|
||||
$invoice_date_label: $invoice_date <br>
|
||||
$invoice_due_date_label: $due_date
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<tr class="information">
|
||||
<td colspan="2">
|
||||
<table>
|
||||
<tr>
|
||||
<td>
|
||||
$client_name<br>
|
||||
$address1<br>
|
||||
$address2<br>
|
||||
$city_state_postal<br>
|
||||
$country<br>
|
||||
$vat_number<br>
|
||||
<div class="row mt-4">
|
||||
<div class="col-md-4">
|
||||
<b>Client:</b><br>
|
||||
$client_name<br>
|
||||
$address1<br>
|
||||
$address2<br>
|
||||
$city_state_postal<br>
|
||||
$country<br>
|
||||
$vat_number<br>
|
||||
</div>
|
||||
|
||||
</td>
|
||||
<div class="col-md-4 ml-auto">
|
||||
$company_name<br>
|
||||
$company_address<br>
|
||||
$phone<br>
|
||||
$email<br>
|
||||
</div>
|
||||
|
||||
<td>
|
||||
$company_name<br>
|
||||
$company_address<br>
|
||||
$phone<br>
|
||||
$email<br>
|
||||
</td>
|
||||
</div>
|
||||
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
{{--
|
||||
column variables:
|
||||
|
||||
@ -174,36 +107,37 @@
|
||||
--}}
|
||||
{!! $invoice->table(['product_key', 'notes', 'cost','quantity', 'discount', 'tax_name1', 'line_total']) !!}
|
||||
|
||||
<div class="d-flex justify-content-end">
|
||||
<table class="totals">
|
||||
<tr class="subtotal">
|
||||
<td>$subtotal_label:</td>
|
||||
<td>$subtotal</td>
|
||||
</tr>
|
||||
<tr class="taxes">
|
||||
<td>$taxes_label:</td>
|
||||
<td>$taxes</td>
|
||||
</tr>
|
||||
<div class="row">
|
||||
<div class="d-flex justify-content-end ml-auto mr-4">
|
||||
<table class="totals" border="0" cellpadding="5">
|
||||
<tr class="subtotal">
|
||||
<td>$subtotal_label:</td>
|
||||
<td>$subtotal</td>
|
||||
</tr>
|
||||
<tr class="taxes">
|
||||
<td>$taxes_label:</td>
|
||||
<td>$taxes</td>
|
||||
</tr>
|
||||
|
||||
{{-- line_taxes html is populated server side, with a class of line_items, you can customise your CSS here to override the defaults--}}
|
||||
{{-- line_taxes html is populated server side, with a class of line_items, you can customise your CSS here to override the defaults--}}
|
||||
|
||||
$line_taxes
|
||||
$line_taxes
|
||||
|
||||
<tr class="discount">
|
||||
<td>$discount_label:</td>
|
||||
<td>$discount</td>
|
||||
</tr>
|
||||
<tr class="total">
|
||||
<td>$total_label:</td>
|
||||
<td>$total</td>
|
||||
</tr>
|
||||
<tr class="discount">
|
||||
<td>$discount_label:</td>
|
||||
<td>$discount</td>
|
||||
</tr>
|
||||
<tr class="total">
|
||||
<td>$total_label:</td>
|
||||
<td>$total</td>
|
||||
</tr>
|
||||
|
||||
<tr class="balance">
|
||||
<td>$balance_label:</td>
|
||||
<td>$balance</td>
|
||||
</tr>
|
||||
|
||||
</table>
|
||||
<tr class="balance">
|
||||
<td>$balance_label:</td>
|
||||
<td>$balance</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
217
resources/views/pdf/design2.blade.php
Normal file
217
resources/views/pdf/design2.blade.php
Normal file
@ -0,0 +1,217 @@
|
||||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>$invoice_number</title>
|
||||
<link href="{{asset('/vendors/css/bootstrap.min.css') }}" rel="stylesheet">
|
||||
<link href="{{asset('/vendors/css/coreui.min.css') }}" rel="stylesheet">
|
||||
<style>
|
||||
|
||||
html {
|
||||
-webkit-print-color-adjust: exact;
|
||||
}
|
||||
.invoice-box {
|
||||
}
|
||||
|
||||
.invoice-box table {
|
||||
width: 100%;
|
||||
line-height: inherit;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.invoice-box table td {
|
||||
padding: 5px;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
.invoice-box table tr td {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.invoice-box table tr.top table td {
|
||||
padding-bottom: 20px;
|
||||
}
|
||||
|
||||
.invoice-box table tr.top table td.title {
|
||||
font-size: 45px;
|
||||
line-height: 45px;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.invoice-box table tr.information table td {
|
||||
padding-bottom: 40px;
|
||||
}
|
||||
|
||||
.invoice-box table tr.heading td {
|
||||
background: #eee;
|
||||
border-bottom: 1px solid #ddd;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.invoice-box table tr.details td {
|
||||
padding-bottom: 20px;
|
||||
}
|
||||
|
||||
.invoice-box table tr.item td{
|
||||
border-bottom: 1px solid #eee;
|
||||
}
|
||||
|
||||
.invoice-box table tr.item.last td {
|
||||
border-bottom: none;
|
||||
}
|
||||
|
||||
.invoice-box table tr.total td:nth-child(2) {
|
||||
border-top: 0px solid #eee;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
table.totals {
|
||||
width:50%;
|
||||
border-collapse: collapse;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
table.totals tr td {
|
||||
width:0.1%;
|
||||
text-align: right;
|
||||
white-space: nowrap; /** added **/
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 600px) {
|
||||
.invoice-box table tr.top table td {
|
||||
width: 100%;
|
||||
display: block;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.invoice-box table tr.information table td {
|
||||
width: 100%;
|
||||
display: block;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
||||
/** RTL **/
|
||||
.rtl {
|
||||
direction: rtl;
|
||||
font-family: Tahoma, 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif;
|
||||
}
|
||||
|
||||
.rtl table {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.rtl table tr td:nth-child(2) {
|
||||
text-align: left;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div class="container-fluid">
|
||||
<div class="invoice-box">
|
||||
<table>
|
||||
<tr class="top">
|
||||
<td colspan="2">
|
||||
<table>
|
||||
<tr>
|
||||
<td class="title">
|
||||
<img src="$company_logo" style="width:100%; max-width:150px;">
|
||||
</td>
|
||||
|
||||
<td>
|
||||
$invoice_number_label: $invoice_number <br>
|
||||
$invoice_date_label: $invoice_date <br>
|
||||
$invoice_due_date_label: $due_date
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr class="information">
|
||||
<td colspan="2">
|
||||
<table>
|
||||
<tr>
|
||||
<td>
|
||||
$client_name<br>
|
||||
$address1<br>
|
||||
$address2<br>
|
||||
$city_state_postal<br>
|
||||
$country<br>
|
||||
$vat_number<br>
|
||||
|
||||
</td>
|
||||
|
||||
<td>
|
||||
$company_name<br>
|
||||
$company_address<br>
|
||||
$phone<br>
|
||||
$email<br>
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
{{--
|
||||
column variables:
|
||||
|
||||
date
|
||||
discount
|
||||
product_key
|
||||
notes
|
||||
cost
|
||||
quantity
|
||||
tax_name1
|
||||
tax_name2
|
||||
line_total
|
||||
custom_label1 ( will show as the following parameter as its value -> custom_invoice_value1 )
|
||||
custom_label2 ( will show as the following parameter as its value -> custom_invoice_value2 )
|
||||
custom_label3 ( will show as the following parameter as its value -> custom_invoice_value3 )
|
||||
custom_label4 ( will show as the following parameter as its value -> custom_invoice_value4 )
|
||||
--}}
|
||||
{!! $invoice->table(['product_key', 'notes', 'cost','quantity', 'discount', 'tax_name1', 'line_total']) !!}
|
||||
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="pull-right">
|
||||
<table class="totals" border="1">
|
||||
<tr class="subtotal">
|
||||
<td>$subtotal_label:</td>
|
||||
<td>$subtotal</td>
|
||||
</tr>
|
||||
<tr class="taxes">
|
||||
<td>$taxes_label:</td>
|
||||
<td>$taxes</td>
|
||||
</tr>
|
||||
|
||||
{{-- line_taxes html is populated server side, with a class of line_items, you can customise your CSS here to override the defaults--}}
|
||||
|
||||
$line_taxes
|
||||
|
||||
<tr class="discount">
|
||||
<td>$discount_label:</td>
|
||||
<td>$discount</td>
|
||||
</tr>
|
||||
<tr class="total">
|
||||
<td>$total_label:</td>
|
||||
<td>$total</td>
|
||||
</tr>
|
||||
|
||||
<tr class="balance">
|
||||
<td>$balance_label:</td>
|
||||
<td>$balance</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
x
Reference in New Issue
Block a user