Attachment #147026 for bug #32891

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

Lines 103-109 sub is_valid_pickup_datetime { Link Here

(-)a/Koha/CurbsidePickupPolicy.pm (-1 / +1 lines)
103	my $start = $datetime->clone->set_hour( $opening_slot->start_hour )	103	my $start = $datetime->clone->set_hour( $opening_slot->start_hour )
104	->set_minute( $opening_slot->start_minute );	104	->set_minute( $opening_slot->start_minute );
105	my $end = $datetime->clone->set_hour( $opening_slot->end_hour )	105	my $end = $datetime->clone->set_hour( $opening_slot->end_hour )
106	->set_minute( $opening_slot->start_minute );	106	->set_minute( $opening_slot->end_minute );
107	my $keep_going = 1;	107	my $keep_going = 1;
108	my $slot_start = $start->clone;	108	my $slot_start = $start->clone;
109	my $slot_end = $slot_start->clone->add(minutes => $self->pickup_interval);	109	my $slot_end = $slot_start->clone->add(minutes => $self->pickup_interval);




        branchcode              => $library->branchcode,
        enabled                 => 1,
        enable_waiting_holds_only => 0,
        pickup_interval         => 15,
        patrons_per_interval    => 2,
        patron_scheduled_pickup => 1
    }

)->store;

# Open Mondays from 12 to 18
$policy->add_opening_slot('1-12:00-18:45');

my $today = dt_from_string;

subtest 'Create a pickup' => sub {
    plan tests => 10;

    # Day and datetime are ok
    my $next_monday =

    'Koha::Exceptions::CurbsidePickup::NotEnabled',
      'Cannot create pickup if the policy does not allow it';

   $policy->enabled(1)->store;

   $policy->enable_waiting_holds_only(1)->store;
    throws_ok {
        Koha::CurbsidePickup->new($params)->store;
    }


    $cp->delete;

    $schedule_dt = $next_monday->set_hour(18)->set_minute(15)->set_second(00);
    $cp          = Koha::CurbsidePickup->new( { %$params, scheduled_pickup_datetime => $schedule_dt } )->store;
    ok($cp);
    $cp->delete;

    # Day is not ok
    my $next_tuesday =
      $today->clone->add( days => ( 2 - $today->day_of_week ) % 7 );

    'Koha::Exceptions::CurbsidePickup::NoMatchingSlots',
      'Cannot create a pickup on a time without opening slots defined';

    # Day ok, datetime inside the opening slot, but wrong (15:07 for instance)
    $schedule_dt = $next_monday->set_hour(15)->set_minute(07)->set_second(00);
    throws_ok {
        Koha::CurbsidePickup->new({%$params, scheduled_pickup_datetime => $schedule_dt})->store;
    }
- 

Return to bug 32891

Lines 56-62 my $policy = Koha::CurbsidePickupPolicy->new( Link Here

(-)a/t/db_dependent/Koha/CurbsidePickups.t (-7 / +13 lines)
56	branchcode => $library->branchcode,	56	branchcode => $library->branchcode,
57	enabled => 1,	57	enabled => 1,
58	enable_waiting_holds_only => 0,	58	enable_waiting_holds_only => 0,
59	pickup_interval => 30,	59	pickup_interval => 15,
60	patrons_per_interval => 2,	60	patrons_per_interval => 2,
61	patron_scheduled_pickup => 1	61	patron_scheduled_pickup => 1
62	}	62	}
Lines 73-84 my $policy_disabled = Koha::CurbsidePickupPolicy->new( Link Here
73	)->store;	73	)->store;
74		74
75	# Open Mondays from 12 to 18	75	# Open Mondays from 12 to 18
76	$policy->add_opening_slot('1-12:00-18:00');	76	$policy->add_opening_slot('1-12:00-18:45');
77		77
78	my $today = dt_from_string;	78	my $today = dt_from_string;
79		79
80	subtest 'Create a pickup' => sub {	80	subtest 'Create a pickup' => sub {
81	plan tests => 9;	81	plan tests => 10;
82		82
83	# Day and datetime are ok	83	# Day and datetime are ok
84	my $next_monday =	84	my $next_monday =
Lines 99-105 subtest 'Create a pickup' => sub { Link Here
99	'Koha::Exceptions::CurbsidePickup::NotEnabled',	99	'Koha::Exceptions::CurbsidePickup::NotEnabled',
100	'Cannot create pickup if the policy does not allow it';	100	'Cannot create pickup if the policy does not allow it';
101		101
102	$policy->enable_waiting_holds_only(1)->store;	102	$policy->enabled(1)->store;
		103
		104	$policy->enable_waiting_holds_only(1)->store;
103	throws_ok {	105	throws_ok {
104	Koha::CurbsidePickup->new($params)->store;	106	Koha::CurbsidePickup->new($params)->store;
105	}	107	}
Lines 119-124 subtest 'Create a pickup' => sub { Link Here
119		121
120	$cp->delete;	122	$cp->delete;
121		123
		124	$schedule_dt = $next_monday->set_hour(18)->set_minute(15)->set_second(00);
		125	$cp = Koha::CurbsidePickup->new( { %$params, scheduled_pickup_datetime => $schedule_dt } )->store;
		126	ok($cp);
		127	$cp->delete;
		128
122	# Day is not ok	129	# Day is not ok
123	my $next_tuesday =	130	my $next_tuesday =
124	$today->clone->add( days => ( 2 - $today->day_of_week ) % 7 );	131	$today->clone->add( days => ( 2 - $today->day_of_week ) % 7 );
Lines 137-144 subtest 'Create a pickup' => sub { Link Here
137	'Koha::Exceptions::CurbsidePickup::NoMatchingSlots',	144	'Koha::Exceptions::CurbsidePickup::NoMatchingSlots',
138	'Cannot create a pickup on a time without opening slots defined';	145	'Cannot create a pickup on a time without opening slots defined';
139		146
140	# Day ok, datetime inside the opening slot, but wrong (15:15 for instance)	147	# Day ok, datetime inside the opening slot, but wrong (15:07 for instance)
141	$schedule_dt = $next_monday->set_hour(15)->set_minute(15)->set_second(00);	148	$schedule_dt = $next_monday->set_hour(15)->set_minute(07)->set_second(00);
142	throws_ok {	149	throws_ok {
143	Koha::CurbsidePickup->new({%$params, scheduled_pickup_datetime => $schedule_dt})->store;	150	Koha::CurbsidePickup->new({%$params, scheduled_pickup_datetime => $schedule_dt})->store;
144	}	151	}
145	-