Merge pull request #9436 from turbo124/v5-develop

v5.8.44

.github/workflows/react_release.yml

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

.github/workflows/release.yml

@@ -50,6 +50,7 @@ jobs:
           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/
+          cp dist/index.html ../resources/views/react/index.blade.php
           
           mkdir -p ../public/tinymce_6.4.2/tinymce/js/
           cp -r node_modules/tinymce ../public/tinymce_6.4.2/tinymce/js/

VERSION.txt

@@ -1 +1 @@
-5.8.43
+5.8.44

app/Services/Invoice/GenerateDeliveryNote.php

@@ -64,8 +64,8 @@ class GenerateDeliveryNote
             : $this->decodePrimaryKey($this->invoice->client->getSetting('invoice_design_id'));
 
         $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') {
             return (new Phantom())->generate($this->invoice->invitations->first());
@@ -81,6 +81,9 @@ class GenerateDeliveryNote
             $template = new PdfMakerDesign(strtolower($design->name));
         }
 
+        $variables = $html->generateLabelsAndValues();
+        $variables['labels']['$entity_label']= ctrans('texts.delivery_note');
+        
         $state = [
             'template' => $template->elements([
                 'client' => $this->invoice->client,
@@ -88,7 +91,7 @@ class GenerateDeliveryNote
                 'pdf_variables' => (array) $this->invoice->company->settings->pdf_variables,
                 'contact' => $this->contact,
             ], 'delivery_note'),
-            'variables' => $html->generateLabelsAndValues(),
+            'variables' => $variables,
             'options' => [
                 'client' => $this->invoice->client,
                 'entity' => $this->invoice,
@@ -113,12 +116,10 @@ class GenerateDeliveryNote
             info($maker->getCompiledHTML());
         }
 
-        return $pdf;
-        // Storage::disk($this->disk)->put($file_path, $pdf);
-
         $maker = null;
         $state = null;
 
-        // return $file_path;
+        return $pdf;
+
     }
 }

app/Services/PdfMaker/PdfMaker.php

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

config/ninja.php

@@ -17,8 +17,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.8.43'),
-    'app_tag' => env('APP_TAG', '5.8.43'),
+    'app_version' => env('APP_VERSION', '5.8.44'),
+    'app_tag' => env('APP_TAG', '5.8.44'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),