From 4d97bc7dbcd03ed4fe5676ef4f9e599b251aa088 Mon Sep 17 00:00:00 2001 From: sushi Date: Wed, 7 Jun 2006 19:14:06 +0000 Subject: [PATCH] perltidy before next commit. --- acqui/addorder.pl | 164 +++++++++++++++++++++++++++------------------- 1 file changed, 97 insertions(+), 67 deletions(-) diff --git a/acqui/addorder.pl b/acqui/addorder.pl index 6b2804c45b..d3aac75a9c 100755 --- a/acqui/addorder.pl +++ b/acqui/addorder.pl @@ -3,7 +3,6 @@ #script to add an order into the system #written 29/2/00 by chris@katipo.co.nz - # Copyright 2000-2002 Katipo Communications # # This file is part of Koha. @@ -36,46 +35,51 @@ use HTML::Template; #use Date::Manip; my $input = new CGI; + # get_template_and_user used only to check auth & get user id -my ($template, $loggedinuser, $cookie) - = get_template_and_user({template_name => "acqui/order.tmpl", - query => $input, - type => "intranet", - authnotrequired => 0, - flagsrequired => {acquisition => 1}, - debug => 1, - }); +my ( $template, $loggedinuser, $cookie ) = get_template_and_user( + { + template_name => "acqui/order.tmpl", + query => $input, + type => "intranet", + authnotrequired => 0, + flagsrequired => { acquisition => 1 }, + debug => 1, + } +); # get CGI parameters -my $ordnum=$input->param('ordnum'); -my $basketno=$input->param('basketno'); +my $ordnum = $input->param('ordnum'); +my $basketno = $input->param('basketno'); my $booksellerid = $input->param('booksellerid'); -my $existing=$input->param('existing'); # existing biblio, (not basket or order) -my $title=$input->param('title'); -my $author=$input->param('author'); -my $copyrightdate=$input->param('copyrightdate'); -my $isbn=$input->param('ISBN'); -my $itemtype=$input->param('format'); -my $quantity=$input->param('quantity'); -my $listprice=$input->param('list_price'); -if ($listprice eq ''){ - $listprice=0; +my $existing = + $input->param('existing'); # existing biblio, (not basket or order) +my $title = $input->param('title'); +my $author = $input->param('author'); +my $copyrightdate = $input->param('copyrightdate'); +my $isbn = $input->param('ISBN'); +my $itemtype = $input->param('format'); +my $quantity = $input->param('quantity'); +my $listprice = $input->param('list_price'); +if ( $listprice eq '' ) { + $listprice = 0; } -my $series=$input->param('Series'); +my $series = $input->param('Series'); + # my $supplier=$input->param('supplier'); -my $notes=$input->param('notes'); -my $bookfund=$input->param('bookfund'); -my $sort1=$input->param('sort1'); -my $sort2=$input->param('sort2'); -my $rrp=$input->param('rrp'); -my $ecost=$input->param('ecost'); -my $gst=$input->param('GST'); -my $budget=$input->param('budget'); -my $cost=$input->param('cost'); -my $sub=$input->param('sub'); -my $invoice=$input->param('invoice'); +my $notes = $input->param('notes'); +my $bookfund = $input->param('bookfund'); +my $sort1 = $input->param('sort1'); +my $sort2 = $input->param('sort2'); +my $rrp = $input->param('rrp'); +my $ecost = $input->param('ecost'); +my $gst = $input->param('GST'); +my $budget = $input->param('budget'); +my $cost = $input->param('cost'); +my $sub = $input->param('sub'); +my $invoice = $input->param('invoice'); my $publishercode = $input->param('publishercode'); -my $suggestionid= $input->param('suggestionid'); +my $suggestionid = $input->param('suggestionid'); # create, modify or delete biblio # create if $quantity>=0 and $existing='no' @@ -83,38 +87,64 @@ my $suggestionid= $input->param('suggestionid'); # delete if $quantity has been se to 0 by the librarian my $bibnum; my $bibitemnum; -if ($quantity ne '0'){ - #check to see if biblio exists - if ($existing eq 'no'){ - #if it doesnt create it - $bibnum = &newbiblio({ title => $title?$title:"", - author => $author?$author:"", - copyrightdate => $copyrightdate?$copyrightdate:"", - series => $series?$series:"", - }); - $bibitemnum = &newbiblioitem({ biblionumber => $bibnum, - itemtype => $itemtype?$itemtype:"", - isbn => $isbn?$isbn:"", - publishercode => $publishercode?$publishercode:"", - }); - # change suggestion status if applicable - if ($suggestionid) { - changestatus($suggestionid,'ORDERED','',$bibnum); - } - } else { - $bibnum=$input->param('biblio'); - $bibitemnum=$input->param('bibitemnum'); - my $oldtype=$input->param('oldtype'); - } - if ($ordnum) { -# warn "MODORDER $title / $ordnum / $quantity / $bookfund"; - modorder($title,$ordnum,$quantity,$listprice,$bibnum,$basketno,$booksellerid,$loggedinuser,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst,$budget,$cost,$invoice,$sort1,$sort2); - }else { -# warn "new order : "; - $basketno=neworder($basketno,$bibnum,$title,$quantity,$listprice,$booksellerid,$loggedinuser,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst,$budget,$cost,$sub,$invoice,$sort1,$sort2); - } -} else { - $bibnum=$input->param('biblio'); - delorder($bibnum,$ordnum); +if ( $quantity ne '0' ) { + + #check to see if biblio exists + if ( $existing eq 'no' ) { + + #if it doesnt create it + $bibnum = &newbiblio( + { + title => $title ? $title : "", + author => $author ? $author : "", + copyrightdate => $copyrightdate ? $copyrightdate : "", + series => $series ? $series : "", + } + ); + $bibitemnum = &newbiblioitem( + { + biblionumber => $bibnum, + itemtype => $itemtype ? $itemtype : "", + isbn => $isbn ? $isbn : "", + publishercode => $publishercode ? $publishercode : "", + } + ); + + # change suggestion status if applicable + if ($suggestionid) { + changestatus( $suggestionid, 'ORDERED', '', $bibnum ); + } + } + else { + $bibnum = $input->param('biblio'); + $bibitemnum = $input->param('bibitemnum'); + my $oldtype = $input->param('oldtype'); + } + if ($ordnum) { + + # warn "MODORDER $title / $ordnum / $quantity / $bookfund"; + modorder( + $title, $ordnum, $quantity, $listprice, + $bibnum, $basketno, $booksellerid, $loggedinuser, + $notes, $bookfund, $bibitemnum, $rrp, + $ecost, $gst, $budget, $cost, + $invoice, $sort1, $sort2 + ); + } + else { + + # warn "new order : "; + $basketno = neworder( + $basketno, $bibnum, $title, $quantity, + $listprice, $booksellerid, $loggedinuser, $notes, + $bookfund, $bibitemnum, $rrp, $ecost, + $gst, $budget, $cost, $sub, + $invoice, $sort1, $sort2 + ); + } +} +else { + $bibnum = $input->param('biblio'); + delorder( $bibnum, $ordnum ); } print $input->redirect("basket.pl?basket=$basketno"); -- 2.39.2