Bug 29010: (QA follow-up) Change inputmode from numeric to decimal

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

diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl
index 7f6f026..6e82048 100755 (executable)
--- a/serials/subscription-detail.pl
+++ b/serials/subscription-detail.pl
@@ -17,29 +17,23 @@
 
 use Modern::Perl;
 use CGI qw ( -utf8 );
-use C4::Acquisition;
-use C4::Auth;
-use C4::Budgets;
-use C4::Koha;
-use C4::Serials;
-use C4::Output;
+use C4::Auth qw( get_template_and_user checkauth );
+use C4::Serials qw( CloseSubscription ReopenSubscription GetSubscription GetExpirationDate GetSerials HasSubscriptionStrictlyExpired CountIssues HasItems DelSubscription check_routing abouttoexpire can_edit_subscription );
+use C4::Output qw( output_and_exit output_html_with_http_headers );
 use C4::Context;
-use C4::Search qw/enabled_staff_search_views/;
+use C4::Search qw( enabled_staff_search_views );
 
+use Koha::AdditionalFields;
 use Koha::AuthorisedValues;
-use Koha::DateUtils;
+use Koha::DateUtils qw( output_pref );
 use Koha::Acquisition::Bookseller;
+use Koha::Subscriptions;
 
-use Date::Calc qw/Today Day_of_Year Week_of_Year Add_Delta_Days/;
-use Carp;
+use Carp qw( carp );
 
-use LWP::UserAgent;
 use Koha::SharedContent;
-use Koha::Patrons;
-use Koha::Subscriptions;
-use Koha::Libraries;
 
-my $query = new CGI;
+my $query = CGI->new;
 my $op = $query->param('op') || q{};
 my $issueconfirmed = $query->param('issueconfirmed');
 my $dbh = C4::Context->dbh;
@@ -61,12 +55,9 @@ my ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "serials/subscription-detail.tt",
                 query => $query,
                 type => "intranet",
-                authnotrequired => 0,
                 flagsrequired => {serials => $permission},
-                debug => 1,
                 });
 
-
 my $subs = GetSubscription($subscriptionid);
 
 output_and_exit( $query, $cookie, $template, 'unknown_subscription')
@@ -104,44 +95,10 @@ if ($op eq 'del') {
     }
 }
 elsif ( $op and $op eq "share" ) {
-    my $mana_language;
-    if ( $query->param('mana_language') ) {
-        $mana_language = $query->param('mana_language');
-    }
-    else {
-        $mana_language = C4::Context->preference('language');
-    }
-
-    my $mana_email;
-    if ( $loggedinuser ne 0 ) {
-        my $borrower = Koha::Patrons->find($loggedinuser);
-        $mana_email = $borrower->email
-          if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
-        $mana_email = $borrower->emailpro
-          if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
-        $mana_email =
-          Koha::Libraries->find( C4::Context->userenv->{'branch'} )->branchemail
-          if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
-    }
-    $mana_email = C4::Context->preference('KohaAdminEmailAddress')
-      if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
-    my %versions = C4::Context::get_versions();
-
-    my $mana_info = {
-        language    => $mana_language,
-        kohaversion => $versions{'kohaVersion'},
-        exportemail => $mana_email
-    };
-    my $sub_mana_info = Koha::Subscription::get_sharable_info($subscriptionid);
-    $sub_mana_info = { %$sub_mana_info, %$mana_info };
-    my $result = Koha::SharedContent::manaPostRequest( "subscription",
-        $sub_mana_info );
-    if ( $result->{code} eq "200" and $result->{code} eq "201" ) {
-        my $subscription = Koha::Subscriptions->find($subscriptionid);
-        $subscription->set( { mana_id => $result->{id} } )->store;
-        $subs->{mana_id} = $result->{id};
-    }
-    $template->param( mana_code => $result->{code} );
+    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);
@@ -167,13 +124,14 @@ 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} );
-    }
-}
-$template->param( additional_fields_for_subscription => $additional_fields );
+my $subscription_object = Koha::Subscriptions->find( $subscriptionid );
+$template->param(
+    available_additional_fields => [ Koha::AdditionalFields->search( { tablename => 'subscription' } ) ],
+    additional_field_values => {
+        map { $_->field->name => $_->value }
+          $subscription_object->additional_field_values->as_list
+    },
+);
 
 # FIXME Do we want to hide canceled orders?
 my $orders = Koha::Acquisition::Orders->search( { subscriptionid => $subscriptionid }, { order_by => [ { -desc => 'timestamp' }, \[ "field(orderstatus, 'ordered', 'partial', 'complete')" ] ] } );
@@ -210,6 +168,7 @@ $template->param(
     default_bib_view => $default_bib_view,
     orders_grouped => $orders_grouped,
     (uc(C4::Context->preference("marcflavour"))) => 1,
+    mana_comments => $subs->{comments},
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;