|
|
|
@ -213,9 +213,9 @@ class FinanceController extends \frontend\controllers\UserBaseController |
|
|
|
$data['rows'] = []; |
|
|
|
$data['rows'] = []; |
|
|
|
foreach($items as $item) { |
|
|
|
foreach($items as $item) { |
|
|
|
$row = $item->toArray(); |
|
|
|
$row = $item->toArray(); |
|
|
|
$row['group'] = $item->user->group->name; |
|
|
|
$row['group'] = $item->user && $item->user->group ? $item->user->group->name : ''; |
|
|
|
$row['company_name'] = $item->order->company2->name; |
|
|
|
$row['company_name'] = $item->order->company2->name; |
|
|
|
$row['username'] = $item->user->getShowName(); |
|
|
|
$row['username'] = $item->user ? $item->user->showName : ''; |
|
|
|
$row['submit_date'] = $item->order->submit_date; |
|
|
|
$row['submit_date'] = $item->order->submit_date; |
|
|
|
$row['print_date'] = $item->order->print_date; |
|
|
|
$row['print_date'] = $item->order->print_date; |
|
|
|
$row['total_real'] = round($item->total_clear_real + $item->total_tax_real,2); |
|
|
|
$row['total_real'] = round($item->total_clear_real + $item->total_tax_real,2); |
|
|
|
|
