|
@@ -12,15 +12,11 @@ use App\Models\ProductSKU;
|
|
|
use App\Models\Reclamation;
|
|
use App\Models\Reclamation;
|
|
|
use App\Models\Ttn;
|
|
use App\Models\Ttn;
|
|
|
use Exception;
|
|
use Exception;
|
|
|
-use Faker\Guesser\Name;
|
|
|
|
|
use Illuminate\Support\Collection;
|
|
use Illuminate\Support\Collection;
|
|
|
use Illuminate\Support\Facades\Storage;
|
|
use Illuminate\Support\Facades\Storage;
|
|
|
use Illuminate\Support\Str;
|
|
use Illuminate\Support\Str;
|
|
|
use PhpOffice\PhpSpreadsheet\IOFactory;
|
|
use PhpOffice\PhpSpreadsheet\IOFactory;
|
|
|
use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
|
|
use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
|
|
|
-use PhpOffice\PhpSpreadsheet\Writer\Pdf\Dompdf;
|
|
|
|
|
-use PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf;
|
|
|
|
|
-use PhpOffice\PhpSpreadsheet\Writer\Pdf\Tcpdf;
|
|
|
|
|
use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
|
|
use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
|
|
|
|
|
|
|
|
class GenerateDocumentsService
|
|
class GenerateDocumentsService
|
|
@@ -103,7 +99,7 @@ class GenerateDocumentsService
|
|
|
$sheet->setCellValue('G33', Str::trim($str));
|
|
$sheet->setCellValue('G33', Str::trim($str));
|
|
|
|
|
|
|
|
//
|
|
//
|
|
|
- $fileName = 'Заявка на монтаж - ' . $order->object_address . '.xlsx';
|
|
|
|
|
|
|
+ $fileName = 'Заявка на монтаж - ' . Str::replace('/', '-', $order->object_address) . '.xlsx';
|
|
|
$writer = new Xlsx($spreadsheet);
|
|
$writer = new Xlsx($spreadsheet);
|
|
|
Storage::disk('public')->makeDirectory('orders/' . $order->id . '/tmp');
|
|
Storage::disk('public')->makeDirectory('orders/' . $order->id . '/tmp');
|
|
|
|
|
|
|
@@ -337,7 +333,7 @@ class GenerateDocumentsService
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// save file
|
|
// save file
|
|
|
- $fileName = '4.Паспорт объекта - ' . $order->object_address . '.xlsx';
|
|
|
|
|
|
|
+ $fileName = '4.Паспорт объекта - ' . Str::replace('/', '-', $order->object_address) . '.xlsx';
|
|
|
$writer = new Xlsx($spreadsheet);
|
|
$writer = new Xlsx($spreadsheet);
|
|
|
Storage::disk('public')->makeDirectory('orders/' . $order->id . '/tmp');
|
|
Storage::disk('public')->makeDirectory('orders/' . $order->id . '/tmp');
|
|
|
|
|
|
|
@@ -406,7 +402,7 @@ class GenerateDocumentsService
|
|
|
$sheet->setCellValue('U20', DateHelper::getHumanDate($reclamation->create_date, true));
|
|
$sheet->setCellValue('U20', DateHelper::getHumanDate($reclamation->create_date, true));
|
|
|
|
|
|
|
|
// save file
|
|
// save file
|
|
|
- $fileName = 'Монтажная заявка - ' . $reclamation->order->object_address . '.xlsx';
|
|
|
|
|
|
|
+ $fileName = 'Монтажная заявка - ' . Str::replace('/', '-', $reclamation->order->object_address) . '.xlsx';
|
|
|
$writer = new Xlsx($spreadsheet);
|
|
$writer = new Xlsx($spreadsheet);
|
|
|
$fd = 'reclamations/' . $reclamation->id . '/tmp/' . $reclamation->order->object_address;
|
|
$fd = 'reclamations/' . $reclamation->id . '/tmp/' . $reclamation->order->object_address;
|
|
|
Storage::disk('public')->makeDirectory($fd);
|
|
Storage::disk('public')->makeDirectory($fd);
|
|
@@ -451,7 +447,7 @@ class GenerateDocumentsService
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// save file
|
|
// save file
|
|
|
- $fileName = 'Акт - ' . $reclamation->order->object_address . '.xlsx';
|
|
|
|
|
|
|
+ $fileName = 'Акт - ' . Str::replace('/', '-', $reclamation->order->object_address) . '.xlsx';
|
|
|
$writer = new Xlsx($spreadsheet);
|
|
$writer = new Xlsx($spreadsheet);
|
|
|
$fd = 'reclamations/' . $reclamation->id . '/tmp/' . $reclamation->order->object_address;
|
|
$fd = 'reclamations/' . $reclamation->id . '/tmp/' . $reclamation->order->object_address;
|
|
|
Storage::disk('public')->makeDirectory($fd);
|
|
Storage::disk('public')->makeDirectory($fd);
|
|
@@ -492,7 +488,7 @@ class GenerateDocumentsService
|
|
|
$sheet->setCellValue('A19', $text);
|
|
$sheet->setCellValue('A19', $text);
|
|
|
|
|
|
|
|
// save file
|
|
// save file
|
|
|
- $fileName = 'Гарантийное письмо - ' . $reclamation->order->object_address . '.xlsx';
|
|
|
|
|
|
|
+ $fileName = 'Гарантийное письмо - ' . Str::replace('/', '-', $reclamation->order->object_address) . '.xlsx';
|
|
|
$writer = new Xlsx($spreadsheet);
|
|
$writer = new Xlsx($spreadsheet);
|
|
|
$fd = 'reclamations/' . $reclamation->id . '/tmp/' . $reclamation->order->object_address;
|
|
$fd = 'reclamations/' . $reclamation->id . '/tmp/' . $reclamation->order->object_address;
|
|
|
Storage::disk('public')->makeDirectory($fd);
|
|
Storage::disk('public')->makeDirectory($fd);
|