Attachment #118572 for bug #16223

View | Details | Raw Unified | Return to bug 16223
Collapse All | Expand All




    my $total_due = $lines->total_outstanding;

    foreach my $debarment (@{ $debarments }){
        my $rule;

        foreach my $liftRule (keys %{ $liftDebarmentRules }){
            my $comment = $debarment->{'comment'};
            $rule = $liftRule if $comment =~ $liftRule;
        }
        next unless $rule;

        # Delete debarment IF:
        # 1. there is no maximum outstanding fines defined for the liftDebarmentRule
        #    and there is no outstanding fines.
        # 2. there is a maximum outstanding fines amount defined
        #    and total_due is smaller or equal than the defined maximum outstanding amount
        # Otherwise, do not lift the debarment.
        if (not defined $liftDebarmentRules->{$rule}->{'outstanding'}){
            if ($total_due <= 0) {
                DelDebarment($debarment->{'borrower_debarment_id'});
            }
        }
        else {
            if ($total_due <= $liftDebarmentRules->{$rule}->{'outstanding'}) {
                DelDebarment($debarment->{'borrower_debarment_id'});
            }
        }
    }




         - pref: DebarmentsToLiftAfterPayment
           type: textarea
           class: code
         - Lift these debarments after Borrower has paid his/her fees. Matches dynamic content in debarment comment.
         - "<p>Example, debarments with comment (either exact match or dynamic content, e.g. 'Debarment message for Patron 123') that match 'Debarment message' are lifted after all fees are paid:</p>"
         - "<pre>Debarment message:</pre>
            <pre>  outstanding: 0</pre>"
         - "<p>Example, debarment with message of exactly 'Debarment message' is lifted after payment with outstanding fees less or equal than 5:</p>"
         - "<pre>^Debarment message$:</pre>
            <pre>  outstanding: 5.00</pre>"
         - You can use regex in the definitions to match your needs.
    Membership expiry:
     -
         - When renewing borrowers, base the new expiry date on
- 

Return to bug 16223

Lines 326-347 sub DelDebarmentsAfterPayment { Link Here

(-)a/Koha/Patron/Debarments.pm (-15 / +21 lines)
326	my $total_due = $lines->total_outstanding;	326	my $total_due = $lines->total_outstanding;
327		327
328	foreach my $debarment (@{ $debarments }){	328	foreach my $debarment (@{ $debarments }){
329	if (exists $liftDebarmentRules->{$debarment->{'comment'}}) {	329	my $rule;
330	# Delete debarment IF:	330
331	# 1. there is no maximum outstanding fines defined for the liftDebarmentRule	331	foreach my $liftRule (keys %{ $liftDebarmentRules }){
332	# and there is no outstanding fines.	332	my $comment = $debarment->{'comment'};
333	# 2. there is a maximum outstanding fines amount defined	333	$rule = $liftRule if $comment =~ $liftRule;
334	# and total_due is smaller or equal than the defined maximum outstanding amount	334	}
335	# Otherwise, do not lift the debarment.	335	next unless $rule;
336	if (not defined $liftDebarmentRules->{$debarment->{'comment'}}->{'outstanding'}){	336
337	if ($total_due <= 0) {	337	# Delete debarment IF:
338	DelDebarment($debarment->{'borrower_debarment_id'});	338	# 1. there is no maximum outstanding fines defined for the liftDebarmentRule
339	}	339	# and there is no outstanding fines.
		340	# 2. there is a maximum outstanding fines amount defined
		341	# and total_due is smaller or equal than the defined maximum outstanding amount
		342	# Otherwise, do not lift the debarment.
		343	if (not defined $liftDebarmentRules->{$rule}->{'outstanding'}){
		344	if ($total_due <= 0) {
		345	DelDebarment($debarment->{'borrower_debarment_id'});
340	}	346	}
341	else {	347	}
342	if ($total_due <= $liftDebarmentRules->{$debarment->{'comment'}}->{'outstanding'}) {	348	else {
343	DelDebarment($debarment->{'borrower_debarment_id'});	349	if ($total_due <= $liftDebarmentRules->{$rule}->{'outstanding'}) {
344	}	350	DelDebarment($debarment->{'borrower_debarment_id'});
345	}	351	}
346	}	352	}
347	}	353	}

Lines 104-116 Patrons: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref (-5 / +5 lines)
104	- pref: DebarmentsToLiftAfterPayment	104	- pref: DebarmentsToLiftAfterPayment
105	type: textarea	105	type: textarea
106	class: code	106	class: code
107	- Lift these debarments after Borrower has paid his/her fees	107	- Lift these debarments after Borrower has paid his/her fees. Matches dynamic content in debarment comment.
108	- "<p>Example, debarment is lifted after all fees are paid:</p>"	108	- "<p>Example, debarments with comment (either exact match or dynamic content, e.g. 'Debarment message for Patron 123') that match 'Debarment message' are lifted after all fees are paid:</p>"
109	- "<pre>Debarment message:</pre>	109	- "<pre>Debarment message:</pre>
110	<pre> outstanding: 0</pre>"	110	<pre> outstanding: 0</pre>"
111	- "<p>Example, debarment is lifted after payment with outstanding fees less or equal than 5:</p>"	111	- "<p>Example, debarment with message of exactly 'Debarment message' is lifted after payment with outstanding fees less or equal than 5:</p>"
112	- "<pre>Another debarment:</pre>	112	- "<pre>^Debarment message$:</pre>
113	<pre> outstanding: 5.00</pre>"	113	<pre> outstanding: 5.00</pre>"
		114	- You can use regex in the definitions to match your needs.
114	Membership expiry:	115	Membership expiry:
115	-	116	-
116	- When renewing borrowers, base the new expiry date on	117	- When renewing borrowers, base the new expiry date on
117	-