[Fmsystem-commits] [15640] Stable: Merge 15636:15639 from trunk

[sigurdne]

Revision: 15640
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15640
Author:   sigurdne
Date:     2016-09-09 11:19:03 +0000 (Fri, 09 Sep 2016)
Log Message:
-----------
Stable: Merge 15636:15639 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/booking/inc/class.bobooking.inc.php
    
branches/Version-2_0-branch/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php

Property Changed:
----------------
    branches/Version-2_0-branch/
    branches/Version-2_0-branch/booking/


Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14937-15027,15165-15215,15223-15228,15230-15243,15245-15250,15254-15257
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635
   + /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14937-15027,15165-15215,15223-15228,15230-15243,15245-15250,15254-15257
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639


Property changes on: branches/Version-2_0-branch/booking
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566,15568-15569,15585-15617,15621-15630
   + /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566,15568-15569,15585-15617,15621-15630,15637-15639

Modified: branches/Version-2_0-branch/booking/inc/class.bobooking.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.bobooking.inc.php     
2016-09-09 11:08:22 UTC (rev 15639)
+++ branches/Version-2_0-branch/booking/inc/class.bobooking.inc.php     
2016-09-09 11:19:03 UTC (rev 15640)
@@ -475,9 +475,9 @@
                                unset($booking['audience']);
                                unset($booking['agegroups']);
                        }
+                       //Sigurd: 09. Sept: testing
+//                     $allocations = $this->split_allocations($allocations, 
$bookings);
 
-                       $allocations = $this->split_allocations($allocations, 
$bookings);
-
                        $event_ids = 
$this->so->event_ids_for_building($building_id, $from, $to);
                        $events = $this->event_so->read(array('filters' => 
array('id' => $event_ids)));
                        $events = $events['results'];
@@ -875,7 +875,8 @@
                                $booking['shortname'] = 
$booking['group_shortname'];
                                $booking['type'] = 'booking';
                        }
-                       $allocations = $this->split_allocations($allocations, 
$bookings);
+                       //Sigurd: 09. Sept: testing
+//                     $allocations = $this->split_allocations($allocations, 
$bookings);
 
                        $event_ids = 
$this->so->event_ids_for_resource($resource_id, $from, $to);
                        $events = $this->event_so->read(array('filters' => 
array('id' => $event_ids)));

Modified: 
branches/Version-2_0-branch/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
===================================================================
--- 
branches/Version-2_0-branch/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
  2016-09-09 11:08:22 UTC (rev 15639)
+++ 
branches/Version-2_0-branch/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
  2016-09-09 11:19:03 UTC (rev 15640)
@@ -260,6 +260,13 @@
                        $external_project = trim($data[0]);
                        $prosjektstatus = trim($data[1]);
                        $order_id = trim($data[2]);
+
+                       if(!ctype_digit($order_id))
+                       {
+                               $this->receipt['error'][] = array('msg' => 
"Feil format på bestillingsnummeret: {$order_id}");
+                               return false;
+
+                       }
                        $diff_actual_cost = (float)trim($data[3]);
 
                        $this->db->query("SELECT id FROM fm_tts_tickets WHERE 
order_id= '{$order_id}'", __LINE__, __FILE__);