Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9436 from turbo124/v5-develop

Browse Source 
v5.8.44
This commit is contained in:
David Bomba 2024-04-05 19:15:24 +11:00 committed by GitHub
commit 13b59107f4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/react_release.yml vendored
View File

@ -49,7 +49,8 @@ jobs:
npm i npm i
npm run build npm run build
cp -r dist/* ../public/ cp -r dist/* ../public/
cp dist/index.html ../resources/views/react/index.blade.php
- name: Prepare JS/CSS assets - name: Prepare JS/CSS assets
run: | run: |
npm i npm i

3
.github/workflows/release.yml vendored
View File

@ -50,7 +50,8 @@ jobs:
mkdir -p ../public/react/${{ github.event.release.tag_name }}/ mkdir -p ../public/react/${{ github.event.release.tag_name }}/
cp -r dist/react/* ../public/react/${{ github.event.release.tag_name }}/ cp -r dist/react/* ../public/react/${{ github.event.release.tag_name }}/
cp -r dist/react/* ../public/react/ cp -r dist/react/* ../public/react/
cp dist/index.html ../resources/views/react/index.blade.php
mkdir -p ../public/tinymce_6.4.2/tinymce/js/ mkdir -p ../public/tinymce_6.4.2/tinymce/js/
cp -r node_modules/tinymce ../public/tinymce_6.4.2/tinymce/js/ cp -r node_modules/tinymce ../public/tinymce_6.4.2/tinymce/js/
cd .. cd ..

2
VERSION.txt
View File

@ -1 +1 @@
5.8.43 5.8.44

15
app/Services/Invoice/GenerateDeliveryNote.php
View File

@ -64,8 +64,8 @@ class GenerateDeliveryNote
: $this->decodePrimaryKey($this->invoice->client->getSetting('invoice_design_id')); : $this->decodePrimaryKey($this->invoice->client->getSetting('invoice_design_id'));
$invitation = $this->invoice->invitations->first(); $invitation = $this->invoice->invitations->first();
// $file_path = sprintf('%s%s_delivery_note.pdf', $this->invoice->client->invoice_filepath($invitation), $this->invoice->number);
$file_path = sprintf('%sdelivery_note.pdf', $this->invoice->client->invoice_filepath($invitation)); // return (new \App\Services\Pdf\PdfService($invitation, 'delivery_note'))->boot()->getPdf();
if (config('ninja.phantomjs_pdf_generation') || config('ninja.pdf_generator') == 'phantom') { if (config('ninja.phantomjs_pdf_generation') || config('ninja.pdf_generator') == 'phantom') {
return (new Phantom())->generate($this->invoice->invitations->first()); return (new Phantom())->generate($this->invoice->invitations->first());
@ -81,6 +81,9 @@ class GenerateDeliveryNote
$template = new PdfMakerDesign(strtolower($design->name)); $template = new PdfMakerDesign(strtolower($design->name));
} }
$variables = $html->generateLabelsAndValues();
$variables['labels']['$entity_label']= ctrans('texts.delivery_note');
$state = [ $state = [
'template' => $template->elements([ 'template' => $template->elements([
'client' => $this->invoice->client, 'client' => $this->invoice->client,
@ -88,7 +91,7 @@ class GenerateDeliveryNote
'pdf_variables' => (array) $this->invoice->company->settings->pdf_variables, 'pdf_variables' => (array) $this->invoice->company->settings->pdf_variables,
'contact' => $this->contact, 'contact' => $this->contact,
], 'delivery_note'), ], 'delivery_note'),
'variables' => $html->generateLabelsAndValues(), 'variables' => $variables,
'options' => [ 'options' => [
'client' => $this->invoice->client, 'client' => $this->invoice->client,
'entity' => $this->invoice, 'entity' => $this->invoice,
@ -113,12 +116,10 @@ class GenerateDeliveryNote
info($maker->getCompiledHTML()); info($maker->getCompiledHTML());
} }
return $pdf;
// Storage::disk($this->disk)->put($file_path, $pdf);
$maker = null; $maker = null;
$state = null; $state = null;
// return $file_path; return $pdf;
} }
} }

1
app/Services/PdfMaker/PdfMaker.php
View File

@ -141,7 +141,6 @@ class PdfMaker
{ {
$html = $this->document->saveHTML(); $html = $this->document->saveHTML();
// nlog($html);
return str_replace('%24', '$', $html); return str_replace('%24', '$', $html);
} }
} }

4
config/ninja.php
View File

@ -17,8 +17,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => env('APP_VERSION', '5.8.43'), 'app_version' => env('APP_VERSION', '5.8.44'),
'app_tag' => env('APP_TAG', '5.8.43'), 'app_tag' => env('APP_TAG', '5.8.44'),
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false), 'api_secret' => env('API_SECRET', false),