Skip to content

Commit 59a46fc

Browse files
author
Chris Gårdenberg
committed
fix: Change method to filter LastApplicationDate
fixes #444
1 parent 5efd776 commit 59a46fc

2 files changed

Lines changed: 15 additions & 15 deletions

File tree

PLUGIN-CHECKSUM

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
98c329fe6ce3435b694ef79640c1692f
1+
9404b13ece888c99f73e5fef0fe753d7

includes/eduapi-helper-functions.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function GetCourseDetailInfo( $course_id, $fetch_months, $group_by_city )
4343
' and StatusId eq 1' .
4444
' and CustomerId eq null' .
4545
' and CompanySpecific eq false' .
46-
' and LastApplicationDate ge ' . edu_get_timezoned_date( 'c', 'now 23:59:59' ) .
46+
' and LastApplicationDate ge ' . date_i18n( 'c' ) .
4747
' and StartDate le ' . edu_get_timezoned_date( 'c', 'now 23:59:59 +' . $fetch_months . ' months' ) .
4848
' and EndDate ge ' . edu_get_timezoned_date( 'c', 'now' ) .
4949
';' .
@@ -53,7 +53,7 @@ public function GetCourseDetailInfo( $course_id, $fetch_months, $group_by_city )
5353
';' .
5454
'$orderby=StartDate asc' . ( $group_by_city ? ', City asc' : '' ) .
5555
';' .
56-
'$select=EventId,City,ParticipantNumberLeft,MaxParticipantNumber,StartDate,EndDate,AddressName,LocationId,ParticipantVat,BookingFormUrl,OnDemand,OnDemandPublished,OnDemandAccessDays';
56+
'$select=EventId,City,ParticipantNumberLeft,MaxParticipantNumber,StartDate,EndDate,AddressName,LocationId,ParticipantVat,BookingFormUrl,OnDemand,OnDemandPublished,OnDemandAccessDays,LastApplicationDate';
5757

5858
$expands['CustomFields'] = '$filter=ShowOnWeb;$select=CustomFieldId,CustomFieldName,CustomFieldType,CustomFieldValue,CustomFieldChecked,CustomFieldDate,CustomFieldAlternativeId,CustomFieldAlternativeValue;';
5959

@@ -71,7 +71,7 @@ public function GetCourseDetailInfo( $course_id, $fetch_months, $group_by_city )
7171
join( ',', $selects ),
7272
join( ',', $expand_arr )
7373
) );
74-
}, 10, $course_id, $fetch_months, $group_by_city );
74+
}, 10, $course_id, $fetch_months, $group_by_city );
7575
}
7676

7777
public function GetOnDemandCourseDetailInfo( $course_id, $group_by_city ) {
@@ -134,7 +134,7 @@ public function GetOnDemandCourseDetailInfo( $course_id, $group_by_city ) {
134134
join( ',', $selects ),
135135
join( ',', $expand_arr )
136136
) );
137-
}, 10, $course_id, $group_by_city );
137+
}, 10, $course_id, $group_by_city );
138138
}
139139

140140
public function GetCourseList( $attributes, $category_id, $city, $subjectid, $courselevel, $custom_order_by, $custom_order_by_order ) {
@@ -178,7 +178,7 @@ public function GetCourseList( $attributes, $category_id, $city, $subjectid, $co
178178
' and StatusId eq 1' .
179179
' and CustomerId eq null' .
180180
' and CompanySpecific eq false' .
181-
' and LastApplicationDate ge ' . edu_get_timezoned_date( 'c', 'now 23:59:59' ) .
181+
' and LastApplicationDate ge ' . date_i18n( 'c' ) .
182182
' and StartDate le ' . edu_get_timezoned_date( 'c', 'now 23:59:59 +' . $fetch_months . ' months' ) .
183183
' and EndDate ge ' . edu_get_timezoned_date( 'c', 'now' ) .
184184
' and OnDemand eq false' .
@@ -187,7 +187,7 @@ public function GetCourseList( $attributes, $category_id, $city, $subjectid, $co
187187
';' .
188188
'$orderby=StartDate asc' .
189189
';' .
190-
'$select=EventId,City,ParticipantNumberLeft,MaxParticipantNumber,StartDate,EndDate,AddressName,EventName,ParticipantVat,BookingFormUrl,OnDemand,OnDemandPublished,OnDemandAccessDays,LocationId';
190+
'$select=EventId,City,ParticipantNumberLeft,MaxParticipantNumber,StartDate,EndDate,AddressName,EventName,ParticipantVat,BookingFormUrl,OnDemand,OnDemandPublished,OnDemandAccessDays,LocationId,LastApplicationDate';
191191

192192
$expands['CustomFields'] = '$filter=ShowOnWeb;$select=CustomFieldId,CustomFieldName,CustomFieldType,CustomFieldValue,CustomFieldChecked,CustomFieldDate,CustomFieldAlternativeId,CustomFieldAlternativeValue;';
193193

@@ -254,7 +254,7 @@ public function GetCourseList( $attributes, $category_id, $city, $subjectid, $co
254254
join( ',', $expand_arr ),
255255
join( ',', $sorting )
256256
);
257-
}, 300, $selects, $filters, $sorting );
257+
}, 300, $selects, $filters, $sorting );
258258
}
259259

260260
public function GetOnDemandCourseList( $attributes, $category_id, $city, $subjectid, $courselevel, $custom_order_by, $custom_order_by_order ) {
@@ -372,7 +372,7 @@ public function GetOnDemandCourseList( $attributes, $category_id, $city, $subjec
372372
join( ',', $expand_arr ),
373373
join( ',', $sorting )
374374
);
375-
}, 300, $selects, $filters, $sorting );
375+
}, 300, $selects, $filters, $sorting );
376376
}
377377

378378
public function GetEventList( $attributes, $category_id, $city, $subjectid, $courselevel, $custom_order_by, $custom_order_by_order ) {
@@ -413,7 +413,7 @@ public function GetEventList( $attributes, $category_id, $city, $subjectid, $cou
413413
' and StatusId eq 1' .
414414
' and CustomerId eq null' .
415415
' and CompanySpecific eq false' .
416-
' and LastApplicationDate ge ' . edu_get_timezoned_date( 'c', 'now 23:59:59' ) .
416+
' and LastApplicationDate ge ' . date_i18n( 'c' ) .
417417
' and StartDate le ' . edu_get_timezoned_date( 'c', 'now 23:59:59 +' . $fetch_months . ' months' ) .
418418
' and EndDate ge ' . edu_get_timezoned_date( 'c', 'now' ) .
419419
' and OnDemand eq false' .
@@ -422,7 +422,7 @@ public function GetEventList( $attributes, $category_id, $city, $subjectid, $cou
422422
';' .
423423
'$orderby=StartDate asc' .
424424
';' .
425-
'$select=EventId,City,ParticipantNumberLeft,MaxParticipantNumber,StartDate,EndDate,AddressName,EventName,ParticipantVat,BookingFormUrl,OnDemand,OnDemandPublished,OnDemandAccessDays,LocationId';
425+
'$select=EventId,City,ParticipantNumberLeft,MaxParticipantNumber,StartDate,EndDate,AddressName,EventName,ParticipantVat,BookingFormUrl,OnDemand,OnDemandPublished,OnDemandAccessDays,LocationId,LastApplicationDate';
426426

427427
$expands['CustomFields'] = '$filter=ShowOnWeb;$select=CustomFieldId,CustomFieldName,CustomFieldType,CustomFieldValue,CustomFieldChecked,CustomFieldDate,CustomFieldAlternativeId,CustomFieldAlternativeValue;';
428428

@@ -487,7 +487,7 @@ public function GetEventList( $attributes, $category_id, $city, $subjectid, $cou
487487
join( ' and ', $filters ),
488488
join( ',', $expand_arr )
489489
);
490-
}, 300, $selects, $filters );
490+
}, 300, $selects, $filters );
491491
}
492492

493493
public function GetOnDemandEventList( $attributes, $category_id, $city, $subjectid, $courselevel, $custom_order_by, $custom_order_by_order ) {
@@ -601,7 +601,7 @@ public function GetOnDemandEventList( $attributes, $category_id, $city, $subject
601601
join( ' and ', $filters ),
602602
join( ',', $expand_arr )
603603
);
604-
}, 300, $selects, $filters );
604+
}, 300, $selects, $filters );
605605
}
606606

607607
/**
@@ -610,7 +610,7 @@ public function GetOnDemandEventList( $attributes, $category_id, $city, $subject
610610
public function GetOrganization() {
611611
return EDU()->get_transient( 'eduadmin-organization', function() {
612612
return EDUAPI()->REST->Organisation->GetOrganisation();
613-
}, DAY_IN_SECONDS );
613+
}, DAY_IN_SECONDS );
614614
}
615615

616616
public function GetRegions() {
@@ -621,7 +621,7 @@ public function GetRegions() {
621621
'Locations($filter=PublicLocation;$expand=LocationAddresses;$select=LocationId,City,PublicLocation;)',
622622
'RegionName asc'
623623
);
624-
}, DAY_IN_SECONDS );
624+
}, DAY_IN_SECONDS );
625625
}
626626

627627
public static function instance() {

0 commit comments

Comments
 (0)