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

Update dompdf version

Browse Source
This commit is contained in:
Harsh Jagad
2022-01-12 11:44:45 +00:00
committed by Mohit Panjwani
parent f677a54c2a
commit a14655d73b
9 changed files with 212 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
composer.json
View File

@ -10,8 +10,8 @@
"require": { "require": {
"php": "^7.4 || ^8.0", "php": "^7.4 || ^8.0",
"aws/aws-sdk-php": "^3.142", "aws/aws-sdk-php": "^3.142",
"barryvdh/laravel-dompdf": "^0.9.0",
"crater-invoice/modules": "^1.0.0", "crater-invoice/modules": "^1.0.0",
"barryvdh/laravel-dompdf": "^0.8.7",
"doctrine/dbal": "^2.10", "doctrine/dbal": "^2.10",
"dragonmantank/cron-expression": "^3.1", "dragonmantank/cron-expression": "^3.1",
"fideloper/proxy": "^4.0", "fideloper/proxy": "^4.0",
@ -88,4 +88,4 @@
"dont-discover": [] "dont-discover": []
} }
} }
} }

67
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "b4c1fd7a94025b650a89756e1140b1c0", "content-hash": "bec0a5c13fb0fdf512aa6fc44ca14273",
"packages": [ "packages": [
{ {
"name": "asm89/stack-cors", "name": "asm89/stack-cors",
@ -114,16 +114,16 @@
}, },
{ {
"name": "aws/aws-sdk-php", "name": "aws/aws-sdk-php",
"version": "3.209.1", "version": "3.209.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/aws/aws-sdk-php.git", "url": "https://github.com/aws/aws-sdk-php.git",
"reference": "3a418a7a9beae4675685efe7bb426ee0ae338a40" "reference": "77c14dd84704d2db6c5c4d6a8c1226337e4e6783"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3a418a7a9beae4675685efe7bb426ee0ae338a40", "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/77c14dd84704d2db6c5c4d6a8c1226337e4e6783",
"reference": "3a418a7a9beae4675685efe7bb426ee0ae338a40", "reference": "77c14dd84704d2db6c5c4d6a8c1226337e4e6783",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -199,33 +199,33 @@
"support": { "support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues", "issues": "https://github.com/aws/aws-sdk-php/issues",
"source": "https://github.com/aws/aws-sdk-php/tree/3.209.1" "source": "https://github.com/aws/aws-sdk-php/tree/3.209.2"
}, },
"time": "2022-01-07T19:12:55+00:00" "time": "2022-01-10T19:14:32+00:00"
}, },
{ {
"name": "barryvdh/laravel-dompdf", "name": "barryvdh/laravel-dompdf",
"version": "v0.8.7", "version": "v0.9.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/barryvdh/laravel-dompdf.git", "url": "https://github.com/barryvdh/laravel-dompdf.git",
"reference": "30310e0a675462bf2aa9d448c8dcbf57fbcc517d" "reference": "5b99e1f94157d74e450f4c97e8444fcaffa2144b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/30310e0a675462bf2aa9d448c8dcbf57fbcc517d", "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/5b99e1f94157d74e450f4c97e8444fcaffa2144b",
"reference": "30310e0a675462bf2aa9d448c8dcbf57fbcc517d", "reference": "5b99e1f94157d74e450f4c97e8444fcaffa2144b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"dompdf/dompdf": "^0.8", "dompdf/dompdf": "^1",
"illuminate/support": "^5.5|^6|^7|^8", "illuminate/support": "^5.5|^6|^7|^8",
"php": ">=7" "php": "^7.1 || ^8.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "0.8-dev" "dev-master": "0.9-dev"
}, },
"laravel": { "laravel": {
"providers": [ "providers": [
@ -259,7 +259,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/barryvdh/laravel-dompdf/issues", "issues": "https://github.com/barryvdh/laravel-dompdf/issues",
"source": "https://github.com/barryvdh/laravel-dompdf/tree/master" "source": "https://github.com/barryvdh/laravel-dompdf/tree/v0.9.0"
}, },
"funding": [ "funding": [
{ {
@ -267,7 +267,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2020-09-07T11:50:18+00:00" "time": "2020-12-27T12:05:53+00:00"
}, },
{ {
"name": "brick/math", "name": "brick/math",
@ -1058,16 +1058,16 @@
}, },
{ {
"name": "dompdf/dompdf", "name": "dompdf/dompdf",
"version": "v0.8.6", "version": "v1.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/dompdf/dompdf.git", "url": "https://github.com/dompdf/dompdf.git",
"reference": "db91d81866c69a42dad1d2926f61515a1e3f42c5" "reference": "de4aad040737a89fae2129cdeb0f79c45513128d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/dompdf/dompdf/zipball/db91d81866c69a42dad1d2926f61515a1e3f42c5", "url": "https://api.github.com/repos/dompdf/dompdf/zipball/de4aad040737a89fae2129cdeb0f79c45513128d",
"reference": "db91d81866c69a42dad1d2926f61515a1e3f42c5", "reference": "de4aad040737a89fae2129cdeb0f79c45513128d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1075,11 +1075,11 @@
"ext-mbstring": "*", "ext-mbstring": "*",
"phenx/php-font-lib": "^0.5.2", "phenx/php-font-lib": "^0.5.2",
"phenx/php-svg-lib": "^0.3.3", "phenx/php-svg-lib": "^0.3.3",
"php": "^7.1" "php": "^7.1 || ^8.0"
}, },
"require-dev": { "require-dev": {
"mockery/mockery": "^1.3", "mockery/mockery": "^1.3",
"phpunit/phpunit": "^7.5", "phpunit/phpunit": "^7.5 || ^8 || ^9",
"squizlabs/php_codesniffer": "^3.5" "squizlabs/php_codesniffer": "^3.5"
}, },
"suggest": { "suggest": {
@ -1089,11 +1089,6 @@
"ext-zlib": "Needed for pdf stream compression" "ext-zlib": "Needed for pdf stream compression"
}, },
"type": "library", "type": "library",
"extra": {
"branch-alias": {
"dev-develop": "0.7-dev"
}
},
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Dompdf\\": "src/" "Dompdf\\": "src/"
@ -1124,9 +1119,9 @@
"homepage": "https://github.com/dompdf/dompdf", "homepage": "https://github.com/dompdf/dompdf",
"support": { "support": {
"issues": "https://github.com/dompdf/dompdf/issues", "issues": "https://github.com/dompdf/dompdf/issues",
"source": "https://github.com/dompdf/dompdf/tree/master" "source": "https://github.com/dompdf/dompdf/tree/v1.1.1"
}, },
"time": "2020-08-30T22:54:22+00:00" "time": "2021-11-24T00:45:04+00:00"
}, },
{ {
"name": "dragonmantank/cron-expression", "name": "dragonmantank/cron-expression",
@ -11432,16 +11427,16 @@
}, },
{ {
"name": "nunomaduro/collision", "name": "nunomaduro/collision",
"version": "v5.10.0", "version": "v5.11.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nunomaduro/collision.git", "url": "https://github.com/nunomaduro/collision.git",
"reference": "3004cfa49c022183395eabc6d0e5207dfe498d00" "reference": "8b610eef8582ccdc05d8f2ab23305e2d37049461"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nunomaduro/collision/zipball/3004cfa49c022183395eabc6d0e5207dfe498d00", "url": "https://api.github.com/repos/nunomaduro/collision/zipball/8b610eef8582ccdc05d8f2ab23305e2d37049461",
"reference": "3004cfa49c022183395eabc6d0e5207dfe498d00", "reference": "8b610eef8582ccdc05d8f2ab23305e2d37049461",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -11503,7 +11498,7 @@
}, },
"funding": [ "funding": [
{ {
"url": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66BYDWAT92N6L", "url": "https://www.paypal.com/paypalme/enunomaduro",
"type": "custom" "type": "custom"
}, },
{ {
@ -11515,7 +11510,7 @@
"type": "patreon" "type": "patreon"
} }
], ],
"time": "2021-09-20T15:06:32+00:00" "time": "2022-01-10T16:22:52+00:00"
}, },
{ {
"name": "pestphp/pest", "name": "pestphp/pest",
@ -12412,5 +12407,5 @@
"php": "^7.4 || ^8.0" "php": "^7.4 || ^8.0"
}, },
"platform-dev": [], "platform-dev": [],
"plugin-api-version": "2.1.0" "plugin-api-version": "2.0.0"
} }

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

@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<title>@lang('pdf_estimate_label') - {{$estimate->estimate_number}}</title> <title>@lang('pdf_estimate_label') - {{ $estimate->estimate_number }}</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<style type="text/css"> <style type="text/css">
@ -46,7 +46,7 @@
} }
.header-logo { .header-logo {
height: 50px;
margin-top: 20px; margin-top: 20px;
text-transform: capitalize; text-transform: capitalize;
color: #817AE3; color: #817AE3;
@ -260,6 +260,7 @@
.total-display-container { .total-display-container {
padding: 0 25px; padding: 0 25px;
} }
.total-display-table { .total-display-table {
@ -268,8 +269,10 @@
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-top: 20px; margin-top: 20px;
float: right;
width: auto;
} }
.total-table-attribute-label { .total-table-attribute-label {
@ -308,7 +311,7 @@
.notes { .notes {
font-size: 12px; font-size: 12px;
color: #595959; color: #595959;
margin-top: 15px; margin-top: 80px;
margin-left: 30px; margin-left: 30px;
width: 442px; width: 442px;
text-align: left; text-align: left;
@ -381,6 +384,7 @@
.pl-0 { .pl-0 {
padding-left: 0; padding-left: 0;
} }
</style> </style>
</head> </head>
@ -389,11 +393,11 @@
<table width="100%"> <table width="100%">
<tr> <tr>
<td class="text-center"> <td class="text-center">
@if($logo) @if ($logo)
<img class="header-logo" src="{{ $logo }}" alt="Company Logo"> <img class="header-logo" style="height: 50px;" src="{{ $logo }}" alt="Company Logo">
@else @else
@if($estimate->customer->company) @if ($estimate->customer->company)
<h2 class="header-logo"> {{$estimate->customer->company->name}} </h2> <h2 class="header-logo"> {{ $estimate->customer->company->name }} </h2>
@endif @endif
@endif @endif
</td> </td>
@ -412,15 +416,15 @@
<table class="estimate-details-table"> <table class="estimate-details-table">
<tr> <tr>
<td class="attribute-label">@lang('pdf_estimate_number')</td> <td class="attribute-label">@lang('pdf_estimate_number')</td>
<td class="attribute-value"> &nbsp;{{$estimate->estimate_number}}</td> <td class="attribute-value"> &nbsp;{{ $estimate->estimate_number }}</td>
</tr> </tr>
<tr> <tr>
<td class="attribute-label">@lang('pdf_estimate_date')</td> <td class="attribute-label">@lang('pdf_estimate_date')</td>
<td class="attribute-value"> &nbsp;{{$estimate->formattedEstimateDate}}</td> <td class="attribute-value"> &nbsp;{{ $estimate->formattedEstimateDate }}</td>
</tr> </tr>
<tr> <tr>
<td class="attribute-label">@lang('pdf_estimate_expire_date')</td> <td class="attribute-label">@lang('pdf_estimate_expire_date')</td>
<td class="attribute-value"> &nbsp;{{$estimate->formattedExpiryDate}}</td> <td class="attribute-value"> &nbsp;{{ $estimate->formattedExpiryDate }}</td>
</tr> </tr>
</table> </table>
</div> </div>
@ -428,9 +432,9 @@
</div> </div>
<div class="customer-address-container"> <div class="customer-address-container">
@if($billing_address !== '</br>') @if ($billing_address !== '</br>')
<div class="billing-address-container billing-address"> <div class="billing-address-container billing-address">
@if($billing_address) @if ($billing_address)
<b>@lang('pdf_bill_to')</b> <br> <b>@lang('pdf_bill_to')</b> <br>
{!! $billing_address !!} {!! $billing_address !!}
@endif @endif
@ -438,10 +442,10 @@
@endif @endif
<div @if($billing_address !== '</br>') class="shipping-address-container shipping-address" @else class="shipping-address-container--left shipping-address" style="padding-left:30px;" @endif> <div @if ($billing_address !== '</br>') class="shipping-address-container shipping-address" @else class="shipping-address-container--left shipping-address" style="padding-left:30px;" @endif>
@if($shipping_address) @if ($shipping_address)
<b>@lang('pdf_ship_to') </b> <br> <b>@lang('pdf_ship_to') </b> <br>
{!! $shipping_address !!} {!! $shipping_address !!}
@endif @endif
</div> </div>
@ -454,7 +458,7 @@
</div> </div>
<div class="notes"> <div class="notes">
@if($notes) @if ($notes)
<div class="notes-label"> <div class="notes-label">
@lang('pdf_notes') @lang('pdf_notes')
</div> </div>

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

@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<title>@lang('pdf_estimate_label') - {{$estimate->estimate_number}}</title> <title>@lang('pdf_estimate_label') - {{ $estimate->estimate_number }}</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<style type="text/css"> <style type="text/css">
/* -- Base -- */ /* -- Base -- */
@ -46,7 +46,7 @@
.header-logo { .header-logo {
position: absolute; position: absolute;
height: 50px;
text-transform: capitalize; text-transform: capitalize;
color: #fff; color: #fff;
} }
@ -278,6 +278,7 @@
/* -- Total Display Table -- */ /* -- Total Display Table -- */
.total-display-container { .total-display-container {
padding: 0 25px; padding: 0 25px;
} }
@ -291,9 +292,9 @@
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-top: 20px;
border: 1px solid #EAF1FB; float: right;
border-top: none; width: auto;
} }
.total-table-attribute-label { .total-table-attribute-label {
@ -313,12 +314,26 @@
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;
color: #595959; color: #595959;
margin-top: 15px; margin-top: 80px;
margin-left: 30px; margin-left: 30px;
width: 442px; width: 442px;
text-align: left; text-align: left;
@ -391,6 +406,7 @@
.pl-0 { .pl-0 {
padding-left: 0; padding-left: 0;
} }
</style> </style>
</head> </head>
@ -398,21 +414,21 @@
<div class="header-container"> <div class="header-container">
<table width="100%"> <table width="100%">
<tr> <tr>
@if($logo) @if ($logo)
<td width="60%" class="header-section-left"> <td width="60%" class="header-section-left">
<img class="header-logo" src="{{ $logo }}" alt="Company Logo"> <img class="header-logo" style="height: 50px;" src="{{ $logo }}" alt="Company Logo">
</td> </td>
@else @else
<td width="60%" class="header-section-left" style="padding-top: 0px;"> <td width="60%" class="header-section-left" style="padding-top: 0px;">
@if($estimate->customer->company) @if ($estimate->customer->company)
<h1 class="header-logo"> {{$estimate->customer->company->name}} </h1> <h1 class="header-logo"> {{ $estimate->customer->company->name }} </h1>
@endif @endif
</td> </td>
@endif @endif
<td width="40%" class="header-section-right estimate-details-container"> <td width="40%" class="header-section-right estimate-details-container">
<h1>@lang('pdf_estimate_label')</h1> <h1>@lang('pdf_estimate_label')</h1>
<h4>{{$estimate->estimate_number}}</h4> <h4>{{ $estimate->estimate_number }}</h4>
<h4>{{$estimate->formattedEstimateDate}}</h4> <h4>{{ $estimate->formattedEstimateDate }}</h4>
</td> </td>
</tr> </tr>
</table> </table>
@ -424,17 +440,17 @@
{!! $company_address !!} {!! $company_address !!}
</div> </div>
@if($shipping_address !== '</br>') @if ($shipping_address !== '</br>')
<div class="shipping-address-container shipping-address"> <div class="shipping-address-container shipping-address">
@if($shipping_address) @if ($shipping_address)
<b>@lang('pdf_ship_to')</b> <br> <b>@lang('pdf_ship_to')</b> <br>
{!! $shipping_address !!} {!! $shipping_address !!}
@endif @endif
</div> </div>
@endif @endif
<div class="billing-address-container billing-address" @if($shipping_address === '</br>') style="float:right; margin-right:30px;" @endif> <div class="billing-address-container billing-address" @if ($shipping_address === '</br>') style="float:right; margin-right:30px;" @endif>
@if($billing_address) @if ($billing_address)
<b>@lang('pdf_bill_to')</b> <br> <b>@lang('pdf_bill_to')</b> <br>
{!! $billing_address !!} {!! $billing_address !!}
@endif @endif
@ -445,7 +461,7 @@
@include('app.pdf.estimate.partials.table') @include('app.pdf.estimate.partials.table')
<div class="notes"> <div class="notes">
@if($notes) @if ($notes)
<div class="notes-label"> <div class="notes-label">
@lang('pdf_notes') @lang('pdf_notes')
</div> </div>

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

@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<title>@lang('pdf_estimate_label') - {{$estimate->estimate_number}}</title> <title>@lang('pdf_estimate_label') - {{ $estimate->estimate_number }}</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<style type="text/css"> <style type="text/css">
@ -35,7 +35,7 @@
} }
.header-logo { .header-logo {
height: 50px;
text-transform: capitalize; text-transform: capitalize;
color: #817AE3; color: #817AE3;
padding-top: 0px; padding-top: 0px;
@ -46,8 +46,9 @@
.company-address-container { .company-address-container {
width: 50%; width: 50%;
text-transform: capitalize; text-transform: capitalize;
padding-left: 80px; padding-right: 60px;
margin-bottom: 2px; margin-bottom: 2px;
} }
.company-address { .company-address {
@ -81,7 +82,7 @@
} }
.shipping-address-container--left { .shipping-address-container--left {
float:left; float: left;
display: block; display: block;
padding-left: 0; padding-left: 0;
} }
@ -228,8 +229,10 @@
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-top: 20px; margin-top: 20px;
float: right;
width: auto;
} }
.total-table-attribute-label { .total-table-attribute-label {
@ -268,7 +271,7 @@
.notes { .notes {
font-size: 12px; font-size: 12px;
color: #595959; color: #595959;
margin-top: 15px; margin-top: 80px;
margin-left: 30px; margin-left: 30px;
width: 442px; width: 442px;
text-align: left; text-align: left;
@ -341,6 +344,7 @@
.pl-0 { .pl-0 {
padding-left: 0; padding-left: 0;
} }
</style> </style>
</head> </head>
@ -349,10 +353,10 @@
<table width="100%"> <table width="100%">
<tr> <tr>
<td width="50%" class="header-section-left"> <td width="50%" class="header-section-left">
@if($logo) @if ($logo)
<img class="header-logo" src="{{ $logo }}" alt="Company Logo"> <img class="header-logo" style="height: 50px;" src="{{ $logo }}" alt="Company Logo">
@else @else
<h1 class="header-logo"> {{$estimate->customer->company->name}} </h1> <h1 class="header-logo"> {{ $estimate->customer->company->name }} </h1>
@endif @endif
</td> </td>
<td width="50%" class="text-right company-address-container company-address"> <td width="50%" class="text-right company-address-container company-address">
@ -368,14 +372,14 @@
<div class="main-content"> <div class="main-content">
<div class="customer-address-container"> <div class="customer-address-container">
<div class="billing-address-container billing-address"> <div class="billing-address-container billing-address">
@if($billing_address) @if ($billing_address)
<b>@lang('pdf_bill_to')</b> <br> <b>@lang('pdf_bill_to')</b> <br>
{!! $billing_address !!} {!! $billing_address !!}
@endif @endif
</div> </div>
<div @if($estimate->customer->billingaddress) class="shipping-address-container shipping-address" @else class="shipping-address-container--left shipping-address" @endif> <div @if ($estimate->customer->billingaddress) class="shipping-address-container shipping-address" @else class="shipping-address-container--left shipping-address" @endif>
@if($shipping_address) @if ($shipping_address)
<b>@lang('pdf_ship_to')</b> <br> <b>@lang('pdf_ship_to')</b> <br>
{!! $shipping_address !!} {!! $shipping_address !!}
@endif @endif
@ -388,15 +392,15 @@
<table> <table>
<tr> <tr>
<td class="attribute-label">@lang('pdf_estimate_number')</td> <td class="attribute-label">@lang('pdf_estimate_number')</td>
<td class="attribute-value"> &nbsp;{{$estimate->estimate_number}}</td> <td class="attribute-value"> &nbsp;{{ $estimate->estimate_number }}</td>
</tr> </tr>
<tr> <tr>
<td class="attribute-label">@lang('pdf_estimate_date') </td> <td class="attribute-label">@lang('pdf_estimate_date') </td>
<td class="attribute-value"> &nbsp;{{$estimate->formattedEstimateDate}}</td> <td class="attribute-value"> &nbsp;{{ $estimate->formattedEstimateDate }}</td>
</tr> </tr>
<tr> <tr>
<td class="attribute-label">@lang('pdf_estimate_expire_date')</td> <td class="attribute-label">@lang('pdf_estimate_expire_date')</td>
<td class="attribute-value"> &nbsp;{{$estimate->formattedExpiryDate}}</td> <td class="attribute-value"> &nbsp;{{ $estimate->formattedExpiryDate }}</td>
</tr> </tr>
</table> </table>
</div> </div>
@ -405,7 +409,7 @@
@include('app.pdf.estimate.partials.table') @include('app.pdf.estimate.partials.table')
<div class="notes"> <div class="notes">
@if($notes) @if ($notes)
<div class="notes-label"> <div class="notes-label">
@lang('pdf_notes') @lang('pdf_notes')
</div> </div>

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

@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<title>@lang('pdf_invoice_label') - {{$invoice->invoice_number}}</title> <title>@lang('pdf_invoice_label') - {{ $invoice->invoice_number }}</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<style type="text/css"> <style type="text/css">
@ -15,10 +15,11 @@
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
margin-top: 50px; margin-top: 50px;
} }
.text-center { .text-center {
text-align: center text-align: center;
} }
hr { hr {
@ -31,10 +32,11 @@
.header-bottom-divider { .header-bottom-divider {
color: rgba(0, 0, 0, 0.2); color: rgba(0, 0, 0, 0.2);
position: absolute;
top: 90px; top: 90px;
left: 0px; left: 0px;
width: 100%; width: 100%;
margin-left: 0%;
} }
.header-container { .header-container {
@ -46,10 +48,11 @@
} }
.header-logo { .header-logo {
height: 50px;
margin-top: 20px; margin-top: 20px;
padding-bottom: 20px;
text-transform: capitalize; text-transform: capitalize;
color: #817AE3; color: #817AE3;
} }
.header { .header {
@ -81,7 +84,7 @@
} }
.company-address { .company-address {
margin-top: 2px; margin-top: 16px;
text-align: left; text-align: left;
font-size: 12px; font-size: 12px;
line-height: 15px; line-height: 15px;
@ -93,6 +96,7 @@
.invoice-details-container { .invoice-details-container {
float: right; float: right;
padding: 10px 30px 0 0; padding: 10px 30px 0 0;
margin-top: 18px;
} }
.attribute-label { .attribute-label {
@ -218,8 +222,9 @@
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-top: 20px; margin-top: 20px;
float: right;
width: auto;
} }
.total-table-attribute-label { .total-table-attribute-label {
@ -282,9 +287,6 @@
color: #5851DB; color: #5851DB;
} }
.text-center {
text-align: center
}
table .text-left { table .text-left {
text-align: left; text-align: left;
@ -331,6 +333,7 @@
.pl-0 { .pl-0 {
padding-left: 0; padding-left: 0;
} }
</style> </style>
</head> </head>
@ -339,11 +342,11 @@
<table width="100%"> <table width="100%">
<tr> <tr>
<td class="text-center"> <td class="text-center">
@if($logo) @if ($logo)
<img class="header-logo" src="{{ $logo }}" alt="Company Logo"> <img class="header-logo" style="height:50px" src="{{ $logo }}" alt="Company Logo">
@else @else
@if($invoice->customer->company) @if ($invoice->customer->company)
<h2 class="header-logo"> {{$invoice->customer->company->name}} </h2> <h2 class="header-logo"> {{ $invoice->customer->company->name }}</h2>
@endif @endif
@endif @endif
</td> </td>
@ -352,6 +355,7 @@
<hr class="header-bottom-divider" style="border: 0.620315px solid #E8E8E8;" /> <hr class="header-bottom-divider" style="border: 0.620315px solid #E8E8E8;" />
</div> </div>
<div class="content-wrapper"> <div class="content-wrapper">
<div style="padding-top: 30px"> <div style="padding-top: 30px">
<div class="company-address-container company-address"> <div class="company-address-container company-address">
@ -362,15 +366,15 @@
<table> <table>
<tr> <tr>
<td class="attribute-label">@lang('pdf_invoice_number')</td> <td class="attribute-label">@lang('pdf_invoice_number')</td>
<td class="attribute-value"> &nbsp;{{$invoice->invoice_number}}</td> <td class="attribute-value"> &nbsp;{{ $invoice->invoice_number }}</td>
</tr> </tr>
<tr> <tr>
<td class="attribute-label">@lang('pdf_invoice_date')</td> <td class="attribute-label">@lang('pdf_invoice_date')</td>
<td class="attribute-value"> &nbsp;{{$invoice->formattedInvoiceDate}}</td> <td class="attribute-value"> &nbsp;{{ $invoice->formattedInvoiceDate }}</td>
</tr> </tr>
<tr> <tr>
<td class="attribute-label">@lang('pdf_invoice_due_date')</td> <td class="attribute-label">@lang('pdf_invoice_due_date')</td>
<td class="attribute-value"> &nbsp;{{$invoice->formattedDueDate}}</td> <td class="attribute-value"> &nbsp;{{ $invoice->formattedDueDate }}</td>
</tr> </tr>
</table> </table>
</div> </div>
@ -379,15 +383,15 @@
</div> </div>
<div class="billing-address-container billing-address"> <div class="billing-address-container billing-address">
@if($billing_address) @if ($billing_address)
<b>@lang('pdf_bill_to')</b> <br> <b>@lang('pdf_bill_to')</b> <br>
{!! $billing_address !!} {!! $billing_address !!}
@endif @endif
</div> </div>
<div class="shipping-address-container shipping-address" @if($billing_address !=='</br>' ) style="float:left;" @else style="display:block; float:left: padding-left: 0px;" @endif> <div class="shipping-address-container shipping-address" @if ($billing_address !== '</br>') style="float:left;" @else style="display:block; float:left: padding-left: 0px;" @endif>
@if($shipping_address) @if ($shipping_address)
<b>@lang('pdf_ship_to')</b> <br> <b>@lang('pdf_ship_to')</b> <br>
{!! $shipping_address !!} {!! $shipping_address !!}
@ -399,7 +403,7 @@
</div> </div>
<div class="notes"> <div class="notes">
@if($notes) @if ($notes)
<div class="notes-label"> <div class="notes-label">
@lang('pdf_notes') @lang('pdf_notes')
</div> </div>

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

@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<title>@lang('pdf_invoice_label') - {{$invoice->invoice_number}}</title> <title>@lang('pdf_invoice_label') - {{ $invoice->invoice_number }}</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<style type="text/css"> <style type="text/css">
/* -- Base -- */ /* -- Base -- */
@ -14,6 +14,7 @@
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
margin-top: 50px; margin-top: 50px;
margin-bottom: 25px;
} }
table { table {
@ -38,7 +39,6 @@
} }
.header-section-left { .header-section-left {
padding-top: 45px;
padding-bottom: 45px; padding-bottom: 45px;
padding-left: 30px; padding-left: 30px;
display: inline-block; display: inline-block;
@ -46,10 +46,11 @@
} }
.header-logo { .header-logo {
padding-top: 45px;
position: absolute; position: absolute;
height: 50px;
text-transform: capitalize; text-transform: capitalize;
color: #fff; color: #fff;
} }
.header-section-right { .header-section-right {
@ -256,12 +257,13 @@
} }
.total-display-table { .total-display-table {
border-top: none;
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-top: 20px;
border: 1px solid #EAF1FB; float: right;
border-top: none; width: auto;
} }
.total-table-attribute-label { .total-table-attribute-label {
@ -373,6 +375,7 @@
.pl-0 { .pl-0 {
padding-left: 0; padding-left: 0;
} }
</style> </style>
</head> </head>
@ -380,22 +383,20 @@
<div class="header-container"> <div class="header-container">
<table width="100%"> <table width="100%">
<tr> <tr>
@if($logo) <td width="60%" class="header-section-left">
<td width="60%" class="header-section-left"> @if ($logo)
<img class="header-logo" src="{{ $logo }}" alt="Company Logo"> <img class="header-logo" src="{{ $logo }}" alt="Company Logo" style="height: 50px;">
</td> @elseif ($invoice->customer->company)
@else <h1 class="header-logo" style="padding-top: 0px;">
<td width="60%" class="header-section-left" style="padding-top: 0px;"> {{ $invoice->customer->company->name }}
@if($invoice->customer->company) </h1>
<h1 class="header-logo"> {{$invoice->customer->company->name}} </h1> @endif
@endif </td>
</td>
@endif
<td width="40%" class="header-section-right invoice-details-container"> <td width="40%" class="header-section-right invoice-details-container">
<h1>@lang('pdf_invoice_label')</h1> <h1>@lang('pdf_invoice_label')</h1>
<h4>{{$invoice->invoice_number}}</h4> <h4>{{ $invoice->invoice_number }}</h4>
<h4>{{$invoice->formattedInvoiceDate}}</h4> <h4>{{ $invoice->formattedInvoiceDate }}</h4>
</td> </td>
</tr> </tr>
</table> </table>
@ -409,9 +410,9 @@
{!! $company_address !!} {!! $company_address !!}
</div> </div>
@if($shipping_address !== '</br>') @if ($shipping_address !== '</br>')
<div class="shipping-address-container shipping-address"> <div class="shipping-address-container shipping-address">
@if($shipping_address) @if ($shipping_address)
<b>@lang('pdf_ship_to')</b> <br> <b>@lang('pdf_ship_to')</b> <br>
{!! $shipping_address !!} {!! $shipping_address !!}
@endif @endif
@ -419,8 +420,8 @@
@endif @endif
<div class="billing-address-container billing-address" @if($shipping_address === '</br>') style="float:right; margin-right:30px;" @endif> <div class="billing-address-container billing-address" @if ($shipping_address === '</br>') style="float:right; margin-right:30px;" @endif>
@if($billing_address) @if ($billing_address)
<b>@lang('pdf_bill_to')</b> <br> <b>@lang('pdf_bill_to')</b> <br>
{!! $billing_address !!} {!! $billing_address !!}
@endif @endif
@ -432,7 +433,7 @@
@include('app.pdf.invoice.partials.table') @include('app.pdf.invoice.partials.table')
<div class="notes"> <div class="notes">
@if($notes) @if ($notes)
<div class="notes-label"> <div class="notes-label">
@lang('pdf_notes') @lang('pdf_notes')
</div> </div>

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

@ -36,7 +36,7 @@
} }
.header-logo { .header-logo {
height: 50px;
text-transform: capitalize; text-transform: capitalize;
color: #817AE3; color: #817AE3;
padding-top: 0px; padding-top: 0px;
@ -44,8 +44,8 @@
.company-address-container { .company-address-container {
width: 50%; width: 50%;
padding-left: 80px;
margin-bottom: 2px; margin-bottom: 2px;
padding-right: 60px;
} }
.company-address { .company-address {
@ -187,11 +187,13 @@
.total-display-table { .total-display-table {
border-top: none;
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-top: 20px; margin-top: 20px;
float: right;
width: auto;
} }
.total-table-attribute-label { .total-table-attribute-label {
@ -311,7 +313,7 @@
<tr> <tr>
<td width="50%" class="header-section-left"> <td width="50%" class="header-section-left">
@if($logo) @if($logo)
<img class="header-logo" src="{{ $logo }}" alt="Company Logo"> <img class="header-logo" style="height: 50px;" src="{{ $logo }}" alt="Company Logo">
@else @else
<h1 class="header-logo"> {{$invoice->customer->company->name}} </h1> <h1 class="header-logo"> {{$invoice->customer->company->name}} </h1>
@endif @endif

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

@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<title>@lang('pdf_payment_label') - {{$payment->payment_number}}</title> <title>@lang('pdf_payment_label') - {{ $payment->payment_number }}</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<style type="text/css"> <style type="text/css">
@ -15,6 +15,7 @@
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
margin-top: 50px; margin-top: 50px;
margin-bottom: 50px;
} }
table { table {
@ -24,6 +25,7 @@
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: 50px 0px;
} }
/* -- Heeader -- */ /* -- Heeader -- */
@ -48,7 +50,6 @@
.header-logo { .header-logo {
/* position: absolute; */ /* position: absolute; */
height: 50px;
text-transform: capitalize; text-transform: capitalize;
color: #817AE3; color: #817AE3;
padding-top: 0px; padding-top: 0px;
@ -62,9 +63,9 @@
} }
/* .header-section-right { /* .header-section-right {
display:inline-block; display: inline-block;
position: absolute; position: absolute;
right:0; right: 0;
padding: 15px 30px 15px 0px; padding: 15px 30px 15px 0px;
float: right; float: right;
} */ } */
@ -92,9 +93,10 @@
} }
.company-address { .company-address {
/* margin-top: 12px; */ margin-top: 0px;
font-size: 12px; font-size: 12px;
line-height: 15px; line-height: 15px;
padding-right: 60px;
color: #595959; color: #595959;
word-wrap: break-word; word-wrap: break-word;
} }
@ -181,10 +183,10 @@
.payment-details-container { .payment-details-container {
display: inline; display: inline;
position: absolute; position: absolute;
float: right;
width: 40%; width: 40%;
height: 120px; height: 120px;
padding: 5px 30px 0 0; left: 440px;
padding: 5px 10px 0 0;
} }
.attribute-label { .attribute-label {
@ -205,11 +207,11 @@
.notes { .notes {
font-size: 12px; font-size: 12px;
color: #595959; color: #595959;
margin-top: 15px; margin-top: 100px;
margin-left: 30px; margin-left: 30px;
width: 442px; width: 90%;
text-align: left; text-align: left;
page-break-inside: avoid; page-break-before: avoid;
} }
.notes-label { .notes-label {
@ -245,7 +247,7 @@
/* -- Total Display Box -- */ /* -- Total Display Box -- */
.total-display-box { .total-display-box {
width: 315px; min-width: 315px;
display: block; display: block;
margin-right: 30px; margin-right: 30px;
background: #F9FBFF; background: #F9FBFF;
@ -270,7 +272,9 @@
line-height: 21px; line-height: 21px;
text-align: right; text-align: right;
color: #5851D8; color: #5851D8;
margin-left: 150px;
} }
</style> </style>
</head> </head>
@ -278,15 +282,15 @@
<div class="header-container"> <div class="header-container">
<table width="100%"> <table width="100%">
<tr> <tr>
@if($logo) @if ($logo)
<td width="50%" class="header-section-left"> <td width="50%" class="header-section-left">
<img class="header-logo" src="{{ $logo }}" alt="Company Logo"> <img style="height: 50px;" class="header-logo" src="{{ $logo }}" alt="Company Logo">
@else @else
@if($payment->customer) @if ($payment->customer)
<td class="header-section-left" style="padding-top:0px;"> <td class="header-section-left" style="padding-top:0px;">
<h1 class="header-logo"> {{$payment->customer->company->name}} </h1> <h1 class="header-logo"> {{ $payment->customer->company->name }} </h1>
@endif @endif
@endif @endif
</td> </td>
<td width="50%" class="header-section-right company-details company-address"> <td width="50%" class="header-section-right company-details company-address">
{!! $company_address !!} {!! $company_address !!}
@ -305,9 +309,9 @@
<div class="main-content"> <div class="main-content">
<div class="customer-address-container"> <div class="customer-address-container">
<div class="billing-address-container billing-address"> <div class="billing-address-container billing-address">
@if($billing_address) @if ($billing_address)
@lang('pdf_received_from') @lang('pdf_received_from')
{!! $billing_address !!} {!! $billing_address !!}
@endif @endif
</div> </div>
<div class="billing-address-container--right"> <div class="billing-address-container--right">
@ -319,21 +323,22 @@
<table width="100%"> <table width="100%">
<tr> <tr>
<td class="attribute-label">@lang('pdf_payment_date')</td> <td class="attribute-label">@lang('pdf_payment_date')</td>
<td class="attribute-value"> &nbsp;{{$payment->formattedPaymentDate}}</td> <td class="attribute-value"> &nbsp;{{ $payment->formattedPaymentDate }}</td>
</tr> </tr>
<tr> <tr>
<td class="attribute-label">@lang('pdf_payment_number')</td> <td class="attribute-label">@lang('pdf_payment_number')</td>
<td class="attribute-value"> &nbsp;{{$payment->payment_number}}</td> <td class="attribute-value"> &nbsp;{{ $payment->payment_number }}</td>
</tr> </tr>
<tr> <tr>
<td class="attribute-label">@lang('pdf_payment_mode')</td> <td class="attribute-label">@lang('pdf_payment_mode')</td>
<td class="attribute-value"> &nbsp;{{$payment->paymentMethod ? $payment->paymentMethod->name : '-'}}</td> <td class="attribute-value">
&nbsp;{{ $payment->paymentMethod ? $payment->paymentMethod->name : '-' }}</td>
</tr> </tr>
@if ($payment->invoice && $payment->invoice->invoice_number) @if ($payment->invoice && $payment->invoice->invoice_number)
<tr> <tr>
<td class="attribute-label">@lang('pdf_invoice_label')</td> <td class="attribute-label">@lang('pdf_invoice_label')</td>
<td class="attribute-value"> &nbsp;{{$payment->invoice->invoice_number}}</td> <td class="attribute-value"> &nbsp;{{ $payment->invoice->invoice_number }}</td>
</tr> </tr>
@endif @endif
</table> </table>
</div> </div>
@ -344,6 +349,14 @@
<p class="total-display-label">@lang('pdf_payment_amount_received_label')</p> <p class="total-display-label">@lang('pdf_payment_amount_received_label')</p>
<span class="amount">{!! format_money_pdf($payment->amount, $payment->customer->currency) !!}</span> <span class="amount">{!! format_money_pdf($payment->amount, $payment->customer->currency) !!}</span>
</div> </div>
<div class="notes">
@if ($notes)
<div class="notes-label">
@lang('pdf_notes')
</div>
{!! $notes !!}
@endif
</div>
</body> </body>
</html> </html>