Skip to content

Commit 20e1c3f

Browse files
author
Chris Gårdenberg
committed
Release 0.10.8 (Unstable)
1 parent b8b9237 commit 20e1c3f

22 files changed

Lines changed: 283 additions & 142 deletions

‎.official.plugin.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ function edu_isOfficialPlugin()
55
{
66
if(isset($_REQUEST['checkOfficialPlugin']))
77
{
8-
echo "<script>(function() { alert(new Date() + \"\\nI'm official!\\nVersion: " . eduadmin_get_plugin_version() . "\"); })();</script>";
8+
echo "<script>(function() { alert(new Date() + \"\\nI'm official!\\nVersion: " . EDU()->get_plugin_version() . "\"); })();</script>";
99
}
1010
}
1111
}
@@ -15,7 +15,7 @@ function edu_isOfficialPlugin()
1515
function edu_check_for_updates()
1616
{
1717
require_once("includes/auto_update.php");
18-
$current_version = eduadmin_get_plugin_version();
18+
$current_version = EDU()->get_plugin_version();
1919
$slug = "eduadmin/eduadmin.php";
2020
new wp_auto_update($current_version, $slug);
2121
}

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
## [Unreleased]
44
### Added
55

6+
## [0.10.8]
7+
### Added
8+
- Trying to build everything as classes instead, just like WooCommerce
9+
- Bugfix: While fetching prices, we should use the same date span as everything else.
10+
- Started coding support for plugins (THIS IS NOT WORKING YET)
11+
612
## [0.10.7]
713
### Added
814
- Default translation is now in Swedish.

‎backend/modules/edu.api.detailinfo.eventlist.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function edu_api_eventlist($request)
4141
}
4242

4343
$ft = new XFiltering();
44-
$f = new XFilter('PeriodStart', '<=', date("Y-m-d 00:00:00", strtotime('now +' . $fetchMonths . ' months')));
44+
$f = new XFilter('PeriodStart', '<=', date("Y-m-d 23:59:59", strtotime('now +' . $fetchMonths . ' months')));
4545
$ft->AddItem($f);
4646
$f = new XFilter('PeriodEnd', '>=', date("Y-m-d H:i:s", strtotime('now')));
4747
$ft->AddItem($f);

‎backend/modules/edu.api.listview.courselist.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ function edu_api_listview_courselist($request)
2323

2424
$f = new XFilter('PeriodStart','<=', date("Y-m-d 23:59:59", strtotime("now +" . $fetchMonths . " months")));
2525
$filtering->AddItem($f);
26-
$f = new XFilter('PeriodEnd', '>=', date("Y-m-d 00:00:00", strtotime("now +1 day")));
26+
$f = new XFilter('PeriodEnd', '>=', date("Y-m-d", strtotime("now")));
2727
$filtering->AddItem($f);
2828
$f = new XFilter('StatusID','=','1');
2929
$filtering->AddItem($f);
3030

31-
$f = new XFilter('LastApplicationDate','>=',date("Y-m-d 00:00:00"));
31+
$f = new XFilter('LastApplicationDate','>=',date("Y-m-d H:i:s"));
3232
$filtering->AddItem($f);
3333

3434
if(!empty($objectIds))

‎content/script/frontendjs.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ var eduBookingView = {
123123
if(priceDdl !== null) {
124124
var selected = priceDdl.selectedOptions[0];
125125
var ppp = 0.0;
126-
if(selected !== null) {
126+
if(selected !== null && undefined !== selected.attributes["data-price"]) {
127127
ppp = parseFloat(selected.attributes["data-price"].value);
128128
}
129129
if(discountPerParticipant !== undefined && discountPerParticipant > 0) {

‎content/template/bookingTemplate/loginView.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
$ft->AddItem($f);
5353
$f = new XFilter('ObjectID', '=', $selectedCourse->ObjectID);
5454
$ft->AddItem($f);
55-
$f = new XFilter('LastApplicationDate', '>=', date("Y-m-d 00:00:00"));
55+
$f = new XFilter('LastApplicationDate', '>=', date("Y-m-d H:i:s"));
5656
$ft->AddItem($f);
5757
$f = new XFilter('StatusID','=','1');
5858
$ft->AddItem($f);

‎content/template/detailTemplate/template_A.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
}
5353

5454
$ft = new XFiltering();
55-
$f = new XFilter('PeriodStart', '<=', date("Y-m-d 00:00:00", strtotime('now +' . $fetchMonths . ' months')));
55+
$f = new XFilter('PeriodStart', '<=', date("Y-m-d 23:59:59", strtotime('now +' . $fetchMonths . ' months')));
5656
$ft->AddItem($f);
5757
$f = new XFilter('PeriodEnd', '>=', date("Y-m-d H:i:s", strtotime('now')));
5858
$ft->AddItem($f);
@@ -237,6 +237,8 @@
237237
$ft = new XFiltering();
238238
$f = new XFilter('PublicPriceName', '=', 'true');
239239
$ft->AddItem($f);
240+
$f = new XFilter('ObjectID', 'IN', $selectedCourse->ObjectID);
241+
$ft->AddItem($f);
240242
$f = new XFilter('OccationID', 'IN', join(',', $occIds));
241243
$ft->AddItem($f);
242244

‎content/template/detailTemplate/template_B.php‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
}
4848

4949
$ft = new XFiltering();
50-
$f = new XFilter('PeriodStart', '<=', date("Y-m-d 00:00:00", strtotime('now +' . $fetchMonths . ' months')));
50+
$f = new XFilter('PeriodStart', '<=', date("Y-m-d 23:59:59", strtotime('now +' . $fetchMonths . ' months')));
5151
$ft->AddItem($f);
5252
$f = new XFilter('PeriodEnd', '>=', date("Y-m-d H:i:s", strtotime('now')));
5353
$ft->AddItem($f);
@@ -193,7 +193,9 @@
193193
$ft = new XFiltering();
194194
$f = new XFilter('PublicPriceName', '=', 'true');
195195
$ft->AddItem($f);
196-
$f = new XFilter('ObjectID', '=', $selectedCourse->ObjectID);
196+
$f = new XFilter('ObjectID', 'IN', $selectedCourse->ObjectID);
197+
$ft->AddItem($f);
198+
$f = new XFilter('OccationID', 'IN', join(',', $occIds));
197199
$ft->AddItem($f);
198200

199201
$st = new XSorting();
@@ -247,9 +249,9 @@
247249
<?php
248250
foreach($events as $ev)
249251
{
252+
250253
if($groupByCity && $lastCity != $ev->City)
251254
{
252-
$i = 0;
253255
echo '<div class="eventSeparator">';
254256
echo $ev->City;
255257

@@ -266,8 +268,8 @@
266268
?>
267269
<div class="eventItem">
268270
<div class="eventDate<?php echo $groupByCityClass; ?>">
269-
<?php echo GetStartEndDisplayDate($ev->PeriodStart, $ev->PeriodEnd, true); ?>
270-
<span class="eventTime">, <?php echo date("H:i", strtotime($ev->PeriodStart)); ?> - <?php echo date("H:i", strtotime($ev->PeriodEnd)); ?></span>
271+
<?php echo isset($eventDates[$ev->EventID]) ? GetLogicalDateGroups($eventDates[$ev->EventID]) : GetOldStartEndDisplayDate($ev->PeriodStart, $ev->PeriodEnd); ?>
272+
<?php echo (!isset($eventDates[$ev->EventID]) ? "<span class=\"eventTime\">, " . date("H:i", strtotime($ev->PeriodStart)) .' - ' . date("H:i", strtotime($ev->PeriodEnd)) . "</span>" : ""); ?>
271273
</div>
272274
<?php if(!$groupByCity) { ?>
273275
<div class="eventCity">
@@ -307,7 +309,6 @@
307309
</div>
308310
<?php
309311
$lastCity = $ev->City;
310-
$i++;
311312
}
312313

313314
if(empty($events))

‎content/template/interestRegTemplate/interestRegEvent.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
$ft->AddItem($f);
5959
$f = new XFilter('ObjectID', '=', $selectedCourse->ObjectID);
6060
$ft->AddItem($f);
61-
$f = new XFilter('LastApplicationDate', '>=', date("Y-m-d 00:00:00"));
61+
$f = new XFilter('LastApplicationDate', '>=', date("Y-m-d H:i:s"));
6262
$ft->AddItem($f);
6363
$f = new XFilter('StatusID','=','1');
6464
$ft->AddItem($f);

‎content/template/listTemplate/template_GF_listCourses.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
}
180180
else
181181
{
182-
$s = new XSort('PeriodStart', 'ASC');
182+
$s = new XSort('PeriodStart', 'DESC');
183183
$sorting->AddItem($s);
184184
}
185185

0 commit comments

Comments
 (0)