projects / working / Evergreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 47b3209)
kmain-331_all_bibliocommons_ecommerce_functionality
authorBill Erickson <berickxx@gmail.com>
Wed, 29 Oct 2014 21:08:29 +0000 (17:08 -0400)
committerBill Erickson <berickxx@gmail.com>
Thu, 21 Mar 2019 19:46:23 +0000 (15:46 -0400)
    Cross-port: f8c3c9e

Conflicts:
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm

KCLS/openils/var/templates_kcls/opac/parts/base_fines.tt2 [new file with mode: 0644] patch | blob
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm patch | blob | history

diff --git a/KCLS/openils/var/templates_kcls/opac/parts/base_fines.tt2 b/KCLS/openils/var/templates_kcls/opac/parts/base_fines.tt2
new file mode 100644 (file)
index 0000000..2aed579
--- /dev/null
+++ b/KCLS/openils/var/templates_kcls/opac/parts/base_fines.tt2
@@ -0,0 +1,20 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns='http://www.w3.org/1999/xhtml' lang='[% ctx.locale %]' xml:lang='[% ctx.locale %]'>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+        [% IF ctx.refresh %]
+        <meta http-equiv="refresh" content="[% ctx.refresh %]">
+        [% ELSIF ctx.authtime %]
+        <meta http-equiv="refresh" content="[% ctx.authtime %]; url=[% ctx.logout_page %]">
+        [% END %]
+        <link rel="stylesheet" type="text/css" href="[% ctx.media_prefix %]/css/skin/default/opac/semiauto.css" />
+        <link rel="stylesheet" type="text/css" href="[% ctx.media_prefix %]/css/skin/default/opac/style.css" />
+        <title>[% l('Catalog - [_1]', ctx.page_title) %]</title>
+        <link rel="unapi-server" type="application/xml" title="unAPI" href="/opac/extras/unapi" />
+        [% INCLUDE 'opac/parts/goog_analytics.tt2' %]
+    </head>
+    <body>
+               [% INCLUDE 'opac/parts/js.tt2' %]
+        [% content %] 
+    </body>
+</html>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
index 2bf6704..8812e1a 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
@@ -211,6 +211,9 @@ sub load {
     return $self->load_myopac_messages if $path =~ m|opac/myopac/messages|;
     return $self->load_myopac_payment_form if $path =~ m|opac/myopac/main_payment_form|;
     return $self->load_myopac_payments if $path =~ m|opac/myopac/main_payments|;
+    return $self->load_myopac_payment_form if $path =~ m|opac/myopac/biblio_main_payment_form|;
+    return $self->load_myopac_payments if $path =~ m|opac/myopac/biblio_main_payments|;
+    return $self->load_myopac_main if $path =~ m|opac/myopac/biblio_main_fines|;
     return $self->load_myopac_pay_init if $path =~ m|opac/myopac/main_pay_init|;
     return $self->load_myopac_pay if $path =~ m|opac/myopac/main_pay|;
     return $self->load_myopac_main if $path =~ m|opac/myopac/main|;
@@ -252,6 +255,11 @@ sub redirect_auth {
     my $self = shift;
     my $login_page = sprintf('%s://%s%s/login',($self->ctx->{is_staff} ? 'oils' : 'https'), $self->ctx->{hostname}, $self->ctx->{opac_root});
     my $redirect_to = uri_escape_utf8($self->apache->unparsed_uri);
+    
+    if ($redirect_to =~ m/biblio_main_fines/ || $redirect_to =~ m/biblio_main_payment/){
+        $login_page .= '_fines';
+    }
+
     return $self->generic_redirect("$login_page?redirect_to=$redirect_to");
 }
 
Evergreen ILS