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

(-)a/t/db_dependent/Members/IssueSlip.t (-9 / +11 lines)
Lines 126-131 EOS Link Here
126
126
127
    subtest 'Daily loans' => sub {
127
    subtest 'Daily loans' => sub {
128
        plan tests => 2;
128
        plan tests => 2;
129
        skip "It's 23:59!", 2 if $today->hour == 23 and $today->minute == 59;
129
        # Test 1: No overdue
130
        # Test 1: No overdue
130
        my $today_daily = $today->clone->set( hour => 23, minute => 59 );
131
        my $today_daily = $today->clone->set( hour => 23, minute => 59 );
131
        my $today_daily_as_formatted = output_pref( $today_daily );
132
        my $today_daily_as_formatted = output_pref( $today_daily );
Lines 194-205 EOS Link Here
194
195
195
    subtest 'Hourly loans' => sub {
196
    subtest 'Hourly loans' => sub {
196
        plan tests => 2;
197
        plan tests => 2;
198
        skip "It's 23:59!", 2 if $today->hour == 23 and $today->minute == 59;
197
        # Test 1: No overdue
199
        # Test 1: No overdue
198
        my ( $date_due_in_time, $date_due_in_time_as_formatted, $date_due_in_late, $date_due_in_late_as_formatted, $issue_date, $slip, $expected_slip );
200
        my ( $date_due_in_time, $date_due_in_time_as_formatted, $date_due_in_late, $date_due_in_late_as_formatted, $issue_date, $slip, $expected_slip );
199
        # Assuming today is not hour = 23 and minute = 59
201
        # Assuming today is not hour = 23 and minute = 59
200
        $date_due_in_time = $today->clone->set(hour => $today->hour + 1);
202
        $date_due_in_time = $today->clone->set(hour => ($today->hour < 23 ? $today->hour + 1 : 23), minute => 59);
201
        $date_due_in_time_as_formatted = output_pref( $date_due_in_time );
203
        $date_due_in_time_as_formatted = output_pref( $date_due_in_time );
202
        $issue_date = $today->clone->subtract_duration( DateTime::Duration->new( minutes => 1 ) );
204
        $issue_date = $date_due_in_time->clone->subtract_duration( DateTime::Duration->new( minutes => 1 ) );
203
        AddIssue( $borrower, $barcode1, $date_due_in_time, undef, $issue_date );
205
        AddIssue( $borrower, $barcode1, $date_due_in_time, undef, $issue_date );
204
        $issue_date = $yesterday->clone;
206
        $issue_date = $yesterday->clone;
205
        AddIssue( $borrower, $barcode2, $date_due_in_time, undef, $issue_date );
207
        AddIssue( $borrower, $barcode2, $date_due_in_time, undef, $issue_date );
Lines 227-235 EOS Link Here
227
        AddReturn( $barcode2, $branchcode );
229
        AddReturn( $barcode2, $branchcode );
228
230
229
        # Test 2: 1 Overdue
231
        # Test 2: 1 Overdue
230
        $date_due_in_time = $today->clone->set(hour => $today->hour + 1);
232
        $date_due_in_time = $today->clone->set(hour => ($today->hour < 23 ? $today->hour + 1 : 23), minute => 59);
231
        $date_due_in_time_as_formatted = output_pref( $date_due_in_time );
233
        $date_due_in_time_as_formatted = output_pref( $date_due_in_time );
232
        $issue_date = $today->clone->subtract_duration( DateTime::Duration->new( minutes => 1 ) );
234
        $issue_date = $date_due_in_time->clone->subtract_duration( DateTime::Duration->new( minutes => 1 ) );
233
        AddIssue( $borrower, $barcode1, $date_due_in_time, undef, $issue_date );
235
        AddIssue( $borrower, $barcode1, $date_due_in_time, undef, $issue_date );
234
        $date_due_in_late = $today->clone->set(hour => $today->hour - 1);
236
        $date_due_in_late = $today->clone->set(hour => $today->hour - 1);
235
        $date_due_in_late_as_formatted = output_pref( $date_due_in_late );
237
        $date_due_in_late_as_formatted = output_pref( $date_due_in_late );
Lines 275-280 EOS Link Here
275
277
276
    subtest 'Daily loans' => sub {
278
    subtest 'Daily loans' => sub {
277
        plan tests => 2;
279
        plan tests => 2;
280
        skip "It's 23:59!", 2 if $today->hour == 23 and $today->minute == 59;
278
        # Test 1: No overdue
281
        # Test 1: No overdue
279
        my $today_daily = $today->clone->set( hour => 23, minute => 59 );
282
        my $today_daily = $today->clone->set( hour => 23, minute => 59 );
280
        my $today_daily_as_formatted = output_pref( $today_daily );
283
        my $today_daily_as_formatted = output_pref( $today_daily );
Lines 328-336 EOS Link Here
328
        # Test 1: No overdue
331
        # Test 1: No overdue
329
        my ( $date_due_in_time, $date_due_in_time_as_formatted, $date_due_in_late, $date_due_in_late_as_formatted, $issue_date, $slip, $expected_slip );
332
        my ( $date_due_in_time, $date_due_in_time_as_formatted, $date_due_in_late, $date_due_in_late_as_formatted, $issue_date, $slip, $expected_slip );
330
        # Assuming today is not hour = 23 and minute = 59
333
        # Assuming today is not hour = 23 and minute = 59
331
        $date_due_in_time = $today->clone->set(hour => $today->hour + 1);
334
        $date_due_in_time = $today->clone->set(hour => ($today->hour < 23 ? $today->hour + 1 : 23), minute => 59);
332
        $date_due_in_time_as_formatted = output_pref( $date_due_in_time );
335
        $date_due_in_time_as_formatted = output_pref( $date_due_in_time );
333
        $issue_date = $today->clone->subtract_duration( DateTime::Duration->new( minutes => 1 ) );
336
        $issue_date = $date_due_in_time->clone->subtract_duration( DateTime::Duration->new( minutes => 1 ) );
334
        AddIssue( $borrower, $barcode1, $date_due_in_time, undef, $issue_date );
337
        AddIssue( $borrower, $barcode1, $date_due_in_time, undef, $issue_date );
335
        $issue_date = $yesterday->clone;
338
        $issue_date = $yesterday->clone;
336
        AddIssue( $borrower, $barcode2, $date_due_in_time, undef, $issue_date );
339
        AddIssue( $borrower, $barcode2, $date_due_in_time, undef, $issue_date );
Lines 350-358 EOS Link Here
350
        AddReturn( $barcode2, $branchcode );
353
        AddReturn( $barcode2, $branchcode );
351
354
352
        # Test 2: 1 Overdue
355
        # Test 2: 1 Overdue
353
        $date_due_in_time = $today->clone->set(hour => $today->hour + 1);
356
        $date_due_in_time = $today->clone->set(hour => ($today->hour < 23 ? $today->hour + 1 : 23), minute => 59);
354
        $date_due_in_time_as_formatted = output_pref( $date_due_in_time );
357
        $date_due_in_time_as_formatted = output_pref( $date_due_in_time );
355
        $issue_date = $today->clone->subtract_duration( DateTime::Duration->new( minutes => 1 ) );
358
        $issue_date = $date_due_in_time->clone->subtract_duration( DateTime::Duration->new( minutes => 1 ) );
356
        AddIssue( $borrower, $barcode1, $date_due_in_time, undef, $issue_date );
359
        AddIssue( $borrower, $barcode1, $date_due_in_time, undef, $issue_date );
357
        $date_due_in_late = $today->clone->set(hour => $today->hour - 1);
360
        $date_due_in_late = $today->clone->set(hour => $today->hour - 1);
358
        $date_due_in_late_as_formatted = output_pref( $date_due_in_late );
361
        $date_due_in_late_as_formatted = output_pref( $date_due_in_late );
359
- 

Return to bug 15029