From: Bill Erickson Date: Wed, 29 Oct 2014 21:08:29 +0000 (-0400) Subject: kmain-331_all_bibliocommons_ecommerce_functionality X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=1455fe4774309a6a8ed8e970f8c837a88ca00124;p=working%2FEvergreen.git kmain-331_all_bibliocommons_ecommerce_functionality Cross-port: f8c3c9e Conflicts: Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm --- 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 index 0000000000..2aed579617 --- /dev/null +++ b/KCLS/openils/var/templates_kcls/opac/parts/base_fines.tt2 @@ -0,0 +1,20 @@ + + + + + [% IF ctx.refresh %] + + [% ELSIF ctx.authtime %] + + [% END %] + + + [% l('Catalog - [_1]', ctx.page_title) %] + + [% INCLUDE 'opac/parts/goog_analytics.tt2' %] + + + [% INCLUDE 'opac/parts/js.tt2' %] + [% content %] + + diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm index 2bf6704742..8812e1a620 100644 --- 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"); }