diff --git a/resources/views/app/pdf/estimate/estimate1.blade.php b/resources/views/app/pdf/estimate/estimate1.blade.php index c50a5153..00a699b1 100644 --- a/resources/views/app/pdf/estimate/estimate1.blade.php +++ b/resources/views/app/pdf/estimate/estimate1.blade.php @@ -1,8 +1,9 @@ + Estimate - + +
@@ -398,16 +365,16 @@
@if($logo) - + @else - @if($estimate->user->company) - - @endif + @if($estimate->user->company) + + @endif @endif
- - + + - - + + - - + +
Estimate Number  {{$estimate->estimate_number}}Estimate Number  {{$estimate->estimate_number}}
Estimate Date  {{$estimate->formattedEstimateDate}}Estimate Date  {{$estimate->formattedEstimateDate}}
Expiry Date  {{$estimate->formattedExpiryDate}}Expiry Date  {{$estimate->formattedExpiryDate}}
@@ -418,18 +385,19 @@ @include('app.pdf.estimate.partials.billing-address') @if($estimate->user->billingaddress) -
- @else +
+ @else
- @endif - @include('app.pdf.estimate.partials.shipping-address') + @endif + @include('app.pdf.estimate.partials.shipping-address') +
+
-
+
+ @include('app.pdf.estimate.partials.table') +
+ @include('app.pdf.estimate.partials.notes')
-
- @include('app.pdf.estimate.partials.table') -
- @include('app.pdf.estimate.partials.notes') - - + + \ No newline at end of file diff --git a/resources/views/app/pdf/estimate/estimate2.blade.php b/resources/views/app/pdf/estimate/estimate2.blade.php index 8e14fa36..5d2d489f 100644 --- a/resources/views/app/pdf/estimate/estimate2.blade.php +++ b/resources/views/app/pdf/estimate/estimate2.blade.php @@ -1,8 +1,9 @@ + Estimate - + +
@if($logo) -
- - @else - - @if($estimate->user->company) -

{{$estimate->user->company->name}}

- @endif - @endif + 		+ + @else + + @if($estimate->user->company) +

{{$estimate->user->company->name}}

+ @endif + @endif

Estimate

@@ -434,16 +408,17 @@ @include('app.pdf.estimate.partials.shipping-address') @if($estimate->user->shippingaddress) -
- @else +
+ @else
- @endif - @include('app.pdf.estimate.partials.billing-address') + @endif + @include('app.pdf.estimate.partials.billing-address') +
+
-
+ @include('app.pdf.estimate.partials.table') + @include('app.pdf.estimate.partials.notes')
- @include('app.pdf.estimate.partials.table') - @include('app.pdf.estimate.partials.notes') - - + + \ No newline at end of file diff --git a/resources/views/app/pdf/estimate/estimate3.blade.php b/resources/views/app/pdf/estimate/estimate3.blade.php index 2d0da68d..c35f4142 100644 --- a/resources/views/app/pdf/estimate/estimate3.blade.php +++ b/resources/views/app/pdf/estimate/estimate3.blade.php @@ -1,8 +1,9 @@ + Estimate - + +
@if($logo) -
+ - @else + @else @if($estimate->user->company) - -

{{$estimate->user->company->name}}

+ 		+

{{$estimate->user->company->name}}

+ @endif @endif - @endif 		@include('app.pdf.estimate.partials.company-address') @@ -432,36 +413,37 @@
@include('app.pdf.estimate.partials.billing-address')
- @if($estimate->user->billingaddress) -
- @else + @if($estimate->user->billingaddress) +
+ @else
- @endif - @include('app.pdf.estimate.partials.shipping-address') + @endif + @include('app.pdf.estimate.partials.shipping-address') +
+
+
+ +
+ + + + + + + + + + + + + +
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}}
-
-
+ @include('app.pdf.estimate.partials.table') + @include('app.pdf.estimate.partials.notes') - @include('app.pdf.estimate.partials.table') - @include('app.pdf.estimate.partials.notes') - - + + \ No newline at end of file diff --git a/resources/views/app/pdf/estimate/partials/table.blade.php b/resources/views/app/pdf/estimate/partials/table.blade.php index b5c1dee5..7d5f9ed4 100644 --- a/resources/views/app/pdf/estimate/partials/table.blade.php +++ b/resources/views/app/pdf/estimate/partials/table.blade.php @@ -1,27 +1,27 @@ - - - - - + + + + + @if($estimate->discount_per_item === 'YES') - + @endif - + @php $index = 1 @endphp @foreach ($estimate->items as $item) - + @if($estimate->discount_per_item === 'YES') - @endif - @@ -68,7 +68,7 @@
#ItemsQuantityPrice
#ItemsQuantityPriceDiscountDiscountAmountAmount
{{$index}} {{ $item->name }}
@@ -32,19 +32,19 @@ 		{{$item->quantity}} {!! format_money_pdf($item->price, $estimate->user->currency) !!} + @if($item->discount_type === 'fixed') {!! format_money_pdf($item->discount_val, $estimate->user->currency) !!} @endif @@ -53,7 +53,7 @@ @endif + {!! format_money_pdf($item->total, $estimate->user->currency) !!}
- @@ -78,7 +78,7 @@ - @@ -89,7 +89,7 @@ - @@ -106,7 +106,7 @@ Discount ({{$estimate->discount}}%) @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') {!! format_money_pdf($estimate->discount_val, $estimate->user->currency) !!} @endif @@ -127,7 +127,7 @@ {!! 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 801ec366..5a811ca6 100644 --- a/resources/views/app/pdf/invoice/invoice1.blade.php +++ b/resources/views/app/pdf/invoice/invoice1.blade.php @@ -6,6 +6,7 @@ +
@if($logo) -
- - @else - - @if($invoice->user->company) -

{{$invoice->user->company->name}}

- @endif - @endif + 		+ + @else + + @if($invoice->user->company) +

{{$invoice->user->company->name}}

+ @endif + @endif

Invoice

@@ -435,16 +408,17 @@ @include('app.pdf.invoice.partials.shipping-address') @if($invoice->user->shippingaddress) -
- @else +
+ @else
- @endif - @include('app.pdf.invoice.partials.billing-address') + @endif + @include('app.pdf.invoice.partials.billing-address') +
+
-
+ @include('app.pdf.invoice.partials.table') + @include('app.pdf.invoice.partials.notes')
- @include('app.pdf.invoice.partials.table') - @include('app.pdf.invoice.partials.notes') - - + + \ No newline at end of file diff --git a/resources/views/app/pdf/invoice/invoice3.blade.php b/resources/views/app/pdf/invoice/invoice3.blade.php index 56eed9cd..1e602bf0 100644 --- a/resources/views/app/pdf/invoice/invoice3.blade.php +++ b/resources/views/app/pdf/invoice/invoice3.blade.php @@ -1,9 +1,9 @@ + Invoice - {{-- --}} - + +
- @if($logo) -
+ + @if($logo) @else - @if($invoice->user->company) - -

{{$invoice->user->company->name}}

- @endif +

{{$invoice->user->company->name}}

@endif 		@@ -444,35 +426,36 @@ @include('app.pdf.invoice.partials.billing-address') @if($invoice->user->billingaddress) -
- @else +
+ @else
- @endif - @include('app.pdf.invoice.partials.shipping-address') + @endif + @include('app.pdf.invoice.partials.shipping-address') +
+
+
+ +
+ + + + + + + + + + + + + +
Invoice Number  {{$invoice->invoice_number}}
Invoice Date  {{$invoice->formattedInvoiceDate}}
Due date  {{$invoice->formattedDueDate}}
- -
- - - - - - - - - - - - - -
Invoice Number  {{$invoice->invoice_number}}
Invoice Date  {{$invoice->formattedInvoiceDate}}
Due date  {{$invoice->formattedDueDate}}
-
-
+ @include('app.pdf.invoice.partials.table') + @include('app.pdf.invoice.partials.notes') - @include('app.pdf.invoice.partials.table') - @include('app.pdf.invoice.partials.notes') - - + + \ No newline at end of file diff --git a/resources/views/app/pdf/invoice/partials/company-address.blade.php b/resources/views/app/pdf/invoice/partials/company-address.blade.php index f45249ce..fcf47212 100644 --- a/resources/views/app/pdf/invoice/partials/company-address.blade.php +++ b/resources/views/app/pdf/invoice/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/invoice/partials/shipping-address.blade.php b/resources/views/app/pdf/invoice/partials/shipping-address.blade.php index 7a80dc80..3cd2abb6 100644 --- a/resources/views/app/pdf/invoice/partials/shipping-address.blade.php +++ b/resources/views/app/pdf/invoice/partials/shipping-address.blade.php @@ -30,7 +30,7 @@ {{$invoice->user->shippingaddress->country->name}}
@endif - @if($invoice->user->phone) + @if($invoice->user->shippingaddress->phone)

Phone :{{$invoice->user->shippingaddress->phone}}

diff --git a/resources/views/app/pdf/invoice/partials/table.blade.php b/resources/views/app/pdf/invoice/partials/table.blade.php index 95874846..a2a74ebe 100644 --- a/resources/views/app/pdf/invoice/partials/table.blade.php +++ b/resources/views/app/pdf/invoice/partials/table.blade.php @@ -1,46 +1,46 @@ - - - - - + + + + + @if($invoice->discount_per_item === 'YES') - + @endif - + @php $index = 1 @endphp @foreach ($invoice->items as $item) - + @if($invoice->discount_per_item === 'YES') - @endif
#ItemsQuantityPrice
#ItemsQuantityPriceDiscountDiscountAmountAmount
{{$index}} {{ $item->name }}
{!! nl2br(htmlspecialchars($item->description)) !!} 		{{$item->quantity}} {!! format_money_pdf($item->price, $invoice->user->currency) !!} + @if($item->discount_type === 'fixed') {!! format_money_pdf($item->discount_val, $invoice->user->currency) !!} @endif @@ -50,7 +50,7 @@ {!! format_money_pdf($item->total, $invoice->user->currency) !!} @@ -62,12 +62,12 @@ @endforeach
-
+
- @@ -77,7 +77,7 @@ - @@ -88,7 +88,7 @@ - @@ -105,7 +105,7 @@ Discount ({{$invoice->discount}}%) @endif -
Subtotal{!! format_money_pdf($invoice->sub_total, $invoice->user->currency) !!}
{{$labels[$i]}} + {!! format_money_pdf($taxes[$i], $invoice->user->currency) !!}
{{$tax->name.' ('.$tax->percent.'%)'}} + {!! format_money_pdf($tax->amount, $invoice->user->currency) !!}
+ @if($invoice->discount_type === 'fixed') {!! format_money_pdf($invoice->discount_val, $invoice->user->currency) !!} @endif @@ -126,7 +126,7 @@ {!! format_money_pdf($invoice->total, $invoice->user->currency)!!} diff --git a/resources/views/app/pdf/payment/payment.blade.php b/resources/views/app/pdf/payment/payment.blade.php index f7854884..b3140e70 100644 --- a/resources/views/app/pdf/payment/payment.blade.php +++ b/resources/views/app/pdf/payment/payment.blade.php @@ -2,7 +2,6 @@ Invoice - {{-- --}}