| Estimate Number | +{{$estimate->estimate_number}} | +
| Estimate Date | +{{$estimate->formattedEstimateDate}} | +
| Expiry Date | +{{$estimate->formattedExpiryDate}} | +
| Estimate Number | -{{$estimate->estimate_number}} | -
| Estimate Date | -{{$estimate->formattedEstimateDate}} | -
| Expiry Date | -{{$estimate->formattedExpiryDate}} | -
Bill To,
+Bill To,
@if($estimate->user->billingaddress->name) -+
{{$estimate->user->billingaddress->name}}
@endif -+
@if($estimate->user->billingaddress->address_street_1)
{!! nl2br(htmlspecialchars($estimate->user->billingaddress->address_street_1)) !!}
@endif
@@ -31,7 +31,7 @@
@endif
@if($estimate->user->billingaddress->phone)
-
+
Phone :{{$estimate->user->billingaddress->phone}}
@endif diff --git a/resources/views/app/pdf/estimate/partials/company-address.blade.php b/resources/views/app/pdf/estimate/partials/company-address.blade.php index f6cdb5c6..cd755178 100644 --- a/resources/views/app/pdf/estimate/partials/company-address.blade.php +++ b/resources/views/app/pdf/estimate/partials/company-address.blade.php @@ -3,7 +3,7 @@ @endif @if($company_address) -+
@if($company_address->addresses[0]['address_street_1'])
{!! nl2br(htmlspecialchars($company_address->addresses[0]['address_street_1'])) !!}
@endif
diff --git a/resources/views/app/pdf/estimate/partials/shipping-address.blade.php b/resources/views/app/pdf/estimate/partials/shipping-address.blade.php
index 90d34531..a7ccd6a3 100644
--- a/resources/views/app/pdf/estimate/partials/shipping-address.blade.php
+++ b/resources/views/app/pdf/estimate/partials/shipping-address.blade.php
@@ -1,11 +1,11 @@
@if($estimate->user->shippingaddress)
-
Ship To,
+Ship To,
@if($estimate->user->shippingaddress->name) -+
{{$estimate->user->shippingaddress->name}}
@endif -+
@if($estimate->user->shippingaddress->address_street_1)
{!! nl2br(htmlspecialchars($estimate->user->shippingaddress->address_street_1)) !!}
@endif
@@ -30,8 +30,8 @@
{{$estimate->user->shippingaddress->country->name}}
@endif
- @if($estimate->user->phone)
-
+ @if($estimate->user->shippingAddress->phone) +
Phone :{{$estimate->user->shippingaddress->phone}}
@endif diff --git a/resources/views/app/pdf/estimate/partials/table.blade.php b/resources/views/app/pdf/estimate/partials/table.blade.php index b5c1dee5..3e8934a6 100644 --- a/resources/views/app/pdf/estimate/partials/table.blade.php +++ b/resources/views/app/pdf/estimate/partials/table.blade.php @@ -1,50 +1,49 @@ -| # | -Items | -Quantity | -Price | +
|---|
| # | +Items | +Quantity | +Price | @if($estimate->discount_per_item === 'YES') -Discount | +Discount | @endif -Amount | +Amount |
|---|---|---|---|---|---|---|---|
| {{$index}} |
{{ $item->name }} {!! nl2br(htmlspecialchars($item->description)) !!} |
{{$item->quantity}} | {!! format_money_pdf($item->price, $estimate->user->currency) !!} | @if($estimate->discount_per_item === 'YES') -+ | @if($item->discount_type === 'fixed') {!! format_money_pdf($item->discount_val, $estimate->user->currency) !!} @endif @@ -53,7 +52,7 @@ @endif | @endif -+ | {!! format_money_pdf($item->total, $estimate->user->currency) !!} |
+
-
| Subtotal | -{!! format_money_pdf($estimate->sub_total, $estimate->user->currency) !!} | -||
| - {{$labels[$i]}} - | -- {!! format_money_pdf($taxes[$i], $estimate->user->currency) !!} - | -||
| - {{$tax->name.' ('.$tax->percent.'%)'}} - | -- {!! format_money_pdf($tax->amount, $estimate->user->currency) !!} - | -
| - @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) !!} | +
| + {{$labels[$i]}} + | ++ {!! format_money_pdf($taxes[$i], $estimate->user->currency) !!} + | +||
| + {{$tax->name.' ('.$tax->percent.'%)'}} + | ++ {!! format_money_pdf($tax->amount, $estimate->user->currency) !!} + | +||
| + @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 + | +||
| + | + | ||
| Total | ++ {!! format_money_pdf($estimate->total, $estimate->user->currency)!!} | ||
| - | - | ||
| - - | -- {!! format_money_pdf($estimate->total, $estimate->user->currency)!!} - | -
| + |
@if($logo)
- {{$invoice->user->company->name}}- @endif + @if($invoice->user->company) +{{$invoice->user->company->name}}+ @endif @endif |
+
| Invoice Number | -{{$invoice->invoice_number}} | +Invoice Number | +{{$invoice->invoice_number}} |
| Invoice Date | -{{$invoice->formattedInvoiceDate}} | +Invoice Date | +{{$invoice->formattedInvoiceDate}} |
| Due date | -{{$invoice->formattedDueDate}} | +Due date | +{{$invoice->formattedDueDate}} |