Refactor permission checks across multiple files to utilize isAllowed function for better access control management. Updated hierarchy level checks in account, contracts, equipments, partners, users, and API endpoints to streamline permission validation. Enhanced download options visibility based on user permissions in various reports and management pages. Improved modal behavior and auto-installation process in software tool after payment success. Added new helper functions for building dynamic where clauses based on user hierarchy levels.
This commit is contained in:
@@ -40,7 +40,7 @@ if ($id != ''){
|
||||
$salesid_new = (($post_content['salesid'] != '' && $post_content['salesid'] != $accounthierarchy_old->salesid)? $post_content['salesid'] : $accounthierarchy_old->salesid);
|
||||
$soldto_new = (($post_content['soldto'] != '' && $post_content['soldto'] != $accounthierarchy_old->soldto)? $post_content['soldto'] : $accounthierarchy_old->soldto);
|
||||
|
||||
if ($permission == 3 || $permission == 4){
|
||||
if (getHierarchyLevel($partner) == 1 || getHierarchyLevel($partner) == 0){
|
||||
//ADMIN ONLY ARE ALLOWED TO CHANGE SALES AND SOLD
|
||||
$account = array(
|
||||
"salesid"=>$salesid_new,
|
||||
|
||||
@@ -58,7 +58,7 @@ if ($id != ''){
|
||||
$shipto_new = (($post_content['shipto'] != '' && $post_content['shipto'] != $contract_old->shipto)? $post_content['shipto'] : $contract_old->shipto);
|
||||
$location_new = (($post_content['location'] != '' && $post_content['location'] != $contract_old->location)? $post_content['location'] : $contract_old->location);
|
||||
|
||||
if ($permission == 4){
|
||||
if (getHierarchyLevel($partner) == 0){
|
||||
//ADMIN+ ONLY ARE ALLOWED TO CHANGE SALES AND SOLD
|
||||
$account = array(
|
||||
"salesid"=>$salesid_new,
|
||||
@@ -67,7 +67,7 @@ if ($id != ''){
|
||||
"location"=>$location_new
|
||||
);
|
||||
}
|
||||
elseif ($permission == 3) {
|
||||
elseif (getHierarchyLevel($partner) == 1) {
|
||||
//ADMIN ONLY ARE ALLOWED TO CHANGE SOLD
|
||||
$account = array(
|
||||
"salesid"=>$contract_old->salesid,
|
||||
@@ -120,7 +120,7 @@ if ($id != ''){
|
||||
}
|
||||
else {
|
||||
//ID is empty => INSERT / NEW RECORD
|
||||
if ($permission == 4){
|
||||
if (getHierarchyLevel($partner) == 0){
|
||||
$account = array(
|
||||
"salesid"=>$post_content['salesid'],
|
||||
"soldto"=>$post_content['soldto'],
|
||||
@@ -128,7 +128,7 @@ else {
|
||||
"location"=>$post_content['location']
|
||||
);
|
||||
}
|
||||
elseif ($permission == 3){
|
||||
elseif (getHierarchyLevel($partner) == 1){
|
||||
$account = array(
|
||||
"salesid"=>$partner->salesid,
|
||||
"soldto"=>$post_content['soldto'],
|
||||
@@ -160,7 +160,7 @@ if (isset($post_content['servicetool'])){
|
||||
if (isset($post_content['ignore_list'])){
|
||||
$post_content['ignore_list'] = json_encode($post_content['ignore_list'], JSON_UNESCAPED_UNICODE);
|
||||
//ONLY ADMINS ARE ALLOWED TO UPDATE IGNORE LIST
|
||||
if ($permission != 3 && $permission != 4){
|
||||
if (getHierarchyLevel($partner) != 1 && getHierarchyLevel($partner) != 0){
|
||||
unset($post_content['ignore_list']);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@ if ($id != ''){
|
||||
|
||||
$owner_equipment = (($equipment_data['createdby'] == $username)? 1 : 0);
|
||||
|
||||
if ($permission == 4){
|
||||
if (getHierarchyLevel($partner) == 0){
|
||||
//ADMIN+ ONLY ARE ALLOWED TO CHANGE SALES AND SOLD
|
||||
$account = array(
|
||||
"salesid"=>$salesid_new,
|
||||
@@ -57,7 +57,7 @@ if ($id != ''){
|
||||
"section"=>$section_new
|
||||
);
|
||||
}
|
||||
elseif ($permission == 3) {
|
||||
elseif (getHierarchyLevel($partner) == 1) {
|
||||
//ADMIN ONLY ARE ALLOWED TO CHANGE SOLD
|
||||
$account = array(
|
||||
"salesid"=>$equipment_old->salesid,
|
||||
@@ -79,7 +79,7 @@ if ($id != ''){
|
||||
}
|
||||
else {
|
||||
//ID is empty => INSERT / NEW RECORD
|
||||
if ($permission == 4){
|
||||
if (getHierarchyLevel($partner) == 0){
|
||||
$account = array(
|
||||
"salesid"=>$post_content['salesid'],
|
||||
"soldto"=>$post_content['soldto'],
|
||||
@@ -89,7 +89,7 @@ else {
|
||||
|
||||
);
|
||||
}
|
||||
elseif ($permission == 3){
|
||||
elseif (getHierarchyLevel($partner) == 1){
|
||||
$account = array(
|
||||
"salesid"=>$partner->salesid,
|
||||
"soldto"=>$post_content['soldto'],
|
||||
|
||||
@@ -41,7 +41,7 @@ if ($id != ''){
|
||||
$salesid_new = (($post_content['salesid'] != '' && $post_content['salesid'] != $partnerhierarchy_old->salesid)? $post_content['salesid'] : $partnerhierarchy_old->salesid);
|
||||
$soldto_new = (($post_content['soldto'] != '' && $post_content['soldto'] != $partnerhierarchy_old->soldto)? $post_content['soldto'] : $partnerhierarchy_old->soldto);
|
||||
|
||||
if ($permission == 3 || $permission == 4){
|
||||
if (getHierarchyLevel($partner) == 1 || getHierarchyLevel($partner) == 0){
|
||||
//ADMIN ONLY ARE ALLOWED TO CHANGE SALES AND SOLD
|
||||
$account = array(
|
||||
"salesid"=>$salesid_new,
|
||||
@@ -56,7 +56,7 @@ if ($id != ''){
|
||||
}
|
||||
else {
|
||||
//ID is empty => INSERT / NEW RECORD
|
||||
if ($permission == 3 || $permission == 4){
|
||||
if (getHierarchyLevel($partner) == 1 || getHierarchyLevel($partner) == 0){
|
||||
//ADMIN ONLY ARE ALLOWED TO CHANGE SALES AND SOLD
|
||||
$account = array(
|
||||
"salesid"=>$partner->salesid,
|
||||
|
||||
@@ -50,7 +50,7 @@ $soldto_new = ((isset($post_content['soldto']) && $post_content['soldto'] != ''
|
||||
$shipto_new = (($post_content['shipto'] != '' && $post_content['shipto'] != $partnerhierarchy_old->shipto)? $post_content['shipto'] : $partnerhierarchy_old->shipto);
|
||||
$location_new = (($post_content['location'] != '' && $post_content['location'] != $partnerhierarchy_old->location)? $post_content['location'] : $partnerhierarchy_old->location);
|
||||
|
||||
if ($permission == 4){
|
||||
if (getHierarchyLevel($partner) == 0){
|
||||
//ADMIN+ ONLY ARE ALLOWED TO CHANGE SALES AND SOLD
|
||||
$account = array(
|
||||
"salesid"=>$salesid_new,
|
||||
@@ -58,7 +58,7 @@ $location_new = (($post_content['location'] != '' && $post_content['location'] !
|
||||
"shipto"=>$shipto_new,
|
||||
"location"=>$location_new
|
||||
);
|
||||
}elseif ($permission == 3) {
|
||||
}elseif (getHierarchyLevel($partner) == 1) {
|
||||
//ADMIN ONLY ARE ALLOWED TO CHANGE SOLD
|
||||
$account = array(
|
||||
"salesid"=>$partner->salesid,
|
||||
@@ -77,7 +77,7 @@ $location_new = (($post_content['location'] != '' && $post_content['location'] !
|
||||
}
|
||||
} elseif ($command == 'insert') {
|
||||
//ID is empty => INSERT / NEW RECORD
|
||||
if ($permission == 4){
|
||||
if (getHierarchyLevel($partner) == 0){
|
||||
//ADMIN+ ONLY ARE ALLOWED TO CHANGE SALES AND SOLD
|
||||
$account = array(
|
||||
"salesid"=>$post_content['salesid'],
|
||||
@@ -86,7 +86,7 @@ $location_new = (($post_content['location'] != '' && $post_content['location'] !
|
||||
"location"=>$post_content['location']
|
||||
);
|
||||
}
|
||||
elseif ($permission == 3){
|
||||
elseif (getHierarchyLevel($partner) == 1){
|
||||
//ADMIN ONLY ARE ALLOWED TO CHANGE SOLD
|
||||
$account = array(
|
||||
"salesid"=>$partner->salesid,
|
||||
|
||||
Reference in New Issue
Block a user