From f2f9f225456628617df3da7f55f502a4ed83a2fb Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 17 Feb 2022 17:41:30 -0500 Subject: [PATCH] Started using new php function for Currency formatting as this is best preactice, removed Client Access and removed certian user roles --- blank.php | 7 ++++++ check_login.php | 21 ++++------------- clients.php | 9 +------ dashboard_financial.php | 18 +++++++------- footer.php | 1 - get_settings.php | 4 ++++ post.php | 25 -------------------- user_add_modal.php | 7 ++---- user_clients_modal.php | 52 ----------------------------------------- user_edit_modal.php | 7 ++---- users.php | 12 ++-------- 11 files changed, 32 insertions(+), 131 deletions(-) delete mode 100644 user_clients_modal.php diff --git a/blank.php b/blank.php index 22f906c0..b987543d 100644 --- a/blank.php +++ b/blank.php @@ -13,4 +13,11 @@

This is a great starting point for new custom pages.

+ + \ No newline at end of file diff --git a/check_login.php b/check_login.php index 963dcb2a..1574b49a 100644 --- a/check_login.php +++ b/check_login.php @@ -40,16 +40,10 @@ $session_token = $row['user_token']; $session_company_id = $row['user_default_company']; $session_user_role = $row['user_role']; - if($session_user_role == 6){ - $session_user_role_display = "Global Administrator"; - }elseif($session_user_role == 5){ + if($session_user_role == 3){ $session_user_role_display = "Administrator"; - }elseif($session_user_role == 4){ - $session_user_role_display = "Technician"; - }elseif($session_user_role == 3){ - $session_user_role_display = "IT Contractor"; }elseif($session_user_role == 2){ - $session_user_role_display = "Client"; + $session_user_role_display = "Technician"; }else{ $session_user_role_display = "Accountant"; } @@ -69,14 +63,6 @@ header('Location: login.php'); } - //LOAD USER CLIENT ACCESS PERMISSIONS - $session_user_client_access_sql = mysqli_query($mysqli,"SELECT client_id FROM user_clients WHERE user_id = $session_user_id"); - $session_user_client_access_array = array(); - while($row = mysqli_fetch_array($session_user_client_access_sql)){ - $session_user_client_access_array[] = $row['client_id']; - } - $session_user_client_access = implode(',',$session_user_client_access_array); - $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = $session_company_id"); $row = mysqli_fetch_array($sql); @@ -101,4 +87,7 @@ $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('alert_id') AS num FROM alerts WHERE alert_ack_date IS NULL AND company_id = $session_company_id")); $num_alerts = $row['num']; + //Set Currency Format + $currency_format = numfmt_create('en-US', NumberFormatter::CURRENCY); + ?> \ No newline at end of file diff --git a/clients.php b/clients.php index 92cfad24..cbe17644 100644 --- a/clients.php +++ b/clients.php @@ -1,12 +1,5 @@
-

+

Income

- Receivables: + Receivables:
@@ -138,7 +138,7 @@ $vendors_added = $row['vendors_added'];
-

+

Expenses

@@ -152,7 +152,7 @@ $vendors_added = $row['vendors_added'];
-

+

Profit

@@ -166,7 +166,7 @@ $vendors_added = $row['vendors_added'];
-

+

Monthly Recurring

@@ -180,7 +180,7 @@ $vendors_added = $row['vendors_added'];
-

+

Yearly Recurring

@@ -359,7 +359,7 @@ $vendors_added = $row['vendors_added']; $balance = '0.00'; } ?> - + - + - + - \ No newline at end of file diff --git a/get_settings.php b/get_settings.php index 285f1ba3..f482e548 100644 --- a/get_settings.php +++ b/get_settings.php @@ -54,6 +54,10 @@ $config_stripe_enable = $row['config_stripe_enable']; $config_stripe_publishable = $row['config_stripe_publishable']; $config_stripe_secret = $row['config_stripe_secret']; +//Currency + +$config_currency_format = "US_en"; + $colors_array = array( 'green', 'olive', diff --git a/post.php b/post.php index feb5328d..4e068f56 100644 --- a/post.php +++ b/post.php @@ -330,30 +330,6 @@ if(isset($_POST['edit_user_companies'])){ } -if(isset($_POST['edit_user_clients'])){ - - $user_id = intval($_POST['user_id']); - - mysqli_query($mysqli,"DELETE FROM user_clients WHERE user_id = $user_id"); - - foreach($_POST['clients'] as $client){ - intval($client); - mysqli_query($mysqli,"INSERT INTO user_clients SET user_id = $user_id, client_id = $client"); - } - - //Logging - //Get User Name - $sql = mysqli_query($mysqli,"SELECT * FROM users WHERE user_id = $user_id"); - $row = mysqli_fetch_array($sql); - $name = $row['user_name']; - mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'User', log_action = 'Modify', log_description = '$session_name updated client permissions for user $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_created_at = NOW(), log_user_id = $session_user_id, company_id = $session_company_id"); - - $_SESSION['alert_message'] = "Client $client_imploded added to user $user_id!"; - - header("Location: users.php"); - -} - if(isset($_GET['archive_user'])){ $user_id = intval($_GET['archive_user']); @@ -383,7 +359,6 @@ if(isset($_GET['delete_user'])){ mysqli_query($mysqli,"DELETE FROM tickets WHERE ticket_closed_by = $user_id"); mysqli_query($mysqli,"DELETE FROM ticket_replies WHERE ticket_reply_by = $user_id"); mysqli_query($mysqli,"DELETE FROM user_companies WHERE user_id = $user_id"); - mysqli_query($mysqli,"DELETE FROM user_clients WHERE user_id = $user_id"); //Logging //Get User Name diff --git a/user_add_modal.php b/user_add_modal.php index b23f4564..8926cf7e 100644 --- a/user_add_modal.php +++ b/user_add_modal.php @@ -75,11 +75,8 @@
diff --git a/user_clients_modal.php b/user_clients_modal.php deleted file mode 100644 index 34029f67..00000000 --- a/user_clients_modal.php +++ /dev/null @@ -1,52 +0,0 @@ - \ No newline at end of file diff --git a/user_edit_modal.php b/user_edit_modal.php index adff3914..00aa0202 100644 --- a/user_edit_modal.php +++ b/user_edit_modal.php @@ -88,11 +88,8 @@
diff --git a/users.php b/users.php index ab1ffe1f..fb7527ed 100644 --- a/users.php +++ b/users.php @@ -87,16 +87,10 @@ $user_avatar = $row['user_avatar']; $user_default_company = $row['user_default_company']; $user_role = $row['user_role']; - if($user_role == 6){ - $user_role_display = "Global Administrator"; - }elseif($user_role == 5){ + if($user_role == 3){ $user_role_display = "Administrator"; - }elseif($user_role == 4){ - $user_role_display = "Technician"; - }elseif($user_role == 3){ - $user_role_display = "IT Contractor"; }elseif($user_role == 2){ - $user_role_display = "Client"; + $user_role_display = "Technician"; }else{ $user_role_display = "Accountant"; } @@ -160,7 +154,6 @@ Edit
Company Access - Client Access
Archive
@@ -172,7 +165,6 @@ include("user_edit_modal.php"); include("user_companies_modal.php"); - include("user_clients_modal.php"); }