Merge pull request #8695 from turbo124/v5-stable

Minor Fixes.
invoiceninja · Aug 6, 2023 · 0948a1b · 0948a1b
2 parents 97b90f6 + 9af4d3f
commit 0948a1b
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/app/Http/Controllers/PreviewController.php b/app/Http/Controllers/PreviewController.php
@@ -188,19 +188,19 @@ public function live(PreviewInvoiceRequest $request)
 
         if ($request->input('entity') == 'quote') {
             $repo = new QuoteRepository();
-            $entity_obj = QuoteFactory::create($company->id, auth()->user()->id);
+            $entity_obj = QuoteFactory::create($company->id, $user->id);
             $class = Quote::class;
         } elseif ($request->input('entity') == 'credit') {
             $repo = new CreditRepository();
-            $entity_obj = CreditFactory::create($company->id, auth()->user()->id);
+            $entity_obj = CreditFactory::create($company->id, $user->id);
             $class = Credit::class;
         } elseif ($request->input('entity') == 'recurring_invoice') {
             $repo = new RecurringInvoiceRepository();
-            $entity_obj = RecurringInvoiceFactory::create($company->id, auth()->user()->id);
+            $entity_obj = RecurringInvoiceFactory::create($company->id, $user->id);
             $class = RecurringInvoice::class;
         } else { //assume it is either an invoice or a null object
             $repo = new InvoiceRepository();
-            $entity_obj = InvoiceFactory::create($company->id, auth()->user()->id);
+            $entity_obj = InvoiceFactory::create($company->id, $user->id);
             $class = Invoice::class;
         }
 

diff --git a/app/Jobs/Company/CompanyExport.php b/app/Jobs/Company/CompanyExport.php
@@ -460,7 +460,9 @@ private function zipAndSend()
         $zip->close();
 
         Storage::disk(config('filesystems.default'))->put('backups/'.$file_name, file_get_contents($zip_path));
-        unlink($zip_path);        
+
+        if(file_exists($zip_path))
+            unlink($zip_path);        
 
         if(Ninja::isSelfHost())
             $storage_path = 'backups/'.$file_name;
@@ -489,7 +491,9 @@ private function zipAndSend()
 
         if (Ninja::isHosted()) {
             sleep(3);
-            unlink($zip_path);
+
+            if(file_exists($zip_path))
+                unlink($zip_path);
         }
     }
 }
diff --git a/public/flutter_service_worker.js b/public/flutter_service_worker.js
@@ -6,7 +6,7 @@ const RESOURCES = {
   "favicon.ico": "51636d3a390451561744c42188ccd628",
 "icons/Icon-192.png": "bb1cf5f6982006952211c7c8404ffbed",
 "icons/Icon-512.png": "0f9aff01367f0a0c69773d25ca16ef35",
-"/": "3cef19d55e16f81791e8a40542ac73b2",
+"/": "564587e987ec6f0646905b404f6da8bf",
 "flutter.js": "a85fcf6324d3c4d3ae3be1ae4931e9c5",
 "manifest.json": "ef43d90e57aa7682d7e2cfba2f484a40",
 "favicon.png": "dca91c54388f52eded692718d5a98b8b",
@@ -296,7 +296,7 @@ const RESOURCES = {
 "assets/NOTICES": "6cf3e734da918534f75f16892b0e2c1f",
 "assets/FontManifest.json": "087fb858dc3cbfbf6baf6a30004922f1",
 "version.json": "bf49df736fed3f74ade0dbaebf08de11",
-"main.dart.js": "34e466fd4955c81eb69a60b71ccbaca0",
+"main.dart.js": "c517df351de39a454c7bc0ca5a7225da",
 "canvaskit/canvaskit.js": "97937cb4c2c2073c968525a3e08c86a3",
 "canvaskit/profiling/canvaskit.js": "c21852696bc1cc82e8894d851c01921a",
 "canvaskit/profiling/canvaskit.wasm": "371bc4e204443b0d5e774d64a046eb99",

diff --git a/public/main.dart.js b/public/main.dart.js
@@ -187611,9 +187611,11 @@ if(s!=null&&s.length!==0)return"3"
 else if(r.c)return"2"
 else if(r.Q.length!==0||r.ax.length!==0||r.f.length!==0)return"5"
 else return"1"}},
-gJY(){if(B.a.B(A.a([B.a4],t.Z),this.b7))return!1
-else{var s=this.dy
-return!(s!=null&&s.length!==0)&&this.c}}}
+gJY(){var s,r=this
+if(B.a.B(A.a([B.a4],t.Z),r.b7)){if(r.fy==="2")s=r.rx.length===0
+else s=!1
+return s}else{s=r.dy
+return!(s!=null&&s.length!==0)&&r.c}}}
 A.bV8.prototype={
 $1(a){var s=$.dR-1
 $.dR=s

diff --git a/public/main.dart.js.map b/public/main.dart.js.map