Skip to content

F
fazo
Commit aeaeaab2 authored by Khumoyunmirzo Sodiqov's avatar Khumoyunmirzo Sodiqov
Browse files
Options

fix bugs

parent fb1be3bf
Expand all Show whitespace changes
Inline Side-by-side
Showing with 186 additions and 160 deletions
.env
View file @ aeaeaab2
...@@ -7,11 +7,11 @@ APP_URL=http://localhost ...@@ -7,11 +7,11 @@ APP_URL=http://localhost
LOG_CHANNEL=stack LOG_CHANNEL=stack
DB_CONNECTION=mysql DB_CONNECTION=mysql
DB_HOST=nobletech.co DB_HOST=127.0.0.1
DB_PORT=3306 DB_PORT=3306
DB_DATABASE=fazo DB_DATABASE=erpfazo
DB_USERNAME=iego DB_USERNAME=root
DB_PASSWORD=3448844 DB_PASSWORD=
BROADCAST_DRIVER=log BROADCAST_DRIVER=log
CACHE_DRIVER=file CACHE_DRIVER=file
......
app/Http/Controllers/Auth/LoginController.php
View file @ aeaeaab2
...@@ -25,7 +25,7 @@ class LoginController extends Controller ...@@ -25,7 +25,7 @@ class LoginController extends Controller
* *
* @var string * @var string
*/ */
protected $redirectTo = '/home'; protected $redirectTo = '/packages';
/** /**
* Create a new controller instance. * Create a new controller instance.
......
app/Http/Controllers/Auth/RegisterController.php
View file @ aeaeaab2
...@@ -28,7 +28,7 @@ class RegisterController extends Controller ...@@ -28,7 +28,7 @@ class RegisterController extends Controller
* *
* @var string * @var string
*/ */
protected $redirectTo = '/home'; protected $redirectTo = '/packages';
/** /**
* Create a new controller instance. * Create a new controller instance.
...@@ -50,6 +50,7 @@ class RegisterController extends Controller ...@@ -50,6 +50,7 @@ class RegisterController extends Controller
{ {
return Validator::make($data, [ return Validator::make($data, [
'name' => ['required', 'string', 'max:255'], 'name' => ['required', 'string', 'max:255'],
'surname' => ['required', 'string', 'max:255'],
'email' => ['required', 'string', 'email', 'max:255', 'unique:users'], 'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
'password' => ['required', 'string', 'min:8', 'confirmed'], 'password' => ['required', 'string', 'min:8', 'confirmed'],
]); ]);
...@@ -65,8 +66,11 @@ class RegisterController extends Controller ...@@ -65,8 +66,11 @@ class RegisterController extends Controller
{ {
return User::create([ return User::create([
'name' => $data['name'], 'name' => $data['name'],
'surname' => $data['surname'],
'email' => $data['email'], 'email' => $data['email'],
'password' => Hash::make($data['password']), 'password' => Hash::make($data['password']),
'uni_code' => $this->generateUniqNumber(),
'client_type' => 'WEB',
]); ]);
} }
} }
app/Http/Controllers/Controller.php
View file @ aeaeaab2
...@@ -10,4 +10,10 @@ use Illuminate\Foundation\Auth\Access\AuthorizesRequests; ...@@ -10,4 +10,10 @@ use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
class Controller extends BaseController class Controller extends BaseController
{ {
use AuthorizesRequests, DispatchesJobs, ValidatesRequests; use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
function generateUniqNumber($digit = 6)
{
return (int)substr(number_format(time() * rand(), 0, '', ''), 0, $digit);
}
} }
app/Http/Controllers/ProfileController.php
View file @ aeaeaab2
...@@ -300,8 +300,8 @@ class ProfileController extends Controller ...@@ -300,8 +300,8 @@ class ProfileController extends Controller
try { try {
$user = User::find(Auth::user()->id); $user = User::find(Auth::user()->id);
$user->firstname = $request->input('firstname'); $user->name = $request->input('name');
$user->lastname = $request->input('lastname'); $user->surname = $request->input('surname');
$user->email = $request->input('email'); $user->email = $request->input('email');
$user->phone = $request->input('phone'); $user->phone = $request->input('phone');
......
app/Http/Middleware/RedirectIfAuthenticated.php
View file @ aeaeaab2
...@@ -18,7 +18,7 @@ class RedirectIfAuthenticated ...@@ -18,7 +18,7 @@ class RedirectIfAuthenticated
public function handle($request, Closure $next, $guard = null) public function handle($request, Closure $next, $guard = null)
{ {
if (Auth::guard($guard)->check()) { if (Auth::guard($guard)->check()) {
return redirect('/profile'); return redirect('/packages');
} }
return $next($request); return $next($request);
......
app/User.php
View file @ aeaeaab2
...@@ -10,13 +10,18 @@ class User extends Authenticatable ...@@ -10,13 +10,18 @@ class User extends Authenticatable
{ {
use Notifiable; use Notifiable;
protected $table = 'clients';
/** /**
* The attributes that are mass assignable. * The attributes that are mass assignable.
* *
* @var array * @var array
*/ */
protected $fillable = [ protected $fillable = [
'name', 'email', 'password', 'name', 'surname', 'birthday', 'sex', 'passport', 'passport_issue', 'passport_by', 'country_id',
'city_id', 'street', 'house', 'apartment', 'phone', 'mobile', 'email', 'add_operator_id', 'edit_operator_id',
'added', 'edited', 'orders', 'last_order', 'allowed', 'status', 'uni_code', 'lang_id', 'password', 'remember_token',
'scan_id', 'client_type'
]; ];
/** /**
...@@ -34,11 +39,15 @@ class User extends Authenticatable ...@@ -34,11 +39,15 @@ class User extends Authenticatable
* @var array * @var array
*/ */
protected $casts = [ protected $casts = [
'email_verified_at' => 'datetime', 'added' => 'datetime',
'edited' => 'datetime',
'last_order' => 'datetime',
]; ];
public $timestamps = false;
public function getFIO() public function getFIO()
{ {
return $this->firstname.' '.$this->lastname; return $this->name . ' ' . $this->surname;
} }
} }
composer.lock
View file @ aeaeaab2
This diff is collapsed.
resources/views/auth/login.blade.php
View file @ aeaeaab2
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<div class="col-md-8 offset-md-4 mt-4"> <div class="col-md-8 offset-md-4 mt-4">
Впервые у нас? Впервые у нас?
<span class="text-muted"> <span class="text-muted">
<a class="" href="{{ route('register') }}"> <a class="" href="/register">
Регистрация. Регистрация.
</a> </a>
</span> </span>
......
resources/views/auth/register.blade.php
View file @ aeaeaab2
...@@ -14,34 +14,67 @@ ...@@ -14,34 +14,67 @@
<div class="form-wrap"> <div class="form-wrap">
<input class="form-input" id="name" type="text" name="name" <input class="form-input" id="name" type="text" name="name"
placeholder="Имя"> placeholder="Имя">
@if ($errors->has('name'))
<span class="invalid-feedback" role="alert">
<strong>{{ $errors->first('name') }}</strong>
</span>
@endif
</div>
<div class="form-wrap">
<input class="form-input" id="name" type="text" name="surname"
placeholder="Фамиля">
@if ($errors->has('surname'))
<span class="invalid-feedback" role="alert">
<strong>{{ $errors->first('surname') }}</strong>
</span>
@endif
</div> </div>
<div class="form-wrap"> <div class="form-wrap">
<input class="form-input" id="email" type="email" name="email" <input class="form-input" id="email" type="email" name="email"
placeholder="email"> placeholder="email">
@if ($errors->has('email'))
<span class="invalid-feedback" role="alert">
<strong>{{ $errors->first('email') }}</strong>
</span>
@endif
</div> </div>
<div class="form-wrap"> <div class="form-wrap">
<input class="form-input" id="password" type="password" name="password" <input class="form-input" id="password" type="password" name="password"
placeholder="Пароль"> placeholder="Пароль">
</div> </div>
<div class="form-wrap"> <div class="form-wrap">
<input class="form-input" id="password-confirm" type="password" name="password_confirmation" <input class="form-input" id="password-confirm" type="password"
name="password_confirmation"
placeholder="Подтверждение пароля"> placeholder="Подтверждение пароля">
@if ($errors->has('password'))
<span class="invalid-feedback" role="alert">
<strong>{{ $errors->first('password') }}</strong>
</span>
@endif
</div> </div>
<div class="button-wrap text-center">
<button class="btn btn-primary btn-sm btn-min-width-lg" type="submit"> <div class="button-wrap text-center" style="padding-top: 15px">
<button type="submit" class="btn btn-primary btn-sm btn-min-width-lg">
Зарегистрироваться Зарегистрироваться
</button> </button>
</div> </div>
<div class="form-group row mb-0" style="padding-top: 15px">
<div class="col-md-12 offset-md-4 mt-4">
Если у вас есть аккаунт,
<span class="text-muted">
<a class="" href="{{ route('login') }}">
Войдите
</a>
</span>
</div>
</div>
</form> </form>
<p class="text-uppercase text-gray offset-7">или</p> {{-- <p class="text-uppercase text-gray offset-7">или</p>--}}
</div> </div>
</div> </div>
<div class="btn-group-variant"><a class="btn btn-info-2 btn-sm btn-icon" href="#"><span
class="icon fa-facebook"></span> Facebook</a><a class="btn btn-info btn-sm btn-icon"
href="#"><span
class="icon fa-twitter"></span> Twitter</a><a class="btn btn-danger btn-sm btn-icon"
href="#"><span
class="icon fa-google-plus"></span> Google+</a></div>
</div> </div>
</div> </div>
</div> </div>
......
resources/views/pages/profile/addresses.blade.php
View file @ aeaeaab2
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
<th>Паспорт</th> <th>Паспорт</th>
<th>Адрес</th> <th>Адрес</th>
<th>Тел.</th> <th>Тел.</th>
<th>Тип</th>
<th>Опции</th> <th>Опции</th>
</tr> </tr>
</thead> </thead>
...@@ -37,11 +38,17 @@ ...@@ -37,11 +38,17 @@
{{ $unit->phone }} {{ $unit->phone }}
</td> </td>
<td> <td>
<a href="/address/{{$unit->id}}/edit" class="btn btn-warning btn-sm mb-1"> Редактировать</a> {{ ($unit->type == 'recipient')?'Получатель':'Отправитель' }}
</td>
<td>
<a href="/address/{{$unit->id}}/edit" class="btn btn-warning btn-sm mb-1">
Редактировать</a>
<form action="{{ route('address.destroy', $unit->id) }}" method="POST"> <form action="{{ route('address.destroy', $unit->id) }}" method="POST">
@csrf @csrf
@method('DELETE') @method('DELETE')
<button type="submit" class="btn btn-danger btn-sm" ><i class="fa fa-times-circle"></i> Удалить</button> <button type="submit" class="btn btn-danger btn-sm"><i
class="fa fa-times-circle"></i> Удалить
</button>
</form> </form>
</td> </td>
</tr> </tr>
...@@ -51,7 +58,7 @@ ...@@ -51,7 +58,7 @@
</div> </div>
<!-- RD Mailform--> <!-- RD Mailform-->
<a class="btn btn-primary shadow" href="{{ route('address.add') }}" >Добавить адрес</a> <a class="btn btn-primary shadow" href="{{ route('address.add') }}">Добавить адрес</a>
</div> </div>
</div> </div>
......
resources/views/pages/profile/user.blade.php
View file @ aeaeaab2
...@@ -14,12 +14,9 @@ ...@@ -14,12 +14,9 @@
<div class="col-4"> <div class="col-4">
<div class="card bg-white border-primary mb-3"> <div class="card bg-white border-primary mb-3">
<div class="card-body"> <div class="card-body">
<h5 class="card-title">{{ Auth::user()->lastname }} {{ Auth::user()->firstname }}</h5> <h5 class="card-title">{{ Auth::user()->name }} {{ Auth::user()->surname }}</h5>
<p class="card-text"> <p class="card-text">
97 Quentin Road, <br /> Код Клиента <b style="font-size: 16px">{{ Auth::user()->uni_code }}</b> <br/>
ID {{ Auth::user()->id }}-FZ <br />
Brooklyn, NY 11234
(347) 547-9797
</p> </p>
</div> </div>
</div> </div>
...@@ -31,25 +28,31 @@ ...@@ -31,25 +28,31 @@
<div class="col-xs-12 col-sm-6 form-group"> <div class="col-xs-12 col-sm-6 form-group">
<div class="form-wrap"> <div class="form-wrap">
<label for="forms-check-country1">Имя</label> <label for="forms-check-country1">Имя</label>
<input class="form-control" id="forms-check-country1" value="{{ Auth::user()->firstname }}" type="text" name="firstname" data-constraints="@Required"> <input class="form-control" id="forms-check-country1" value="{{ Auth::user()->name }}"
type="text" name="name" data-constraints="@Required">
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-6 form-group"> <div class="col-xs-12 col-sm-6 form-group">
<div class="form-wrap"> <div class="form-wrap">
<label for="forms-check-country1">Фамилия</label> <label for="forms-check-country1">Фамилия</label>
<input class="form-control" id="forms-check-country1" value="{{ Auth::user()->lastname }}" type="text" name="lastname" data-constraints="@Required"> <input class="form-control" id="forms-check-country1"
value="{{ Auth::user()->surname }}" type="text" name="surname"
data-constraints="@Required">
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-6 form-group"> <div class="col-xs-12 col-sm-6 form-group">
<div class="form-wrap"> <div class="form-wrap">
<label for="forms-check-postcode1">Email</label> <label for="forms-check-postcode1">Email</label>
<input class="form-control" id="forms-check-postcode1" type="text" name="email" value="{{ Auth::user()->email }}" data-constraints="@Required"> <input class="form-control" id="forms-check-postcode1" type="text" name="email"
value="{{ Auth::user()->email }}" data-constraints="@Required" disabled>
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-6 form-group"> <div class="col-xs-12 col-sm-6 form-group">
<div class="form-wrap"> <div class="form-wrap">
<label for="forms-check-postcode1">Телефон</label> <label for="forms-check-postcode1">Телефон</label>
<input class="form-control" id="forms-check-postcode1" type="text" name="phone" value="{{ Auth::user()->phone }}" placeholder="Phone..." data-constraints="@Required"> <input class="form-control" id="forms-check-postcode1" type="text" name="phone"
value="{{ Auth::user()->phone }}" placeholder="Phone..."
data-constraints="@Required">
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-6 form-group"> <div class="col-xs-12 col-sm-6 form-group">
...@@ -61,12 +64,13 @@ ...@@ -61,12 +64,13 @@
<div class="col-xs-12 col-sm-6 form-group"> <div class="col-xs-12 col-sm-6 form-group">
<div class="form-wrap"> <div class="form-wrap">
<label for="password_confirmation">Подтверждение пароля</label> <label for="password_confirmation">Подтверждение пароля</label>
<input class="form-control" id="password_confirmation" type="password" name="password_confirmation"> <input class="form-control" id="password_confirmation" type="password"
name="password_confirmation">
</div> </div>
</div> </div>
</div> </div>
<br /><br /> <br/><br/>
<button class="btn btn-primary btn-xs">Сохранить</button> <button class="btn btn-primary btn-xs">Сохранить</button>
</form> </form>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment