Attachment #118695 for bug #26352

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




    $fields = $self->{fields};

    $patron_id = $fields->{ (FID_PATRON_ID) };
    ($patron_id) = Koha::Plugins->call_recursive('patron_barcode_transform', $patron_id );
    $item_id   = $fields->{ (FID_ITEM_ID) };
    my $fee_ack = $fields->{ (FID_FEE_ACK) };


    $patron_id        = $fields->{ (FID_PATRON_ID) };
    $terminal_pwd     = $fields->{ (FID_TERMINAL_PWD) };

    ($patron_id) = Koha::Plugins->call_recursive('patron_barcode_transform', $patron_id );

    # Terminal passwords are different from account login
    # passwords, but I have no idea what to do with them.  So,

    $start        = $fields->{ (FID_START_ITEM) };
    $end          = $fields->{ (FID_END_ITEM) };

    ($patron_id) = Koha::Plugins->call_recursive('patron_barcode_transform', $patron_id );

    $patron = $ils->find_patron($patron_id);


    $fee_id     = $fields->{ (FID_FEE_ID) };
    $trans_id   = $fields->{ (FID_TRANSACTION_ID) };

    ($patron_id) = Koha::Plugins->call_recursive('patron_barcode_transform', $patron_id );

    $ils->check_inst_id( $inst_id, "handle_fee_paid" );


    $patron_id  = $fields->{ (FID_PATRON_ID) };
    $patron_pwd = $fields->{ (FID_PATRON_PWD) };

    ($patron_id) = Koha::Plugins->call_recursive('patron_barcode_transform', $patron_id );

    siplog( "LOG_DEBUG", "handle_patron_enable: patron_id: '%s', patron_pwd: '%s'", $patron_id, $patron_pwd );


    $title_id    = $fields->{ (FID_TITLE_ID) } || '';
    $fee_ack     = $fields->{ (FID_FEE_ACK) } || 'N';

    ($patron_id) = Koha::Plugins->call_recursive('patron_barcode_transform', $patron_id );

    if ( $hold_mode eq '+' ) {
        $status = $ils->add_hold( $patron_id, $patron_pwd, $item_id, $title_id, $expiry_date, $pickup_locn, $hold_type, $fee_ack );

    $item_props = $fields->{ (FID_ITEM_PROPS) };
    $fee_ack    = $fields->{ (FID_FEE_ACK) };

    ($patron_id) = Koha::Plugins->call_recursive('patron_barcode_transform', $patron_id );

    $status = $ils->renew( $patron_id, $patron_pwd, $item_id, $title_id, $no_block, $nb_due_date, $third_party, $item_props, $fee_ack );


    $terminal_pwd = $fields->{ (FID_TERMINAL_PWD) };
    $fee_ack      = $fields->{ (FID_FEE_ACK) };

    ($patron_id) = Koha::Plugins->call_recursive('patron_barcode_transform', $patron_id );

    $status = $ils->renew_all( $patron_id, $patron_pwd, $fee_ack );


Lines 112-118 Autogenerate next cardnumber from highest value found in database Link Here

(-)a/Koha/Patron.pm (-2 / +2 lines)
112	sub fixup_cardnumber {	112	sub fixup_cardnumber {
113	my ( $self ) = @_;	113	my ( $self ) = @_;
114		114
115	my ( $max ) = Koha::Plugins->call( 'patron_barcode_transform', $self->cardnumber ) \|\| undef;	115	my ( $max ) = Koha::Plugins->call_recursive( 'patron_barcode_transform', $self->cardnumber );
116		116
117	$max \|\|= Koha::Patrons->search({	117	$max \|\|= Koha::Patrons->search({
118	cardnumber => {-regexp => '^-?[0-9]+$'}	118	cardnumber => {-regexp => '^-?[0-9]+$'}
Lines 201-207 sub store { Link Here
201		201
202	$self->trim_whitespaces;	202	$self->trim_whitespaces;
203		203
204	my ( $new_cardnumber ) = Koha::Plugins->call( 'patron_barcode_transform', $self->cardnumber ) \|\| $self->cardnumber;	204	my ( $new_cardnumber ) = Koha::Plugins->call_recursive( 'patron_barcode_transform', $self->cardnumber );
205	$self->cardnumber( $new_cardnumber );	205	$self->cardnumber( $new_cardnumber );
206		206
207	# Set surname to uppercase if uppercasesurname is true	207	# Set surname to uppercase if uppercasesurname is true

Lines 81-87 my $autoswitched; Link Here

(-)a/circ/circulation.pl (-2 / +2 lines)
81	my $borrowernumber = $query->param('borrowernumber');	81	my $borrowernumber = $query->param('borrowernumber');
82		82
83	if (C4::Context->preference("AutoSwitchPatron") && $barcode) {	83	if (C4::Context->preference("AutoSwitchPatron") && $barcode) {
84	my ( $new_barcode ) = Koha::Plugins->call( 'patron_barcode_transform', $findborrower ) \|\| $findborrower;	84	my ( $new_barcode ) = Koha::Plugins->call_recursive( 'patron_barcode_transform', $findborrower );
85	if (Koha::Patrons->search( { cardnumber => $new_barcode} )->count() > 0) {	85	if (Koha::Patrons->search( { cardnumber => $new_barcode} )->count() > 0) {
86	$findborrower = $barcode;	86	$findborrower = $barcode;
87	undef $barcode;	87	undef $barcode;
Lines 227-233 if ( @$barcodes == 0 && $charges eq 'yes' ) { Link Here
227	#	227	#
228	my $message;	228	my $message;
229	if ($findborrower) {	229	if ($findborrower) {
230	( $findborrower ) = Koha::Plugins->call( 'patron_barcode_transform', $findborrower ) \|\| $findborrower;	230	( $findborrower ) = Koha::Plugins->call_recursive( 'patron_barcode_transform', $findborrower );
231	my $patron = Koha::Patrons->find( { cardnumber => $findborrower } );	231	my $patron = Koha::Patrons->find( { cardnumber => $findborrower } );
232	if ( $patron ) {	232	if ( $patron ) {
233	$borrowernumber = $patron->borrowernumber;	233	$borrowernumber = $patron->borrowernumber;

Lines 333-339 if ($op eq 'save' \|\| $op eq 'insert'){ Link Here

(-)a/members/memberentry.pl (-1 / +1 lines)
333	# If the cardnumber is blank, treat it as null.	333	# If the cardnumber is blank, treat it as null.
334	$newdata{'cardnumber'} = undef if $newdata{'cardnumber'} =~ /^\s*$/;	334	$newdata{'cardnumber'} = undef if $newdata{'cardnumber'} =~ /^\s*$/;
335		335
336	my ( $new_barcode ) = Koha::Plugins->call( 'patron_barcode_transform', $newdata{'cardnumber'} ) \|\| $newdata{'cardnumber'};	336	my ( $new_barcode ) = Koha::Plugins->call_recursive( 'patron_barcode_transform', $newdata{'cardnumber'} );
337	$newdata{'cardnumber'} = $new_barcode;	337	$newdata{'cardnumber'} = $new_barcode;
338		338
339	if (my $error_code = checkcardnumber($newdata{cardnumber},$newdata{borrowernumber})){	339	if (my $error_code = checkcardnumber($newdata{cardnumber},$newdata{borrowernumber})){

Lines 124-130 if (C4::Context->preference('SelfCheckoutByLogin') && !$patronid) { Link Here

(-)a/opac/sco/sco-main.pl (-1 / +1 lines)
124		124
125	my ( $borrower, $patron );	125	my ( $borrower, $patron );
126	if ( $patronid ) {	126	if ( $patronid ) {
127	( $patronid ) = Koha::Plugins->call( 'patron_barcode_transform', $patronid ) \|\| $patronid;	127	( $patronid ) = Koha::Plugins->call_recursive( 'patron_barcode_transform', $patronid );
128	$patron = Koha::Patrons->find( { cardnumber => $patronid } );	128	$patron = Koha::Patrons->find( { cardnumber => $patronid } );
129	$borrower = $patron->unblessed if $patron;	129	$borrower = $patron->unblessed if $patron;
130	}	130	}

Lines 48-53 subtest '() hook tests' => sub { Link Here

(-)a/t/db_dependent/Koha/Plugins/Barcode_transform_hooks.t (-1 / +1 lines)
48		48
49	my $plugins = Koha::Plugins->new;	49	my $plugins = Koha::Plugins->new;
50	$plugins->InstallPlugins;	50	$plugins->InstallPlugins;
		51	C4::Context->dbh->do("DELETE FROM plugin_methods WHERE plugin_class LIKE '%TestBarcodes%'");
51		52
52	my $plugin = Koha::Plugin::Test->new->enable;	53	my $plugin = Koha::Plugin::Test->new->enable;
53		54
54	-

Return to bug 26352

Lines 520-526 sub handle_checkout { Link Here

(-)a/C4/SIP/Sip/MsgType.pm (-8 / +8 lines)
520	$fields = $self->{fields};	520	$fields = $self->{fields};
521		521
522	$patron_id = $fields->{ (FID_PATRON_ID) };	522	$patron_id = $fields->{ (FID_PATRON_ID) };
523	($patron_id) = Koha::Plugins->call('patron_barcode_transform', $patron_id ) \|\| $patron_id;	523	($patron_id) = Koha::Plugins->call_recursive('patron_barcode_transform', $patron_id );
524	$item_id = $fields->{ (FID_ITEM_ID) };	524	$item_id = $fields->{ (FID_ITEM_ID) };
525	my $fee_ack = $fields->{ (FID_FEE_ACK) };	525	my $fee_ack = $fields->{ (FID_FEE_ACK) };
526		526
Lines 742-748 sub handle_block_patron { Link Here
742	$patron_id = $fields->{ (FID_PATRON_ID) };	742	$patron_id = $fields->{ (FID_PATRON_ID) };
743	$terminal_pwd = $fields->{ (FID_TERMINAL_PWD) };	743	$terminal_pwd = $fields->{ (FID_TERMINAL_PWD) };
744		744
745	($patron_id) = Koha::Plugins->call('patron_barcode_transform', $patron_id ) \|\| $patron_id;	745	($patron_id) = Koha::Plugins->call_recursive('patron_barcode_transform', $patron_id );
746		746
747	# Terminal passwords are different from account login	747	# Terminal passwords are different from account login
748	# passwords, but I have no idea what to do with them. So,	748	# passwords, but I have no idea what to do with them. So,
Lines 968-974 sub handle_patron_info { Link Here
968	$start = $fields->{ (FID_START_ITEM) };	968	$start = $fields->{ (FID_START_ITEM) };
969	$end = $fields->{ (FID_END_ITEM) };	969	$end = $fields->{ (FID_END_ITEM) };
970		970
971	($patron_id) = Koha::Plugins->call('patron_barcode_transform', $patron_id ) \|\| $patron_id;	971	($patron_id) = Koha::Plugins->call_recursive('patron_barcode_transform', $patron_id );
972		972
973	$patron = $ils->find_patron($patron_id);	973	$patron = $ils->find_patron($patron_id);
974		974
Lines 1127-1133 sub handle_fee_paid { Link Here
1127	$fee_id = $fields->{ (FID_FEE_ID) };	1127	$fee_id = $fields->{ (FID_FEE_ID) };
1128	$trans_id = $fields->{ (FID_TRANSACTION_ID) };	1128	$trans_id = $fields->{ (FID_TRANSACTION_ID) };
1129		1129
1130	($patron_id) = Koha::Plugins->call('patron_barcode_transform', $patron_id ) \|\| $patron_id;	1130	($patron_id) = Koha::Plugins->call_recursive('patron_barcode_transform', $patron_id );
1131		1131
1132	$ils->check_inst_id( $inst_id, "handle_fee_paid" );	1132	$ils->check_inst_id( $inst_id, "handle_fee_paid" );
1133		1133
Lines 1325-1331 sub handle_patron_enable { Link Here
1325	$patron_id = $fields->{ (FID_PATRON_ID) };	1325	$patron_id = $fields->{ (FID_PATRON_ID) };
1326	$patron_pwd = $fields->{ (FID_PATRON_PWD) };	1326	$patron_pwd = $fields->{ (FID_PATRON_PWD) };
1327		1327
1328	($patron_id) = Koha::Plugins->call('patron_barcode_transform', $patron_id ) \|\| $patron_id;	1328	($patron_id) = Koha::Plugins->call_recursive('patron_barcode_transform', $patron_id );
1329		1329
1330	siplog( "LOG_DEBUG", "handle_patron_enable: patron_id: '%s', patron_pwd: '%s'", $patron_id, $patron_pwd );	1330	siplog( "LOG_DEBUG", "handle_patron_enable: patron_id: '%s', patron_pwd: '%s'", $patron_id, $patron_pwd );
1331		1331
Lines 1390-1396 sub handle_hold { Link Here
1390	$title_id = $fields->{ (FID_TITLE_ID) } \|\| '';	1390	$title_id = $fields->{ (FID_TITLE_ID) } \|\| '';
1391	$fee_ack = $fields->{ (FID_FEE_ACK) } \|\| 'N';	1391	$fee_ack = $fields->{ (FID_FEE_ACK) } \|\| 'N';
1392		1392
1393	($patron_id) = Koha::Plugins->call('patron_barcode_transform', $patron_id ) \|\| $patron_id;	1393	($patron_id) = Koha::Plugins->call_recursive('patron_barcode_transform', $patron_id );
1394		1394
1395	if ( $hold_mode eq '+' ) {	1395	if ( $hold_mode eq '+' ) {
1396	$status = $ils->add_hold( $patron_id, $patron_pwd, $item_id, $title_id, $expiry_date, $pickup_locn, $hold_type, $fee_ack );	1396	$status = $ils->add_hold( $patron_id, $patron_pwd, $item_id, $title_id, $expiry_date, $pickup_locn, $hold_type, $fee_ack );
Lines 1457-1463 sub handle_renew { Link Here
1457	$item_props = $fields->{ (FID_ITEM_PROPS) };	1457	$item_props = $fields->{ (FID_ITEM_PROPS) };
1458	$fee_ack = $fields->{ (FID_FEE_ACK) };	1458	$fee_ack = $fields->{ (FID_FEE_ACK) };
1459		1459
1460	($patron_id) = Koha::Plugins->call('patron_barcode_transform', $patron_id ) \|\| $patron_id;	1460	($patron_id) = Koha::Plugins->call_recursive('patron_barcode_transform', $patron_id );
1461		1461
1462	$status = $ils->renew( $patron_id, $patron_pwd, $item_id, $title_id, $no_block, $nb_due_date, $third_party, $item_props, $fee_ack );	1462	$status = $ils->renew( $patron_id, $patron_pwd, $item_id, $title_id, $no_block, $nb_due_date, $third_party, $item_props, $fee_ack );
1463		1463
Lines 1540-1546 sub handle_renew_all { Link Here
1540	$terminal_pwd = $fields->{ (FID_TERMINAL_PWD) };	1540	$terminal_pwd = $fields->{ (FID_TERMINAL_PWD) };
1541	$fee_ack = $fields->{ (FID_FEE_ACK) };	1541	$fee_ack = $fields->{ (FID_FEE_ACK) };
1542		1542
1543	($patron_id) = Koha::Plugins->call('patron_barcode_transform', $patron_id ) \|\| $patron_id;	1543	($patron_id) = Koha::Plugins->call_recursive('patron_barcode_transform', $patron_id );
1544		1544
1545	$status = $ils->renew_all( $patron_id, $patron_pwd, $fee_ack );	1545	$status = $ils->renew_all( $patron_id, $patron_pwd, $fee_ack );
1546		1546