Koha-community/Koha - Koha - Koha: The world's first free and open source library system

Commit Graph

Author	SHA1	Message	Date
Kyle Hall	831d75d09c	Bug 19208 - Pay select option doesn't pay the selected fine The "Pay selected" option on the Fines tab in the borrower account page doesn't work as intended. The fine on top of the list gets the amount deducted, even if another fine is choosen from the list. Test Plan: 1) Create two or three fines, using the Create manual invoice function. 2) Choose one of the fines (not the one on the top) and click Pay selected 3) Pay a partial amount 4) Go back to the Pay fines tab an notice that the fine you selected has not changed. Instead, either the top fine or the total (see attachment) has ben affected. 5) Apply this patch 6) Repeat steps 1-3 7) Note the correct fine is paid Signed-off-by: Andreas Hedström Mace <andreas.hedstrom.mace@sub.su.se> Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	7 years ago
Owen Leonard	a7bdc6eb3e	Bug 17014 - Remove more event attributes from patron templates There are many patron-related templates which still use event attributes to define events. This patch updates these templates so that events are defined in JavaScript. To test apply the patch and check out to a patron. - From the Print menu in the toolbar, choose "Print summary." The patron summary page should open and the print dialog should be automatically triggered. - From the Print menu in the toolbar, choose "Print slip." The patron slip page should open and the print dialog should be automatically triggered. - From the Print menu in the toolbar, choose "Print quick slip." The patron quick slip page should open and the print dialog should be automatically triggered. - Click the patron's "Fines" tab in the left-hand sidebar and then choose the "Account" tab. -- Click the "Print" button for an account payment (the link should point to printfeercpt.pl). A print receipt page should open and the print dialog should be automatically triggered. -- Follow the same procedure for a transaction which is not an account payment (the link should point to printinvoice.pl). - Click the "Create manual invoice" tab. -- Select one of the "type" choices. Doing so should automatically populate the "Description" field with the corresponding code. -- If necessary, define one or more values for the MANUAL_INV authorized value and confirm that those invoice types work as well. - From the patron's "Pay fines" tab, click the "Pay amount" button. In the "collect from patron" field, enter any combination of letters, numbers, and symbols. When you tab away from that field your text should be reformatted to currency format. - From the patrons home page, change the filter in the left-hand sidebar and submit it. The correct results should be returned. Signed-off-by: EricGosselin <eric.gosselin.5@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Jonathan Druart	19a977dc7b	Bug 15758: Koha::Libraries - Remove GetBranchName This is the fourth and last patch set to remove C4::Branch. The real purpose of this patch is to standardise and refactor some code which is related to the libraries selection/display. Its unconfessed purpose is to remove the C4::Branch package. Before this patch set, only 6 subroutines still existed in the C4::Branch package: - GetBranchName - GetBranchesLoop - mybranch - onlymine - GetBranches - GetBranch GetBranchName basically returns the branchname for a given branchcode. The branchname is only used for a display purpose and we don't need to retrieve it in package or pl scripts (unless for a few exceptions). We have a `Branches` template plugin with a `GetName` method which does exactly this job. To achieve this removal, we will use this template plugin and delete the GetBranchName from pl and pm files. The `Branches.all()` will now select the library of the logged in user if no `selected` parameter has been passed. This new behavior could cause regressions, for instance there are some places where we do not want an option preselected (batch item modification for instance), keep that in mind when testing. GetBranchesLoop took 3 parameters: $branch and $onlymine. The first one was used to set a "selected" flag, for a display purpose: select an option in the libraries dropdown lists. The second one was useless: If not passed or set to 0, the `C4::Branch::onlymine` subroutine was called. This onlymine flag was use to know if the logged in user was able to see other libraries infos. A patron can see the infos from other libraries if IndependentBranches is not set OR if he has the superlibrarian permission. Prior to this patch set, the "onlymine test" was done on different places (neworderempty.pl, additem.pl, holidays.pl, etc.), including the Branches TT plugin. In this patch set, this test is only done on one place (C4::Context::only_my_library, code moved from C4::Branch::onlymine). To accomplish the same job as this subroutine, we just need to call the `Branches.all()` method from the `Branches` TT plugin. It already accepts a `selected` parameter to set a flag on the option to select. To avoid the repetitive [% IF selected %]<option selected="selected">[% ELSE %]<option>[% END %] pattern, a new `html_helpers` TT include file has been created, it defines an `options_for_libraries` block, which takes a `selected` parameter. We could imagine to use this include file for other selects. The 'mybranch` and `onlymine` subroutines of the C4::Branch package have been moved to C4::Context. onlymine has been renamed with only_my_library. There are only 4 occurrences of it, against 11 before this patch set. There 2 subroutines are Context-centric and it makes sense to put them in `C4::Context` (at least it's the least worst place!) GetBranches is the tricky part of this patch set: It retrieves all the libraries, independently of the value of IndependentBranches. To keep the same way as the existing calls of `Branches.all()`, I have added a `unfiltered` parameter. If set, the `Branches.all()` will call a usual Koha::Libraries->search method, otherwise Koha::Libraries->search_filtered will be called. This new method will check if the logged in user is allowed to see other libraries or only its library. Note that this `GetBranches` subroutine also created a `category` key: it allowed to get the list of groups (of libraries) where this library existed. Thanks to a previous patch set (bug 15295), this value was not used anymore (I may have missed something!). Note that the only use of `GetBranch` was buggy (see bug 15746). Test plan (for the whole patch set): The best way to test this whole patch set is to test with 2 instances: 1 with the patch set applied, 1 using master, to be sure there is no regression. It would be good to test the same with `IndependentBranches` and the without `IndependentBranches`. No difference should be found. The tester must focus on the library dropdowns on as many forms as possible. You will notice changes in the order of the options: the libraries will now be ordered by branchname (instead of branchcode in some places). A special attention will be given to the following page: - acqui/neworderempty.pl - catalogue/search.pl - members/members-home.pl (header?) - opac/opac-topissues.pl - tools/holidays.pl - admin/branch_transfer_limits.pl - admin/item_circulation_alerts.pl - rotating_collections/transferCollection.pl - suggestion/suggestion.pl - tools/export.pl Notes for QA: - There are 2 FIXMEs in the patch set, I have kept the existing behavior, but I am not sure it's the good one. Feel free to open a bug report and I will fill a patch if you think it's not correct. Otherwise, remove the FIXME lines in a follow-up patch. - The whole patch set is huge and makes a lot of changes. But it finally will tremendously reduce the number of lines: 716 insertions for 1910 deletions Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Blou	63041c19c9	Bug 14605 - Corrects the individual fine's description When paying a fine, the description is built out of the borrower's type and title, instead of the actual fine's description. STEPS: 1) in the staff, go to a user with a fine to pay. a) if none, go to a user and Fines>>"Create manual invoice" with a distinctive description. 2) In Fines>>Pay fines, click the "Pay" button on the line of the fine. 3) This will take you a "Pay an individual fine" screen, where the description will look like "Staff Mrs", for the category and title of the borrower. Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	9 years ago
Marc Véron	117ee49514	Bug 4041: Third step - Display address on patron's pages using the system preference This patch displays the address information in the left column of the patron's pages using the new system preference. The address is formatted in member-display-address-style-us.inc and member-display-address-style-de.inc To test: - Apply patch on top of 1st and 2nd patch - Select 'German style' in system preference 'addressformat' in I18N/L10N - Verify that the address information displays properly in the left column of all patron's pages. - Verify that the address displays properly in the main area of moremember.pl as well (Note: In right column, Alternate address /contact are not yet touched)) - Switch system preference to US style, repeat checks Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> AMending without changes to put this patch at the end of the patch list / Marc Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	9 years ago
Paul Poulain	34ea8fbec7	Bug 6413 - QA Followup - Add notes for 'Pay selected' Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>	11 years ago
Chris Hall	8249544156	Bug 6413 Added ability to add a note when paying or writing off a fine Code will also respect notes when using the "Writeoff All" button but WILL NOT when using either the "Pay Amount" or "Pay Selected" buttons Fixed uri encoding of arguments Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>	12 years ago
Liz Rea	6c6fe37ced	Bug 8054 - double clicking can cause duplicate payments/fines Uses preventDoubleForSubmit() to prevent double form submissions in the fines module. To test: Create a manual invoice/fine Create some manual fines, click save like mad - you should get only one fine (without, you will get several if you click madly enough) Click Pay fines Pay some fines, clicking save like mad on each. You should only get one payment. (without, you will get several payments) Create a manual credit Create a credit, click save like mad. You should only get one credit. (without you will get several if you click madly enough) Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>	11 years ago
Owen Leonard	f2c2be1c20	Bug 9141 - Untranslatable strings on "pay an amount..." page Moving text of an error message from the script into the template. To test, submit an amount which is greater than the amount due. You should see an error message displayed correctly with a properly-formatted currency amount. Signed-off-by: Marc Veron <veron@veron.ch> Patch behaves as expected. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>	12 years ago
Stéphane Delaune	a8b168dc63	Bug 7671 : add a real primary key accountlines_id in accountlines Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com> Signed-off-by: Marc Veron <veron@veron.ch> NOTE: After applying the patch I got following errors in members/pay.pl: Global symbol "$writeoff_sth" requires explicit package name Global symbol "$add_writeoff_sth" requires explicit package name Added to lines at the begin of members/pay.pl: our $writeoff_sth; our $add_writeoff_sth; Now the patch worked as expected. However I am not quite sure if signing off is OK in this situation. Marc Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	12 years ago
Owen Leonard	68b30468c3	Bug 8143 [REVISED] Upgrade jQuery tabs to current jQueryUI version Current jQuery-driven tabs are done using a very old version of the tabs plugin. This patch upgrades jQueryUI to the latest version and adds the tabs widget dependency to the jqueryui js file and updates the syntax for existing tabs: - $("#foo > ul").tabs(); changes to $("#foo").tabs(); - Remove full URL from tab links (use #anchor only). Pages with "static" tabs (tabs which are built in the markup rather than generated by the plugin) have been modified to use their own style. Examples: pay.tt in the staff client and opac-readingrecord.tt in the OPAC. Edit: Minor revision to some uncorrected markup Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>	12 years ago
Katrin Fischer	bae9aacb3f	Bug 2780 - Capitalize strings consistently (members) Signed-off-by: Owen Leonard <oleonard@myacpl.org>	12 years ago
Katrin Fischer	1fd4a1e8af	Bug 7760 - Add ids and classes to every staff page to help with customization (patrons) Class is 'pat' and ids start with 'pat_'. Signed-off-by: Owen Leonard <oleonard@myacpl.org>	12 years ago
Owen Leonard	0f80707d7c	Bug 7080 - Revised - Clean up interface on fine payment screens - Move some content out of table cells - Improve table markup with <thead>, <tbody>, and <tfoot> - Improve breadcrumb specificity on paycollect.pl - Add clearer messages for different actions (Pay selected fines, pay an individual fine, etc. - Add client-side warning to pay.pl when writing-off all - Correcting terminology: When a verb, "write off," when a noun: "Writeoff." Revision: Correcting tab label case according to Bug 2780 guidelines Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> I checked all 4 fine tabs and performed different fine actions. The layout on all pages looks clean and correct. I tested the new client-side warning and made sure it's translatable. Labels have proper capitalization. Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>	13 years ago
Frédéric Demians	9d80ca2775	Bug 7472 Edit button ineffective when paying borrower fee On payment page, the Edit button doesn't load anymore the current borrower edit page. To reproduce the bug: - Define a borrower category 'foo' with Enrollment fee - Create a new 'foo' borrower - Click on Check out tab - A message is displayed: Fees & Charges: Patron has Outstanding fees & charges of xx.00. Checkouts are BLOCKED because fine balance is OVER THE LIMIT. Make Payment - Click on Payment link - Click on Edit button - You reach a page for creating a new borrower => you should reach the current borrower edition page - Same issue on paycollect.tt template Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>	12 years ago
Srdjan Jankovic	6b092f0e27	bug_7190: Do not reverse writeoffs when item is returned Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>	12 years ago
Colin Campbell	507c7f4224	Bug 3498 [ENH] Allow Partial Payment of Fines Allow partial payment of outstanding fines against either individual fine entries or as a lump payment Sponsered by East Brunswick Public Library, East Brunswick, NJ, USA NB: Adds a version of the include circ-menu.inc as circ-menu.tt this has the same functionality as the old include but does not require all the borrowers attributes to be passed as global scoped variables Signed-off-by: Liz Rea <lrea@nekls.org> Bug 3498 - Documentation update to explain what every button does. Help file updated to the following: Pay and Writeoff Fines Each line item can be paid in full, partially paid, or written off. Pay a fine in full Click "Pay" next to the fine you want to pay in full The full amount of the fine will be populated for you in the "Collect From Patron" box Click "Confirm" The fine will be removed from outstanding fines, and displayed as fully paid. Pay a partial fine Click "Pay" next to the fine you want to partially pay Enter the amount you are collecting from the patron in the "Collect From Patron" box Click "Confirm" The fine will be updated to show the original Amount, and the current Amount Outstanding Writeoff a single fine Click "Writeoff" next to the fine you wish to writeoff. The fine will be removed from outstanding fines, and displayed as fully paid. Pay an amount towards all fines Click the "Pay Amount" button Enter the amount you are collecting from the patron in "Collect from Patron." The sum of all fines is shown in "Total Amount Outstanding" Click "Confirm" The fine totals will be updated with the payment applied to oldest fines first. Writeoff All fines Click the "Writeoff All" button All fines will be removed from outstanding fines, and displayed as written off. Pay Selected fines Check the selection boxes next to the fines you wish to pay, click "Pay Selected" Enter an amount to pay towards the fines. Click "Confirm" The fine totals will be updated with the payment applied to the oldest selected fines first. Bug 3498 - adding parens to TT IF Statements for style pay.tt Bug 3498 - Add parens to TT IF statements for style paycollect.tt Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>	13 years ago

1 2

67 Commits (b7dd0d62ddf324a6f54dd3c6f7cb6babcd61ad2d)