diff --git a/VERSION.txt b/VERSION.txt index 57ebcacf2c5b..097c041f2526 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.7.34 \ No newline at end of file +5.7.35 \ No newline at end of file diff --git a/app/Services/Pdf/PdfBuilder.php b/app/Services/Pdf/PdfBuilder.php index 7a496e17578b..d6df412c4213 100644 --- a/app/Services/Pdf/PdfBuilder.php +++ b/app/Services/Pdf/PdfBuilder.php @@ -652,7 +652,7 @@ class PdfBuilder /** * Formats the line items for display. * - * @param array<\App\DataMapper\InvoiceItem> $items + * @param array $items * @param string $table_type * * @return array @@ -662,10 +662,10 @@ class PdfBuilder $data = []; $locale_info = localeconv(); - - // $this->service->config->entity_currency = $this->service->config->currency; - + foreach ($items as $key => $item) { + /** @var \App\DataMapper\InvoiceItem $item */ + if ($table_type == '$product' && $item->type_id != 1) { if ($item->type_id != 4 && $item->type_id != 6 && $item->type_id != 5) { continue; @@ -980,7 +980,7 @@ class PdfBuilder return [ ['element' => 'div', 'properties' => ['style' => 'display: flex; flex-direction: column;'], 'elements' => [ ['element' => 'div', 'properties' => ['style' => 'margin-top: 1.5rem; display: block; align-items: flex-start; page-break-inside: avoid; visible !important;'], 'elements' => [ - ['element' => 'img', 'properties' => ['src' => '$invoiceninja.whitelabel', 'style' => 'height: 2.5rem;', 'hidden' => 'false', 'id' => 'invoiceninja-whitelabel-logo']], + ['element' => 'img', 'properties' => ['src' => '$invoiceninja.whitelabel', 'style' => 'height: 2.5rem;', 'hidden' => $this->service->company->account->isPaid() ? 'true' : 'false', 'id' => 'invoiceninja-whitelabel-logo']], ]], ]], ]; @@ -1052,7 +1052,7 @@ class PdfBuilder ]], ['element' => 'img', 'properties' => ['style' => 'max-width: 50%; height: auto;', 'src' => '$contact.signature', 'id' => 'contact-signature']], ['element' => 'div', 'properties' => ['style' => 'margin-top: 1.5rem; display: flex; align-items: flex-start; page-break-inside: auto;'], 'elements' => [ - ['element' => 'img', 'properties' => ['src' => '$invoiceninja.whitelabel', 'style' => 'height: 2.5rem;', 'hidden' => 'false', 'id' => 'invoiceninja-whitelabel-logo']], + ['element' => 'img', 'properties' => ['src' => '$invoiceninja.whitelabel', 'style' => 'height: 2.5rem;', 'hidden' => $this->service->company->account->isPaid() ? 'true' : 'false', 'id' => 'invoiceninja-whitelabel-logo']], ]], ]], ['element' => 'div', 'properties' => ['class' => 'totals-table-right-side', 'dir' => '$dir'], 'elements' => []], diff --git a/config/ninja.php b/config/ninja.php index b6801e5f61f6..52bcd06fbdd7 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -15,8 +15,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => env('APP_VERSION','5.7.34'), - 'app_tag' => env('APP_TAG','5.7.34'), + 'app_version' => env('APP_VERSION','5.7.35'), + 'app_tag' => env('APP_TAG','5.7.35'), 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''),