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

(-)a/circ/returns.pl (-60 / +32 lines)
Lines 689-777 foreach my $code ( keys %$messages ) { Link Here
689
    if ( $code eq 'BadBarcode' ) {
689
    if ( $code eq 'BadBarcode' ) {
690
        $err{badbarcode} = 1;
690
        $err{badbarcode} = 1;
691
        $err{msg}        = $messages->{'BadBarcode'};
691
        $err{msg}        = $messages->{'BadBarcode'};
692
    }
692
    } elsif ( $code eq 'NotIssued' ) {
693
    elsif ( $code eq 'NotIssued' ) {
694
        $err{notissued} = 1;
693
        $err{notissued} = 1;
695
        $err{msg} = '';
694
        $err{msg}       = '';
696
    }
695
    } elsif ( $code eq 'LocalUse' ) {
697
    elsif ( $code eq 'LocalUse' ) {
698
        $err{localuse} = 1;
696
        $err{localuse} = 1;
699
    }
697
    } elsif ( $code eq 'WasLost' ) {
700
    elsif ( $code eq 'WasLost' ) {
701
        $err{waslost} = 1;
698
        $err{waslost} = 1;
702
    }
699
    } elsif ( $code eq 'LostItemFeeRefunded' ) {
703
    elsif ( $code eq 'LostItemFeeRefunded' ) {
704
        $template->param( LostItemFeeRefunded => 1 );
700
        $template->param( LostItemFeeRefunded => 1 );
705
    }
701
    } elsif ( $code eq 'LostItemPaymentNotRefunded' ) {
706
    elsif ( $code eq 'LostItemPaymentNotRefunded' ) {
707
        $template->param( LostItemPaymentNotRefunded => 1 );
702
        $template->param( LostItemPaymentNotRefunded => 1 );
708
    }
703
    } elsif ( $code eq 'LostItemFeeCharged' ) {
709
    elsif ( $code eq 'LostItemFeeCharged' ) {
710
        $template->param( LostItemFeeCharged => 1 );
704
        $template->param( LostItemFeeCharged => 1 );
711
    }
705
    } elsif ( $code eq 'LostItemFeeRestored' ) {
712
    elsif ( $code eq 'LostItemFeeRestored' ) {
713
        $template->param( LostItemFeeRestored => 1 );
706
        $template->param( LostItemFeeRestored => 1 );
714
    }
707
    } elsif ( $code eq 'ProcessingFeeRefunded' ) {
715
    elsif ( $code eq 'ProcessingFeeRefunded' ) {
716
        $template->param( ProcessingFeeRefunded => 1 );
708
        $template->param( ProcessingFeeRefunded => 1 );
717
    }
709
    } elsif ( $code eq 'ResFound' ) {
718
    elsif ( $code eq 'ResFound' ) {
719
        ;    # FIXME... anything to do here?
710
        ;    # FIXME... anything to do here?
720
    }
711
    } elsif ( $code eq 'WasReturned' ) {
721
    elsif ( $code eq 'WasReturned' ) {
722
        ;    # FIXME... anything to do here?
712
        ;    # FIXME... anything to do here?
723
    }
713
    } elsif ( $code eq 'WasTransfered' ) {
724
    elsif ( $code eq 'WasTransfered' ) {
725
        ;    # FIXME... anything to do here?
714
        ;    # FIXME... anything to do here?
726
    }
715
    } elsif ( $code eq 'TransferTo' ) {
727
    elsif ( $code eq 'TransferTo' ) {
728
        ;    # Handled above, along with WasTransfered
716
        ;    # Handled above, along with WasTransfered
729
    }
717
    } elsif ( $code eq 'withdrawn' ) {
730
    elsif ( $code eq 'withdrawn' ) {
731
        $err{withdrawn} = 1;
718
        $err{withdrawn} = 1;
732
    }
719
    } elsif ( $code eq 'WrongTransfer' ) {
733
    elsif ( $code eq 'WrongTransfer' ) {
734
        ;    # FIXME... anything to do here?
720
        ;    # FIXME... anything to do here?
735
    }
721
    } elsif ( $code eq 'WrongTransferItem' ) {
736
    elsif ( $code eq 'WrongTransferItem' ) {
737
        ;    # FIXME... anything to do here?
722
        ;    # FIXME... anything to do here?
738
    }
723
    } elsif ( $code eq 'NeedsTransfer' ) {
739
    elsif ( $code eq 'NeedsTransfer' ) {
724
    } elsif ( $code eq 'TransferTrigger' ) {
740
    }
741
    elsif ( $code eq 'TransferTrigger' ) {
742
        ;    # Handled alongside NeedsTransfer
725
        ;    # Handled alongside NeedsTransfer
743
    }
726
    } elsif ( $code eq 'TransferArrived' ) {
744
    elsif ( $code eq 'TransferArrived' ) {
745
        $err{transferred} = $messages->{'TransferArrived'};
727
        $err{transferred} = $messages->{'TransferArrived'};
746
    }
728
    } elsif ( $code eq 'Wrongbranch' ) {
747
    elsif ( $code eq 'Wrongbranch' ) {
729
    } elsif ( $code eq 'Debarred' ) {
748
    }
749
    elsif ( $code eq 'Debarred' ) {
750
        $err{debarred}            = $messages->{'Debarred'};
730
        $err{debarred}            = $messages->{'Debarred'};
751
        $err{debarcardnumber}     = $borrower->{cardnumber};
731
        $err{debarcardnumber}     = $borrower->{cardnumber};
752
        $err{debarborrowernumber} = $borrower->{borrowernumber};
732
        $err{debarborrowernumber} = $borrower->{borrowernumber};
753
        $err{debarname}           = "$borrower->{firstname} $borrower->{surname}";
733
        $err{debarname}           = "$borrower->{firstname} $borrower->{surname}";
754
    }
734
    } elsif ( $code eq 'PrevDebarred' ) {
755
    elsif ( $code eq 'PrevDebarred' ) {
735
        $err{prevdebarred} = $messages->{'PrevDebarred'};
756
        $err{prevdebarred}        = $messages->{'PrevDebarred'};
736
    } elsif ( $code eq 'ForeverDebarred' ) {
757
    }
737
        $err{foreverdebarred} = $messages->{'ForeverDebarred'};
758
    elsif ( $code eq 'ForeverDebarred' ) {
738
    } elsif ( $code eq 'ItemLocationUpdated' ) {
759
        $err{foreverdebarred}        = $messages->{'ForeverDebarred'};
760
    }
761
    elsif ( $code eq 'ItemLocationUpdated' ) {
762
        $err{ItemLocationUpdated} = $messages->{ItemLocationUpdated};
739
        $err{ItemLocationUpdated} = $messages->{ItemLocationUpdated};
763
    }
740
    } elsif ( $code eq 'NotForLoanStatusUpdated' ) {
764
    elsif ( $code eq 'NotForLoanStatusUpdated' ) {
765
        $err{NotForLoanStatusUpdated} = $messages->{NotForLoanStatusUpdated};
741
        $err{NotForLoanStatusUpdated} = $messages->{NotForLoanStatusUpdated};
766
    }
742
    } elsif ( $code eq 'DataCorrupted' ) {
767
    elsif ( $code eq 'DataCorrupted' ) {
768
        $err{data_corrupted} = 1;
743
        $err{data_corrupted} = 1;
769
    }
744
    } elsif ( $code eq 'ReturnClaims' ) {
770
    elsif ( $code eq 'ReturnClaims' ) {
771
        $template->param( ReturnClaims => $messages->{ReturnClaims} );
745
        $template->param( ReturnClaims => $messages->{ReturnClaims} );
772
    }
746
    } elsif ( $code eq 'ClaimAutoResolved' ) {
773
      elsif ( $code eq 'ClaimAutoResolved' ) {
747
        $template->param( ClaimAutoResolved => $messages->{ClaimAutoResolved} );
774
          $template->param( ClaimAutoResolved => $messages->{ClaimAutoResolved} );
775
    } elsif ( $code eq 'RecallFound' ) {
748
    } elsif ( $code eq 'RecallFound' ) {
776
        ;
749
        ;
777
    } elsif ( $code eq 'RecallNeedsTransfer' ) {
750
    } elsif ( $code eq 'RecallNeedsTransfer' ) {
Lines 782-788 foreach my $code ( keys %$messages ) { Link Here
782
        $template->param( InBundle => $messages->{InBundle} );
755
        $template->param( InBundle => $messages->{InBundle} );
783
    } else {
756
    } else {
784
        die "Unknown error code $code";    # note we need all the (empty) elsif's above, or we die.
757
        die "Unknown error code $code";    # note we need all the (empty) elsif's above, or we die.
785
        # This forces the issue of staying in sync w/ Circulation.pm
758
                                           # This forces the issue of staying in sync w/ Circulation.pm
786
    }
759
    }
787
    if (%err) {
760
    if (%err) {
788
        push( @errmsgloop, \%err );
761
        push( @errmsgloop, \%err );
789
- 

Return to bug 28575