Bladeren bron

Merge branch 'dev'

master
Guillaume Bourgeois 4 jaren geleden
bovenliggende
commit
2e335dd954
2 gewijzigde bestanden met toevoegingen van 2 en 6 verwijderingen
  1. +1
    -5
      backend/views/distribution/report.php
  2. +1
    -1
      common/models/Order.php

+ 1
- 5
backend/views/distribution/report.php Bestand weergeven

@@ -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))
{

+ 1
- 1
common/models/Order.php Bestand weergeven

@@ -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 {

Laden…
Annuleren
Opslaan