From 2716acbb1155662613e788cc7babe024b128dc75 Mon Sep 17 00:00:00 2001 From: Paul POULAIN Date: Fri, 17 Aug 2007 18:07:21 +0200 Subject: [PATCH] loading template 1st to have userenv set + fixing javasccript bug + reindenting Signed-off-by: Chris Cormack --- C4/Bookseller.pm | 1 - .../intranet-tmpl/prog/en/serials/claims.tmpl | 319 +++++++++--------- serials/claims.pl | 22 +- 3 files changed, 167 insertions(+), 175 deletions(-) diff --git a/C4/Bookseller.pm b/C4/Bookseller.pm index f970774aaf..b30c1bfbb6 100755 --- a/C4/Bookseller.pm +++ b/C4/Bookseller.pm @@ -84,7 +84,6 @@ sub GetBookSeller { while ( my $data = $sth->fetchrow_hashref ) { $sth2->execute($data->{id}); ($data->{basketcount}) = $sth2->fetchrow(); - warn "COUNT : ".$data->{basketcount}; push( @results, $data ); } $sth->finish; diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl index 30d8ac30f8..4ebb2c8619 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl @@ -1,177 +1,170 @@ - -Koha › Subscription edit - - - - - - -
+ +
- -
+ +
-

Claims

- -

-

- - - Phone: - Fax: -

"> - -

-

- - Select Letter : - - - No Letter defined. Please Define One. The list of expected issues is displayed. - -

- - -" /> - - - -

Missing Issues

- - - - - - - - - - - - - - - - +

Claims

+

+ + + + Phone: + Fax: +

"> +

+

+ + Select Letter : + + + No Letter defined. Please Define One. The list of expected issues is displayed. + +

+ " /> + + +

Missing Issues

+
 SupplierTitleIssue numberStatus sortSince sortBegan Claim
- " onclick="document.claims.op='send_alert';" /> -
+ + + - - - - - - - - -
Claim - - - - - - - Waited - Arrived - Late - Missing - Claimed - - - - -
- -

Select a supplier

- - - -" /> + Supplier + Title + Issue number + Status sort + Since sort + Began Claim + + + + + + " onclick="javascript:document.claims.op.value='send_alert';" /> + + + + + + + + + + + + + Waited + Arrived + Late + Missing + Claimed + + + + + + + + + + + +

Select a supplier

+ - + " /> + &op=preview" onclick="popup(,''); return false" class="button">Supplier Group Claim Letter

--> - -


- - - - -

+ +


+ + + + - - - -


- - -
- - - Ph:
- - - Fax:
- - - Email:
- - - A/C:

- - -

Dear

- -

To whom it may concern

- -

The following items have not been received from you and are now considered missing:

- - - -

Missing Issues

- - - - - - - - - - - - - - - -
SupplierTitleIssue numberMissing since
- - - - - - - -
- + + + +


+ + +
+ + + Ph:
+ + + Fax:
+ + + Email:
+ + + A/C:

+ + +

Dear

+ +

To whom it may concern

+ +

The following items have not been received from you and are now considered missing:

+ + + +

Missing Issues

+ + + + + + + + + + + + + + + +
SupplierTitleIssue numberMissing since
+ + + + + + + +
+

Print   Close

diff --git a/serials/claims.pl b/serials/claims.pl index a96857ec59..87e597e823 100755 --- a/serials/claims.pl +++ b/serials/claims.pl @@ -20,6 +20,16 @@ my $order = $input->param('order'); my %supplierlist = GetSuppliersWithLateIssues; my @select_supplier; +# open template first (security & userenv set here) +my ($template, $loggedinuser, $cookie) += get_template_and_user({template_name => "serials/claims.tmpl", + query => $input, + type => "intranet", + authnotrequired => 0, + flagsrequired => {serials => 1}, + debug => 1, + }); + foreach my $supplierid (sort {$supplierlist{$a} cmp $supplierlist{$b} } keys %supplierlist){ my ($count, @dummy) = GetLateOrMissingIssues($supplierid,"",$order); my $counting = $count; @@ -33,7 +43,7 @@ foreach (keys %$letters){ push @letters ,{code=>$_,name=> $letters->{$_}}; } -my $letter=((scalar(@letters)>1)||($letters[0]->{name}||$letters[0]->{code})); +my $letter=((scalar(@letters)>1) || ($letters[0]->{name}||$letters[0]->{code})); my ($count2, @missingissues) = GetLateOrMissingIssues($supplierid,$serialid,$order) if $supplierid; my $CGIsupplier=CGI::scrolling_list( -name => 'supplierid', @@ -53,7 +63,6 @@ if($supplierid){ } } - my $preview=0; if($op eq 'preview'){ $preview = 1; @@ -66,15 +75,6 @@ if ($op eq "send_alert"){ ### $cntupdate SHOULD be equal to scalar(@$serialnums) } -my ($template, $loggedinuser, $cookie) -= get_template_and_user({template_name => "serials/claims.tmpl", - query => $input, - type => "intranet", - authnotrequired => 0, - flagsrequired => {serials => 1}, - debug => 1, - }); - $template->param('letters'=>\@letters,'letter'=>$letter); $template->param( order =>$order, -- 2.39.5