+
@endif
@include('app.pdf.estimate.partials.billing-address')
diff --git a/resources/views/app/pdf/estimate/estimate3.blade.php b/resources/views/app/pdf/estimate/estimate3.blade.php
index 6001ebf7..fbba4bc5 100644
--- a/resources/views/app/pdf/estimate/estimate3.blade.php
+++ b/resources/views/app/pdf/estimate/estimate3.blade.php
@@ -24,7 +24,6 @@
hr {
color: rgba(0, 0, 0, 0.2);
border: 0.5px solid #EAF1FB;
- margin: 0 30px 0 30px;
}
/* -- Header -- */
@@ -128,6 +127,7 @@
.shipping-address-container--left {
float: left;
+ padding-left: 0;
}
.shipping-address-label {
@@ -213,6 +213,7 @@
.items-table hr {
height: 0.1px;
+ margin: 0 30px;
}
.item-table-heading {
@@ -253,6 +254,10 @@
line-height: 12px;
}
+ .item-cell-table-hr {
+ margin: 0 30px 0 30px;
+ }
+
/* -- Total Display Table -- */
.total-display-container {
@@ -266,8 +271,6 @@
page-break-after: auto;
margin-left: 500px;
margin-top: 20px;
- border: 1px solid #EAF1FB;
- border-top: none;
}
.total-table-attribute-label {
diff --git a/resources/views/app/pdf/estimate/partials/table.blade.php b/resources/views/app/pdf/estimate/partials/table.blade.php
index f43b8667..3e8934a6 100644
--- a/resources/views/app/pdf/estimate/partials/table.blade.php
+++ b/resources/views/app/pdf/estimate/partials/table.blade.php
@@ -62,68 +62,68 @@
@endforeach
-
+
-
-
- | Subtotal |
- {!! format_money_pdf($estimate->sub_total, $estimate->user->currency) !!} |
-
-
- @if ($estimate->tax_per_item === 'YES')
- @for ($i = 0; $i < count($labels); $i++)
-
- |
- {{$labels[$i]}}
- |
-
- {!! format_money_pdf($taxes[$i], $estimate->user->currency) !!}
- |
-
- @endfor
- @else
- @foreach ($estimate->taxes as $tax)
-
- |
- {{$tax->name.' ('.$tax->percent.'%)'}}
- |
-
- {!! format_money_pdf($tax->amount, $estimate->user->currency) !!}
- |
-
- @endforeach
- @endif
-
- @if ($estimate->discount_per_item === 'NO')
+
- |
- @if($estimate->discount_type === 'fixed')
- Discount
- @endif
- @if($estimate->discount_type === 'percentage')
- Discount ({{$estimate->discount}}%)
- @endif
- |
-
- @if($estimate->discount_type === 'fixed')
- {!! format_money_pdf($estimate->discount_val, $estimate->user->currency) !!}
- @endif
- @if($estimate->discount_type === 'percentage')
- {!! format_money_pdf($estimate->discount_val, $estimate->user->currency) !!}
- @endif
+ | Subtotal |
+ {!! format_money_pdf($estimate->sub_total, $estimate->user->currency) !!} |
+
+
+ @if ($estimate->tax_per_item === 'YES')
+ @for ($i = 0; $i < count($labels); $i++)
+
+ |
+ {{$labels[$i]}}
+ |
+
+ {!! format_money_pdf($taxes[$i], $estimate->user->currency) !!}
+ |
+
+ @endfor
+ @else
+ @foreach ($estimate->taxes as $tax)
+
+ |
+ {{$tax->name.' ('.$tax->percent.'%)'}}
+ |
+
+ {!! format_money_pdf($tax->amount, $estimate->user->currency) !!}
+ |
+
+ @endforeach
+ @endif
+
+ @if ($estimate->discount_per_item === 'NO')
+
+ |
+ @if($estimate->discount_type === 'fixed')
+ Discount
+ @endif
+ @if($estimate->discount_type === 'percentage')
+ Discount ({{$estimate->discount}}%)
+ @endif
+ |
+
+ @if($estimate->discount_type === 'fixed')
+ {!! format_money_pdf($estimate->discount_val, $estimate->user->currency) !!}
+ @endif
+ @if($estimate->discount_type === 'percentage')
+ {!! format_money_pdf($estimate->discount_val, $estimate->user->currency) !!}
+ @endif
+ |
+
+ @endif
+
+ |
+ |
+
+
+ | Total |
+
+ {!! format_money_pdf($estimate->total, $estimate->user->currency)!!}
|
- @endif
-
- |
- |
-
-
- | Total |
-
- {!! format_money_pdf($estimate->total, $estimate->user->currency)!!}
- |
-
-
+
diff --git a/resources/views/app/pdf/invoice/invoice1.blade.php b/resources/views/app/pdf/invoice/invoice1.blade.php
index 7835ed1f..e2626ba9 100644
--- a/resources/views/app/pdf/invoice/invoice1.blade.php
+++ b/resources/views/app/pdf/invoice/invoice1.blade.php
@@ -123,7 +123,7 @@
}
.shipping-address-name {
- max-width: 250px;
+ max-width: 160px;
font-size: 15px;
line-height: 22px;
padding: 0px;
@@ -155,7 +155,7 @@
}
.billing-address-name {
- max-width: 250px;
+ max-width: 160px;
font-size: 15px;
line-height: 22px;
padding: 0px;
@@ -214,21 +214,23 @@
.item-description {
color: #595959;
font-size: 9px;
- font-weight:300;
line-height: 12px;
}
/* -- Total Display Table -- */
+ .total-display-container {
+ padding: 0 25px;
+ }
+
.total-display-table {
border-top: none;
box-sizing: border-box;
- width: 630px;
page-break-inside: avoid;
page-break-before: auto;
page-break-after: auto;
- margin-left: 420px;
- margin-top: 10px;
+ margin-left: 500px;
+ margin-top: 20px;
}
.total-table-attribute-label {
@@ -239,7 +241,7 @@
}
.total-table-attribute-value {
- font-weight: 500;
+ font-weight: bold;
text-align: right;
font-size: 13px;
color: #040405;
diff --git a/resources/views/app/pdf/invoice/invoice2.blade.php b/resources/views/app/pdf/invoice/invoice2.blade.php
index a1d72527..17f44db3 100644
--- a/resources/views/app/pdf/invoice/invoice2.blade.php
+++ b/resources/views/app/pdf/invoice/invoice2.blade.php
@@ -75,7 +75,6 @@
.invoice-details-container h1 {
margin: 0;
- font-weight: 500;
font-size: 24px;
line-height: 36px;
text-align: right;
@@ -200,7 +199,7 @@
/* -- Items Table -- */
.items-table {
- margin-top: 30px;
+ margin-top: 35px;
padding: 0px 30px 10px 30px;
page-break-before: avoid;
page-break-after: auto;
@@ -210,20 +209,12 @@
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 {
font-size: 13.5;
text-align: center;
color: rgba(0, 0, 0, 0.85);
padding: 5px;
+ color: #55547A;
}
tr.item-table-heading-row th {
@@ -239,24 +230,36 @@
.item-cell {
font-size: 13;
- color: #040405;
text-align: center;
padding: 5px;
padding-top: 10px;
+ color: #040405;
+ }
+
+ .item-description {
+ color: #595959;
+ font-size: 9px;
+ line-height: 12px;
}
/* -- Total Display Table -- */
+ .total-display-container {
+ padding: 0 25px;
+ }
+
+ .item-cell-table-hr {
+ margin: 0 25px 0 30px;
+ }
+
.total-display-table {
- border: 1px solid #EAF1FB;
- border-top: none;
box-sizing: border-box;
- width: 630px;
page-break-inside: avoid;
page-break-before: auto;
page-break-after: auto;
- margin-left:420px;
- margin-top: 10px
+ margin-left: 500px;
+ border: 1px solid #EAF1FB;
+ border-top: none;
}
.total-table-attribute-label {
diff --git a/resources/views/app/pdf/invoice/invoice3.blade.php b/resources/views/app/pdf/invoice/invoice3.blade.php
index e544345f..f75a8804 100644
--- a/resources/views/app/pdf/invoice/invoice3.blade.php
+++ b/resources/views/app/pdf/invoice/invoice3.blade.php
@@ -100,13 +100,12 @@
.content-wrapper {
display: block;
- padding-top: 50px;
+ padding-top: 100px;
padding-bottom: 20px;
}
.main-content {
- display: inline-block;
- padding-top: 100px;
+
}
.customer-address-container {
@@ -119,10 +118,13 @@
/* -- Shipping -- */
.shipping-address-container {
float:right;
+ display: block;
}
.shipping-address-container--left {
float:left;
+ display: block;
+ padding-left: 0;
}
.shipping-address-label {
@@ -137,6 +139,7 @@
font-size: 15px;
line-height: 22px;
margin: 0px;
+ max-width: 160px;
}
.shipping-address {
@@ -150,13 +153,12 @@
/* -- Billing -- */
.billing-address-container {
+ display: block;
float: left;
}
.billing-address-label {
padding-top: 5px;
-
-
font-size: 12px;
line-height: 18px;
margin-bottom: 0px;
@@ -167,6 +169,7 @@
font-size: 15px;
line-height: 22px;
margin: 0px;
+ max-width: 160px;
}
.billing-address {
@@ -201,6 +204,7 @@
/* -- Items Table -- */
.items-table {
+ margin-top: 35px;
padding: 0px 30px 10px 30px;
page-break-before: avoid;
page-break-after: auto;
@@ -208,19 +212,18 @@
.items-table hr {
height: 0.1px;
- margin: 0 30px 0 30px;
}
- .item-table-heading-row td {
- padding: 10px;
- }
-
- .item-table-heading-row {
- border-bottom: 1px solid red;
+ .item-table-heading {
+ font-size: 13.5;
+ text-align: center;
+ color: rgba(0, 0, 0, 0.85);
+ padding: 5px;
+ color: #55547A;
}
tr.item-table-heading-row th {
- font-weight: 600;
+ border-bottom: 0.620315px solid #E8E8E8;
font-size: 12px;
line-height: 18px;
}
@@ -230,32 +233,38 @@
line-height: 18px;
}
- .item-table-heading {
- font-size: 13.5;
- text-align: center;
- color: rgba(0, 0, 0, 0.85);
- padding: 5px;
- }
-
.item-cell {
font-size: 13;
- color: #040405;
text-align: center;
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-container {
+ padding: 0 25px;
+ }
+
+
.total-display-table {
- border: 1px solid #EAF1FB;
- border-top: none;
box-sizing: border-box;
- width: 630px;
page-break-inside: avoid;
page-break-before: auto;
page-break-after: auto;
- margin-left:420px;
- margin-top: 10px
+ margin-left: 500px;
+ margin-top: 20px;
}
.total-table-attribute-label {
@@ -266,7 +275,7 @@
}
.total-table-attribute-value {
- font-weight: 500;
+ font-weight: bold;
text-align: right;
font-size: 12px;
color: #040405;
@@ -275,6 +284,20 @@
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 {
font-size: 12px;
@@ -382,9 +405,9 @@