Finish version/v.0.0.47
This commit is contained in:
commit
c0162c1082
@ -70,6 +70,7 @@ class TransferSearch extends Transfer
|
|||||||
|
|
||||||
$query->innerJoinWith('account');
|
$query->innerJoinWith('account');
|
||||||
$query->innerJoin('user', " user.id = transfer.id_user");
|
$query->innerJoin('user', " user.id = transfer.id_user");
|
||||||
|
$query->leftJoin('customer', " transfer.id_customer = customer.id_customer");
|
||||||
|
|
||||||
|
|
||||||
if ( !RoleDefinition::isAdmin() ){
|
if ( !RoleDefinition::isAdmin() ){
|
||||||
@ -118,6 +119,10 @@ class TransferSearch extends Transfer
|
|||||||
'asc' => ['user.username' => SORT_ASC ],
|
'asc' => ['user.username' => SORT_ASC ],
|
||||||
'desc' => ['user.username' => SORT_DESC],
|
'desc' => ['user.username' => SORT_DESC],
|
||||||
],
|
],
|
||||||
|
'id_customer' =>[
|
||||||
|
'asc' => ['customer.name' => SORT_ASC ],
|
||||||
|
'desc' => ['customer.name' => SORT_DESC],
|
||||||
|
],
|
||||||
]
|
]
|
||||||
]
|
]
|
||||||
]);
|
]);
|
||||||
|
|||||||
@ -64,6 +64,11 @@ $this->params['breadcrumbs'][] = $this->title;
|
|||||||
'value' => 'paidByName' ,
|
'value' => 'paidByName' ,
|
||||||
'label' => 'Fizette'
|
'label' => 'Fizette'
|
||||||
],
|
],
|
||||||
|
[
|
||||||
|
'attribute' => 'id_customer',
|
||||||
|
'value' => 'customerName' ,
|
||||||
|
'label' => 'Vendég'
|
||||||
|
],
|
||||||
[
|
[
|
||||||
'attribute' => 'id_account',
|
'attribute' => 'id_account',
|
||||||
'value' => 'accountName'
|
'value' => 'accountName'
|
||||||
|
|||||||
@ -1,3 +1,5 @@
|
|||||||
|
-0.0.47
|
||||||
|
- add backend transfer/index customerName column
|
||||||
-0.0.46
|
-0.0.46
|
||||||
- procurement ( beszerzés ) termék lista vonalkód helyett
|
- procurement ( beszerzés ) termék lista vonalkód helyett
|
||||||
- kulcs ki/be átirányítás változás
|
- kulcs ki/be átirányítás változás
|
||||||
|
|||||||
@ -4,7 +4,7 @@ return [
|
|||||||
'supportEmail' => 'rocho02@gmail.com',
|
'supportEmail' => 'rocho02@gmail.com',
|
||||||
'infoEmail' => 'info@rocho-net.hu',
|
'infoEmail' => 'info@rocho-net.hu',
|
||||||
'user.passwordResetTokenExpire' => 3600,
|
'user.passwordResetTokenExpire' => 3600,
|
||||||
'version' => 'v0.0.46',
|
'version' => 'v0.0.47',
|
||||||
'company' => 'movar',//gyor
|
'company' => 'movar',//gyor
|
||||||
'company_name' => "Freimann Kft.",
|
'company_name' => "Freimann Kft.",
|
||||||
'product_visiblity' => 'account',// on reception which products to display. account or global
|
'product_visiblity' => 'account',// on reception which products to display. account or global
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user