Commit graph

99 commits

Author SHA1 Message Date
f446b3d03d Bug 7641: Suspend Reserves
Adds the ability to suspend reserves. The new system preference
AutoResumeSuspendedHolds enables the ability to set a date for
a suspended hold to automatically be resumed.

When a hold is suspended, it will continue to increase in priority
as the holds above it are fulfilled. If the first holds in line
to be filled are suspended, the first non-suspened hold in line
will be used when an item can fulfill a hold that has been placed.

http://bugs.koha-community.org/show_bug.cgi?id=7641
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>

Tested with the preference on and off:
1. placed several holds in the staff client
2. suspended some with a date
3. suspended some without a date
4. triggered hold message by checking in for hold with suspensions
5. the suspended hold was skipped as it should be
6. tested suspending holds in the OPAC w and w/out dates
7. ran the cron to clear suspensions with dates

All the above tests worked as expected. Signing off.
2012-03-29 14:37:49 +02:00
Julian Maurice
3414c117cd Bug 7743: Update opac-readingrecord.pl to use KohaDates TT plugin
Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>

fixed conflict
2012-03-26 16:22:52 +02:00
Julian Maurice
80e02f01f5 Bug 7743: Update opac-user.pl to use KohaDates TT plugin
Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>

fixed conflict
2012-03-26 16:22:39 +02:00
Chris Cormack
0c40ff9f98 Merge remote-tracking branch 'kc/master' into merged_5549
Fixed conflicts

Conflicts:
	catalogue/moredetail.pl
	installer/data/mysql/updatedatabase.pl
	koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
2012-03-22 09:36:55 +13:00
Ian Walls
f7a7b34bdf Bug 7697: Remove unused textmessaging parameter from OPAC main/user
Removes the textmessaging parameter from opac/opac-main.pl and
opac/opac-user.pl, since it's not utilized anywhere in the templates, and is
sourced from a field that no longer exists in the borrower
table (textmessaging).

This also removes a dependency on C4/Members.pm from opac-main.pl

To Test:  Login to the OPAC, and view both opac-user.pl and opac-main.pl. Both
pages should still render properly.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-20 16:49:36 +01:00
Colin Campbell
372216b9c8 Bug 5549 : Don't confuse the users with an irrelevant time
If the book is due at 23:59 the due time is irrelevant
and potentially confusing to the user add a DateUtils
routine that strips that off the returned display date
2012-03-20 13:24:32 +13:00
Colin Campbell
f74da1e834 Bug 5549 : GetPendingIssues now returns DateTime objects
Show due times in addition to dates in using screens
2012-03-20 12:33:37 +13:00
Colin Campbell
995fa23c3b Bug 5549 : GetPendingIssues now returns duedate as a DateTime object
Change the handling/formatting of duedate in those
scripts calling it
2012-03-20 12:13:43 +13:00
Paul Poulain
734c63222b Merge remote-tracking branch 'origin/new/bug_7453' 2012-02-27 11:35:12 +01:00
37d9f43620 7453 Followup for borrower without expiry date
While it should be impossible now to have a patron without expiry date, I still had one. It does not hurt to add a simple check on expiry date defined before calling delta days on null values and breaking the opac login.
Trivial change.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested by deleting the expirydate from my own patron record.
Missing expiry date now no longer breaks the summary page
in the patron account on OPAC.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-27 11:34:51 +01:00
0027fe0cc3 Bug 6598 [REVISED] OPACFineNoRenewals syspreference does not stop user renewing in opac
This patch standardizes the condition under which renewal controls
are displayed at the page (as opposed to item) level. In some
places "canrenew" was used, in others "patron_flagged" was used.
Now "canrenew" controls renew controls and "patron_flagged" only
triggers the display of user warnings.

This patch also allows for renewal information to be displayed
for each item in situations where OPAC renewals are allowed but
disabled for whatever reason. This gives the patron information
about used/available renew counts but hides renew controls.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-14 22:15:23 +01:00
32e1669731 Bug 7337 - "Debarred Until" display in the opac tells patrons they are debarred until the year 9999
This patch copies the debarred handling method from circulation.pl for
use on opac-user.pl so that debarred dates and comments can be handled
properly.

I have slightly reworded the message in the OPAC and on circulation.pl
to make the display of the debarred comment a little clearer.

Revision adds missing handling of debarred status with regard to
renewal operations. Renew links and buttons were not being hidden
from debarred users.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Renewal buttons are gone, message looks good.

liz@koha-deb:~/kohaclone$ prove xt
xt/permissions.t .. ok
xt/tt_valid.t ..... ok
All tests successful.
Files=2, Tests=27,  9 wallclock secs ( 0.05 usr  0.01 sys +  8.28 cusr  0.08 csys =  8.42 CPU)
Result: PASS

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-06 15:08:30 +01:00
Srdjan Jankovic
6e07fd7b00 bug_2830: Remove reserve when checking out if the borrower is not the first one in the reserve queue
To test:
Create 4 holds on a bib, for patrons A, B, C, and D,

Check in the item to mark hold as waiting for patron A
Check out the item to patron B -> reserve for patron B should be removed
Check in the item to mark hold as waiting for patron A
Check out the item to Patron A, hold should complete normally
Check in the item to mark hold as waiting for patron C
Check out the item to patron D -> reserve for patron D should be removed.
Check in the item to mark hold as waiting for patron C
Check out the item to patron C, hold should complete normally
Check in the item -> there should be no more reserves.

We also tested:
Created 4 holds on a bib with two items, for patrons A, B, C, and D

All worked as expected.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-16 16:21:38 +01:00
Paul Poulain
1fe3514c3c Bug 6328 fine in days does not work
Some code coming from BibLibre has been lost in the process of inclusion in
3.4. The result is that fine in days does not work at all (you can setup rules,
but it does nothing)

Step to reproduce:

- Koha > Admin > circ rules > set 1 day fine every day of overdue for default
  rule
- Issue a book return date last week
- check-in the book => no debarment is set

The following patch will fix all of those problems by :

* updating borrowers.debarred to a date field (instead of tinyint). It contains
  the limit of the debarment
* changing API of DebarMember and UpdateBorrowerDebarred to pass a date
* display debarrdate where applicable. Note that a debarrdate of 31/12/9999 is
  considered as unlimited and not displayed
* added a debarrcomment, usefull to explain why a patron is debarred (this is
  independant from debarrdate changes and can be used when placing an unlimited
  debarment too)

[2011-05-12] F. Demians. It works as described. And I can confirm this
functionality is impatiently awaited by French libraries since one year. Thanks
BibLibre for the good work and for contributing this code.

Bug 6328 Followup--update DB structure

Thanks Katrin.

Bug 6328: make comment a textbox / fix debar by notice trigger

Debarring by notice triggers was broken, because the new function
expects a date as second parameter.

The comment field in patron account details was a very long text field.
Patch changes it to be a textbox instead.

Bug 6328: Lift debarment leaves patron account

'Lift debarment' redirects to an empty circulation page.

BZ6328 follow-up 3

Fixes comment 23 from Fernando L. Canizo : when the patron was debarred and debar removed
he still could not check-out.

The changes in the IsMemberBlocked (that were on biblibre/master) were lost somewhere
The sub was still checking for old_issues instead of calling CheckBorrowerDebarred
to get a debardate if applicable

Note : this bug was appearing only is you had issuing rules defined for itemtype/categorycode/branch.
Seemed to work if you had only default rules. That's probably why it hadn't been spotted before

BZ6328 follow-up 4
Comments fron Zeno Tajoli: The patch is OK and I sign-off it. Two little changes done on
installer/data/mysql/kohastructure.sql and installer/data/mysql/updatedatabase.pl

Signed-off-by: koha <koha@kohabase.localdomain>
2011-11-25 14:00:47 +01:00
Srdjan Jankovic
2b2e544f05 Bug 6303: Display Organisation and Parent Organisation names when viewing a borrower of type organisation
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as advertised, doesn't affect display for non-organisational patrons.

Note: Display change in OPAC only affects the summary tab.
It would be a little bit more consistent to make the name show the
same on all tabs in OPAC patron account.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
I repeated Katrin's signoff here (with permission). The patch only changed for some minor rebasing and cosmetic QA requests. Passed QA now.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-11-24 11:30:08 +01:00
Frédérick Capovilla
e676e117fc Notify the user on his account page when his account is almost expired
New feature : If the "NotifyBorrowerDeparture" system preference is defined, a
notification appears in the user's account page if his subscription is almost
expired.

http://bugs.koha-community.org/show_bug.cgi?id=6978
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
works perfectly with date formatted DD/MM/YYYY as well
2011-11-06 11:36:18 +01:00
7093f075a7 Fix for Bug 6534 - Duplicate opac renew buttons at the top of the checkouts list
This patch uses JS to add two links to the top of the checkouts
table: renew selected and renew all. Clicking each one submits
the respective form.

Also added is a small validation routine to warn the user if
they try to "renew selected" without having checked any boxes.

Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-07 22:55:12 +12:00
Colin Campbell
b84276a3b1 Bug 6598 : ensure OPACFineRenewals can prevent opac renewals
patron_flagged was being passed at global scope to the template
but being checked as an element in other structures
Also although items could not be selected the Renew Selected
button was displayed, it too should check the flag
Amended the preference text which incorrectly suggested the
option could be turned off. (leading to the opposite to what
the user might expect)
In the script have explicitly assigned the value to a inumeric
variable rather than making an implicit conversion as it may be
that readers were missing that sleight of hand

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-01 13:21:13 +12:00
Colin Campbell
af3c7d4ce7 Bug 5453 Move declarations out of conditionals in opac
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-15 15:50:22 +12:00
Magnus Enger
004d2a10c5 Bug 5671 Revised Patch #2 - Add a column of custom HTML to my summary
Fix JS error in /koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 19:23:09 +12:00
Srdjan Jankovic
5bcb1529bc wr76595 (bug 4157): Control barcode display with a borrower attribute
Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 14:54:50 +12:00
Srdjan Jankovic
0ccc89990b Bug 4157: Display of barcode in checked out items in OPAC
wr76595: barcode display

Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 14:54:33 +12:00
Matthias Meusburger
c9ca5edf85 Bug 5966 : MT 3010: Adds waiting date for holds in opac-user
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-28 21:46:56 +13:00
Paul Poulain
ddbedbfc2f Bug 4330 : Adding some copyright BibLibre statements 2011-03-21 10:57:20 +13:00
Ian Walls
a5e769253b Bug 4289: OpacPublic prevents login into OPAC
If OpacPublic is set to Public, opac-user.pl does not ask for authentication, and takes the patron to a
null OPAC summary page.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-24 07:18:50 +13:00
Mason James
f46b03cf2d Bug 4289: 'OpacPublic' feature
applied to git tag 'v3.02.00-rc'

Frédéric Demians:

  - Rebased this patch to HEAD
  - Solved a merge conflict
  - The patch works as described here:
    http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=4289

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-19 14:30:34 +13:00
Donovan Jones
91c7bb791f Bug 2505 - Add commented use warnings where missing in the opac/ directory 2010-04-21 20:24:59 +12:00
Kyle M Hall
3502810346 (bug 1532) Reserves Updates Ported From Dev_Week
This is a much improved re-implementation of the reserves updates from dev_week.
Less new code has been added, and more existing functions are used instead of adding new ones.

The 'Lock Hold' function has been removed due to it not working as intended.

[RM note for documentation: this adds the following features:

* ability to specify an expiration date for a hold request
  when placing it via the staff interface or OPAC
* daily batch job to cancel expired holds
* nice interface to change the priority of hold
  requests for a bib in the staff interface]

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 22:49:47 -05:00
Henri-Damien LAURENT
5cd7704a30 Adding Bullet Proof to opac-user.pl [followup]
Fixing things a more proper way.
2009-09-30 11:30:09 +02:00
Henri-Damien LAURENT
746a2e0d4a Bug Fixing : Bullet Proofing
Some functions lack testing befor using empty references

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-30 11:30:07 +02:00
Nahuel ANGELINETTI
46a03a9442 (bug #2812) fix holds cancel in OPAC
This fix the user ability to cancel holds in OPAC.
At the moment, a user can cancel all his holds, but in fact, only items that are not in transfert or waiting to be checked out can be cancelled by the user.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-30 11:30:05 +02:00
Kyle M Hall
318fd2d57d Implementation of OPAC Message formatting
This patch implements the suggestions about the new and old message system made by Owen Leonard.

Includes type fix pointed out by Owen.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-29 19:20:48 -04:00
Colin Campbell
6fb8ef0d79 New Messaging System.
This system is indended to replace the old opacnotes
  and borrowernotes fields in the borrowers table.
  This system allows an unlimited number of Libraran and OPAC notes to be
  attached to a borrower. Each note has a message, a message type,
  the data it was created, and which library created it.
  Each message can only be deleted by the library that created it unless the syspref
  AllowAllMessageDeletion has been set.

  This system may be used simultaneously with the old notes system and does not affect it in any way.

  A new database table (messages) was added for this feature.

  The System also allows for pre-defined notes for Borrower records

  To use these, just create authorised values with the category BOR_NOTES
  where the Authorized Value is the short description shown in the pulldown,
  and the description is the text that should be in the note.

  Original Author: PTFS Contractor <dbavousett@ptfs.com>

  This work co-sponsered by Middletown Township Public Library, Middletown, NJ, USA
     and East Brunswick Public Library, East Brunswick, NJ, USA

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2009-09-15 22:11:38 -04:00
b159ba8e5a fix how patron_flagged gets set for opac-user.tmpl
Remove unneeded variable and get value from $borr->{'flagged'}
directly, avoiding glitch where $borr->{'flagged'} could be
set after old $patron_flagged variable was set.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-08-23 11:35:26 -04:00
Jesse Weaver
f8a43317b1 Prevent OPAC renewals if fines are over limit
This introduces a new system preference, OPACFineNoRenewals, that sets a
limit on the total fines a patron can have before they can no longer
renew their own books. opac-user.pl has been updated to obey this limit.

This work sponsered by East Brunswick Public Library, East Brunswick, NJ USA

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-08-23 10:13:26 -04:00
Michael Hafen
bf723f8480 bugfix opac-user stomps mylibraryfirst value in quick search label
the system preference mylibraryfirst is exported by Auth containing the logged
in users branchcode.  It is also exported as the value of the syspref by
opac-user.pl.  The effect is that when mylibraryfirst is on and the user
logged in the text label for the OPAC quick search instead of displaying
'Search (in [branchcode] only)' shows 'Search (in 1 only)'.  Other user pages
are uneffected.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-08-10 20:34:46 -04:00
2b14727449 Corrected: Hiding renew link in the OPAC for items which cannot be renewed. Fixes bug 3083.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-04-03 18:31:16 -05:00
Joe Atzberger
ec8ca853a6 Invalid field 'expiry' referenced.
This caused a warning from C4::Dates on every execution, since the value
passed to format_date was undefined.  Now we reference the correct field
and check for a populated value before trying to reformat it.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-03-27 18:33:33 -05:00
Joshua Ferraro
3d65e44d5c Syndetics and Amazon bugfix enhancements
This patch resolves a number of problems related to Enhanced Content:

1. Previously, there was no syspref for controlling whether or not to display
Amazon.com cover images apart from other content. This had the side effect
of preventing use of amazon.com content alongside use of another provider's
images. This patch introduces AmazonCoverImages and OPACAmazonCoverImages,
and changes the name of AmazonContent to AmazonEnabled.

So, for instance, you can now enable OPACAmazonSimilarItems yet utilize
SyndeticsCoverImages for displaying those similar items.

NOTE TO DOCUMENTATION TEAM: please update references to AmazonContent
and OPACAmazonContent to comply with the above.

2. Fixes some semantically incorrect uses of AmazonContent (now OPACAmazonEnabled)
on the OPAC side.

3. Resolves once and for all, the normalization of ISBN,UPC,EAN and OCLC numbers
for all enhanced content elements; These elements can be normalized using the
new functions in C4::Koha; I've replaced use of the various previously used
variables $xisbn,$norm_isbn,$clean_isbn, etc with $isbn, and the template
variable normalized_isbn.

We finally have a single, consistant place to retrieve normalize values for
these fields given a particular record.

4. Adds Syndetics attribution statements to display of all Syndetics content
'enhanced content provide by Syndetics' or 'Enhanced Description from Syndetics'

5. Adds an option to view the large cover image on the detail page on the OPAC
when using SyndeticsCoverImages; this option is controlled by a new system
preference: SyndeticsCoverImageSize which has two values: MC (medium) LC (large)

6. Adds UPC and OCLC numbers for Syndetics enhanced content queries especially
helpful for finding enhanced content for DVD and Music materials

7. Adds capability to display Syndetics images to opac-user for checkouts and overdues

8. Updates to systempreferences.sql, and updatedatabase.pl database revision 015

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-03-27 17:23:51 -05:00
Nahuel ANGELINETTI
90fe0170f2 (bug #2811)[3.2] fix opac-renew.pl part
This patch only fix a "security" failure that permit a user to renew his loan using directly the opac-renew.pl url.
Now, we check that opacrenewalallowed is set to on to permit the renewal in opac.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-03-06 12:49:57 -06:00
Joe Atzberger
c70cd87d54 Bug 2900: fix GetPendingIssues.
GetPendingIssues did several bad things:
~ select * on a 4 table join,
~ including multiple namespace collisions,
~ including large fields marc and marcxml from biblioitems,
~ return ($count, \@array_being_counted).

Not everything is fixed here (see FIXMEs), but the situation is
improved considerably, with bug 2900 resolved.  The "timestamp"
namespace collision in query should be resolved by separate patch.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-01-08 11:08:27 -06:00
Allen Reinmeyer
3b1817f685 Bug #2754 Show hold request priority in OPAC
Code changes to display the priority level on holds in OPAC. Turned on/off based on System Preference.  Database changes to systempreferences for both English and French

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-12-08 08:50:56 -06:00
7045b67a50 Overhaul of cover images. Replaces Amazon's "no cover" image with styled text, addressing bug 2241. Adds the same "no cover" text for Google and Baker & Taylor images.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-11-04 15:47:42 -06:00
Galen Charlton
4bf76c2d77 bug 2615: remove unneeded 'require Exporter'
Most Perl scripts (as opposed to modules) do
not need to require Exporter.

No user-visible or documentation changes.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-09-26 09:05:08 -05:00
Jesse Weaver
5d0f0027be fix number two for bug 1204: Lists of issues and overdues on opac-user.pl
This makes opac-user.pl sort the output from GetPendingIssues itself, by descend
ing due date.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-25 12:20:01 -05:00
Jesse Weaver
7da895cda7 fix for bug 1771: Template errors with remote itemtype image
This adds a new function, getitemtypeimagelocation, that returns the image
unmodified for absolute urls and returns the proper intranet or opac path
otherwise. It also updates all of the relevant files to use that function.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-21 16:50:29 -05:00
Galen Charlton
c80b328aae clean up old-style calls to GetMemberDetails
GetMemberDetails() returns only one hashref now,
not two.  In all cases where the caller was
expecting two output values, the $flags return
was ignored anyway.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-25 11:39:22 -05:00
Galen Charlton
378e919059 bug 2002: show item's in transit status in OPAC holds list
If item is in transit, show that status in the OPAC
user's hold list rather than "waiting to be pulled".

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 17:55:55 -05:00
Joe Atzberger
38bf3b1e18 Remove EXPRs. Also added all jacket images to Overdue tab.
Standardized table layout with colspan=2 for Title header,
the first being the icon or jacket image.  Discovered a bug
when I fixed the "toggle/highlight" code to work (using loop
context var __odd__), namely that the highlight styling overrides
the red overdue styling.  Commented out that conditional with a
FIXME.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 15:30:45 -05:00
691bcc631c Markup corrections to cataloging pages; Fixes for Bugs 2166 (" Book Jackets Not Showing on My Summary"), 2194 ("No results for Authority Search Shows blank record"), and 2196 ("Extra comma being added to record display")
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 08:31:09 -05:00