Fix Invoice/Estimate template issues and Add Payment Receipt, Custom Payment Modes and Item units

This commit is contained in:
Jay Makwana
2020-01-05 07:22:36 +00:00
committed by Mohit Panjwani
parent 56a955befd
commit 4c33a5d88c
112 changed files with 5050 additions and 331 deletions

View File

@ -2,7 +2,6 @@
<html>
<head>
<title>Invoice</title>
{{-- <link href="https://fonts.googleapis.com/css?family=Poppins&display=swap" rel="stylesheet"> --}}
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<style type="text/css">
@ -20,13 +19,18 @@
border-collapse: collapse;
}
hr {
.header-line {
color:rgba(0, 0, 0, 0.2);
position: absolute;
top: 90px;
left: 0px;
width: 100%;
}
hr {
margin: 0 30px 0 30px;
color:rgba(0, 0, 0, 0.2);
border: 0.5px solid #EAF1FB;
}
.header-center {
@ -251,8 +255,7 @@
.table2 {
margin-top: 35px;
border-bottom: 1px solid #EAF1FB;
padding: 0px 30px 0 30px;
padding: 0px 30px 10px 30px;
page-break-before: avoid;
page-break-after: auto;
}
@ -289,6 +292,7 @@
color: rgba(0, 0, 0, 0.6);
text-align: center;
padding: 5px;
padding-top: 10px;
}
.padd8 {

View File

@ -78,7 +78,8 @@
}
.address {
display: inline-block;
display: block;
padding-top: 20px;
}
.company {
padding: 0 0 0 30px;
@ -108,8 +109,8 @@
/* -------------------------- */
/* billing style */
.bill-address-container {
display: inline;
position: absolute;
display: block;
/* position: absolute; */
float:right;
padding: 0 40px 0 0;
}
@ -157,8 +158,7 @@
/* -------------------------- */
/* shipping style */
.ship-address-container {
display: inline;
position: absolute;
display: block;
float:right;
padding: 0 30px 0 0;
}
@ -245,13 +245,18 @@
}
.table2 {
margin-top: 200px;
border-bottom: 1px solid #EAF1FB;
padding: 0px 30px 0 30px;
margin-top: 30px;
padding: 0px 30px 10px 30px;
page-break-before: avoid;
page-break-after: auto;
}
hr {
margin: 0 30px 0 30px;
color:rgba(0, 0, 0, 0.2);
border: 0.5px solid #EAF1FB;
}
.table2 hr {
height:0.1px;
}
@ -283,6 +288,7 @@
color: rgba(0, 0, 0, 0.6);
text-align: center;
padding: 5px;
padding-top: 10px;
}
.note-header {
@ -435,8 +441,9 @@
@endif
@include('app.pdf.invoice.partials.billing-address')
</div>
<div style="clear: both;"></div>
</div>
@include('app.pdf.invoice.partials.table')
@include('app.pdf.invoice.partials.table')
@include('app.pdf.invoice.partials.notes')
</div>
</body>

View File

@ -18,7 +18,7 @@
border-collapse: collapse;
}
hr {
.header-line {
color:rgba(0, 0, 0, 0.2);
position: absolute;
top: 80px;
@ -27,6 +27,16 @@
width: 100%;
}
hr {
color:rgba(0, 0, 0, 0.2);
border: 0.5px solid #EAF1FB;
}
.items-table-hr{
margin: 0 30px 0 30px;
}
.header-left {
padding-top: 45px;
padding-bottom: 45px;
@ -86,7 +96,7 @@
.address {
display: inline-block;
padding-top: 20px
padding-top: 100px;
}
.bill-add {
@ -200,8 +210,7 @@
.job-add {
display: inline;
position: absolute;
display: block;
float: right;
padding: 20px 30px 0 0;
}
@ -250,9 +259,7 @@
line-height: 18px;
}
.table2 {
margin-top: 188px;
border-bottom: 1px solid #EAF1FB;
padding: 0px 30px 0 30px;
padding: 0px 30px 10px 30px;
page-break-before: avoid;
page-break-after: auto;
}
@ -427,7 +434,9 @@
</tr>
</table>
</div>
<hr style="border: 0.620315px solid #E8E8E8;">
<hr class="header-line">
<div class="wrapper">
<div class="address">
<div class="bill-add">
@ -460,6 +469,7 @@
</tr>
</table>
</div>
<div style="clear: both;"></div>
</div>
@include('app.pdf.invoice.partials.table')
@include('app.pdf.invoice.partials.notes')

View File

@ -3,6 +3,6 @@
<div class="notes-label">
Notes
</div>
{!! $invoice->notes !!}
{!! nl2br(htmlspecialchars($invoice->notes)) !!}
</div>
@endif

View File

@ -1,17 +1,13 @@
<table width="100%" class="table2" cellspacing="0" border="0">
<tr class="main-table-header">
<th class="ItemTableHeader" style="text-align: right; color: #55547A; padding-right: 20px">#</th>
@if($invoice->discount_per_item === 'NO')
<th width="80%" class="ItemTableHeader" style="text-align: left; color: #55547A; padding-left: 0px">Items</th>
@else
<th width="40%" class="ItemTableHeader" style="text-align: left; color: #55547A; padding-left: 0px">Items</th>
@endif
<th width="17%" class="ItemTableHeader" style="text-align: right; color: #55547A; padding-right: 20px">Quantity</th>
<th width="18%" class="ItemTableHeader" style="text-align: right; color: #55547A; padding-right: 40px">Price</th>
<th width="2%" class="ItemTableHeader" style="text-align: right; color: #55547A; padding-right: 20px">#</th>
<th width="40%" class="ItemTableHeader" style="text-align: left; color: #55547A; padding-left: 0px">Items</th>
<th class="ItemTableHeader" style="text-align: right; color: #55547A; padding-right: 20px">Quantity</th>
<th class="ItemTableHeader" style="text-align: right; color: #55547A; padding-right: 20px">Price</th>
@if($invoice->discount_per_item === 'YES')
<th width="10%" class="ItemTableHeader" style="text-align: right; color: #55547A; padding-left: 10px">Discount</th>
<th class="ItemTableHeader" style="text-align: right; color: #55547A; padding-left: 10px">Discount</th>
@endif
<th width="15%" class="ItemTableHeader" style="text-align: right; color: #55547A;">Amount</th>
<th class="ItemTableHeader" style="text-align: right; color: #55547A;">Amount</th>
</tr>
@php
$index = 1
@ -29,7 +25,7 @@
style="text-align: left; color: #040405;padding-left: 0px"
>
<span>{{ $item->name }}</span><br>
<span style="text-align: left; color: #595959; font-size: 9px; font-weight:300; line-height: 12px;">{{ $item->description }}</span>
<span style="text-align: left; color: #595959; font-size: 9px; font-weight:300; line-height: 12px;">{!! nl2br(htmlspecialchars($item->description)) !!}</span>
</td>
<td
class="inv-item items"
@ -39,7 +35,7 @@
</td>
<td
class="inv-item items"
style="text-align: right; color: #040405; padding-right: 40px"
style="text-align: right; color: #040405; padding-right: 20px"
>
{!! format_money_pdf($item->price, $invoice->user->currency) !!}
</td>
@ -66,10 +62,12 @@
@endforeach
</table>
<table width="100%" cellspacing="0px" style="margin-left:420px" border="0" class="table3 @if(count($invoice->items) > 12) page-break @endif">
<hr class="items-table-hr">
<table width="100%" cellspacing="0px" style="margin-left:420px; margin-top: 10px" border="0" class="table3 @if(count($invoice->items) > 12) page-break @endif">
<tr>
<td class="no-borde" style="color: #55547A; padding-left:10px; font-size:12px;">Subtotal</td>
<td class="no-border items"
<td class="no-border" style="color: #55547A; padding-left:10px; font-size:12px;">Subtotal</td>
<td class="no-border items padd2"
style="padding-right:10px; text-align: right; font-size:12px; color: #040405; font-weight: 500;">{!! format_money_pdf($invoice->sub_total, $invoice->user->currency) !!}</td>
</tr>