Browse Source

fix specification generation

Alexander Musikhin 2 days ago
parent
commit
5f66e68b0e
1 changed files with 9 additions and 7 deletions
  1. 9 7
      app/Services/ContractorSpecificationService.php

+ 9 - 7
app/Services/ContractorSpecificationService.php

@@ -142,18 +142,20 @@ class ContractorSpecificationService
             $extraRows = $itemCount - self::TEMPLATE_ITEM_ROWS;
             $extraRows = $itemCount - self::TEMPLATE_ITEM_ROWS;
             $insertBefore = self::ITEM_START_ROW + self::TEMPLATE_ITEM_ROWS;
             $insertBefore = self::ITEM_START_ROW + self::TEMPLATE_ITEM_ROWS;
             $sheet->insertNewRowBefore($insertBefore, $extraRows);
             $sheet->insertNewRowBefore($insertBefore, $extraRows);
-
-            for ($row = $insertBefore; $row < $insertBefore + $extraRows; $row++) {
-                $sheet->duplicateStyle($sheet->getStyle('A' . ($insertBefore - 1) . ':F' . ($insertBefore - 1)), 'A' . $row . ':F' . $row);
-                $sheet->getRowDimension($row)->setRowHeight($sheet->getRowDimension($insertBefore - 1)->getRowHeight());
-            }
-
-            return;
         }
         }
 
 
         if ($itemCount < self::TEMPLATE_ITEM_ROWS) {
         if ($itemCount < self::TEMPLATE_ITEM_ROWS) {
             $sheet->removeRow(self::ITEM_START_ROW + $itemCount, self::TEMPLATE_ITEM_ROWS - $itemCount);
             $sheet->removeRow(self::ITEM_START_ROW + $itemCount, self::TEMPLATE_ITEM_ROWS - $itemCount);
         }
         }
+
+        $templateRow = self::ITEM_START_ROW;
+        $templateStyle = $sheet->getStyle('A' . $templateRow . ':F' . $templateRow);
+        $templateHeight = $sheet->getRowDimension($templateRow)->getRowHeight();
+
+        for ($row = $templateRow; $row < $templateRow + $itemCount; $row++) {
+            $sheet->duplicateStyle($templateStyle, 'A' . $row . ':F' . $row);
+            $sheet->getRowDimension($row)->setRowHeight($templateHeight);
+        }
     }
     }
 
 
     private function buildItems($skus, Contractor $contractor): array
     private function buildItems($skus, Contractor $contractor): array