Merge pull request #135 from ebsco/pr-updates

Pr updates

Author: mmabrahamson

Koha/Plugin/EDS.pm

@@ -31,10 +31,10 @@ $PluginDir = $PluginDir.'/Koha/Plugin/EDS';
 
 ################# DO NOT TOUCH - CONTROLLED BY build.py
 our $MAJOR_VERSION = "22.11";
-our $SUB_VERSION = "001";
+our $SUB_VERSION = "002";
 our $VERSION = $MAJOR_VERSION . "" . $SUB_VERSION;
 our $SHA_ADD = "https://widgets.ebscohost.com/prod/api/koha/sha/1711.json";
-our $DATE_UPDATE = '2023-08-02';
+our $DATE_UPDATE = '2024-04-15';
 ######################################################
 
 ## 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>22.11.001</latestversion>
+	<latestversion>22.11.002</latestversion>
 	<download>https://github.com/ebsco/edsapi-koha-plugin</download>
-	<lastupdated>2023/08/02</lastupdated>
+	<lastupdated>2024/04/15</lastupdated>
 	<releasenotes>
-		<release version="22.11.001" date="2023/08/02">
-			<note id="1" author="mmohkamkar@ebsco.com">Fixes issue with cart not displaying.</note>
+		<release version="22.11.002" date="2024/04/15">
+			<note id="1" author="mabrahamson@ebsco.com">Builds community PRs into installer.</note>
 		</release>
 	</releasenotes>
 </kohaplugin>

Koha/Plugin/EDS/js/EDSScript.tt

@@ -41,7 +41,7 @@ edsConfig.pluginhttppath = "[% PLUGIN_HTTP_PATH %]";
 var searchBlockCount = 3;
 
 // DO NOT TOUCH - controlled by build.py
-var versionEDSKoha = "22.11001";
+var versionEDSKoha = "22.11002";
 ///////////////////////////////////////
 
 if (document.title == "") {

Koha/Plugin/EDS/opac/2111/opac-sendbasket.pl

@@ -38,7 +38,9 @@
 use Koha::Token;
 
 my $query = CGI->new;
-my $PluginDir = C4::Context->config("pluginsdir");
+my $pluginsdir = C4::Context->config("pluginsdir");
+my @pluginsdir = ref($pluginsdir) eq 'ARRAY' ? @$pluginsdir : $pluginsdir;
+my ($PluginDir) = grep { -f $_ . "/Koha/Plugin/EDS.pm" } @pluginsdir;
 $PluginDir = $PluginDir.'/Koha/Plugin/EDS';
 #require $PluginDir.'/opac/eds-methods.pl';
 do '../eds-methods.pl';

Koha/Plugin/EDS/opac/eds-raw.pl

@@ -80,9 +80,7 @@
 
 my $api_response;
 
-if($input->param("q") eq 'config'){
-	$api_response = EDSGetConfiguration();
-}elsif($input->param("q") eq 'getip'){
+if($input->param("q") eq 'getip'){
 	$api_response = GetLocalIP();
 }else{
 	# Send Known Items

eds_plugin_22.11001.kpz eds_plugin_22.11002.kpzeds_plugin_22.11001.kpz renamed to eds_plugin_22.11002.kpz

@@ -1,10 +1,10 @@
 {
     "MajorVersion": "22.11",
-    "MinorVersion": "001",
+    "MinorVersion": "002",
     "ReleaseNotes": [
         {
-            "author": "mmohkamkar@ebsco.com",
-            "note": "Fixes issue with cart not displaying."
+            "author": "mabrahamson@ebsco.com",
+            "note": "Builds community PRs into installer."
         }
     ],
     "ShaAdd": "https://widgets.ebscohost.com/prod/api/koha/sha/1711.json"