cief/ARCHIVED-IZYIM
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/ARCHIVED-IZYIM.git synced 2026-08-19 04:14:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/IZYIM

Browse Source
This commit is contained in:
CIEF Dev Team
2018-03-20 08:19:11 +00:00
parent 2a2690258d b0086fcc1d
commit 3692b546c0
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.htaccess
+1 -1
View File
@@ -1,4 +1,4 @@
RewriteEngine On
RewriteEngine On
RewriteBase /
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{HTTPS} off
includes/func.class/general.func.php
+1 -1
View File
@@ -555,7 +555,7 @@ function getModalStaff($id) {
<select id='position_edit' name='position_edit' class='form-control'>
<option " . ($value["position"] == 1 ? "selected" : "") . " value='1'>Admin</option>
<option " . ($value["position"] == 2 ? "selected" : "") . " value='2'>Branch Admin</option>
<option " . ($value["position"] == 3 ? "selected" : "") . " value='2'>Staff</option>
<option " . ($value["position"] == 3 ? "selected" : "") . " value='3'>Staff</option>
</select>
</div>
</div>
modul/common/company/editstaff.tpl.php
+1 -1
View File
@@ -130,7 +130,7 @@
<center>Name</center>
</th>
<th>
<center>Role</center>
<center>Position</center>
</th>
<?php if($_SESSION['group_id'] == 2){ ?>
<th>
modul/common/company/init.php
+2 -1
View File
@@ -786,8 +786,9 @@ function the_company() {
$db->bind("id", $id);
$db->bind("position", $position);
$db->bind("branch", $branch);
echo $id;
// EXECUTE
$row = $db->query("UPDATE user_company SET position = :position, branch_id = :branch WHERE id = :id");
$row = $db->query("UPDATE user_company SET branch_id = :branch, position = :position WHERE id = :id");
if ($row) {
action_log($_SESSION['user_id'], "Edit Staff : ID - " . $id , "SUCCESS");
return new Response('SUCCESS', 200);