Commit graph

32552 commits

Author SHA1 Message Date
Katrin Fischer
5616e22236 Bug 19817: (QA follow-up) Add German manual and fix system preference help files
- German language manuals were added since this patch was started
- The structure of the manual was changed slightly, system
  preferences were moved into their own chapter

To test:
- Test help files display correctly for system preferences display correctly
  Note: Local use uses a different page than the other tabs
- Test German shows up as option in KohaManualLanguage and links
  correctly

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:32:29 +00:00
87c2755c04 Bug 19817: Remove numbering from chapter file names
See commit 8ad495abf1e42c5e73c5cb62ec32e1a54d16f8e8
    Remove numbering from chapter file names
from koha-manual

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:32:29 +00:00
6739346e1b Bug 19817: use https instead of http
the https version was not working when I wrote the first patches

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:32:29 +00:00
bfbc6cc941 Bug 19817: Use the language from the interface if valid
Use the UI language for the manual, if exists. Use the pref as a
fallback.

With the call to get_template_and_user the value of preferred_language
switched from 'es' (spanish) to 'en' from one click to another (??)

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:32:28 +00:00
ac07a5074f Bug 19817: Open the manual in a new window, not a popup
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:32:28 +00:00
5496dc7eea Bug 19817: Add pref KohaManualLanguage
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:32:28 +00:00
3bede9a9d7 Bug 19817: Move code to Koha::Manual to make it testable and reusable
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:32:28 +00:00
d9a8ac0489 Bug 19817: Make the location of the manual configurable - KohaManualBaseURL
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:32:27 +00:00
206ba82a46 Bug 19817: Remove local help files + edit help feature
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:32:27 +00:00
2e641b698e Bug 19817: Redirect to the online manual
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:32:27 +00:00
f190ef3f2e Bug 7534: DBRev 18.06.00.024
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:32:27 +00:00
Kyle M Hall
de629e2a28 Bug 7534: (QA follow-up) Don't do pickup branch checking for determining holdability in the OPAC
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:32:26 +00:00
b40070f4ad Bug 7534: (RM follow-up) Fix tests and adjust after bug 15524
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:32:26 +00:00
Kyle M Hall
3afbe3cf5d Bug 7534: Disambiguate branchcode parameter, make it match between subroutines
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:32:26 +00:00
Kyle M Hall
c556ad49b8 Bug 7534: Fix number of tests for Holds.t
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:32:25 +00:00
Lari Taskula
69316c7b8b Bug 7534: Check hold availability to desired pickup location in opac-reserve.pl
To test:
-1. Have access to your browser's developer tools in order to modify <select>
    dropdown values
1. Go to cgi-bin/koha/admin/branches.pl
2. Configure one of your libraries to "Pickup location" => "No". Remember the
   branchcode of this library!
3. Go place a hold in OPAC
4. See the provided "Pick up location" list
5. Observe the library that you configured is not present in the list
6. You should see another library selected by default. Right click that and
   in Firefox/Chrome click "Inspect element"
7. You should see a list of <option value="xxxx">blabla</option> elements
8. Double click between value (xxxx in above example) and replace the value
   with the branchcode you remember from step 2.
9. Place the hold
10. Observe that you are taken to cgi-bin/koha/opac-user.pl but your hold
    was not successful.
11. Go back to place a hold and this time do not modify any values.
12. Observe that a hold is now placed.

Signed-off-by: Koha Team AMU <axelle.clarisse@univ-amu.fr>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:32:25 +00:00
Lari Taskula
ce411c186d Bug 7534: Validate pickup location in CanBook/ItemBeReserved
This patch adds $branchcode_to parameter to CanBookBeReserved and
CanItemBeReserved. It represents the pickup location for the hold.

To test:
1. prove t/db_dependent/Holds.t

Signed-off-by: Koha Team AMU <axelle.clarisse@univ-amu.fr>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:32:25 +00:00
Lari Taskula
24fc43b978 Bug 7534: (QA follow-up) Default pickup location to Yes when adding a new library
To test:
1. Apply the patches before this one
2. Go to /cgi-bin/koha/admin/branches.pl
3. Press New library button
4. Scroll down the page and observe Pickup location defaults to No
5. Apply this patch
6. Go to /cgi-bin/koha/admin/branches.pl
7. Press New library button
8. Scroll down the page and observe Pickup location now defaults to Yes

Signed-off-by: Koha Team AMU <axelle.clarisse@univ-amu.fr>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:32:17 +00:00
Lari Taskula
8d404ec2cc Bug 7534: Display pickup locations instead of all libraries in opac-reserve.pl
This patch sets opac-reserve.tt to use the list of pickup libraries instead
of every library in the system.

To test:
1. Go to cgi-bin/koha/admin/branches.pl
2. Configure one of your libraries to "Pickup location" => "No"
3. Go to OPAC and place a hold
4. See the provided Pickup location list
5. Observe the library that you configured is not present in the list

Signed-off-by: Koha Team AMU <axelle.clarisse@univ-amu.fr>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:27:06 +00:00
Lari Taskula
d9ceb30a4d Bug 7534: Display pickup locations instead of all libraries in request.pl
This patch sets request.tt to use the list of pickup libraries instead
of every library in the system.

To test:
1. Go to cgi-bin/koha/admin/branches.pl
2. Configure one of your libraries to "Pickup location" => "No"
3. Go place a hold in intranet
4. See the provided "Pickup at" list
5. Observe the library that you configured is not present in the list
6. Place the hold
7. See list of existing holds on that biblio
8. See "Pickup library" column and observe your configured library is
   not included in the list

Signed-off-by: Koha Team AMU <axelle.clarisse@univ-amu.fr>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:27:06 +00:00
Lari Taskula
d2db67fbcb Bug 7534: Add configuration to admin/branches.pl
This patch adds a configuration option for pickup locations.

To test:
1. Apply patch
2. Go to cgi-bin/koha/admin/branches.pl
3. Observe there is a new column "Pickup location"
4. Click "Edit" for any library
5. Scroll to bottom of the page and select "No"
6. Click "Submit"
7. Observe your library in Libraries-table, notice the value of "Pickup location"
   has changed to "No"

Signed-off-by: Koha Team AMU <axelle.clarisse@univ-amu.fr>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:27:06 +00:00
Lari Taskula
9a53a7384a Bug 7534: Use search parameters for Koha::Template::Plugin::Branches->all
This lets us query libraries with additional search parameters and is useful
for this particular Bug by allowing us to select pickup locations.

Unit tests included.

To test:
1. prove t/db_dependent/Template/Plugin/Branches.t

Signed-off-by: Koha Team AMU <axelle.clarisse@univ-amu.fr>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:27:05 +00:00
Lari Taskula
bf8834a1e6 Bug 7534: Add new column "pickup_location" to branches
This patch adds a new column "pickup_location" for each library. This value
defines whether a library can be used as a pickup location or not.

For extended configurability, this flag could perhaps be considered as a part
of issuing rules, but as of now, this patch only offers a simple flag into
each library. This method also allows easy way for REST API to determine valid
pickup locations by querying the /libraries endpoint.

To test:
1. perl installer/data/mysql/updatedatabase.pl
2. Observe
DEV atomic update: bug_7534.perl
Upgrade to XXX done (Bug 7534 - Let libraries have configuration for pickup locations)

https://bugs.koha-community.org/show_bug.cgi?id=7354

Signed-off-by: Koha Team AMU <axelle.clarisse@univ-amu.fr>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:27:05 +00:00
4577ca53c8 Bug 15287: Add generated CSS
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:27:05 +00:00
e0f58070f2 Bug 15287: (follow-up) QA fix for position of user icon
This patch corrects the CSS for the user icon which appears when the
browser width is very narrow.

To test, apply the patch, rebuild CSS, and clear your browser cache if
necessary. View the OPAC with and without a user logged in and confirm
that the user icon at the top of the page looks correct at narrow
browser widths.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:27:05 +00:00
60a2589d3c Bug 15287: Use font-awesome on the OPAC
This patch replaces Bootstrap's glyphicons with Font Awesome icons.

To test, apply the patch and clear your browser cache and regenerate the
OPAC CSS from the LESS file if necessary. Check these icons and confirm
they look correct:

- Cart and Lists icons in the OPAC header
- User icon in the header when the browser window is narrow
- Languages menu when multiple languages are installed and
  the OpacLangSelectorMode system preference is "top" or "both top and
  footer."
- Set the  SuspendHoldsOpac system preference to "allow" and log in to
  the OPAC as a user who has one or more holds.
  - Check the appearance of the "suspend" and "resume" buttons both in
    the table of holds and at the bottom.
- With one or more clubs defined, log in to the OPAC and check the
  "Clubs" tab on the user summary page. The "Enroll" and "Cancel
  enrollment" buttons should look correct.
- On the "your messaging" tab in the OPAC, the "Digests only"
  information icon should look correct.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:27:04 +00:00
2c000059ef Bug 20898: (RM follow-up) Add missing filters
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 17:27:03 +00:00
9900181cd3 Bug 20898: Add generated CSS
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 16:54:07 +00:00
662e64f766 Bug 20898: Replace OPAC detail's results browser with non-JavaScript version
This patch moves generation of the OPAC detail page's results browser
from JavaScript to the template. This makes the template easier to
understand and easier to debug. It also makes it possible for the widget
to be completely non-dependent on JavaScript.

To test, apply the patch and regenerate the OPAC CSS
(https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client)

 - Enable the OpacBrowseResults system preference and perform a search
   in the OPAC which will return multiple results.
 - Click on any title in the first page of search results.
 - On the bibliographic detail page there should be a "Browse results"
   link in the right-hand sidebar just as before.
   - Test that the "Previous," "Back to results," and "Next" links work
     correctly.
   - Click the "Browse results" link. A list of the first 20 search
     results should appear. An arrow should indicate the title you're
     viewing.
   - Click any title in the results browser. The page should correctly
     load that record.
   - Clicking the numbered links at the top of the results browser
     should do the same.

Signed-off-by: Cab Vinton <bibliwho@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 16:54:07 +00:00
00606e1300 Bug 20743: Update two-column templates with Bootstrap grid: Administration part 7
This patch modifies several administration templates to use the
Bootstrap grid instead of YUI.

This patch also removes obsolete "text/javascript" attributes from
<script> tags and "text/css" attributes from <style> tags in the
modified templates.

To test, apply the patch and view the following pages, confirming that
they look correct at various browser widths:

 - Navigate directly to /cgi-bin/koha/admin/printers.pl
   - View and edit printers
 - Administration -> Search engine configuration (or navigate directly
   to /cgi-bin/koha/admin/searchengine/elasticsearch/mappings.pl
 - Administration -> Circulation and fines rules
 - Administration -> SMS cellular providers (enable SMSSendDriver or
   navigate directly to /cgi-bin/koha/admin/sms_providers.pl)
 - Administration -> Z39.50/SRU servers -> New SRU server -> Modify SRU
   search fields mapping
 - Administration -> System preferences -> Local use
   - View and edit local use preferences
 - Administration -> Transport cost matrix
 - With  UsageStats enabled, go to Administration -> Share your usage
   statistics.

Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 16:54:06 +00:00
135bf128a3 Bug 20742: (RM follow-up) Fix menu include
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 16:54:06 +00:00
b8c1198a79 Bug 20742: Update two-column templates with Bootstrap grid: Administration part 6
This patch modifies several administration templates to use the
Bootstrap grid instead of YUI.

This patch also removes obsolete "text/javascript" attributes from
<script> tags and "text/css" attributes from <style> tags in the
modified templates.

To test, apply the patch and view the following pages, confirming that
they look correct at various browser widths:

 - Administration -> MARC frameworks -> MARC structure -> Subfields
   - View and edit subfields
 - Administration -> Record matching rules
   - View and edit record matching rules
 - Administration -> OAI sets configuration
   - View and edit OAI sets
     - Define mappings for an OAI set
 - Administration -> Patron attribute types
   - View and edit patron attribute types
 - Administration -> System preferences
 - Administration -> Z39.50/SRU servers
   - View and edit servers

Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 12:43:20 +00:00
a344710aed Bug 20741: (RM follow-up) adjust selenium tests
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 12:43:20 +00:00
1ce0930ed1 Bug 20741: Update two-column templates with Bootstrap grid: Administration part 5
This patch modifies several administration templates to use the
Bootstrap grid instead of YUI.

This patch also removes obsolete "text/javascript" attributes from
<script> tags in the modified templates.

To test, apply the patch and view the following pages, confirming that
they look correct at various browser widths:

 - Administration -> Keywords to MARC mapping
 - Administration -> Item circulation alerts
 - Administration -> Item types
   - View and edit item types
   - Edit and item type and translate a description
 - Administration -> Koha to MARC mapping
 - Administration -> MARC frameworks -> MARC structure
   - View and edit tags

Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-09-06 12:18:32 +00:00
f04cd87e67 Bug 21295: Update selenium tests for admin bootstrap changes
To test:
1 - Setup and run selenium server as outlined here:
https://wiki.koha-community.org/wiki/Using_Selenium_with_Koha
2 - sudo koha-shell kohadev
3 - prove -v t/db_dependent/selenium/administration_tasks.t
4 - All should be green

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
All good!

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-08-31 15:27:37 +00:00
1ab7d74a15 Bug 20944: Fix perlcritic issues
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-08-31 15:24:00 +00:00
d19d8ec049 Bug 20944: Add route to add credits to a patron's account
This patch adds the /patrons/{patron_id}/account/credits endpoint, that
can be used to add credits to a patron's account. It is implemented so
the new credits are used to pay existing debts.

To test:
- Run:
  $ kshell
k$ prove t/db_dependent/api/v1/patrons_accounts.t
=> SUCCESS: Tests pass!
- Make your favourite REST testing tool (RESTer on Firefox?) do:
  POST /api/v1/patrons/{patron_id}/account/credits
{
  "amount": 100
}
- Play with other possible attributes on the credit object.
- Sign off :-D

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-08-31 12:47:00 +00:00
566badf12a Bug 20944: OpenAPI spec for /patrons/{patron_id}/account/credits
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-08-31 12:46:59 +00:00
302dd7bf82 Bug 21267: Set X-FORWARDED-PROTO https if required
This patch makes the apache configuration for the reverse proxy
(required for Plack) so it sets the X-FORWARDED-PROTO header correctly
for Plack::Middleware::ReverseProxy to use it.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Ulrich Kleiber <ulrich.kleiber@bsz-bw.de>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Since we actually resolve 19799 now (Changing language on OPAC redirects
back to homepage), I will move that code to a new enh report.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-08-31 12:46:58 +00:00
Nightly Build Bot
9582d268af Bug 17084: Automatic debian/control updates (unstable/master)
This is a result of Bug 21068: Remove NorwegianPatronDB related code

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-08-31 12:46:53 +00:00
092d52d5cf Bug 18639: DBRev 18.06.00.023
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-08-31 12:46:52 +00:00
Katrin Fischer
c883ffe6b3 Bug 18639: (QA follow-up) Fix formatting of replacement cost when modifying an order
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-08-31 12:46:52 +00:00
eba00a8c6f Bug 18639: Alter DB update to populate replacementprice from rpp initially
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-08-31 12:46:51 +00:00
87fb5d53a1 Bug 18639: (follow-up) Populate replacement price from list price during ordering
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-08-31 12:46:51 +00:00
Colin Campbell
c9da416690 Bug 18639: Use replacementprice when creating order from quote
Updates column name from rrp -> replacementprice when creating
order from EDI QUOTE message
Also ensure other rrp_tax* fields populated

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-08-31 12:46:45 +00:00
80ae56cb31 Bug 18639: Unit tests
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-08-31 12:46:38 +00:00
a3e8e12364 Bug 18639: Add replacementprice field to acquisitions workflow
To test:
 0 - Apply patches and updatedatabase
 1 - Add an order to a basket
 2 - You should note new 'Retail price field'
 3 - You should have a separate 'Replacement price' field
 4 - Enter values and ensure they are saved as expected
 5 - In the basket you should see the replacement price
 6 - Modify order and ensure value is loaded and saved correctly
 7 - Add and cancle an order and esure replacement price shows/saves
 8 - Close basket
 9 - Receive an order
10 - You should be able to edit replacement price
11 - 'retail price' field is not editable
12 - Check associated item, replacement price in item should be updated
13 - Cancel receipt, check item. receive again with new replacement
price, check item
14 - Price should be correctly updated
15 - Finish receipt, value should show in table
16 - Test with receive from file

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-08-31 12:46:28 +00:00
26976dfba9 Bug 18639: Add replacementprice field to aqorders
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-08-31 12:46:12 +00:00
87d7ce88f6 Bug 14302: (follow-up) Remove traces in C4::Search and C4::Context
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-08-31 11:24:22 +00:00
8f4c686e7c Bug 14302: (follow-up) Remove traces in koha-create
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-08-31 11:24:22 +00:00