Skip to content

Commit

Permalink
Make item addition dependent on MarcItemFieldsToOrder mappings and in…
Browse files Browse the repository at this point in the history 
…troduce MarcFieldsToOrder to cronjob
  • Loading branch information
@mblenk
mblenk committed Aug 8, 2023
1 parent 74a1a68 commit 9d648c9
Show file tree
Hide file tree
Showing 3 changed files with 106 additions and 25 deletions.
123 changes: 100 additions & 23 deletions Koha/MarcOrder.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,41 @@ sub _stage_file {
};
}

=head3 _get_MarcFieldsToOrder_syspref_data
my $marc_fields_to_order = _get_MarcFieldsToOrder_syspref_data('MarcFieldsToOrder', $marcrecord, $fields);
Fetches data from a marc record based on the mappings in the syspref MarcFieldsToOrder using the fields selected in $fields (array).
=cut

sub _get_MarcFieldsToOrder_syspref_data {
my ($syspref_name, $record, $field_list) = @_;
my $syspref = C4::Context->preference($syspref_name);
$syspref = "$syspref\n\n";
my $yaml = eval {
YAML::XS::Load(Encode::encode_utf8($syspref));
};
if ( $@ ) {
warn "Unable to parse $syspref syspref : $@";
return ();
}
my $r;
for my $field_name ( @$field_list ) {
next unless exists $yaml->{$field_name};
my @fields = split /\|/, $yaml->{$field_name};
for my $field ( @fields ) {
my ( $f, $sf ) = split /\$/, $field;
next unless $f and $sf;
if ( my $v = $record->subfield( $f, $sf ) ) {
$r->{$field_name} = $v;
}
last if $yaml->{$field};
}
}
return $r;
}

=head3 _get_MarcItemFieldsToOrder_syspref_data
my $marc_item_fields_to_order = _get_MarcItemFieldsToOrder_syspref_data('MarcItemFieldsToOrder', $marcrecord, $fields);
Expand Down Expand Up @@ -359,8 +394,6 @@ sub _get_MarcItemFieldsToOrder_syspref_data {
}
@tags_list = List::MoreUtils::uniq(@tags_list);

die "System preference MarcItemFieldsToOrder has not been filled in. Please set the mapping values to use this cron script." if scalar(@tags_list == 0);

my $tags_count = _verify_number_of_fields(\@tags_list, $record);
# Return if the number of these fields in the record is not the same.
die "Invalid number of fields detected on field $tags_count->{key}, please check this file" if $tags_count->{error};
Expand All @@ -375,21 +408,24 @@ sub _get_MarcItemFieldsToOrder_syspref_data {
$fields_hash->{$tag} = \@tmp_fields;
}

for (my $i = 0; $i < $tags_count->{count}; $i++) {
my $r;
for my $field_name ( @$field_list ) {
next unless exists $yaml->{$field_name};
my @fields = split /\|/, $yaml->{$field_name};
for my $field ( @fields ) {
my ( $f, $sf ) = split /\$/, $field;
next unless $f and $sf;
my $v = $fields_hash->{$f}[$i] ? $fields_hash->{$f}[$i]->subfield( $sf ) : undef;
$r->{$field_name} = $v if (defined $v);
last if $yaml->{$field};
if($tags_count->{count}){
for (my $i = 0; $i < $tags_count->{count}; $i++) {
my $r;
for my $field_name ( @$field_list ) {
next unless exists $yaml->{$field_name};
my @fields = split /\|/, $yaml->{$field_name};
for my $field ( @fields ) {
my ( $f, $sf ) = split /\$/, $field;
next unless $f and $sf;
my $v = $fields_hash->{$f}[$i] ? $fields_hash->{$f}[$i]->subfield( $sf ) : undef;
$r->{$field_name} = $v if (defined $v);
last if $yaml->{$field};
}
}
push @result, $r;
}
push @result, $r;
}

return $result[0];
}

Expand All @@ -416,7 +452,6 @@ sub _verify_number_of_fields {
return { error => 1, key => $key } if $tag_fields_count->{$key} != $tags_count; # All counts of various fields should be equal if they exist
}
}

return { error => 0, count => $tags_count };
}

Expand Down Expand Up @@ -539,6 +574,23 @@ sub add_items_from_import_record {
my @order_line_details;

if($agent eq 'cron') {
my $marc_fields_to_order = _get_MarcFieldsToOrder_syspref_data('MarcFieldsToOrder', $marcrecord, ['price', 'quantity', 'budget_code', 'discount', 'sort1', 'sort2']);
my $quantity = $marc_fields_to_order->{quantity};
my $budget_code = $marc_fields_to_order->{budget_code} || $budget_id; # Use fallback from ordering profile if not mapped
my $price = $marc_fields_to_order->{price};
my $discount = $marc_fields_to_order->{discount};
my $sort1 = $marc_fields_to_order->{sort1};
my $sort2 = $marc_fields_to_order->{sort2};
my $mapped_budget;
if($budget_code) {
my $biblio_budget = GetBudgetByCode($budget_code);
if($biblio_budget) {
$mapped_budget = $biblio_budget->{budget_id};
} else {
$mapped_budget = $budget_id;
}
}

my $marc_item_fields_to_order = _get_MarcItemFieldsToOrder_syspref_data('MarcItemFieldsToOrder', $marcrecord, ['homebranch', 'holdingbranch', 'itype', 'nonpublic_note', 'public_note', 'loc', 'ccode', 'notforloan', 'uri', 'copyno', 'price', 'replacementprice', 'itemcallnumber', 'quantity', 'budget_code']);
my $item_homebranch = $marc_item_fields_to_order->{homebranch};
my $item_holdingbranch = $marc_item_fields_to_order->{holdingbranch};
Expand All @@ -550,7 +602,7 @@ sub add_items_from_import_record {
my $item_notforloan = $marc_item_fields_to_order->{notforloan};
my $item_uri = $marc_item_fields_to_order->{uri};
my $item_copyno = $marc_item_fields_to_order->{copyno};
my $item_quantity = $marc_item_fields_to_order->{quantity};
my $item_quantity = $marc_item_fields_to_order->{quantity} || 0;
my $item_budget_code = $marc_item_fields_to_order->{budget_code};
my $item_budget_id;
if ( $marc_item_fields_to_order->{budget_code} ) {
Expand All @@ -566,13 +618,10 @@ sub add_items_from_import_record {
my $item_price = $marc_item_fields_to_order->{price};
my $item_replacement_price = $marc_item_fields_to_order->{replacementprice};
my $item_callnumber = $marc_item_fields_to_order->{itemcallnumber};

if(!$item_quantity) {
my $isbn = $marcrecord->subfield( '020', "a" );
warn "No quantity found for record with ISBN: $isbn. No items will be added.";
}
my $itemcreation = 0;

for (my $i = 0; $i < $item_quantity; $i++) {
$itemcreation = 1;
my $item = Koha::Item->new({
biblionumber => $biblionumber,
homebranch => $item_homebranch,
Expand All @@ -592,8 +641,8 @@ sub add_items_from_import_record {

my %order_detail_hash = (
biblionumber => $biblionumber,
itemnumbers => ($item->itemnumber),
basketno => $basket_id,
itemnumbers => ($item->itemnumber),
quantity => 1,
budget_id => $item_budget_id,
currency => $vendor->listprice,
Expand All @@ -615,6 +664,34 @@ sub add_items_from_import_record {

push @order_line_details, \%order_detail_hash;
}

if(!$itemcreation) {
my %order_detail_hash = (
biblionumber => $biblionumber,
basketno => $basket_id,
quantity => $quantity,
budget_id => $mapped_budget,
uncertainprice => 1,
sort1 => $sort1,
sort2 => $sort2,
);

if ($price){
$order_detail_hash{tax_rate_on_ordering} = $vendor->tax_rate;
$order_detail_hash{tax_rate_on_receiving} = $vendor->tax_rate;
my $order_discount = $discount ? $discount : $vendor->discount;
$order_detail_hash{discount} = $order_discount;
$order_detail_hash{rrp} = $price;
$order_detail_hash{ecost} = $order_discount ? $price * ( 1 - $order_discount / 100 ) : $price;
$order_detail_hash{listprice} = $order_detail_hash{rrp} / $active_currency->rate;
$order_detail_hash{unitprice} = $order_detail_hash{ecost};
} else {
$order_detail_hash{listprice} = 0;
}

$order_detail_hash{uncertainprice} = 0 if $order_detail_hash{listprice};
push @order_line_details, \%order_detail_hash;
}
}

if($agent eq 'client') {
Expand Down Expand Up @@ -750,7 +827,7 @@ sub create_order_lines {
my $order_line_details = $args->{order_line_details};

foreach my $order_detail ( @{ $order_line_details } ) {
my @itemnumbers = $order_detail->{itemnumbers};
my @itemnumbers = $order_detail->{itemnumbers} || ();
delete($order_detail->{itemnumber});
my $order = Koha::Acquisition::Order->new( \%{ $order_detail } );
$order->populate_with_prices_for_ordering();
Expand Down
2 changes: 1 addition & 1 deletion acqui/addorderiso2709.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
matcher_id => $matcher_id,
overlay_action => $overlay_action,
agent => 'client',
import_record_id_selected => @import_record_id_selected,
import_record_id_selected => \@import_record_id_selected,
client_item_fields => $client_item_fields,
basket_id => $cgiparams->{'basketno'},
vendor => $bookseller,
Expand Down
6 changes: 5 additions & 1 deletion misc/cronjobs/marc_ordering_process.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ =head1 OPTIONS
opendir my $dir, $working_dir or die "Can't open filepath";
my @files = grep { /\.(mrc|marcxml|mrk)/i } readdir $dir;
closedir $dir;
print "No new files found\n" if scalar(@files) == 0;

my $files_processed = 0;

foreach my $filename ( @files ) {
say sprintf "Creating order lines from file %s", $filename if $verbose;
Expand All @@ -113,6 +116,7 @@ =head1 OPTIONS
};
my $result = Koha::MarcOrder->create_order_lines_from_file($args);
if($result->{success}) {
$files_processed++;
say sprintf "Successfully processed file: %s", $filename if $verbose;
unlink $full_path;
} else {
Expand All @@ -121,7 +125,7 @@ =head1 OPTIONS
};
}
}
print "All files completed\n";
say sprintf "%s files processed", $files_processed unless $files_processed == 0;
print "Moving to next account\n\n";
}
print "Process complete\n";
Expand Down

0 comments on commit 9d648c9

Please sign in to comment.