added new tablet mode for creating shipping notes
This commit is contained in:
@@ -4,13 +4,36 @@ class AddressController extends mfBaseController {
|
||||
private $filter;
|
||||
|
||||
protected function init() {
|
||||
$this->needlogin = true;
|
||||
$me = new User();
|
||||
$me->loadMe();
|
||||
$this->me = $me;
|
||||
$this->layout()->set("me", $me);
|
||||
$user = null;
|
||||
$overrideKey = MFAPPNAME . '_warehouse_login_override';
|
||||
$timestampKey = MFAPPNAME . '_warehouse_login_override_timestamp';
|
||||
|
||||
if (!$me->is(["Admin", "salespartner"])) {
|
||||
$overrideId = $_SESSION[$overrideKey] ?? null;
|
||||
$timestamp = $_SESSION[$timestampKey] ?? null;
|
||||
|
||||
if (is_numeric($overrideId) && $timestamp && (time() - $timestamp) < 600) {
|
||||
$potentialUser = new User($overrideId);
|
||||
if ($potentialUser->id && $potentialUser->address_id == 1) {
|
||||
$user = $potentialUser;
|
||||
} else {
|
||||
unset($_SESSION[$overrideKey], $_SESSION[$timestampKey]);
|
||||
$this->redirect('WarehouseShippingNote');
|
||||
return;
|
||||
}
|
||||
} elseif ($overrideId) {
|
||||
unset($_SESSION[$overrideKey], $_SESSION[$timestampKey]);
|
||||
}
|
||||
|
||||
if (!$user) {
|
||||
$this->needlogin = true;
|
||||
$user = new User();
|
||||
$user->loadMe();
|
||||
}
|
||||
|
||||
$this->me = $user;
|
||||
$this->layout()->set("me", $this->me);
|
||||
|
||||
if (!$this->me->is(["Admin", "salespartner"])) {
|
||||
$this->redirect("Dashboard");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -125,6 +125,8 @@ class UserModel
|
||||
$where .= " AND WorkerPermission.employee = 'true'";
|
||||
}
|
||||
}
|
||||
if (isset($filter['active']))
|
||||
$where .= " AND Worker.active = " . (int)$filter['active'];
|
||||
|
||||
//var_dump($filter, $where);exit;
|
||||
return $where;
|
||||
|
||||
@@ -28,7 +28,7 @@ class WarehouseShippingNoteController extends TTCrud {
|
||||
['key' => 'actions', 'text' => 'Aktionen', 'required' => false, 'modal' => false, 'table' => ['filter' => false, 'sortable' => false, 'class' => 'text-center']],];
|
||||
|
||||
protected array $defaultOrder = ['key' => 'create', 'order' => 'DESC'];
|
||||
protected array $additionalJSVariables = ['WAREHOUSE_ADMIN' => true];
|
||||
protected array $additionalJSVariables = ['WAREHOUSE_ADMIN' => true, 'HIDE_MENU' => false];
|
||||
protected array $infoMessages = ['create' => 'Lieferschein wurde erstellt.',
|
||||
'update' => 'Lieferschein wurde aktualisiert',
|
||||
'delete' => 'Lieferschein wurde gelöscht',
|
||||
@@ -37,6 +37,7 @@ class WarehouseShippingNoteController extends TTCrud {
|
||||
|
||||
protected function prepareCrudConfig() {
|
||||
if (!$this->user->can('WarehouseAdmin')) $this->additionalJSVariables['WAREHOUSE_ADMIN'] = false;
|
||||
if (isset($_SESSION[MFAPPNAME . '_warehouse_login_override']) && is_numeric($_SESSION[MFAPPNAME . '_warehouse_login_override'])) $this->additionalJSVariables['HIDE_MENU'] = true;
|
||||
}
|
||||
|
||||
protected function beforeCreate($postData): bool {
|
||||
|
||||
Reference in New Issue
Block a user