Commit graph

969 commits

Author SHA1 Message Date
tipaul
b56f035183 bugfixes 2004-05-03 16:36:53 +00:00
tipaul
040bcdf92b CIRCULATION : the big rewrite...
This 1st commit reorders deeply the circulation module.
The goal is to :
* have something 100% templated/translatable.
* have something easy to read & modify, to say to customers/users : you can define your circulation rules as you want if you accept to look in C4/Circ/Circ2.pm

The circulation now works :
1=> ask for the borrower barcode (as previously)
2=> ask for the item barcode.
3=> check "canbookbeissued". This new sub returns 2 arrays :
- IMPOSSIBLE : if something is here, then the issue is not possible and is not done.
- TOBECONFIRMED : if something is here, then the issue can be donc if the user confirms it.
4=> if TOBECONFIRMED is set : ask for confirmation, loop. if neither  are set or confirmation flag is set (2nd pass of the loop), then issue.

The IMPOSSIBLE & TOBECONFIRMED hashs contains :
* the reason of the line. always in capitals, with words separated by _ : BARCODE_UNKNOWN, DEBTS ... as key of the hash
* more information, as value of the hash ( TOBECONFIRMED{ALREADY_ISSUED} = "previous_borrower_name", for example)

This commit :
* compiles
* works on certain situations, not on other
* does NOT issue (the line is # )
* does not check issuing rules depending of # of books allowed / already issued

The next step is :
- check issuing rule.
- extend issuing rule to have a 3D array : for each branch / itemtype / borrowertype = issuing number and issuing length.
2004-05-03 09:10:51 +00:00
tipaul
21a379acda CIRCULATION : the big rewrite...
This 1st commit reorders deeply the circulation module.
The goal is to :
* have something 100% templated/translatable.
* have something easy to read & modify, to say to customers/users : you can define your circulation rules as you want if you accept to look in C4/Circ/Circ2.pm

The circulation now works :
1=> ask for the borrower barcode (as previously)
2=> ask for the item barcode.
3=> check "canbookbeissued". This new sub returns 2 arrays :
- IMPOSSIBLE : if something is here, then the issue is not possible and is not done.
- TOBECONFIRMED : if something is here, then the issue can be donc if the user confirms it.
4=> if TOBECONFIRMED is set : ask for confirmation, loop. if neither  are set or confirmation flag is set (2nd pass of the loop), then issue.

The IMPOSSIBLE & TOBECONFIRMED hashs contains :
* the reason of the line. always in capitals, with words separated by _ : BARCODE_UNKNOWN, DEBTS ... as key of the hash
* more information, as value of the hash ( TOBECONFIRMED{ALREADY_ISSUED} = "previous_borrower_name", for example)

This commit :
* compiles
* works on certain situations, not on other
* does NOT issue (the line is # )
* does not check issuing rules depending of # of books allowed / already issued

The next step is :
- check issuing rule.
- extend issuing rule to have a 3D array : for each branch / itemtype / borrowertype = issuing number and issuing length.
2004-05-03 09:02:12 +00:00
rangi
9ab6c09048 Passing thru the borrowernumber with the charges data, so can create a link
to the payment window
2004-03-15 23:41:20 +00:00
rangi
1d2a764626 fix for bug 606,
seems to be an error in the tmpl still but the functionality seems to be working again
2004-02-25 21:44:40 +00:00
oleonard
e0d4eee48f Small changes to help fix Bug 436 2004-02-25 18:09:29 +00:00
oleonard
7a2a0fe018 Adding item information variable declarations to 'Waiting' section already present in 'Reserved' section 2004-02-18 16:51:20 +00:00
oleonard
84b3a7b984 Adding variable declarations so that 'waiting' screen shows same information 'reserved' screen does, adding more address info 2004-02-17 22:15:33 +00:00
tipaul
af08d677c5 synch'ing 2.0.0 branch (RC4 tag) and head 2004-02-11 08:42:01 +00:00
oleonard
0f8e6bfb73 Added variables available to template: streetaddress, city, phone, cardnumber. Added FIXME comments to sections where HTML should be moved to template 2004-01-26 19:32:36 +00:00
rangi
cf67d8bb8f Bug 605 fixed 2004-01-21 20:49:54 +00:00
rangi
9c998cda51 Fix for bug 535, and adding the classification column to the variables
available to the template
2003-11-04 19:48:50 +00:00
rangi
d187195a75 Fix for bug 592
Re-issuing book does not renew correctly
2003-10-31 21:02:16 +00:00
rangi
5a808e96ef Fix for bug 621,
Returns not marking reserves waiting
2003-10-28 19:34:05 +00:00
rangi
8576e81ea9 moving more html out of the script 2003-10-22 20:01:28 +00:00
rangi
68067f6400 Fix for bug 436, thanks to Pierre 2003-10-16 20:36:25 +00:00
rangi
985af48c45 Fixing bug 619 2003-09-25 09:11:24 +00:00
rangi
80ab9dee1d Fix for returns error message always displaying 2003-08-04 21:47:23 +00:00
rangi
4fe953202a fix for bug 535 2003-07-24 08:33:35 +00:00
rangi
44ee726663 Fixing the internal server error bug 2003-07-10 09:39:12 +00:00
tipaul
c101d517bb *** empty log message *** 2003-07-07 14:46:55 +00:00
plugz
a0de7c08fd Added allowborrow to the template parameters to check if a borrower can borrow books or not according to the "borrow" flag. 2003-07-01 11:22:48 +00:00
rangi
f8d250abfa Fixing the sticky due date problem reported by jerome 2003-06-26 09:31:39 +00:00
tipaul
a72d9621ae removing searchborrower from circ2.pm.
Already exists in Search.pm
this fixes bug #439 and improve consistency.
2003-06-05 17:03:31 +00:00
rangi
02196feed9 Shifted the todays issues and previous issues html out into the template
And fixed a bug that was causing the enter a borrowers card or surname box
to show. Even if you were currently issuing to a borrower
2003-05-30 20:37:09 +00:00
wolfpac444
d9ebc9a714 Fixed bug #169 2003-05-08 13:04:15 +00:00
wolfpac444
be884f5b62 *** empty log message *** 2003-05-08 11:19:49 +00:00
tonnesen
f34f75ebd7 circulation.pl also has to set the branch and printer cookies. 2003-05-05 21:22:24 +00:00
tonnesen
f457e68515 Script was not setting cookies for branch and printer. 2003-05-05 20:57:56 +00:00
tipaul
22567447ce *** empty log message *** 2003-04-29 16:51:15 +00:00
tipaul
0435cd1e25 last commits before 1.9.1 2003-04-04 08:44:39 +00:00
tipaul
9b2028ab72 some fixes, and links to themelang/images 2003-03-11 15:13:18 +00:00
tipaul
edf5485626 templating circulation.pl
works poorly for instance
2003-03-10 15:16:29 +00:00
acli
bf5fb01d32 Make sure flagsrequired is *circulate* not parameters 2003-02-06 05:10:54 +00:00
acli
993c57941b Fixed bug 202, the branch menu-building code has spurious checks for CU and
IS fields, which does not exist, resulting in no branches being added

For selectbranchprinter:
Noted correct tab size
Handle non-latin1 charsets

For branchtransfers:
Use getbranch and getprinter
Removed spurious checkauth call and associated unused variables
2003-02-05 09:07:09 +00:00
acli
4d7c1a0ca3 Missing "use" statement
Noted correct tab size
2003-02-05 08:04:00 +00:00
acli
c965f345cd Fixed bug 200; a "last" was placed in the wrong place
The file does not use 4-character tabs, nor 8-character tabs, it uses both
(!); updated comments.

Catch more $code's; is this (and the change to Circ2.pm) what was intended?
2003-02-05 07:57:56 +00:00
acli
f475af255f Implemented fixes for bug 170
1. Circ2::returnbook will throw an exception if $branch is undef
2. branch/printer-getting code is modularized into getbranch and getprinter
   with correct logic from circulation.pl (temporarily put into Circ2.pm)
3. circulation.pl and returns.pl modified to use above functions

Noted correct tab sizes for the files; returns.pl partially reformatted to
conform to the dominant correct tab size

Handle non-latin1 charsets for returns.pl
2003-02-05 06:28:56 +00:00
acli
52a5fd4bbd Moved C4/Charset.pm to C4/Interface/CGI/Output.pm
Create output_html_with_http_headers function to contain the "print $query
->header(-type => guesstype...),..." call. This is in preparation for
non-HTML output (e.g., text/xml) and charset conversion before output in
the future.

Created C4/Interface/CGI/Template.pm to hold convenience functions specific
to the CGI interface using HTML::Template

Modified moremembers.pl to make the "sex" field localizable for languages
where M and F doesn't make sense
2003-02-02 07:18:37 +00:00
hdl
a0f2bc96a3 Templating : returns.pl 2003-01-29 22:45:07 +00:00
hdl
38ca2b91a2 Adding variable declarations 2003-01-28 00:49:55 +00:00
hdl
6bff70151f Templating branchtransfers.pl 2003-01-28 00:48:36 +00:00
hdl
1f36d6776a Templating : selectbranchprinter.pl 2003-01-23 11:29:13 +00:00
rangi
12c6a26124 Fixing typo, thanks ambrose for spotting this 2003-01-15 03:47:46 +00:00
tonnesen
7aeb26593b Merging changes from rel-1-2 into trunk (circulation module only) 2002-10-24 18:30:17 +00:00
arensb
5aa0fca7fa Removed trailing whitespace. 2002-10-13 10:43:54 +00:00
arensb
eb57e3b92a (bug workaround): Commented out some code that removes everything from
the list of branches the user can select.
Added some FIXME comments.
2002-10-12 18:57:41 +00:00
arensb
4e79364d43 Added some FIXME comments. 2002-10-09 14:29:39 +00:00
arensb
f76faf6f02 (bug fix?) What looks like possibly a line left over from debugging
was giving me an empty branch list, so transfers didn't work.
2002-10-09 14:28:51 +00:00
arensb
dbca39823f Merged with arensb-context branch: use C4::Context->dbh instead of
&C4Connect, and generally prefer C4::Context over C4::Database.
2002-10-05 09:44:27 +00:00
arensb
80a4896fd4 Added a wishlist FIXME comment. 2002-09-28 04:59:19 +00:00
rangi
a68e85669b fixes for the ordering of the issues table in issues, and also on the
printed slip
2002-09-14 00:57:27 +00:00
finlayt
4867288671 changed the way Waiting items are transfered from returns.pl to Circ2.pm 2002-09-05 00:16:39 +00:00
finlayt
01d6f11543 Changed so that when a Waiting item is returned the holding branch is updated. 2002-09-05 00:06:30 +00:00
finlayt
0883b382b9 Fixed bug in flags display 2002-08-29 00:00:45 +00:00
finlayt
d8e359ce2f added another link on the "Reserve Found" flag. 2002-08-22 04:20:33 +00:00
finlayt
bb97d5133a fixed bug caused by last commit 2002-08-21 04:35:13 +00:00
finlayt
26957b08de turned of the branchtransfer when an item is set to "waiting". 2002-08-21 04:29:03 +00:00
finlayt
4b1f369036 Fixed up some of the messaging stuff. 2002-08-21 03:54:39 +00:00
finlayt
236e3babd1 Fixed a little bug so that flags get recalculated after an item is issued. 2002-08-21 01:40:47 +00:00
tonnesen
bac842beda Removed '_' between issues, returns, and transfers graphics 2002-08-16 20:46:40 +00:00
finlayt
0f4b30b89c Changed the wording of the reserves print slip slightly. 2002-08-15 22:26:34 +00:00
finlayt
13e3a38889 changed the color to red and size to +2 for the Issuing Question.... 2002-08-15 03:13:44 +00:00
tonnesen
1e67687742 Added copyright statement to all .pl and .pm files 2002-08-14 18:12:50 +00:00
finlayt
0f93387146 all items are listed in the returned items list, regardless of whether they were issued or not.
Changed some messageing stuff as well, but will be back to fix that up some more.
2002-08-14 05:35:53 +00:00
finlayt
7d440c782f changed the previous issues to be listed in order of due date 2002-08-09 04:14:56 +00:00
finlayt
67e285299d fixed up the todays issues and previous issues tables so that they are both listed in reverse order by issue date. 2002-08-09 04:03:43 +00:00
finlayt
ba793f7604 added the itemtype code to the printed slip that goes in a reserved book. 2002-07-26 02:27:16 +00:00
finlayt
3e5a9b644e added the book title and author to the reserve messages. 2002-07-26 01:09:55 +00:00
finlayt
52e5f54401 removed warn statement 2002-07-24 05:11:07 +00:00
finlayt
51e0e140c2 Fixed up the Print module. Added a function printslip that takes a string as an argument. It is easier to prepare the slip and then call the print function.
in circulation.pl I have moved some javascript out to the circulation-top.inc
2002-07-24 03:16:21 +00:00
finlayt
ee16dd23ff fixed up the reserves. Can view the printed slip before it is printed! 2002-07-24 03:14:04 +00:00
finlayt
c78de2bcb8 changed the behaviour when a reserved book is returned according to the wishes of HLT. 2002-07-23 03:28:36 +00:00
finlayt
ae3d808003 fixed up some little bugs around the big buttons that change between issues, returns and transfers 2002-07-23 01:28:42 +00:00
finlayt
6e9129444f these files were old versions that are not currently used. 2002-07-22 22:40:32 +00:00
finlayt
a1afd5ab09 changed the wording of two messages. see http://bugzilla.katipo.co.nz/show_bug.cgi?id=1390 2002-07-19 03:33:52 +00:00
rangi
c4d0d2f54e Regex to change the javascript to make cursor start in barcode box 2002-06-28 23:43:16 +00:00
rangi
c509c3d633 pop up pay window is working again 2002-06-19 01:32:37 +00:00
rangi
d8b356d441 Fixing issues which i broke just before ... perhaps one more commit today.
Issues used to pop up a payment window when a borrower had finished issuing
and had money to pay.
We seem to have lost that, ill try and get it back
2002-06-19 01:04:47 +00:00
rangi
78c976aa0f issues printing issue slips again 2002-06-18 22:46:59 +00:00
rangi
1e9225fd51 Fix to get sticky due date working 2002-06-13 03:17:18 +00:00
rangi
49e2b90a8b Fix to get list of overdue items showing correctly 2002-06-13 03:16:55 +00:00
finlayt
2bb0991120 fixed minor bugs 2002-06-06 02:51:38 +00:00
finlayt
e6099545cc Most everything is fixed now in returns, including the way it displays (a little). 2002-05-30 01:32:29 +00:00
finlayt
e9bfecc3a4 Fixed up the reserves code to use the new Reserves2.pm methods. 2002-05-29 05:50:52 +00:00
finlayt
da147ed714 Added the reserves functionality. Now calls a bunch of routines from Reserves2.pm 2002-05-29 04:33:42 +00:00
finlayt
3f876641ca Changed the wording of error message from:
"Cannot transfer item to branch it is already at"
to: "Item already at destination branch"
2002-05-18 05:38:57 +00:00
finlayt
d06de68d9e fixed a little bug with cookies and setting the branch and printer settings. 2002-05-18 05:37:26 +00:00
finlayt
73706c24f7 improoved layout and branch and printer settings are displayed 2002-05-18 05:07:26 +00:00
finlayt
4a54639472 Completely new. This file handles the issues, and sets branch and printer
cookie.
2002-05-18 05:05:53 +00:00
finlayt
65b3df77cc fixed the branch and printer setting mechanism
changed layout slightly
2002-05-18 05:04:43 +00:00
finlayt
efee891bca script for changing the branch and printer settings, taken from circulation.pl 2002-05-18 05:02:25 +00:00
finlayt
2131829c6b changed the destination branch dropdown to only show branches that have
categorycode == CU, ie can be current branch.
2002-05-07 04:36:00 +00:00
finlayt
277f3490be Changes to circulations:
added returns.pl  ->  deals with the returns only
moved old circulation.pl to circulationold.pl which still deals with issues.
fixed up branchtransfers.pl
moved circulation2.pl to circulation.pl

Note more changes coming next week
2002-05-02 00:06:28 +00:00
finlayt
cf973f53bb Changed heading to look like the rest of Koha 2002-03-14 01:51:16 +00:00
finlayt
6c91f693a5 Added a heading to be consistent with rest of Koha 2002-03-14 01:50:17 +00:00
finlayt
b9ee6194bf This is the begining of a process of dividing up circulation.pl
This script deals with the branch and printer selection stuff
2002-03-14 01:04:00 +00:00
finlayt
501da7db0d Fixed a small problem in the <form>, not hidden inputs are getting passed
correctly.
2002-03-13 21:07:41 +00:00
finlayt
9d891b5f41 Branchtransfers.pl provides a form for entering barcodes and selecting a
destination branch.

New rows are entered into the branchtransfers table for each item
"transfered".
2002-03-12 21:04:32 +00:00
rangi
be16259a1b Changed the sorting of the hash of items on issue. To sort numerically, (so
10 comes after 2) Just a quick fix to get the items showing in date_due order
2001-08-17 07:54:38 +00:00
rangi
a28629608b Quick bodge to restrict the number of returned books showing to 8.
(Request from the librarians here to speed up the screen reload)
Needs to be tidied up
2001-04-20 00:31:02 +00:00
rangi
b2c9dabcf1 Making a change to the way charges are handled, the system originally worked such that if a borrower owed more than $5 issues werent allowed. This worked fine except that often borrowers wish to borrows say 3 pay videos at $2 each, then 2 books say. The three pay videos rack up charges of $6 and then they cant issue the books until that is paid.
Reworked so that it cares about previous charges, not the ones accrued during current issue process.
2001-04-03 21:32:37 +00:00
rangi
3604bdd166 Adding in javscript code to open a new window for payments 2001-03-28 03:00:56 +00:00
rangi
fe1fab2ab5 Reworked layout of issues section. 2001-03-28 02:23:03 +00:00
rangi
c2a70e1811 Changes made by Glen to allow the circulation module to work with a
ASCII-wand, or CueCat (weird encoded) input equally well.

Do not bother installing the CueCat driver or any other software - it's not
needed.
2001-03-22 22:20:29 +00:00
rangi
cc578cfd59 Rejigged printing issues, to print out everything on issue to the borrower 2001-02-21 22:33:48 +00:00
rangi
3271ec126d A bodgy hack so that hitting enter in issues (with no barcode) prints out the borrowers issue slip and starts a new borrower 2001-02-14 02:41:43 +00:00
rangi
aab933707f The Horowhenua libraries wanted less patron and item information displaying at returns
So Added some if statements to not display patron addresses, and to only display the title of the item
These presumably would be changed to suit individual libraries wants
2001-02-14 00:29:17 +00:00
tonnesen
ad16590c11 Fixed backgroundimage in circulation module. Background image now displays
only in header lines.
2001-02-05 17:24:13 +00:00
rangi
3b07c5bf30 Fixing printing error, now is printing all of the days issues for borrower 2001-02-04 22:25:42 +00:00
rangi
866118ff98 Made sure the printer queue value was being set before calling print 2001-02-01 04:09:11 +00:00
rangi
cf3086c7da Attempting to get issues slip to print when borrower is finished with 2001-02-01 02:08:34 +00:00
rangi
dea0fd150d Added a line to Ouput.pm to enable circulation to use its own includes
Changed the look of circulation.pl to the green/yellow colours

Note: Steve, i added another variable $backgroundimage that sets the background image for the main tables, so it should be straightforward to change the look back to the colours you had if you want to
2001-01-31 21:38:43 +00:00
tonnesen
e371a7114f Mostly just look changes, got rid of table borders, alternating colors on
table rows.  Some fixes to returned items in returns module.
2001-01-31 18:14:34 +00:00
tonnesen
ee5ba729f3 Returns module lists recently returned items, cookies used to store branch
and printer preferences.
2001-01-26 00:17:00 +00:00
tonnesen
d389b68e6d Refined Returns module.
Added ability to select branch and printer.
Fixed charges for rental items.
2001-01-25 00:01:34 +00:00
tonnesen
eaa9677292 Changes to web circulation module: rudimentary returns module, arbitrary
due date for issues, flag info displayed, overdue books are displayed in
red.
2001-01-23 23:48:54 +00:00
tonnesen
3186e690ce Fixed a bug in issuing reserved books. Was calling non-existent
printreserve subroutine
2001-01-23 00:12:49 +00:00
tonnesen
7c52cda9d6 Started work on a web-based circulation interface. 2001-01-22 23:48:41 +00:00