Skip to content

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

fix bugs

parent fb1be3bf
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
LOG_CHANNEL=stack
DB_CONNECTION=mysql
DB_HOST=nobletech.co
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=fazo
DB_USERNAME=iego
DB_PASSWORD=3448844
DB_DATABASE=erpfazo
DB_USERNAME=root
DB_PASSWORD=
BROADCAST_DRIVER=log
CACHE_DRIVER=file
......
app/Http/Controllers/Auth/LoginController.php
View file @ aeaeaab2
......@@ -25,7 +25,7 @@ class LoginController extends Controller
*
* @var string
*/
protected $redirectTo = '/home';
protected $redirectTo = '/packages';
/**
* Create a new controller instance.
......
app/Http/Controllers/Auth/RegisterController.php
View file @ aeaeaab2
......@@ -28,7 +28,7 @@ class RegisterController extends Controller
*
* @var string
*/
protected $redirectTo = '/home';
protected $redirectTo = '/packages';
/**
* Create a new controller instance.
......@@ -50,6 +50,7 @@ class RegisterController extends Controller
{
return Validator::make($data, [
'name' => ['required', 'string', 'max:255'],
'surname' => ['required', 'string', 'max:255'],
'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
'password' => ['required', 'string', 'min:8', 'confirmed'],
]);
......@@ -65,8 +66,11 @@ class RegisterController extends Controller
{
return User::create([
'name' => $data['name'],
'surname' => $data['surname'],
'email' => $data['email'],
'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;
class Controller extends BaseController
{
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
try {
$user = User::find(Auth::user()->id);
$user->firstname = $request->input('firstname');
$user->lastname = $request->input('lastname');
$user->name = $request->input('name');
$user->surname = $request->input('surname');
$user->email = $request->input('email');
$user->phone = $request->input('phone');
......
app/Http/Middleware/RedirectIfAuthenticated.php
View file @ aeaeaab2
......@@ -18,7 +18,7 @@ class RedirectIfAuthenticated
public function handle($request, Closure $next, $guard = null)
{
if (Auth::guard($guard)->check()) {
return redirect('/profile');
return redirect('/packages');
}
return $next($request);
......
app/User.php
View file @ aeaeaab2
......@@ -10,13 +10,18 @@ class User extends Authenticatable
{
use Notifiable;
protected $table = 'clients';
/**
* The attributes that are mass assignable.
*
* @var array
*/
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
* @var array
*/
protected $casts = [
'email_verified_at' => 'datetime',
'added' => 'datetime',
'edited' => 'datetime',
'last_order' => 'datetime',
];
public $timestamps = false;
public function getFIO()
{
return $this->firstname.' '.$this->lastname;
return $this->name . ' ' . $this->surname;
}
}
composer.lock
View file @ aeaeaab2
{
"_readme": [
"This file locks the dependencies of your project to a known state",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "9f657ec865f9f65549dde33ed7da0d1f",
......@@ -164,28 +164,30 @@
},
{
"name": "doctrine/lexer",
"version": "1.0.2",
"version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/lexer.git",
"reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8"
"reference": "e17f069ede36f7534b95adec71910ed1b49c74ea"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/lexer/zipball/1febd6c3ef84253d7c815bed85fc622ad207a9f8",
"reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8",
"url": "https://api.github.com/repos/doctrine/lexer/zipball/e17f069ede36f7534b95adec71910ed1b49c74ea",
"reference": "e17f069ede36f7534b95adec71910ed1b49c74ea",
"shasum": ""
},
"require": {
"php": ">=5.3.2"
"php": "^7.2"
},
"require-dev": {
"phpunit/phpunit": "^4.5"
"doctrine/coding-standard": "^6.0",
"phpstan/phpstan": "^0.11.8",
"phpunit/phpunit": "^8.2"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
"dev-master": "1.1.x-dev"
}
},
"autoload": {
......@@ -198,14 +200,14 @@
"MIT"
],
"authors": [
{
"name": "Roman Borschel",
"email": "roman@code-factory.org"
},
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com"
},
{
"name": "Roman Borschel",
"email": "roman@code-factory.org"
},
{
"name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com"
......@@ -220,7 +222,7 @@
"parser",
"php"
],
"time": "2019-06-08T11:03:04+00:00"
"time": "2019-07-30T19:33:28+00:00"
},
{
"name": "dompdf/dompdf",
......@@ -827,51 +829,6 @@
],
"time": "2018-12-27T15:44:58+00:00"
},
{
"name": "kylekatarnls/update-helper",
"version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/kylekatarnls/update-helper.git",
"reference": "5786fa188e0361b9adf9e8199d7280d1b2db165e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/kylekatarnls/update-helper/zipball/5786fa188e0361b9adf9e8199d7280d1b2db165e",
"reference": "5786fa188e0361b9adf9e8199d7280d1b2db165e",
"shasum": ""
},
"require": {
"composer-plugin-api": "^1.1.0 || ^2.0.0",
"php": ">=5.3.0"
},
"require-dev": {
"codeclimate/php-test-reporter": "dev-master",
"composer/composer": "2.0.x-dev || ^2.0.0-dev",
"phpunit/phpunit": ">=4.8.35 <6.0"
},
"type": "composer-plugin",
"extra": {
"class": "UpdateHelper\\ComposerPlugin"
},
"autoload": {
"psr-0": {
"UpdateHelper\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Kyle",
"email": "kylekatarnls@gmail.com"
}
],
"description": "Update helper",
"time": "2019-07-29T11:03:54+00:00"
},
{
"name": "laravel/framework",
"version": "v5.8.35",
......@@ -1149,16 +1106,16 @@
},
{
"name": "league/flysystem",
"version": "1.0.55",
"version": "1.0.57",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
"reference": "33c91155537c6dc899eacdc54a13ac6303f156e6"
"reference": "0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/33c91155537c6dc899eacdc54a13ac6303f156e6",
"reference": "33c91155537c6dc899eacdc54a13ac6303f156e6",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a",
"reference": "0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a",
"shasum": ""
},
"require": {
......@@ -1229,7 +1186,7 @@
"sftp",
"storage"
],
"time": "2019-08-24T11:17:19+00:00"
"time": "2019-10-16T21:01:05+00:00"
},
{
"name": "league/oauth1-client",
......@@ -1374,34 +1331,36 @@
},
{
"name": "nesbot/carbon",
"version": "1.39.0",
"version": "2.25.2",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
"reference": "dd62a58af4e0775a45ea5f99d0363d81b7d9a1e0"
"reference": "443fe5f1498147e0fbc792142b5dc43e2e8a533f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/dd62a58af4e0775a45ea5f99d0363d81b7d9a1e0",
"reference": "dd62a58af4e0775a45ea5f99d0363d81b7d9a1e0",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/443fe5f1498147e0fbc792142b5dc43e2e8a533f",
"reference": "443fe5f1498147e0fbc792142b5dc43e2e8a533f",
"shasum": ""
},
"require": {
"kylekatarnls/update-helper": "^1.1",
"php": ">=5.3.9",
"symfony/translation": "~2.6 || ~3.0 || ~4.0"
"ext-json": "*",
"php": "^7.1.8 || ^8.0",
"symfony/translation": "^3.4 || ^4.0"
},
"require-dev": {
"composer/composer": "^1.2",
"friendsofphp/php-cs-fixer": "~2",
"phpunit/phpunit": "^4.8.35 || ^5.7"
"friendsofphp/php-cs-fixer": "^2.14 || ^3.0",
"kylekatarnls/multi-tester": "^1.1",
"phpmd/phpmd": "dev-php-7.1-compatibility",
"phpstan/phpstan": "^0.11",
"phpunit/phpunit": "^7.5 || ^8.0",
"squizlabs/php_codesniffer": "^3.4"
},
"bin": [
"bin/upgrade-carbon"
"bin/carbon"
],
"type": "library",
"extra": {
"update-helper": "Carbon\\Upgrade",
"laravel": {
"providers": [
"Carbon\\Laravel\\ServiceProvider"
......@@ -1410,7 +1369,7 @@
},
"autoload": {
"psr-4": {
"": "src/"
"Carbon\\": "src/Carbon/"
}
},
"notification-url": "https://packagist.org/downloads/",
......@@ -1422,16 +1381,20 @@
"name": "Brian Nesbitt",
"email": "brian@nesbot.com",
"homepage": "http://nesbot.com"
},
{
"name": "kylekatarnls",
"homepage": "http://github.com/kylekatarnls"
}
],
"description": "A simple API extension for DateTime.",
"description": "An API extension for DateTime that supports 281 different languages.",
"homepage": "http://carbon.nesbot.com",
"keywords": [
"date",
"datetime",
"time"
],
"time": "2019-06-11T09:07:59+00:00"
"time": "2019-10-14T14:18:59+00:00"
},
{
"name": "nikic/php-parser",
......@@ -3976,25 +3939,25 @@
},
{
"name": "maximebf/debugbar",
"version": "v1.15.0",
"version": "v1.15.1",
"source": {
"type": "git",
"url": "https://github.com/maximebf/php-debugbar.git",
"reference": "30e7d60937ee5f1320975ca9bc7bcdd44d500f07"
"reference": "6c4277f6117e4864966c9cb58fb835cee8c74a1e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/30e7d60937ee5f1320975ca9bc7bcdd44d500f07",
"reference": "30e7d60937ee5f1320975ca9bc7bcdd44d500f07",
"url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/6c4277f6117e4864966c9cb58fb835cee8c74a1e",
"reference": "6c4277f6117e4864966c9cb58fb835cee8c74a1e",
"shasum": ""
},
"require": {
"php": ">=5.3.0",
"php": ">=5.6",
"psr/log": "^1.0",
"symfony/var-dumper": "^2.6|^3.0|^4.0"
"symfony/var-dumper": "^2.6|^3|^4"
},
"require-dev": {
"phpunit/phpunit": "^4.0|^5.0"
"phpunit/phpunit": "^5"
},
"suggest": {
"kriswallsmith/assetic": "The best way to manage assets",
......@@ -4004,7 +3967,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.14-dev"
"dev-master": "1.15-dev"
}
},
"autoload": {
......@@ -4033,7 +3996,7 @@
"debug",
"debugbar"
],
"time": "2017-12-15T11:13:46+00:00"
"time": "2019-09-24T14:55:42+00:00"
},
{
"name": "mockery/mockery",
......@@ -5462,8 +5425,8 @@
"authors": [
{
"name": "Arne Blankerts",
"role": "Developer",
"email": "arne@blankerts.de"
"email": "arne@blankerts.de",
"role": "Developer"
}
],
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
......
resources/views/auth/login.blade.php
View file @ aeaeaab2
......@@ -39,7 +39,7 @@
<div class="col-md-8 offset-md-4 mt-4">
Впервые у нас?
<span class="text-muted">
<a class="" href="{{ route('register') }}">
<a class="" href="/register">
Регистрация.
</a>
</span>
......
resources/views/auth/register.blade.php
View file @ aeaeaab2
......@@ -14,34 +14,67 @@
<div class="form-wrap">
<input class="form-input" id="name" type="text" name="name"
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 class="form-wrap">
<input class="form-input" id="email" type="email" name="email"
placeholder="email">
@if ($errors->has('email'))
<span class="invalid-feedback" role="alert">
<strong>{{ $errors->first('email') }}</strong>
</span>
@endif
</div>
<div class="form-wrap">
<input class="form-input" id="password" type="password" name="password"
placeholder="Пароль">
</div>
<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="Подтверждение пароля">
@if ($errors->has('password'))
<span class="invalid-feedback" role="alert">
<strong>{{ $errors->first('password') }}</strong>
</span>
@endif
</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>
</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>
<p class="text-uppercase text-gray offset-7">или</p>
{{-- <p class="text-uppercase text-gray offset-7">или</p>--}}
</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>
......
resources/views/pages/profile/addresses.blade.php
View file @ aeaeaab2
......@@ -22,6 +22,7 @@
<th>Паспорт</th>
<th>Адрес</th>
<th>Тел.</th>
<th>Тип</th>
<th>Опции</th>
</tr>
</thead>
......@@ -37,11 +38,17 @@
{{ $unit->phone }}
</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">
@csrf
@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>
</td>
</tr>
......@@ -51,7 +58,7 @@
</div>
<!-- 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>
......
resources/views/pages/profile/user.blade.php
View file @ aeaeaab2
......@@ -14,12 +14,9 @@
<div class="col-4">
<div class="card bg-white border-primary mb-3">
<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">
97 Quentin Road, <br />
ID {{ Auth::user()->id }}-FZ <br />
Brooklyn, NY 11234
(347) 547-9797
Код Клиента <b style="font-size: 16px">{{ Auth::user()->uni_code }}</b> <br/>
</p>
</div>
</div>
......@@ -31,25 +28,31 @@
<div class="col-xs-12 col-sm-6 form-group">
<div class="form-wrap">
<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 class="col-xs-12 col-sm-6 form-group">
<div class="form-wrap">
<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 class="col-xs-12 col-sm-6 form-group">
<div class="form-wrap">
<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 class="col-xs-12 col-sm-6 form-group">
<div class="form-wrap">
<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 class="col-xs-12 col-sm-6 form-group">
......@@ -61,12 +64,13 @@
<div class="col-xs-12 col-sm-6 form-group">
<div class="form-wrap">
<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>
<br /><br />
<br/><br/>
<button class="btn btn-primary btn-xs">Сохранить</button>
</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