Bug 15774: Show additional field values in edit form

[koha.git] / serials / subscription-detail.pl

diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl
index 9ea681b..c023c74 100755 (executable)
--- a/serials/subscription-detail.pl
+++ b/serials/subscription-detail.pl
@@ -26,6 +26,7 @@ use C4::Output;
 use C4::Context;
 use C4::Search qw/enabled_staff_search_views/;
 
+use Koha::AdditionalFields;
 use Koha::AuthorisedValues;
 use Koha::DateUtils;
 use Koha::Acquisition::Bookseller;
@@ -33,6 +34,8 @@ use Koha::Acquisition::Bookseller;
 use Date::Calc qw/Today Day_of_Year Week_of_Year Add_Delta_Days/;
 use Carp;
 
+use Koha::SharedContent;
+
 my $query = new CGI;
 my $op = $query->param('op') || q{};
 my $issueconfirmed = $query->param('issueconfirmed');
@@ -60,7 +63,6 @@ my ($template, $loggedinuser, $cookie)
                 debug => 1,
                 });
 
-
 my $subs = GetSubscription($subscriptionid);
 
 output_and_exit( $query, $cookie, $template, 'unknown_subscription')
@@ -72,31 +74,38 @@ my ($totalissues,@serialslist) = GetSerials($subscriptionid);
 $totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue)
 
 if ($op eq 'del') {
-       if ($$subs{'cannotedit'}){
-               carp "Attempt to delete subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed";
-               print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
-               exit;
-       }
-       
+    if ($$subs{'cannotedit'}){
+        carp "Attempt to delete subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed";
+        print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
+        exit;
+    }
+
     # Asking for confirmation if the subscription has not strictly expired yet or if it has linked issues
     my $strictlyexpired = HasSubscriptionStrictlyExpired($subscriptionid);
     my $linkedissues = CountIssues($subscriptionid);
     my $countitems   = HasItems($subscriptionid);
     if ($strictlyexpired == 0 || $linkedissues > 0 || $countitems>0) {
-               $template->param(NEEDSCONFIRMATION => 1);
-               if ($strictlyexpired == 0) { $template->param("NOTEXPIRED" => 1); }
-               if ($linkedissues     > 0) { $template->param("LINKEDISSUES" => 1); }
-               if ($countitems       > 0) { $template->param("LINKEDITEMS"  => 1); }
+        $template->param(NEEDSCONFIRMATION => 1);
+        if ($strictlyexpired == 0) { $template->param("NOTEXPIRED" => 1); }
+        if ($linkedissues     > 0) { $template->param("LINKEDISSUES" => 1); }
+        if ($countitems       > 0) { $template->param("LINKEDITEMS"  => 1); }
     } else {
-               $issueconfirmed = "1";
+        $issueconfirmed = "1";
     }
     # If it's ok to delete the subscription, we do so
     if ($issueconfirmed eq "1") {
-               &DelSubscription($subscriptionid);
+        &DelSubscription($subscriptionid);
         print $query->redirect("/cgi-bin/koha/serials/serials-home.pl");
         exit;
     }
 }
+elsif ( $op and $op eq "share" ) {
+    my $mana_language = $query->param('mana_language');
+    my $result = Koha::SharedContent::send_entity($mana_language, $loggedinuser, $subscriptionid, 'subscription');
+    $template->param( mana_code => $result->{msg} );
+    $subs->{mana_id} = $result->{id};
+}
+
 my $hasRouting = check_routing($subscriptionid);
 
 (undef, $cookie, undef, undef)
@@ -120,16 +129,25 @@ my $numberpattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($su
 
 my $default_bib_view = get_default_view();
 
-my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription' } );
-for my $field ( @$additional_fields ) {
-    if ( $field->{authorised_value_category} ) {
-        $field->{authorised_value_choices} = GetAuthorisedValues( $field->{authorised_value_category} );
-    }
-}
+my $additional_fields = Koha::AdditionalFields->search( { tablename => 'subscription' } );
 $template->param( additional_fields_for_subscription => $additional_fields );
 
 # FIXME Do we want to hide canceled orders?
-my $orders = Koha::Acquisition::Orders->search( { subscriptionid => $subscriptionid }, { order_by => { -desc => 'parent_ordernumber' } } );
+my $orders = Koha::Acquisition::Orders->search( { subscriptionid => $subscriptionid }, { order_by => [ { -desc => 'timestamp' }, \[ "field(orderstatus, 'ordered', 'partial', 'complete')" ] ] } );
+my $orders_grouped;
+while ( my $o = $orders->next ) {
+    if ( $o->ordernumber == $o->parent_ordernumber ) {
+        $orders_grouped->{$o->parent_ordernumber}->{datereceived} = $o->datereceived;
+        $orders_grouped->{$o->parent_ordernumber}->{orderstatus} = $o->orderstatus;
+        $orders_grouped->{$o->parent_ordernumber}->{basket} = $o->basket;
+    }
+    $orders_grouped->{$o->parent_ordernumber}->{quantity} += $o->quantity;
+    $orders_grouped->{$o->parent_ordernumber}->{ecost_tax_excluded} += sprintf('%.2f', $o->ecost_tax_excluded * $o->quantity);
+    $orders_grouped->{$o->parent_ordernumber}->{ecost_tax_included} += sprintf('%.2f', $o->ecost_tax_included * $o->quantity);
+    $orders_grouped->{$o->parent_ordernumber}->{unitprice_tax_excluded} += sprintf('%.2f', $o->unitprice_tax_excluded * $o->quantity);
+    $orders_grouped->{$o->parent_ordernumber}->{unitprice_tax_included} += sprintf('%.2f', $o->unitprice_tax_included * $o->quantity);
+    push @{$orders_grouped->{$o->parent_ordernumber}->{orders}}, $o;
+}
 
 $template->param(
     subscriptionid => $subscriptionid,
@@ -147,8 +165,9 @@ $template->param(
     intranetcolorstylesheet => C4::Context->preference('intranetcolorstylesheet'),
     irregular_issues => scalar @irregular_issues,
     default_bib_view => $default_bib_view,
-    orders => $orders,
+    orders_grouped => $orders_grouped,
     (uc(C4::Context->preference("marcflavour"))) => 1,
+    mana_comments => $subs->{comments},
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;