[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.05.1-24-g6a24376

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 3.18.x has been updated
       via  6a24376001404b5a36592ddcb261d8c6fa630c99 (commit)
       via  8c40dfca0bee1e53251a88b0d3c10a1da7ed9f96 (commit)
      from  43191a61e77d056bda8bd4465f40baf1c93abafa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6a24376001404b5a36592ddcb261d8c6fa630c99
Author: Benjamin Rokseth <benjamin.rokseth at kul.oslo.kommune.no>
Date:   Thu Mar 5 12:18:09 2015 +0100

    Bug 12344: QA followup: use next instead of return
    
    Use next instead of return when generating templates.
    In case patron has enabled a message type that misses a template,
    next message type will be attempted instead of returning at once.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit e4d88bcf43996f1d118427067fe2e06a272167d9)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 8c40dfca0bee1e53251a88b0d3c10a1da7ed9f96
Author: Benjamin Rosketh <benjamin.rokseth at kul.oslo.kommune.no>
Date:   Mon Jun 2 14:18:30 2014 +0200

    Bug 12344 - Multi transport types for issues and checkins
    
    This small patch corrects the order of generating notices for issues and returns (checkout/checkin) so that borrower's notices are rendered correctly (for sms,email,etc.)
    
    Test plan:
    
    1) Edit SMSSendDriver syspref to use driver 'Test'
    2) Edit CHECKOUT template for sms to 'SMS test'
    3) select SMS for test patron's messaging prefs for item checkout
    4) checkout an item
    5) check the table message_queue, verify that template sms is
       not used (message content is not 'SMS test')
    
    6) apply patch, make new checkout
    7) check that message_queue table now has a correctly generated
       notice with 'SMS test'
    
    For a real world test use a real SMS::Send driver and run the
    cronjob process-message-queue.pl to send messages immediately.
    
    Signed-off-by: Sophie Meynieux <sophie.meynieux at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 2ab4a4287ba6081a872f1123fe44e5596c829bf1)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

-----------------------------------------------------------------------

Summary of changes:
 C4/Circulation.pm |   43 +++++++++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
main Koha release repository