Skip to content

Commit 7ec59f9

Browse files
committed
Widgets are always loaded..
1 parent 039cfb0 commit 7ec59f9

14 files changed

Lines changed: 69 additions & 38 deletions

modules/registrars/realtimeregister/src/Hooks/Widgets/ActionsWidget.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
class ActionsWidget extends Hook
99
{
10-
public function __invoke(DataObject $vars)
10+
public function __invoke(DataObject $vars): \RealtimeRegisterDomains\Widget\ActionsWidget
1111
{
12-
return new \RealtimeRegisterDomains\Widget\ActionsWidget();
12+
return new \RealtimeRegisterDomains\Widget\ActionsWidget($vars);
1313
}
1414
}

modules/registrars/realtimeregister/src/Hooks/Widgets/BalanceWidget.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
class BalanceWidget extends Hook
99
{
10-
public function __invoke(DataObject $vars)
10+
public function __invoke(DataObject $vars): \RealtimeRegisterDomains\Widget\BalanceModuleWidget
1111
{
12-
return new \RealtimeRegisterDomains\Widget\BalanceModuleWidget();
12+
return new \RealtimeRegisterDomains\Widget\BalanceModuleWidget($vars);
1313
}
1414
}

modules/registrars/realtimeregister/src/Hooks/Widgets/DomainOverviewWidget.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
class DomainOverviewWidget extends Hook
99
{
10-
public function __invoke(DataObject $vars)
10+
public function __invoke(DataObject $vars): \RealtimeRegisterDomains\Widget\DomainOverviewModuleWidget
1111
{
12-
return new \RealtimeRegisterDomains\Widget\DomainOverviewModuleWidget();
12+
return new \RealtimeRegisterDomains\Widget\DomainOverviewModuleWidget($vars);
1313
}
1414
}

modules/registrars/realtimeregister/src/Hooks/Widgets/ErrorLogWidget.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
class ErrorLogWidget extends Hook
99
{
10-
public function __invoke(DataObject $vars)
10+
public function __invoke(DataObject $vars): \RealtimeRegisterDomains\Widget\ErrorLogWidget
1111
{
12-
return new \RealtimeRegisterDomains\Widget\ErrorLogWidget();
12+
return new \RealtimeRegisterDomains\Widget\ErrorLogWidget($vars);
1313
}
1414
}

modules/registrars/realtimeregister/src/Hooks/Widgets/InactiveDomainWidget.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
class InactiveDomainWidget extends Hook
99
{
10-
public function __invoke(DataObject $vars)
10+
public function __invoke(DataObject $vars): \RealtimeRegisterDomains\Widget\InactiveDomainsWidget
1111
{
12-
return new \RealtimeRegisterDomains\Widget\InactiveDomainsWidget();
12+
return new \RealtimeRegisterDomains\Widget\InactiveDomainsWidget($vars);
1313
}
1414
}

modules/registrars/realtimeregister/src/Hooks/Widgets/PromoWidget.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
class PromoWidget extends Hook
99
{
10-
public function __invoke(DataObject $vars)
10+
public function __invoke(DataObject $vars): \RealtimeRegisterDomains\Widget\PromoWidget
1111
{
12-
return new \RealtimeRegisterDomains\Widget\PromoWidget();
12+
return new \RealtimeRegisterDomains\Widget\PromoWidget($vars);
1313
}
1414
}

modules/registrars/realtimeregister/src/Hooks/Widgets/UpdateWidget.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44

55
use RealtimeRegisterDomains\Entities\DataObject;
66
use RealtimeRegisterDomains\Hooks\Hook;
7-
use WHMCS\Module\AbstractWidget;
87

98
class UpdateWidget extends Hook
109
{
1110
public function __invoke(DataObject $vars): \RealtimeRegisterDomains\Widget\UpdateWidget
1211
{
13-
return new \RealtimeRegisterDomains\Widget\UpdateWidget();
12+
return new \RealtimeRegisterDomains\Widget\UpdateWidget($vars);
1413
}
1514
}

modules/registrars/realtimeregister/src/Widget/ActionsWidget.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class ActionsWidget extends BalanceModuleWidget
1010
protected $description = '';
1111
protected $weight = 150;
1212
protected $columns = 1;
13-
protected $cache = false;
13+
protected $cache = true;
1414
protected $cacheExpiry = 120;
1515
protected $requiredPermission = '';
1616

modules/registrars/realtimeregister/src/Widget/BalanceModuleWidget.php

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,20 @@ class BalanceModuleWidget extends BaseWidget
1010
protected $description = '';
1111
protected $weight = 150;
1212
protected $columns = 1;
13-
protected $cache = false;
13+
protected $cache = true;
1414
protected $cacheExpiry = 120;
1515
protected $requiredPermission = '';
1616

1717
public function getData()
1818
{
19-
try {
20-
$credits = App::client()->customers->credits(App::registrarConfig()->customerHandle());
21-
return $credits->entities;
22-
} catch (\Exception) {
23-
return 0;
19+
if ($this->isVisible()) {
20+
try {
21+
$credits = App::client()->customers->credits(App::registrarConfig()->customerHandle());
22+
return $credits->entities;
23+
} catch (\Exception) {
24+
}
2425
}
26+
return 0;
2527
}
2628

2729
public function generateOutput($data): string

modules/registrars/realtimeregister/src/Widget/BaseWidget.php

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,18 @@
22

33
namespace RealtimeRegisterDomains\Widget;
44

5+
use RealtimeRegisterDomains\Entities\DataObject;
6+
use RealtimeRegisterDomains\Models\Whmcs\Admin;
7+
58
abstract class BaseWidget extends \WHMCS\Module\AbstractWidget
69
{
10+
protected DataObject $vars;
11+
12+
public function __construct(DataObject $vars)
13+
{
14+
$this->vars = $vars;
15+
}
16+
717
public function getId(): string
818
{
919
$classname = get_called_class();
@@ -13,4 +23,18 @@ public function getId(): string
1323

1424
return $pos;
1525
}
26+
27+
protected function isVisible(): bool
28+
{
29+
$admin = Admin::query()->find($this->vars->get('adminid'));
30+
31+
$hiddenWidgets = $admin->hidden_widgets;
32+
33+
if ($hiddenWidgets) {
34+
if (in_array($this->getId(), explode(',', $hiddenWidgets))) {
35+
return false;
36+
}
37+
}
38+
return true;
39+
}
1640
}

0 commit comments

Comments
 (0)