Release 28.10.2019

app/Http/Controllers/OrderController.php

@@ -76,6 +76,7 @@ class OrderController extends Controller
                 'status_id',
                 'label_url',
                 'comment',
+                DB::raw('(SELECT name FROM payment_statuses WHERE id=(select payment_statuses_id from payment where order_id=orders.id)) as payment_status'),
                 DB::raw('(SELECT title FROM flights WHERE id=orders.flight_id) as flights'),
                 DB::raw('(SELECT name FROM users WHERE id=orders.operator_id) as operator'),
                 DB::raw('(SELECT concat(name, \' \', surname) FROM clients WHERE id=orders.client_id) as client'),
@@ -118,7 +119,7 @@ class OrderController extends Controller
                 'status_id',
                 'label_url',
                 'comment',
-                DB::raw('(SELECT name FROM payment_statuses WHERE id=(select payment_statuses_id from payment where order_id=orders.id)) as payment_statuses'),
+                DB::raw('(SELECT name FROM payment_statuses WHERE id=(select payment_statuses_id from payment where order_id=orders.id)) as payment_status'),
                 DB::raw('(SELECT title FROM flights WHERE id=orders.flight_id) as flights'),
                 DB::raw('(SELECT name FROM users WHERE id=orders.operator_id) as operator'),
                 DB::raw('(SELECT concat(name, \' \', surname) FROM clients WHERE id=orders.client_id) as client'),
@@ -130,6 +131,8 @@ class OrderController extends Controller
                 ['client_id', '=', $id],
                 ['status_id', '=', $status_id]
             ])->get();
+
+
         }
 
         $statuses = DB::select('SELECT s.id, s.sort, s.title, s.color_class, (SELECT count(*) FROM orders where status_id=s.id and client_id=' . $id . ') as count FROM status s');
@@ -363,7 +366,7 @@ class OrderController extends Controller
             'id',
             'user_id',
             'country',
-            'firstname', 'secondname',
+            'firstname', 'secondname','phone',
             'city', 'street', 'house', 'apartment', 'zip', 'passport', 'type',
             DB::raw('(SELECT title_ru FROM country WHERE id=address_info.country) as country_name'),
             DB::raw('(SELECT title_ru FROM city WHERE id=address_info.city) as city_name'),

app/Models/Client.php

@@ -21,7 +21,7 @@ class Client extends Authenticatable
         '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'
+        'scan_id', 'client_type', 'is_email_ver'
     ];
 
 //    protected $hidden = [

resources/views/layouts/user_new.blade.php

@@ -12,10 +12,11 @@
     <!-- jQuery -->
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.9.1/jquery.min.js" type="text/javascript"></script>
     <!-- jQuery easing plugin -->
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js" type="text/javascript"></script>
-{{--        <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"--}}
-{{--                integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"--}}
-{{--                crossorigin="anonymous"></script>--}}
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js"
+            type="text/javascript"></script>
+    {{--        <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"--}}
+    {{--                integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"--}}
+    {{--                crossorigin="anonymous"></script>--}}
     <style>
         body {
             background-color: #fbfbfb !important;
@@ -68,6 +69,12 @@
             vertical-align: middle;
             float: right;
         }
+
+        input[type=number]::-webkit-inner-spin-button,
+        input[type=number]::-webkit-outer-spin-button {
+            -webkit-appearance: none;
+            margin: 0;
+        }
     </style>
 </head>
 <body>

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

@@ -64,9 +64,9 @@
                                 <th>Статус</th>
                                 <th>Трек №</th>
                                 <th>Количество товаров</th>
-                                <th>Стоимость товаров</th>
+                                <th>Сумма товаров</th>
                                 <th>Вес</th>
-                                <th>Стоимость доставки</th>
+                                <th>Сумма доставки</th>
                                 <th>FedEx</th>
                                 <th>Способ оплаты</th>
                                 <th>Статус платежа</th>
@@ -93,7 +93,9 @@
                                     <td class="text-center"><a
                                             href="{{ ($package->payment_info == 3)?'/packages/payment/'.$package->id:'#' }}">{{ ($package->payment_info == 3)?'Оплатить онлайн':'Pay offline' }}</a>
                                     </td>
-                                    <td class="text-center">{{ $package->payment_statuses }}</td>
+                                    <td class="text-center">{{ $package->payment_status }}</td>
+                                    <td class="text-center"><a
+                                            href="#"><i class="fa fa-pencil" style="color: #e0a800"></i></a></td>
                                 </tr>
                             @endforeach
                             </tbody>

routes/web.php

@@ -18,8 +18,9 @@ Route::get('/', function () {
 Route::get('/watch', function () {
     return view('welcome');
 });
-//
-//Auth::routes();
+
+Auth::routes();
+Auth::routes(['verify' => true]);
 
 //Route::get('/home', 'HomeController@index')->name('home');
 
@@ -98,7 +99,6 @@ Route::post('/profile/password/', 'ProfileController@edit_password')->middleware
 Route::get('/tariffs', 'HomeController@tariffs')->name('tariffs');
 Route::get('/terms', 'HomeController@terms')->name('terms');
 
-Auth::routes();
 Route::get('/home', 'HomeController@index')->name('home');
 //
 ///**