Lines 173-179
sub GetBasket {
Link Here
|
173 |
=head3 NewBasket |
173 |
=head3 NewBasket |
174 |
|
174 |
|
175 |
$basket = &NewBasket( $booksellerid, $authorizedby, $basketname, |
175 |
$basket = &NewBasket( $booksellerid, $authorizedby, $basketname, |
176 |
$basketnote, $basketbooksellernote, $basketcontractnumber ); |
176 |
$basketnote, $basketbooksellernote, $basketcontractnumber, $deliveryplace, $billingplace ); |
177 |
|
177 |
|
178 |
Create a new basket in aqbasket table |
178 |
Create a new basket in aqbasket table |
179 |
|
179 |
|
Lines 189-198
The other parameters are optional, see ModBasketHeader for more info on them.
Link Here
|
189 |
|
189 |
|
190 |
=cut |
190 |
=cut |
191 |
|
191 |
|
192 |
# FIXME : this function seems to be unused. |
|
|
193 |
|
194 |
sub NewBasket { |
192 |
sub NewBasket { |
195 |
my ( $booksellerid, $authorisedby, $basketname, $basketnote, $basketbooksellernote, $basketcontractnumber ) = @_; |
193 |
my ( $booksellerid, $authorisedby, $basketname, $basketnote, $basketbooksellernote, $basketcontractnumber, $deliveryplace, $billingplace ) = @_; |
196 |
my $dbh = C4::Context->dbh; |
194 |
my $dbh = C4::Context->dbh; |
197 |
my $query = " |
195 |
my $query = " |
198 |
INSERT INTO aqbasket |
196 |
INSERT INTO aqbasket |
Lines 203-209
sub NewBasket {
Link Here
|
203 |
$dbh->do($query); |
201 |
$dbh->do($query); |
204 |
#find & return basketno MYSQL dependant, but $dbh->last_insert_id always returns null :-( |
202 |
#find & return basketno MYSQL dependant, but $dbh->last_insert_id always returns null :-( |
205 |
my $basket = $dbh->{'mysql_insertid'}; |
203 |
my $basket = $dbh->{'mysql_insertid'}; |
206 |
ModBasketHeader($basket, $basketname || '', $basketnote || '', $basketbooksellernote || '', $basketcontractnumber || undef, $booksellerid); |
204 |
ModBasketHeader($basket, $basketname || '', $basketnote || '', $basketbooksellernote || '', $basketcontractnumber || undef, $booksellerid, $deliveryplace || undef, $billingplace || undef ); |
207 |
return $basket; |
205 |
return $basket; |
208 |
} |
206 |
} |
209 |
|
207 |
|
Lines 265-272
sub GetBasketAsCSV {
Link Here
|
265 |
notes => $order->{'notes'}, |
263 |
notes => $order->{'notes'}, |
266 |
quantity => $order->{'quantity'}, |
264 |
quantity => $order->{'quantity'}, |
267 |
rrp => $order->{'rrp'}, |
265 |
rrp => $order->{'rrp'}, |
268 |
deliveryplace => $basket->{'deliveryplace'}, |
266 |
deliveryplace => C4::Branch::GetBranchName( $basket->{'deliveryplace'} ), |
269 |
billingplace => $basket->{'billingplace'} |
267 |
billingplace => C4::Branch::GetBranchName( $basket->{'billingplace'} ), |
270 |
}; |
268 |
}; |
271 |
foreach(qw( |
269 |
foreach(qw( |
272 |
contractname author title publishercode collectiontitle notes |
270 |
contractname author title publishercode collectiontitle notes |
Lines 315-320
sub GetBasketGroupAsCSV {
Link Here
|
315 |
my @orders = GetOrders( $$basket{basketno} ); |
313 |
my @orders = GetOrders( $$basket{basketno} ); |
316 |
my $contract = GetContract( $$basket{contractnumber} ); |
314 |
my $contract = GetContract( $$basket{contractnumber} ); |
317 |
my $bookseller = GetBookSellerFromId( $$basket{booksellerid} ); |
315 |
my $bookseller = GetBookSellerFromId( $$basket{booksellerid} ); |
|
|
316 |
my $basketgroup = GetBasketgroup( $$basket{basketgroupid} ); |
318 |
|
317 |
|
319 |
foreach my $order (@orders) { |
318 |
foreach my $order (@orders) { |
320 |
my $bd = GetBiblioData( $order->{'biblionumber'} ); |
319 |
my $bd = GetBiblioData( $order->{'biblionumber'} ); |
Lines 339-344
sub GetBasketGroupAsCSV {
Link Here
|
339 |
booksellerpostal => $bookseller->{postal}, |
338 |
booksellerpostal => $bookseller->{postal}, |
340 |
contractnumber => $contract->{contractnumber}, |
339 |
contractnumber => $contract->{contractnumber}, |
341 |
contractname => $contract->{contractname}, |
340 |
contractname => $contract->{contractname}, |
|
|
341 |
basketgroupdeliveryplace => C4::Branch::GetBranchName( $basketgroup->{deliveryplace} ) || C4::Branch::GetBranchName( $basketgroup->{freedeliveryplace} ), |
342 |
basketgroupbillingplace => C4::Branch::GetBranchName( $basketgroup->{billingplace} ), |
343 |
basketdeliveryplace => C4::Branch::GetBranchName( $basket->{deliveryplace} ), |
344 |
basketbillingplace => C4::Branch::GetBranchName( $basket->{billingplace} ), |
342 |
}; |
345 |
}; |
343 |
foreach(qw( |
346 |
foreach(qw( |
344 |
basketname author title publishercode collectiontitle notes |
347 |
basketname author title publishercode collectiontitle notes |
Lines 486-502
Modifies a basket's header.
Link Here
|
486 |
|
489 |
|
487 |
=item C<$booksellerid> is the id (foreign) key in the "aqbooksellers" table for the vendor. |
490 |
=item C<$booksellerid> is the id (foreign) key in the "aqbooksellers" table for the vendor. |
488 |
|
491 |
|
|
|
492 |
=item C<$deliveryplace> is the "deliveryplace" field in the aqbasket table. |
493 |
|
494 |
=item C<$billingplace> is the "billingplace" field in the aqbasket table. |
495 |
|
489 |
=back |
496 |
=back |
490 |
|
497 |
|
491 |
=cut |
498 |
=cut |
492 |
|
499 |
|
493 |
sub ModBasketHeader { |
500 |
sub ModBasketHeader { |
494 |
my ($basketno, $basketname, $note, $booksellernote, $contractnumber, $booksellerid) = @_; |
501 |
my ($basketno, $basketname, $note, $booksellernote, $contractnumber, $booksellerid, $deliveryplace, $billingplace) = @_; |
|
|
502 |
my $query = qq{ |
503 |
UPDATE aqbasket |
504 |
SET basketname=?, note=?, booksellernote=?, booksellerid=?, deliveryplace=?, billingplace=? |
505 |
WHERE basketno=? |
506 |
}; |
495 |
|
507 |
|
496 |
my $query = "UPDATE aqbasket SET basketname=?, note=?, booksellernote=?, booksellerid=? WHERE basketno=?"; |
|
|
497 |
my $dbh = C4::Context->dbh; |
508 |
my $dbh = C4::Context->dbh; |
498 |
my $sth = $dbh->prepare($query); |
509 |
my $sth = $dbh->prepare($query); |
499 |
$sth->execute($basketname,$note,$booksellernote,$booksellerid,$basketno); |
510 |
$sth->execute($basketname, $note, $booksellernote, $booksellerid, $deliveryplace, $billingplace, $basketno); |
500 |
|
511 |
|
501 |
if ( $contractnumber ) { |
512 |
if ( $contractnumber ) { |
502 |
my $query2 ="UPDATE aqbasket SET contractnumber=? WHERE basketno=?"; |
513 |
my $query2 ="UPDATE aqbasket SET contractnumber=? WHERE basketno=?"; |