From 169be56d099883253f091ece2dd7e14793bd88cb Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 9 Oct 2014 09:40:26 -0400
Subject: [PATCH] Bug 13052 - OPAC Cart JavaScript is included twice in the
 footer
Content-Type: text/plain; charset="utf-8"

The external JavaScript file which powers the OPAC Cart should not be
included twice. The correct instance is the one which comes after the
definition of MSG strings.

To test you must have the opacbookbag system preference turned on. In
Bootstrap OPAC, test adding some items to the Cart and confirm that Cart
operations work correctly.
---
 .../bootstrap/en/includes/opac-bottom.inc          |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
index 4128061..596341a 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
@@ -103,11 +103,6 @@ $.widget.bridge('uitooltip', $.ui.tooltip);
 <script type="text/javascript" src="[% interface %]/[% theme %]/js/amazonimages.js"></script>
 [% END %]
 
-[% IF Koha.Preference( 'opacbookbag' ) == 1 %]<script type="text/javascript" src="[% interface %]/[% theme %]/js/basket.js">
-[% ELSIF ( Koha.Preference( 'virtualshelves' ) == 1 ) %]<script type="text/javascript" src="[% interface %]/[% theme %]/js/basket.js">
-[% ELSE %]<script type="text/javascript"> var readCookie;[% END %]
-</script>
-
 <script type="text/javascript">
     //<![CDATA[
     var MSG_CONFIRM_AGAIN = _("Warning: Cannot be undone. Please confirm once again")
@@ -153,6 +148,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip);
     [% IF ( opacuserjs ) %][% opacuserjs %][% END %]
     //]]>
 </script>
+
 [% IF Koha.Preference( 'opacbookbag' ) == 1 %]
     <script type="text/javascript" src="[% interface %]/[% theme %]/js/basket.js"></script>
 [% ELSIF ( Koha.Preference( 'virtualshelves' ) == 1 ) %]
@@ -160,6 +156,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip);
 [% ELSE %]
     <script type="text/javascript">var readCookie;</script>
 [% END %]
+
 [% IF Koha.Preference( 'opacuserlogin' ) == 1 %][% IF Koha.Preference( 'TagsEnabled' ) == 1 %]<script type="text/javascript" src="[% interface %]/[% theme %]/js/tags.js"></script>[% END %][% ELSE %][% END %]
 [% IF ( GoogleJackets ) %]
     <script type="text/javascript" src="[% interface %]/[% theme %]/js/google-jackets.js"></script>
-- 
1.7.9.5