Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Finished Preorder statistics / added statistics permission

Browse Source
This commit is contained in:
Frank Schubert
2024-01-20 09:17:26 +01:00
parent 791465c9a4
commit a90de85ddf
7 changed files with 114 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
application/Dashboard/DashboardController.php
View File

@@ -23,8 +23,7 @@ class DashboardController extends mfBaseController {
$newss = NewsModel::getAll();
$this->layout()->set("newss", $newss);
//if($this->me->is(["Admin", "netowner", "salespartner"]) || $this->me->can("Preorder")) {
if($this->me->is("Admin")) {
if($this->me->can("Statistics") && $this->me->is(["Admin", "netowner", "salespartner"])) {
return $this->dashboardAction();
}
@@ -118,7 +117,7 @@ class DashboardController extends mfBaseController {
foreach($preordercampaign_id as $campaign_id) {
$campaign = new Preordercampaign($campaign_id);
if($campaign->id) {
$total_homes += $campaign->total_homes;
$total_homes += ($campaign->homes_total) ? $campaign->homes_total : $campaign->total_homes;
}
}

5
application/User/UserController.php
View File

@@ -51,7 +51,9 @@ class UserController extends mfBaseController
}
$this->layout()->setTemplate('User/Form');
$addresses = AddressModel::getAll();
$roles = TT_NETWORK_ROLES_WITH_OWNER;
$roles[] = "systemowner";
$addresses = AddressModel::search(["addresstype" => $roles]);
$this->layout()->set("addresses", $addresses);
if ($this->request->address_id) {
@@ -225,6 +227,7 @@ class UserController extends mfBaseController
$user->permissions->canPreorder = "false";
$user->permissions->canOrder = "false";
$user->permissions->canFibu = "false";
$user->permissions->canStatistics = "false";
if($r->get("can") && is_array($r->can)) {
foreach($r->can as $key => $can) {