From 765c09d90666b359313c6af54444aec0daa05edd Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 5 Mar 2025 08:25:11 +1100 Subject: [PATCH 1/2] Fixes for white label license --- app/Http/Controllers/LicenseController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/LicenseController.php b/app/Http/Controllers/LicenseController.php index 54b68ed12c..9ab4e7328f 100644 --- a/app/Http/Controllers/LicenseController.php +++ b/app/Http/Controllers/LicenseController.php @@ -185,7 +185,7 @@ class LicenseController extends BaseController $account = auth()->user()->account; $account->plan_term = Account::PLAN_TERM_YEARLY; - $account->plan_expires = Carbon::parse($payload['expires'])->addYear()->format('Y-m-d'); + $account->plan_expires = Carbon::parse($payload['expires'])->format('Y-m-d'); $account->plan = Account::PLAN_WHITE_LABEL; $account->save(); From 66f05e975527b7c60f8b413d153477c03174d86d Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 5 Mar 2025 08:26:09 +1100 Subject: [PATCH 2/2] v5.11.51 --- VERSION.txt | 2 +- app/Http/Controllers/LicenseController.php | 2 +- config/ninja.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 3632ac139f..4608a1f5b2 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.11.50 \ No newline at end of file +5.11.51 \ No newline at end of file diff --git a/app/Http/Controllers/LicenseController.php b/app/Http/Controllers/LicenseController.php index 9ab4e7328f..60287db88b 100644 --- a/app/Http/Controllers/LicenseController.php +++ b/app/Http/Controllers/LicenseController.php @@ -180,7 +180,7 @@ class LicenseController extends BaseController nlog("Ninja Server Response"); nlog($payload); - if ($response->successful()) { + if ($response->successful() && is_array($payload)) { $account = auth()->user()->account; diff --git a/config/ninja.php b/config/ninja.php index 3ac15d7eed..d6894d17d8 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.11.50'), - 'app_tag' => env('APP_TAG', '5.11.50'), + 'app_version' => env('APP_VERSION', '5.11.51'), + 'app_tag' => env('APP_TAG', '5.11.51'), 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', false),