Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-03 03:44:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixes for user creation

Browse Source
This commit is contained in:
David Bomba 2019-08-25 15:53:16 +10:00
parent d02e62e46f
commit dbb2256819
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/DataMapper/DefaultSettings.php
View File

@ -12,6 +12,7 @@
namespace App\DataMapper; namespace App\DataMapper;
use App\Models\Client; use App\Models\Client;
use App\Models\User;
/** /**
* Class DefaultSettings * Class DefaultSettings
@ -27,21 +28,24 @@ class DefaultSettings extends BaseSettings
/** /**
* @return \stdClass * @return \stdClass
*
* //todo user specific settings / preferences.
*/ */
public static function userSettings() : \stdClass public static function userSettings() : \stdClass
{ {
return (object)[ return (object)[
class_basename(Client::class) => self::clientSettings(), class_basename(User::class) => self::userSettings(),
]; ];
} }
/** /**
* @return \stdClass * @return \stdClass
*/ */
private static function clientSettings() : \stdClass private static function userSettings() : \stdClass
{ {
return (object)[ return (object)[
'per_page' => self::$per_page,
]; ];
} }

6
app/Jobs/User/CreateUser.php
View File

@ -54,9 +54,9 @@ class CreateUser
*/ */
public function handle() : ?User public function handle() : ?User
{ {
$x = mt_rand(1,10000);//todo // $x = mt_rand(1,10000);//todo
$email = 'turbo124+'. $x .'@gmail.com'; //todo // $email = 'turbo124+'. $x .'@gmail.com'; //todo
$user = new User(); $user = new User();
// $user->account_id = $this->account->id; // $user->account_id = $this->account->id;
@ -64,7 +64,7 @@ class CreateUser
$user->accepted_terms_version = config('ninja.terms_version'); $user->accepted_terms_version = config('ninja.terms_version');
$user->confirmation_code = $this->createDbHash(config('database.default')); $user->confirmation_code = $this->createDbHash(config('database.default'));
$user->fill($this->request); $user->fill($this->request);
$user->email = $email;//todo need to remove this in production $user->email = $this->request(['email']);//todo need to remove this in production
$user->save(); $user->save();
$user->companies()->attach($this->company->id, [ $user->companies()->attach($this->company->id, [