From 1debb52997a7aa22b9a7aadf7d3c6f0784ff605e Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 28 Mar 2017 11:40:42 +0300 Subject: [PATCH] Remove newline from end of CSV exports --- resources/views/export.blade.php | 13 ++++++++++++- resources/views/export/clients.blade.php | 2 -- resources/views/export/contacts.blade.php | 2 -- resources/views/export/credits.blade.php | 2 -- resources/views/export/expenses.blade.php | 2 -- resources/views/export/invoices.blade.php | 2 -- resources/views/export/payments.blade.php | 2 -- resources/views/export/products.blade.php | 2 -- resources/views/export/recurring_invoices.blade.php | 2 -- resources/views/export/tasks.blade.php | 2 -- resources/views/export/vendor_contacts.blade.php | 2 -- resources/views/export/vendors.blade.php | 2 -- 12 files changed, 12 insertions(+), 23 deletions(-) diff --git a/resources/views/export.blade.php b/resources/views/export.blade.php index 668ed9c6df..7c43d59e7f 100644 --- a/resources/views/export.blade.php +++ b/resources/views/export.blade.php @@ -3,64 +3,75 @@ {{ $title }} - @if (isset($clients) && $clients && count($clients)) + {{ strtoupper(trans('texts.clients')) }} @include('export.clients') @endif @if (isset($contacts) && $contacts && count($contacts)) + {{ strtoupper(trans('texts.contacts')) }} @include('export.contacts') @endif @if (isset($credits) && $credits && count($credits)) + {{ strtoupper(trans('texts.credits')) }} @include('export.credits') @endif @if (isset($tasks) && $tasks && count($tasks)) + {{ strtoupper(trans('texts.tasks')) }} @include('export.tasks') @endif @if (isset($invoices) && $invoices && count($invoices)) + {{ strtoupper(trans('texts.invoices')) }} @include('export.invoices') @endif @if (isset($quotes) && $quotes && count($quotes)) + {{ strtoupper(trans('texts.quotes')) }} @include('export.invoices', ['invoices' => $quotes, 'entityType' => ENTITY_QUOTE]) @endif @if (isset($recurringInvoices) && $recurringInvoices && count($recurringInvoices)) + {{ strtoupper(trans('texts.recurring_invoices')) }} @include('export.recurring_invoices', ['entityType' => ENTITY_RECURRING_INVOICE]) @endif @if (isset($payments) && $payments && count($payments)) + {{ strtoupper(trans('texts.payments')) }} @include('export.payments') @endif @if (isset($products) && $products && count($products)) + {{ strtoupper(trans('texts.products')) }} @include('export.products') @endif @if (isset($expenses) && $expenses && count($expenses)) + {{ strtoupper(trans('texts.expenses')) }} @include('export.expenses') @endif @if (isset($vendors) && $vendors && count($vendors)) + {{ strtoupper(trans('texts.vendors')) }} @include('export.vendors') @endif @if (isset($vendor_contacts) && $vendor_contacts && count($vendor_contacts)) + {{ strtoupper(trans('texts.vendor_contacts')) }} @include('export.vendor_contacts') @endif diff --git a/resources/views/export/clients.blade.php b/resources/views/export/clients.blade.php index c15152c903..d2ad3c95ce 100644 --- a/resources/views/export/clients.blade.php +++ b/resources/views/export/clients.blade.php @@ -49,5 +49,3 @@ @endif @endforeach - - diff --git a/resources/views/export/contacts.blade.php b/resources/views/export/contacts.blade.php index b35f59045a..60690100fa 100644 --- a/resources/views/export/contacts.blade.php +++ b/resources/views/export/contacts.blade.php @@ -23,5 +23,3 @@ @endif @endforeach - - \ No newline at end of file diff --git a/resources/views/export/credits.blade.php b/resources/views/export/credits.blade.php index d47eba0570..4ed9a7b5f6 100644 --- a/resources/views/export/credits.blade.php +++ b/resources/views/export/credits.blade.php @@ -21,5 +21,3 @@ @endif @endforeach - - \ No newline at end of file diff --git a/resources/views/export/expenses.blade.php b/resources/views/export/expenses.blade.php index 947f2b508f..d1668eb6f7 100644 --- a/resources/views/export/expenses.blade.php +++ b/resources/views/export/expenses.blade.php @@ -25,5 +25,3 @@ {{ $expense->private_notes }} @endforeach - - diff --git a/resources/views/export/invoices.blade.php b/resources/views/export/invoices.blade.php index 9f5dc26b21..1e99f85b1b 100644 --- a/resources/views/export/invoices.blade.php +++ b/resources/views/export/invoices.blade.php @@ -55,5 +55,3 @@ @endif @endforeach - - diff --git a/resources/views/export/payments.blade.php b/resources/views/export/payments.blade.php index 779e9b5a04..81cee2297d 100644 --- a/resources/views/export/payments.blade.php +++ b/resources/views/export/payments.blade.php @@ -25,5 +25,3 @@ @endif @endforeach - - diff --git a/resources/views/export/products.blade.php b/resources/views/export/products.blade.php index fd96f9530d..4d44ee3808 100644 --- a/resources/views/export/products.blade.php +++ b/resources/views/export/products.blade.php @@ -17,5 +17,3 @@ {{ $product->cost }} @endforeach - - diff --git a/resources/views/export/recurring_invoices.blade.php b/resources/views/export/recurring_invoices.blade.php index 0548c14b9b..8a57dc1c4a 100644 --- a/resources/views/export/recurring_invoices.blade.php +++ b/resources/views/export/recurring_invoices.blade.php @@ -51,5 +51,3 @@ @endif @endforeach - - \ No newline at end of file diff --git a/resources/views/export/tasks.blade.php b/resources/views/export/tasks.blade.php index 3cacc198b9..c5f48c89c0 100644 --- a/resources/views/export/tasks.blade.php +++ b/resources/views/export/tasks.blade.php @@ -21,5 +21,3 @@ @endif @endforeach - - \ No newline at end of file diff --git a/resources/views/export/vendor_contacts.blade.php b/resources/views/export/vendor_contacts.blade.php index 28b3b5381c..e4a8be4318 100644 --- a/resources/views/export/vendor_contacts.blade.php +++ b/resources/views/export/vendor_contacts.blade.php @@ -23,5 +23,3 @@ @endif @endforeach - - diff --git a/resources/views/export/vendors.blade.php b/resources/views/export/vendors.blade.php index 8f6aeacb52..13db2270f7 100644 --- a/resources/views/export/vendors.blade.php +++ b/resources/views/export/vendors.blade.php @@ -25,5 +25,3 @@ {{ $vendor->present()->country }} @endforeach - -