generation refactored

app/Jobs/GenerateInstallationPack.php

@@ -32,11 +32,8 @@ class GenerateInstallationPack implements ShouldQueue
             Log::info('Generate installation pack finished!');
             event(new SendWebSocketMessageEvent('Пакет документов для монтажа готов!', $this->userId, ['success' => true, 'link' => $link]));
         } catch (Exception $e) {
-            Log::info('Generate installation pack failed! ' . $e->getMessage());
+            Log::error('Generate installation pack failed! ' . $e->getMessage());
             event(new SendWebSocketMessageEvent('Ошибка создания покета документов для монтажа! ', $this->userId, ['error' => $e->getMessage()]));
         }
-
-
-
     }
 }

app/Services/GenerateDocumentsService.php

@@ -9,8 +9,8 @@ use Illuminate\Support\Str;
 
 class GenerateDocumentsService
 {
-    const INSTALL_FILENAME = 'Монт аж_';
-    const HANDOVER_FILENAME = 'Сдача_';
+    const INSTALL_FILENAME = 'Монтаж ';
+    const HANDOVER_FILENAME = 'Сдача ';
 
     /**
      * @param Order $order
@@ -23,7 +23,8 @@ class GenerateDocumentsService
         $techDocsPath = base_path('/tech-docs/');
         $products_sku = $order->products_sku;
         $articles = [];
-        Storage::disk('public')->makeDirectory('orders/' . $order->id . '/tmp/Схемы сборки');
+        Storage::disk('public')->makeDirectory('orders/' . $order->id . '/tmp/Схемы сборки/');
+
         foreach ($products_sku as $sku) {
             if(!in_array($sku->product->article, $articles)) {
                 $articles[] = $sku->product->article;
@@ -35,20 +36,18 @@ class GenerateDocumentsService
                     }
                 }
             }
+        }
 
-            // generate xlsx order file
-            // ...
-            // create zip archive
-            $fileModel = (new FileService())->createZipArchive('orders/' . $order->id . '/tmp', self::INSTALL_FILENAME . $order->common_name . '.zip', $userId);
-
-            // remove temp files
-            Storage::disk('public')->deleteDirectory('orders/' . $order->id . '/tmp');
-            $order->documents()->syncWithoutDetaching($fileModel);
-
-            // return link
-            return $fileModel->link;
+        // generate xlsx order file
+        // ...
+        // create zip archive
+        $fileModel = (new FileService())->createZipArchive('orders/' . $order->id . '/tmp', self::INSTALL_FILENAME . $order->common_name . '.zip', $userId);
 
+        // remove temp files
+        Storage::disk('public')->deleteDirectory('orders/' . $order->id . '/tmp');
+        $order->documents()->syncWithoutDetaching($fileModel);
 
-        }
+        // return link
+        return $fileModel?->link ?? '';
     }
 }

resources/views/orders/show.blade.php

@@ -17,7 +17,7 @@
                         @method('DELETE')
                     </form>
                 @endif
-                <a href="{{ route('order.generate-installation-pack', $order) }}">Документы для монтажа</a>
+                <a href="{{ route('order.generate-installation-pack', $order) }}" class="btn btn-primary">Документы для монтажа</a>
 
             </div>
         </div>