[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12066] bkbooking: stavanger bugfix edit booking in f
From: |
Kjell Arne Espedal |
Subject: |
[Fmsystem-commits] [12066] bkbooking: stavanger bugfix edit booking in frontend |
Date: |
Thu, 28 Aug 2014 11:15:11 +0000 |
Revision: 12066
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12066
Author: kjell
Date: 2014-08-28 11:15:07 +0000 (Thu, 28 Aug 2014)
Log Message:
-----------
bkbooking: stavanger bugfix edit booking in frontend
Modified Paths:
--------------
branches/stavangerkommune/bookingfrontend/inc/class.uibooking.inc.php
branches/stavangerkommune/bookingfrontend/templates/stavanger/booking_edit_preview.xsl
Modified: branches/stavangerkommune/bookingfrontend/inc/class.uibooking.inc.php
===================================================================
--- branches/stavangerkommune/bookingfrontend/inc/class.uibooking.inc.php
2014-08-26 11:25:23 UTC (rev 12065)
+++ branches/stavangerkommune/bookingfrontend/inc/class.uibooking.inc.php
2014-08-28 11:15:07 UTC (rev 12066)
@@ -389,22 +389,24 @@
if ($_POST['recurring'] ==
'on') {
$where_clauses[] =
sprintf("bb_booking.to_ < '%s 00:00:00'", date('Y-m-d', $repeat_until));
}
+ $where_clauses[] = sprintf("EXTRACT(DOW FROM
bb_booking.from_) in (%s)",date('w', strtotime($_POST['from_'])));
+ $where_clauses[] = sprintf("EXTRACT(HOUR FROM
bb_booking.from_) = %s",date('H', strtotime($_POST['from_'])));
+ $where_clauses[] = sprintf("EXTRACT(MINUTE FROM
bb_booking.from_) = %s",date('i', strtotime($_POST['from_'])));
+ $where_clauses[] = sprintf("EXTRACT(HOUR FROM
bb_booking.to_) = %s",date('H', strtotime($_POST['to_'])));
+ $where_clauses[] = sprintf("EXTRACT(MINUTE FROM
bb_booking.to_) = %s",date('i', strtotime($_POST['to_'])));
+ $params['sort'] = 'from_';
$params['filters']['where'] =
$where_clauses;
$params['filters']['season_id']
= $booking['season_id'];
$params['filters']['group_id']
= $booking['group_id'];
-
$bookings =
$this->bo->so->read($params);
if ($step == 2)
{
-
$_SESSION['audience'] =
$_POST['audience'];
$_SESSION['male'] =
$_POST['male'];
$_SESSION['female'] =
$_POST['female'];
-
}
-
- if ($step == 3)
+ if ($step == 3)
{
foreach($bookings['results'] as $b)
{
@@ -421,26 +423,24 @@
$i++;
}
}
-
$b['agegroups']
= $temp_agegroup;
$b['audience']
= $_SESSION['audience'];
$b['group_id']
=$_POST['group_id'];
$b['activity_id'] = $_POST['activity_id'];
$errors =
$this->bo->validate($b);
+
if(!$errors)
{
-
$receipt = $this->bo->update($b);
$update_count++;
-
}
}
-
unset($_SESSION['female']);
+ unset($_SESSION['female']);
unset($_SESSION['male']);
unset($_SESSION['audience']);
}
- }
+ }
}
}
$this->flash_form_errors($errors);
Modified:
branches/stavangerkommune/bookingfrontend/templates/stavanger/booking_edit_preview.xsl
===================================================================
---
branches/stavangerkommune/bookingfrontend/templates/stavanger/booking_edit_preview.xsl
2014-08-26 11:25:23 UTC (rev 12065)
+++
branches/stavangerkommune/bookingfrontend/templates/stavanger/booking_edit_preview.xsl
2014-08-28 11:15:07 UTC (rev 12066)
@@ -20,6 +20,9 @@
<input type="hidden" name="group_id"
value="{group_id}"/>
<input type="hidden" name="activity_id"
value="{activity_id}"/>
<input type="hidden" name="building_id"
value="{booking/building_id}"/>
+ <input type="hidden" name="from_" value="{booking/from_}"/>
+ <input type="hidden" name="to_" value="{booking/to_}"/>
+
<select size="10">
<xsl:for-each
select="bookings/results">
<option>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12066] bkbooking: stavanger bugfix edit booking in frontend,
Kjell Arne Espedal <=