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

Fix estimate template issues

Browse Source
This commit is contained in:
radhu587
2020-05-08 16:52:48 +05:30
parent 6046113cb1
commit a739a938fc
5 changed files with 65 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,7 +80,6 @@
.company-address-container { .company-address-container {
padding-left: 30px; padding-left: 30px;
float: left; float: left;
width: 30%; width: 30%;
text-transform: capitalize; text-transform: capitalize;
@ -88,8 +87,6 @@
} }
.company-address-container h1 { .company-address-container h1 {
font-size: 15px; font-size: 15px;
line-height: 22px; line-height: 22px;
letter-spacing: 0.05em; letter-spacing: 0.05em;
@ -100,8 +97,6 @@
.company-address { .company-address {
margin-top: 2px; margin-top: 2px;
text-align: left; text-align: left;
font-size: 12px; font-size: 12px;
line-height: 15px; line-height: 15px;
color: #595959; color: #595959;
@ -154,7 +149,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;
@ -186,7 +181,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;
@ -250,21 +245,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 {
@ -275,7 +272,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;

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

@ -117,7 +117,6 @@
.company-address-container { .company-address-container {
padding-left: 30px; padding-left: 30px;
float: left; float: left;
width: 30%; width: 30%;
text-transform: capitalize; text-transform: capitalize;
@ -125,8 +124,6 @@
} }
.company-address-container h1 { .company-address-container h1 {
font-size: 15px; font-size: 15px;
line-height: 22px; line-height: 22px;
letter-spacing: 0.05em; letter-spacing: 0.05em;
@ -227,8 +224,7 @@
/* -- Items Table -- */ /* -- Items Table -- */
.items-table { .items-table {
margin-top: 30px; padding: 30px 30px 10px 30px;
padding: 0px 30px 10px 30px;
page-break-before: avoid; page-break-before: avoid;
page-break-after: auto; page-break-after: auto;
} }
@ -275,22 +271,25 @@
.item-description { .item-description {
color: #595959; color: #595959;
font-size: 9px; font-size: 9px;
font-weight:300;
line-height: 12px; line-height: 12px;
page-break-inside: avoid;
} }
/* -- Total Display Table -- */ /* -- Total Display Table -- */
.total-display-container {
padding: 0 25px;
}
.total-display-table { .total-display-table {
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;
border: 1px solid #EAF1FB; border: 1px solid #EAF1FB;
border-top: none;
} }
.total-table-attribute-label { .total-table-attribute-label {
@ -301,7 +300,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;
@ -327,7 +326,6 @@
/* -- Notes -- */ /* -- Notes -- */
.notes { .notes {
font-weight: 300;
font-size: 12px; font-size: 12px;
color: #595959; color: #595959;
margin-top: 15px; margin-top: 15px;

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

@ -105,13 +105,11 @@
.wrapper { .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 {
@ -125,6 +123,7 @@
.shipping-address-container { .shipping-address-container {
float: right; float: right;
display: block;
} }
.shipping-address-container--left { .shipping-address-container--left {
@ -143,6 +142,7 @@
font-size: 15px; font-size: 15px;
line-height: 22px; line-height: 22px;
margin: 0px; margin: 0px;
max-width: 160px;
} }
.shipping-address { .shipping-address {
@ -171,6 +171,7 @@
font-size: 15px; font-size: 15px;
line-height: 22px; line-height: 22px;
margin: 0px; margin: 0px;
max-width: 160px;
} }
.billing-address { .billing-address {
@ -203,15 +204,15 @@
} }
/* -- Items Table -- */ /* -- Items Table -- */
.items-table { .items-table {
padding: 0px 30px 10px 30px; padding: 30px 30px 10px 30px;
page-break-before: avoid; page-break-before: avoid;
page-break-after: auto; page-break-after: auto;
} }
.items-table hr { .items-table hr {
height: 0.1px; height: 0.1px;
margin: 0 30px 0 30px;
} }
.item-table-heading { .item-table-heading {
@ -219,46 +220,54 @@
text-align: center; text-align: center;
color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);
padding: 5px; padding: 5px;
} padding-bottom: 10px;
.item-cell {
font-size: 13;
color: #040405;
text-align: center;
padding: 5px;
}
.item-table-heading-row td {
padding: 10px;
}
.item-table-heading-row {
border-bottom: 1px solid red;
} }
tr.item-table-heading-row th { tr.item-table-heading-row th {
border-bottom: 0.620315px solid #E8E8E8;
font-weight: 600;
font-size: 12px; font-size: 12px;
line-height: 18px; line-height: 18px;
} }
.item-table-heading-row {
margin-bottom: 10px;
}
tr.item-row td { tr.item-row td {
font-size: 12px; font-size: 12px;
line-height: 18px; line-height: 18px;
} }
.item-cell {
font-size: 13;
color: #040405;
text-align: center;
padding: 5px;
padding-top: 10px;
border-color: #d9d9d9;
}
.item-description {
color: #595959;
font-size: 9px;
line-height: 12px;
}
/* -- Total Display Table -- */ /* -- Total Display Table -- */
.total-display-container {
padding: 0 25px;
}
.total-display-table { .total-display-table {
border: 1px solid #EAF1FB;
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;
border: 1px solid #EAF1FB;
border-top: none;
} }
.total-table-attribute-label { .total-table-attribute-label {
@ -269,7 +278,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;
@ -432,6 +441,7 @@
@include('app.pdf.estimate.partials.table') @include('app.pdf.estimate.partials.table')
@include('app.pdf.estimate.partials.notes') @include('app.pdf.estimate.partials.notes')
</div> </div>
</div>
</body> </body>
</html> </html>

2
resources/views/app/pdf/estimate/partials/shipping-address.blade.php
View File

@ -30,7 +30,7 @@
{{$estimate->user->shippingaddress->country->name}}<br> {{$estimate->user->shippingaddress->country->name}}<br>
@endif @endif
@if($estimate->user->phone) @if($estimate->user->shippingAddress->phone)
<p class="shipping-address"> <p class="shipping-address">
Phone :{{$estimate->user->shippingaddress->phone}} Phone :{{$estimate->user->shippingaddress->phone}}
</p> </p>

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

@ -7,7 +7,7 @@
@if($estimate->discount_per_item === 'YES') @if($estimate->discount_per_item === 'YES')
<th class="item-table-heading text-right 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>
@php @php
$index = 1 $index = 1
@ -32,16 +32,18 @@
</td> </td>
<td <td
class="item-cell text-right pr-20" class="item-cell text-right pr-20"
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, $estimate->user->currency) !!} {!! format_money_pdf($item->price, $estimate->user->currency) !!}
</td> </td>
@if($estimate->discount_per_item === 'YES') @if($estimate->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, $estimate->user->currency) !!} {!! format_money_pdf($item->discount_val, $estimate->user->currency) !!}
@endif @endif
@ -50,7 +52,7 @@
@endif @endif
</td> </td>
@endif @endif
<td class="item-cell text-right"> <td class="item-cell text-right" style="vertical-align: top;">
{!! format_money_pdf($item->total, $estimate->user->currency) !!} {!! format_money_pdf($item->total, $estimate->user->currency) !!}
</td> </td>
</tr> </tr>
@ -62,6 +64,7 @@
<hr class="items-table-hr"> <hr class="items-table-hr">
<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>
@ -102,7 +105,7 @@
Discount ({{$estimate->discount}}%) Discount ({{$estimate->discount}}%)
@endif @endif
</td> </td>
<td class="border-0 item-cell total-table-attribute-value pr-10"> <td class="border-0 item-cell total-table-attribute-value text-right">
@if($estimate->discount_type === 'fixed') @if($estimate->discount_type === 'fixed')
{!! format_money_pdf($estimate->discount_val, $estimate->user->currency) !!} {!! format_money_pdf($estimate->discount_val, $estimate->user->currency) !!}
@endif @endif
@ -123,3 +126,4 @@
</td> </td>
</tr> </tr>
</table> </table>
</div>