[Fmsystem-commits] [16885] booking: invoice datalog

[sigurdne]

Revision: 16885
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16885
Author:   sigurdne
Date:     2017-06-28 08:39:54 -0400 (Wed, 28 Jun 2017)
Log Message:
-----------
booking: invoice datalog

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      
2017-06-28 12:31:35 UTC (rev 16884)
+++ trunk/booking/inc/class.socompleted_reservation_export.inc.php      
2017-06-28 12:39:54 UTC (rev 16885)
@@ -1121,7 +1121,7 @@
                                $file_format_linebreak = "\n";
                        }
 
-                       return array('data' => implode($file_format_linebreak, 
$output), 'data_log' => implode("\r\n", $log),
+                       return array('data' => implode($file_format_linebreak, 
$output), 'data_log' => implode(PHP_EOL, $log),
                                'info' => $export_info, 'header_count' => 
$header_count);
                }
 
@@ -1373,7 +1373,7 @@
                                $file_format_linebreak = "\n";
                        }
 
-                       return array('data' => implode($file_format_linebreak, 
$output), 'data_log' => implode("\r\n", $log),
+                       return array('data' => implode($file_format_linebreak, 
$output), 'data_log' => implode(PHP_EOL, $log),
                                'info' => $export_info, 'header_count' => 
$header_count);
                }
 

Modified: trunk/booking/inc/class.socompleted_reservation_export_file.inc.php
===================================================================
--- trunk/booking/inc/class.socompleted_reservation_export_file.inc.php 
2017-06-28 12:31:35 UTC (rev 16884)
+++ trunk/booking/inc/class.socompleted_reservation_export_file.inc.php 
2017-06-28 12:39:54 UTC (rev 16885)
@@ -173,7 +173,7 @@
 
                                                        if 
(!is_null($export_result['export']['data_log']))
                                                        {
-                                                               $export_log .= 
$export_result['export']['data_log'];
+                                                               $export_log .= 
PHP_EOL . $export_result['export']['data_log'];
                                                        }
                                                        else
                                                        {
@@ -188,7 +188,7 @@
                                        $export_data[$export_type] = 
$this->combine_export_result_data($export_results[$export_type]);
                                }
 
-                               $log = 
"Reservasjon_Id;Reservasjon_Type;Ordrenr;Kunde navn - Nummer;Varelinjer med 
dato;Bygg;Beløp\n";
+                               $log = 
"Reservasjon_Id;Reservasjon_Type;Ordrenr;Kunde navn - Nummer;Varelinjer med 
dato;Bygg;Beløp";
                                $log .= $export_log;
 //                             $export_log = $log;
                                $export_log = iconv("UTF-8", 
"ISO-8859-1//TRANSLIT", $log);