Bladeren bron

upd passport names on generation

Alexander Musikhin 7 maanden geleden
bovenliggende
commit
2cbc8aba03
1 gewijzigde bestanden met toevoegingen van 9 en 7 verwijderingen
  1. 9 7
      app/Services/GenerateDocumentsService.php

+ 9 - 7
app/Services/GenerateDocumentsService.php

@@ -132,9 +132,12 @@ class GenerateDocumentsService
             // copy passport
             if ($sku->passport_id) {
                 $from = $sku->passport->path;
-                $to = 'orders/' . $order->id . '/tmp/ПАСПОРТ/' . $sku->passport->original_name;
-                if (!Storage::disk('public')->exists($to)) {
-                    Storage::disk('public')->copy($from, $to);
+                $to = 'orders/' . $order->id . '/tmp/ПАСПОРТ/';
+                if (!Storage::disk('public')->exists($to . $sku->passport->original_name)) {
+                    $f = Storage::disk('public')->get($from);
+                    $ext = \File::extension($sku->passport->original_name);
+                    $targetName = $to . 'Паспорт ' . $sku->factory_number . ' арт. ' . $sku->product->article . '.' . $ext;
+                    Storage::disk('public')->put($targetName, $f);
                 }
             }
 
@@ -204,7 +207,7 @@ class GenerateDocumentsService
 
         $writer->save(storage_path('app/public/orders/') . $order->id . '/tmp/' . $fileName);
     }
-    public function generateQualityDeclaration(Order $order): void
+    private function generateQualityDeclaration(Order $order): void
     {
         $inputFileType = 'Xlsx';
         $inputFileName = './templates/QualityDeclaration.xlsx';
@@ -255,7 +258,7 @@ class GenerateDocumentsService
 
         $writer->save(storage_path('app/public/orders/') . $order->id . '/tmp/' . $fileName);
     }
-    public function generateInventory(Order $order): void
+    private function generateInventory(Order $order): void
     {
         $inputFileType = 'Xlsx';
         $inputFileName = './templates/Inventory.xlsx';
@@ -292,7 +295,7 @@ class GenerateDocumentsService
 
         $writer->save(storage_path('app/public/orders/') . $order->id . '/tmp/' . $fileName);
     }
-    public function generatePassport(Order $order): void
+    private function generatePassport(Order $order): void
     {
         $inputFileType = 'Xlsx';
         $inputFileName = './templates/Passport.xlsx';
@@ -304,7 +307,6 @@ class GenerateDocumentsService
         $i = 3; // start of table
         $n = 1;
         foreach ($order->products_sku as $sku) {
-            echo $sku->id . "\n";
             if ($n++ > 1) {
                 $sheet->insertNewRowBefore($i + 1, 1);
                 $range = 'A' . $i . ':J' . $i;