0987165d6a
KOCT plugin send UTC timestamp, it should be converted to local timezone Test plan: 1. Install latest version of KOCT and configure it https://addons.mozilla.org/fr/firefox/addon/koct/ https://wiki.koha-community.org/wiki/Offline_circulation_firefox_plugin 2. Use it to do a checkout and a checkin. See that timestamps are UTC. 3. Click on "Commit to Koha" under "Log" tab 4. Wait for all operations to be processed 5. In Koha, go to Circulation > Offline circulation and check the timestamps were correctly converted to the Koha server's timezone 6. Process the pending operations and see that timestamps are still correct 7. Repeat step 2 8. Now click on "Apply directly" 9. Check the timestamps are correct in Koha NOTE: I could not get "Commit to Koha" to work for me, but I did confirm this corrected behaviour with "Apply directly". Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Using the "commit to Koha" option works fine for me. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> This patch only affects service.pl, which is not used in any way by the uploader for desktop client files. No changes to the desktop offline circ will be needed. Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
85 lines
2.7 KiB
Perl
Executable file
85 lines
2.7 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# 2009 BibLibre <jeanandre.santoni@biblibre.com>
|
|
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
#
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
use CGI qw ( -utf8 );
|
|
use C4::Auth;
|
|
use C4::Circulation;
|
|
use Koha::DateUtils;
|
|
use DateTime::TimeZone;
|
|
|
|
my $cgi = CGI->new;
|
|
|
|
# get the status of the user, this will check his credentials and rights
|
|
my ($status, $cookie, $sessionId) = C4::Auth::check_api_auth($cgi, undef);
|
|
($status, $sessionId) = C4::Auth::check_cookie_auth($cgi, undef) if ($status ne 'ok');
|
|
|
|
my $result;
|
|
|
|
if ($status eq 'ok') { # if authentication is ok
|
|
|
|
my $userid = $cgi->param('userid') || '';
|
|
my $branchcode = $cgi->param('branchcode') || '';
|
|
my $timestamp = $cgi->param('timestamp') || '';
|
|
my $action = $cgi->param('action') || '';
|
|
my $barcode = $cgi->param('barcode') || '';
|
|
my $amount = $cgi->param('amount') || 0;
|
|
$barcode =~ s/^\s+//;
|
|
$barcode =~ s/\s+$//;
|
|
my $cardnumber = $cgi->param('cardnumber') || '';
|
|
$cardnumber =~ s/^\s+//;
|
|
$cardnumber =~ s/\s+$//;
|
|
|
|
# KOCT send UTC timestamp, it should be converted to local timezone
|
|
my $dt = dt_from_string($timestamp, 'iso', DateTime::TimeZone->new(name => 'UTC'));
|
|
$dt->set_time_zone(C4::Context->tz);
|
|
$timestamp = $dt->ymd('-') . ' ' . $dt->hms(':');
|
|
|
|
if ( $cgi->param('pending') eq 'true' ) { # if the 'pending' flag is true, we store the operation in the db instead of directly processing them
|
|
$result = AddOfflineOperation(
|
|
$userid,
|
|
$branchcode,
|
|
$timestamp,
|
|
$action,
|
|
$barcode,
|
|
$cardnumber,
|
|
$amount
|
|
);
|
|
} else {
|
|
$result = ProcessOfflineOperation(
|
|
{
|
|
'userid' => $userid,
|
|
'branchcode' => $branchcode,
|
|
'timestamp' => $timestamp,
|
|
'action' => $action,
|
|
'barcode' => $barcode,
|
|
'cardnumber' => $cardnumber,
|
|
'amount' => $amount
|
|
}
|
|
);
|
|
}
|
|
} else {
|
|
$result = "Authentication failed."
|
|
}
|
|
|
|
print CGI::header('-type'=>'text/plain', '-charset'=>'utf-8');
|
|
print $result;
|