Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
79e37778d3
@ -361,7 +361,7 @@ $routes->group("/util", ["filter" => "authMVC"], function ($routes) {
|
|||||||
$routes->get('removeInstallments', 'LeadsController::removeInstallments');
|
$routes->get('removeInstallments', 'LeadsController::removeInstallments');
|
||||||
$routes->get('viewHrAccessData', 'ClientController::viewHrAccessData');
|
$routes->get('viewHrAccessData', 'ClientController::viewHrAccessData');
|
||||||
$routes->post('saveHrAccessData', 'ClientController::saveHrAccessData');
|
$routes->post('saveHrAccessData', 'ClientController::saveHrAccessData');
|
||||||
$routes->post('removeLevelContacts', 'ClientController::removeLevelContacts');
|
$routes->get('removeLevelContacts', 'ClientController::removeLevelContacts');
|
||||||
});
|
});
|
||||||
|
|
||||||
$routes->post("policy_tranction/sendInstallmentRemainderMail","PolicyTransactionController::sendInstallmentRemainderMail");
|
$routes->post("policy_tranction/sendInstallmentRemainderMail","PolicyTransactionController::sendInstallmentRemainderMail");
|
||||||
|
|||||||
@ -13,7 +13,7 @@ use App\Models\RoleModel;
|
|||||||
use App\Models\TeamModel;
|
use App\Models\TeamModel;
|
||||||
use App\Models\UserTeamsModel;
|
use App\Models\UserTeamsModel;
|
||||||
use App\Helpers\BookStackUserHelper;
|
use App\Helpers\BookStackUserHelper;
|
||||||
use App\Helpers\AuthHistoryModel;
|
use App\Models\AuthHistoryModel;
|
||||||
use App\Models\UserActivityHistoryModel;
|
use App\Models\UserActivityHistoryModel;
|
||||||
|
|
||||||
|
|
||||||
@ -25,6 +25,8 @@ class UserController extends AdminController
|
|||||||
protected $teamModel;
|
protected $teamModel;
|
||||||
protected $userTeamsModel;
|
protected $userTeamsModel;
|
||||||
protected $bookStack;
|
protected $bookStack;
|
||||||
|
protected $authHistoryModel;
|
||||||
|
protected $userActivityHistoryModel;
|
||||||
|
|
||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user