jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

begin order form with registration

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2022-06-26 23:33:39 +02:00
parent c2fd71e3d1
commit e435752484
36 changed files with 442 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Repositories/Config.php
View File

@@ -2,23 +2,19 @@
namespace App\Repositories;
use App\Repositories\Core\Auth\Users;
use App\Repositories\Users;
use App\Repositories\Shop\Categories;
use App\Repositories\Shop\Homepages;
class Config
{
public static function init()
{
$data['user'] = self::getUser();
return ['init' => $data];
}
public static function getUser()
{
if (Users::getUser()) {
$data = Users::getInfo();
} else {
$data = false;
}
return $data;
return [
'auth' => Users::getUser() ? Users::getInfo() : false,
'categories' => Categories::getTreeVisibles(),
'footer' => Homepages::getFooter(),
'extra_footer' => Homepages::getExtraFooter(),
];
}
}

55
app/Repositories/Core/Auth/Users.php
View File

@@ -7,18 +7,14 @@ use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Str;
use Hyn\Tenancy\Database\Connection;
use Laratrust\Traits\LaratrustUserTrait;
use LangleyFoxall\LaravelNISTPasswordRules\PasswordRules;
use App\Models\Core\Auth\User;
use App\Models\Core\Auth\RoleUser;
use App\Repositories\Clients;
use App\Repositories\Partners;
use App\Repositories\Core\Upload;
use LangleyFoxall\LaravelNISTPasswordRules\PasswordRules;
class Users
{
use LaratrustUserTrait;
@@ -38,44 +34,26 @@ class Users
$data = $user->toArray();
$data['name'] = $user->name;
$data['avatar'] = self::getAvatar($id);
// $data['last_login'] = $user->previousLoginAt();
// $data['roles'] = self::getRoles();
// $data['permissions'] = self::getPermissions();
$data['roles'] = $user->roles->pluck('id')->toArray();
$data['permissions'] = $user->allPermissions()->pluck('id')->toArray();
$data['clients'] = $user->clients->pluck('id')->toArray();
return $data;
}
public static function store($data)
{
$id = isset($data['id']) ? $data['id'] : false;
if (!empty($data['password'])) {
$data['password'] = Hash::make($data['password']);
} else {
if ($id) {
unset($data['password']);
} else {
$data['password'] = Hash::make(Str::random(8));
}
if ($data['id'] ?? false) {
unset($data['password']);
}
$data['remember_token'] = Str::random(32);
$data['active'] = true;
$user = $id ? self::update($data, $id) : self::create($data);
$user = ($data['id'] ?? false) ? self::update($data) : self::create($data);
$user->roles()->sync(array_keys($data['roles'] ?? []));
UserClients::associate($user->id, $data['clients'] ?? false );
// $user->sendNewUserNotification($data['remember_token'], Auth::user());
return $user;
}
public static function create($data, $copy_password = false)
public static function create($data)
{
$data['password'] = $copy_password ? $data['password'] : ($data['password'] ? Hash::make($data['password']) : Hash::make(Str::random(8)));
$data['password'] = $data['password'] ?? Hash::make($data['password']);
$data['remember_token'] = Str::random(32);
$data['active'] = true;
$user = User::create($data);
PasswordSecurities::create($user->id);
return $user;
@@ -208,7 +186,7 @@ class Users
if (!$avatar) {
return '/assets/img/no-avatar.png';
}
$path = Clients::isClient() ? Clients::getPublicPath('/images/avatars/') : Partners::getPublicPath('/images/avatars/');
$path = '/images/avatars/';
return $path . $avatar;
}
@@ -242,16 +220,6 @@ class Users
return User::byUsername($username)->withTrashed()->first();
}
public static function select_by_status_and_team_and_entity($status_id, $team_id, $third_party_id)
{
return User::active()->byStatus($status_id)->byTeam($team_id)->byThirdParty($third_party_id)->get()->toArray();
}
public static function select_datas_by_id($user_id)
{
return User::with('status')->find($user_id)->toArray();
}
public static function toggle_active($id, $active)
{
return self::get($id)->update(['active' => $active]);
@@ -276,14 +244,11 @@ class Users
public static function update_password($id, $password)
{
$password = Hash::make($password);
UserClients::changePasswordsByUser($id, $password);
return User::find($id)->update(['password' => $password]);
// $connection = app(Connection::class);
// return User::on($connection->systemName())->find($id)->update(['password' => $password]);
}
public static function validate($username, $field = 'current_password')
{
return PasswordRules::changePassword($username, $field);
}
}
}

2
app/Repositories/Shop/Articles.php
View File

@@ -451,7 +451,7 @@ class Articles
$tags[$tag['group']][] = $tag['name'];
}
}
return $tags;
return $tags ?? null;
}
public static function getPricesByArticle($article)

10
app/Repositories/Shop/Homepages.php
View File

@@ -18,6 +18,16 @@ class Homepages
return self::get(1)->text;
}
public static function getFooter()
{
return self::get(2)->text;
}
public static function getExtraFooter()
{
return self::get(3)->text;
}
public static function get($id)
{
return Homepage::find($id);

16
app/Repositories/Users.php Normal file
View File

@@ -0,0 +1,16 @@
<?php
namespace App\Repositories;
use App\Repositories\Core\Auth\Users as parentUsers;
use App\Repositories\Shop\SaleChannels;
class Users extends parentUsers
{
public static function getInfo($id = false)
{
$data = parent::getInfo($id);
$data['sale_channel'] = SaleChannels::getDefault()->toArray();
return $data;
}
}