Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for negative credits

Browse Source
This commit is contained in:
David Bomba 2022-01-25 13:43:44 +11:00
parent fe3ebc3a87
commit 1888ac2426
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Auth/ContactLoginController.php
View File

@ -152,6 +152,7 @@ class ContactLoginController extends Controller
public function logout()
{
Auth::guard('contact')->logout();
request()->session()->invalidate();
return redirect('/client/login');
}

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

@ -98,6 +98,7 @@ class InvitationController extends Controller
$client_contact->email = Str::random(15) . "@example.com"; $client_contact->save();
if (request()->has('client_hash') && request()->input('client_hash') == $invitation->contact->client->client_hash) {
request()->session()->invalidate();
auth()->guard('contact')->loginUsingId($client_contact->id, true);
} elseif ((bool) $invitation->contact->client->getSetting('enable_client_portal_password') !== false) {
@ -106,6 +107,7 @@ class InvitationController extends Controller
} else {
nlog("else - default - login contact");
request()->session()->invalidate();
auth()->guard('contact')->loginUsingId($client_contact->id, true);
}

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

@ -35,7 +35,7 @@ class SessionDomains
if (strpos($domain_name, 'invoicing.co') !== false)
{
config(['session.domain' => '.invoicing.co']);
// config(['session.domain' => '.invoicing.co']);
}
else{

6
app/Http/Requests/Expense/UpdateExpenseRequest.php
View File

@ -34,10 +34,10 @@ class UpdateExpenseRequest extends Request
public function rules()
{
/* Ensure we have a client name, and that all emails are unique*/
$rules = [];
// $rules['country_id'] = 'integer|nullable';
$rules['country_id'] = 'integer|nullable';
$rules['contacts.*.email'] = 'nullable|distinct';
// $rules['contacts.*.email'] = 'nullable|distinct';
if (isset($this->number)) {
$rules['number'] = Rule::unique('expenses')->where('company_id', auth()->user()->company()->id)->ignore($this->expense->id);

2
app/Services/Credit/CreditService.php
View File

@ -108,6 +108,7 @@ class CreditService
$this->updateBalance($adjustment)
->updatePaidToDate($adjustment)
->setStatus(Credit::STATUS_APPLIED)
->save();
//create a negative payment of total $this->credit->balance
@ -136,7 +137,6 @@ class CreditService
->client
->service()
->updatePaidToDate($adjustment)
->setStatus(Credit::STATUS_APPLIED)
->save();
event('eloquent.created: App\Models\Payment', $payment);