From dea57e07809f79268b3e2f75c08892315ff18dc6 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 5 Aug 2024 08:37:21 +1000 Subject: [PATCH] Fixes for recurring invoice queries --- VERSION.txt | 2 +- app/Http/Controllers/ExportController.php | 4 ++-- app/Jobs/Company/CompanyExport.php | 2 +- config/ninja.php | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index b62d8ef8ec05..21a04bbf2c42 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.10.17 \ No newline at end of file +5.10.18 \ No newline at end of file diff --git a/app/Http/Controllers/ExportController.php b/app/Http/Controllers/ExportController.php index d182e613057d..0aea27594fe8 100644 --- a/app/Http/Controllers/ExportController.php +++ b/app/Http/Controllers/ExportController.php @@ -59,9 +59,9 @@ class ExportController extends BaseController /** @var \App\Models\User $user */ $user = auth()->user(); - $hash = Str::uuid(); + $hash = Str::uuid()->toString(); $url = \Illuminate\Support\Facades\URL::temporarySignedRoute('protected_download', now()->addHour(), ['hash' => $hash]); - Cache::put($hash, $url, now()->addHour()); + Cache::put($hash, $url, 3600); CompanyExport::dispatch($user->getCompany(), $user, $hash); diff --git a/app/Jobs/Company/CompanyExport.php b/app/Jobs/Company/CompanyExport.php index 3885c05e7df3..9cc901cdf240 100644 --- a/app/Jobs/Company/CompanyExport.php +++ b/app/Jobs/Company/CompanyExport.php @@ -695,7 +695,7 @@ class CompanyExport implements ShouldQueue $url = Cache::get($this->hash); - Cache::put($this->hash, $storage_path, now()->addHour()); + Cache::put($this->hash, $storage_path, 3600); App::forgetInstance('translator'); $t = app('translator'); diff --git a/config/ninja.php b/config/ninja.php index a1fe742fc8dc..1881afbb4e3a 100644 --- a/config/ninja.php +++ b/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.10.17'), - 'app_tag' => env('APP_TAG', '5.10.17'), + 'app_version' => env('APP_VERSION', '5.10.18'), + 'app_tag' => env('APP_TAG', '5.10.18'), 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', false),