Lines 68-73
my $searchfield=$input->param('description');
Link Here
|
68 |
my $script_name="/cgi-bin/koha/admin/categorie.pl"; |
68 |
my $script_name="/cgi-bin/koha/admin/categorie.pl"; |
69 |
my $categorycode=$input->param('categorycode'); |
69 |
my $categorycode=$input->param('categorycode'); |
70 |
my $op = $input->param('op'); |
70 |
my $op = $input->param('op'); |
|
|
71 |
my $block_expired = $input->param("block_expired"); |
71 |
|
72 |
|
72 |
my ($template, $loggedinuser, $cookie) |
73 |
my ($template, $loggedinuser, $cookie) |
73 |
= get_template_and_user({template_name => "admin/categorie.tmpl", |
74 |
= get_template_and_user({template_name => "admin/categorie.tmpl", |
Lines 94-100
if ($op eq 'add_form') {
Link Here
|
94 |
my @selected_branches; |
95 |
my @selected_branches; |
95 |
if ($categorycode) { |
96 |
if ($categorycode) { |
96 |
my $dbh = C4::Context->dbh; |
97 |
my $dbh = C4::Context->dbh; |
97 |
my $sth=$dbh->prepare("select categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,hidelostitems,overduenoticerequired,category_type from categories where categorycode=?"); |
98 |
my $sth=$dbh->prepare("select categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,hidelostitems,overduenoticerequired,category_type,BlockExpiredOpacActions from categories where categorycode=?"); |
98 |
$sth->execute($categorycode); |
99 |
$sth->execute($categorycode); |
99 |
$data=$sth->fetchrow_hashref; |
100 |
$data=$sth->fetchrow_hashref; |
100 |
|
101 |
|
Lines 119-140
if ($op eq 'add_form') {
Link Here
|
119 |
}; |
120 |
}; |
120 |
} |
121 |
} |
121 |
|
122 |
|
122 |
$template->param(description => $data->{'description'}, |
123 |
$template->param( |
123 |
enrolmentperiod => $data->{'enrolmentperiod'}, |
124 |
description => $data->{'description'}, |
124 |
enrolmentperioddate => C4::Dates::format_date($data->{'enrolmentperioddate'}), |
125 |
enrolmentperiod => $data->{'enrolmentperiod'}, |
125 |
upperagelimit => $data->{'upperagelimit'}, |
126 |
enrolmentperioddate => C4::Dates::format_date($data->{'enrolmentperioddate'}), |
126 |
dateofbirthrequired => $data->{'dateofbirthrequired'}, |
127 |
upperagelimit => $data->{'upperagelimit'}, |
127 |
enrolmentfee => sprintf("%.2f",$data->{'enrolmentfee'}), |
128 |
dateofbirthrequired => $data->{'dateofbirthrequired'}, |
128 |
overduenoticerequired => $data->{'overduenoticerequired'}, |
129 |
enrolmentfee => sprintf("%.2f",$data->{'enrolmentfee'}), |
129 |
issuelimit => $data->{'issuelimit'}, |
130 |
overduenoticerequired => $data->{'overduenoticerequired'}, |
130 |
reservefee => sprintf("%.2f",$data->{'reservefee'}), |
131 |
issuelimit => $data->{'issuelimit'}, |
131 |
hidelostitems => $data->{'hidelostitems'}, |
132 |
reservefee => sprintf("%.2f",$data->{'reservefee'}), |
132 |
category_type => $data->{'category_type'}, |
133 |
hidelostitems => $data->{'hidelostitems'}, |
133 |
SMSSendDriver => C4::Context->preference("SMSSendDriver"), |
134 |
category_type => $data->{'category_type'}, |
134 |
TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"), |
135 |
SMSSendDriver => C4::Context->preference("SMSSendDriver"), |
135 |
"type_".$data->{'category_type'} => 1, |
136 |
TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"), |
136 |
branches_loop => \@branches_loop, |
137 |
branches_loop => \@branches_loop, |
137 |
); |
138 |
SMSSendDriver => C4::Context->preference("SMSSendDriver") |
|
|
139 |
|
140 |
"type_".$data->{'category_type'} => 1, |
141 |
"block_" . ($data->{'BlockExpiredOpacActions'} == -1 ? 'syspref' : $data->{'BlockExpiredOpacActions'} ? 'block' : 'dontblock') => 1, |
142 |
); |
143 |
|
138 |
if (C4::Context->preference('EnhancedMessagingPreferences')) { |
144 |
if (C4::Context->preference('EnhancedMessagingPreferences')) { |
139 |
C4::Form::MessagingPreferences::set_form_values({ categorycode => $categorycode } , $template); |
145 |
C4::Form::MessagingPreferences::set_form_values({ categorycode => $categorycode } , $template); |
140 |
} |
146 |
} |
Lines 148-157
if ($op eq 'add_form') {
Link Here
|
148 |
if($input->param('enrolmentperioddate')){ |
154 |
if($input->param('enrolmentperioddate')){ |
149 |
$input->param('enrolmentperioddate' => C4::Dates::format_date_in_iso($input->param('enrolmentperioddate')) ); |
155 |
$input->param('enrolmentperioddate' => C4::Dates::format_date_in_iso($input->param('enrolmentperioddate')) ); |
150 |
} |
156 |
} |
151 |
|
157 |
|
152 |
if ($is_a_modif) { |
158 |
if ($is_a_modif) { |
153 |
my $sth=$dbh->prepare("UPDATE categories SET description=?,enrolmentperiod=?, enrolmentperioddate=?,upperagelimit=?,dateofbirthrequired=?,enrolmentfee=?,reservefee=?,hidelostitems=?,overduenoticerequired=?,category_type=? WHERE categorycode=?"); |
159 |
my $sth=$dbh->prepare("UPDATE categories SET description=?,enrolmentperiod=?, enrolmentperioddate=?,upperagelimit=?,dateofbirthrequired=?,enrolmentfee=?,reservefee=?,hidelostitems=?,overduenoticerequired=?,category_type=?,BlockExpiredOpacActions=? WHERE categorycode=?"); |
154 |
$sth->execute(map { $input->param($_) } ('description','enrolmentperiod','enrolmentperioddate','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','hidelostitems','overduenoticerequired','category_type','categorycode')); |
160 |
$sth->execute(map { $input->param($_) } ('description','enrolmentperiod','enrolmentperioddate','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','hidelostitems','overduenoticerequired','category_type','block_expired','categorycode')); |
155 |
my @branches = $input->param("branches"); |
161 |
my @branches = $input->param("branches"); |
156 |
if ( @branches ) { |
162 |
if ( @branches ) { |
157 |
$sth = $dbh->prepare("DELETE FROM categories_branches WHERE categorycode = ?"); |
163 |
$sth = $dbh->prepare("DELETE FROM categories_branches WHERE categorycode = ?"); |
Lines 170-177
if ($op eq 'add_form') {
Link Here
|
170 |
} |
176 |
} |
171 |
$sth->finish; |
177 |
$sth->finish; |
172 |
} else { |
178 |
} else { |
173 |
my $sth=$dbh->prepare("INSERT INTO categories (categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,reservefee,hidelostitems,overduenoticerequired,category_type) values (?,?,?,?,?,?,?,?,?,?,?)"); |
179 |
my $sth=$dbh->prepare("INSERT INTO categories (categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,reservefee,hidelostitems,overduenoticerequired,category_type,BlockExpiredOpacActions) values (?,?,?,?,?,?,?,?,?,?,?,?)"); |
174 |
$sth->execute(map { $input->param($_) } ('categorycode','description','enrolmentperiod','enrolmentperioddate','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','hidelostitems','overduenoticerequired','category_type')); |
180 |
$sth->execute(map { $input->param($_) } ('categorycode','description','enrolmentperiod','enrolmentperioddate','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','hidelostitems','overduenoticerequired','category_type','block_expired')); |
175 |
$sth->finish; |
181 |
$sth->finish; |
176 |
} |
182 |
} |
177 |
if (C4::Context->preference('EnhancedMessagingPreferences')) { |
183 |
if (C4::Context->preference('EnhancedMessagingPreferences')) { |
Lines 194-200
if ($op eq 'add_form') {
Link Here
|
194 |
$sth->finish; |
200 |
$sth->finish; |
195 |
$template->param(total => $total->{'total'}); |
201 |
$template->param(total => $total->{'total'}); |
196 |
|
202 |
|
197 |
my $sth2=$dbh->prepare("select categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,hidelostitems,overduenoticerequired,category_type from categories where categorycode=?"); |
203 |
my $sth2=$dbh->prepare("select categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,hidelostitems,overduenoticerequired,category_type,BlockExpiredOpacActions from categories where categorycode=?"); |
198 |
$sth2->execute($categorycode); |
204 |
$sth2->execute($categorycode); |
199 |
my $data=$sth2->fetchrow_hashref; |
205 |
my $data=$sth2->fetchrow_hashref; |
200 |
$sth2->finish; |
206 |
$sth2->finish; |
Lines 213-218
if ($op eq 'add_form') {
Link Here
|
213 |
reservefee => sprintf("%.2f",$data->{'reservefee'}), |
219 |
reservefee => sprintf("%.2f",$data->{'reservefee'}), |
214 |
hidelostitems => $data->{'hidelostitems'}, |
220 |
hidelostitems => $data->{'hidelostitems'}, |
215 |
category_type => $data->{'category_type'}, |
221 |
category_type => $data->{'category_type'}, |
|
|
222 |
"block_" . $data->{'BlockExpiredOpacActions'} == -1 ? 'syspref' : $data->{'BlockExpiredOpacActions'} ? 'block' : 'dontblock', |
216 |
); |
223 |
); |
217 |
# END $OP eq DELETE_CONFIRM |
224 |
# END $OP eq DELETE_CONFIRM |
218 |
################## DELETE_CONFIRMED ################################## |
225 |
################## DELETE_CONFIRMED ################################## |
Lines 229-279
if ($op eq 'add_form') {
Link Here
|
229 |
|
236 |
|
230 |
# END $OP eq DELETE_CONFIRMED |
237 |
# END $OP eq DELETE_CONFIRMED |
231 |
} else { # DEFAULT |
238 |
} else { # DEFAULT |
232 |
$template->param(else => 1); |
239 |
$template->param(else => 1); |
233 |
my @loop; |
240 |
my @loop; |
234 |
my ($count,$results)=StringSearch($searchfield,'web'); |
241 |
my ($count,$results) = StringSearch($searchfield,'web'); |
|
|
242 |
|
235 |
my $dbh = C4::Context->dbh; |
243 |
my $dbh = C4::Context->dbh; |
236 |
my $sth = $dbh->prepare("SELECT b.branchcode, b.branchname FROM categories_branches AS cb, branches AS b WHERE cb.branchcode = b.branchcode AND cb.categorycode = ?"); |
244 |
my $sth = $dbh->prepare("SELECT b.branchcode, b.branchname FROM categories_branches AS cb, branches AS b WHERE cb.branchcode = b.branchcode AND cb.categorycode = ?"); |
237 |
for (my $i=0; $i < $count; $i++){ |
245 |
|
|
|
246 |
for (my $i=0; $i < $count; $i++){ |
238 |
$sth->execute( $results->[$i]{'categorycode'} ); |
247 |
$sth->execute( $results->[$i]{'categorycode'} ); |
|
|
248 |
|
239 |
my @selected_branches; |
249 |
my @selected_branches; |
240 |
while ( my $branch = $sth->fetchrow_hashref ) { |
250 |
while ( my $branch = $sth->fetchrow_hashref ) { |
241 |
push @selected_branches, $branch; |
251 |
push @selected_branches, $branch; |
242 |
} |
252 |
} |
243 |
my %row = ( |
253 |
|
244 |
categorycode => $results->[$i]{'categorycode'}, |
254 |
my %row = ( |
245 |
description => $results->[$i]{'description'}, |
255 |
categorycode => $results->[$i]{'categorycode'}, |
246 |
enrolmentperiod => $results->[$i]{'enrolmentperiod'}, |
256 |
description => $results->[$i]{'description'}, |
247 |
enrolmentperioddate => C4::Dates::format_date($results->[$i]{'enrolmentperioddate'}), |
257 |
enrolmentperiod => $results->[$i]{'enrolmentperiod'}, |
248 |
upperagelimit => $results->[$i]{'upperagelimit'}, |
258 |
enrolmentperioddate => C4::Dates::format_date($results->[$i]{'enrolmentperioddate'}), |
249 |
dateofbirthrequired => $results->[$i]{'dateofbirthrequired'}, |
259 |
upperagelimit => $results->[$i]{'upperagelimit'}, |
250 |
enrolmentfee => sprintf("%.2f",$results->[$i]{'enrolmentfee'}), |
260 |
dateofbirthrequired => $results->[$i]{'dateofbirthrequired'}, |
251 |
overduenoticerequired => $results->[$i]{'overduenoticerequired'}, |
261 |
enrolmentfee => sprintf("%.2f",$results->[$i]{'enrolmentfee'}), |
252 |
issuelimit => $results->[$i]{'issuelimit'}, |
262 |
overduenoticerequired => $results->[$i]{'overduenoticerequired'}, |
253 |
reservefee => sprintf("%.2f",$results->[$i]{'reservefee'}), |
263 |
issuelimit => $results->[$i]{'issuelimit'}, |
254 |
hidelostitems => $results->[$i]{'hidelostitems'}, |
264 |
reservefee => sprintf("%.2f",$results->[$i]{'reservefee'}), |
255 |
category_type => $results->[$i]{'category_type'}, |
265 |
hidelostitems => $results->[$i]{'hidelostitems'}, |
256 |
"type_".$results->[$i]{'category_type'} => 1, |
266 |
category_type => $results->[$i]{'category_type'}, |
257 |
branches => \@selected_branches, |
267 |
block_syspref => 1, |
|
|
268 |
branches => \@selected_branches, |
269 |
"type_".$results->[$i]{'category_type'} => 1, |
258 |
); |
270 |
); |
|
|
271 |
|
259 |
if (C4::Context->preference('EnhancedMessagingPreferences')) { |
272 |
if (C4::Context->preference('EnhancedMessagingPreferences')) { |
260 |
my $brief_prefs = _get_brief_messaging_prefs($results->[$i]{'categorycode'}); |
273 |
my $brief_prefs = _get_brief_messaging_prefs($results->[$i]{'categorycode'}); |
261 |
$row{messaging_prefs} = $brief_prefs if @$brief_prefs; |
274 |
$row{messaging_prefs} = $brief_prefs if @$brief_prefs; |
262 |
} |
275 |
} |
263 |
push @loop, \%row; |
276 |
|
264 |
} |
277 |
push @loop, \%row; |
265 |
$template->param(loop => \@loop); |
278 |
} |
266 |
# check that I (institution) and C (child) exists. otherwise => warning to the user |
279 |
|
267 |
$sth=$dbh->prepare("select category_type from categories where category_type='C'"); |
280 |
$template->param(loop => \@loop); |
268 |
$sth->execute; |
281 |
# check that I (institution) and C (child) exists. otherwise => warning to the user |
269 |
my ($categoryChild) = $sth->fetchrow; |
282 |
|
270 |
$template->param(categoryChild => $categoryChild); |
283 |
$sth = $dbh->prepare("select category_type from categories where category_type='C'"); |
271 |
$sth=$dbh->prepare("select category_type from categories where category_type='I'"); |
284 |
$sth->execute; |
272 |
$sth->execute; |
285 |
my ($categoryChild) = $sth->fetchrow; |
273 |
my ($categoryInstitution) = $sth->fetchrow; |
286 |
$template->param(categoryChild => $categoryChild); |
274 |
$template->param(categoryInstitution => $categoryInstitution); |
|
|
275 |
$sth->finish; |
276 |
|
287 |
|
|
|
288 |
$sth = $dbh->prepare("select category_type from categories where category_type='I'"); |
289 |
$sth->execute; |
290 |
my ($categoryInstitution) = $sth->fetchrow; |
291 |
$template->param(categoryInstitution => $categoryInstitution); |
292 |
$sth->finish; |
277 |
|
293 |
|
278 |
} #---- END $OP eq DEFAULT |
294 |
} #---- END $OP eq DEFAULT |
279 |
output_html_with_http_headers $input, $cookie, $template->output; |
295 |
output_html_with_http_headers $input, $cookie, $template->output; |