Volltextsuche auch bei Verkaufsrechnungen und Deb. Buchungen

kivitendo · Nov 8, 2024 · 4bc122b · 4bc122b
1 parent 800aaec
commit 4bc122b
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 1 deletion.
diff --git a/SL/AR.pm b/SL/AR.pm
@@ -667,6 +667,29 @@ sub ar_transactions {
     }
   }
 
+  $form->{fulltext} = trim($form->{fulltext});
+  if ($form->{fulltext}) {
+    my @fulltext_fields = qw(a.notes
+                             a.intnotes
+                             a.shipvia
+                             a.transaction_description
+                             a.quonumber
+                             a.ordnumber
+                             a.invnumber);
+    $where .= ' AND (';
+    $where .= join ' OR ', map {"$_ ILIKE ?"} @fulltext_fields;
+
+    $where .= <<SQL;
+      OR EXISTS (
+        SELECT files.id FROM files LEFT JOIN file_full_texts ON (file_full_texts.file_id = files.id)
+          WHERE files.object_id = a.id AND files.object_type = 'invoice'
+            AND file_full_texts.full_text ILIKE ?)
+SQL
+    $where .= ')'; # end AND
+
+    push(@values, like($form->{fulltext})) for 1 .. (scalar @fulltext_fields) + 1;
+  }
+
   if ($form->{parts_partnumber}) {
     $where .= <<SQL;
       AND EXISTS (

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
@@ -1154,7 +1154,7 @@ sub ar_transactions {
     business_id parts_partnumber parts_description department_id
     show_marked_as_closed show_not_mailed shippingpoint shipvia taxzone_id
     payment_id shiptoname shiptodepartment_1 shiptodepartment_2 shiptostreet
-    shiptozipcode shiptocity shiptocountry
+    shiptozipcode shiptocity shiptocountry fulltext
   );
   push @hidden_variables, map { "cvar_$_->{name}" } @ct_searchable_custom_variables;
 
@@ -1331,6 +1331,9 @@ sub ar_transactions {
   if ($form->{shiptocountry}) {
     push @options, $locale->text('Country (Shipping)') . " : $form->{shiptocountry}";
   }
+  if ($form->{fulltext}) {
+    push @options, $locale->text('Full Text') . " : $form->{fulltext}";
+  }
 
   $form->{ALL_PRINTERS} = SL::DB::Manager::Printer->get_all_sorted;
 

diff --git a/templates/design40_webpages/ar/search.html b/templates/design40_webpages/ar/search.html
@@ -39,6 +39,10 @@ <h1>[% title %]</h1>
         <tr>
           <th class="caption" colspan="2">[% 'Miscellaneous' | $T8 %]</th>
         </tr>
+        <tr>
+          <th>[% 'Full Text' | $T8 %]</th>
+          <td>[% L.input_tag('fulltext', '') %]</td>
+        </tr>
         <tr>
           <th>[% 'Transaction description' | $T8 %]</th>
           <td>[% L.input_tag("transaction_description", "") %]</td>

diff --git a/templates/webpages/ar/search.html b/templates/webpages/ar/search.html
@@ -59,6 +59,10 @@ <h1>[% title %]</h1>
       <th align="right">[% 'Part Number' | $T8 %]</th>
       <td>[% L.input_tag("parts_partnumber", "", style=style) %]</td>
      </tr>
+     <tr>
+      <th align="right">[% 'Full Text' | $T8 %]</th>
+      <td>[% L.input_tag('fulltext', '', style=style) %]</td>
+     </tr>
      <tr>
       <th align=right nowrap>[% 'Shipping Point' | $T8 %]</th>
       <td>[% L.input_tag("shippingpoint", "", style=style) %]</td>