Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 21:22:58 +01:00
Code Issues Releases Activity

Merge pull request #6094 from turbo124/v5-develop

Browse Source 
Fixes for subscription service
This commit is contained in:
David Bomba 2021-06-21 20:59:25 +10:00 committed by GitHub
commit 2b0acf1dc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Auth/ContactRegisterController.php
View File

@ -1,4 +1,13 @@
<?php
/**
* Invoice Ninja (https://invoiceninja.com).
*
* @link https://github.com/invoiceninja/invoiceninja source repository
*
* @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
*
* @license https://www.elastic.co/licensing/elastic-license
*/
namespace App\Http\Controllers\Auth;

2
app/Http/Requests/ClientPortal/RegisterRequest.php
View File

@ -30,7 +30,7 @@ class RegisterRequest extends FormRequest
'first_name' => ['required', 'string', 'max:255'],
'last_name' => ['required', 'string', 'max:255'],
'phone' => ['required', 'string', 'max:255'],
'email' => ['required', 'string', 'email:rfc,dns', 'max:255', 'unique:client_contacts'],
'email' => ['required', 'string', 'email:rfc,dns', 'max:255'],
'password' => ['required', 'string', 'min:6', 'confirmed'],
];
}

3
app/Services/Subscription/SubscriptionService.php
View File

@ -629,7 +629,7 @@ class SubscriptionService
}
$client = \App\Models\Client::find($this->decodePrimaryKey($body['client']));
$client = Client::where('id', $this->decodePrimaryKey($body['client']))->withTrashed()->first();
SystemLogger::dispatch(
$body,
@ -639,6 +639,7 @@ class SubscriptionService
$client,
$client->company,
);
if(is_array($body))
return $response;