fix

app/Http/Controllers/DeliverySytemsController.php

@@ -74,24 +74,24 @@ class DeliverySytemsController extends Controller
         if ($order == null) {
             return response()->json(['warning' => 'Order not found'], 200);
         } elseif ($order['label_url'] == null) {
-            $street = $sender[0]->street; //'test str';
-            $city = $sender[0]->city_name; // 'Unit C1 Brooklyn';
+            $street = $sender[0]->street; //'97 Quentin Rd, 1st Floor';
+            $city = $sender[0]->city_name; // 'Brooklyn';
             $stateOrProvinceCode = $sender[0]->city_name; // 'NY';
-            $postalCode = $sender[0]->zip; // '11229';
+            $postalCode = $sender[0]->zip; // '11223';
             $countryCode = 'US'; //'US';
-            $weight = ($order['weight'] > 0) ? $order['weight'] : 1; // 10;
+            $weight = ($order['weight'] > 0) ? $order['weight'] : 1; // 20;
 
 
             $userCredential = new WebAuthenticationCredential();
             $userCredential
-                ->setKey('dXw7hhDl5lS6mwqs')
-                ->setPassword('DDOWpwxnnmPsUxWNSM8gXLIdD');
+                ->setKey('WZmcVJM6rADSDHRA')
+                ->setPassword('RFdr6uqXNvFpZVvwtoEaGLuRG');
             $webAuthenticationDetail = new WebAuthenticationDetail();
             $webAuthenticationDetail->setUserCredential($userCredential);
             $clientDetail = new ClientDetail();
             $clientDetail
-                ->setAccountNumber('510087100')
-                ->setMeterNumber('119157536');
+                ->setAccountNumber('647927254')
+                ->setMeterNumber('250557652');
             $version = new VersionId();
             $version
                 ->setMajor(23)
@@ -100,20 +100,23 @@ class DeliverySytemsController extends Controller
                 ->setServiceId('ship');
             $shipperAddress = new Address();
             $shipperAddress
-                ->setStreetLines([$street])
-                ->setCity($city)
-                ->setStateOrProvinceCode($stateOrProvinceCode)
-                ->setPostalCode($postalCode)
-                ->setCountryCode($countryCode);
+                ->setStreetLines(['56 Christopher Columbus Dr'])
+//                ->setStreetLines([$street])
+                ->setCity('Jersey City')
+//                ->setCity($city)
+                ->setStateOrProvinceCode('NJ')
+//                ->setStateOrProvinceCode($stateOrProvinceCode)
+                ->setPostalCode('07302')
+                ->setCountryCode('US');
             $shipperContact = new Contact();
             $shipperContact
-//            ->setCompanyName('TuronExpresss')
+//            ->setCompanyName('FAZO CARGO INC.')
 //                ->setEMailAddress('test@example.com')
-                ->setPersonName($sender[0]->firstname.' '.$sender[0]->secondname.' '.$sender[0]->fathername)
+                ->setPersonName($sender[0]->firstname . ' ' . $sender[0]->secondname . ' ' . $sender[0]->fathername)
                 ->setPhoneNumber(($sender[0]->phone));
             $shipper = new Party();
             $shipper
-                ->setAccountNumber('510087100')
+                ->setAccountNumber('250557652')
                 ->setAddress($shipperAddress)
                 ->setContact($shipperContact);
             $recipientAddress = new Address();
@@ -121,13 +124,13 @@ class DeliverySytemsController extends Controller
                 ->setStreetLines(['97 Quentin Rd, 1st floor'])
                 ->setCity('Brooklyn')
                 ->setStateOrProvinceCode('NY')
-                ->setPostalCode('11229')
+                ->setPostalCode('11223')
                 ->setCountryCode('US');
             $recipientContact = new Contact();
             $recipientContact
-                ->setCompanyName('Fazo Cargo')
-                ->setPersonName('Test FullName')
-                ->setPhoneNumber('+1 347 547 9797');
+                ->setCompanyName('FAZO CARGO INC.')
+                ->setPersonName('Sheroz Mamayev')
+                ->setPhoneNumber('+1 347 547.9797');
             $recipient = new Party();
             $recipient
                 ->setAddress($recipientAddress)

app/Http/Controllers/OrderController.php

@@ -125,9 +125,9 @@ class OrderController extends Controller
             ])->get();
         }
 
-        $statuses = DB::select('SELECT s.id, s.sort, s.title, s.color_class, (SELECT count(*) FROM orders where status_id=s.id) as count FROM status s');
+        $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');
 
-        $count = DB::select('SELECT COUNT(*) as count FROM orders');
+        $count = DB::select('SELECT COUNT(*) as count FROM orders where client_id='.$id);
 
 
 //        dd($orders);
@@ -217,7 +217,7 @@ class OrderController extends Controller
 
 
         $order = Orders::create([
-            'client_id' => $request->get('client_id'),
+            'client_id' => $user->id,
             'name' => $request->get('name'),
             'flight_id' => 0,
             'added' => Carbon::now(),

app/Http/Controllers/Postman/DeclarationController.php

@@ -120,6 +120,14 @@ class DeclarationController extends Controller
             'order_id',
         ])->where('order_id', '=', $orderData[0]->id)->get();
 
+//        return view('templates.declaration', [
+//            'title' => 'Declaration #',
+//            'client' => $clientData,
+//            'order' => $orderData[0],
+//            'recipient' => $recipient[0],
+//            'sender' => $sender[0],
+//            'product' => $products
+//        ]);
         $pdf = \Barryvdh\DomPDF\Facade::loadView('templates.declaration', [
             'title' => 'Declaration #',
             'client' => $clientData,
@@ -134,7 +142,7 @@ class DeclarationController extends Controller
         $pdf->save($path . $filename);
 //        Activity::appendLog("Сгенерирована декларация в PDF формате.", Activity::NOTICE);
         return redirect(url($path . $filename));
-//        return response()->json(['url' => url($path.$filename).''], 200);
+//        return response()->json(['url' => url($path . $filename) . ''], 200);
 //        return $pdf->download('declaration.pdf');
     }
 

app/Models/Orders.php

@@ -44,6 +44,7 @@ class Orders extends Authenticatable
         'delivery_info',
         'label_url',
         'payment_info',
+        'comment',
         'status_id'
     ];
 

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

@@ -955,7 +955,7 @@
                 '                        </td>\n' +
                 '                        <td class="col-2">\n' +
                 '                            <div class="input-group input-group-sm">\n' +
-                '                                <input type="number" name="products[' + counter + '][1]" class="form-control form-control-sm count" id="" value="1" required>\n' +
+                '                                <input type="number" name="products[' + counter + '][1]" class="form-control form-control-sm count"  value="1" required>\n' +
                 '                                <div class="invalid-feedback" >\n' +
                 '                                    Укажите количество единиц товара\n' +
                 '                                </div>\n' +
@@ -963,7 +963,7 @@
                 '                        </td>\n' +
                 '                        <td class="col-2">\n' +
                 '                            <div class="input-group input-group-sm">\n' +
-                '                                <input type="number" name="products[' + counter + '][2]" class="form-control form-control-sm cost" id="" placeholder="Username" value="2" required>\n' +
+                '                                <input type="number" name="products[' + counter + '][2]" class="form-control form-control-sm cost" value="2" required>\n' +
                 '                                <div class="invalid-feedback" >\n' +
                 '                                    Укажите стоимость за единицу товара\n' +
                 '                                </div>\n' +
@@ -971,7 +971,7 @@
                 '                        </td>\n' +
                 '                        <td class="col-2">\n' +
                 '                            <div class="input-group input-group-sm">\n' +
-                '                                <input type="text" step="0.1" name="products[' + counter + '][3]" class="form-control form-control-sm" id="username" required>\n' +
+                '                                <input type="text" name="products[' + counter + '][3]" class="form-control form-control-sm" required>\n' +
                 '                                <div class="invalid-feedback" >\n' +
                 '                                    Your username is required.\n' +
                 '                                </div>\n' +

routes/web.php

@@ -66,8 +66,6 @@ Route::get('/refresh', 'Auth\LoginController@refresh')->name('refresh');
 
 Route::post('/feedback/add', 'FeedbackController@addGuest');
 //
-//Route::get('/packages/pay', 'PackagesController@pay');
-//Route::get('/packages/addr', 'PackagesController@addr');
 Route::get('/packages', 'OrderController@index')->name('package')->middleware('auth');
 Route::get('/packages/create/{id}', 'OrderController@create')->name('package.create')->middleware('auth');
 Route::post('/packages/order-store', 'OrderController@orderStore')->name('package.store')->middleware('auth');
@@ -82,17 +80,6 @@ Route::get('/profile', 'ProfileController@profile')->middleware('auth');
 Route::post('/profile/save', 'ProfileController@save')->name('profile.save')->middleware('auth');
 Route::get('/get-fedex-label/{id}', 'DeliverySytemsController@getFedexData')->middleware('auth');
 //
-//Route::get('/packages/list', 'PackagesController@pending_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')->name('packagePacking');
-//Route::get('/packages/register', 'PackagesController@register');
-//Route::post('/packages/register', 'PackagesController@register');
-//Route::get('/packages/sent', 'PackagesController@sent_packages')->name('packageSent');
-//Route::get('/packages/all', 'PackagesController@all_packages')->name('packageAll');
-//Route::get('/package/{id}/delivered', 'PackagesController@make_delivered')->where(['id' => '[0-9]+'])->name('makeDelivered');
-//Route::get('packages/delivered', 'PackagesController@delivered_packages')->name('packageDelivered');
 
 Route::get('/profile/info', 'ProfileController@info')->middleware('auth');
 Route::post('/profile/address/add', 'ProfileController@address_add')->middleware('auth');