TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-28 04:01:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues on invoice template

Browse Source
This commit is contained in:
radhu587
2020-05-08 18:49:02 +05:30
parent a739a938fc
commit 325f90bba5
9 changed files with 235 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/app/pdf/estimate/estimate1.blade.php
View File

@ -137,7 +137,7 @@
.shipping-address-container--left { .shipping-address-container--left {
float: left; float: left;
padding-left: 30px; padding-left: 0px;
} }
.shipping-address-label { .shipping-address-label {

29
resources/views/app/pdf/estimate/estimate2.blade.php
View File

@ -21,7 +21,6 @@
} }
hr { hr {
margin: 0 30px 0 30px;
color: rgba(0, 0, 0, 0.2); color: rgba(0, 0, 0, 0.2);
border: 0.5px solid #EAF1FB; border: 0.5px solid #EAF1FB;
} }
@ -75,10 +74,10 @@
.estimate-details-container h1 { .estimate-details-container h1 {
margin: 0; margin: 0;
font-weight: 500;
font-size: 24px; font-size: 24px;
line-height: 36px; line-height: 36px;
text-align: right; text-align: right;
font-family: "DejaVu Sans";
} }
.estimate-details-container h4 { .estimate-details-container h4 {
@ -158,7 +157,7 @@
} }
.billing-address-name { .billing-address-name {
max-width: 250px; max-width: 160px;
font-size: 15px; font-size: 15px;
line-height: 22px; line-height: 22px;
padding: 0px; padding: 0px;
@ -191,7 +190,7 @@
} }
.shipping-address-name { .shipping-address-name {
max-width: 250px; max-width: 160px;
font-size: 15px; font-size: 15px;
line-height: 22px; line-height: 22px;
padding: 0px; padding: 0px;
@ -231,6 +230,7 @@
.items-table hr { .items-table hr {
height: 0.1px; height: 0.1px;
margin: 0 30px;
} }
.item-table-heading { .item-table-heading {
@ -281,13 +281,16 @@
padding: 0 25px; padding: 0 25px;
} }
.item-cell-table-hr {
margin: 0 25px 0 30px;
}
.total-display-table { .total-display-table {
box-sizing: border-box; box-sizing: border-box;
page-break-inside: avoid; page-break-inside: avoid;
page-break-before: auto; page-break-before: auto;
page-break-after: auto; page-break-after: auto;
margin-left: 500px; margin-left: 500px;
margin-top: 20px;
border: 1px solid #EAF1FB; border: 1px solid #EAF1FB;
border-top: none; border-top: none;
} }
@ -309,20 +312,6 @@
padding-bottom: 2px; padding-bottom: 2px;
} }
.total-border-left {
border: 1px solid #E8E8E8 !important;
border-right: 0px !important;
padding-top: 0px;
padding: 8px !important;
}
.total-border-right {
border: 1px solid #E8E8E8 !important;
border-left: 0px !important;
padding-top: 0px;
padding: 8px !important;
}
/* -- Notes -- */ /* -- Notes -- */
.notes { .notes {
@ -437,7 +426,7 @@
@if($estimate->user->shippingaddress) @if($estimate->user->shippingaddress)
<div class="billing-address-container"> <div class="billing-address-container">
@else @else
<div class="billing-address-container" style="float:right;padding-right:0px;"> <div class="billing-address-container" style="float:right; padding-right:0px;">
@endif @endif
@include('app.pdf.estimate.partials.billing-address') @include('app.pdf.estimate.partials.billing-address')
</div> </div>

9
resources/views/app/pdf/estimate/estimate3.blade.php
View File

@ -24,7 +24,6 @@
hr { hr {
color: rgba(0, 0, 0, 0.2); color: rgba(0, 0, 0, 0.2);
border: 0.5px solid #EAF1FB; border: 0.5px solid #EAF1FB;
margin: 0 30px 0 30px;
} }
/* -- Header -- */ /* -- Header -- */
@ -128,6 +127,7 @@
.shipping-address-container--left { .shipping-address-container--left {
float: left; float: left;
padding-left: 0;
} }
.shipping-address-label { .shipping-address-label {
@ -213,6 +213,7 @@
.items-table hr { .items-table hr {
height: 0.1px; height: 0.1px;
margin: 0 30px;
} }
.item-table-heading { .item-table-heading {
@ -253,6 +254,10 @@
line-height: 12px; line-height: 12px;
} }
.item-cell-table-hr {
margin: 0 30px 0 30px;
}
/* -- Total Display Table -- */ /* -- Total Display Table -- */
.total-display-container { .total-display-container {
@ -266,8 +271,6 @@
page-break-after: auto; page-break-after: auto;
margin-left: 500px; margin-left: 500px;
margin-top: 20px; margin-top: 20px;
border: 1px solid #EAF1FB;
border-top: none;
} }
.total-table-attribute-label { .total-table-attribute-label {

6
resources/views/app/pdf/estimate/partials/table.blade.php
View File

@ -62,10 +62,10 @@
@endforeach @endforeach
</table> </table>
<hr class="items-table-hr"> <hr class="item-cell-table-hr">
<div class="total-display-container"> <div class="total-display-container">
<table width="100%" cellspacing="0px" border="0" class="total-display-table @if(count($estimate->items) > 12) page-break @endif"> <table width="100%" cellspacing="0px" border="0" class="total-display-table @if(count($estimate->items) > 12) page-break @endif">
<tr> <tr>
<td class="border-0 total-table-attribute-label">Subtotal</td> <td class="border-0 total-table-attribute-label">Subtotal</td>
<td class="border-0 item-cell total-table-attribute-value ">{!! format_money_pdf($estimate->sub_total, $estimate->user->currency) !!}</td> <td class="border-0 item-cell total-table-attribute-value ">{!! format_money_pdf($estimate->sub_total, $estimate->user->currency) !!}</td>
@ -125,5 +125,5 @@
{!! format_money_pdf($estimate->total, $estimate->user->currency)!!} {!! format_money_pdf($estimate->total, $estimate->user->currency)!!}
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>

16
resources/views/app/pdf/invoice/invoice1.blade.php
View File

@ -123,7 +123,7 @@
} }
.shipping-address-name { .shipping-address-name {
max-width: 250px; max-width: 160px;
font-size: 15px; font-size: 15px;
line-height: 22px; line-height: 22px;
padding: 0px; padding: 0px;
@ -155,7 +155,7 @@
} }
.billing-address-name { .billing-address-name {
max-width: 250px; max-width: 160px;
font-size: 15px; font-size: 15px;
line-height: 22px; line-height: 22px;
padding: 0px; padding: 0px;
@ -214,21 +214,23 @@
.item-description { .item-description {
color: #595959; color: #595959;
font-size: 9px; font-size: 9px;
font-weight:300;
line-height: 12px; line-height: 12px;
} }
/* -- Total Display Table -- */ /* -- Total Display Table -- */
.total-display-container {
padding: 0 25px;
}
.total-display-table { .total-display-table {
border-top: none; border-top: none;
box-sizing: border-box; box-sizing: border-box;
width: 630px;
page-break-inside: avoid; page-break-inside: avoid;
page-break-before: auto; page-break-before: auto;
page-break-after: auto; page-break-after: auto;
margin-left: 420px; margin-left: 500px;
margin-top: 10px; margin-top: 20px;
} }
.total-table-attribute-label { .total-table-attribute-label {
@ -239,7 +241,7 @@
} }
.total-table-attribute-value { .total-table-attribute-value {
font-weight: 500; font-weight: bold;
text-align: right; text-align: right;
font-size: 13px; font-size: 13px;
color: #040405; color: #040405;

37
resources/views/app/pdf/invoice/invoice2.blade.php
View File

@ -75,7 +75,6 @@
.invoice-details-container h1 { .invoice-details-container h1 {
margin: 0; margin: 0;
font-weight: 500;
font-size: 24px; font-size: 24px;
line-height: 36px; line-height: 36px;
text-align: right; text-align: right;
@ -200,7 +199,7 @@
/* -- Items Table -- */ /* -- Items Table -- */
.items-table { .items-table {
margin-top: 30px; margin-top: 35px;
padding: 0px 30px 10px 30px; padding: 0px 30px 10px 30px;
page-break-before: avoid; page-break-before: avoid;
page-break-after: auto; page-break-after: auto;
@ -210,20 +209,12 @@
height: 0.1px; height: 0.1px;
} }
.item-table-heading-row td {
padding: 5px;
padding-bottom: 10px;
}
.item-table-heading-row {
border-bottom: 1px solid red;
}
.item-table-heading { .item-table-heading {
font-size: 13.5; font-size: 13.5;
text-align: center; text-align: center;
color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);
padding: 5px; padding: 5px;
color: #55547A;
} }
tr.item-table-heading-row th { tr.item-table-heading-row th {
@ -239,24 +230,36 @@
.item-cell { .item-cell {
font-size: 13; font-size: 13;
color: #040405;
text-align: center; text-align: center;
padding: 5px; padding: 5px;
padding-top: 10px; padding-top: 10px;
color: #040405;
}
.item-description {
color: #595959;
font-size: 9px;
line-height: 12px;
} }
/* -- Total Display Table -- */ /* -- Total Display Table -- */
.total-display-container {
padding: 0 25px;
}
.item-cell-table-hr {
margin: 0 25px 0 30px;
}
.total-display-table { .total-display-table {
border: 1px solid #EAF1FB;
border-top: none;
box-sizing: border-box; box-sizing: border-box;
width: 630px;
page-break-inside: avoid; page-break-inside: avoid;
page-break-before: auto; page-break-before: auto;
page-break-after: auto; page-break-after: auto;
margin-left:420px; margin-left: 500px;
margin-top: 10px border: 1px solid #EAF1FB;
border-top: none;
} }
.total-table-attribute-label { .total-table-attribute-label {

78
resources/views/app/pdf/invoice/invoice3.blade.php
View File

@ -100,13 +100,12 @@
.content-wrapper { .content-wrapper {
display: block; display: block;
padding-top: 50px; padding-top: 100px;
padding-bottom: 20px; padding-bottom: 20px;
} }
.main-content { .main-content {
display: inline-block;
padding-top: 100px;
} }
.customer-address-container { .customer-address-container {
@ -119,10 +118,13 @@
/* -- Shipping -- */ /* -- Shipping -- */
.shipping-address-container { .shipping-address-container {
float:right; float:right;
display: block;
} }
.shipping-address-container--left { .shipping-address-container--left {
float:left; float:left;
display: block;
padding-left: 0;
} }
.shipping-address-label { .shipping-address-label {
@ -137,6 +139,7 @@
font-size: 15px; font-size: 15px;
line-height: 22px; line-height: 22px;
margin: 0px; margin: 0px;
max-width: 160px;
} }
.shipping-address { .shipping-address {
@ -150,13 +153,12 @@
/* -- Billing -- */ /* -- Billing -- */
.billing-address-container { .billing-address-container {
display: block;
float: left; float: left;
} }
.billing-address-label { .billing-address-label {
padding-top: 5px; padding-top: 5px;
font-size: 12px; font-size: 12px;
line-height: 18px; line-height: 18px;
margin-bottom: 0px; margin-bottom: 0px;
@ -167,6 +169,7 @@
font-size: 15px; font-size: 15px;
line-height: 22px; line-height: 22px;
margin: 0px; margin: 0px;
max-width: 160px;
} }
.billing-address { .billing-address {
@ -201,6 +204,7 @@
/* -- Items Table -- */ /* -- Items Table -- */
.items-table { .items-table {
margin-top: 35px;
padding: 0px 30px 10px 30px; padding: 0px 30px 10px 30px;
page-break-before: avoid; page-break-before: avoid;
page-break-after: auto; page-break-after: auto;
@ -208,19 +212,18 @@
.items-table hr { .items-table hr {
height: 0.1px; height: 0.1px;
margin: 0 30px 0 30px;
} }
.item-table-heading-row td { .item-table-heading {
padding: 10px; font-size: 13.5;
} text-align: center;
color: rgba(0, 0, 0, 0.85);
.item-table-heading-row { padding: 5px;
border-bottom: 1px solid red; color: #55547A;
} }
tr.item-table-heading-row th { tr.item-table-heading-row th {
font-weight: 600; border-bottom: 0.620315px solid #E8E8E8;
font-size: 12px; font-size: 12px;
line-height: 18px; line-height: 18px;
} }
@ -230,32 +233,38 @@
line-height: 18px; line-height: 18px;
} }
.item-table-heading {
font-size: 13.5;
text-align: center;
color: rgba(0, 0, 0, 0.85);
padding: 5px;
}
.item-cell { .item-cell {
font-size: 13; font-size: 13;
color: #040405;
text-align: center; text-align: center;
padding: 5px; padding: 5px;
padding-top: 10px;
color: #040405;
}
.item-description {
color: #595959;
font-size: 9px;
line-height: 12px;
}
.item-cell-table-hr {
margin: 0 30px 0 30px;
} }
/* -- Total Display Table -- */ /* -- Total Display Table -- */
.total-display-container {
padding: 0 25px;
}
.total-display-table { .total-display-table {
border: 1px solid #EAF1FB;
border-top: none;
box-sizing: border-box; box-sizing: border-box;
width: 630px;
page-break-inside: avoid; page-break-inside: avoid;
page-break-before: auto; page-break-before: auto;
page-break-after: auto; page-break-after: auto;
margin-left:420px; margin-left: 500px;
margin-top: 10px margin-top: 20px;
} }
.total-table-attribute-label { .total-table-attribute-label {
@ -266,7 +275,7 @@
} }
.total-table-attribute-value { .total-table-attribute-value {
font-weight: 500; font-weight: bold;
text-align: right; text-align: right;
font-size: 12px; font-size: 12px;
color: #040405; color: #040405;
@ -275,6 +284,20 @@
padding-bottom: 2px; padding-bottom: 2px;
} }
.total-border-left {
border: 1px solid #E8E8E8 !important;
border-right: 0px !important;
padding-top: 0px;
padding: 8px !important;
}
.total-border-right {
border: 1px solid #E8E8E8 !important;
border-left: 0px !important;
padding-top: 0px;
padding: 8px !important;
}
/* -- Notes -- */ /* -- Notes -- */
.notes { .notes {
font-size: 12px; font-size: 12px;
@ -411,6 +434,7 @@
@include('app.pdf.invoice.partials.table') @include('app.pdf.invoice.partials.table')
@include('app.pdf.invoice.partials.notes') @include('app.pdf.invoice.partials.notes')
</div> </div>
</div>
</body> </body>
</html> </html>

17
resources/views/app/pdf/invoice/partials/table.blade.php
View File

@ -5,7 +5,7 @@
<th class="item-table-heading text-right pr-20">Quantity</th> <th class="item-table-heading text-right pr-20">Quantity</th>
<th class="item-table-heading pr-20 text-right">Price</th> <th class="item-table-heading pr-20 text-right">Price</th>
@if($invoice->discount_per_item === 'YES') @if($invoice->discount_per_item === 'YES')
<th class="item-table-heading pl-10">Discount</th> <th class="item-table-heading text-right pl-10">Discount</th>
@endif @endif
<th class="item-table-heading text-right">Amount</th> <th class="item-table-heading text-right">Amount</th>
</tr> </tr>
@ -22,22 +22,28 @@
</td> </td>
<td <td
class="item-cell text-left pl-0" class="item-cell text-left pl-0"
style="vertical-align: top;"
> >
<span>{{ $item->name }}</span><br> <span>{{ $item->name }}</span><br>
<span class="item-description">{!! nl2br(htmlspecialchars($item->description)) !!}</span> <span class="item-description">{!! nl2br(htmlspecialchars($item->description)) !!}</span>
</td> </td>
<td <td
class="item-cell pr-20 text-right" class="item-cell pr-20 text-right"
style="vertical-align: top;"
> >
{{$item->quantity}} {{$item->quantity}}
</td> </td>
<td <td
class="item-cell text-right pr-20" class="item-cell text-right pr-20"
style="vertical-align: top;"
> >
{!! format_money_pdf($item->price, $invoice->user->currency) !!} {!! format_money_pdf($item->price, $invoice->user->currency) !!}
</td> </td>
@if($invoice->discount_per_item === 'YES') @if($invoice->discount_per_item === 'YES')
<td class="item-cell text-right pl-10"> <td
class="item-cell text-right pl-10"
style="vertical-align: top;"
>
@if($item->discount_type === 'fixed') @if($item->discount_type === 'fixed')
{!! format_money_pdf($item->discount_val, $invoice->user->currency) !!} {!! format_money_pdf($item->discount_val, $invoice->user->currency) !!}
@endif @endif
@ -48,6 +54,7 @@
@endif @endif
<td <td
class="item-cell text-right" class="item-cell text-right"
style="vertical-align: top;"
> >
{!! format_money_pdf($item->total, $invoice->user->currency) !!} {!! format_money_pdf($item->total, $invoice->user->currency) !!}
</td> </td>
@ -60,7 +67,8 @@
<hr class="item-cell-table-hr"> <hr class="item-cell-table-hr">
<table width="100%" cellspacing="0px" border="0" class="total-display-table @if(count($invoice->items) > 12) page-break @endif"> <div class="total-display-container">
<table width="100%" cellspacing="0px" border="0" class="total-display-table @if(count($invoice->items) > 12) page-break @endif">
<tr> <tr>
<td class="border-0 total-table-attribute-label">Subtotal</td> <td class="border-0 total-table-attribute-label">Subtotal</td>
<td class="border-0 item-cell py-2 total-table-attribute-value"> <td class="border-0 item-cell py-2 total-table-attribute-value">
@ -126,4 +134,5 @@
{!! format_money_pdf($invoice->total, $invoice->user->currency)!!} {!! format_money_pdf($invoice->total, $invoice->user->currency)!!}
</td> </td>
</tr> </tr>
</table> </table>
</div>

3
resources/views/app/pdf/payment/payment.blade.php
View File

@ -219,9 +219,10 @@
} }
.content-heading span { .content-heading span {
font-weight: 500; font-weight: bold;
font-size: 14px; font-size: 14px;
line-height: 25px; line-height: 25px;
padding-bottom: 5px;
border-bottom: 1px solid #B9C1D1; border-bottom: 1px solid #B9C1D1;
} }