Merge branch 'dev'

backend/views/distribution/report.php

@@ -68,11 +68,7 @@ foreach ($pointsSaleArray as $pointSale) {
                     $strUser = '';
 
                     // username
-                    if ($order->user) {
-                        $strUser = $order->user->name . " " . $order->user->lastname; 
-                    } else {
-                        $strUser = $order->username; 
-                    }
+                    $strUser = $order->getStrUser() ;
                     
                     if(strlen($order->comment_point_sale)) 
                     {

common/models/Order.php

@@ -486,7 +486,7 @@ class Order extends ActiveRecordCommon
     public function getStrUser() 
     {
         if (isset($this->user)) {
-            return Html::encode($this->user->name . ' ' . $this->user->lastname);
+            return Html::encode($this->user->lastname . ' ' . $this->user->name);
         } elseif (strlen($this->username)) {
             return Html::encode($this->username);
         } else {