@@ -, +, @@
name|table_name>>
---
C4/Reports/Guided.pm | 5 +++-
.../modules/reports/guided_reports_start.tt | 19 +++++++++++++-
reports/guided_reports.pl | 26 ++++++++++++++++++-
t/db_dependent/Reports/Guided.t | 5 +++-
4 files changed, 51 insertions(+), 4 deletions(-)
--- a/C4/Reports/Guided.pm
+++ a/C4/Reports/Guided.pm
@@ -936,7 +936,10 @@ sub GetReservedAuthorisedValues {
'itemtypes',
'cn_source',
'categorycode',
- 'biblio_framework' );
+ 'biblio_framework',
+ 'cash_registers',
+ 'debit_types',
+ 'credit_types' );
return \%reserved_authorised_values;
}
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -1207,7 +1207,6 @@
Required
[% PROCESS group_and_subgroup_selection %]
-
[% IF (public) %]
@@ -1632,6 +1631,21 @@
$("#paramLabel").val( _("Patron category") );
$("#param_category").val("categorycode");
break;
+ case "insertCashregister":
+ modalTitle.text( _("Insert cash register parameter") );
+ $("#paramLabel").val( _("Cash register") );
+ $("#param_category").val("cash_registers");
+ break;
+ case "insertDebittypes":
+ modalTitle.text( _("Insert debit types parameter") );
+ $("#paramLabel").val( _("Debit types") );
+ $("#param_category").val("debit_types");
+ break;
+ case "insertCredittypes":
+ modalTitle.text( _("Insert credit types parameter") );
+ $("#paramLabel").val( _("Credit types") );
+ $("#param_category").val("credit_types");
+ break;
case "insertList":
modalTitle.text( _("Insert list parameter") );
$("#paramLabel").val( _("List of values") );
@@ -2435,6 +2449,9 @@
Libraries
List
Patron categories
+ Cash register
+ Debit types
+ Credit types
Text field
--- a/reports/guided_reports.pl
+++ a/reports/guided_reports.pl
@@ -773,6 +773,30 @@ elsif ($phase eq 'Run this report'){
%authorised_lib = map { $_->categorycode => $_->description } @patron_categories;
push @authorised_values, $_->categorycode for @patron_categories;
}
+ elsif ( $authorised_value eq "cash_registers" ) {
+ my $sth = $dbh->prepare("SELECT id, name FROM cash_registers ORDER BY description");
+ $sth->execute;
+ while ( my ( $id, $name ) = $sth->fetchrow_array ) {
+ push @authorised_values, $id;
+ $authorised_lib{$id} = $name;
+ }
+ }
+ elsif ( $authorised_value eq "debit_types" ) {
+ my $sth = $dbh->prepare("SELECT code, description FROM account_debit_types ORDER BY code");
+ $sth->execute;
+ while ( my ( $code, $description ) = $sth->fetchrow_array ) {
+ push @authorised_values, $code;
+ $authorised_lib{$code} = $description;
+ }
+ }
+ elsif ( $authorised_value eq "credit_types" ) {
+ my $sth = $dbh->prepare("SELECT code, description FROM account_credit_types ORDER BY code");
+ $sth->execute;
+ while ( my ( $code, $description ) = $sth->fetchrow_array ) {
+ push @authorised_values, $code;
+ $authorised_lib{$code} = $description;
+ }
+ }
else {
if ( Koha::AuthorisedValues->search({ category => $authorised_value })->count ) {
my $query = '
@@ -812,6 +836,7 @@ elsif ($phase eq 'Run this report'){
push @tmpl_parameters, {'entry' => $text, 'input' => $input, 'labelid' => $labelid, 'name' => $text.$sep.$authorised_value_all, 'include_all' => $all };
}
+
$template->param('sql' => $sql,
'name' => $name,
'sql_params' => \@tmpl_parameters,
@@ -875,7 +900,6 @@ elsif ($phase eq 'Run this report'){
push @errors, { no_sql_for_id => $report_id };
}
}
-
elsif ($phase eq 'Export'){
# export results to tab separated text or CSV
--- a/t/db_dependent/Reports/Guided.t
+++ a/t/db_dependent/Reports/Guided.t
@@ -118,6 +118,9 @@ subtest 'GetReservedAuthorisedValues' => sub {
'categorycode' => 1,
'biblio_framework' => 1,
'list' => 1,
+ 'cash_registers' => 1,
+ 'debit_types' => 1,
+ 'credit_types' => 1
);
my $reserved_authorised_values = GetReservedAuthorisedValues();
@@ -126,7 +129,7 @@ subtest 'GetReservedAuthorisedValues' => sub {
};
subtest 'IsAuthorisedValueValid' => sub {
- plan tests => 9;
+ plan tests => 12;
ok( IsAuthorisedValueValid('LOC'),
'User defined authorised value category is valid');
--