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>Estimate</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">
@ -19,13 +18,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 {
@ -250,8 +254,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;
}
@ -265,6 +268,7 @@
text-align: center;
color: rgba(0, 0, 0, 0.85);
padding: 5px;
padding-bottom: 10px;
}
tr.main-table-header th {
@ -275,6 +279,10 @@
line-height: 18px;
}
.main-table-header {
margin-bottom: 10px;
}
tr.item-details td {
font-style: normal;
font-weight: normal;
@ -287,6 +295,7 @@
color: rgba(0, 0, 0, 0.6);
text-align: center;
padding: 5px;
padding-top: 10px;
}
.padd8 {
@ -379,7 +388,7 @@
</td>
</tr>
</table>
<hr class="header-line" style="border: 0.620315px solid #E8E8E8;" />
<hr class="header-line" />
</div>
<div class="wrapper">
<div class="address">

View File

@ -2,9 +2,7 @@
<html>
<head>
<title>Estimate</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">
body {
font-family: "DejaVu Sans";
@ -25,7 +23,6 @@
display:inline-block;
width:30%;
}
@page {
margin-top: 60px !important;
}
@ -80,7 +77,8 @@
}
.address {
display: inline-block;
display: block;
padding-top: 20px;
}
.company {
padding: 0 0 0 30px;
@ -110,8 +108,8 @@
/* -------------------------- */
/* billing style */
.bill-address-container {
display: inline;
position: absolute;
display: block;
/* position: absolute; */
float:right;
padding: 0 40px 0 0;
}
@ -159,8 +157,7 @@
/* -------------------------- */
/* shipping style */
.ship-address-container {
display: inline;
position: absolute;
display: block;
float:right;
padding: 0 30px 0 0;
}
@ -247,13 +244,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;
}
@ -285,6 +287,7 @@
color: rgba(0, 0, 0, 0.6);
text-align: center;
padding: 5px;
padding-top: 10px;
}
.note-header {
@ -317,6 +320,16 @@
page-break-after: auto;
}
.text-per-item-table3 {
border: 1px solid #EAF1FB;
border-top: none;
padding-right: 30px;
box-sizing: border-box;
width: 260px;
/* height: 100px; */
position: absolute;
right: -25;
}
.inv-item {
border-color: #d9d9d9;
@ -402,6 +415,7 @@
<h1 class="header-logo"> {{$estimate->user->company->name}} </h1>
@endif
@endif
</td>
<td width="40%" class="header-right company-details">
<h1>Estimate</h1>
<h4>{{$estimate->estimate_number}}</h4>
@ -426,6 +440,7 @@
@endif
@include('app.pdf.estimate.partials.billing-address')
</div>
<div style="clear: both;"></div>
</div>
@include('app.pdf.estimate.partials.table')
@include('app.pdf.estimate.partials.notes')

View File

@ -2,7 +2,6 @@
<html>
<head>
<title>Estimate</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">
@ -18,7 +17,7 @@
border-collapse: collapse;
}
hr {
.header-line {
color:rgba(0, 0, 0, 0.2);
position: absolute;
top: 80px;
@ -27,6 +26,15 @@
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;
@ -34,6 +42,7 @@
display:inline-block;
width:30%;
}
.header-table {
position: absolute;
width: 100%;
@ -87,7 +96,7 @@
.address {
display: inline-block;
padding-top: 20px
padding-top: 100px
}
.bill-add {
@ -201,8 +210,7 @@
.job-add {
display: inline;
position: absolute;
display: block;
float: right;
padding: 20px 30px 0 0;
}
@ -251,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;
}
@ -417,7 +423,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">
@ -450,6 +458,7 @@
</tr>
</table>
</div>
<div style="clear: both;"></div>
</div>
@include('app.pdf.estimate.partials.table')
@include('app.pdf.estimate.partials.notes')

View File

@ -3,6 +3,6 @@
<div class="notes-label">
Notes
</div>
{{$estimate->notes}}
{!! nl2br(htmlspecialchars($estimate->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($estimate->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($estimate->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
@ -32,7 +28,7 @@
<span
style="text-align: left; color: #595959; font-size: 9px; font-weight:300; line-height: 12px;"
>
{{ $item->description }}
{!! nl2br(htmlspecialchars($item->description)) !!}
</span>
</td>
<td
@ -43,7 +39,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, $estimate->user->currency) !!}
</td>
@ -67,7 +63,9 @@
@endforeach
</table>
<table width="100%" cellspacing="0px" style="margin-left:420px" border="0" class="table3 @if(count($estimate->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($estimate->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"