Stage 1.1

.env

@@ -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_USERNAME=root
+DB_PASSWORD=
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file

app/Http/Controllers/PackagesController.php

@@ -88,7 +88,7 @@ class PackagesController extends Controller
     public function onpacking_packages()
     {
         $packages = Package::where('user_id', Auth::id())->where('status', 'onpacking')->orderBy('id', 'desc')->get();
-        return view('pages.packages.packages_onpacking', [
+        return view('pages.parcels.packages_onpacking', [
             'packages' => $packages,
             'jsonStructure' => $this->makeDeclarationJSON($packages),
             'countPackages' => $this->countPackages(),
@@ -102,7 +102,7 @@ class PackagesController extends Controller
     public function sent_packages()
     {
         $packages = Package::where('user_id', Auth::id())->where('status', 'sent')->orderBy('id', 'desc')->get();
-        return view('pages.packages.packages_sent', [
+        return view('pages.parcels.packages_sent', [
             'packages' => $packages,
             'jsonStructure' => $this->makeDeclarationJSON($packages),
             'countPackages' => $this->countPackages(),

resources/views/pages/packages/declaration_script.blade.php

@@ -2,7 +2,7 @@
     var packagesDeclaration = {!! $jsonStructure !!};
 
     function showModal(id) {
-        var table = '<table class="table table-bordered"><thead><tr><th>Название</th><th>Количество</th><th>Цена</th><th>Вес</th></thead><tbody>';
+        var table = '<table class="table table-bordered table-sm"><thead class="thead-light"><tr><th>Название</th><th>Количество</th><th>Цена</th><th>Вес</th></thead><tbody>';
         for (i in packagesDeclaration[id]) {
             table += '<tr><td>' + packagesDeclaration[id][i].name + '</td><td>'
             + packagesDeclaration[id][i].amount + '</td><td> $' + packagesDeclaration[id][i].price + '</td><td>'

resources/views/pages/parcels/declaration_modal.blade.php

+<div class="modal" tabindex="-1" id="declarationModal" role="dialog">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">Декларация</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <p>Декларация пуста</p>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" data-dismiss="modal">Закрыть</button>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file

resources/views/pages/parcels/index.blade.php

 @extends('layouts.user_new')
-
+@section('custom_script')
+    @include('pages.packages.declaration_script', ['jsonStructure' => $jsonStructure])
+@endsection
 @section('content')
     <div class="row">
         <div class="col-12">
@@ -10,50 +12,55 @@
     </div>
     <section class="section section-inset-1">
         <div class="container">
-            @include('pages.pages.parcels.package_menu', ['countPackages' => $countPackages])
+            @include('pages.parcels.package_menu', ['countPackages' => $countPackages, 'active' => \App\Models\Package::STATUS_PENDING])
             <div class="row">
                 <div class="col-md-12">
                     <div class="table-responsive">
-                        <table class="table table-hover bg-white border-1 shadow-sm">
-                            <thead>
+                        <table class="table table-hover bg-white shadow-sm table-bordered">
+                            <thead class="thead-light">
                             <tr>
-                                <th>Tracking ID</th>
-                                <th>Название</th>
+                                <th>-</th>
+                                <th>№</th>
                                 <th>Статус</th>
+                                <th>Трек №</th>
+                                <th>Количество товаров</th>
+                                <th>Стоимость товаров</th>
                                 <th>Вес</th>
-                                <th>Количество</th>
-                                <th>Общая стоимость</th>
-                                <th>Manage</th>
+                                <th>Стоимость доставки</th>
                             </tr>
                             </thead>
                             <tbody>
-                            @foreach($packages as $unit)
+                            @foreach($packages as $package)
                                 <tr>
-                                <td>{{ $unit->track_number }}</td>
-                                <td><a href="#">{{ $unit->package_name }}</a></td>
-                                <td><b>{{ $unit->status }}</b></td>
-                                <td>{{ $unit->items_weight() }}</td>
-                                <td>{{ $unit->total_items() }}</td>
-                                <td>${{ $unit->items_cost() }}</td>
-                                <td>
-                                    @if($unit->status == 1)
-                                        <span class="icon icon-xs fa fa-money"></span>
-                                    @endif
-
-                                    <span class="icon icon-xs fa fa-pencil"></span>
-                                    <span class="icon icon-xs fa fa-times-circle"></span>
+                                    <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>
+                        </table>
                     </div>
                     <!-- RD Mailform-->
 
-                    <a href="/packages/addr" class="btn btn-primary shadow" >Добавить посылку</a>
+                    <a href="/packages/addr" class="btn btn-success shadow" >Добавить посылку</a>
+                </div>
+            </div>
+            <div class="row mt-5">
+                <div class="col-12">
+                    @include('pages.parcels.status_description')
                 </div>
-
             </div>
         </div>
     </section>
+
+    @include('pages.parcels.declaration_modal')
 @endsection

resources/views/pages/parcels/package_menu.blade.php

@@ -2,27 +2,31 @@
     <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"> Ожидаются
+                <a class="nav-item nav-link {{ $active == \App\Models\Package::STATUS_PENDING ? 'active' : '' }}" href="{{ route('packagePending') }}"> Ожидаются
                     @if($countPackages['onPending'] !== 0)
                         <span class="badge badge-pill badge-primary">{{ $countPackages['onPending'] }}</span>
                     @endif
                 </a>
-                <a class="nav-item nav-link" id="nav-profile-tab" data-toggle="tab" href="#nav-profile" role="tab" aria-selected="false">На складе
+                <a class="nav-item nav-link {{ $active == \App\Models\Package::STATUS_INSTORE ? 'active' : '' }}" href="{{ route('packageInwarehouse') }}">На складе
                     @if($countPackages['inStore'] !== 0)
                         <span class="badge badge-pill badge-primary">{{ $countPackages['inStore'] }}</span>
                     @endif
                 </a>
-                <a class="nav-item nav-link" id="nav-contact-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-selected="false">На упаковке
+                <a class="nav-item nav-link {{ $active == \App\Models\Package::STATUS_ONPACKING ? 'active' : '' }}" href="{{ route('packagePacking') }}">На упаковке
                     @if($countPackages['onPacking'] !== 0)
                         <span class="badge badge-pill badge-primary">{{ $countPackages['onPacking'] }}</span>
                     @endif
                 </a>
-                <a class="nav-item nav-link" id="nav-sent-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-selected="false">Отправленные
+                <a class="nav-item nav-link {{ $active == \App\Models\Package::STATUS_SENT ? 'active' : '' }}" href="{{ route('packageSent') }}">Отправленные
                     @if($countPackages['sent'] !== 0)
                         <span class="badge badge-pill badge-primary">{{ $countPackages['sent'] }}</span>
                     @endif
                 </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>
+                <a class="nav-item nav-link" id="nav-delivered-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-selected="false">Доставленные
+                    @if($countPackages['delivered'] !== 0)
+                        <span class="badge badge-pill badge-primary">{{ $countPackages['delivered'] }}</span>
+                    @endif
+                </a>
             </div>
         </nav>
     </div>

resources/views/pages/parcels/packages_inwarehouse.blade.php

 @extends('layouts.user_new')
-
+@section('custom_script')
+    @include('pages.packages.declaration_script', ['jsonStructure' => $jsonStructure])
+@endsection
 @section('content')
     <div class="row">
         <div class="col-12">
@@ -10,19 +12,7 @@
     </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>
+            @include('pages.parcels.package_menu', ['countPackages' => $countPackages, 'active' => \App\Models\Package::STATUS_INSTORE])
             <div class="row">
                 <div class="col-md-12">
                     <div class="table-responsive">
@@ -30,8 +20,8 @@
 
                             {{ csrf_field() }}
 
-                            <table class="table table-light table-hover table-bordered table-sm">
-                                <thead class="">
+                            <table class="table table-hover bg-white shadow-sm table-bordered">
+                                <thead class="thead-light">
                                 <tr>
                                     <th>-</th>
                                     <th>№</th>
@@ -62,22 +52,19 @@
                                 </tbody>
                             </table>
 
-                            <input type="submit" class="btn btn-success mb-5 mt-4" value="Отправить на упаковку" />
+                            <input type="submit" class="btn btn-success shadow 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 class="row">
+                <div class="col-12">
+                    @include('pages.parcels.status_description')
+                </div>
             </div>
         </div>
     </section>
+
+    @include('pages.parcels.declaration_modal')
 @endsection

resources/views/pages/parcels/packages_onpacking.blade.php

+@extends('layouts.user_new')
+@section('custom_script')
+    @include('pages.packages.declaration_script', ['jsonStructure' => $jsonStructure])
+@endsection
+@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">
+            @include('pages.parcels.package_menu', ['countPackages' => $countPackages, 'active' => \App\Models\Package::STATUS_ONPACKING])
+            <div class="row">
+                <div class="col-md-12">
+                    <div class="table-responsive">
+                            <table class="table table-hover bg-white shadow-sm table-bordered">
+                                <thead class="thead-light">
+                                <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>
+                    </div>
+                    <!-- RD Mailform-->
+                </div>
+            </div>
+            <div class="row mt-5">
+                <div class="col-12">
+                    @include('pages.parcels.status_description')
+                </div>
+            </div>
+        </div>
+    </section>
+
+    @include('pages.parcels.declaration_modal')
+@endsection

resources/views/pages/parcels/packages_pending.blade.php

-<?php
-/**
- * Created by PhpStorm.
- * User: RSkaldin
- * Date: 6/15/2019
- * Time: 2:24 AM
- */
\ No newline at end of file

resources/views/pages/parcels/packages_sent.blade.php

+@extends('layouts.user_new')
+@section('custom_script')
+    @include('pages.packages.declaration_script', ['jsonStructure' => $jsonStructure])
+@endsection
+@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">
+            @include('pages.parcels.package_menu', ['countPackages' => $countPackages, 'active' => \App\Models\Package::STATUS_SENT])
+            <div class="row">
+                <div class="col-md-12">
+                    <div class="table-responsive">
+                        <table class="table table-hover bg-white shadow-sm table-bordered">
+                            <thead class="thead-light">
+                            <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>
+                    </div>
+                    <!-- RD Mailform-->
+                </div>
+            </div>
+            <div class="row mt-5">
+                <div class="col-12">
+                    @include('pages.parcels.status_description')
+                </div>
+            </div>
+        </div>
+    </section>
+
+    @include('pages.parcels.declaration_modal')
+@endsection

resources/views/pages/parcels/status_description.blade.php

+<h5>Обозначение статусов:</h5>
+<ul class="list-unstyled">
+    <li><span class="badge badge-danger shadow-sm">Ожидаются</span> - Посылка создана в системе, но еще не дошла до нашего склада.</li>
+    <li><span class="badge badge-warning shadow-sm">На складе</span> - Посылка находится на складе в США.</li>
+    <li><span class="badge badge-info shadow-sm">На упаковке</span> - Посылка проходит процесс упаковки и отправки.</li>
+    <li><span class="badge badge-primary shadow-sm">Отправленные</span> - Посылка находится в пути.</li>
+    <li><span class="badge badge-success shadow-sm">Доставленные</span> - Посылка находится на складе в Ташкенте.</li>
+</ul>
+</div>

resources/views/pages/profile/addresses.blade.php

@@ -14,7 +14,7 @@
             <div class="row">
                 <div class="col-12 section-inset-1">
                     <div class="table-responsive">
-                        <table class="table table-hover">
+                        <table class="table table-hover bg-white border-1 shadow-sm">
                             <thead>
                             <tr class="">
                                 <th>#</th>

routes/web.php

@@ -39,7 +39,7 @@ Route::post('/feedback/add', 'FeedbackController@addGuest');
 
 Route::get('/packages/pay', 'PackagesController@pay');
 Route::get('/packages/addr', 'PackagesController@addr');
-Route::get('/packages', 'PackagesController@index')->name('package');
+Route::get('/packages', 'PackagesController@pending_packages')->name('package');
 Route::get('/profile/address', 'ProfileController@address')->name('address');
 Route::get('/profile/addaddress', 'ProfileController@addaddress')->name('address.add');
 Route::post('/profile/storeaddress', 'ProfileController@storeaddress')->name('address.store');
@@ -48,13 +48,13 @@ Route::get('/profile', 'ProfileController@profile');
 Route::post('/profile/save', 'ProfileController@save')->name('profile.save');
 
 Route::get('/packages/list', 'PackagesController@pending_packages');
-Route::get('/packages/pending', 'PackagesController@pending_packages');
-Route::get('/packages/warehouse', 'PackagesController@inwarehouse_packages');
+Route::get('/packages/pending', 'PackagesController@pending_packages')->name('packagePending');
+Route::get('/packages/warehouse', 'PackagesController@inwarehouse_packages')->name('packageInwarehouse');
 Route::post('/packages/warehouse', 'PackagesController@inwarehouse_packages');
-Route::get('/packages/packing', 'PackagesController@onpacking_packages');
+Route::get('/packages/packing', 'PackagesController@onpacking_packages')->name('packagePacking');
 Route::get('/packages/register', 'PackagesController@register');
 Route::post('/packages/register', 'PackagesController@register');
-Route::get('/packages/sent', 'PackagesController@sent_packages');
+Route::get('/packages/sent', 'PackagesController@sent_packages')->name('packageSent');
 
 Route::get('/profile/info', 'ProfileController@info')->middleware('auth');
 Route::post('/profile/address/add', 'ProfileController@address_add')->middleware('auth');
@@ -74,7 +74,7 @@ Auth::routes();
 Route::get('/home', 'HomeController@index')->name('home');
 
 /**
- *  Роуты для управления складом
+ *  Роуты для управления складом Админ панель
  */
 Route::namespace('Postman')->group(function () {
     Route::get('/postman/packages', 'PackagesController@packages_list');