Merge pull request #9720 from turbo124/v5-develop

Fixes for react switching

app/Http/Controllers/AccountController.php

@@ -115,13 +115,8 @@ class AccountController extends BaseController
 
     public function update(UpdateAccountRequest $request, Account $account)
     {
-        $fi = new \FilesystemIterator(public_path('react'), \FilesystemIterator::SKIP_DOTS);
 
-        if (iterator_count($fi) < 30) {
+        $account->set_react_as_default_ap = $request->input('set_react_as_default_ap');
-            return response()->json(['message' => 'React App Not Installed, Please install the React app before attempting to switch.'], 400);
-        }
-
-        $account->fill($request->all());
         $account->save();
 
         $this->entity_type = Account::class;

app/Jobs/Task/TaskAssigned.php

@@ -47,7 +47,7 @@ class TaskAssigned implements ShouldQueue
 
         $company_user = $this->task->assignedCompanyUser();
 
-        if($this->findEntityAssignedNotification($company_user, 'task'))
+        if($company_user && $this->findEntityAssignedNotification($company_user, 'task'))
         {
             $mo = new EmailObject();
             $mo->subject = ctrans('texts.task_assigned_subject', ['task' => $this->task->number, 'date' => now()->setTimeZone($this->task->company->timezone()->name)->format($this->task->company->date_format()) ]);

app/Services/EDocument/Imports/ZugferdEDocument.php

@@ -41,6 +41,7 @@ class ZugferdEDocument extends AbstractService {
      */
     public function run(): Expense
     {
+        /** @var \App\Models\User $user */
         $user = auth()->user();
         $this->document = ZugferdDocumentReader::readAndGuessFromContent($this->tempdocument);
         $this->document->getDocumentInformation($documentno, $documenttypecode, $documentdate, $invoiceCurrency, $taxCurrency, $documentname, $documentlanguage, $effectiveSpecifiedPeriod);
@@ -102,13 +103,13 @@ class ZugferdEDocument extends AbstractService {
                 if ($taxid != null) {
                     $vendor->vat_number = $taxid;
                 }
-                $vendor->currency_id = Currency::whereCode($invoiceCurrency)->first()->id;
+                $vendor->currency_id = Currency::query()->where('code', $invoiceCurrency)->first()->id;
                 $vendor->phone = $contact_phone;
                 $vendor->address1 = $address_1;
                 $vendor->address2 = $address_2;
                 $vendor->city = $city;
                 $vendor->postal_code = $postcode;
-                $vendor->country_id = Country::where('iso_3166_2', $country)->first()->id;
+                $vendor->country_id = Country::query()->where('iso_3166_2', $country)->first()->id;
 
                 $vendor->save();
                 $expense->vendor_id = $vendor->id;

app/Utils/TempFile.php

@@ -11,6 +11,8 @@
 
 namespace App\Utils;
 
+use Illuminate\Http\File;
+use Illuminate\Http\UploadedFile;
 class TempFile
 {
     public static function path($url): string
@@ -34,4 +36,61 @@ class TempFile
 
         return $file_path;
     }
+
+    public static function UploadedFileFromRaw(string $fileData, string|null $fileName = null, string|null $mimeType = null): UploadedFile
+    {
+        // Create temp file and get its absolute path
+        $tempFile = tmpfile();
+        $tempFilePath = stream_get_meta_data($tempFile)['uri'];
+
+        // Save file data in file
+        file_put_contents($tempFilePath, $fileData);
+
+        $tempFileObject = new File($tempFilePath);
+        $file = new UploadedFile(
+            $tempFileObject->getPathname(),
+            $fileName ?: $tempFileObject->getFilename(),
+            $mimeType ?: $tempFileObject->getMimeType(),
+            0,
+            true // Mark it as test, since the file isn't from real HTTP POST.
+        );
+
+        // Close this file after response is sent.
+        // Closing the file will cause to remove it from temp director!
+        app()->terminating(function () use ($tempFile) {
+            fclose($tempFile);
+        });
+
+        // return UploadedFile object
+        return $file;
+    }
+
+    /* create a tmp file from a raw string: https://gist.github.com/waska14/8b3bcebfad1f86f7fcd3b82927576e38*/
+    public static function UploadedFileFromUrl(string $url, string|null $fileName = null, string|null $mimeType = null): UploadedFile
+    {
+        // Create temp file and get its absolute path
+        $tempFile = tmpfile();
+        $tempFilePath = stream_get_meta_data($tempFile)['uri'];
+
+        // Save file data in file
+        file_put_contents($tempFilePath, file_get_contents($url));
+
+        $tempFileObject = new File($tempFilePath);
+        $file = new UploadedFile(
+            $tempFileObject->getPathname(),
+            $fileName ?: $tempFileObject->getFilename(),
+            $mimeType ?: $tempFileObject->getMimeType(),
+            0,
+            true // Mark it as test, since the file isn't from real HTTP POST.
+        );
+
+        // Close this file after response is sent.
+        // Closing the file will cause to remove it from temp director!
+        app()->terminating(function () use ($tempFile) {
+            fclose($tempFile);
+        });
+
+        // return UploadedFile object
+        return $file;
+    }
 }