Merge branch 'bugfix/warehouseeshop' into 'master'

now not only showing xinon users

See merge request fronk/thetool!605

application/WarehouseEShopOrder/WarehouseEShopOrderController.php

@@ -21,7 +21,7 @@ class WarehouseEShopOrderController extends TTCrud {
         ['key' => 'deliveryAddressPLZ', 'text' => 'PLZ', 'required' => true, 'regex' => '/^\d{4}$/'],
         ['key' => 'deliveryAddressCity', 'text' => 'Stadt', 'required' => true, 'required_length' => 3],
         ['key' => 'create', 'text' => 'Erstellt', 'required' => true, 'modal' => false, 'filter' => 'datetime'],
-        ['key' => 'createBy', 'text' => 'Erstellt von', 'required' => true,'modal' => ['type' => 'select', 'items' => []]],
+        ['key' => 'createBy', 'text' => 'Erstellt von', 'required' => true,'table' => ['filter' => 'select'], 'modal' => ['type' => 'select', 'items' => []]],
         ['key' => 'actions', 'text' => 'Aktionen', 'required' => false, 'modal' => false, 'table' => ['filter' => false, 'sortable' => false, 'class' => 'text-center']],
     ];
 
@@ -43,7 +43,7 @@ class WarehouseEShopOrderController extends TTCrud {
     protected function prepareCrudConfig() {
         $users = array_map(function($user) {
             return ['value' => intval($user->id), 'text' => $user->name];
-        }, UserModel::search(['employee' => true]));
+        }, UserModel::search());
 
         $this->columns[8]['modal']['items'] = $users;
     }