From cb4a639c96ae8144e7a38fe8bdc2d3b98ef0b6bf Mon Sep 17 00:00:00 2001 From: Roland Schneider Date: Tue, 1 Mar 2016 22:16:40 +0100 Subject: [PATCH 1/2] add backend transfer/index customerName --- backend/models/TransferSearch.php | 5 +++++ backend/views/transfer/index.php | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/backend/models/TransferSearch.php b/backend/models/TransferSearch.php index ee066fe..7206050 100644 --- a/backend/models/TransferSearch.php +++ b/backend/models/TransferSearch.php @@ -70,6 +70,7 @@ class TransferSearch extends Transfer $query->innerJoinWith('account'); $query->innerJoin('user', " user.id = transfer.id_user"); + $query->leftJoin('customer', " transfer.id_customer = customer.id_customer"); if ( !RoleDefinition::isAdmin() ){ @@ -118,6 +119,10 @@ class TransferSearch extends Transfer 'asc' => ['user.username' => SORT_ASC ], 'desc' => ['user.username' => SORT_DESC], ], + 'id_customer' =>[ + 'asc' => ['customer.name' => SORT_ASC ], + 'desc' => ['customer.name' => SORT_DESC], + ], ] ] ]); diff --git a/backend/views/transfer/index.php b/backend/views/transfer/index.php index b554728..29a10ef 100644 --- a/backend/views/transfer/index.php +++ b/backend/views/transfer/index.php @@ -64,6 +64,11 @@ $this->params['breadcrumbs'][] = $this->title; 'value' => 'paidByName' , 'label' => 'Fizette' ], + [ + 'attribute' => 'id_customer', + 'value' => 'customerName' , + 'label' => 'Vendég' + ], [ 'attribute' => 'id_account', 'value' => 'accountName' From 055fc541eadac1ac1fba70b4502d0c0bd2377f5a Mon Sep 17 00:00:00 2001 From: Roland Schneider Date: Tue, 1 Mar 2016 22:17:32 +0100 Subject: [PATCH 2/2] change version --- changelog.txt | 2 ++ common/config/params.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index c88a3a8..56e480b 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,5 @@ +-0.0.47 + - add backend transfer/index customerName column -0.0.46 - procurement ( beszerzés ) termék lista vonalkód helyett - kulcs ki/be átirányítás változás diff --git a/common/config/params.php b/common/config/params.php index d1c0e83..3b987c9 100644 --- a/common/config/params.php +++ b/common/config/params.php @@ -4,7 +4,7 @@ return [ 'supportEmail' => 'rocho02@gmail.com', 'infoEmail' => 'info@rocho-net.hu', 'user.passwordResetTokenExpire' => 3600, - 'version' => 'v0.0.46', + 'version' => 'v0.0.47', 'company' => 'movar',//gyor 'company_name' => "Freimann Kft.", 'product_visiblity' => 'account',// on reception which products to display. account or global