Nick Clemens
bd28eae578
To recreate: 1. Enable the "EnablePointofSale" syspref. 2. Set the "UseCashRegisters" syspref to use. 3. Create 3 new registers (Register A, B and C) with a float amount of $25. 4. Under POS, configure 3 new debit types (i.e. Copies, Earbuds, Friends Donation) -- You can leave the default amounts blank, or add an amount if desired. -- Set "Can be manually invoiced?" and "Can be sold?" 5. Under point of sale make a $5 sale of copies under Register A. 6. Under point of sale make a $10 sale of earbuds under Register B. 7. Under point of sale make a $100 sale of Friends Donation under Register C. 8. At circ/set-library.pl set your register to Register A. 9. Go back to POS and view the "Transaction history for Register A" - it shows the correct amount of $5 sold in copies. 10. Go back to circ/set-library.pl and change your register to Register B. 11. Go back to POS and view the "Transaction history for Register B" - it shows the incorrect transaction history. It is showing the transaction history for Register A. 12. Go back to circ/set-library.pl and change your register to Register C. 13. Go back to POS and view the "Transaction history for Register C" - it shows the incorrect transaction history. It is showing the transaction history for Register A. 14. Apply patch, repeat. The correct transactions should now show. Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
160 lines
5.6 KiB
Perl
Executable file
160 lines
5.6 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2020 PTFS-Europe Ltd
|
|
#
|
|
# 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 Modern::Perl;
|
|
use CGI;
|
|
use C4::Auth qw( get_template_and_user );
|
|
use C4::Output qw( output_html_with_http_headers );
|
|
use C4::Context;
|
|
|
|
use Koha::Account::Lines;
|
|
use Koha::Cash::Registers;
|
|
use Koha::Database;
|
|
use Koha::DateUtils qw( dt_from_string );
|
|
|
|
my $input = CGI->new();
|
|
|
|
my ( $template, $loggedinuser, $cookie, $user_flags ) = get_template_and_user(
|
|
{
|
|
template_name => 'pos/register.tt',
|
|
query => $input,
|
|
type => 'intranet',
|
|
authnotrequired => 0,
|
|
flagsrequired => { cash_management => [ 'cashup', 'anonymous_refund' ] },
|
|
}
|
|
);
|
|
my $logged_in_user = Koha::Patrons->find($loggedinuser) or die "Not logged in";
|
|
my $schema = Koha::Database->new->schema;
|
|
|
|
my $library_id = C4::Context->userenv->{'branch'};
|
|
my $registerid = $input->param('registerid') // C4::Context->userenv->{'register_id'};
|
|
my $registers = Koha::Cash::Registers->search(
|
|
{ branch => $library_id, archived => 0 },
|
|
{ order_by => { '-asc' => 'name' } }
|
|
);
|
|
|
|
if ( !$registers->count ) {
|
|
$template->param( error_registers => 1 );
|
|
}
|
|
else {
|
|
if ( !$registerid ) {
|
|
my $default_register = Koha::Cash::Registers->find(
|
|
{ branch => $library_id, branch_default => 1 } );
|
|
$registerid = $default_register->id if $default_register;
|
|
}
|
|
$registerid = $registers->next->id if !$registerid;
|
|
|
|
$template->param(
|
|
registerid => $registerid,
|
|
registers => $registers,
|
|
);
|
|
|
|
my $cash_register = Koha::Cash::Registers->find( { id => $registerid } );
|
|
my $accountlines = $cash_register->outstanding_accountlines();
|
|
$template->param(
|
|
register => $cash_register,
|
|
accountlines => $accountlines
|
|
);
|
|
|
|
my $transactions_range_from = $input->param('trange_f');
|
|
my $last_cashup = $cash_register->last_cashup;
|
|
my $transactions_range_to =
|
|
$input->param('trange_t') ? $input->param('trange_t')
|
|
: $last_cashup ? $last_cashup->timestamp
|
|
: '';
|
|
my $end = dt_from_string($transactions_range_to);
|
|
$end = $end->set( { hour => 23, minute => 59, second => 59 } ); # To should be 'inclusive'
|
|
|
|
if ($transactions_range_from) {
|
|
|
|
my $dtf = $schema->storage->datetime_parser;
|
|
my $start = dt_from_string($transactions_range_from);
|
|
my $past_accountlines = Koha::Account::Lines->search(
|
|
{
|
|
register_id => $registerid,
|
|
timestamp => {
|
|
-between => [
|
|
$dtf->format_datetime($start),
|
|
$dtf->format_datetime($end)
|
|
]
|
|
}
|
|
}
|
|
);
|
|
$template->param(
|
|
past_accountlines => $past_accountlines,
|
|
trange_f => $start,
|
|
);
|
|
}
|
|
$template->param( trange_t => $end, );
|
|
|
|
my $op = $input->param('op') // '';
|
|
if ( $op eq 'cashup' ) {
|
|
if ( $logged_in_user->has_permission( { cash_management => 'cashup' } ) ) {
|
|
$cash_register->add_cashup(
|
|
{
|
|
manager_id => $logged_in_user->id,
|
|
amount => $cash_register->outstanding_accountlines->total
|
|
}
|
|
);
|
|
}
|
|
else {
|
|
$template->param( error_cashup_permission => 1 );
|
|
}
|
|
}
|
|
elsif ( $op eq 'refund' ) {
|
|
if ( $logged_in_user->has_permission( { cash_management => 'anonymous_refund' } ) ) {
|
|
my $amount = $input->param('amount');
|
|
my $quantity = $input->param('quantity');
|
|
my $accountline_id = $input->param('accountline');
|
|
my $refund_type = $input->param('refund_type');
|
|
|
|
my $accountline = Koha::Account::Lines->find($accountline_id);
|
|
$schema->txn_do(
|
|
sub {
|
|
|
|
my $refund = $accountline->reduce(
|
|
{
|
|
reduction_type => 'REFUND',
|
|
branch => $library_id,
|
|
staff_id => $logged_in_user->id,
|
|
interface => 'intranet',
|
|
amount => $amount
|
|
}
|
|
);
|
|
my $payout = $refund->payout(
|
|
{
|
|
payout_type => $refund_type,
|
|
branch => $library_id,
|
|
staff_id => $logged_in_user->id,
|
|
cash_register => $cash_register->id,
|
|
interface => 'intranet',
|
|
amount => $amount
|
|
}
|
|
);
|
|
|
|
}
|
|
);
|
|
}
|
|
else {
|
|
$template->param( error_refund_permission => 1 );
|
|
}
|
|
}
|
|
}
|
|
|
|
output_html_with_http_headers( $input, $cookie, $template->output );
|