Skip to content

F
fazo
Commit 898273e7 authored by Ruslan's avatar Ruslan
Browse files
Options

Stage 1

parent 62b586ac
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 306 additions and 199 deletions
.idea/workspace.xml
View file @ 898273e7
This diff is collapsed.
app/Http/Controllers/PackagesController.php
View file @ 898273e7
...@@ -33,7 +33,7 @@ class PackagesController extends Controller ...@@ -33,7 +33,7 @@ class PackagesController extends Controller
$packages = Package::where('user_id', Auth::id())->where('status', 'pending')->orderBy('id', 'desc')->get(); $packages = Package::where('user_id', Auth::id())->where('status', 'pending')->orderBy('id', 'desc')->get();
$declarationJson = $this->makeDeclarationJSON($packages); $declarationJson = $this->makeDeclarationJSON($packages);
return view('pages.packages.packages_pending', [ return view('pages.parcels.index', [
'packages' => $packages, 'packages' => $packages,
'jsonStructure' => $declarationJson, 'jsonStructure' => $declarationJson,
'countPackages' => $this->countPackages(), 'countPackages' => $this->countPackages(),
...@@ -73,7 +73,7 @@ class PackagesController extends Controller ...@@ -73,7 +73,7 @@ class PackagesController extends Controller
$packages = Package::where('user_id', Auth::id())->where('status', 'instore')->orderBy('id', 'desc')->get(); $packages = Package::where('user_id', Auth::id())->where('status', 'instore')->orderBy('id', 'desc')->get();
return view('pages.packages.packages_inwarehouse', [ return view('pages.parcels.packages_inwarehouse', [
'packages' => $packages, 'packages' => $packages,
'jsonStructure' => $this->makeDeclarationJSON($packages), 'jsonStructure' => $this->makeDeclarationJSON($packages),
'countPackages' => $this->countPackages(), 'countPackages' => $this->countPackages(),
......
app/Http/Controllers/ProfileController.php
View file @ 898273e7
...@@ -256,7 +256,7 @@ class ProfileController extends Controller ...@@ -256,7 +256,7 @@ class ProfileController extends Controller
public function address() public function address()
{ {
$units = Address::where('user_id', '=', Auth::user()->id); $units = Address::where('user_id', '=', Auth::user()->id)->get();
return view('pages.profile.addresses', compact('units')); return view('pages.profile.addresses', compact('units'));
} }
......
resources/views/layouts/user_new.blade.php
View file @ 898273e7
...@@ -6,11 +6,9 @@ ...@@ -6,11 +6,9 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>FazoShop.us</title> <title>FazoShop.us</title>
<link rel="canonical" href="https://getbootstrap.com/docs/4.3/examples/pricing/">
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous"> <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<link rel="stylesheet" href="{{ asset('css/font-awesome.min.css') }}" >
<style> <style>
body { body {
...@@ -49,7 +47,7 @@ ...@@ -49,7 +47,7 @@
footer{ footer{
background-color: #fff; background-color: #fff;
} }
.text-top-title { color: #6b8eea!important } .text-top-title { color: #567ee6!important }
</style> </style>
</head> </head>
<body> <body>
......
resources/views/pages/parcels/index.blade.php
View file @ 898273e7
@extends('layouts.user') @extends('layouts.user_new')
@section('content') @section('content')
<div class="row">
<section class="bg-light section-lg"> <div class="col-12">
<ol class="breadcrumb"> <h4 class="mb-5">
<span class="text-top-title">Ожидаемые посылки</span>
</ol> </h4>
</section> </div>
</div>
<section class="section section-inset-1"> <section class="section section-inset-1">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-xs-12 section-inset-1"> <div class="col-12">
<nav>
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<a class="nav-item nav-link active" id="nav-home-tab" data-toggle="tab" href="#nav-home" role="tab" aria-selected="true">Ожидаются <span class="badge badge-pill badge-primary">0</span></a>
<a class="nav-item nav-link" id="nav-profile-tab" data-toggle="tab" href="#nav-profile" role="tab" aria-selected="false">На складе <span class="badge badge-pill badge-primary">0</span></a>
<a class="nav-item nav-link" id="nav-contact-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-selected="false">На упаковке <span class="badge badge-pill badge-primary">0</span></a>
<a class="nav-item nav-link" id="nav-sent-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-selected="false">Отправленные <span class="badge badge-pill badge-primary">0</span></a>
<a class="nav-item nav-link" id="nav-delivered-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-selected="false">Доставленные <span class="badge badge-pill badge-primary">0</span></a>
</div>
</nav>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-bordered text-left table-primary table-hover"> <table class="table table-hover bg-white border-1 shadow-sm">
<thead> <thead>
<tr class="bg-dark"> <tr>
<th>Tracking ID</th> <th>Tracking ID</th>
<th>Name</th> <th>Название</th>
<th>Status</th> <th>Статус</th>
<th>Parcel weight</th> <th>Вес</th>
<th>Total Items</th> <th>Количество</th>
<th>Total Price</th> <th>Общая стоимость</th>
<th>Manage</th> <th>Manage</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach($units as $unit) @foreach($packages as $unit)
<tr> <tr>
<td>{{ $unit->track_number }}</td> <td>{{ $unit->track_number }}</td>
<td><a href="#">{{ $unit->package_name }}</a></td> <td><a href="#">{{ $unit->package_name }}</a></td>
...@@ -48,7 +62,7 @@ ...@@ -48,7 +62,7 @@
</div> </div>
<!-- RD Mailform--> <!-- RD Mailform-->
<a href="/packages/addr" class="btn btn-primary btn-xs pull-sm-right btn-shadow" >Add Order</a> <a href="/packages/addr" class="btn btn-primary shadow" >Добавить посылку</a>
</div> </div>
</div> </div>
......
resources/views/pages/parcels/packages_inwarehouse.blade.php 0 → 100644
View file @ 898273e7
@extends('layouts.user_new')
@section('content')
<div class="row">
<div class="col-12">
<h4 class="mb-5">
<span class="text-top-title">Посылки на складе</span>
</h4>
</div>
</div>
<section class="section section-inset-1">
<div class="container">
<div class="row">
<div class="col-12">
<nav>
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<a class="nav-item nav-link" id="nav-home-tab" data-toggle="tab" href="#nav-home" role="tab" aria-selected="false">Ожидаются <span class="badge badge-pill badge-primary">0</span></a>
<a class="nav-item nav-link active" id="nav-profile-tab" data-toggle="tab" href="#nav-profile" role="tab" aria-selected="true">На складе <span class="badge badge-pill badge-primary">0</span></a>
<a class="nav-item nav-link" id="nav-contact-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-selected="false">На упаковке <span class="badge badge-pill badge-primary">0</span></a>
<a class="nav-item nav-link" id="nav-sent-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-selected="false">Отправленные <span class="badge badge-pill badge-primary">0</span></a>
<a class="nav-item nav-link" id="nav-delivered-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-selected="false">Доставленные <span class="badge badge-pill badge-primary">0</span></a>
</div>
</nav>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="table-responsive">
<form action="{{ url('/packages/warehouse') }}" method="post" novalidate>
{{ csrf_field() }}
<table class="table table-light table-hover table-bordered table-sm">
<thead class="">
<tr>
<th>-</th>
<th>№</th>
<th>Статус</th>
<th>Трек №</th>
<th>Количество товаров</th>
<th>Стоимость товаров</th>
<th>Вес</th>
<th>Стоимость доставки</th>
</tr>
</thead>
<tbody>
@foreach($packages as $package)
<tr>
<td class="text-center"><input type="checkbox" name="packages2pack[]" value="{{ $package->id }}"> </td>
<td class="text-center">{{ $package->package_number() }}</td>
<td class="text-center"><span class="badge badge-primary">{{ \App\Models\Package::$statuses_descr[$package->status] }}</span></td>
<td><a href="#" class="text-info"> {{ $package->track_number }} </a></td>
<td class="d-flex justify-content-between align-items-center">
<span class="badge badge-primary badge-pill">{{ $package->total_items() }}</span>
<a href="#" onclick="showModal({{ $package->id }})">Декларация</a>
</td>
<td class="text-center">${{ $package->items_cost() }}</td>
<td class="text-center">{{ $package->items_weight() }} кг</td>
<td class="text-center">{{ $package->delivery_cost }}</td>
</tr>
@endforeach
</tbody>
</table>
<input type="submit" class="btn btn-success mb-5 mt-4" value="Отправить на упаковку" />
</form>
</div>
<!-- RD Mailform-->
<h5>Обозначение статусов:</h5>
<ul>
<li>Ожидаются - Посылка создана в системе, но еще не дошла до нашего склада.</li>
<li>На складе - Посылка находится на складе в Нью-Йорке.</li>
<li>На упаковке - Посылка проходит процесс упаковки и отправки.</li>
<li>Отправленные - Посылка находится в пути.</li>
<li>Доставленные - Посылка находится на складе в Ташкенте.</li>
</ul>
</div>
</div>
</div>
</section>
@endsection
resources/views/pages/parcels/packages_pending.blade.php 0 → 100644
View file @ 898273e7
<?php
/**
* Created by PhpStorm.
* User: RSkaldin
* Date: 6/15/2019
* Time: 2:24 AM
*/
\ No newline at end of file
resources/views/pages/profile/address_add.blade.php
View file @ 898273e7
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<h4 class="mb-5"> <h4 class="mb-5">
<span class="text-top-title">Редактирование профиля</span> <span class="text-top-title">Добавление адреса</span>
</h4> </h4>
</div> </div>
</div> </div>
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
</div> </div>
</div> </div>
<button class="btn btn-primary btn-sm mt-4" type="submit">Добавить Адрес</button> <button class="btn btn-primary btn-sm mt-4 shadow" type="submit">Добавить Адрес</button>
</form> </form>
</div> </div>
@endsection @endsection
resources/views/pages/profile/addresses.blade.php
View file @ 898273e7
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<h4 class="mb-5"> <h4 class="mb-5">
<span class="text-top-title">Редактирование профиля</span> <span class="text-top-title">Список ваших адресов</span>
</h4> </h4>
</div> </div>
</div> </div>
...@@ -32,32 +32,26 @@ ...@@ -32,32 +32,26 @@
<td>{{ $unit->firstname }} {{ $unit->lastname }}</td> <td>{{ $unit->firstname }} {{ $unit->lastname }}</td>
<td>{{ $unit->passport }} <td>{{ $unit->passport }}
</td> </td>
<td>{{ $unit->address }}</td> <td>{{ $unit->getFormated() }}</td>
<td> <td>
{{ $unit->phone }} {{ $unit->phone }}
</td> </td>
<td> <td>
<form action="{{ route('address.destroy',$device->id) }}" method="POST"> <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 @csrf
@method('DELETE') @method('DELETE')
<button type="submit" class="btn btn-danger btn-sm" ><i class="fa fa-times-circle"></i> Удалить</button>
<a href="/address/{{$unit->id}}/edit"><i class="fa fa-pencil"></i></a> </form>
<button class="fa fa-times-circle" >
</button></form>
</td> </td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
</div> </div>
<!-- RD Mailform--> <!-- RD Mailform-->
<a class="btn btn-primary btn-sm pull-sm-right" href="{{ route('address.add') }}" >Добавить адрес</a> <a class="btn btn-primary shadow" href="{{ route('address.add') }}" >Добавить адрес</a>
</div> </div>
</div> </div>
......
resources/views/pages/profile/profile_edit.blade.php
View file @ 898273e7
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</div> </div>
<div class="form-group row mb-0"> <div class="form-group row mb-0">
<div class="col-md-6 offset-md-4"> <div class="col-md-6 offset-md-4 shadow">
<button type="submit" class="btn btn-primary"> <button type="submit" class="btn btn-primary">
Сохранить изменения Сохранить изменения
</button> </button>
......
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