Merge remote-tracking branch 'origin/master'

app/Http/Controllers/DeliverySytemsController.php

@@ -84,13 +84,13 @@ class DeliverySytemsController extends Controller
 
             $userCredential = new WebAuthenticationCredential();
             $userCredential
-                ->setKey('2WrQK1IeH6jBoghg')
+                ->setKey('WZmcVJM6rADSDHRA')
                 ->setPassword('RFdr6uqXNvFpZVvwtoEaGLuRG');
             $webAuthenticationDetail = new WebAuthenticationDetail();
             $webAuthenticationDetail->setUserCredential($userCredential);
             $clientDetail = new ClientDetail();
             $clientDetail
-                ->setAccountNumber('647927254')
+                ->setAccountNumber('896775413')
                 ->setMeterNumber('250557652');
             $version = new VersionId();
             $version
@@ -188,11 +188,11 @@ class DeliverySytemsController extends Controller
             $result = $shipService->getProcessShipmentReply($processShipmentRequest);
 
             if ($result->HighestSeverity == 'ERROR') {
-                dd($result);
-//                return response()->json([
-//                    'error' => $result->Notifications[0]->Message,
-//                    'code' => $result->Notifications[0]->Code
-//                ], 200);
+//                dd($result);
+                return response()->json([
+                    'error' => $result->Notifications[0]->Message,
+                    'code' => $result->Notifications[0]->Code
+                ], 200);
             }
             if ($result->HighestSeverity == 'WARNING') {
 //                dd($result->Notifications[0]->Message);

app/Http/Controllers/OrderController.php

@@ -311,7 +311,7 @@ class OrderController extends Controller
             'summa' => ($request->get('weight') * 8.5) + $serSum,
             'weight' => $request->get('weight'),
             'total' => $price,
-            'track_number' => '98' . $this->generateUniqNumber(4),
+//            'track_number' => '98' . $this->generateUniqNumber(4),
             'is_site' => $request->get('is_site'),
             'is_payment_uzb' => 0,
             'from_address' => $request->get('from_address'),
@@ -324,6 +324,9 @@ class OrderController extends Controller
             'status_id' => 19,
         ]);
 
+        $order->track_number = $order->id;
+        $order->save();
+
         if ($orderServices != null) {
 
             foreach ($orderServices as $item) {

app/Http/Controllers/Postman/DeclarationController.php

@@ -142,6 +142,7 @@ class DeclarationController extends Controller
         $pdf->save($path . $filename);
 //        Activity::appendLog("Сгенерирована декларация в PDF формате.", Activity::NOTICE);
         return redirect(url($path . $filename));
+//        return redirect(url($path . $filename));
 //        return response()->json(['url' => url($path . $filename) . ''], 200);
 //        return $pdf->download('declaration.pdf');
     }

resources/views/templates/declaration.blade.php

@@ -272,7 +272,7 @@
                             к перессылке попчтовыми правилами.
                         </p>
                         Date: <b>{{ date('Y-m-d') }}</b> Signature of Sender:
-                        <b>{{ $client->name.' '.$client->surname }}</b>
+                        <b>{{ $sender->firstname.' '.$sender->secondname.' '.$sender->fathername }}</b>
                     </td>
                 </tr>
             </table>