Lines 67-72
my $searchfield=$input->param('description');
Link Here
|
67 |
my $script_name="/cgi-bin/koha/admin/categorie.pl"; |
67 |
my $script_name="/cgi-bin/koha/admin/categorie.pl"; |
68 |
my $categorycode=$input->param('categorycode'); |
68 |
my $categorycode=$input->param('categorycode'); |
69 |
my $op = $input->param('op'); |
69 |
my $op = $input->param('op'); |
|
|
70 |
my $block_expired = $input->param("block_expired"); |
70 |
|
71 |
|
71 |
my ($template, $loggedinuser, $cookie) |
72 |
my ($template, $loggedinuser, $cookie) |
72 |
= get_template_and_user({template_name => "admin/categorie.tmpl", |
73 |
= get_template_and_user({template_name => "admin/categorie.tmpl", |
Lines 92-98
if ($op eq 'add_form') {
Link Here
|
92 |
my $data; |
93 |
my $data; |
93 |
if ($categorycode) { |
94 |
if ($categorycode) { |
94 |
my $dbh = C4::Context->dbh; |
95 |
my $dbh = C4::Context->dbh; |
95 |
my $sth=$dbh->prepare("select categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,hidelostitems,overduenoticerequired,category_type from categories where categorycode=?"); |
96 |
my $sth=$dbh->prepare("select categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,hidelostitems,overduenoticerequired,category_type,BlockExpiredOpacActions from categories where categorycode=?"); |
96 |
$sth->execute($categorycode); |
97 |
$sth->execute($categorycode); |
97 |
$data=$sth->fetchrow_hashref; |
98 |
$data=$sth->fetchrow_hashref; |
98 |
$sth->finish; |
99 |
$sth->finish; |
Lines 113-118
if ($op eq 'add_form') {
Link Here
|
113 |
category_type => $data->{'category_type'}, |
114 |
category_type => $data->{'category_type'}, |
114 |
DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), |
115 |
DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), |
115 |
"type_".$data->{'category_type'} => 1, |
116 |
"type_".$data->{'category_type'} => 1, |
|
|
117 |
"block_" . ($data->{'BlockExpiredOpacActions'} == -1 ? 'syspref' : $data->{'BlockExpiredOpacActions'} ? 'block' : 'dontblock') => 1, |
116 |
SMSSendDriver => C4::Context->preference("SMSSendDriver") |
118 |
SMSSendDriver => C4::Context->preference("SMSSendDriver") |
117 |
); |
119 |
); |
118 |
if (C4::Context->preference('EnhancedMessagingPreferences')) { |
120 |
if (C4::Context->preference('EnhancedMessagingPreferences')) { |
Lines 128-141
if ($op eq 'add_form') {
Link Here
|
128 |
if($input->param('enrolmentperioddate')){ |
130 |
if($input->param('enrolmentperioddate')){ |
129 |
$input->param('enrolmentperioddate' => C4::Dates::format_date_in_iso($input->param('enrolmentperioddate')) ); |
131 |
$input->param('enrolmentperioddate' => C4::Dates::format_date_in_iso($input->param('enrolmentperioddate')) ); |
130 |
} |
132 |
} |
131 |
|
133 |
|
132 |
if ($is_a_modif) { |
134 |
if ($is_a_modif) { |
133 |
my $sth=$dbh->prepare("UPDATE categories SET description=?,enrolmentperiod=?, enrolmentperioddate=?,upperagelimit=?,dateofbirthrequired=?,enrolmentfee=?,reservefee=?,hidelostitems=?,overduenoticerequired=?,category_type=? WHERE categorycode=?"); |
135 |
my $sth=$dbh->prepare("UPDATE categories SET description=?,enrolmentperiod=?, enrolmentperioddate=?,upperagelimit=?,dateofbirthrequired=?,enrolmentfee=?,reservefee=?,hidelostitems=?,overduenoticerequired=?,category_type=?,BlockExpiredOpacActions=? WHERE categorycode=?"); |
134 |
$sth->execute(map { $input->param($_) } ('description','enrolmentperiod','enrolmentperioddate','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','hidelostitems','overduenoticerequired','category_type','categorycode')); |
136 |
$sth->execute(map { $input->param($_) } ('description','enrolmentperiod','enrolmentperioddate','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','hidelostitems','overduenoticerequired','category_type','block_expired','categorycode')); |
135 |
$sth->finish; |
137 |
$sth->finish; |
136 |
} else { |
138 |
} else { |
137 |
my $sth=$dbh->prepare("INSERT INTO categories (categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,reservefee,hidelostitems,overduenoticerequired,category_type) values (?,?,?,?,?,?,?,?,?,?,?)"); |
139 |
my $sth=$dbh->prepare("INSERT INTO categories (categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,reservefee,hidelostitems,overduenoticerequired,category_type,BlockExpiredOpacActions) values (?,?,?,?,?,?,?,?,?,?,?,?)"); |
138 |
$sth->execute(map { $input->param($_) } ('categorycode','description','enrolmentperiod','enrolmentperioddate','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','hidelostitems','overduenoticerequired','category_type')); |
140 |
$sth->execute(map { $input->param($_) } ('categorycode','description','enrolmentperiod','enrolmentperioddate','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','hidelostitems','overduenoticerequired','category_type','block_expired')); |
139 |
$sth->finish; |
141 |
$sth->finish; |
140 |
} |
142 |
} |
141 |
if (C4::Context->preference('EnhancedMessagingPreferences')) { |
143 |
if (C4::Context->preference('EnhancedMessagingPreferences')) { |
Lines 158-164
if ($op eq 'add_form') {
Link Here
|
158 |
$sth->finish; |
160 |
$sth->finish; |
159 |
$template->param(total => $total->{'total'}); |
161 |
$template->param(total => $total->{'total'}); |
160 |
|
162 |
|
161 |
my $sth2=$dbh->prepare("select categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,hidelostitems,overduenoticerequired,category_type from categories where categorycode=?"); |
163 |
my $sth2=$dbh->prepare("select categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,hidelostitems,overduenoticerequired,category_type,BlockExpiredOpacActions from categories where categorycode=?"); |
162 |
$sth2->execute($categorycode); |
164 |
$sth2->execute($categorycode); |
163 |
my $data=$sth2->fetchrow_hashref; |
165 |
my $data=$sth2->fetchrow_hashref; |
164 |
$sth2->finish; |
166 |
$sth2->finish; |
Lines 177-182
if ($op eq 'add_form') {
Link Here
|
177 |
reservefee => sprintf("%.2f",$data->{'reservefee'}), |
179 |
reservefee => sprintf("%.2f",$data->{'reservefee'}), |
178 |
hidelostitems => $data->{'hidelostitems'}, |
180 |
hidelostitems => $data->{'hidelostitems'}, |
179 |
category_type => $data->{'category_type'}, |
181 |
category_type => $data->{'category_type'}, |
|
|
182 |
"block_" . $data->{'BlockExpiredOpacActions'} == -1 ? 'syspref' : $data->{'BlockExpiredOpacActions'} ? 'block' : 'dontblock', |
180 |
); |
183 |
); |
181 |
# END $OP eq DELETE_CONFIRM |
184 |
# END $OP eq DELETE_CONFIRM |
182 |
################## DELETE_CONFIRMED ################################## |
185 |
################## DELETE_CONFIRMED ################################## |
Lines 210-215
if ($op eq 'add_form') {
Link Here
|
210 |
reservefee => sprintf("%.2f",$results->[$i]{'reservefee'}), |
213 |
reservefee => sprintf("%.2f",$results->[$i]{'reservefee'}), |
211 |
hidelostitems => $results->[$i]{'hidelostitems'}, |
214 |
hidelostitems => $results->[$i]{'hidelostitems'}, |
212 |
category_type => $results->[$i]{'category_type'}, |
215 |
category_type => $results->[$i]{'category_type'}, |
|
|
216 |
block_syspref => 1, |
213 |
"type_".$results->[$i]{'category_type'} => 1); |
217 |
"type_".$results->[$i]{'category_type'} => 1); |
214 |
if (C4::Context->preference('EnhancedMessagingPreferences')) { |
218 |
if (C4::Context->preference('EnhancedMessagingPreferences')) { |
215 |
my $brief_prefs = _get_brief_messaging_prefs($results->[$i]{'categorycode'}); |
219 |
my $brief_prefs = _get_brief_messaging_prefs($results->[$i]{'categorycode'}); |