Kyle M Hall
285f06e394
The root problem here is that the price is being pulled from the MARC record and is then run through Number::Format::unformat_number. This routine is really being misused, and should only be used to reverse the effects of Number::Format on a number string. We are apparently using it to strip out currency characters and the like. Number::Format::unformat_number will choke if there is more than one period (.) in the price field. MARC standards do not limit this field to a single period, so unless there is only one period, we should skip number unformatting. Examples of that break unformat_number include '18.95 (U.S.)', and '$5.99 ($7.75 CAN)', both of which are perfectly valid. This commit adds the function MungeMarcPrice that will better handle find a real price value in a given price field. It does a very good job at finding a price in any currency format, and attempts to find a price in whichever currency is active before falling back to the first valid price it can find. The variable $price may fail to have an actual price, in which case the price then defaults to '0.00', which would be rarely if ever the correct price. To combat this, I have added highlighting to any price in the Order Details table that begins with 0 ( i.e. '0.00' ). Also, fixed the incomplete table footer, adding a new td with a span of 3 to fill in the nonexistant cells. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
447 lines
18 KiB
Perl
Executable file
447 lines
18 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
#A script that lets the user populate a basket from an iso2709 file
|
|
#the script first displays a list of import batches, then when a batch is selected displays all the biblios in it.
|
|
#The user can then pick which biblios he wants to order
|
|
|
|
# Copyright 2008 - 2011 BibLibre SARL
|
|
#
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it under the
|
|
# terms of the GNU General Public License as published by the Free Software
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
|
# version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
|
|
# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License along
|
|
# with Koha; if not, write to the Free Software Foundation, Inc.,
|
|
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
use strict;
|
|
use warnings;
|
|
use CGI;
|
|
use Carp;
|
|
use Number::Format qw(:all);
|
|
|
|
use C4::Context;
|
|
use C4::Auth;
|
|
use C4::Input;
|
|
use C4::Output;
|
|
use C4::ImportBatch;
|
|
use C4::Matcher;
|
|
use C4::Search qw/FindDuplicate/;
|
|
use C4::Acquisition;
|
|
use C4::Biblio;
|
|
use C4::Items;
|
|
use C4::Koha;
|
|
use C4::Budgets;
|
|
use C4::Acquisition;
|
|
use C4::Bookseller qw/GetBookSellerFromId/;
|
|
use C4::Suggestions; # GetSuggestion
|
|
use C4::Branch; # GetBranches
|
|
use C4::Members;
|
|
|
|
my $input = new CGI;
|
|
my ($template, $loggedinuser, $cookie) = get_template_and_user({
|
|
template_name => "acqui/addorderiso2709.tmpl",
|
|
query => $input,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { acquisition => 'order_manage' },
|
|
debug => 1,
|
|
});
|
|
my $cgiparams = $input->Vars;
|
|
my $op = $cgiparams->{'op'};
|
|
my $booksellerid = $input->param('booksellerid');
|
|
my $bookseller = GetBookSellerFromId($booksellerid);
|
|
my $data;
|
|
|
|
$template->param(scriptname => "/cgi-bin/koha/acqui/addorderiso2709.pl",
|
|
booksellerid => $booksellerid,
|
|
booksellername => $bookseller->{name},
|
|
);
|
|
my $ordernumber;
|
|
|
|
if ($cgiparams->{'import_batch_id'} && $op eq ""){
|
|
$op = "batch_details";
|
|
}
|
|
|
|
#Needed parameters:
|
|
if (! $cgiparams->{'basketno'}){
|
|
die "Basketnumber required to order from iso2709 file import";
|
|
}
|
|
|
|
#
|
|
# 1st step = choose the file to import into acquisition
|
|
#
|
|
if ($op eq ""){
|
|
$template->param("basketno" => $cgiparams->{'basketno'});
|
|
#display batches
|
|
import_batches_list($template);
|
|
#
|
|
# 2nd step = display the content of the choosen file
|
|
#
|
|
} elsif ($op eq "batch_details"){
|
|
#display lines inside the selected batch
|
|
# get currencies (for change rates calcs if needed)
|
|
my $active_currency = GetCurrency();
|
|
my $default_currency;
|
|
if (! $data->{currency} ) { # New order no currency set
|
|
if ( $bookseller->{listprice} ) {
|
|
$default_currency = $bookseller->{listprice};
|
|
}
|
|
else {
|
|
$default_currency = $active_currency->{currency};
|
|
}
|
|
}
|
|
my @rates = GetCurrencies();
|
|
|
|
# ## @rates
|
|
|
|
my @loop_currency = ();
|
|
for my $curr ( @rates ) {
|
|
my $selected;
|
|
if ($data->{currency} ) {
|
|
$selected = $curr->{currency} eq $data->{currency};
|
|
}
|
|
else {
|
|
$selected = $curr->{currency} eq $default_currency;
|
|
}
|
|
push @loop_currency, {
|
|
currcode => $curr->{currency},
|
|
rate => $curr->{rate},
|
|
selected => $selected,
|
|
}
|
|
}
|
|
|
|
$template->param("batch_details" => 1,
|
|
"basketno" => $cgiparams->{'basketno'},
|
|
loop_currencies => \@loop_currency,
|
|
);
|
|
import_biblios_list($template, $cgiparams->{'import_batch_id'});
|
|
if ( C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordernumber ) {
|
|
# prepare empty item form
|
|
my $cell = PrepareItemrecordDisplay( '', '', '', 'ACQ' );
|
|
|
|
# warn "==> ".Data::Dumper::Dumper($cell);
|
|
unless ($cell) {
|
|
$cell = PrepareItemrecordDisplay( '', '', '', '' );
|
|
$template->param( 'NoACQframework' => 1 );
|
|
}
|
|
my @itemloop;
|
|
push @itemloop, $cell;
|
|
|
|
$template->param( items => \@itemloop );
|
|
}
|
|
#
|
|
# 3rd step = import the records
|
|
#
|
|
} elsif ( $op eq 'import_records' ) {
|
|
my $num=FormatNumber();
|
|
#import selected lines
|
|
$template->param('basketno' => $cgiparams->{'basketno'});
|
|
# Budget_id is mandatory for adding an order, we just add a default, the user needs to modify this aftewards
|
|
my $budgets = GetBudgets();
|
|
if (scalar @$budgets == 0){
|
|
die "No budgets defined, can't continue";
|
|
}
|
|
my $budget_id = @$budgets[0]->{'budget_id'};
|
|
#get all records from a batch, and check their import status to see if they are checked.
|
|
#(default values: quantity 1, uncertainprice yes, first budget)
|
|
|
|
# retrieve the file you want to import
|
|
my $import_batch_id = $cgiparams->{'import_batch_id'};
|
|
my $biblios = GetImportBibliosRange($import_batch_id);
|
|
for my $biblio (@$biblios){
|
|
# 1st insert the biblio, or find it through matcher
|
|
my ( $marcblob, $encoding ) = GetImportRecordMarc( $biblio->{'import_record_id'} );
|
|
my $marcrecord = MARC::Record->new_from_usmarc($marcblob) || die "couldn't translate marc information";
|
|
my $match = GetImportRecordMatches( $biblio->{'import_record_id'}, 1 );
|
|
my $biblionumber=$#$match > -1?$match->[0]->{'biblionumber'}:0;
|
|
|
|
unless ( $biblionumber ) {
|
|
# add the biblio
|
|
my $bibitemnum;
|
|
|
|
# remove ISBN -
|
|
my ( $isbnfield, $isbnsubfield ) = GetMarcFromKohaField( 'biblioitems.isbn', '' );
|
|
if ( $marcrecord->field($isbnfield) ) {
|
|
foreach my $field ( $marcrecord->field($isbnfield) ) {
|
|
foreach my $subfield ( $field->subfield($isbnsubfield) ) {
|
|
my $newisbn = $field->subfield($isbnsubfield);
|
|
$newisbn =~ s/-//g;
|
|
$field->update( $isbnsubfield => $newisbn );
|
|
}
|
|
}
|
|
}
|
|
( $biblionumber, $bibitemnum ) = AddBiblio( $marcrecord, $cgiparams->{'frameworkcode'} || '' );
|
|
SetImportRecordStatus( $biblio->{'import_record_id'}, 'imported' );
|
|
# 2nd add authorities if applicable
|
|
if (C4::Context->preference("BiblioAddsAuthorities")){
|
|
my $headings_linked =BiblioAutoLink($marcrecord, $cgiparams->{'frameworkcode'});
|
|
}
|
|
} else {
|
|
SetImportRecordStatus( $biblio->{'import_record_id'}, 'imported' );
|
|
}
|
|
# 3rd add order
|
|
my $patron = C4::Members->GetMember( borrowernumber => $loggedinuser );
|
|
my $branch = C4::Branch->GetBranchDetail( $patron->{branchcode} );
|
|
my ($invoice);
|
|
# get quantity in the MARC record (1 if none)
|
|
my $quantity = GetMarcQuantity($marcrecord, C4::Context->preference('marcflavour')) || 1;
|
|
my %orderinfo = (
|
|
"biblionumber", $biblionumber, "basketno", $cgiparams->{'basketno'},
|
|
"quantity", $quantity, "branchcode", $branch,
|
|
"booksellerinvoicenumber", $invoice,
|
|
"budget_id", $budget_id, "uncertainprice", 1,
|
|
"sort1", $cgiparams->{'sort1'},"sort2", $cgiparams->{'sort2'},
|
|
"notes", $cgiparams->{'notes'}, "budget_id", $cgiparams->{'budget_id'},
|
|
"currency",$cgiparams->{'currency'},
|
|
);
|
|
|
|
my $price = GetMarcPrice($marcrecord, C4::Context->preference('marcflavour'));
|
|
|
|
if ($price){
|
|
$orderinfo{'listprice'} = $price;
|
|
eval {
|
|
require C4::Acquisition;
|
|
import C4::Acquisition qw/GetBasket/;
|
|
};
|
|
if ($@){
|
|
croak $@;
|
|
}
|
|
eval {
|
|
require C4::Bookseller;
|
|
import C4::Bookseller qw/GetBookSellerFromId/;
|
|
};
|
|
if ($@){
|
|
croak $@;
|
|
}
|
|
my $basket = GetBasket( $orderinfo{basketno} );
|
|
my $bookseller = GetBookSellerFromId( $basket->{booksellerid} );
|
|
my $gst = $bookseller->{gstrate} || C4::Context->preference("gist") || 0;
|
|
$orderinfo{'unitprice'} = $orderinfo{listprice} - ( $orderinfo{listprice} * ( $bookseller->{discount} / 100 ) );
|
|
$orderinfo{'ecost'} = $orderinfo{unitprice};
|
|
} else {
|
|
$orderinfo{'listprice'} = 0;
|
|
}
|
|
$orderinfo{'rrp'} = $orderinfo{'listprice'};
|
|
|
|
# remove uncertainprice flag if we have found a price in the MARC record
|
|
$orderinfo{uncertainprice} = 0 if $orderinfo{listprice};
|
|
my $basketno;
|
|
( $basketno, $ordernumber ) = NewOrder( \%orderinfo );
|
|
|
|
# 4th, add items if applicable
|
|
# parse the item sent by the form, and create an item just for the import_record_id we are dealing with
|
|
# this is not optimised, but it's working !
|
|
if ( C4::Context->preference('AcqCreateItem') eq 'ordering' ) {
|
|
my @tags = $input->param('tag');
|
|
my @subfields = $input->param('subfield');
|
|
my @field_values = $input->param('field_value');
|
|
my @serials = $input->param('serial');
|
|
my @ind_tag = $input->param('ind_tag');
|
|
my @indicator = $input->param('indicator');
|
|
my $item;
|
|
push @{ $item->{tags} }, $tags[0];
|
|
push @{ $item->{subfields} }, $subfields[0];
|
|
push @{ $item->{field_values} }, $field_values[0];
|
|
push @{ $item->{ind_tag} }, $ind_tag[0];
|
|
push @{ $item->{indicator} }, $indicator[0];
|
|
my $xml = TransformHtmlToXml( \@tags, \@subfields, \@field_values, \@ind_tag, \@indicator );
|
|
my $record = MARC::Record::new_from_xml( $xml, 'UTF-8' );
|
|
for (my $qtyloop=1;$qtyloop <=$quantity;$qtyloop++) {
|
|
my ( $biblionumber, $bibitemnum, $itemnumber ) = AddItemFromMarc( $record, $biblionumber );
|
|
NewOrderItem( $itemnumber, $ordernumber );
|
|
}
|
|
} else {
|
|
SetImportRecordStatus( $biblio->{'import_record_id'}, 'imported' );
|
|
}
|
|
}
|
|
# go to basket page
|
|
print $input->redirect("/cgi-bin/koha/acqui/basket.pl?basketno=".$cgiparams->{'basketno'});
|
|
exit;
|
|
}
|
|
|
|
my $budgets = GetBudgets();
|
|
my $budget_id = @$budgets[0]->{'budget_id'};
|
|
# build bookfund list
|
|
my $borrower = GetMember( 'borrowernumber' => $loggedinuser );
|
|
my ( $flags, $homebranch ) = ( $borrower->{'flags'}, $borrower->{'branchcode'} );
|
|
my $budget = GetBudget($budget_id);
|
|
|
|
# build budget list
|
|
my $budget_loop = [];
|
|
$budgets = GetBudgetHierarchy( q{}, $borrower->{branchcode}, $borrower->{borrowernumber} );
|
|
foreach my $r ( @{$budgets} ) {
|
|
if ( !defined $r->{budget_amount} || $r->{budget_amount} == 0 ) {
|
|
next;
|
|
}
|
|
push @{$budget_loop},
|
|
{ b_id => $r->{budget_id},
|
|
b_txt => $r->{budget_name},
|
|
b_sel => ( $r->{budget_id} == $budget_id ) ? 1 : 0,
|
|
};
|
|
}
|
|
$template->param( budget_loop => $budget_loop,);
|
|
|
|
my $CGIsort1;
|
|
if ($budget) { # its a mod ..
|
|
if ( defined $budget->{'sort1_authcat'} ) { # with custom Asort* planning values
|
|
$CGIsort1 = GetAuthvalueDropbox( $budget->{'sort1_authcat'}, $data->{'sort1'} );
|
|
}
|
|
} elsif ( scalar(@$budgets) ) {
|
|
$CGIsort1 = GetAuthvalueDropbox( @$budgets[0]->{'sort1_authcat'}, '' );
|
|
} else {
|
|
$CGIsort1 = GetAuthvalueDropbox( '', '' );
|
|
}
|
|
|
|
# if CGIsort is successfully fetched, the use it
|
|
# else - failback to plain input-field
|
|
if ($CGIsort1) {
|
|
$template->param( CGIsort1 => $CGIsort1 );
|
|
} else {
|
|
$template->param( sort1 => $data->{'sort1'} );
|
|
}
|
|
|
|
my $CGIsort2;
|
|
if ($budget) {
|
|
if ( defined $budget->{'sort2_authcat'} ) {
|
|
$CGIsort2 = GetAuthvalueDropbox( $budget->{'sort2_authcat'}, $data->{'sort2'} );
|
|
}
|
|
} elsif ( scalar(@$budgets) ) {
|
|
$CGIsort2 = GetAuthvalueDropbox( @$budgets[0]->{sort2_authcat}, '' );
|
|
} else {
|
|
$CGIsort2 = GetAuthvalueDropbox( '', '' );
|
|
}
|
|
|
|
if ($CGIsort2) {
|
|
$template->param( CGIsort2 => $CGIsort2 );
|
|
} else {
|
|
$template->param( sort2 => $data->{'sort2'} );
|
|
}
|
|
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
|
|
|
|
sub import_batches_list {
|
|
my ($template) = @_;
|
|
my $batches = GetImportBatchRangeDesc();
|
|
|
|
my @list = ();
|
|
foreach my $batch (@$batches) {
|
|
if ($batch->{'import_status'} eq "staged") {
|
|
# check if there is at least 1 line still staged
|
|
my $stagedList=GetImportBibliosRange($batch->{'import_batch_id'}, undef, undef, 'staged');
|
|
if (scalar @$stagedList) {
|
|
my ($staged_date, $staged_hour) = split (/ /, $batch->{'upload_timestamp'});
|
|
push @list, {
|
|
import_batch_id => $batch->{'import_batch_id'},
|
|
num_biblios => $batch->{'num_biblios'},
|
|
num_items => $batch->{'num_items'},
|
|
staged_date => $staged_date,
|
|
staged_hour => $staged_hour,
|
|
import_status => $batch->{'import_status'},
|
|
file_name => $batch->{'file_name'},
|
|
comments => $batch->{'comments'},
|
|
};
|
|
} else {
|
|
# if there are no more line to includes, set the status to imported
|
|
SetImportBatchStatus( $batch->{'import_batch_id'}, 'imported' );
|
|
}
|
|
}
|
|
}
|
|
$template->param(batch_list => \@list);
|
|
my $num_batches = GetNumberOfNonZ3950ImportBatches();
|
|
$template->param(num_results => $num_batches);
|
|
}
|
|
|
|
sub import_biblios_list {
|
|
my ($template, $import_batch_id) = @_;
|
|
my $batch = GetImportBatch($import_batch_id,'staged');
|
|
my $biblios = GetImportBibliosRange($import_batch_id,'','','staged');
|
|
my @list = ();
|
|
|
|
foreach my $biblio (@$biblios) {
|
|
my $citation = $biblio->{'title'};
|
|
$citation .= " $biblio->{'author'}" if $biblio->{'author'};
|
|
$citation .= " (" if $biblio->{'issn'} or $biblio->{'isbn'};
|
|
$citation .= $biblio->{'isbn'} if $biblio->{'isbn'};
|
|
$citation .= ", " if $biblio->{'issn'} and $biblio->{'isbn'};
|
|
$citation .= $biblio->{'issn'} if $biblio->{'issn'};
|
|
$citation .= ")" if $biblio->{'issn'} or $biblio->{'isbn'};
|
|
my $match = GetImportRecordMatches($biblio->{'import_record_id'}, 1);
|
|
my %cellrecord = (
|
|
import_record_id => $biblio->{'import_record_id'},
|
|
citation => $citation,
|
|
import => 1,
|
|
status => $biblio->{'status'},
|
|
record_sequence => $biblio->{'record_sequence'},
|
|
overlay_status => $biblio->{'overlay_status'},
|
|
match_biblionumber => $#$match > -1 ? $match->[0]->{'biblionumber'} : 0,
|
|
match_citation => $#$match > -1 ? $match->[0]->{'title'} . ' ' . $match->[0]->{'author'} : '',
|
|
match_score => $#$match > -1 ? $match->[0]->{'score'} : 0,
|
|
);
|
|
push @list, \%cellrecord;
|
|
}
|
|
my $num_biblios = $batch->{'num_biblios'};
|
|
my $overlay_action = GetImportBatchOverlayAction($import_batch_id);
|
|
my $nomatch_action = GetImportBatchNoMatchAction($import_batch_id);
|
|
my $item_action = GetImportBatchItemAction($import_batch_id);
|
|
$template->param(biblio_list => \@list,
|
|
num_results => $num_biblios,
|
|
import_batch_id => $import_batch_id,
|
|
"overlay_action_${overlay_action}" => 1,
|
|
overlay_action => $overlay_action,
|
|
"nomatch_action_${nomatch_action}" => 1,
|
|
nomatch_action => $nomatch_action,
|
|
"item_action_${item_action}" => 1,
|
|
item_action => $item_action
|
|
);
|
|
batch_info($template, $batch);
|
|
}
|
|
|
|
sub batch_info {
|
|
my ($template, $batch) = @_;
|
|
$template->param(batch_info => 1,
|
|
file_name => $batch->{'file_name'},
|
|
comments => $batch->{'comments'},
|
|
import_status => $batch->{'import_status'},
|
|
upload_timestamp => $batch->{'upload_timestamp'},
|
|
num_biblios => $batch->{'num_biblios'},
|
|
num_items => $batch->{'num_biblios'});
|
|
if ($batch->{'num_biblios'} > 0) {
|
|
if ($batch->{'import_status'} eq 'staged' or $batch->{'import_status'} eq 'reverted') {
|
|
$template->param(can_commit => 1);
|
|
}
|
|
if ($batch->{'import_status'} eq 'imported') {
|
|
$template->param(can_revert => 1);
|
|
}
|
|
}
|
|
if (defined $batch->{'matcher_id'}) {
|
|
my $matcher = C4::Matcher->fetch($batch->{'matcher_id'});
|
|
if (defined $matcher) {
|
|
$template->param('current_matcher_id' => $batch->{'matcher_id'},
|
|
'current_matcher_code' => $matcher->code(),
|
|
'current_matcher_description' => $matcher->description());
|
|
}
|
|
}
|
|
add_matcher_list($batch->{'matcher_id'});
|
|
}
|
|
|
|
sub add_matcher_list {
|
|
my $current_matcher_id = shift;
|
|
my @matchers = C4::Matcher::GetMatcherList();
|
|
if (defined $current_matcher_id) {
|
|
for (my $i = 0; $i <= $#matchers; $i++) {
|
|
if ($matchers[$i]->{'matcher_id'} == $current_matcher_id) {
|
|
$matchers[$i]->{'selected'} = 1;
|
|
}
|
|
}
|
|
}
|
|
$template->param(available_matchers => \@matchers);
|
|
}
|