Bug 6347 - Fix for itemlevel holds in OPAC

[koha.git] / acqui / basketgroup.pl

diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl
index 2a35f3a..457b616 100755 (executable)
--- a/acqui/basketgroup.pl
+++ b/acqui/basketgroup.pl
@@ -273,6 +273,7 @@ if ( $op eq "add" ) {
         my $basketgroupid = $input->param('basketgroupid');
         my $billingplace;
         my $deliveryplace;
+        my $freedeliveryplace;
         if ( $basketgroupid ) {
             # Get the selected baskets in the basketgroup to display them
             my $selecteds = GetBasketsByBasketgroup($basketgroupid);
@@ -287,9 +288,11 @@ if ( $op eq "add" ) {
             $template->param(
                 name            => $basketgroup->{name},
                 deliverycomment => $basketgroup->{deliverycomment},
+                freedeliveryplace => $basketgroup->{freedeliveryplace},
             );
             $billingplace  = $basketgroup->{billingplace};
             $deliveryplace = $basketgroup->{deliveryplace};
+            $freedeliveryplace = $basketgroup->{freedeliveryplace};
         }
 
         # determine default billing and delivery places depending on librarian homebranch and existing basketgroup data
@@ -405,25 +408,27 @@ if ( $op eq "add" ) {
 } elsif ( $op eq 'attachbasket') {
     
     # Getting parameters
-    my $basketgroup = {};
-    my @baskets         = $input->param('basket');
-    my $basketgroupid   = $input->param('basketgroupid');
-    my $basketgroupname = $input->param('basketgroupname');
-    my $booksellerid    = $input->param('booksellerid');
-    my $billingplace    = $input->param('billingplace');
-    my $deliveryplace   = $input->param('deliveryplace');
-    my $deliverycomment = $input->param('deliverycomment');
-    my $close           = $input->param('close') ? 1 : 0;
+    my $basketgroup       = {};
+    my @baskets           = $input->param('basket');
+    my $basketgroupid     = $input->param('basketgroupid');
+    my $basketgroupname   = $input->param('basketgroupname');
+    my $booksellerid      = $input->param('booksellerid');
+    my $billingplace      = $input->param('billingplace');
+    my $deliveryplace     = $input->param('deliveryplace');
+    my $freedeliveryplace = $input->param('freedeliveryplace');
+    my $deliverycomment   = $input->param('deliverycomment');
+    my $close             = $input->param('close') ? 1 : 0;
     # If we got a basketgroupname, we create a basketgroup
     if ($basketgroupid) {
         $basketgroup = {
-              name            => $basketgroupname,
-              id              => $basketgroupid,
-              basketlist      => \@baskets,
-              billingplace    => $billingplace,
-              deliveryplace   => $deliveryplace,
-              deliverycomment => $deliverycomment,
-              closed          => $close,
+              name              => $basketgroupname,
+              id                => $basketgroupid,
+              basketlist        => \@baskets,
+              billingplace      => $billingplace,
+              deliveryplace     => $deliveryplace,
+              freedeliveryplace => $freedeliveryplace,
+              deliverycomment   => $deliverycomment,
+              closed            => $close,
         };
         ModBasketgroup($basketgroup);
         if($close){
@@ -431,12 +436,13 @@ if ( $op eq "add" ) {
         }
     }else{
         $basketgroup = {
-            name            => $basketgroupname,
-            booksellerid    => $booksellerid,
-            basketlist      => \@baskets,
-            deliveryplace   => $deliveryplace,
-            deliverycomment => $deliverycomment,
-            closed          => $close,
+            name              => $basketgroupname,
+            booksellerid      => $booksellerid,
+            basketlist        => \@baskets,
+            deliveryplace     => $deliveryplace,
+            freedeliveryplace => $freedeliveryplace,
+            deliverycomment   => $deliverycomment,
+            closed            => $close,
         };
         $basketgroupid = NewBasketgroup($basketgroup);
     }