View | Details | Raw Unified | Return to bug 13736
Collapse All | Expand All

(-)a/C4/Auth.pm (+1 lines)
Lines 471-476 sub get_template_and_user { Link Here
471
            AuthorisedValueImages                 => C4::Context->preference("AuthorisedValueImages"),
471
            AuthorisedValueImages                 => C4::Context->preference("AuthorisedValueImages"),
472
            BranchesLoop                          => GetBranchesLoop($opac_name),
472
            BranchesLoop                          => GetBranchesLoop($opac_name),
473
            BranchCategoriesLoop                  => GetBranchCategories( 'searchdomain', 1, $opac_name ),
473
            BranchCategoriesLoop                  => GetBranchCategories( 'searchdomain', 1, $opac_name ),
474
	    EDSEnabled                            => C4::Context->preference("EDSEnabled"),
474
            LibraryName                           => "" . C4::Context->preference("LibraryName"),
475
            LibraryName                           => "" . C4::Context->preference("LibraryName"),
475
            LibraryNameTitle                      => "" . $LibraryNameTitle,
476
            LibraryNameTitle                      => "" . $LibraryNameTitle,
476
            LoginBranchname                       => C4::Context->userenv ? C4::Context->userenv->{"branchname"} : "",
477
            LoginBranchname                       => C4::Context->userenv ? C4::Context->userenv->{"branchname"} : "",
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc (+1 lines)
Lines 48-50 Link Here
48
    function _(s) { return s } // dummy function for gettext
48
    function _(s) { return s } // dummy function for gettext
49
</script>
49
</script>
50
<script type="text/javascript" src="[% interface %]/[% theme %]/lib/modernizr.min.js"></script>
50
<script type="text/javascript" src="[% interface %]/[% theme %]/lib/modernizr.min.js"></script>
51
[% IF ( EDSEnabled ) %]<script type="text/javascript" language="javascript" src="/plugin/Koha/Plugin/EDS/js/EDSScript.js"></script>[% END %]
(-)a/opac/opac-downloadcart.pl (+15 lines)
Lines 34-39 use C4::Csv; Link Here
34
use utf8;
34
use utf8;
35
my $query = new CGI;
35
my $query = new CGI;
36
36
37
my $eds_data = "";
38
if ( ( eval { C4::Context->preference('EDSEnabled') } ) ) {
39
    my $PluginDir = C4::Context->config("pluginsdir");
40
    $PluginDir = $PluginDir . '/Koha/Plugin/EDS';
41
    require $PluginDir . '/opac/eds-methods.pl';
42
    $eds_data = $query->param('eds_data');
43
}
44
37
my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
45
my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
38
    {
46
    {
39
        template_name   => "opac-downloadcart.tt",
47
        template_name   => "opac-downloadcart.tt",
Lines 66-71 if ($bib_list && $format) { Link Here
66
        foreach my $biblio (@bibs) {
74
        foreach my $biblio (@bibs) {
67
75
68
            my $record = GetMarcBiblio($biblio, 1);
76
            my $record = GetMarcBiblio($biblio, 1);
77
            if ( ( eval { C4::Context->preference('EDSEnabled') } ) ) {
78
                my $dat = "";
79
                if ( $biblio =~ m/\|/ ) {
80
                    ( $record, $dat ) =
81
                      ProcessEDSCartItems( $biblio, $eds_data, $record, $dat );
82
                }
83
            }
69
            next unless $record;
84
            next unless $record;
70
85
71
            if ($format eq 'iso2709') {
86
            if ($format eq 'iso2709') {
(-)a/opac/opac-sendbasket.pl (-1 / +15 lines)
Lines 36-41 use C4::Members; Link Here
36
use Koha::Email;
36
use Koha::Email;
37
37
38
my $query = new CGI;
38
my $query = new CGI;
39
my $eds_data = "";
40
if ( ( eval { C4::Context->preference('EDSEnabled') } ) ) {
41
    my $PluginDir = C4::Context->config("pluginsdir");
42
    $PluginDir = $PluginDir . '/Koha/Plugin/EDS';
43
    require $PluginDir . '/opac/eds-methods.pl';
44
    $eds_data = $query->param('eds_data');
45
}
39
46
40
my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
47
my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
41
    {
48
    {
Lines 86-91 if ( $email_add ) { Link Here
86
        my $dat              = GetBiblioData($biblionumber);
93
        my $dat              = GetBiblioData($biblionumber);
87
        next unless $dat;
94
        next unless $dat;
88
        my $record           = GetMarcBiblio($biblionumber, 1);
95
        my $record           = GetMarcBiblio($biblionumber, 1);
96
	if((eval{C4::Context->preference('EDSEnabled')})){
97
		if($biblionumber =~m/\|/){
98
			($record,$dat)= ProcessEDSCartItems($biblionumber,$eds_data,$record,$dat);
99
		}
100
	}
89
        my $marcnotesarray   = GetMarcNotes( $record, $marcflavour );
101
        my $marcnotesarray   = GetMarcNotes( $record, $marcflavour );
90
        my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
102
        my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
91
        my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
103
        my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
Lines 122-127 if ( $email_add ) { Link Here
122
    # Getting template result
134
    # Getting template result
123
    my $template_res = $template2->output();
135
    my $template_res = $template2->output();
124
    my $body;
136
    my $body;
137
	if((eval{C4::Context->preference('EDSEnabled')})){
138
		$template_res = CartSendLinks($template_res,@bibs);
139
	}
125
140
126
    # Analysing information and getting mail properties
141
    # Analysing information and getting mail properties
127
142
128
- 

Return to bug 13736