diff --git a/.github/workflows/react_release.yml b/.github/workflows/react_release.yml index 68c709eaf9..a5f5e0df75 100644 --- a/.github/workflows/react_release.yml +++ b/.github/workflows/react_release.yml @@ -49,6 +49,7 @@ jobs: cd ui git checkout develop sed -i 's/VITE_IS_TEST=true/VITE_IS_TEST=false/' .env.example + cp .env.example .env cp ../vite.config.ts.react ./vite.config.js sed -i '/"version"/c\ "version": " Latest Build - ${{ env.current_date }}",' package.json diff --git a/VERSION.txt b/VERSION.txt index 670dfb4dbb..57f82f727c 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.10.62 \ No newline at end of file +5.11.0 \ No newline at end of file diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php index e43f78cf63..c7cffe96fa 100644 --- a/app/Http/Controllers/ActivityController.php +++ b/app/Http/Controllers/ActivityController.php @@ -132,6 +132,8 @@ class ActivityController extends BaseController $file = $backup->getFile(); + $html_backup = $file; + if(!$file) return response()->json(['message' => ctrans('texts.no_backup_exists'), 'errors' => new stdClass()], 404); diff --git a/app/Models/Backup.php b/app/Models/Backup.php index 9cdfd748d7..6e2610cff2 100644 --- a/app/Models/Backup.php +++ b/app/Models/Backup.php @@ -73,7 +73,7 @@ class Backup extends BaseModel $filename = now()->format('Y_m_d').'_'.md5(time()).'.html'; //@phpstan-ignore-line $file_path = $path.$filename; - $disk = Ninja::isHosted() ? config('filesystems.backup') : config('filesystems.default'); + $disk = Ninja::isHosted() ? 'backup' : config('filesystems.default'); Storage::disk($disk)->put($file_path, $html); diff --git a/config/ninja.php b/config/ninja.php index ef4a384616..e0362f1282 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.62'), - 'app_tag' => env('APP_TAG', '5.10.62'), + 'app_version' => env('APP_VERSION', '5.11.0'), + 'app_tag' => env('APP_TAG', '5.11.0'), 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', false),