[Fmsystem-commits] [9841] bkbooking: fixed a bug with reservation export log file

[Kjell Arne Espedal]

Revision: 9841
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9841
Author:   kjell
Date:     2012-08-10 12:17:40 +0000 (Fri, 10 Aug 2012)
Log Message:
-----------
bkbooking: fixed a bug with reservation export log file

Modified Paths:
--------------
    trunk/booking/inc/class.socompleted_reservation_export.inc.php
    trunk/booking/inc/class.socompleted_reservation_export_file.inc.php

Modified: trunk/booking/inc/class.socompleted_reservation_export.inc.php
===================================================================
--- trunk/booking/inc/class.socompleted_reservation_export.inc.php      
2012-08-10 08:43:03 UTC (rev 9840)
+++ trunk/booking/inc/class.socompleted_reservation_export.inc.php      
2012-08-10 12:17:40 UTC (rev 9841)
@@ -601,10 +601,9 @@
                        //$orders = array();
                        $export_info = array();
                        $output = array();
+
                        $log = array();
 
-                       $log[] = 'Ordrenr;Kunde navn - Nummer;Varelinjer med 
dato;Bygg;Beløp';
-
                        /* NOTE: The specification states that values of type 
date
                         * should be left padded with spaces. The example file,
                         * however, is right padded with spaces.

Modified: trunk/booking/inc/class.socompleted_reservation_export_file.inc.php
===================================================================
--- trunk/booking/inc/class.socompleted_reservation_export_file.inc.php 
2012-08-10 08:43:03 UTC (rev 9840)
+++ trunk/booking/inc/class.socompleted_reservation_export_file.inc.php 
2012-08-10 12:17:40 UTC (rev 9841)
@@ -133,7 +133,11 @@
 
                         if ($export_type == 'external') {
                                                        
$export_result['total_items'] = $export_result['export']['header_count'];       
-                                                       $export_log = 
$export_result['export']['data_log'];     
+                                                   if 
(!is_null($export_result['export']['data_log'])) {
+                                                               $export_log .= 
$export_result['export']['data_log'];    
+                                                       } else {
+                                                               $export_log .= 
"";
+                                                       }
                         }
                                                
                                                
$export_configurations[$export_type][$export['id']] = $conf;
@@ -142,6 +146,10 @@
                                        }
                                        $export_data[$export_type] = 
$this->combine_export_result_data($export_results[$export_type]);
                                }
+
+                               $log = "Ordrenr;Kunde navn - Nummer;Varelinjer 
med dato;Bygg;Beløp\n";
+                               $log .= $export_log;
+                               $export_log = $log;                     
                                
                                if ($do_generate_files === false) {
                                        return false;
@@ -164,7 +172,7 @@
                        
                                        
$this->file_storage->attach($export_file)->persist();
                                             
-                    if ($export_type == 'external') {
+                    if ($export_type == 'external'){
                                        $entity_export_file['log_filename'] = 
'log_'.$export_type.'_'.$entity_export_file['id'].'.csv';
                                        $log_export_file = new 
booking_storage_object($entity_export_file['log_filename']);
                                        $log_export_files[] = $log_export_file;