Merge branch 'feature/CreateTotalReport' into 'develop'
Feature/create total report See merge request witel-back-end/crm!26
This commit is contained in:
@@ -27,7 +27,8 @@ class UserResource extends JsonResource
|
|||||||
'province_name' => $this->province_name,
|
'province_name' => $this->province_name,
|
||||||
'role' => $this->roles->pluck('id', 'name_fa'),
|
'role' => $this->roles->pluck('id', 'name_fa'),
|
||||||
'permissions' => $this->getPermissionNames(),
|
'permissions' => $this->getPermissionNames(),
|
||||||
'telephone_id' => $this->telephone_id
|
'telephone_id' => $this->telephone_id,
|
||||||
|
'server_province_id' => config('ProvinceInfo.id'),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -203,7 +203,7 @@ Route::prefix('server')->group(function () {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
Route::middleware(['auth', 'role:admin'])
|
Route::middleware(['auth', 'permission:teleport_to_province'])
|
||||||
->prefix('login_to_province')
|
->prefix('login_to_province')
|
||||||
->name('loginToProvince.')
|
->name('loginToProvince.')
|
||||||
->controller(LoginToProvinceController::class)
|
->controller(LoginToProvinceController::class)
|
||||||
|
|||||||
Reference in New Issue
Block a user