|
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 1146-1152
The following keys are used: "biblionumber", "title", "basketno", "quantity", "n
Link Here
|
| 1146 |
|
1190 |
|
| 1147 |
sub NewOrder { |
1191 |
sub NewOrder { |
| 1148 |
my $orderinfo = shift; |
1192 |
my $orderinfo = shift; |
| 1149 |
#### ------------------------------ |
1193 |
my $parent_ordernumber = shift; |
|
|
1194 |
|
| 1150 |
my $dbh = C4::Context->dbh; |
1195 |
my $dbh = C4::Context->dbh; |
| 1151 |
my @params; |
1196 |
my @params; |
| 1152 |
|
1197 |
|
|
Lines 1421-1427
sub ModReceiveOrder {
Link Here
|
| 1421 |
# (entirely received) |
1466 |
# (entirely received) |
| 1422 |
$sth=$dbh->prepare(" |
1467 |
$sth=$dbh->prepare(" |
| 1423 |
UPDATE aqorders |
1468 |
UPDATE aqorders |
| 1424 |
SET quantity = ? |
1469 |
SET quantity = ?, |
|
|
1470 |
orderstatus = 2 |
| 1425 |
WHERE ordernumber = ? |
1471 |
WHERE ordernumber = ? |
| 1426 |
"); |
1472 |
"); |
| 1427 |
|
1473 |
|
|
Lines 1448-1454
sub ModReceiveOrder {
Link Here
|
| 1448 |
} else { |
1494 |
} else { |
| 1449 |
$sth=$dbh->prepare("update aqorders |
1495 |
$sth=$dbh->prepare("update aqorders |
| 1450 |
set quantityreceived=?,datereceived=?,invoiceid=?, |
1496 |
set quantityreceived=?,datereceived=?,invoiceid=?, |
| 1451 |
unitprice=?,rrp=?,ecost=? |
1497 |
unitprice=?,rrp=?,ecost=?,orderstatus=3 |
| 1452 |
where biblionumber=? and ordernumber=?"); |
1498 |
where biblionumber=? and ordernumber=?"); |
| 1453 |
$sth->execute($quantrec,$datereceived,$invoiceid,$cost,$rrp,$ecost,$biblionumber,$ordernumber); |
1499 |
$sth->execute($quantrec,$datereceived,$invoiceid,$cost,$rrp,$ecost,$biblionumber,$ordernumber); |
| 1454 |
$sth->finish; |
1500 |
$sth->finish; |
|
Lines 1498-1504
sub CancelReceipt {
Link Here
|
| 1498 |
UPDATE aqorders |
1544 |
UPDATE aqorders |
| 1499 |
SET quantityreceived = ?, |
1545 |
SET quantityreceived = ?, |
| 1500 |
datereceived = ?, |
1546 |
datereceived = ?, |
| 1501 |
invoiceid = ? |
1547 |
invoiceid = ?, |
|
|
1548 |
orderstatus = 1 |
| 1502 |
WHERE ordernumber = ? |
1549 |
WHERE ordernumber = ? |
| 1503 |
}; |
1550 |
}; |
| 1504 |
$sth = $dbh->prepare($query); |
1551 |
$sth = $dbh->prepare($query); |
|
Lines 1525-1531
sub CancelReceipt {
Link Here
|
| 1525 |
} |
1572 |
} |
| 1526 |
$query = qq{ |
1573 |
$query = qq{ |
| 1527 |
UPDATE aqorders |
1574 |
UPDATE aqorders |
| 1528 |
SET quantity = ? |
1575 |
SET quantity = ?, |
|
|
1576 |
orderstatus = 1 |
| 1529 |
WHERE ordernumber = ? |
1577 |
WHERE ordernumber = ? |
| 1530 |
}; |
1578 |
}; |
| 1531 |
$sth = $dbh->prepare($query); |
1579 |
$sth = $dbh->prepare($query); |
|
Lines 1665-1671
sub DelOrder {
Link Here
|
| 1665 |
my $dbh = C4::Context->dbh; |
1713 |
my $dbh = C4::Context->dbh; |
| 1666 |
my $query = " |
1714 |
my $query = " |
| 1667 |
UPDATE aqorders |
1715 |
UPDATE aqorders |
| 1668 |
SET datecancellationprinted=now() |
1716 |
SET datecancellationprinted=now(), orderstatus=4 |
| 1669 |
WHERE biblionumber=? AND ordernumber=? |
1717 |
WHERE biblionumber=? AND ordernumber=? |
| 1670 |
"; |
1718 |
"; |
| 1671 |
my $sth = $dbh->prepare($query); |
1719 |
my $sth = $dbh->prepare($query); |
|
Lines 2026-2031
sub GetHistory {
Link Here
|
| 2026 |
my $basket = $params{basket}; |
2074 |
my $basket = $params{basket}; |
| 2027 |
my $booksellerinvoicenumber = $params{booksellerinvoicenumber}; |
2075 |
my $booksellerinvoicenumber = $params{booksellerinvoicenumber}; |
| 2028 |
my $basketgroupname = $params{basketgroupname}; |
2076 |
my $basketgroupname = $params{basketgroupname}; |
|
|
2077 |
my $budget = $params{budget}; |
| 2078 |
my $orderstatus = $params{orderstatus}; |
| 2079 |
|
| 2029 |
my @order_loop; |
2080 |
my @order_loop; |
| 2030 |
my $total_qty = 0; |
2081 |
my $total_qty = 0; |
| 2031 |
my $total_qtyreceived = 0; |
2082 |
my $total_qtyreceived = 0; |
|
Lines 2034-2043
sub GetHistory {
Link Here
|
| 2034 |
my $dbh = C4::Context->dbh; |
2085 |
my $dbh = C4::Context->dbh; |
| 2035 |
my $query =" |
2086 |
my $query =" |
| 2036 |
SELECT |
2087 |
SELECT |
| 2037 |
biblio.title, |
2088 |
COALESCE(biblio.title, deletedbiblio.title) AS title, |
| 2038 |
biblio.author, |
2089 |
COALESCE(biblio.author, deletedbiblio.author) AS author, |
| 2039 |
biblioitems.isbn, |
2090 |
COALESCE(biblioitems.isbn, deletedbiblioitems.isbn) AS isbn, |
| 2040 |
biblioitems.ean, |
2091 |
COALESCE(biblioitems.ean, deletedbiblioitems.ean) AS ean, |
| 2041 |
aqorders.basketno, |
2092 |
aqorders.basketno, |
| 2042 |
aqbasket.basketname, |
2093 |
aqbasket.basketname, |
| 2043 |
aqbasket.basketgroupid, |
2094 |
aqbasket.basketgroupid, |
|
Lines 2052-2070
sub GetHistory {
Link Here
|
| 2052 |
aqorders.invoiceid, |
2103 |
aqorders.invoiceid, |
| 2053 |
aqinvoices.invoicenumber, |
2104 |
aqinvoices.invoicenumber, |
| 2054 |
aqbooksellers.id as id, |
2105 |
aqbooksellers.id as id, |
| 2055 |
aqorders.biblionumber |
2106 |
aqorders.biblionumber, |
|
|
2107 |
aqorders.orderstatus, |
| 2108 |
aqorders.parent_ordernumber, |
| 2109 |
aqbudgets.budget_name |
| 2110 |
"; |
| 2111 |
$query .= ", aqbudgets.budget_id AS budget" if defined $budget; |
| 2112 |
$query .= " |
| 2056 |
FROM aqorders |
2113 |
FROM aqorders |
| 2057 |
LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno |
2114 |
LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno |
| 2058 |
LEFT JOIN aqbasketgroups ON aqbasket.basketgroupid=aqbasketgroups.id |
2115 |
LEFT JOIN aqbasketgroups ON aqbasket.basketgroupid=aqbasketgroups.id |
| 2059 |
LEFT JOIN aqbooksellers ON aqbasket.booksellerid=aqbooksellers.id |
2116 |
LEFT JOIN aqbooksellers ON aqbasket.booksellerid=aqbooksellers.id |
| 2060 |
LEFT JOIN biblioitems ON biblioitems.biblionumber=aqorders.biblionumber |
2117 |
LEFT JOIN biblioitems ON biblioitems.biblionumber=aqorders.biblionumber |
| 2061 |
LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber |
2118 |
LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber |
| 2062 |
LEFT JOIN aqinvoices ON aqorders.invoiceid = aqinvoices.invoiceid"; |
2119 |
LEFT JOIN aqbudgets ON aqorders.budget_id=aqbudgets.budget_id |
|
|
2120 |
LEFT JOIN aqinvoices ON aqorders.invoiceid = aqinvoices.invoiceid |
| 2121 |
LEFT JOIN deletedbiblio ON deletedbiblio.biblionumber=aqorders.biblionumber |
| 2122 |
LEFT JOIN deletedbiblioitems ON deletedbiblioitems.biblionumber=aqorders.biblionumber |
| 2123 |
"; |
| 2124 |
|
| 2125 |
if ( C4::Context->preference("IndependentBranches") ) { |
| 2126 |
$query .= " LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber"; |
| 2127 |
} |
| 2063 |
|
2128 |
|
| 2064 |
$query .= " LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber" |
2129 |
$query .= " WHERE 1 "; |
| 2065 |
if ( C4::Context->preference("IndependentBranches") ); |
|
|
| 2066 |
|
2130 |
|
| 2067 |
$query .= " WHERE (datecancellationprinted is NULL or datecancellationprinted='0000-00-00') "; |
2131 |
$query .= " AND (datecancellationprinted is NULL or datecancellationprinted='0000-00-00') " if $orderstatus ne '4'; |
| 2068 |
|
2132 |
|
| 2069 |
my @query_params = (); |
2133 |
my @query_params = (); |
| 2070 |
|
2134 |
|
|
Lines 2083-2089
sub GetHistory {
Link Here
|
| 2083 |
$query .= " AND biblioitems.isbn LIKE ? "; |
2147 |
$query .= " AND biblioitems.isbn LIKE ? "; |
| 2084 |
push @query_params, "%$isbn%"; |
2148 |
push @query_params, "%$isbn%"; |
| 2085 |
} |
2149 |
} |
| 2086 |
if ( defined $ean and $ean ) { |
2150 |
if ( $ean ) { |
| 2087 |
$query .= " AND biblioitems.ean = ? "; |
2151 |
$query .= " AND biblioitems.ean = ? "; |
| 2088 |
push @query_params, "$ean"; |
2152 |
push @query_params, "$ean"; |
| 2089 |
} |
2153 |
} |
|
Lines 2092-2097
sub GetHistory {
Link Here
|
| 2092 |
push @query_params, "%$name%"; |
2156 |
push @query_params, "%$name%"; |
| 2093 |
} |
2157 |
} |
| 2094 |
|
2158 |
|
|
|
2159 |
if ( $budget ) { |
| 2160 |
$query .= " AND aqbudgets.budget_id = ? "; |
| 2161 |
push @query_params, "$budget"; |
| 2162 |
} |
| 2163 |
|
| 2095 |
if ( $from_placed_on ) { |
2164 |
if ( $from_placed_on ) { |
| 2096 |
$query .= " AND creationdate >= ? "; |
2165 |
$query .= " AND creationdate >= ? "; |
| 2097 |
push @query_params, $from_placed_on; |
2166 |
push @query_params, $from_placed_on; |
|
Lines 2102-2107
sub GetHistory {
Link Here
|
| 2102 |
push @query_params, $to_placed_on; |
2171 |
push @query_params, $to_placed_on; |
| 2103 |
} |
2172 |
} |
| 2104 |
|
2173 |
|
|
|
2174 |
if ( defined $orderstatus and $orderstatus ne '') { |
| 2175 |
$query .= " AND aqorders.orderstatus = ? "; |
| 2176 |
push @query_params, "$orderstatus"; |
| 2177 |
} |
| 2178 |
|
| 2105 |
if ($basket) { |
2179 |
if ($basket) { |
| 2106 |
if ($basket =~ m/^\d+$/) { |
2180 |
if ($basket =~ m/^\d+$/) { |
| 2107 |
$query .= " AND aqorders.basketno = ? "; |
2181 |
$query .= " AND aqorders.basketno = ? "; |
|
Lines 2137-2145
sub GetHistory {
Link Here
|
| 2137 |
$line->{count} = $cnt++; |
2211 |
$line->{count} = $cnt++; |
| 2138 |
$line->{toggle} = 1 if $cnt % 2; |
2212 |
$line->{toggle} = 1 if $cnt % 2; |
| 2139 |
push @order_loop, $line; |
2213 |
push @order_loop, $line; |
| 2140 |
$total_qty += $line->{'quantity'}; |
2214 |
$total_qty += ( $line->{quantity} ) ? $line->{quantity} : 0; |
| 2141 |
$total_qtyreceived += $line->{'quantityreceived'}; |
2215 |
$total_qtyreceived += ( $line->{quantityreceived} ) ? $line->{quantityreceived} : 0; |
| 2142 |
$total_price += $line->{'quantity'} * $line->{'ecost'}; |
2216 |
$total_price += ( $line->{quantity} and $line->{ecost} ) ? $line->{quantity} * $line->{ecost} : 0; |
| 2143 |
} |
2217 |
} |
| 2144 |
return \@order_loop, $total_qty, $total_price, $total_qtyreceived; |
2218 |
return \@order_loop, $total_qty, $total_price, $total_qtyreceived; |
| 2145 |
} |
2219 |
} |
|
Lines 2603-2608
sub ReopenInvoice {
Link Here
|
| 2603 |
$sth->execute($invoiceid); |
2677 |
$sth->execute($invoiceid); |
| 2604 |
} |
2678 |
} |
| 2605 |
|
2679 |
|
|
|
2680 |
=head3 GetBiblioCountByBasketno |
| 2681 |
|
| 2682 |
$biblio_count = &GetBiblioCountByBasketno($basketno); |
| 2683 |
|
| 2684 |
Looks up the biblio's count that has basketno value $basketno |
| 2685 |
|
| 2686 |
Returns a quantity |
| 2687 |
|
| 2688 |
=cut |
| 2689 |
|
| 2690 |
sub GetBiblioCountByBasketno { |
| 2691 |
my ($basketno) = @_; |
| 2692 |
my $dbh = C4::Context->dbh; |
| 2693 |
my $query = " |
| 2694 |
SELECT COUNT( DISTINCT( biblionumber ) ) |
| 2695 |
FROM aqorders |
| 2696 |
WHERE basketno = ? |
| 2697 |
AND (datecancellationprinted IS NULL OR datecancellationprinted='0000-00-00') |
| 2698 |
"; |
| 2699 |
|
| 2700 |
my $sth = $dbh->prepare($query); |
| 2701 |
$sth->execute($basketno); |
| 2702 |
return $sth->fetchrow; |
| 2703 |
} |
| 2704 |
|
| 2606 |
1; |
2705 |
1; |
| 2607 |
__END__ |
2706 |
__END__ |
| 2608 |
|
2707 |
|