From d40da3c7f235041451d8595c5204aaafb8bbda39 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 4 Jul 2023 09:07:31 +1000
Subject: [PATCH] Adjustments for imports

---
 app/Http/Controllers/ImportController.php |  2 ++
 app/Import/Providers/BaseImport.php       | 12 +++++++-----
 app/PaymentDrivers/BaseDriver.php         |  3 +++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php
index c02adb8fbae6..0d42d74a552b 100644
--- a/app/Http/Controllers/ImportController.php
+++ b/app/Http/Controllers/ImportController.php
@@ -162,12 +162,14 @@ class ImportController extends Controller
         $delimiters = [',', '.', ';'];
         $bestDelimiter = ' ';
         $count = 0;
+
         foreach ($delimiters as $delimiter) {
             
             if (substr_count(strstr($csvfile, "\n", true), $delimiter) >= $count) {
                 $count = substr_count($csvfile, $delimiter);
                 $bestDelimiter = $delimiter;
             }
+        
         }
         return $bestDelimiter;
     }
diff --git a/app/Import/Providers/BaseImport.php b/app/Import/Providers/BaseImport.php
index 2901507c4087..0cb696bfde5c 100644
--- a/app/Import/Providers/BaseImport.php
+++ b/app/Import/Providers/BaseImport.php
@@ -91,6 +91,10 @@ class BaseImport
 
     public function getCsvData($entity_type)
     {
+        if (! ini_get('auto_detect_line_endings')) {
+            ini_set('auto_detect_line_endings', '1');
+        }
+
         $base64_encoded_csv = Cache::pull($this->hash.'-'.$entity_type);
 
         if (empty($base64_encoded_csv)) {
@@ -132,14 +136,12 @@ class BaseImport
         $bestDelimiter = ',';
         $count = 0;
         foreach ($delimiters as $delimiter) {
-            // if (substr_count($csvfile, $delimiter) > $count) {
-            //     $count = substr_count($csvfile, $delimiter);
-            //     $bestDelimiter = $delimiter;
-            // }
-            if (substr_count(strstr($csvfile, "\n", true), $delimiter) > $count) {
+
+            if (substr_count(strstr($csvfile, "\n", true), $delimiter) >= $count) {
                 $count = substr_count($csvfile, $delimiter);
                 $bestDelimiter = $delimiter;
             }
+
         }
         return $bestDelimiter;
     }
diff --git a/app/PaymentDrivers/BaseDriver.php b/app/PaymentDrivers/BaseDriver.php
index 4f2c6807b706..632c8c36e137 100644
--- a/app/PaymentDrivers/BaseDriver.php
+++ b/app/PaymentDrivers/BaseDriver.php
@@ -732,6 +732,9 @@ class BaseDriver extends AbstractPaymentDriver
 
         $invoices_string = \implode(', ', collect($this->payment_hash->invoices())->pluck('invoice_number')->toArray()) ?: null;
 
+        if (!$invoices_string) 
+            return str_replace(["*","<",">","'",'"'], "", $this->client->company->present()->name());
+
         $invoices_string = str_replace(["*","<",">","'",'"'], "-", $invoices_string);
         
         $invoices_string = "I-".$invoices_string;