diff --git a/VERSION.txt b/VERSION.txt index 769f5e0bec..d6403175aa 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.3.9 \ No newline at end of file +5.3.10 \ No newline at end of file diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php index f2bfe9d012..466cd55952 100644 --- a/app/Http/Controllers/BaseController.php +++ b/app/Http/Controllers/BaseController.php @@ -769,6 +769,10 @@ class BaseController extends Controller case 'profile': return 'main.profile.dart.js'; default: + + if(Ninja::isSelfHost()) + return 'main.foss.dart.js'; + return 'main.dart.js'; } diff --git a/app/Repositories/ClientContactRepository.php b/app/Repositories/ClientContactRepository.php index e43539e1d6..eedab840d3 100644 --- a/app/Repositories/ClientContactRepository.php +++ b/app/Repositories/ClientContactRepository.php @@ -73,7 +73,9 @@ class ClientContactRepository extends BaseRepository $client->company->client_contacts()->where('email', $update_contact->email)->update(['password' => $update_contact->password]); } - $update_contact->email = trim($contact['email']); + if(array_key_exists('email', $contact)) + $update_contact->email = trim($contact['email']); + $update_contact->save(); }); diff --git a/config/ninja.php b/config/ninja.php index 89d7ba65bf..1364c4d095 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -14,8 +14,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => '5.3.9', - 'app_tag' => '5.3.9', + 'app_version' => '5.3.10', + 'app_tag' => '5.3.10', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''),