SL::DB::{Invoice,DeliveryOrder}->new_from: manuelles Filtern von Items via coderef

diff --git a/SL/DB/DeliveryOrder.pm b/SL/DB/DeliveryOrder.pm
index 3afd591626ad6e3fcc5043b8d7830960575b5e38..94725a8d02c54f42bde1393e1f5f2349cb6b4928 100644 (file)
--- a/SL/DB/DeliveryOrder.pm
+++ b/SL/DB/DeliveryOrder.pm
@@ -160,6 +160,7 @@ sub new_from {
 
   } @{ $items };
 
 
   } @{ $items };
 

+  @items = grep { $params{item_filter}->($_) } @items if $params{item_filter};

   @items = grep { $_->qty * 1 } @items if $params{skip_items_zero_qty};
   @items = grep { $_->qty >=0 } @items if $params{skip_items_negative_qty};
 
   @items = grep { $_->qty * 1 } @items if $params{skip_items_zero_qty};
   @items = grep { $_->qty >=0 } @items if $params{skip_items_negative_qty};
 


@@ -245,6 +246,12 @@ a quantity of 0 are not affected by this option.
 
 If trueish then items with a quantity of 0 are skipped.
 
 
 If trueish then items with a quantity of 0 are skipped.
 

+=item C<item_filter>
+
+An optional code reference that is called for each item with the item
+as its sole parameter. Items for which the code reference returns a
+falsish value will be skipped.
+

 =item C<attributes>
 
 An optional hash reference. If it exists then it is passed to C<new>
 =item C<attributes>
 
 An optional hash reference. If it exists then it is passed to C<new>

diff --git a/SL/DB/Invoice.pm b/SL/DB/Invoice.pm
index 82cf66b5e2ce00de33ef6422443ec79016b4820b..8bfc918e83bc6bb239ffd58cf2b1823c138f7327 100644 (file)
--- a/SL/DB/Invoice.pm
+++ b/SL/DB/Invoice.pm
@@ -203,6 +203,7 @@ sub new_from {
     $current_invoice_item;
   } @{ $items };
 
     $current_invoice_item;
   } @{ $items };
 

+  @items = grep { $params{item_filter}->($_) } @items if $params{item_filter};

   @items = grep { $_->qty * 1 } @items if $params{skip_items_zero_qty};
   @items = grep { $_->qty >=0 } @items if $params{skip_items_negative_qty};
 
   @items = grep { $_->qty * 1 } @items if $params{skip_items_zero_qty};
   @items = grep { $_->qty >=0 } @items if $params{skip_items_negative_qty};
 


@@ -411,6 +412,12 @@ a quantity of 0 are not affected by this option.
 
 If trueish then items with a quantity of 0 are skipped.
 
 
 If trueish then items with a quantity of 0 are skipped.
 

+=item C<item_filter>
+
+An optional code reference that is called for each item with the item
+as its sole parameter. Items for which the code reference returns a
+falsish value will be skipped.
+

 =item C<attributes>
 
 An optional hash reference. If it exists then it is passed to C<new>
 =item C<attributes>
 
 An optional hash reference. If it exists then it is passed to C<new>