diff --git a/add_company_modal.php b/add_company_modal.php index 21e3457e..01a58437 100644 --- a/add_company_modal.php +++ b/add_company_modal.php @@ -20,6 +20,71 @@ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+
diff --git a/companies.php b/companies.php index d5f4c924..79befc8d 100644 --- a/companies.php +++ b/companies.php @@ -50,7 +50,6 @@ ?> -
Companies
@@ -79,7 +78,14 @@ while($row = mysqli_fetch_array($sql)){ $company_id = $row['company_id']; $company_name = $row['company_name']; + $company_address = $row['config_company_address']; + $company_city = $row['config_company_city']; + $company_state = $row['config_company_state']; + $company_zip = $row['config_company_zip']; + $company_phone = $row['config_company_phone']; + $company_site = $row['config_company_site']; $company_logo = $row['config_invoice_logo']; + $initials = initials($company_name); ?> diff --git a/edit_company_modal.php b/edit_company_modal.php index 2b82a4f8..df3ce15d 100644 --- a/edit_company_modal.php +++ b/edit_company_modal.php @@ -21,6 +21,71 @@
+
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+
diff --git a/guest_view_quote.php b/guest_view_quote.php index 932e5ce6..ac1809cd 100644 --- a/guest_view_quote.php +++ b/guest_view_quote.php @@ -63,7 +63,6 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){ $browser = get_web_browser(); $device = get_device(); - //Mark viewed in history //Mark viewed in history mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = '$quote_status', history_description = 'Quote viewed - $ip - $os - $browser - $device', history_created_at = NOW(), quote_id = $quote_id, company_id = $company_id"); diff --git a/post.php b/post.php index a1f0e174..5272c713 100644 --- a/post.php +++ b/post.php @@ -90,6 +90,13 @@ if(isset($_POST['edit_user'])){ if(isset($_POST['add_company'])){ $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])); + $address = strip_tags(mysqli_real_escape_string($mysqli,$_POST['address'])); + $city = strip_tags(mysqli_real_escape_string($mysqli,$_POST['city'])); + $state = strip_tags(mysqli_real_escape_string($mysqli,$_POST['state'])); + $zip = strip_tags(mysqli_real_escape_string($mysqli,$_POST['zip'])); + $phone = strip_tags(mysqli_real_escape_string($mysqli,$_POST['phone'])); + $phone = preg_replace("/[^0-9]/", '',$phone); + $site = strip_tags(mysqli_real_escape_string($mysqli,$_POST['site'])); mysqli_query($mysqli,"INSERT INTO companies SET company_name = '$name', company_created_at = NOW()"); @@ -102,7 +109,7 @@ if(isset($_POST['add_company'])){ mkdir("uploads/settings/$company_id"); mkdir("uploads/tmp/$company_id"); - mysqli_query($mysqli,"INSERT INTO settings SET company_id = $company_id, config_company_name = '$name', config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_api_key = '$config_api_key', config_recurring_auto_send_invoice = 1, config_default_net_terms = 7, config_send_invoice_reminders = 0, config_enable_cron = 0, config_ticket_next_number = 1"); + mysqli_query($mysqli,"INSERT INTO settings SET company_id = $company_id, config_company_name = '$name', config_company_address = '$address', config_company_city = '$city', config_company_state = '$state', config_company_zip = '$zip', config_company_phone = '$phone', config_company_site = '$site', config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_api_key = '$config_api_key', config_recurring_auto_send_invoice = 1, config_default_net_terms = 7, config_send_invoice_reminders = 0, config_enable_cron = 0, config_ticket_next_number = 1"); //logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Company', log_action = 'Created', log_description = '$name', log_created_at = NOW()"); @@ -116,9 +123,18 @@ if(isset($_POST['add_company'])){ if(isset($_POST['edit_company'])){ $company_id = intval($_POST['company_id']); $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])); + $address = strip_tags(mysqli_real_escape_string($mysqli,$_POST['address'])); + $city = strip_tags(mysqli_real_escape_string($mysqli,$_POST['city'])); + $state = strip_tags(mysqli_real_escape_string($mysqli,$_POST['state'])); + $zip = strip_tags(mysqli_real_escape_string($mysqli,$_POST['zip'])); + $phone = strip_tags(mysqli_real_escape_string($mysqli,$_POST['phone'])); + $phone = preg_replace("/[^0-9]/", '',$phone); + $site = strip_tags(mysqli_real_escape_string($mysqli,$_POST['site'])); mysqli_query($mysqli,"UPDATE companies SET company_name = '$name', company_updated_at = NOW() WHERE company_id = $company_id"); + mysqli_query($mysqli,"UPDATE settings SET config_company_name = '$name', config_company_address = '$address', config_company_city = '$city', config_company_state = '$state', config_company_zip = '$zip', config_company_phone = '$phone', config_company_site = '$site' WHERE company_id = $company_id"); + //logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Company', log_action = 'Modified', log_description = '$name', log_created_at = NOW()"); diff --git a/settings-user.php b/settings-user.php index 51ba4373..dc1e34d7 100644 --- a/settings-user.php +++ b/settings-user.php @@ -6,7 +6,7 @@ $sql_recent_logins = mysqli_query($mysqli,"SELECT * FROM logs ORDER BY log_id DESC LIMIT 3"); $sql_recent_logs = mysqli_query($mysqli,"SELECT * FROM logs - WHERE user_id = $session_user_id + WHERE user_id = $session_user_id AND log_type NOT LIKE 'Login' ORDER BY log_id DESC LIMIT 5"); ?>