19ebcd4eb5
To activate Curbside pickups
1- Enable the CurbsidePickup system preference
1.1 Go to Administration > Global system preferences
1.2 Search for CurbsidePickup
1.3 Change the value for 'Enable'
1.4 Click on 'Save all circulation preferences'
2- Configure time slots for at least one library
2.1 Go to Administration > Curbside pickup
2.2 Fill out the form for Centerville (or another library)
Enable: Check
Pickup interval: 10 (or other)
Maximum boss per interval: 3 (or other)
Patron-scheduled pickup: Check
Enable for waiting holds only: DO NOT check
2.3 Add a time slot
In 'New slot', enter
Monday
From: 10:00
To: 12:00
Click on 'Add'
3- Make an appointment from the OPAC
3.1 Go to OPAC
3.2 Open mobile mode
3.3 Connect with a user
3.4 Click on 'Curbside pickups'
3.5 Choose the library in 'Pick a library'
3.6 Choose a date in 'Pickup date'
3.7 Choose a time range in 'Select a time'
3.8 Click on 'Schedule pickup'
=> Notice The table is not responsive
4- Apply the patch
5- Execute 'yarn build --view opac'
6- Clean your cache or open your navigator on private mode (to load updated css files)
7- Perform step 3.1, 3.2, 3.3, 3.4,
8- click on 'Your pickups'
=> Confirm that the CurbsidePickup table are now displayed correctly and is now responsive.
9- Click on 'Charges'
=> Confirm that the Charges table are now displayed correctly and is now responsive.
I correct a little bug. The "suspend_hold" button did not work anymore. This change resets it to it's original state.
Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 16008c24c5
)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
196 lines
8.1 KiB
Text
196 lines
8.1 KiB
Text
[% USE raw %]
|
|
[% USE Asset %]
|
|
[% USE Koha %]
|
|
[% USE KohaDates %]
|
|
[% USE AuthorisedValues %]
|
|
[% USE Price %]
|
|
[% SET ENABLE_OPAC_PAYMENTS = payment_methods %]
|
|
[% USE AdditionalContents %]
|
|
[% SET DISPLAY_PAYMENT_BLOCK = 0 %]
|
|
[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
|
|
[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Your charges › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
[% BLOCK cssinclude %]
|
|
[% Asset.css("css/datatables.css") | $raw %]
|
|
[% END %]
|
|
</head>
|
|
|
|
[% INCLUDE 'bodytag.inc' bodyid='opac-account' bodyclass='scrollto' %]
|
|
[% INCLUDE 'masthead.inc' %]
|
|
|
|
<div class="main">
|
|
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumbs">
|
|
<ol class="breadcrumb">
|
|
<li class="breadcrumb-item">
|
|
<a href="/cgi-bin/koha/opac-main.pl">Home</a>
|
|
</li>
|
|
<li class="breadcrumb-item">
|
|
<a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a>
|
|
</li>
|
|
<li class="breadcrumb-item active">
|
|
<a href="#" aria-current="page">Your charges</a>
|
|
</li>
|
|
</ol>
|
|
</nav> <!-- /#breadcrumbs -->
|
|
|
|
<div class="container-fluid">
|
|
<div class="row">
|
|
<div class="col col-lg-2 order-2 order-lg-1">
|
|
<div id="navigation">
|
|
[% INCLUDE 'navigation.inc' IsPatronPage=1 %]
|
|
</div>
|
|
</div>
|
|
<div class="col-md-12 col-lg-10 order-1">
|
|
<div id="useraccount" class="maincontent">
|
|
|
|
<h1>Charges</h1>
|
|
[% IF message %]
|
|
<div class="alert alert-info">
|
|
[% IF message == 'valid_payment' %]
|
|
<p>Your payment of $[% message_value | html %] has been processed successfully!</p>
|
|
[% ELSIF message == 'duplicate_payment' %]
|
|
<p>A payment with the transaction ID '[% message_value | html %]' has already been posted to an account.</p>
|
|
<p>Please contact a librarian for details.</p>
|
|
[% ELSIF message == 'invalid_payment' %]
|
|
<p>The transaction ID '[% message_value | html %]' for this payment is invalid.</p>
|
|
<p>Please contact a librarian for details.</p>
|
|
[% END %]
|
|
</div>
|
|
[% END %]
|
|
|
|
[% IF payment_error %]
|
|
<div id="error" class="alert alert-warning">
|
|
<p><strong>Error:</strong> there was a problem processing your payment</p>
|
|
</div>
|
|
[% ELSIF payment %]
|
|
<div class="alert alert-info">
|
|
<p><strong>Payment applied:</strong> your payment of [% payment | html %] has been applied to your account</p>
|
|
</div>
|
|
[% END %]
|
|
|
|
[% PROCESS 'account-table.inc' ACCOUNT_LINES = ACCOUNT_LINES, ENABLE_OPAC_PAYMENTS = ENABLE_OPAC_PAYMENTS, plugins = plugins %]
|
|
|
|
</div> <!-- / #useraccount -->
|
|
</div> <!-- / .col-10 -->
|
|
</div> <!-- / .row -->
|
|
</div> <!-- / .container-fluid -->
|
|
</div> <!-- / .main -->
|
|
|
|
[% INCLUDE 'opac-bottom.inc' %]
|
|
[% BLOCK jsinclude %]
|
|
[% INCLUDE 'datatables.inc' %]
|
|
<script>
|
|
$( document ).ready(function() {
|
|
|
|
var MSG_MIN_THRESHOLD = _("Minimum amount needed by this service is %s");
|
|
var txtActivefilter = _("Filter paid transactions");
|
|
var txtInactivefilter = _("Show all transactions");
|
|
|
|
var fines_table = $("#finestable").dataTable($.extend(true, {}, dataTablesDefaults, {
|
|
[% IF ENABLE_OPAC_PAYMENTS %]
|
|
"order": [[ 1, "desc" ]],
|
|
[% ELSE %]
|
|
"order": [[ 0, "desc" ]],
|
|
[% END %]
|
|
"dom": '<"#filter_p">',
|
|
"autoWidth": false,
|
|
"responsive": {
|
|
"details": { "type": 'column',"target": -1 }
|
|
},
|
|
"columnDefs": [
|
|
{ "className": 'dtr-control', "orderable": false, "targets": -1 }
|
|
],
|
|
'fnDrawCallback': function() {
|
|
show_hiddentfoot('#finestable');
|
|
}
|
|
} ));
|
|
|
|
$('table[id^="finestable-"]').dataTable($.extend(true, {}, dataTablesDefaults, {
|
|
"autoWidth": false,
|
|
"responsive": {
|
|
"details": { "type": 'column',"target": -1 }
|
|
},
|
|
"columnDefs": [
|
|
{ "className": 'dtr-control', "orderable": false, "targets": -1 }
|
|
],
|
|
'fnDrawCallback': function() {
|
|
show_hiddentfoot('table[id^="finestable-"]');
|
|
}
|
|
} ));
|
|
|
|
function show_hiddentfoot(selector) {
|
|
$('.finestable tfoot .sum').show();
|
|
if ($(".finestable tfoot td.dtr-hidden").length > 0) {
|
|
$(selector+" tfoot th").removeAttr( "colspan" );
|
|
$(".finestable tfoot .dtr-control").hide();
|
|
}
|
|
}
|
|
$("#filter_p").html('<p><a href="#" id="filter_paid"><i class="fa fa-filter" aria-hidden="true"></i> '+txtActivefilter+'</a>');
|
|
$('#filter_paid').click(function(e) {
|
|
e.preventDefault();
|
|
if ($(this).hasClass('filtered')) {
|
|
var filteredValue = '';
|
|
$(this).html('<i class="fa fa-filter" aria-hidden="true"></i> '+txtActivefilter);
|
|
} else { //Not filtered. Let's do it!
|
|
var filteredValue = '^((?!0.00).*)$'; //Filter not matching 0.00 http://stackoverflow.com/a/406408
|
|
$(this).html('<i class="fa fa-filter" aria-hidden="true"></i> '+txtInactivefilter);
|
|
}
|
|
fines_table.fnFilter(filteredValue, -1, true, false);
|
|
$(this).toggleClass('filtered');
|
|
});
|
|
|
|
//Start filtered
|
|
$('#filter_paid').click();
|
|
|
|
$(".pay-online").removeClass("hidden");
|
|
|
|
$("#amount-to-pay-label").hide();
|
|
|
|
$(".checkbox-pay, input[name='payment_method']").change( function() {
|
|
// Disable the pay button if no fees are selected
|
|
//$("#submit-pay").prop("disabled", ! $(".checkbox-pay:checked").length );
|
|
|
|
// Calculate the total amount to be paid based on selected fees
|
|
var total = 0;
|
|
$(".checkbox-pay").each( function() {
|
|
if ( $(this).is(":checked") ) {
|
|
var id = this.id.split("checkbox-pay-")[1];
|
|
total += parseFloat( $("#amount-" + id).val() );
|
|
}
|
|
});
|
|
|
|
var p = Promise.resolve();
|
|
if ( total ) {
|
|
p = Promise.all(
|
|
$('input[name="payment_method"]').map(function() {
|
|
var self = this;
|
|
return new Promise(function(resolve, reject) {
|
|
var threshold = $(self).data('threshold');
|
|
var help = $(self).parent().siblings('.help-block');
|
|
if(!threshold || threshold == '' || threshold <= total) {
|
|
$(self).prop('disabled', false);
|
|
help.addClass('hide');
|
|
} else {
|
|
$(self).prop('disabled', true);
|
|
help.html(MSG_MIN_THRESHOLD.format(parseInt(threshold,10).toFixed(2))).removeClass('hide');
|
|
}
|
|
resolve();
|
|
})
|
|
}).toArray()
|
|
);
|
|
|
|
$("#amount-to-pay").html( total.toFixed(2) );
|
|
$("#amount-to-pay-label").show();
|
|
} else {
|
|
$('input[name="payment_method"]').prop('disabled', false).parent().siblings('.help-block').addClass('hide');
|
|
$("#amount-to-pay-label").hide();
|
|
}
|
|
p.then(function() {
|
|
$("#submit-pay").prop("disabled", ! $(".checkbox-pay:checked").length || ! $('input[name="payment_method"]:checked:not(:disabled)').length);
|
|
})
|
|
});
|
|
});
|
|
</script>
|
|
[% END %]
|