Fixes for subscription service

This commit is contained in:
David Bomba 2021-06-21 20:53:34 +10:00
parent 690f1ff9f3
commit 1b303f9559
3 changed files with 12 additions and 2 deletions

View File

@ -1,4 +1,13 @@
<?php <?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; namespace App\Http\Controllers\Auth;

View File

@ -30,7 +30,7 @@ class RegisterRequest extends FormRequest
'first_name' => ['required', 'string', 'max:255'], 'first_name' => ['required', 'string', 'max:255'],
'last_name' => ['required', 'string', 'max:255'], 'last_name' => ['required', 'string', 'max:255'],
'phone' => ['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'], 'password' => ['required', 'string', 'min:6', 'confirmed'],
]; ];
} }

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( SystemLogger::dispatch(
$body, $body,
@ -639,6 +639,7 @@ class SubscriptionService
$client, $client,
$client->company, $client->company,
); );
if(is_array($body)) if(is_array($body))
return $response; return $response;