[Fmsystem-commits] [12085] bkbooking: stavanger bugfix edit booking

[Kjell Arne Espedal]

Revision: 12085
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12085
Author:   kjell
Date:     2014-09-09 10:46:49 +0000 (Tue, 09 Sep 2014)
Log Message:
-----------
bkbooking: stavanger bugfix edit booking

Modified Paths:
--------------
    branches/stavangerkommune/bookingfrontend/inc/class.uibooking.inc.php

Modified: branches/stavangerkommune/bookingfrontend/inc/class.uibooking.inc.php
===================================================================
--- branches/stavangerkommune/bookingfrontend/inc/class.uibooking.inc.php       
2014-09-09 07:13:00 UTC (rev 12084)
+++ branches/stavangerkommune/bookingfrontend/inc/class.uibooking.inc.php       
2014-09-09 10:46:49 UTC (rev 12085)
@@ -385,26 +385,28 @@
                                                        $_POST['repeat_until'] 
= $season['to_'];
                                                } 
 
-                                               $where_clauses[] = 
sprintf("bb_booking.from_ >= '%s 00:00:00'", date('Y-m-d', 
strtotime($_POST['from_'])));
+                                               $where_clauses[] = 
sprintf("bb_booking.from_ >= '%s 00:00:00'", date('Y-m-d', 
strtotime($booking['from_'])));
                                                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_'])));
+                        $where_clauses[] = sprintf("EXTRACT(DOW FROM 
bb_booking.from_) in (%s)",date('w', strtotime($booking['from_'])));
+                        $where_clauses[] = sprintf("EXTRACT(HOUR FROM 
bb_booking.from_) = %s",date('H', strtotime($booking['from_'])));
+                        $where_clauses[] = sprintf("EXTRACT(MINUTE FROM 
bb_booking.from_) = %s",date('i', strtotime($booking['from_'])));
+                        $where_clauses[] = sprintf("EXTRACT(HOUR FROM 
bb_booking.to_) = %s",date('H', strtotime($booking['to_'])));
+                        $where_clauses[] = sprintf("EXTRACT(MINUTE FROM 
bb_booking.to_) = %s",date('i', strtotime($booking['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);
+                        $bookings = $this->bo->so->read($params);
 
                                                if ($step == 2)
                                                {
                                                        $_SESSION['audience'] = 
$_POST['audience'];
                                                        $_SESSION['male'] = 
$_POST['male'];
                                                        $_SESSION['female'] = 
$_POST['female'];
+                            $_SESSION['from'] = 
mb_strcut($_POST['from_'],11,strlen($_POST['from_']));
+                            $_SESSION['to'] = 
mb_strcut($_POST['to_'],11,strlen($_POST['to_']));
                                                }
                         if ($step == 3)
                                                {
@@ -427,11 +429,12 @@
                                                                $b['audience'] 
= $_SESSION['audience'];
                                                                $b['group_id'] 
=$_POST['group_id'];
                                                                
$b['activity_id'] = $_POST['activity_id'];
-                                                               $errors = 
$this->bo->validate($b);
-
+                                $b['from_'] = 
mb_strcut($b['from_'],0,11).$_SESSION['from'];
+                                $b['to_'] = 
mb_strcut($b['to_'],0,11).$_SESSION['to'];
+                                $errors = $this->bo->validate($b);
                                                                if(!$errors)
                                                                {
-                                                                       
$receipt = $this->bo->update($b);
+                                    $receipt = $this->bo->update($b);
                                                                        
$update_count++;
                                                                }
                                                        }