|
Lines 28-34
use MARC::Record;
Link Here
|
| 28 |
use C4::Suggestions; |
28 |
use C4::Suggestions; |
| 29 |
use C4::Biblio; |
29 |
use C4::Biblio; |
| 30 |
use C4::Debug; |
30 |
use C4::Debug; |
| 31 |
use C4::SQLHelper qw(InsertInTable); |
31 |
use C4::SQLHelper qw(InsertInTable UpdateInTable); |
| 32 |
use C4::Bookseller qw(GetBookSellerFromId); |
32 |
use C4::Bookseller qw(GetBookSellerFromId); |
| 33 |
use C4::Templates qw(gettemplate); |
33 |
use C4::Templates qw(gettemplate); |
| 34 |
|
34 |
|
|
Lines 43-49
BEGIN {
Link Here
|
| 43 |
require Exporter; |
43 |
require Exporter; |
| 44 |
@ISA = qw(Exporter); |
44 |
@ISA = qw(Exporter); |
| 45 |
@EXPORT = qw( |
45 |
@EXPORT = qw( |
| 46 |
&GetBasket &NewBasket &CloseBasket &DelBasket &ModBasket |
46 |
&GetBasket &NewBasket &CloseBasket &ReopenBasket &DelBasket &ModBasket |
| 47 |
&GetBasketAsCSV &GetBasketGroupAsCSV |
47 |
&GetBasketAsCSV &GetBasketGroupAsCSV |
| 48 |
&GetBasketsByBookseller &GetBasketsByBasketgroup |
48 |
&GetBasketsByBookseller &GetBasketsByBasketgroup |
| 49 |
&GetBasketsInfosByBookseller |
49 |
&GetBasketsInfosByBookseller |
|
Lines 75-80
BEGIN {
Link Here
|
| 75 |
&GetItemnumbersFromOrder |
75 |
&GetItemnumbersFromOrder |
| 76 |
|
76 |
|
| 77 |
&AddClaim |
77 |
&AddClaim |
|
|
78 |
&GetBiblioCountByBasketno |
| 78 |
); |
79 |
); |
| 79 |
} |
80 |
} |
| 80 |
|
81 |
|
|
Lines 214-220
sub NewBasket {
Link Here
|
| 214 |
|
215 |
|
| 215 |
&CloseBasket($basketno); |
216 |
&CloseBasket($basketno); |
| 216 |
|
217 |
|
| 217 |
close a basket (becomes unmodifiable,except for recieves) |
218 |
close a basket (becomes unmodifiable, except for receives) |
| 218 |
|
219 |
|
| 219 |
=cut |
220 |
=cut |
| 220 |
|
221 |
|
|
Lines 228-233
sub CloseBasket {
Link Here
|
| 228 |
"; |
229 |
"; |
| 229 |
my $sth = $dbh->prepare($query); |
230 |
my $sth = $dbh->prepare($query); |
| 230 |
$sth->execute($basketno); |
231 |
$sth->execute($basketno); |
|
|
232 |
|
| 233 |
my @orders = GetOrders($basketno); |
| 234 |
foreach my $order (@orders) { |
| 235 |
$query = qq{ |
| 236 |
UPDATE aqorders |
| 237 |
SET orderstatus = 1 |
| 238 |
WHERE ordernumber = ?; |
| 239 |
}; |
| 240 |
$sth = $dbh->prepare($query); |
| 241 |
$sth->execute($order->{'ordernumber'}); |
| 242 |
} |
| 243 |
} |
| 244 |
|
| 245 |
=head3 ReopenBasket |
| 246 |
|
| 247 |
&ReopenBasket($basketno); |
| 248 |
|
| 249 |
reopen a basket |
| 250 |
|
| 251 |
=cut |
| 252 |
|
| 253 |
sub ReopenBasket { |
| 254 |
my ($basketno) = @_; |
| 255 |
my $dbh = C4::Context->dbh; |
| 256 |
my $query = " |
| 257 |
UPDATE aqbasket |
| 258 |
SET closedate=NULL |
| 259 |
WHERE basketno=? |
| 260 |
"; |
| 261 |
my $sth = $dbh->prepare($query); |
| 262 |
$sth->execute($basketno); |
| 263 |
|
| 264 |
my @orders = GetOrders($basketno); |
| 265 |
foreach my $order (@orders) { |
| 266 |
$query = qq{ |
| 267 |
UPDATE aqorders |
| 268 |
SET orderstatus = 0 |
| 269 |
WHERE ordernumber = ?; |
| 270 |
}; |
| 271 |
$sth = $dbh->prepare($query); |
| 272 |
$sth->execute($order->{'ordernumber'}); |
| 273 |
} |
| 231 |
} |
274 |
} |
| 232 |
|
275 |
|
| 233 |
#------------------------------------------------------------# |
276 |
#------------------------------------------------------------# |
|
Lines 467-472
sub ModBasket {
Link Here
|
| 467 |
my $dbh = C4::Context->dbh; |
510 |
my $dbh = C4::Context->dbh; |
| 468 |
my $sth = $dbh->prepare($query); |
511 |
my $sth = $dbh->prepare($query); |
| 469 |
$sth->execute(@params); |
512 |
$sth->execute(@params); |
|
|
513 |
|
| 470 |
$sth->finish; |
514 |
$sth->finish; |
| 471 |
} |
515 |
} |
| 472 |
|
516 |
|
|
Lines 1108-1114
The following keys are used: "biblionumber", "title", "basketno", "quantity", "n
Link Here
|
| 1108 |
|
1152 |
|
| 1109 |
sub NewOrder { |
1153 |
sub NewOrder { |
| 1110 |
my $orderinfo = shift; |
1154 |
my $orderinfo = shift; |
| 1111 |
#### ------------------------------ |
1155 |
my $parent_ordernumber = shift; |
|
|
1156 |
|
| 1112 |
my $dbh = C4::Context->dbh; |
1157 |
my $dbh = C4::Context->dbh; |
| 1113 |
my @params; |
1158 |
my @params; |
| 1114 |
|
1159 |
|
|
Lines 1381-1386
sub ModReceiveOrder {
Link Here
|
| 1381 |
$sth=$dbh->prepare(" |
1426 |
$sth=$dbh->prepare(" |
| 1382 |
UPDATE aqorders |
1427 |
UPDATE aqorders |
| 1383 |
SET quantity = ? |
1428 |
SET quantity = ? |
|
|
1429 |
ordernumber = 2 |
| 1384 |
WHERE ordernumber = ? |
1430 |
WHERE ordernumber = ? |
| 1385 |
"); |
1431 |
"); |
| 1386 |
|
1432 |
|
|
Lines 1407-1413
sub ModReceiveOrder {
Link Here
|
| 1407 |
} else { |
1453 |
} else { |
| 1408 |
$sth=$dbh->prepare("update aqorders |
1454 |
$sth=$dbh->prepare("update aqorders |
| 1409 |
set quantityreceived=?,datereceived=?,invoiceid=?, |
1455 |
set quantityreceived=?,datereceived=?,invoiceid=?, |
| 1410 |
unitprice=?,rrp=?,ecost=? |
1456 |
unitprice=?,rrp=?,ecost=?,orderstatus=3 |
| 1411 |
where biblionumber=? and ordernumber=?"); |
1457 |
where biblionumber=? and ordernumber=?"); |
| 1412 |
$sth->execute($quantrec,$datereceived,$invoiceid,$cost,$rrp,$ecost,$biblionumber,$ordernumber); |
1458 |
$sth->execute($quantrec,$datereceived,$invoiceid,$cost,$rrp,$ecost,$biblionumber,$ordernumber); |
| 1413 |
$sth->finish; |
1459 |
$sth->finish; |
|
Lines 1624-1630
sub DelOrder {
Link Here
|
| 1624 |
my $dbh = C4::Context->dbh; |
1670 |
my $dbh = C4::Context->dbh; |
| 1625 |
my $query = " |
1671 |
my $query = " |
| 1626 |
UPDATE aqorders |
1672 |
UPDATE aqorders |
| 1627 |
SET datecancellationprinted=now() |
1673 |
SET datecancellationprinted=now(), orderstatus=4 |
| 1628 |
WHERE biblionumber=? AND ordernumber=? |
1674 |
WHERE biblionumber=? AND ordernumber=? |
| 1629 |
"; |
1675 |
"; |
| 1630 |
my $sth = $dbh->prepare($query); |
1676 |
my $sth = $dbh->prepare($query); |
|
Lines 1985-1990
sub GetHistory {
Link Here
|
| 1985 |
my $basket = $params{basket}; |
2031 |
my $basket = $params{basket}; |
| 1986 |
my $booksellerinvoicenumber = $params{booksellerinvoicenumber}; |
2032 |
my $booksellerinvoicenumber = $params{booksellerinvoicenumber}; |
| 1987 |
my $basketgroupname = $params{basketgroupname}; |
2033 |
my $basketgroupname = $params{basketgroupname}; |
|
|
2034 |
my $budget = $params{budget}; |
| 2035 |
my $orderstatus = $params{orderstatus}; |
| 2036 |
|
| 1988 |
my @order_loop; |
2037 |
my @order_loop; |
| 1989 |
my $total_qty = 0; |
2038 |
my $total_qty = 0; |
| 1990 |
my $total_qtyreceived = 0; |
2039 |
my $total_qtyreceived = 0; |
|
Lines 1993-2002
sub GetHistory {
Link Here
|
| 1993 |
my $dbh = C4::Context->dbh; |
2042 |
my $dbh = C4::Context->dbh; |
| 1994 |
my $query =" |
2043 |
my $query =" |
| 1995 |
SELECT |
2044 |
SELECT |
| 1996 |
biblio.title, |
2045 |
COALESCE(biblio.title, deletedbiblio.title) AS title, |
| 1997 |
biblio.author, |
2046 |
COALESCE(biblio.author, deletedbiblio.author) AS author, |
| 1998 |
biblioitems.isbn, |
2047 |
COALESCE(biblioitems.isbn, deletedbiblioitems.isbn) AS isbn, |
| 1999 |
biblioitems.ean, |
2048 |
COALESCE(biblioitems.ean, deletedbiblioitems.ean) AS ean, |
| 2000 |
aqorders.basketno, |
2049 |
aqorders.basketno, |
| 2001 |
aqbasket.basketname, |
2050 |
aqbasket.basketname, |
| 2002 |
aqbasket.basketgroupid, |
2051 |
aqbasket.basketgroupid, |
|
Lines 2010-2028
sub GetHistory {
Link Here
|
| 2010 |
aqorders.ordernumber, |
2059 |
aqorders.ordernumber, |
| 2011 |
aqinvoices.invoicenumber, |
2060 |
aqinvoices.invoicenumber, |
| 2012 |
aqbooksellers.id as id, |
2061 |
aqbooksellers.id as id, |
| 2013 |
aqorders.biblionumber |
2062 |
aqorders.biblionumber, |
|
|
2063 |
aqorders.orderstatus, |
| 2064 |
aqorders.parent_ordernumber, |
| 2065 |
aqbudgets.budget_name |
| 2066 |
"; |
| 2067 |
$query .= ", aqbudgets.budget_id AS budget" if defined $budget; |
| 2068 |
$query .= " |
| 2014 |
FROM aqorders |
2069 |
FROM aqorders |
| 2015 |
LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno |
2070 |
LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno |
| 2016 |
LEFT JOIN aqbasketgroups ON aqbasket.basketgroupid=aqbasketgroups.id |
2071 |
LEFT JOIN aqbasketgroups ON aqbasket.basketgroupid=aqbasketgroups.id |
| 2017 |
LEFT JOIN aqbooksellers ON aqbasket.booksellerid=aqbooksellers.id |
2072 |
LEFT JOIN aqbooksellers ON aqbasket.booksellerid=aqbooksellers.id |
| 2018 |
LEFT JOIN biblioitems ON biblioitems.biblionumber=aqorders.biblionumber |
2073 |
LEFT JOIN biblioitems ON biblioitems.biblionumber=aqorders.biblionumber |
| 2019 |
LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber |
2074 |
LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber |
| 2020 |
LEFT JOIN aqinvoices ON aqorders.invoiceid = aqinvoices.invoiceid"; |
2075 |
LEFT JOIN aqbudgets ON aqorders.budget_id=aqbudgets.budget_id |
|
|
2076 |
LEFT JOIN aqinvoices ON aqorders.invoiceid = aqinvoices.invoiceid |
| 2077 |
LEFT JOIN deletedbiblio ON deletedbiblio.biblionumber=aqorders.biblionumber |
| 2078 |
LEFT JOIN deletedbiblioitems ON deletedbiblioitems.biblionumber=aqorders.biblionumber |
| 2079 |
"; |
| 2080 |
|
| 2081 |
if ( C4::Context->preference("IndependantBranches") ) { |
| 2082 |
$query .= " LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber"; |
| 2083 |
} |
| 2021 |
|
2084 |
|
| 2022 |
$query .= " LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber" |
2085 |
$query .= " WHERE 1 "; |
| 2023 |
if ( C4::Context->preference("IndependantBranches") ); |
|
|
| 2024 |
|
2086 |
|
| 2025 |
$query .= " WHERE (datecancellationprinted is NULL or datecancellationprinted='0000-00-00') "; |
2087 |
$query .= " AND (datecancellationprinted is NULL or datecancellationprinted='0000-00-00') " if $orderstatus ne '4'; |
| 2026 |
|
2088 |
|
| 2027 |
my @query_params = (); |
2089 |
my @query_params = (); |
| 2028 |
|
2090 |
|
|
Lines 2041-2047
sub GetHistory {
Link Here
|
| 2041 |
$query .= " AND biblioitems.isbn LIKE ? "; |
2103 |
$query .= " AND biblioitems.isbn LIKE ? "; |
| 2042 |
push @query_params, "%$isbn%"; |
2104 |
push @query_params, "%$isbn%"; |
| 2043 |
} |
2105 |
} |
| 2044 |
if ( defined $ean and $ean ) { |
2106 |
if ( $ean ) { |
| 2045 |
$query .= " AND biblioitems.ean = ? "; |
2107 |
$query .= " AND biblioitems.ean = ? "; |
| 2046 |
push @query_params, "$ean"; |
2108 |
push @query_params, "$ean"; |
| 2047 |
} |
2109 |
} |
|
Lines 2050-2055
sub GetHistory {
Link Here
|
| 2050 |
push @query_params, "%$name%"; |
2112 |
push @query_params, "%$name%"; |
| 2051 |
} |
2113 |
} |
| 2052 |
|
2114 |
|
|
|
2115 |
if ( $budget ) { |
| 2116 |
$query .= " AND aqbudgets.budget_id = ? "; |
| 2117 |
push @query_params, "$budget"; |
| 2118 |
} |
| 2119 |
|
| 2053 |
if ( $from_placed_on ) { |
2120 |
if ( $from_placed_on ) { |
| 2054 |
$query .= " AND creationdate >= ? "; |
2121 |
$query .= " AND creationdate >= ? "; |
| 2055 |
push @query_params, $from_placed_on; |
2122 |
push @query_params, $from_placed_on; |
|
Lines 2060-2065
sub GetHistory {
Link Here
|
| 2060 |
push @query_params, $to_placed_on; |
2127 |
push @query_params, $to_placed_on; |
| 2061 |
} |
2128 |
} |
| 2062 |
|
2129 |
|
|
|
2130 |
if ( defined $orderstatus and $orderstatus ne '') { |
| 2131 |
$query .= " AND aqorders.orderstatus = ? "; |
| 2132 |
push @query_params, "$orderstatus"; |
| 2133 |
} |
| 2134 |
|
| 2063 |
if ($basket) { |
2135 |
if ($basket) { |
| 2064 |
if ($basket =~ m/^\d+$/) { |
2136 |
if ($basket =~ m/^\d+$/) { |
| 2065 |
$query .= " AND aqorders.basketno = ? "; |
2137 |
$query .= " AND aqorders.basketno = ? "; |
|
Lines 2095-2103
sub GetHistory {
Link Here
|
| 2095 |
$line->{count} = $cnt++; |
2167 |
$line->{count} = $cnt++; |
| 2096 |
$line->{toggle} = 1 if $cnt % 2; |
2168 |
$line->{toggle} = 1 if $cnt % 2; |
| 2097 |
push @order_loop, $line; |
2169 |
push @order_loop, $line; |
| 2098 |
$total_qty += $line->{'quantity'}; |
2170 |
$total_qty += ( $line->{quantity} ) ? $line->{quantity} : 0; |
| 2099 |
$total_qtyreceived += $line->{'quantityreceived'}; |
2171 |
$total_qtyreceived += ( $line->{quantityreceived} ) ? $line->{quantityreceived} : 0; |
| 2100 |
$total_price += $line->{'quantity'} * $line->{'ecost'}; |
2172 |
$total_price += ( $line->{quantity} and $line->{ecost} ) ? $line->{quantity} * $line->{ecost} : 0; |
| 2101 |
} |
2173 |
} |
| 2102 |
return \@order_loop, $total_qty, $total_price, $total_qtyreceived; |
2174 |
return \@order_loop, $total_qty, $total_price, $total_qtyreceived; |
| 2103 |
} |
2175 |
} |
|
Lines 2561-2566
sub ReopenInvoice {
Link Here
|
| 2561 |
$sth->execute($invoiceid); |
2633 |
$sth->execute($invoiceid); |
| 2562 |
} |
2634 |
} |
| 2563 |
|
2635 |
|
|
|
2636 |
=head3 GetBiblioCountByBasketno |
| 2637 |
|
| 2638 |
$biblio_count = &GetBiblioCountByBasketno($basketno); |
| 2639 |
|
| 2640 |
Looks up the biblio's count that has basketno value $basketno |
| 2641 |
|
| 2642 |
Returns a quantity |
| 2643 |
|
| 2644 |
=cut |
| 2645 |
|
| 2646 |
sub GetBiblioCountByBasketno { |
| 2647 |
my ($basketno) = @_; |
| 2648 |
my $dbh = C4::Context->dbh; |
| 2649 |
my $query = " |
| 2650 |
SELECT COUNT( DISTINCT( biblionumber ) ) |
| 2651 |
FROM aqorders |
| 2652 |
WHERE basketno = ? |
| 2653 |
AND (datecancellationprinted IS NULL OR datecancellationprinted='0000-00-00') |
| 2654 |
"; |
| 2655 |
|
| 2656 |
my $sth = $dbh->prepare($query); |
| 2657 |
$sth->execute($basketno); |
| 2658 |
return $sth->fetchrow; |
| 2659 |
} |
| 2660 |
|
| 2564 |
1; |
2661 |
1; |
| 2565 |
__END__ |
2662 |
__END__ |
| 2566 |
|
2663 |
|