Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

Browse Source
This commit is contained in:
David Bomba 2023-09-20 22:15:57 +10:00
commit 947e6f116d
5 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.7.14
5.7.16

2
app/Console/Commands/CreateTestData.php
View File

@ -61,6 +61,8 @@ class CreateTestData extends Command
protected $invoice_repo;
protected $count;
/**
* Execute the console command.
*

18
app/Http/Controllers/Auth/LoginController.php
View File

@ -418,10 +418,12 @@ class LoginController extends BaseController
->setReturnType(Model\User::class)
->execute();
nlog($user);
if ($user) {
$account = request()->input('account');
$email = $user->getMail() ?: $user->getUserPrincipalName();
$email = $user->getUserPrincipalName() ?: $user->getMail();
$query = [
'oauth_user_id' => $user->getId(),
@ -437,15 +439,15 @@ class LoginController extends BaseController
}
//If this is a result user/email combo - lets add their OAuth details details
if ($existing_login_user = MultiDB::hasUser(['email' => $email])) {
if (!$existing_login_user->account) {
return response()->json(['message' => 'User exists, but not attached to any companies! Orphaned user!'], 400);
}
// if ($existing_login_user = MultiDB::hasUser(['email' => $email])) {
// if (!$existing_login_user->account) {
// return response()->json(['message' => 'User exists, but not attached to any companies! Orphaned user!'], 400);
// }
Auth::login($existing_login_user, true);
// Auth::login($existing_login_user, true);
return $this->existingLoginUser($user->getId(), 'microsoft');
}
// return $this->existingLoginUser($user->getId(), 'microsoft');
// }
// Signup!

4
config/ninja.php
View File

@ -15,8 +15,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.7.14'),
'app_tag' => env('APP_TAG','5.7.14'),
'app_version' => env('APP_VERSION','5.7.16'),
'app_tag' => env('APP_TAG','5.7.16'),
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''),

4
resources/views/portal/ninja2020/components/livewire/documents-table.blade.php
View File

@ -94,8 +94,8 @@
<td class="px-6 py-4 whitespace-nowrap text-sm leading-5 text-gray-500">
<input type="checkbox" class="form-checkbox cursor-pointer" onchange="appendToElement('multiple-downloads', '{{ $document->hashed_id }}')" />
</td>
<td class="px-6 py-4 whitespace-nowrap text-sm leading-5 text-gray-500">
{{ Illuminate\Support\Str::limit($document->name, 40) }}
<td class="px-6 py-4 whitespace-nowrap text-sm leading-5 text-gray-500 truncate">
{{ $document->name }}
</td>
<td class="px-6 py-4 whitespace-nowrap text-sm leading-5 text-gray-500">