Attachment 173805 Details for Bug 34355 – Bug 34355: (QA follow-up) Restore MarcFieldsToOrder prices

[patch] Bug 34355: (QA follow-up) Restore MarcFieldsToOrder prices

Bug-34355-QA-follow-up-Restore-MarcFieldsToOrder-p.patch (text/plain), 2.70 KB, created by Matt Blenkinsop on 2024-10-31 14:51:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Blenkinsop

Created: 2024-10-31 14:51:07 UTC

Size: 2.70 KB

patch

obsolete

>From c6841b443414f9770ba1355794b3a513b070dc5d Mon Sep 17 00:00:00 2001
>From: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
>Date: Thu, 31 Oct 2024 14:50:39 +0000
>Subject: [PATCH] Bug 34355: (QA follow-up) Restore MarcFieldsToOrder prices
>
>---
> Koha/MarcOrder.pm                      | 6 +++---
> misc/cronjobs/marc_ordering_process.pl | 2 +-
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/Koha/MarcOrder.pm b/Koha/MarcOrder.pm
>index 627b7fd85e6..9bd3e53d8e7 100644
>--- a/Koha/MarcOrder.pm
>+++ b/Koha/MarcOrder.pm
>@@ -849,7 +849,7 @@ sub parse_input_into_order_line_fields {
>     my $fields       = $args->{fields};
>     my $marcrecord   = $args->{marcrecord};
> 
>-    my $quantity          = $fields->{quantity} || 1;
>+    my $quantity          = $fields->{quantity} || $fields->{c_quantity} || 1;
>     my @homebranches      = $fields->{homebranches}      ? @{ $fields->{homebranches} }      : ();
>     my @holdingbranches   = $fields->{holdingbranches}   ? @{ $fields->{holdingbranches} }   : ();
>     my @itypes            = $fields->{itypes}            ? @{ $fields->{itypes} }            : ();
>@@ -996,9 +996,9 @@ sub create_items_and_generate_order_hash {
>         for ( my $i = 0 ; $i < $loop_limit ; $i++ ) {
>             $budget_ids[$i] = $budget_id if !$budget_ids[$i];    # Use default budget if no budget provided
>             $budget_hash->{ $budget_ids[$i] }->{quantity} += 1;
>-            $budget_hash->{ $budget_ids[$i] }->{price} = @{ $fields->{price} }[$i];
>+            $budget_hash->{ $budget_ids[$i] }->{price} = @{ $fields->{price} }[$i] || $fields->{c_price};
>             $budget_hash->{ $budget_ids[$i] }->{replacementprice} =
>-                @{ $fields->{replacementprice} }[$i];
>+                @{ $fields->{replacementprice} }[$i] || $fields->{c_replacement_price};
>             $budget_hash->{ $budget_ids[$i] }->{itemnumbers} //= [];
>             push @{ $budget_hash->{ $budget_ids[$i] }->{itemnumbers} },
>                 $itemnumbers[$i];
>diff --git a/misc/cronjobs/marc_ordering_process.pl b/misc/cronjobs/marc_ordering_process.pl
>index afe41c8c7d3..ac2e6006d06 100755
>--- a/misc/cronjobs/marc_ordering_process.pl
>+++ b/misc/cronjobs/marc_ordering_process.pl
>@@ -132,7 +132,7 @@ foreach my $acct (@accounts) {
>                 } else {
>                     mkdir "$working_dir/archive" unless -d "$working_dir/archive";
>                     say sprintf "Moving file to archive: %s", $filename if $verbose;
>-                    move( $full_path, "$working_dir/archive/$filename" );
>+                    # move( $full_path, "$working_dir/archive/$filename" );
>                 }
>             } else {
>                 say sprintf "Error processing file: %s", $filename        if $verbose;
>-- 
>2.39.3 (Apple Git-146)

Actions: View | Diff | Splinter Review

Attachments on bug 34355: 154705 | 154706 | 154707 | 154708 | 154709 | 154710 | 157092 | 157093 | 157094 | 157095 | 157096 | 157097 | 157098 | 157099 | 157100 | 160858 | 160859 | 160860 | 160861 | 160862 | 160863 | 160864 | 160865 | 160866 | 160867 | 160868 | 160869 | 160870 | 160871 | 160872 | 160873 | 160874 | 160875 | 169896 | 169897 | 169898 | 169899 | 169900 | 169901 | 169902 | 169903 | 169904 | 170395 | 170401 | 170402 | 170403 | 170404 | 170405 | 170406 | 170407 | 170408 | 170409 | 173054 | 173055 | 173056 | 173057 | 173058 | 173059 | 173060 | 173061 | 173062 | 173063 | 173064 | 173065 | 173066 | 173709 | 173805 | 173806 | 173809 | 173824 | 173825 | 173993 | 173994 | 173995 | 173996 | 173997 | 173998 | 173999 | 174000 | 174001 | 174002 | 174003 | 174004 | 174005 | 174006 | 174007 | 174008 | 174009 | 174010 | 174362 | 174363 | 174364 | 174365 | 174366 | 174367 | 174368 | 174369 | 174370 | 174371 | 174372 | 174373 | 174374 | 174375 | 174376 | 174377 | 174378 | 174379 | 174380 | 174382 | 174383