Update doliconnect.php

ptibogxiv · Apr 15, 2019 · 1b5a4b3 · 1b5a4b3
1 parent 7e5ca0c
commit 1b5a4b3
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/doliconnect.php b/doliconnect.php
@@ -219,9 +219,12 @@ function dolibarr() {
 } else {  
 if ( $dolibarr->fk_soc == 0 ) {
 
-if ( $current_user->billing_type == 'mor' ) { $name = $current_user->billing_company;
+if ( $current_user->billing_type == 'mor' ) { 
+if (!empty($current_user->billing_company)) { $name = $current_user->billing_company; }
+else { $name = $current_user->user_login; }
 } else {
-$name = $current_user->user_firstname." ".$current_user->user_lastname;
+if (!empty($current_user->user_firstname) && !empty($current_user->user_lastname)) { $name = $current_user->user_firstname." ".$current_user->user_lastname; }
+else { $name = $current_user->user_login; }
 } 
 
 $rdr = [
@@ -273,10 +276,13 @@ function doliconnector($current_user = null) {
 
 } else {  
 
-if ( $current_user->billing_type == 'mor' ) { $name = $user->billing_company;
+if ( $current_user->billing_type == 'mor' ) { 
+if (!empty($current_user->billing_company)) { $name = $current_user->billing_company; }
+else { $name = $current_user->user_login; }
 } else {
-$name = $user->user_firstname." ".$user->user_lastname;
-} 
+if (!empty($current_user->user_firstname) && !empty($current_user->user_lastname)) { $name = $current_user->user_firstname." ".$current_user->user_lastname; }
+else { $name = $current_user->user_login; }
+}
 
 $rdr = [
     'name'  => $name,