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 76-81
BEGIN {
Link Here
|
76 |
&GetItemnumbersFromOrder |
76 |
&GetItemnumbersFromOrder |
77 |
|
77 |
|
78 |
&AddClaim |
78 |
&AddClaim |
|
|
79 |
&GetBiblioCountByBasketno |
79 |
); |
80 |
); |
80 |
} |
81 |
} |
81 |
|
82 |
|
Lines 215-221
sub NewBasket {
Link Here
|
215 |
|
216 |
|
216 |
&CloseBasket($basketno); |
217 |
&CloseBasket($basketno); |
217 |
|
218 |
|
218 |
close a basket (becomes unmodifiable,except for recieves) |
219 |
close a basket (becomes unmodifiable, except for receives) |
219 |
|
220 |
|
220 |
=cut |
221 |
=cut |
221 |
|
222 |
|
Lines 229-234
sub CloseBasket {
Link Here
|
229 |
"; |
230 |
"; |
230 |
my $sth = $dbh->prepare($query); |
231 |
my $sth = $dbh->prepare($query); |
231 |
$sth->execute($basketno); |
232 |
$sth->execute($basketno); |
|
|
233 |
|
234 |
my @orders = GetOrders($basketno); |
235 |
foreach my $order (@orders) { |
236 |
$query = qq{ |
237 |
UPDATE aqorders |
238 |
SET orderstatus = 1 |
239 |
WHERE ordernumber = ?; |
240 |
}; |
241 |
$sth = $dbh->prepare($query); |
242 |
$sth->execute($order->{'ordernumber'}); |
243 |
} |
244 |
} |
245 |
|
246 |
=head3 ReopenBasket |
247 |
|
248 |
&ReopenBasket($basketno); |
249 |
|
250 |
reopen a basket |
251 |
|
252 |
=cut |
253 |
|
254 |
sub ReopenBasket { |
255 |
my ($basketno) = @_; |
256 |
my $dbh = C4::Context->dbh; |
257 |
my $query = " |
258 |
UPDATE aqbasket |
259 |
SET closedate=NULL |
260 |
WHERE basketno=? |
261 |
"; |
262 |
my $sth = $dbh->prepare($query); |
263 |
$sth->execute($basketno); |
264 |
|
265 |
my @orders = GetOrders($basketno); |
266 |
foreach my $order (@orders) { |
267 |
$query = qq{ |
268 |
UPDATE aqorders |
269 |
SET orderstatus = 0 |
270 |
WHERE ordernumber = ?; |
271 |
}; |
272 |
$sth = $dbh->prepare($query); |
273 |
$sth->execute($order->{'ordernumber'}); |
274 |
} |
232 |
} |
275 |
} |
233 |
|
276 |
|
234 |
#------------------------------------------------------------# |
277 |
#------------------------------------------------------------# |
Lines 468-473
sub ModBasket {
Link Here
|
468 |
my $dbh = C4::Context->dbh; |
511 |
my $dbh = C4::Context->dbh; |
469 |
my $sth = $dbh->prepare($query); |
512 |
my $sth = $dbh->prepare($query); |
470 |
$sth->execute(@params); |
513 |
$sth->execute(@params); |
|
|
514 |
|
471 |
$sth->finish; |
515 |
$sth->finish; |
472 |
} |
516 |
} |
473 |
|
517 |
|
Lines 1121-1127
The following keys are used: "biblionumber", "title", "basketno", "quantity", "n
Link Here
|
1121 |
|
1165 |
|
1122 |
sub NewOrder { |
1166 |
sub NewOrder { |
1123 |
my $orderinfo = shift; |
1167 |
my $orderinfo = shift; |
1124 |
#### ------------------------------ |
1168 |
my $parent_ordernumber = shift; |
|
|
1169 |
|
1125 |
my $dbh = C4::Context->dbh; |
1170 |
my $dbh = C4::Context->dbh; |
1126 |
my @params; |
1171 |
my @params; |
1127 |
|
1172 |
|
Lines 1348-1354
sub ModReceiveOrder {
Link Here
|
1348 |
# (entirely received) |
1393 |
# (entirely received) |
1349 |
$sth=$dbh->prepare(" |
1394 |
$sth=$dbh->prepare(" |
1350 |
UPDATE aqorders |
1395 |
UPDATE aqorders |
1351 |
SET quantity = ? |
1396 |
SET quantity = ?, |
|
|
1397 |
orderstatus = 2 |
1352 |
WHERE ordernumber = ? |
1398 |
WHERE ordernumber = ? |
1353 |
"); |
1399 |
"); |
1354 |
|
1400 |
|
Lines 1376-1382
sub ModReceiveOrder {
Link Here
|
1376 |
} else { |
1422 |
} else { |
1377 |
$sth=$dbh->prepare("update aqorders |
1423 |
$sth=$dbh->prepare("update aqorders |
1378 |
set quantityreceived=?,datereceived=?,invoiceid=?, |
1424 |
set quantityreceived=?,datereceived=?,invoiceid=?, |
1379 |
unitprice=?,rrp=?,ecost=? |
1425 |
unitprice=?,rrp=?,ecost=?,orderstatus=3 |
1380 |
where biblionumber=? and ordernumber=?"); |
1426 |
where biblionumber=? and ordernumber=?"); |
1381 |
$sth->execute($quantrec,$datereceived,$invoiceid,$cost,$rrp,$ecost,$biblionumber,$ordernumber); |
1427 |
$sth->execute($quantrec,$datereceived,$invoiceid,$cost,$rrp,$ecost,$biblionumber,$ordernumber); |
1382 |
$sth->finish; |
1428 |
$sth->finish; |
Lines 1426-1432
sub CancelReceipt {
Link Here
|
1426 |
UPDATE aqorders |
1472 |
UPDATE aqorders |
1427 |
SET quantityreceived = ?, |
1473 |
SET quantityreceived = ?, |
1428 |
datereceived = ?, |
1474 |
datereceived = ?, |
1429 |
invoiceid = ? |
1475 |
invoiceid = ?, |
|
|
1476 |
orderstatus = 1 |
1430 |
WHERE ordernumber = ? |
1477 |
WHERE ordernumber = ? |
1431 |
}; |
1478 |
}; |
1432 |
$sth = $dbh->prepare($query); |
1479 |
$sth = $dbh->prepare($query); |
Lines 1453-1459
sub CancelReceipt {
Link Here
|
1453 |
} |
1500 |
} |
1454 |
$query = qq{ |
1501 |
$query = qq{ |
1455 |
UPDATE aqorders |
1502 |
UPDATE aqorders |
1456 |
SET quantity = ? |
1503 |
SET quantity = ?, |
|
|
1504 |
orderstatus = 1 |
1457 |
WHERE ordernumber = ? |
1505 |
WHERE ordernumber = ? |
1458 |
}; |
1506 |
}; |
1459 |
$sth = $dbh->prepare($query); |
1507 |
$sth = $dbh->prepare($query); |
Lines 1593-1599
sub DelOrder {
Link Here
|
1593 |
my $dbh = C4::Context->dbh; |
1641 |
my $dbh = C4::Context->dbh; |
1594 |
my $query = " |
1642 |
my $query = " |
1595 |
UPDATE aqorders |
1643 |
UPDATE aqorders |
1596 |
SET datecancellationprinted=now() |
1644 |
SET datecancellationprinted=now(), orderstatus=4 |
1597 |
WHERE biblionumber=? AND ordernumber=? |
1645 |
WHERE biblionumber=? AND ordernumber=? |
1598 |
"; |
1646 |
"; |
1599 |
my $sth = $dbh->prepare($query); |
1647 |
my $sth = $dbh->prepare($query); |
Lines 2012-2017
sub GetHistory {
Link Here
|
2012 |
my $basket = $params{basket}; |
2060 |
my $basket = $params{basket}; |
2013 |
my $booksellerinvoicenumber = $params{booksellerinvoicenumber}; |
2061 |
my $booksellerinvoicenumber = $params{booksellerinvoicenumber}; |
2014 |
my $basketgroupname = $params{basketgroupname}; |
2062 |
my $basketgroupname = $params{basketgroupname}; |
|
|
2063 |
my $budget = $params{budget}; |
2064 |
my $orderstatus = $params{orderstatus}; |
2065 |
|
2015 |
my @order_loop; |
2066 |
my @order_loop; |
2016 |
my $total_qty = 0; |
2067 |
my $total_qty = 0; |
2017 |
my $total_qtyreceived = 0; |
2068 |
my $total_qtyreceived = 0; |
Lines 2020-2029
sub GetHistory {
Link Here
|
2020 |
my $dbh = C4::Context->dbh; |
2071 |
my $dbh = C4::Context->dbh; |
2021 |
my $query =" |
2072 |
my $query =" |
2022 |
SELECT |
2073 |
SELECT |
2023 |
biblio.title, |
2074 |
COALESCE(biblio.title, deletedbiblio.title) AS title, |
2024 |
biblio.author, |
2075 |
COALESCE(biblio.author, deletedbiblio.author) AS author, |
2025 |
biblioitems.isbn, |
2076 |
COALESCE(biblioitems.isbn, deletedbiblioitems.isbn) AS isbn, |
2026 |
biblioitems.ean, |
2077 |
COALESCE(biblioitems.ean, deletedbiblioitems.ean) AS ean, |
2027 |
aqorders.basketno, |
2078 |
aqorders.basketno, |
2028 |
aqbasket.basketname, |
2079 |
aqbasket.basketname, |
2029 |
aqbasket.basketgroupid, |
2080 |
aqbasket.basketgroupid, |
Lines 2038-2056
sub GetHistory {
Link Here
|
2038 |
aqorders.invoiceid, |
2089 |
aqorders.invoiceid, |
2039 |
aqinvoices.invoicenumber, |
2090 |
aqinvoices.invoicenumber, |
2040 |
aqbooksellers.id as id, |
2091 |
aqbooksellers.id as id, |
2041 |
aqorders.biblionumber |
2092 |
aqorders.biblionumber, |
|
|
2093 |
aqorders.orderstatus, |
2094 |
aqorders.parent_ordernumber, |
2095 |
aqbudgets.budget_name |
2096 |
"; |
2097 |
$query .= ", aqbudgets.budget_id AS budget" if defined $budget; |
2098 |
$query .= " |
2042 |
FROM aqorders |
2099 |
FROM aqorders |
2043 |
LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno |
2100 |
LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno |
2044 |
LEFT JOIN aqbasketgroups ON aqbasket.basketgroupid=aqbasketgroups.id |
2101 |
LEFT JOIN aqbasketgroups ON aqbasket.basketgroupid=aqbasketgroups.id |
2045 |
LEFT JOIN aqbooksellers ON aqbasket.booksellerid=aqbooksellers.id |
2102 |
LEFT JOIN aqbooksellers ON aqbasket.booksellerid=aqbooksellers.id |
2046 |
LEFT JOIN biblioitems ON biblioitems.biblionumber=aqorders.biblionumber |
2103 |
LEFT JOIN biblioitems ON biblioitems.biblionumber=aqorders.biblionumber |
2047 |
LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber |
2104 |
LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber |
2048 |
LEFT JOIN aqinvoices ON aqorders.invoiceid = aqinvoices.invoiceid"; |
2105 |
LEFT JOIN aqbudgets ON aqorders.budget_id=aqbudgets.budget_id |
|
|
2106 |
LEFT JOIN aqinvoices ON aqorders.invoiceid = aqinvoices.invoiceid |
2107 |
LEFT JOIN deletedbiblio ON deletedbiblio.biblionumber=aqorders.biblionumber |
2108 |
LEFT JOIN deletedbiblioitems ON deletedbiblioitems.biblionumber=aqorders.biblionumber |
2109 |
"; |
2049 |
|
2110 |
|
2050 |
$query .= " LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber" |
2111 |
if ( C4::Context->preference("IndependentBranches") ) { |
2051 |
if ( C4::Context->preference("IndependentBranches") ); |
2112 |
$query .= " LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber"; |
|
|
2113 |
} |
2052 |
|
2114 |
|
2053 |
$query .= " WHERE (datecancellationprinted is NULL or datecancellationprinted='0000-00-00') "; |
2115 |
$query .= " WHERE 1 "; |
|
|
2116 |
|
2117 |
$query .= " AND (datecancellationprinted is NULL or datecancellationprinted='0000-00-00') " if $orderstatus ne '4'; |
2054 |
|
2118 |
|
2055 |
my @query_params = (); |
2119 |
my @query_params = (); |
2056 |
|
2120 |
|
Lines 2069-2075
sub GetHistory {
Link Here
|
2069 |
$query .= " AND biblioitems.isbn LIKE ? "; |
2133 |
$query .= " AND biblioitems.isbn LIKE ? "; |
2070 |
push @query_params, "%$isbn%"; |
2134 |
push @query_params, "%$isbn%"; |
2071 |
} |
2135 |
} |
2072 |
if ( defined $ean and $ean ) { |
2136 |
if ( $ean ) { |
2073 |
$query .= " AND biblioitems.ean = ? "; |
2137 |
$query .= " AND biblioitems.ean = ? "; |
2074 |
push @query_params, "$ean"; |
2138 |
push @query_params, "$ean"; |
2075 |
} |
2139 |
} |
Lines 2078-2083
sub GetHistory {
Link Here
|
2078 |
push @query_params, "%$name%"; |
2142 |
push @query_params, "%$name%"; |
2079 |
} |
2143 |
} |
2080 |
|
2144 |
|
|
|
2145 |
if ( $budget ) { |
2146 |
$query .= " AND aqbudgets.budget_id = ? "; |
2147 |
push @query_params, "$budget"; |
2148 |
} |
2149 |
|
2081 |
if ( $from_placed_on ) { |
2150 |
if ( $from_placed_on ) { |
2082 |
$query .= " AND creationdate >= ? "; |
2151 |
$query .= " AND creationdate >= ? "; |
2083 |
push @query_params, $from_placed_on; |
2152 |
push @query_params, $from_placed_on; |
Lines 2088-2093
sub GetHistory {
Link Here
|
2088 |
push @query_params, $to_placed_on; |
2157 |
push @query_params, $to_placed_on; |
2089 |
} |
2158 |
} |
2090 |
|
2159 |
|
|
|
2160 |
if ( defined $orderstatus and $orderstatus ne '') { |
2161 |
$query .= " AND aqorders.orderstatus = ? "; |
2162 |
push @query_params, "$orderstatus"; |
2163 |
} |
2164 |
|
2091 |
if ($basket) { |
2165 |
if ($basket) { |
2092 |
if ($basket =~ m/^\d+$/) { |
2166 |
if ($basket =~ m/^\d+$/) { |
2093 |
$query .= " AND aqorders.basketno = ? "; |
2167 |
$query .= " AND aqorders.basketno = ? "; |
Lines 2123-2131
sub GetHistory {
Link Here
|
2123 |
$line->{count} = $cnt++; |
2197 |
$line->{count} = $cnt++; |
2124 |
$line->{toggle} = 1 if $cnt % 2; |
2198 |
$line->{toggle} = 1 if $cnt % 2; |
2125 |
push @order_loop, $line; |
2199 |
push @order_loop, $line; |
2126 |
$total_qty += $line->{'quantity'}; |
2200 |
$total_qty += ( $line->{quantity} ) ? $line->{quantity} : 0; |
2127 |
$total_qtyreceived += $line->{'quantityreceived'}; |
2201 |
$total_qtyreceived += ( $line->{quantityreceived} ) ? $line->{quantityreceived} : 0; |
2128 |
$total_price += $line->{'quantity'} * $line->{'ecost'}; |
2202 |
$total_price += ( $line->{quantity} and $line->{ecost} ) ? $line->{quantity} * $line->{ecost} : 0; |
2129 |
} |
2203 |
} |
2130 |
return \@order_loop, $total_qty, $total_price, $total_qtyreceived; |
2204 |
return \@order_loop, $total_qty, $total_price, $total_qtyreceived; |
2131 |
} |
2205 |
} |
Lines 2622-2627
sub DelInvoice {
Link Here
|
2622 |
return; |
2696 |
return; |
2623 |
} |
2697 |
} |
2624 |
|
2698 |
|
|
|
2699 |
=head3 GetBiblioCountByBasketno |
2700 |
|
2701 |
$biblio_count = &GetBiblioCountByBasketno($basketno); |
2702 |
|
2703 |
Looks up the biblio's count that has basketno value $basketno |
2704 |
|
2705 |
Returns a quantity |
2706 |
|
2707 |
=cut |
2708 |
|
2709 |
sub GetBiblioCountByBasketno { |
2710 |
my ($basketno) = @_; |
2711 |
my $dbh = C4::Context->dbh; |
2712 |
my $query = " |
2713 |
SELECT COUNT( DISTINCT( biblionumber ) ) |
2714 |
FROM aqorders |
2715 |
WHERE basketno = ? |
2716 |
AND (datecancellationprinted IS NULL OR datecancellationprinted='0000-00-00') |
2717 |
"; |
2718 |
|
2719 |
my $sth = $dbh->prepare($query); |
2720 |
$sth->execute($basketno); |
2721 |
return $sth->fetchrow; |
2722 |
} |
2723 |
|
2625 |
1; |
2724 |
1; |
2626 |
__END__ |
2725 |
__END__ |
2627 |
|
2726 |
|