Commit Graph

414 Commits

Author SHA1 Message Date
Owen Leonard be1db4628e Bug 7336 - memberentry.pl generates an error in the log
Adding check for the existence of a variable in
order to quiet errors in the log.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 11:04:54 -05:00
Ian Walls 319aaca81f Bug 5945: email not searchable in patron search
Adds 'email' to valid search parameters in members/member.pl

To test:
1. give a patron a unique email address in your test database
2. search on the full email; should work
3. search on the part of the email before the domain; should work

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit c3abbedebe)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-16 09:22:16 -05:00
Srdjan Jankovic a82959ed04 bug_6253: Unified member Search()
Removed SearchMembers() and replaced with more generic Search()
Amended Search() to try cardnumber first
Replaced SearchMembers() calls with Search()
Replaced SELECT with Search() where appropriate
C4::SQLHelper:
- added support for '' key for search filter.
- when passing an array to filter, join with OR (rather than AND)
- added support for key => [val1, val2] in filter
- did not document - there was no input documentation to start with,
  and SQLHelper should be replaced with something better anyway

Signed-off-by: Liz Rea <lrea@nekls.org>
(again - testing merge issue)
The functionality of the patch seems to be maintained with Biblibre's changes.

I tested the following:
Extended attribute searching: works
3 part name searching: works
2 part name searching: works
1 part name searching: works

From:
mainpage.pl
members-home.pl
	Patron search limited by branch: Works
	Patron search limited by patron category: works
	Ordering by cardnumber instead of surname: works
The "Check Out" field in the masthead.

Circ Autocomplete is not reliably functional at this time, but the problem appears to predate this patch.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 18b8991cf1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-25 19:32:30 -04:00
Ian Walls 27de4e13e4 Bug 6801: checkoverdues returns unnecessary fields, causing slowness
Explicitly specifies which fields to return in C4::Overdues::checkoverdues
SQL:  all of biblio, items, and issues, and everything in biblioitems
EXCEPT marc, marcxml and timestamp.

Bug 6801: member details page taking long time to load when many checkouts present

This patch removes the call to GetMemberDetails in build_issue_data; this heavy-weight
subroutine was being run for every single item a patron (or their relatives) have checked out.
Instead, the borrowers first name, surname and cardnumber are added to the GetPendingIssues query.
I believe this is reasonable since GetPendingIssues can now return issues for multiple borrowers.

Also corrects the $borrowernumber used for GetIssuesCharges and CanItemBeRenewed; was using the borrower whose
page we were on, NOT the borrower of that specific item (which would be different in the Relatives Checkouts tab).

Template calls to [% scope.borrowername %] are now broken up into [% scope.firstname %] [% scope.surname %].

Signed-off-by: Liz Rea <lrea@nekls.org>
On my test data, a patron with 180 checkouts (without this patch) would take more than a minute to bring back the circulation.pl and moremember.pl pages.
With this patch, the time is reduced to 5 or so seconds.

Big ups to Ian for tenaciously hunting this one down.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 17:42:14 -04:00
Chris Cormack d796b5ddee Bug 6732 : Showing the bibliographic title on the manual invoices line
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit e71b4faf78)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-09-09 22:15:53 -04:00
Christophe Croullebois 0873aa1255 Bug 6116: Adding a child patron
When adding a patron who is a child, the default library is not set when defining a guarantor, this patch corrects the problem.
More, for children with no guarantors, the default branch is the editing branch.

BibLibre MT5795

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 36f526a9a8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-16 22:22:01 -04:00
Colin Campbell 06a38274ca Bug 6280 : Don't generate invalid SQL in GetPendingIssues
Change to parameter list in GetPendingIssues made it
callable by an empty list resulting in invalid sql being
sent to server. As this was occuring on most issues error log
was filling up. Put safeguard in the routine
Also don't bother calling when you have no need

Some of the processing was needlessly obscure

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c435c8c7d1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-10 21:50:45 -04:00
Srdjan Jankovic 087c658d19 bug_4415: Copy parent contact details to child when adding Let child details be managed separately
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 33a9aec802)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-03 18:30:11 -04:00
Colin Campbell d5d5f0f5ab Bug 2505: Suppress some warnings emitted by members-home.pl
an undefined value in branch and the undef selected
can generate a large amount of warning noise

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ffa86e29b5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-07-14 21:07:10 -04:00
Robin Sheat 89538c1943 Bug 6521 - allow blank cardnumbers to not trigger "already in use"
Now a blank cardnumber will get stored as a null in the database, which
is a value that allows duplicates. As such, if cardnumbers aren't
mandatory, then you can actually save a user with it being blank.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 785af7310d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-06-27 07:32:01 -04:00
Chris Cormack bf2e437ca3 Bug 5918 : Use the default messaging preferences if the user does not select any
Signed-off-by: Jesse Weaver <pianohacker@gmail.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b8ccb80bb1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-06-03 15:06:49 -04:00
Ian Walls e561e0e2f6 Bug 3202: creating new 'child' categorytype patrons doesn't set branch properly
If a guarantor search is not being performed, the creation of any Child category_type patron will
not default to the currently logged in branch, but rather the first branch alphabetically.

Adding a test for the existence of any guarantor branch data before assigning it clears up this problem

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b08be41d41)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-04-28 08:47:05 -04:00
Owen Leonard 49af98afd7 Follow-up fix for Bug 5952, Shows member relatives in issues list
- Moving columns around to match display of patron's own checkouts
- Correcting terminology (issues, borrowers)
- Hiding columns added in previous patch which do not display in
  the standard checkout list: materials, stock number, collection.
  If these are to be added they should be added to all displays.

[edit] Adding display of relative's cardnumber alongside their name

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-14 14:40:19 +12:00
Colin Campbell b993d2d231 Bug 6164 Send Borrower Data to template consistently
messaging and notices patron tabs were not passing borrower
info in a manner consistent with other tabs

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-12 09:30:33 +12:00
Chris Cormack 77167b3b17 Merge remote branch 'kc/master' into new/enh/bug_5917
Conflicts:
	installer/data/mysql/updatedatabase.pl
2011-04-10 20:00:04 +12:00
Stéphane Delaune 1fafaafc9a Bug 5728: adding note and manager_id fields to accountlines
Biblibre bug #1874

Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 21:25:18 +12:00
Katrin Fischer 3224b92743 Bug 5422: Add missing fields to deletedborrowers and change datatype to text
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:52:07 +12:00
Owen Leonard e82f88d5d9 Additional fixes for Bug 5422, Separate state field for patron's adresses
Adding state variable to various circ and member pages so that
sidebar display of patron details includes state.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:52:07 +12:00
Katrin Fischer 21727e00f5 Bug 5422: Separate state field for patron's addresses
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:52:07 +12:00
Stéphane Delaune bda0be46b2 Bug 6108 - Quicksearch in member.pl does not display paging correctly
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 10:47:22 +12:00
Chris Cormack 1e7c5166aa Merge remote branch 'kc/master' into new/enh/bug_5917 2011-04-08 14:29:21 +12:00
Alex Arnaud 52ff3ca6ec Bug #6107 - Problems when duplicate a patron on memberentry.pl
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 12:23:15 +12:00
Chris Cormack 13158ee2f8 Bug 5917 : Fix for moremembers page 2011-04-04 14:15:27 +12:00
Matthias Meusburger 6b2b62eb57 Bug 5952: Shows member relatives in issues lists
Duplicate of '[PATCH] MT3747: Shows member relatives in issueslists' : Subject was wrong

MT3747, Follow-up: Adds siblings issues

MT3747, Follow-up: Shows member relatives in issues lists

 - Now displays patron's and relatives' issues apart

MT3747, Follow-up: Shows member relatives in issues lists

 - Removes renewal in circulation.pl
 - Adds links to moremember.pl

MT3747, Follow-up: Shows member relatives in issues lists

 - Remove unuseful warn

MT3747, Follow-up: Shows member relatives in issues lists

 - Removes renewal in moremember.pl

MT3747, Follow-up: Shows member relatives in issues lists

 - Adds sorting for circulation.pl

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 21:03:14 +13:00
Chris Cormack 9e3dbeaf39 Fixing FSF address in license statements 2011-04-01 15:55:06 +13:00
Jared Camins-Esakov 04ff06931c Bug 5900: GetAllIssues performance issues
Previously GetAllIssues was called before authenticating. Given how expensive
GetAllIssues is, this is problematic and could be used for used for DOSing the
server. There should be no functional change from this patch.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-29 21:52:16 +13:00
Ian Walls 1d6f791541 Bug 3203: ACCTDETAIL notices don't parse branches or borrowers tokens
This patch enables the ACCTDETAIL notices (and any branch-specific derivatives) to use
<<branches.*>> and <<borrowers.*>> tokens

This patch also attempts to send the email from the branch email first, falling back to
KohaAdminEmailAddress if no branch email exists.

To test:

1. Enable AutoEmailOpacUser system preference
2. Add <<branches.*>> tokens to the ACCTDETAIL notice
3. Create a new patron, including:
   a. test email address in the field matching your AutoEmailPrimaryAddress syspref value
   b. username and password (required to send a notice)
   c. any other required fields to save the record
4. Check you inbox.  Notice should send instantly (no need to run process_message_queue.pl)

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-28 21:26:29 +13:00
Paul Poulain ddbedbfc2f Bug 4330 : Adding some copyright BibLibre statements 2011-03-21 10:57:20 +13:00
Paul Poulain 528cfd918c Bug 4330 : Fixing copyright and removing unconditional warn chris c mail 2010-12-16 on patches ML 2011-03-21 10:44:42 +13:00
Stéphane Delaune 7b61eadf50 Bug 5750: (MT #4095) add exact matching filter for categorycode and branchcode fields in search members's result
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

No searching borrowers by categorycode or branchcode will only bring up
exact matches. Before searches for Staff (S) would also bring up
Students and Schools (SC, ST). Same for branchcodes.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-15 22:07:50 +13:00
Stéphane Delaune 3cc0939622 Bug 5432 : (MT #4584b)Add duplicate support for borrowers
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-04 13:22:54 +13:00
Chris Cormack f9f35b6984 Merge remote branch 'kc/new/bug_3319' into kcmaster
Conflicts:
	members/members-home.pl
2011-02-28 22:55:59 +13:00
Ian Walls ac9fd0cff9 Bug 3319 Followup: Fix compatibility with fix for bug 4945
The fix for 3319 overwrote the @branchloop variable with output from GetBranchesLoop,
which forces a selected branch.  Removing the extra call, and just measuring the size of
@branchloop as it was build, plus some dereferencing, fixes the issue.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-28 22:52:05 +13:00
Owen Leonard 3e26abc9cd Follow-up fix for Bug 5760 - Add the jquery table sorter to reading record
- Removing option to show 50 items/show all from script and template
- Adding parser to exclude articles in title sort (en only, see Bug 5766)
- Setting default sort to 'date due descending' as it was previously

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-17 08:28:29 +13:00
Chris Cormack f6be5ef20f Bug 5751 : Follow up patch, removing unused variable and fixing copyright 2011-02-14 12:17:29 +13:00
Paul Poulain 3be7a6d458 Bug 5751 : MT2690 fix members-home
This fix the members-home script to work with new letter search management, and delete not anymore used code/template

(written by Nahuel Angelinetti)

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2011-02-14 12:13:50 +13:00
Owen Leonard e6a3029470 Fix for Bug 3319 - Need error message when adding patron and libraries are defined
- Hiding patron add toolbar when branches or categories are undefined
- Blocking patron entry form if branches or categories are undefined
- Removing nonfunctional template logic for displaying missing category
  error message.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-03 22:21:45 +13:00
Colin Campbell 49b5f77194 Bug 5673: test guarantorid consistently
Incorrect checking of guarantorid was causing moremember.pl to
try and construct addresses using data from non-existent guarantors
ensure that test is consistently checking that value is defined and not
'', '0' or 0 [ i.e. what perl does for you anyway!!]

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-03 22:10:24 +13:00
Ian Walls a0dc124a95 Bug 3881: OPAC Privacy reimplementation
Reimplements Paul Poulain's original OPAC Privacy patch, with some minor improvements and changes to wording

If the library enables the OPACPrivacy system preference along with the opacreadinghistory preference, and sets
an AnonymousPatron (must be a valid patron number in the database), the user will see a new tab upon login to
the OPAC, My Privacy.  From there, the user can:

- Set their OPAC Privacy to one of three values
  0 - Forever.  This keeps their reading history unless they explicitly delete it; the bulk anonymiser won't touch it
  1 - Default.  Keep reading history until either they delete it or the library does
  2 - Never.    Instantly anonymises reading history upon item return

- Instantly delete their reading history
  There is a warning and a popup to confirm.  I've removed Paul's extra confirm checkbox, which seemed redundant

A note of which preference the patron has selected is added to the Patorn Details page in the staff client.  This is read-only.

This patch also consolidates Privacy system preferences into the Privacy section of the OPAC tab.

Thank you to BibLibre for the original implmentation of this patch, and Los Gatos Public Library for funding and
testing the reimplementation.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-31 22:23:50 +13:00
Owen Leonard 98efac4c0a Fix for Bug 4945 - Patron search is limited by default to the currently logged-in library
I couldn't figure out how (or whether) GetBranchesLoop could be
convinced to return a list of branches without selecting one, so
I swapped GetBranchesLoop with GetBranches. This will preselect
a branch only if a branch has been submitted as part of a query.

This does NOT preselect the correct branch when IndependantBranches
is turned on.

I also added a template variable which is true if a query has
been submitted with a branch or a category so that the extra
form fields can be displayed, reminding the user that they
added limiters to their query.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-11 15:35:09 +13:00
Galen Charlton 80641597e5 bug 5585: fix display of current date on receipts and slips
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-07 09:08:42 +13:00
Galen Charlton 4daef50c7a bug 5497: make all library fields available to circ receipt/slips
This allows the receipt template to be more readily customized
to include the library's address, phone number, email address, etc.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-05 08:49:02 +13:00
koha 05965fb56d Bug 5283 NEWS ITEM FOR RECEIPT SLIP
There is no on-off global parameter for it since if a library does not want to
use it, then the library will not use the "slip" category in news - this is
similar to the OPAC news and Staff news categories in the news feature.

We have been using this for months in Koha 3.0 and the librarians like it and
so does PR as it gives a way to advertise events and news to patrons with every
checkout.

The files modified are:
koha-news.tmpl
moremember-receipt.tmpl
moremember.pl

Darrell Ulm

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-17 09:39:11 +13:00
Chris Cormack 00408e262f Merge remote branch 'kc/new/bug_5030' into kcmaster 2010-12-02 09:20:14 +13:00
Owen Leonard 9f0495238d Fix for Bug 5030 - Improve handling of duplicate patrons
- Making duplicate patron warning dialog simpler but more explicit
- Pointing duplicate patron preview window to new brief version
  of moremember.pl to display more patron details than the previous
  version.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-02 09:16:07 +13:00
Owen Leonard f7b3b0c75b Fix for Bug 5029 - Update patron deletion error page
- Styling error message with "dialog alert" class
- Adding sidebar patron details to match other patron pages

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-02 09:13:38 +13:00
Koustubha Kale 7f0c1e4fcb Bug 4440: Revised combined patch to print fee receipts and invoices
This patch adds a small enhancement to allow printing of Fees  / Fines
receipts from the Fines page.

Patch adds print links to the Fines page next to Fines or Receipts
transactions.

Clicking on the link will pop a new window and will print that with
total outstanding as on date.

You can edit koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css
to better control printing this type of material.

18-Oct-2010 Changed template and script names to match. Corrected
invalid markup in the templates.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-18 14:33:27 +13:00
Owen Leonard bbb0819f0f Fix for Bug 5037 - If patron category is empty it shouldn't show
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-17 21:07:13 +13:00
Andrew Elwell 9fa574f609 Bug 5385: POD Cleanups (part 1)
working through the master branch to eliminate all
podchecker warnings/errors

Actual improvement to the quality of the POD will
come later (hopefully with assistance of others)

Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-12 10:06:55 +13:00
Katrin Fischer 63fdd8768a Bug 5112: Organisation does not show links to professionals
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-12 09:40:50 +13:00