fix doc generation, added colors to reclamations statuses

app/Http/Controllers/ScheduleController.php

@@ -16,6 +16,7 @@ use App\Models\Dictionary\District;
 use App\Models\Order;
 use App\Models\ProductSKU;
 use App\Models\Reclamation;
+use App\Models\ReclamationStatus;
 use App\Models\Role;
 use App\Models\Schedule;
 use App\Models\User;
@@ -353,7 +354,10 @@ class ScheduleController extends Controller
         $reclamationScheduleIds = [];
 
         foreach ($schedules as $schedule) {
-            $statusMap[$schedule->id] = '-';
+            $statusMap[$schedule->id] = [
+                'name' => '-',
+                'color' => 'secondary',
+            ];
 
             if ($schedule->source === 'Площадки' && $schedule->order_id) {
                 $orderIds[] = (int)$schedule->order_id;
@@ -382,7 +386,10 @@ class ScheduleController extends Controller
 
                 $statusId = $orderStatuses[(int)$schedule->order_id] ?? null;
                 if ($statusId) {
-                    $statusMap[$schedule->id] = Order::STATUS_NAMES[$statusId] ?? '-';
+                    $statusMap[$schedule->id] = [
+                        'name' => Order::STATUS_NAMES[$statusId] ?? '-',
+                        'color' => Order::STATUS_COLOR[$statusId] ?: 'secondary',
+                    ];
                 }
             }
         }
@@ -397,9 +404,13 @@ class ScheduleController extends Controller
             foreach ($reclamationScheduleIds as $reclamationId => $scheduleIds) {
                 $statusId = $reclamationStatuses[$reclamationId] ?? null;
                 $statusName = $statusId ? (Reclamation::STATUS_NAMES[$statusId] ?? '-') : '-';
+                $statusColor = $statusId ? (ReclamationStatus::STATUS_COLOR[$statusId] ?? 'secondary') : 'secondary';
 
                 foreach ($scheduleIds as $scheduleId) {
-                    $statusMap[$scheduleId] = $statusName;
+                    $statusMap[$scheduleId] = [
+                        'name' => $statusName,
+                        'color' => $statusColor,
+                    ];
                 }
             }
         }

app/Models/ReclamationStatus.php

@@ -6,7 +6,18 @@ use Illuminate\Database\Eloquent\Model;
 
 class ReclamationStatus extends Model
 {
-
+    const STATUS_COLOR = [
+        Reclamation::STATUS_NEW => 'secondary',
+        Reclamation::STATUS_WAIT => 'warning',
+        Reclamation::STATUS_IN_WORK => 'info',
+        Reclamation::STATUS_SUBSCRIBE_ACT => 'primary',
+        Reclamation::STATUS_DONE => 'success',
+        Reclamation::STATUS_SENT => 'dark',
+        Reclamation::STATUS_DO_DOCS => 'primary',
+        Reclamation::STATUS_HANDOVER_TO_CHECK => 'warning',
+        Reclamation::STATUS_PAID => 'success',
+        Reclamation::STATUS_CLOSED_NO_PAY => 'danger',
+    ];
 
     public $timestamps = false;
 }

app/Services/GenerateDocumentsService.php

@@ -36,6 +36,13 @@ class GenerateDocumentsService
     public function generateInstallationPack(Order $order, int $userId): string
     {
         $techDocsPath = base_path('/tech-docs/');
+        $order = Order::query()
+            ->withoutGlobalScopes()
+            ->whereKey($order->id)
+            ->where('year', $order->year)
+            ->with('documents')
+            ->firstOrFail();
+
         $products_sku = $order->products_sku()
             ->withoutGlobalScopes()
             ->where('year', $order->year)
@@ -57,6 +64,14 @@ class GenerateDocumentsService
             }
         }
 
+        $orderDocumentsDir = 'orders/' . $order->id . '/tmp/Документы площадки';
+        foreach ($order->documents as $document) {
+            if ($this->shouldSkipArchiveDocument($document)) {
+                continue;
+            }
+            $this->copyFileToDir($document->path, $orderDocumentsDir, $document->original_name);
+        }
+
         // generate xlsx order file
         $this->generateOrderForMount($order);
 
@@ -100,6 +115,11 @@ class GenerateDocumentsService
         $str = Str::replace('<div>', '', $order->products_with_count);
         $str = Str::replace('</div>', "\n", $str);
 
+        // дата монтажа
+        $installationDate = ($order->installation_date) ? DateHelper::getHumanDate($order->installation_date, true) : '';
+        $sheet->setCellValue('L15', $installationDate);
+
+
         // мафы
         $sheet->setCellValue('G33', Str::trim($str));
 
@@ -607,16 +627,39 @@ class GenerateDocumentsService
     }
 
     private function shouldSkipDocumentForPaymentPack($file): bool
+    {
+        return $this->shouldSkipArchiveDocument($file);
+    }
+
+    private function shouldSkipArchiveDocument($file): bool
     {
         if (!$file) {
             return true;
         }
 
-        if ($file->mime_type === 'application/zip') {
+        $fileName = Str::lower((string)$file->original_name);
+        $mimeType = Str::lower((string)$file->mime_type);
+
+        $archiveSuffixes = [
+            '.zip',
+            '.rar',
+            '.7z',
+            '.tar',
+            '.tar.gz',
+            '.tgz',
+            '.tar.bz2',
+            '.tbz2',
+            '.bz2',
+            '.tar.xz',
+            '.txz',
+            '.xz',
+        ];
+
+        if (Str::endsWith($fileName, $archiveSuffixes)) {
             return true;
         }
 
-        if (Str::endsWith((string)$file->original_name, '.zip')) {
+        if (str_contains($mimeType, 'zip') || str_contains($mimeType, 'compressed') || str_contains($mimeType, '7z') || str_contains($mimeType, 'rar')) {
             return true;
         }
 

resources/views/reclamations/edit.blade.php

@@ -5,7 +5,12 @@
     <div class="px-3">
         <div class="row">
             <div class="col-xl-6">
-                <h4>Рекламация</h4>
+                <h4 class="d-flex align-items-center gap-2">
+                    Рекламация
+                    <span class="badge text-bg-{{ \App\Models\ReclamationStatus::STATUS_COLOR[$reclamation->status_id] ?? 'secondary' }}">
+                        {{ $reclamation->status?->name ?? (\App\Models\Reclamation::STATUS_NAMES[$reclamation->status_id] ?? '-') }}
+                    </span>
+                </h4>
             </div>
             <div class="col-xl-6 action-toolbar mb-2">
                 <a href="{{ $previous_url ?? route('reclamations.index', session('gp_reclamations')) }}"

resources/views/schedule/index.blade.php

@@ -151,7 +151,12 @@
                                 class="align-middle">{{ $schedule->brigadier->name }}</td>
                             @if(hasRole('admin'))
                                 <td style="background: {{ $schedule->brigadier->color }}"
-                                    class="align-middle">{{ $scheduleStatusMap[$schedule->id] ?? '-' }}</td>
+                                    class="align-middle">
+                                    @php
+                                        $scheduleStatus = $scheduleStatusMap[$schedule->id] ?? ['name' => '-', 'color' => 'secondary'];
+                                    @endphp
+                                    <span class="badge text-bg-{{ $scheduleStatus['color'] }}">{{ $scheduleStatus['name'] }}</span>
+                                </td>
                                 <td style="background: {{ $schedule->brigadier->color }}"
                                     class="align-middle admin-comment-{{ $schedule->id }}">{{ $schedule->admin_comment }}</td>
                             @endif