Merge pull request #129 from ebsco/2211-cart-issue

Fixes Cart Issue

Author: mmohkamkarebsco

Koha/Plugin/EDS.pm

@@ -30,11 +30,11 @@ my ($PluginDir) = grep { -f $_ . "/Koha/Plugin/EDS.pm" } @pluginsdir;
 $PluginDir = $PluginDir.'/Koha/Plugin/EDS';
 
 ################# DO NOT TOUCH - CONTROLLED BY build.py
-our $MAJOR_VERSION = "21.11";
-our $SUB_VERSION = "004";
+our $MAJOR_VERSION = "22.11";
+our $SUB_VERSION = "001";
 our $VERSION = $MAJOR_VERSION . "" . $SUB_VERSION;
 our $SHA_ADD = "https://widgets.ebscohost.com/prod/api/koha/sha/1711.json";
-our $DATE_UPDATE = '2023-04-04';
+our $DATE_UPDATE = '2023-08-02';
 ######################################################
 
 ## Here is our metadata, some keys are required, some are optional

Koha/Plugin/EDS/admin/release_notes.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- DO NOT TOUCH THIS FILE - controlled by build.py -->
 <kohaplugin>
-	<latestversion>21.11.004</latestversion>
+	<latestversion>22.11.001</latestversion>
 	<download>https://github.com/ebsco/edsapi-koha-plugin</download>
-	<lastupdated>2023/04/04</lastupdated>
+	<lastupdated>2023/08/02</lastupdated>
 	<releasenotes>
-		<release version="21.11.004" date="2023/04/04">
-			<note id="1" author="cwolf@ebsco.com">Adds additional support for translations.</note>
+		<release version="22.11.001" date="2023/08/02">
+			<note id="1" author="mmohkamkar@ebsco.com">Fixes issue with cart not displaying.</note>
 		</release>
 	</releasenotes>
 </kohaplugin>

Koha/Plugin/EDS/js/.EDSScript.tt.swp

@@ -41,7 +41,7 @@ edsConfig.pluginhttppath = "[% PLUGIN_HTTP_PATH %]";
 var searchBlockCount = 3;
 
 // DO NOT TOUCH - controlled by build.py
-var versionEDSKoha = "21.11004";
+var versionEDSKoha = "22.11001";
 ///////////////////////////////////////
 
 if (document.title == "") {
@@ -134,20 +134,32 @@ else { console.log('JS debug enabled') }// keep executing if there is an error.}
 /////  Language data setup  /////
 function getLanguage(code, callback) {
 	// Use cache 
+	if (edsConfig.logerrors == "yes"){
+		console.log("Running getLanguage()...");	
+	}
+	
 	var sessionLang = eds_sessionStorage.get('lang_' + code);
 	if (sessionLang) {
+		if (edsConfig.logerrors == "yes"){
+			console.log("sessionLang is already set...");	
+		}	
 		callback(sessionLang);
 		return;
 		// If custom language, and there's no language file for it
 	} else if (code != 'default' && eds_sessionStorage.get('nolang_' + code)) {
+		if (edsConfig.logerrors == "yes"){
+			console.log("sessionLang is not set...");	
+		}	
 		getLanguage('default', callback);
 		return;
 	}
 
 	// Fetch the language file
 	jQuery.ajax({ url: "[% PLUGIN_HTTP_PATH %]/bootstrap/includes/lang/" + code + ".inc", dataType: "script", cache: true })
 		.done(function (data) {
-
+			if (edsConfig.logerrors == "yes"){
+				console.log("Fetching language file...");	
+			}	
 			// Parse language file
 			var langData = {};
 			var lineData = data.split("var EDSLANG =")[1].split("\n");
@@ -159,12 +171,17 @@ function getLanguage(code, callback) {
 					langData[key] = val;
 				}
 			}
-
+			if (edsConfig.logerrors == "yes"){
+				console.log("langData: " + langData);	
+			}	
 			eds_sessionStorage.set('lang_' + code, langData);
 			callback(langData);
 
 			// No language file, try default
 		}).fail(function () {
+			if (edsConfig.logerrors == "yes"){
+				console.log("Failed to fetch language file...");	
+			}	
 			if (code == 'default') {
 				callback(null);
 			} else {
@@ -339,7 +356,13 @@ function ConfigData(data) {
 
 	if (data.defaultsearch != "off") {
 		var currentDefaultSearchValue = eds_sessionStorage.get('defaultsearch');
+		if (edsConfig.logerrors == "yes"){
+			console.log("currentDefaultSearchValue : " + currentDefaultSearchValue);
+		}
 		if (!currentDefaultSearchValue) {
+			if (edsConfig.logerrors == "yes"){
+				console.log("No currentDefaultSearchValue!");
+			}
 			eds_sessionStorage.set('defaultsearch', data.defaultsearch);
 		}
 		GoDiscovery();
@@ -443,6 +466,9 @@ function SetEDSOptions(data) {
 }
 
 function SetEDS(showInfo) {
+	if (edsConfig.logerrors == "yes"){
+		console.log("In SetEDS...");
+	}
 	jQuery('#searchform').submit(function () { return false; });
 	jQuery('#searchsubmit').click(SearchEDS);
 	jQuery('#masthead_search option').each(function () { jQuery(this).remove(); });
@@ -455,8 +481,10 @@ function SetEDS(showInfo) {
 	jQuery('#transl1').removeClass('placeholder');
 	//advSearch
 	if (document.URL.indexOf("[% PLUGIN_HTTP_PATH %]/opac/eds-search.pl") != -1 && QueryString('q') == "") {
+		//console.log('koha switchtext');
 		jQuery('a[href="/cgi-bin/koha/opac-search.pl"]').attr('title', kohaSwitchText);
-	} else if (document.URL.indexOf("/cgi-bin/koha/opac-search.pl") != -1 && QueryString('q') == "") {
+	} else if (document.URL.indexOf("/cgi-bin/koha/opac-search.pl") != -1 && QueryString('q') == "") {RTCEncodedVideoFrame
+		console.log('eds switchtext');
 		jQuery('a[href="/cgi-bin/koha/opac-search.pl"]').attr('title', edsSwitchText);
 		jQuery('a[href="/cgi-bin/koha/opac-search.pl"]').attr('href', '[% PLUGIN_HTTP_PATH %]/opac/eds-search.pl');
 	} else {
@@ -467,12 +495,13 @@ function SetEDS(showInfo) {
 		jQuery('#masthead_search option[value="JN"]').prop('selected', true);
 		knownItem = "JN";
 	}
-
-	EDSAutoComp();
+	if (edsConfig.autocomplete == "yes") {
+		EDSAutoComp();
+	}
 }
 
 function SetKoha(showInfo) {
-	jQuery('#searchform').unbind('submit');
+	jQuery('#searchform').unbind('submit');EDSAutoComp
 	jQuery('#searchsubmit').unbind('click');
 	jQuery('#masthead_search option').each(function () { jQuery(this).remove(); });
 	if (showInfo) { ShowInfo(kohaSelectInfo); }
@@ -493,6 +522,9 @@ function SetKoha(showInfo) {
 }
 
 function ShowInfo(msg) {
+	if (edsConfig.logerrors == "yes"){
+		console.log("In ShowInfo...");
+	}
 	var topPos = jQuery('#masthead_search').offset().top;
 	var leftPos = jQuery('#masthead_search').offset().left;
 	var cartMsg = jQuery("#cartDetails").html();
@@ -650,6 +682,9 @@ function QueryString(key) {
 
 //BASKET START---------
 function InitCartWithEDS() {
+	if (edsConfig.logerrors == "yes"){
+		console.log("Cart initialized...");
+	}
 	jQuery('#addto').change(function () { CheckEDSRecordsforAddToList(); });
 	jQuery('.addto input:submit').click(function () { CheckEDSRecordsforAddToList(); });
 
@@ -664,14 +699,18 @@ function InitCartWithEDS() {
 }
 
 async function PrepareItems() {
-
+	if (edsConfig.logerrors == "yes"){
+		console.log("Running PrepareItems()...");
+	}
 	//Get Bib numbers from the url
 	var recordList = document.URL;
 	recordList = QueryString("bib_list").toString();
 
 	//Split bib list into array on /
 	var recordId = recordList.split("/");
-
+	if (edsConfig.logerrors == "yes"){
+		console.log(recordId);
+	}
 	//Iterate through all the record IDs
 	for (var edsItemCount = 0; edsItemCount < recordId.length - 1; edsItemCount++) {
 		//Check that it doesn't have the catalogue dbid
@@ -1248,7 +1287,6 @@ function EDSAutoComp() {
 			console.log("Running creds true...");
 			console.log("Running autocomplete...");
 		}
-
 		jQuery('#translControl1').autocomplete({
 			source: function (request, response) {
 				var promise = jQuery.ajax(creds.Autocomplete.Url, {
@@ -1262,7 +1300,6 @@ function EDSAutoComp() {
 						}])
 					}
 				});
-
 				promise.done(function (data) {
 					if (data.error) {
 						eds_sessionStorage.remove('autoComp');

Koha/Plugin/EDS/js/EDSScript.tt

@@ -1,10 +1,10 @@
 {
-    "MajorVersion": "21.11",
-    "MinorVersion": "004",
+    "MajorVersion": "22.11",
+    "MinorVersion": "001",
     "ReleaseNotes": [
         {
-            "author": "cwolf@ebsco.com",
-            "note": "Adds additional support for translations."
+            "author": "mmohkamkar@ebsco.com",
+            "note": "Fixes issue with cart not displaying."
         }
     ],
     "ShaAdd": "https://widgets.ebscohost.com/prod/api/koha/sha/1711.json"