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

(-)a/C4/Serials.pm (-7 / +9 lines)
Lines 1260-1266 sub ModSubscription { Link Here
1260
        $whenmorethan1,   $setto1,          $lastvalue1,        $innerloop1,       $add2,          $every2,      $whenmorethan2, $setto2,
1260
        $whenmorethan1,   $setto1,          $lastvalue1,        $innerloop1,       $add2,          $every2,      $whenmorethan2, $setto2,
1261
        $lastvalue2,      $innerloop2,      $add3,              $every3,           $whenmorethan3, $setto3,      $lastvalue3,    $innerloop3,
1261
        $lastvalue2,      $innerloop2,      $add3,              $every3,           $whenmorethan3, $setto3,      $lastvalue3,    $innerloop3,
1262
        $numberingmethod, $status,          $biblionumber,      $callnumber,       $notes,         $letter,      $hemisphere,    $manualhistory,
1262
        $numberingmethod, $status,          $biblionumber,      $callnumber,       $notes,         $letter,      $hemisphere,    $manualhistory,
1263
        $internalnotes,   $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod,   $location,    $enddate,       $subscriptionid
1263
        $internalnotes,   $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod,   $location,    $enddate,       $subscriptionid,
1264
        $seriallifespan
1264
    ) = @_;
1265
    ) = @_;
1265
1266
1266
    #     warn $irregularity;
1267
    #     warn $irregularity;
Lines 1274-1280 sub ModSubscription { Link Here
1274
                        numberingmethod=?, status=?, biblionumber=?, callnumber=?, notes=?, 
1275
                        numberingmethod=?, status=?, biblionumber=?, callnumber=?, notes=?, 
1275
						letter=?, hemisphere=?,manualhistory=?,internalnotes=?,serialsadditems=?,
1276
						letter=?, hemisphere=?,manualhistory=?,internalnotes=?,serialsadditems=?,
1276
						staffdisplaycount = ?,opacdisplaycount = ?, graceperiod = ?, location = ?
1277
						staffdisplaycount = ?,opacdisplaycount = ?, graceperiod = ?, location = ?
1277
						,enddate=?
1278
                                           ,enddate=?, seriallifespan=?
1278
                    WHERE subscriptionid = ?";
1279
                    WHERE subscriptionid = ?";
1279
1280
1280
    #warn "query :".$query;
1281
    #warn "query :".$query;
Lines 1291-1297 sub ModSubscription { Link Here
1291
        $numberingmethod, $status,         $biblionumber,   $callnumber,
1292
        $numberingmethod, $status,         $biblionumber,   $callnumber,
1292
        $notes, $letter, $hemisphere, ( $manualhistory ? $manualhistory : 0 ),
1293
        $notes, $letter, $hemisphere, ( $manualhistory ? $manualhistory : 0 ),
1293
        $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount,
1294
        $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount,
1294
        $graceperiod,   $location,        $enddate,           $subscriptionid
1295
        $graceperiod,   $location,        $enddate,  $seriallifespan, $subscriptionid
1295
    );
1296
    );
1296
    my $rows = $sth->rows;
1297
    my $rows = $sth->rows;
1297
1298
Lines 1317-1328 the id of this new subscription Link Here
1317
=cut
1318
=cut
1318
1319
1319
sub NewSubscription {
1320
sub NewSubscription {
1321
1320
    my ($auser,         $branchcode,      $aqbooksellerid,    $cost,             $aqbudgetid,    $biblionumber, $startdate,       $periodicity,
1322
    my ($auser,         $branchcode,      $aqbooksellerid,    $cost,             $aqbudgetid,    $biblionumber, $startdate,       $periodicity,
1321
        $dow,           $numberlength,    $weeklength,        $monthlength,      $add1,          $every1,       $whenmorethan1,   $setto1,
1323
        $dow,           $numberlength,    $weeklength,        $monthlength,      $add1,          $every1,       $whenmorethan1,   $setto1,
1322
        $lastvalue1,    $innerloop1,      $add2,              $every2,           $whenmorethan2, $setto2,       $lastvalue2,      $innerloop2,
1324
        $lastvalue1,    $innerloop1,      $add2,              $every2,           $whenmorethan2, $setto2,       $lastvalue2,      $innerloop2,
1323
        $add3,          $every3,          $whenmorethan3,     $setto3,           $lastvalue3,    $innerloop3,   $numberingmethod, $status,
1325
        $add3,          $every3,          $whenmorethan3,     $setto3,           $lastvalue3,    $innerloop3,   $numberingmethod, $status,
1324
        $notes,         $letter,          $firstacquidate,    $irregularity,     $numberpattern, $callnumber,   $hemisphere,      $manualhistory,
1326
        $notes,         $letter,          $firstacquidate,    $irregularity,     $numberpattern, $callnumber,   $hemisphere,      $manualhistory,
1325
        $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod,   $location,     $enddate
1327
        $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod,   $location,     $enddate,         $seriallifespan
1326
    ) = @_;
1328
    ) = @_;
1327
    my $dbh = C4::Context->dbh;
1329
    my $dbh = C4::Context->dbh;
1328
1330
Lines 1336-1343 sub NewSubscription { Link Here
1336
            add3,every3,whenmorethan3,setto3,lastvalue3,innerloop3,
1338
            add3,every3,whenmorethan3,setto3,lastvalue3,innerloop3,
1337
            numberingmethod, status, notes, letter,firstacquidate,irregularity,
1339
            numberingmethod, status, notes, letter,firstacquidate,irregularity,
1338
            numberpattern, callnumber, hemisphere,manualhistory,internalnotes,serialsadditems,
1340
            numberpattern, callnumber, hemisphere,manualhistory,internalnotes,serialsadditems,
1339
            staffdisplaycount,opacdisplaycount,graceperiod,location,enddate)
1341
            staffdisplaycount,opacdisplaycount,graceperiod,location,enddate,seriallifespan)
1340
        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
1342
        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
1341
        |;
1343
        |;
1342
    my $sth = $dbh->prepare($query);
1344
    my $sth = $dbh->prepare($query);
1343
    $sth->execute(
1345
    $sth->execute(
Lines 1346-1352 sub NewSubscription { Link Here
1346
        $lastvalue1,    $innerloop1,      $add2,              $every2,           $whenmorethan2, $setto2,       $lastvalue2,      $innerloop2,
1348
        $lastvalue1,    $innerloop1,      $add2,              $every2,           $whenmorethan2, $setto2,       $lastvalue2,      $innerloop2,
1347
        $add3,          $every3,          $whenmorethan3,     $setto3,           $lastvalue3,    $innerloop3,   $numberingmethod, "$status",
1349
        $add3,          $every3,          $whenmorethan3,     $setto3,           $lastvalue3,    $innerloop3,   $numberingmethod, "$status",
1348
        $notes,         $letter,          $firstacquidate,    $irregularity,     $numberpattern, $callnumber,   $hemisphere,      $manualhistory,
1350
        $notes,         $letter,          $firstacquidate,    $irregularity,     $numberpattern, $callnumber,   $hemisphere,      $manualhistory,
1349
        $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod,   $location,     $enddate
1351
        $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod,   $location,     $enddate,         $seriallifespan
1350
    );
1352
    );
1351
1353
1352
    my $subscriptionid = $dbh->{'mysql_insertid'};
1354
    my $subscriptionid = $dbh->{'mysql_insertid'};
(-)a/installer/data/mysql/kohastructure.sql (+1 lines)
Lines 2031-2036 CREATE TABLE `subscription` ( Link Here
2031
  `enddate` date default NULL,
2031
  `enddate` date default NULL,
2032
  `closed` INT(1) NOT NULL DEFAULT 0,
2032
  `closed` INT(1) NOT NULL DEFAULT 0,
2033
  `reneweddate` date default NULL,
2033
  `reneweddate` date default NULL,
2034
  `seriallifespan` TINYINT(1) DEFAULT -1,
2034
  PRIMARY KEY  (`subscriptionid`)
2035
  PRIMARY KEY  (`subscriptionid`)
2035
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
2036
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
2036
2037
(-)a/installer/data/mysql/updatedatabase.pl (+7 lines)
Lines 7017-7022 if ( CheckVersion($DBversion) ) { Link Here
7017
    SetVersion($DBversion);
7017
    SetVersion($DBversion);
7018
}
7018
}
7019
7019
7020
$DBversion = 'XXX';
7021
if ( CheckVersion($DBversion) ) {
7022
   $dbh->do("ALTER TABLE subscription ADD `seriallifespan` TINYINT(1) DEFAULT -1");
7023
   print "Upgrade to $DBversion done (Add seriallifespan to subscription)\n";
7024
   SetVersion ($DBversion);
7025
}
7026
7020
=head1 FUNCTIONS
7027
=head1 FUNCTIONS
7021
7028
7022
=head2 TableExists($table)
7029
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt (+61 lines)
Lines 1030-1035 $(document).ready(function() { Link Here
1030
            [% END %]
1030
            [% END %]
1031
        </li>
1031
        </li>
1032
        <li>
1032
        <li>
1033
            <label for="seriallifespan">Serial lifespan:</label>
1034
            <select name="seriallifespan" id="seriallifespan">
1035
            [% IF ( seriallifespan == -1 ) %]
1036
                <option value="-1" selected="selected">Permanent</option>
1037
            [% ELSE %]
1038
                <option value="-1">Permanent</option>
1039
            [% END %]
1040
            [% IF ( seriallifespan == 1 ) %]
1041
                <option value="1" selected="selected">1 year</option>
1042
            [% ELSE %]
1043
                <option value="1">1 year</option>
1044
            [% END %]
1045
            [% IF ( seriallifespan == 2 ) %]
1046
                <option value="2" selected="selected">2 years</option>
1047
            [% ELSE %]
1048
                <option value="2">2 years</option>
1049
            [% END %]
1050
            [% IF ( seriallifespan == 3 ) %]
1051
                <option value="3" selected="selected">3 years</option>
1052
            [% ELSE %]
1053
                <option value="3">3 years</option>
1054
            [% END %]
1055
            [% IF ( seriallifespan == 4 ) %]
1056
                <option value="4" selected="selected">4 years</option>
1057
            [% ELSE %]
1058
                <option value="4">4 years</option>
1059
            [% END %]
1060
            [% IF ( seriallifespan == 5 ) %]
1061
                <option value="5" selected="selected">5 years</option>
1062
            [% ELSE %]
1063
                <option value="5">5 years</option>
1064
            [% END %]
1065
            [% IF ( seriallifespan == 6 ) %]
1066
                <option value="6" selected="selected">6 years</option>
1067
            [% ELSE %]
1068
                <option value="6">6 years</option>
1069
            [% END %]
1070
            [% IF ( seriallifespan == 7 ) %]
1071
                <option value="7" selected="selected">7 years</option>
1072
            [% ELSE %]
1073
                <option value="7">7 years</option>
1074
            [% END %]
1075
            [% IF ( seriallifespan == 8 ) %]
1076
                <option value="8" selected="selected">8 years</option>
1077
            [% ELSE %]
1078
                <option value="8">8 years</option>
1079
            [% END %]
1080
            [% IF ( seriallifespan == 9 ) %]
1081
                <option value="9" selected="selected">9 years</option>
1082
            [% ELSE %]
1083
                <option value="9">9 years</option>
1084
            [% END %]
1085
            [% IF ( seriallifespan == 10 ) %]
1086
                <option value="10" selected="selected">10 years</option>
1087
            [% ELSE %]
1088
                <option value="10">10 years</option>
1089
            [% END %]
1090
            </select>
1091
            <div class="hint">Set the subscription's serial lifespan. A serial will be considered "out of date" after the chosen time period.</div>
1092
        </li>
1093
        <li>
1033
            <label for="branchcode">Library:</label>
1094
            <label for="branchcode">Library:</label>
1034
            
1095
            
1035
                <select name="branchcode" id="branchcode" style="width: 20em;">
1096
                <select name="branchcode" id="branchcode" style="width: 20em;">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (+52 lines)
Lines 261-266 $(document).ready(function() { Link Here
261
        [% IF ( numberlength ) %]<li><span class="label">Number of issues:</span> [% numberlength %]</li>[% END %]
261
        [% IF ( numberlength ) %]<li><span class="label">Number of issues:</span> [% numberlength %]</li>[% END %]
262
        [% IF ( weeklength ) %]<li><span class="label">Number of weeks:</span> [% weeklength %]</li>[% END %]
262
        [% IF ( weeklength ) %]<li><span class="label">Number of weeks:</span> [% weeklength %]</li>[% END %]
263
        [% IF ( monthlength ) %]<li><span class="label">Number of months:</span> [% monthlength %]</li>[% END %]
263
        [% IF ( monthlength ) %]<li><span class="label">Number of months:</span> [% monthlength %]</li>[% END %]
264
                <li><span class="label">Serial lifespan:</span>
265
                [% IF seriallifespan == -1 %]
266
                    <span>Permanent</span>
267
                [% ELSIF ( seriallifespan == 1 ) %]
268
                    <span>1 year</span>
269
                [% ELSIF ( seriallifespan == 2 ) %]
270
                    <span>2 years</span>
271
                [% ELSIF ( seriallifespan == 3 ) %]
272
                    <span>3 years</span>
273
                [% ELSIF ( seriallifespan == 4 ) %]
274
                    <span>4 years</span>
275
                [% ELSIF ( seriallifespan == 5 ) %]
276
                    <span>5 years</span>
277
                [% ELSIF ( seriallifespan == 6 ) %]
278
                    <span>6 years</span>
279
                [% ELSIF ( seriallifespan == 7 ) %]
280
                    <span>7 years</span>
281
                [% ELSIF ( seriallifespan == 8 ) %]
282
                    <span>8 years</span>
283
                [% ELSIF ( seriallifespan == 9 ) %]
284
                    <span>9 years</span>
285
                [% ELSIF ( seriallifespan == 10 ) %]
286
                    <span>10 years</span>
287
                [% END %]
288
            </li>
264
        </ol>
289
        </ol>
265
    </div>
290
    </div>
266
    </div>
291
    </div>
Lines 327-332 $(document).ready(function() { Link Here
327
            </table>
352
            </table>
328
    </div>
353
    </div>
329
    <div id="subscription_issues">
354
    <div id="subscription_issues">
355
        <h2>Serial issues</h2>
356
        <p>
357
            <label>Serial lifespan :</label>
358
            [% IF seriallifespan == -1 %]
359
                <span>Permanent</span>
360
            [% ELSIF ( seriallifespan == 1 ) %]
361
                <span>1 year</span>
362
            [% ELSIF ( seriallifespan == 2 ) %]
363
                <span>2 years</span>
364
            [% ELSIF ( seriallifespan == 3 ) %]
365
                <span>3 years</span>
366
            [% ELSIF ( seriallifespan == 4 ) %]
367
                <span>4 years</span>
368
            [% ELSIF ( seriallifespan == 5 ) %]
369
                <span>5 years</span>
370
            [% ELSIF ( seriallifespan == 6 ) %]
371
                <span>6 years</span>
372
            [% ELSIF ( seriallifespan == 7 ) %]
373
                <span>7 years</span>
374
            [% ELSIF ( seriallifespan == 8 ) %]
375
                <span>8 years</span>
376
            [% ELSIF ( seriallifespan == 9 ) %]
377
                <span>9 years</span>
378
            [% ELSIF ( seriallifespan == 10 ) %]
379
                <span>10 years</span>
380
            [% END %]
381
        </p>
330
        <table>
382
        <table>
331
        <tr>
383
        <tr>
332
            <th>Issue number</th>
384
            <th>Issue number</th>
(-)a/serials/subscription-add.pl (-12 / +15 lines)
Lines 45-52 my @budgets; Link Here
45
# Permission needed otherwise (nothing or dup) : create_subscription
45
# Permission needed otherwise (nothing or dup) : create_subscription
46
my $permission = ($op eq "modify") ? "edit_subscription" : "create_subscription";
46
my $permission = ($op eq "modify") ? "edit_subscription" : "create_subscription";
47
47
48
my ($template, $loggedinuser, $cookie)
48
my ($template, $loggedinuser, $cookie) = get_template_and_user({template_name => "serials/subscription-add.tmpl",
49
= get_template_and_user({template_name => "serials/subscription-add.tmpl",
50
				query => $query,
49
				query => $query,
51
				type => "intranet",
50
				type => "intranet",
52
				authnotrequired => 0,
51
				authnotrequired => 0,
Lines 109-114 if ($op eq 'modify' || $op eq 'dup' || $op eq 'modsubscription') { Link Here
109
                    history => ($op eq 'modify'),
108
                    history => ($op eq 'modify'),
110
                    "periodicity".$subs->{'periodicity'} => 1,
109
                    "periodicity".$subs->{'periodicity'} => 1,
111
                    "numberpattern".$subs->{'numberpattern'} => 1,
110
                    "numberpattern".$subs->{'numberpattern'} => 1,
111
                    "seriallifespan" => $subs->{'seriallifespan'},
112
                    firstacquiyear => substr($firstissuedate,0,4),
112
                    firstacquiyear => substr($firstissuedate,0,4),
113
                    );
113
                    );
114
    }
114
    }
Lines 256-270 sub redirect_add_subscription { Link Here
256
    my $missinglist = $query->param('missinglist');
256
    my $missinglist = $query->param('missinglist');
257
    my $opacnote = $query->param('opacnote');
257
    my $opacnote = $query->param('opacnote');
258
    my $librariannote = $query->param('librariannote');
258
    my $librariannote = $query->param('librariannote');
259
    my $seriallifespan = $query->param('seriallifespan');
259
	my $subscriptionid = NewSubscription($auser,$branchcode,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,
260
	my $subscriptionid = NewSubscription($auser,$branchcode,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,
260
					$startdate,$periodicity,$dow,$numberlength,$weeklength,$monthlength,
261
        $startdate,$periodicity,$dow,$numberlength,$weeklength,$monthlength,
261
					$add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1,
262
        $add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1,
262
					$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2,
263
        $add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2,
263
					$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
264
        $add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
264
					$numberingmethod, $status, $notes,$letter,$firstacquidate,join(",",@irregularity),
265
        $numberingmethod, $status, $notes,$letter,$firstacquidate,join(",",@irregularity),
265
                    $numberpattern, $callnumber, $hemisphere,($manualhistory?$manualhistory:0),$internalnotes,
266
        $numberpattern, $callnumber, $hemisphere,($manualhistory?$manualhistory:0),$internalnotes,
266
                    $serialsadditems,$staffdisplaycount,$opacdisplaycount,$graceperiod,$location,$enddate
267
        $serialsadditems,$staffdisplaycount,$opacdisplaycount,$graceperiod,$location,$enddate,$seriallifespan
267
				);
268
    );
269
268
    ModSubscriptionHistory ($subscriptionid,$histstartdate,$histenddate,$recievedlist,$missinglist,$opacnote,$librariannote);
270
    ModSubscriptionHistory ($subscriptionid,$histstartdate,$histenddate,$recievedlist,$missinglist,$opacnote,$librariannote);
269
271
270
    print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
272
    print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
Lines 331-343 sub redirect_mod_subscription { Link Here
331
    my $graceperiod     = $query->param('graceperiod') || 0;
333
    my $graceperiod     = $query->param('graceperiod') || 0;
332
    my $location = $query->param('location');
334
    my $location = $query->param('location');
333
    my $nextexpected = GetNextExpected($subscriptionid);
335
    my $nextexpected = GetNextExpected($subscriptionid);
336
    my $seriallifespan = $query->param('seriallifespan');
334
	#  If it's  a mod, we need to check the current 'expected' issue, and mod it in the serials table if necessary.
337
	#  If it's  a mod, we need to check the current 'expected' issue, and mod it in the serials table if necessary.
335
    if ( $nextacquidate ne $nextexpected->{planneddate}->output('iso') ) {
338
    if ( $nextacquidate ne $nextexpected->{planneddate}->output('iso') ) {
336
        ModNextExpected($subscriptionid,C4::Dates->new($nextacquidate,'iso'));
339
        ModNextExpected($subscriptionid,C4::Dates->new($nextacquidate,'iso'));
337
        # if we have not received any issues yet, then we also must change the firstacquidate for the subs.
340
        # if we have not received any issues yet, then we also must change the firstacquidate for the subs.
338
        $firstissuedate = $nextacquidate if($nextexpected->{isfirstissue});
341
        $firstissuedate = $nextacquidate if($nextexpected->{isfirstissue});
339
    }
342
    }
340
341
        ModSubscription(
343
        ModSubscription(
342
            $auser,           $branchcode,   $aqbooksellerid, $cost,
344
            $auser,           $branchcode,   $aqbooksellerid, $cost,
343
            $aqbudgetid,      $startdate,    $periodicity,    $firstissuedate,
345
            $aqbudgetid,      $startdate,    $periodicity,    $firstissuedate,
Lines 349-356 sub redirect_mod_subscription { Link Here
349
            $whenmorethan3,   $setto3,       $lastvalue3,     $innerloop3,
351
            $whenmorethan3,   $setto3,       $lastvalue3,     $innerloop3,
350
            $numberingmethod, $status,       $biblionumber,   $callnumber,
352
            $numberingmethod, $status,       $biblionumber,   $callnumber,
351
            $notes,           $letter,       $hemisphere,     $manualhistory,$internalnotes,
353
            $notes,           $letter,       $hemisphere,     $manualhistory,$internalnotes,
352
            $serialsadditems, $staffdisplaycount,$opacdisplaycount,$graceperiod,$location,$enddate,$subscriptionid
354
            $serialsadditems, $staffdisplaycount,$opacdisplaycount,$graceperiod,$location,$enddate,$subscriptionid,$seriallifespan
353
        );
355
        );
356
354
        ModSubscriptionHistory ($subscriptionid,$histstartdate,$histenddate,$recievedlist,$missinglist,$opacnote,$librariannote);
357
        ModSubscriptionHistory ($subscriptionid,$histstartdate,$histenddate,$recievedlist,$missinglist,$opacnote,$librariannote);
355
    print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
358
    print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
356
    return;
359
    return;
(-)a/serials/subscription-detail.pl (-1 / +1 lines)
Lines 178-183 $template->param( Link Here
178
    show_acquisition_details => defined $tmpl_infos->{ordered_exists} || defined $tmpl_infos->{spent_exists} ? 1 : 0,
178
    show_acquisition_details => defined $tmpl_infos->{ordered_exists} || defined $tmpl_infos->{spent_exists} ? 1 : 0,
179
    basketno => $order->{basketno},
179
    basketno => $order->{basketno},
180
    %$tmpl_infos,
180
    %$tmpl_infos,
181
    seriallifespan => $subs->{'seriallifespan'},
181
);
182
);
182
183
183
output_html_with_http_headers $query, $cookie, $template->output;
184
output_html_with_http_headers $query, $cookie, $template->output;
184
- 

Return to bug 8587