projects
/
koha.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 7688: (follow-up) rewrite t/db_dependant/Serials.t
[koha.git]
/
t
/
db_dependent
/
Bookseller.t
diff --git
a/t/db_dependent/Bookseller.t
b/t/db_dependent/Bookseller.t
index
dc744bc
..
4415144
100644
(file)
--- a/
t/db_dependent/Bookseller.t
+++ b/
t/db_dependent/Bookseller.t
@@
-2,7
+2,7
@@
use Modern::Perl;
use Modern::Perl;
-use Test::More tests => 6
3
;
+use Test::More tests => 6
4
;
use C4::Context;
use Koha::DateUtils;
use DateTime::Duration;
use C4::Context;
use Koha::DateUtils;
use DateTime::Duration;
@@
-160,12
+160,12
@@
is( $bookseller1fromid->{basketcount}, 2, 'Supplier1 has 2 baskets' );
#Test subscriptioncount
my $dt_today = dt_from_string;
#Test subscriptioncount
my $dt_today = dt_from_string;
-my $today = output_pref(
$dt_today, 'iso', '24hr', 1
);
+my $today = output_pref(
{ dt => $dt_today, dateformat => 'iso', timeformat => '24hr', dateonly => 1 }
);
my $dt_today1 = dt_from_string;
my $dur5 = DateTime::Duration->new( days => -5 );
$dt_today1->add_duration($dur5);
my $dt_today1 = dt_from_string;
my $dur5 = DateTime::Duration->new( days => -5 );
$dt_today1->add_duration($dur5);
-my $daysago5 = output_pref(
$dt_today1, 'iso', '24hr', 1
);
+my $daysago5 = output_pref(
{ dt => $dt_today1, dateformat => 'iso', timeformat => '24hr', dateonly => 1 }
);
my $budgetperiod = C4::Budgets::AddBudgetPeriod({
budget_period_startdate => $daysago5,
my $budgetperiod = C4::Budgets::AddBudgetPeriod({
budget_period_startdate => $daysago5,
@@
-181,7
+181,12
@@
my $id_budget = AddBudget({
budget_active => 1,
budget_period_id => $budgetperiod
});
budget_active => 1,
budget_period_id => $budgetperiod
});
-my ($biblionumber, $biblioitemnumber) = AddBiblio(MARC::Record->new, '');
+my $bib = MARC::Record->new();
+$bib->append_fields(
+ MARC::Field->new('245', ' ', ' ', a => 'Journal of ethnology'),
+ MARC::Field->new('500', ' ', ' ', a => 'bib notes'),
+);
+my ($biblionumber, $biblioitemnumber) = AddBiblio($bib, '');
$bookseller1fromid = C4::Bookseller::GetBookSellerFromId($id_supplier1);
is( $bookseller1fromid->{subscriptioncount},
0, 'Supplier1 has 0 subscription' );
$bookseller1fromid = C4::Bookseller::GetBookSellerFromId($id_supplier1);
is( $bookseller1fromid->{subscriptioncount},
0, 'Supplier1 has 0 subscription' );
@@
-194,11
+199,15
@@
my $id_subscription1 = C4::Serials::NewSubscription(
undef, undef, undef, undef,
undef, undef, undef, undef,
undef, undef, undef, 1,
undef, undef, undef, undef,
undef, undef, undef, undef,
undef, undef, undef, 1,
- "notes", undef, undef, undef,
+ "
subscription
notes", undef, undef, undef,
undef, undef, undef, 0,
"intnotes", 0, undef, undef,
0, undef, '31-12-2013',
);
undef, undef, undef, 0,
"intnotes", 0, undef, undef,
0, undef, '31-12-2013',
);
+
+my @subscriptions = SearchSubscriptions({biblionumber => $biblionumber});
+is($subscriptions[0]->{publicnotes}, 'subscription notes', 'subscription search results include public notes (bug 10689)');
+
my $id_subscription2 = C4::Serials::NewSubscription(
undef, "", $id_supplier1, undef,
$id_budget, $biblionumber, '01-01-2013', undef,
my $id_subscription2 = C4::Serials::NewSubscription(
undef, "", $id_supplier1, undef,
$id_budget, $biblionumber, '01-01-2013', undef,
@@
-208,7
+217,7
@@
my $id_subscription2 = C4::Serials::NewSubscription(
undef, undef, undef, undef,
undef, undef, undef, undef,
undef, undef, undef, 1,
undef, undef, undef, undef,
undef, undef, undef, undef,
undef, undef, undef, 1,
- "notes", undef, undef, undef,
+ "
subscription
notes", undef, undef, undef,
undef, undef, undef, 0,
"intnotes", 0, undef, undef,
0, undef, '31-12-2013',
undef, undef, undef, 0,
"intnotes", 0, undef, undef,
0, undef, '31-12-2013',
@@
-346,7
+355,7
@@
my $basket2info = {
my $dt_today2 = dt_from_string;
my $dur10 = DateTime::Duration->new( days => -10 );
$dt_today2->add_duration($dur10);
my $dt_today2 = dt_from_string;
my $dur10 = DateTime::Duration->new( days => -10 );
$dt_today2->add_duration($dur10);
-my $daysago10 = output_pref(
$dt_today2, 'iso', '24hr', 1
);
+my $daysago10 = output_pref(
{ dt => $dt_today2, dateformat => 'iso', timeformat => '24hr', dateonly => 1 }
);
my $basket3info = {
basketno => $sample_basket3,
closedate => $daysago10,
my $basket3info = {
basketno => $sample_basket3,
closedate => $daysago10,
@@
-507,7
+516,7
@@
isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
my $dt_today3 = dt_from_string;
my $dur4 = DateTime::Duration->new( days => -4 );
$dt_today3->add_duration($dur4);
my $dt_today3 = dt_from_string;
my $dur4 = DateTime::Duration->new( days => -4 );
$dt_today3->add_duration($dur4);
-my $daysago4 =
output_pref( $dt_today3, 'iso', '24hr', 1
);
+my $daysago4 =
output_pref({ dt => $dt_today3, dateformat => 'iso', timeformat => '24hr', dateonly => 1 }
);
%suppliers =
C4::Bookseller::GetBooksellersWithLateOrders( undef, $daysago4, undef );
%suppliers =
C4::Bookseller::GetBooksellersWithLateOrders( undef, $daysago4, undef );