View | Details | Raw Unified | Return to bug 12792
Collapse All | Expand All

(-)a/C4/Reserves.pm (-15 / +14 lines)
Lines 179-204 sub AddReserve { Link Here
179
    # updates take place here
179
    # updates take place here
180
    if ( $fee > 0 ) {
180
    if ( $fee > 0 ) {
181
        my $nextacctno = &getnextacctno( $borrowernumber );
181
        my $nextacctno = &getnextacctno( $borrowernumber );
182
        my $query      = qq/
182
        my $query      = qq{
183
        INSERT INTO accountlines
183
        INSERT INTO accountlines
184
            (borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding)
184
            (borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding)
185
        VALUES
185
        VALUES
186
            (?,?,now(),?,?,'Res',?)
186
            (?,?,now(),?,?,'Res',?)
187
    /;
187
    };
188
        my $usth = $dbh->prepare($query);
188
        my $usth = $dbh->prepare($query);
189
        $usth->execute( $borrowernumber, $nextacctno, $fee,
189
        $usth->execute( $borrowernumber, $nextacctno, $fee,
190
            "Reserve Charge - $title", $fee );
190
            "Reserve Charge - $title", $fee );
191
    }
191
    }
192
192
193
    #if ($const eq 'a'){
193
    #if ($const eq 'a'){
194
    my $query = qq/
194
    my $query = qq{
195
        INSERT INTO reserves
195
        INSERT INTO reserves
196
            (borrowernumber,biblionumber,reservedate,branchcode,constrainttype,
196
            (borrowernumber,biblionumber,reservedate,branchcode,constrainttype,
197
            priority,reservenotes,itemnumber,found,waitingdate,expirationdate)
197
            priority,reservenotes,itemnumber,found,waitingdate,expirationdate)
198
        VALUES
198
        VALUES
199
             (?,?,?,?,?,
199
             (?,?,?,?,?,
200
             ?,?,?,?,?,?)
200
             ?,?,?,?,?,?)
201
    /;
201
             };
202
    my $sth = $dbh->prepare($query);
202
    my $sth = $dbh->prepare($query);
203
    $sth->execute(
203
    $sth->execute(
204
        $borrowernumber, $biblionumber, $resdate, $branch,
204
        $borrowernumber, $biblionumber, $resdate, $branch,
Lines 237-248 sub AddReserve { Link Here
237
237
238
    #}
238
    #}
239
    ($const eq "o" || $const eq "e") or return;   # FIXME: why not have a useful return value?
239
    ($const eq "o" || $const eq "e") or return;   # FIXME: why not have a useful return value?
240
    $query = qq/
240
    $query = qq{
241
        INSERT INTO reserveconstraints
241
        INSERT INTO reserveconstraints
242
            (borrowernumber,biblionumber,reservedate,biblioitemnumber)
242
            (borrowernumber,biblionumber,reservedate,biblioitemnumber)
243
        VALUES
243
        VALUES
244
            (?,?,?,?)
244
            (?,?,?,?)
245
    /;
245
    };
246
    $sth = $dbh->prepare($query);    # keep prepare outside the loop!
246
    $sth = $dbh->prepare($query);    # keep prepare outside the loop!
247
    foreach (@$bibitems) {
247
    foreach (@$bibitems) {
248
        $sth->execute($borrowernumber, $biblionumber, $resdate, $_);
248
        $sth->execute($borrowernumber, $biblionumber, $resdate, $_);
Lines 684-694 sub GetReserveFee { Link Here
684
    #check for issues;
684
    #check for issues;
685
    my $dbh   = C4::Context->dbh;
685
    my $dbh   = C4::Context->dbh;
686
    my $const = lc substr( $constraint, 0, 1 );
686
    my $const = lc substr( $constraint, 0, 1 );
687
    my $query = qq/
687
    my $query = qq{
688
      SELECT * FROM borrowers
688
      SELECT * FROM borrowers
689
    LEFT JOIN categories ON borrowers.categorycode = categories.categorycode
689
    LEFT JOIN categories ON borrowers.categorycode = categories.categorycode
690
    WHERE borrowernumber = ?
690
    WHERE borrowernumber = ?
691
    /;
691
    };
692
    my $sth = $dbh->prepare($query);
692
    my $sth = $dbh->prepare($query);
693
    $sth->execute($borrowernumber);
693
    $sth->execute($borrowernumber);
694
    my $data = $sth->fetchrow_hashref;
694
    my $data = $sth->fetchrow_hashref;
Lines 1835-1841 sub _Findgroupreserve { Link Here
1835
1835
1836
    # TODO: consolidate at least the SELECT portion of the first 2 queries to a common $select var.
1836
    # TODO: consolidate at least the SELECT portion of the first 2 queries to a common $select var.
1837
    # check for exact targetted match
1837
    # check for exact targetted match
1838
    my $item_level_target_query = qq/
1838
    my $item_level_target_query = qq{
1839
        SELECT reserves.biblionumber        AS biblionumber,
1839
        SELECT reserves.biblionumber        AS biblionumber,
1840
               reserves.borrowernumber      AS borrowernumber,
1840
               reserves.borrowernumber      AS borrowernumber,
1841
               reserves.reservedate         AS reservedate,
1841
               reserves.reservedate         AS reservedate,
Lines 1857-1863 sub _Findgroupreserve { Link Here
1857
        AND itemnumber = ?
1857
        AND itemnumber = ?
1858
        AND reservedate <= DATE_ADD(NOW(),INTERVAL ? DAY)
1858
        AND reservedate <= DATE_ADD(NOW(),INTERVAL ? DAY)
1859
        AND suspend = 0
1859
        AND suspend = 0
1860
    /;
1860
    };
1861
    my $sth = $dbh->prepare($item_level_target_query);
1861
    my $sth = $dbh->prepare($item_level_target_query);
1862
    $sth->execute($itemnumber, $lookahead||0);
1862
    $sth->execute($itemnumber, $lookahead||0);
1863
    my @results;
1863
    my @results;
Lines 1867-1873 sub _Findgroupreserve { Link Here
1867
    return @results if @results;
1867
    return @results if @results;
1868
    
1868
    
1869
    # check for title-level targetted match
1869
    # check for title-level targetted match
1870
    my $title_level_target_query = qq/
1870
    my $title_level_target_query = qq{
1871
        SELECT reserves.biblionumber        AS biblionumber,
1871
        SELECT reserves.biblionumber        AS biblionumber,
1872
               reserves.borrowernumber      AS borrowernumber,
1872
               reserves.borrowernumber      AS borrowernumber,
1873
               reserves.reservedate         AS reservedate,
1873
               reserves.reservedate         AS reservedate,
Lines 1889-1895 sub _Findgroupreserve { Link Here
1889
        AND hold_fill_targets.itemnumber = ?
1889
        AND hold_fill_targets.itemnumber = ?
1890
        AND reservedate <= DATE_ADD(NOW(),INTERVAL ? DAY)
1890
        AND reservedate <= DATE_ADD(NOW(),INTERVAL ? DAY)
1891
        AND suspend = 0
1891
        AND suspend = 0
1892
    /;
1892
    };
1893
    $sth = $dbh->prepare($title_level_target_query);
1893
    $sth = $dbh->prepare($title_level_target_query);
1894
    $sth->execute($itemnumber, $lookahead||0);
1894
    $sth->execute($itemnumber, $lookahead||0);
1895
    @results = ();
1895
    @results = ();
Lines 1898-1904 sub _Findgroupreserve { Link Here
1898
    }
1898
    }
1899
    return @results if @results;
1899
    return @results if @results;
1900
1900
1901
    my $query = qq/
1901
    my $query = qq{
1902
        SELECT reserves.biblionumber               AS biblionumber,
1902
        SELECT reserves.biblionumber               AS biblionumber,
1903
               reserves.borrowernumber             AS borrowernumber,
1903
               reserves.borrowernumber             AS borrowernumber,
1904
               reserves.reservedate                AS reservedate,
1904
               reserves.reservedate                AS reservedate,
Lines 1922-1928 sub _Findgroupreserve { Link Here
1922
          AND (reserves.itemnumber IS NULL OR reserves.itemnumber = ?)
1922
          AND (reserves.itemnumber IS NULL OR reserves.itemnumber = ?)
1923
          AND reserves.reservedate <= DATE_ADD(NOW(),INTERVAL ? DAY)
1923
          AND reserves.reservedate <= DATE_ADD(NOW(),INTERVAL ? DAY)
1924
          AND suspend = 0
1924
          AND suspend = 0
1925
    /;
1925
    };
1926
    $sth = $dbh->prepare($query);
1926
    $sth = $dbh->prepare($query);
1927
    $sth->execute( $biblio, $bibitem, $itemnumber, $lookahead||0);
1927
    $sth->execute( $biblio, $bibitem, $itemnumber, $lookahead||0);
1928
    @results = ();
1928
    @results = ();
1929
- 

Return to bug 12792