浏览代码

fix folders in handover pack

Alexander Musikhin 7 月之前
父节点
当前提交
b54601ca3f
共有 1 个文件被更改,包括 4 次插入3 次删除
  1. 4 3
      app/Services/GenerateDocumentsService.php

+ 4 - 3
app/Services/GenerateDocumentsService.php

@@ -107,13 +107,14 @@ class GenerateDocumentsService
         $articles = [];
         Storage::disk('public')->makeDirectory('orders/' . $order->id . '/tmp/ПАСПОРТ/');
         Storage::disk('public')->makeDirectory('orders/' . $order->id . '/tmp/СЕРТИФИКАТ/');
-        Storage::disk('public')->makeDirectory('orders/' . $order->id . '/tmp/ФОТО ПСТ/photos');
+        Storage::disk('public')->makeDirectory('orders/' . $order->id . '/tmp/ФОТО ПСТ/');
         Storage::disk('public')->makeDirectory('orders/' . $order->id . '/tmp/ФОТО ТН/');
 
         // copy app photos
         foreach ($order->photos as $photo) {
             $from = $photo->path;
-            $to = 'orders/' . $order->id . '/tmp/ФОТО ПСТ/photos/' . $photo->original_name;
+            @dump($photo->original_name);
+            $to = 'orders/' . $order->id . '/tmp/ФОТО ПСТ/' . $photo->original_name;
             if (!Storage::disk('public')->exists($to)) {
                 Storage::disk('public')->copy($from, $to);
             }
@@ -154,7 +155,7 @@ class GenerateDocumentsService
         $fileModel = (new FileService())->createZipArchive('orders/' . $order->id . '/tmp', self::HANDOVER_FILENAME . $order->common_name . '.zip', $userId);
 
         // remove temp files
-        Storage::disk('public')->deleteDirectory('orders/' . $order->id . '/tmp');
+//        Storage::disk('public')->deleteDirectory('orders/' . $order->id . '/tmp');
         $order->documents()->syncWithoutDetaching($fileModel);
 
         // return link