Merge branch 'master' of https://github.com/devcode-it/openstamanager

devcode-it · Oct 31, 2024 · 7ca8c70 · 7ca8c70
2 parents c1fe61e + a02499c
commit 7ca8c70
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Util/Autofill.php b/src/Util/Autofill.php
@@ -46,14 +46,18 @@ public function setRows($rows, $additional = null, $first_page = null)
         $this->max_rows_first_page = $first_page ?? $this->max_rows_first_page;
     }
 
-    public function count($text, $small = false)
+    public function count($text, $small = null)
     {
         $count = ceil(strlen((string) $text) / $this->char_number);
 
         // Ricerca dei caratteri a capo
         preg_match_all("/(\r\n|\r|\n)/", (string) $text, $matches);
         $count += count($matches[0]);
-        $count = ($count == 1 ? $count : $count / 1.538461538 );
+        if ($small) {
+            $count *= 1.5;
+        } elseif ($count != 1) {
+            $count /= 1.538461538;
+        }
 
         $this->set($count);
     }

diff --git a/templates/fatture/body.php b/templates/fatture/body.php
@@ -253,6 +253,7 @@
     echo '
             <p class="small-bold text-muted">'.tr('Note', [], ['upper' => true]).':</p>
             <p>'.nl2br((string) $record['note']).'</p>';
+            $autofill->count($record['note'], true);
 }
 
 echo '