Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always update designs post self update

This commit is contained in:
David Bomba 2025-01-15 12:11:49 +11:00
parent bd6540992a
commit 132f053b02
6 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/ClientPortal/InvitationController.php
View File

@ -262,6 +262,7 @@ class InvitationController extends Controller
abort(403, 'You are not authorized to view this resource');
}
request()->session()->invalidate();
auth()->guard('contact')->loginUsingId($contact->id, true);
return redirect()->route('client.payments.show', $payment->hashed_id);
@ -279,6 +280,7 @@ class InvitationController extends Controller
$invitation->contact->restore();
}
request()->session()->invalidate();
auth()->guard('contact')->loginUsingId($invitation->contact->id, true);
$invoice = $invitation->invoice->service()->removeUnpaidGatewayFees()->save();

1
app/Http/Controllers/ClientPortal/NinjaPlanController.php
View File

@ -54,6 +54,7 @@ class NinjaPlanController extends Controller
if (MultiDB::findAndSetDbByContactKey($contact_key) && $client_contact = ClientContact::where('contact_key', $contact_key)->first()) {
nlog('Ninja Plan Controller - Found and set Client Contact');
request()->session()->invalidate();
Auth::guard('contact')->loginUsingId($client_contact->id, true);
return $this->plan();

1
app/Http/Controllers/SelfUpdateController.php
View File

@ -126,6 +126,7 @@ class SelfUpdateController extends BaseController
Artisan::call('migrate', ['--force' => true]);
Artisan::call('config:clear');
Artisan::call('cache:clear');
Artisan::call('ninja:design');
// $this->runModelChecks();

2
app/Http/Middleware/CheckClientExistence.php
View File

@ -56,6 +56,8 @@ class CheckClientExistence
}
if (count($multiple_contacts) == 1 && ! Auth::guard('contact')->check()) {
request()->session()->invalidate();
Auth::guard('contact')->loginUsingId($multiple_contacts[0]->id, true);
auth()->guard('contact')->user()->loadMissing(['client' => function ($query) {

2
app/Models/Presenters/ClientPresenter.php
View File

@ -63,7 +63,7 @@ class ClientPresenter extends EntityPresenter
return $primary_contact->email;
}
$contact = $this->entity->contacts->whereNotNull('email')->first();
$contact = $this->entity->contacts->where('email', '!=', '')->first();
return $contact ? $contact->email : 'No Email Set';
}

2
app/Services/Invoice/AddGatewayFee.php
View File

@ -33,7 +33,7 @@ class AddGatewayFee extends AbstractService
return $this->invoice;
}
return $gateway_fee > 0 $this->processGatewayFee($gateway_fee) : $this->processGatewayDiscount($gateway_fee);
return $gateway_fee > 0 ? $this->processGatewayFee($gateway_fee) : $this->processGatewayDiscount($gateway_fee);
}