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

(-)a/circ/returns.pl (-63 / +36 lines)
Lines 540-550 my $recalled = 0; Link Here
540
540
541
if ( $messages->{'WasTransfered'} ) {
541
if ( $messages->{'WasTransfered'} ) {
542
    $template->param(
542
    $template->param(
543
        found          => 1,
543
        found      => 1,
544
        transfer       => $messages->{'WasTransfered'},
544
        transfer   => $messages->{'WasTransfered'},
545
        transferto     => $messages->{'TransferTo'},
545
        transferto => $messages->{'TransferTo'},
546
        trigger        => $messages->{'TransferTrigger'},
546
        trigger    => $messages->{'TransferTrigger'},
547
        itemnumber     => $itemnumber,
547
        itemnumber => $itemnumber,
548
    );
548
    );
549
}
549
}
550
550
Lines 689-774 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 'LostItemFeeCharged' ) {
706
    elsif ( $code eq 'LostItemFeeCharged' ) {
707
        $template->param( LostItemFeeCharged => 1 );
702
        $template->param( LostItemFeeCharged => 1 );
708
    }
703
    } elsif ( $code eq 'LostItemFeeRestored' ) {
709
    elsif ( $code eq 'LostItemFeeRestored' ) {
710
        $template->param( LostItemFeeRestored => 1 );
704
        $template->param( LostItemFeeRestored => 1 );
711
    }
705
    } elsif ( $code eq 'ProcessingFeeRefunded' ) {
712
    elsif ( $code eq 'ProcessingFeeRefunded' ) {
713
        $template->param( ProcessingFeeRefunded => 1 );
706
        $template->param( ProcessingFeeRefunded => 1 );
714
    }
707
    } elsif ( $code eq 'ResFound' ) {
715
    elsif ( $code eq 'ResFound' ) {
716
        ;    # FIXME... anything to do here?
708
        ;    # FIXME... anything to do here?
717
    }
709
    } elsif ( $code eq 'WasReturned' ) {
718
    elsif ( $code eq 'WasReturned' ) {
719
        ;    # FIXME... anything to do here?
710
        ;    # FIXME... anything to do here?
720
    }
711
    } elsif ( $code eq 'WasTransfered' ) {
721
    elsif ( $code eq 'WasTransfered' ) {
722
        ;    # FIXME... anything to do here?
712
        ;    # FIXME... anything to do here?
723
    }
713
    } elsif ( $code eq 'TransferTo' ) {
724
    elsif ( $code eq 'TransferTo' ) {
725
        ;    # Handled above, along with WasTransfered
714
        ;    # Handled above, along with WasTransfered
726
    }
715
    } elsif ( $code eq 'withdrawn' ) {
727
    elsif ( $code eq 'withdrawn' ) {
728
        $err{withdrawn} = 1;
716
        $err{withdrawn} = 1;
729
    }
717
    } elsif ( $code eq 'WrongTransfer' ) {
730
    elsif ( $code eq 'WrongTransfer' ) {
731
        ;    # FIXME... anything to do here?
718
        ;    # FIXME... anything to do here?
732
    }
719
    } elsif ( $code eq 'WrongTransferItem' ) {
733
    elsif ( $code eq 'WrongTransferItem' ) {
734
        ;    # FIXME... anything to do here?
720
        ;    # FIXME... anything to do here?
735
    }
721
    } elsif ( $code eq 'NeedsTransfer' ) {
736
    elsif ( $code eq 'NeedsTransfer' ) {
722
    } elsif ( $code eq 'TransferTrigger' ) {
737
    }
738
    elsif ( $code eq 'TransferTrigger' ) {
739
        ;    # Handled alongside NeedsTransfer
723
        ;    # Handled alongside NeedsTransfer
740
    }
724
    } elsif ( $code eq 'TransferArrived' ) {
741
    elsif ( $code eq 'TransferArrived' ) {
742
        $err{transferred} = $messages->{'TransferArrived'};
725
        $err{transferred} = $messages->{'TransferArrived'};
743
    }
726
    } elsif ( $code eq 'Wrongbranch' ) {
744
    elsif ( $code eq 'Wrongbranch' ) {
727
    } elsif ( $code eq 'Debarred' ) {
745
    }
746
    elsif ( $code eq 'Debarred' ) {
747
        $err{debarred}            = $messages->{'Debarred'};
728
        $err{debarred}            = $messages->{'Debarred'};
748
        $err{debarcardnumber}     = $borrower->{cardnumber};
729
        $err{debarcardnumber}     = $borrower->{cardnumber};
749
        $err{debarborrowernumber} = $borrower->{borrowernumber};
730
        $err{debarborrowernumber} = $borrower->{borrowernumber};
750
        $err{debarname}           = "$borrower->{firstname} $borrower->{surname}";
731
        $err{debarname}           = "$borrower->{firstname} $borrower->{surname}";
751
    }
732
    } elsif ( $code eq 'PrevDebarred' ) {
752
    elsif ( $code eq 'PrevDebarred' ) {
733
        $err{prevdebarred} = $messages->{'PrevDebarred'};
753
        $err{prevdebarred}        = $messages->{'PrevDebarred'};
734
    } elsif ( $code eq 'ForeverDebarred' ) {
754
    }
735
        $err{foreverdebarred} = $messages->{'ForeverDebarred'};
755
    elsif ( $code eq 'ForeverDebarred' ) {
736
    } elsif ( $code eq 'ItemLocationUpdated' ) {
756
        $err{foreverdebarred}        = $messages->{'ForeverDebarred'};
757
    }
758
    elsif ( $code eq 'ItemLocationUpdated' ) {
759
        $err{ItemLocationUpdated} = $messages->{ItemLocationUpdated};
737
        $err{ItemLocationUpdated} = $messages->{ItemLocationUpdated};
760
    }
738
    } elsif ( $code eq 'NotForLoanStatusUpdated' ) {
761
    elsif ( $code eq 'NotForLoanStatusUpdated' ) {
762
        $err{NotForLoanStatusUpdated} = $messages->{NotForLoanStatusUpdated};
739
        $err{NotForLoanStatusUpdated} = $messages->{NotForLoanStatusUpdated};
763
    }
740
    } elsif ( $code eq 'DataCorrupted' ) {
764
    elsif ( $code eq 'DataCorrupted' ) {
765
        $err{data_corrupted} = 1;
741
        $err{data_corrupted} = 1;
766
    }
742
    } elsif ( $code eq 'ReturnClaims' ) {
767
    elsif ( $code eq 'ReturnClaims' ) {
768
        $template->param( ReturnClaims => $messages->{ReturnClaims} );
743
        $template->param( ReturnClaims => $messages->{ReturnClaims} );
769
    }
744
    } elsif ( $code eq 'ClaimAutoResolved' ) {
770
      elsif ( $code eq 'ClaimAutoResolved' ) {
745
        $template->param( ClaimAutoResolved => $messages->{ClaimAutoResolved} );
771
          $template->param( ClaimAutoResolved => $messages->{ClaimAutoResolved} );
772
    } elsif ( $code eq 'RecallFound' ) {
746
    } elsif ( $code eq 'RecallFound' ) {
773
        ;
747
        ;
774
    } elsif ( $code eq 'RecallNeedsTransfer' ) {
748
    } elsif ( $code eq 'RecallNeedsTransfer' ) {
Lines 779-785 foreach my $code ( keys %$messages ) { Link Here
779
        $template->param( InBundle => $messages->{InBundle} );
753
        $template->param( InBundle => $messages->{InBundle} );
780
    } else {
754
    } else {
781
        die "Unknown error code $code";    # note we need all the (empty) elsif's above, or we die.
755
        die "Unknown error code $code";    # note we need all the (empty) elsif's above, or we die.
782
        # This forces the issue of staying in sync w/ Circulation.pm
756
                                           # This forces the issue of staying in sync w/ Circulation.pm
783
    }
757
    }
784
    if (%err) {
758
    if (%err) {
785
        push( @errmsgloop, \%err );
759
        push( @errmsgloop, \%err );
786
- 

Return to bug 35100