Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

app/Models/Document.php

@@ -211,7 +211,7 @@ class Document extends BaseModel
         $image = $this->getFile();
         $catch_image = $image;
 
-        if(extension_loaded('imagick'))
+        if(!extension_loaded('imagick'))
             return $catch_image;
 
         try {

app/Services/Pdf/PdfConfiguration.php

@@ -273,7 +273,7 @@ class PdfConfiguration
     {
         $design_id = $this->entity->design_id ? : $this->decodePrimaryKey($this->settings_object->getSetting($this->entity_design_id));
             
-        $this->design = Design::withTrashed()->find($design_id ?: 2);
+        $this->design = Design::withTrashed()->find($design_id ?? 2);
 
         return $this;
     }

public/assets/NOTICES

@@ -5635,7 +5635,6 @@ file_selector_macos
 file_selector_platform_interface
 file_selector_windows
 flutter_plugin_android_lifecycle
-google_identity_services_web
 google_sign_in
 google_sign_in_android
 google_sign_in_ios

public/flutter_service_worker.js

@@ -292,11 +292,11 @@ const RESOURCES = {"flutter.js": "6fef97aeca90b426343ba6c5c9dc5d4a",
 "assets/packages/intl_phone_field/assets/flags/la.png": "e8cd9c3ee6e134adcbe3e986e1974e4a",
 "assets/packages/material_design_icons_flutter/lib/fonts/materialdesignicons-webfont.ttf": "3759b2f7a51e83c64a58cfe07b96a8ee",
 "assets/fonts/MaterialIcons-Regular.otf": "06c266d6fa0b6c2f861f5819063605fa",
-"assets/NOTICES": "c60e1b43da0ee6201eb458bd9f613b30",
+"assets/NOTICES": "8c648442630917bca675a1e5230898fc",
 "assets/shaders/ink_sparkle.frag": "f8b80e740d33eb157090be4e995febdf",
 "favicon.ico": "51636d3a390451561744c42188ccd628",
-"/": "1906f781a1467e30e67c780a31d4cb00",
-"main.dart.js": "5b41a15805378227f28e227103829ce3",
+"/": "7b3684deabc95cfae800d47eab74adf7",
+"main.dart.js": "d936daa6052e70f066cd38008cc25836",
 "manifest.json": "ef43d90e57aa7682d7e2cfba2f484a40",
 "version.json": "f49943f1538e62d26aa21601ca8337a5",
 "canvaskit/skwasm.js": "95f16c6690f955a45b2317496983dbe9",

public/main.foss.dart.js

@@ -279249,11 +279249,11 @@ e.toString
 j.push(A.c3(!1,A.l(e,f,f,f,f,f,A.bP(f,f,d.gmF(),f,f,f,f,f,f,f,f,f,f,f,f,f,f,!0,f,f,f,f,f,f,f,f),f,f,f),f,f,new A.dlZ(r),f))}e=A.qn(j,f,n.a===B.t,f,f,1,!1,f,f,!1,f,!1,f,f,f,f,!0,f,f,f,f,f,k,f,f,f,1,f)}else e=f
 d=t.p
 q=A.b([],d)
-q.push(m)
-p=r.bj
-if(p===B.z&&g.r==null)q.push(new A.fv(1,B.aY,l,f))
-q=A.dU(B.Y,!0,f,new A.a9(B.ex,A.aB(q,B.p,B.k,B.m,f),f),B.r,f,0,f,f,f,f,f,B.au)
-return A.r4(e,B.kW,A.aL(A.b([q,A.ao(g.d||g.w==null?new A.j7(f,!1,f):A.a1e(!0,!0,new A.dm_(g),!1,!1,!1,600,f,s.aO(A.oH(p.a))+"_"+r.z+".pdf"),1)],d),B.p,f,B.k,B.m,B.u),f,f,f,f,f)}}
+if(g.a.d){d=A.b([],d)
+d.push(m)
+if(r.bj===B.z&&g.r==null)d.push(new A.fv(1,B.aY,l,f))
+q.push(A.dU(B.Y,!0,f,new A.a9(B.ex,A.aB(d,B.p,B.k,B.m,f),f),B.r,f,0,f,f,f,f,f,B.au))}q.push(A.ao(g.d||g.w==null?new A.j7(f,!1,f):A.a1e(!0,!0,new A.dm_(g),!1,!1,!1,600,f,s.aO(A.oH(r.bj.a))+"_"+r.z+".pdf"),1))
+return A.r4(e,B.kW,A.aL(q,B.p,f,B.k,B.m,B.u),f,f,f,f,f)}}
 A.dm3.prototype={
 $0(){this.a.d=!0},
 $S:0}