diff --git a/add_client_modal.php b/add_client_modal.php index dcbc939e..0eba4b98 100644 --- a/add_client_modal.php +++ b/add_client_modal.php @@ -79,6 +79,21 @@
+
+ +
+
+ +
+ +
+
+
@@ -120,7 +135,7 @@
- +
diff --git a/add_company_modal.php b/add_company_modal.php index eda1d4e7..ebfca29d 100644 --- a/add_company_modal.php +++ b/add_company_modal.php @@ -20,6 +20,21 @@
+
+ +
+
+ +
+ +
+
+
@@ -61,7 +76,7 @@
- +
diff --git a/add_location_modal.php b/add_location_modal.php index 05b6fd24..503c8514 100644 --- a/add_location_modal.php +++ b/add_location_modal.php @@ -59,6 +59,21 @@
+
+ +
+
+ +
+ +
+
+
@@ -100,7 +115,7 @@
- +
diff --git a/add_vendor_modal.php b/add_vendor_modal.php index b5dca7f2..79aca15a 100644 --- a/add_vendor_modal.php +++ b/add_vendor_modal.php @@ -66,6 +66,21 @@
+
+ +
+
+ +
+ +
+
+
@@ -107,7 +122,7 @@
- +
diff --git a/client.php b/client.php index a8726276..fcc6b591 100644 --- a/client.php +++ b/client.php @@ -16,6 +16,7 @@ if(isset($_GET['client_id'])){ $row = mysqli_fetch_array($sql); $client_name = $row['client_name']; $client_type = $row['client_type']; + $client_country = $row['client_country']; $client_address = $row['client_address']; $client_city = $row['client_city']; $client_state = $row['client_state']; diff --git a/client_contacts.php b/client_contacts.php index f2796e8b..7fded3df 100644 --- a/client_contacts.php +++ b/client_contacts.php @@ -152,6 +152,7 @@ $total_pages = ceil($total_found_rows / 10); +
diff --git a/client_locations.php b/client_locations.php index 2ca5e8eb..262f5259 100644 --- a/client_locations.php +++ b/client_locations.php @@ -84,6 +84,7 @@ $total_pages = ceil($total_found_rows / 10); while($row = mysqli_fetch_array($sql)){ $location_id = $row['location_id']; $location_name = $row['location_name']; + $location_country = $row['location_country']; $location_address = $row['location_address']; $location_city = $row['location_city']; $location_state = $row['location_state']; diff --git a/client_vendors.php b/client_vendors.php index 16c84477..1aca2acb 100644 --- a/client_vendors.php +++ b/client_vendors.php @@ -86,6 +86,7 @@ $total_pages = ceil($total_found_rows / 10); $vendor_name = $row['vendor_name']; $vendor_description = $row['vendor_description']; $vendor_account_number = $row['vendor_account_number']; + $vendor_country = $row['vendor_country']; $vendor_address = $row['vendor_address']; $vendor_city = $row['vendor_city']; $vendor_state = $row['vendor_state']; diff --git a/clients.php b/clients.php index a7e523b4..e2ac819a 100644 --- a/clients.php +++ b/clients.php @@ -116,6 +116,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); $client_id = $row['client_id']; $client_name = $row['client_name']; $client_type = $row['client_type']; + $client_country = $row['client_country']; $client_address = $row['client_address']; $client_city = $row['client_city']; $client_state = $row['client_state']; diff --git a/companies.php b/companies.php index 9927b187..f05194cd 100644 --- a/companies.php +++ b/companies.php @@ -78,13 +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']; + $company_country = $row['company_country']; + $company_address = $row['company_address']; + $company_city = $row['company_city']; + $company_state = $row['company_state']; + $company_zip = $row['company_zip']; + $company_phone = $row['company_phone']; + $company_site = $row['company_site']; + $company_logo = $row['company_invoice_logo']; $initials = initials($company_name); diff --git a/db.sql b/db.sql index 2f8f56e2..ad6714ff 100644 --- a/db.sql +++ b/db.sql @@ -1,8 +1,8 @@ --- MariaDB dump 10.17 Distrib 10.4.11-MariaDB, for debian-linux-gnu (x86_64) +-- MariaDB dump 10.17 Distrib 10.4.12-MariaDB, for debian-linux-gnu (x86_64) -- -- Host: localhost Database: admin_crm -- ------------------------------------------------------ --- Server version 10.4.11-MariaDB-1:10.4.11+maria~bionic +-- Server version 10.4.12-MariaDB-1:10.4.12+maria~bionic /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -134,6 +134,7 @@ CREATE TABLE `clients` ( `client_id` int(11) NOT NULL AUTO_INCREMENT, `client_name` varchar(200) NOT NULL, `client_type` varchar(200) DEFAULT NULL, + `client_country` varchar(200) DEFAULT NULL, `client_address` varchar(200) DEFAULT NULL, `client_city` varchar(200) DEFAULT NULL, `client_state` varchar(200) DEFAULT NULL, @@ -370,6 +371,7 @@ DROP TABLE IF EXISTS `locations`; CREATE TABLE `locations` ( `location_id` int(11) NOT NULL AUTO_INCREMENT, `location_name` varchar(200) NOT NULL, + `location_country` varchar(200) DEFAULT NULL, `location_address` varchar(200) DEFAULT NULL, `location_city` varchar(200) DEFAULT NULL, `location_state` varchar(200) DEFAULT NULL, @@ -635,6 +637,7 @@ CREATE TABLE `settings` ( `config_default_calendar` int(11) DEFAULT NULL, `config_default_net_terms` int(11) DEFAULT NULL, `config_company_name` varchar(200) DEFAULT NULL, + `config_company_country` varchar(200) DEFAULT NULL, `config_company_address` varchar(200) DEFAULT NULL, `config_company_city` varchar(200) DEFAULT NULL, `config_company_state` varchar(200) DEFAULT NULL, @@ -828,6 +831,7 @@ CREATE TABLE `vendors` ( `vendor_id` int(11) NOT NULL AUTO_INCREMENT, `vendor_name` varchar(200) NOT NULL, `vendor_description` varchar(200) DEFAULT NULL, + `vendor_country` varchar(200) DEFAULT NULL, `vendor_address` varchar(200) DEFAULT NULL, `vendor_city` varchar(200) DEFAULT NULL, `vendor_state` varchar(200) DEFAULT NULL, @@ -857,4 +861,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2020-02-24 16:59:52 +-- Dump completed on 2020-03-30 20:01:15 diff --git a/delete_confirm_modal.php b/delete_confirm_modal.php new file mode 100644 index 00000000..1dc2f9e5 --- /dev/null +++ b/delete_confirm_modal.php @@ -0,0 +1,17 @@ + \ No newline at end of file diff --git a/edit_client_modal.php b/edit_client_modal.php index 1c3fd53e..16c3711a 100644 --- a/edit_client_modal.php +++ b/edit_client_modal.php @@ -79,6 +79,21 @@
+
+ +
+
+ +
+ +
+
+
@@ -120,7 +135,7 @@
- +
diff --git a/edit_company_modal.php b/edit_company_modal.php index 811b42ee..9805ecb9 100644 --- a/edit_company_modal.php +++ b/edit_company_modal.php @@ -21,6 +21,21 @@
+
+ +
+
+ +
+ +
+
+
@@ -62,7 +77,7 @@
- +
diff --git a/edit_contact_modal.php b/edit_contact_modal.php index 738dfa13..08b8e302 100644 --- a/edit_contact_modal.php +++ b/edit_contact_modal.php @@ -122,6 +122,7 @@
+ diff --git a/edit_location_modal.php b/edit_location_modal.php index d0968df2..3e211722 100644 --- a/edit_location_modal.php +++ b/edit_location_modal.php @@ -61,6 +61,21 @@
+
+ +
+
+ +
+ +
+
+
@@ -101,7 +116,7 @@
- +
diff --git a/edit_vendor_modal.php b/edit_vendor_modal.php index 6ca128e2..adb691a7 100644 --- a/edit_vendor_modal.php +++ b/edit_vendor_modal.php @@ -66,6 +66,21 @@
+
+ +
+
+ +
+ +
+
+
@@ -107,7 +122,7 @@
- +
diff --git a/get_settings.php b/get_settings.php index 6b1d5459..34a00d47 100644 --- a/get_settings.php +++ b/get_settings.php @@ -6,6 +6,7 @@ $sql_settings = mysqli_query($mysqli,"SELECT * FROM settings WHERE company_id = $row = mysqli_fetch_array($sql_settings); $config_company_name = $row['config_company_name']; +$config_company_country = $row['config_company_country']; $config_company_address = $row['config_company_address']; $config_company_city = $row['config_company_city']; $config_company_state = $row['config_company_state']; @@ -119,7 +120,35 @@ $states_array = array( 'WA'=>'Washington', 'WV'=>'West Virginia', 'WI'=>'Wisconsin', - 'WY'=>'Wyoming' + 'WY'=>'Wyoming', + 'ON'=>'Ontario', + 'QC'=>'Quebec', + 'NS'=>'Nova Scotia', + 'NB'=>'New Brunswick', + 'MB'=>'Manitoba', + 'BC'=>'British Columbia', + 'PE'=>'Prince Edward Island', + 'SK'=>'Saskatchewan', + 'AB'=>'Alberta', + 'NL'=>'Newfoundland and Labrador' +); + +$canada_provinces_array = array( + 'ON'=>'Ontario', + 'QC'=>'Quebec', + 'NS'=>'Nova Scotia', + 'NB'=>'New Brunswick', + 'MB'=>'Manitoba', + 'BC'=>'British Columbia', + 'PE'=>'Prince Edward Island', + 'SK'=>'Saskatchewan', + 'AB'=>'Alberta', + 'NL'=>'Newfoundland and Labrador' +); + +$countries_array = array( + 'USA', + 'Canada' ); $timezones_array = array( diff --git a/post.php b/post.php index fe275405..a604a65a 100644 --- a/post.php +++ b/post.php @@ -88,6 +88,7 @@ if(isset($_POST['edit_user'])){ if(isset($_POST['add_company'])){ $name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['name']))); + $country = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['country']))); $address = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['address']))); $city = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['city']))); $state = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['state']))); @@ -107,7 +108,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_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"); + mysqli_query($mysqli,"INSERT INTO settings SET company_id = $company_id, config_company_name = '$name', config_company_country = '$country', 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()"); @@ -121,6 +122,7 @@ 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'])); + $country = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['country']))); $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'])); @@ -131,7 +133,7 @@ if(isset($_POST['edit_company'])){ 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"); + mysqli_query($mysqli,"UPDATE settings SET config_company_name = '$name', config_company_country = '$country', 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()"); @@ -220,6 +222,7 @@ if(isset($_POST['edit_general_settings'])){ if(isset($_POST['edit_company_settings'])){ $config_company_name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_name'])); + $config_company_country = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_country'])); $config_company_address = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_address'])); $config_company_city = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_city'])); $config_company_state = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_state'])); @@ -228,7 +231,7 @@ if(isset($_POST['edit_company_settings'])){ $config_company_phone = preg_replace("/[^0-9]/", '',$config_company_phone); $config_company_site = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_site'])); - mysqli_query($mysqli,"UPDATE settings SET config_company_name = '$config_company_name', config_company_address = '$config_company_address', config_company_city = '$config_company_city', config_company_state = '$config_company_state', config_company_zip = '$config_company_zip', config_company_phone = '$config_company_phone', config_company_site = '$config_company_site' WHERE company_id = $session_company_id"); + mysqli_query($mysqli,"UPDATE settings SET config_company_name = '$config_company_name', config_company_country = '$config_company_country', config_company_address = '$config_company_address', config_company_city = '$config_company_city', config_company_state = '$config_company_state', config_company_zip = '$config_company_zip', config_company_phone = '$config_company_phone', config_company_site = '$config_company_site' WHERE company_id = $session_company_id"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modified', log_description = 'Company', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id"); @@ -473,6 +476,7 @@ if(isset($_POST['add_client'])){ $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])); $type = strip_tags(mysqli_real_escape_string($mysqli,$_POST['type'])); + $country = strip_tags(mysqli_real_escape_string($mysqli,$_POST['country'])); $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'])); @@ -490,7 +494,7 @@ if(isset($_POST['add_client'])){ $company_size = strip_tags(mysqli_real_escape_string($mysqli,$_POST['company_size'])); $notes = strip_tags(mysqli_real_escape_string($mysqli,$_POST['notes'])); - mysqli_query($mysqli,"INSERT INTO clients SET client_name = '$name', client_type = '$type', client_address = '$address', client_city = '$city', client_state = '$state', client_zip = '$zip', client_contact = '$contact', client_phone = '$phone', client_extension = '$extension', client_mobile = '$mobile', client_email = '$email', client_website = '$website', client_net_terms = $net_terms, client_hours = '$hours', client_company_size = '$company_size', client_notes = '$notes', client_created_at = NOW(), company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO clients SET client_name = '$name', client_type = '$type', client_country = '$country', client_address = '$address', client_city = '$city', client_state = '$state', client_zip = '$zip', client_contact = '$contact', client_phone = '$phone', client_extension = '$extension', client_mobile = '$mobile', client_email = '$email', client_website = '$website', client_net_terms = $net_terms, client_hours = '$hours', client_company_size = '$company_size', client_notes = '$notes', client_created_at = NOW(), company_id = $session_company_id"); $client_id = mysqli_insert_id($mysqli); @@ -526,6 +530,7 @@ if(isset($_POST['edit_client'])){ $client_id = intval($_POST['client_id']); $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])); $type = strip_tags(mysqli_real_escape_string($mysqli,$_POST['type'])); + $country = strip_tags(mysqli_real_escape_string($mysqli,$_POST['country'])); $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'])); @@ -543,7 +548,7 @@ if(isset($_POST['edit_client'])){ $company_size = strip_tags(mysqli_real_escape_string($mysqli,$_POST['company_size'])); $notes = strip_tags(mysqli_real_escape_string($mysqli,$_POST['notes'])); - mysqli_query($mysqli,"UPDATE clients SET client_name = '$name', client_type = '$type', client_address = '$address', client_city = '$city', client_state = '$state', client_zip = '$zip', client_contact = '$contact', client_phone = '$phone', client_extension = '$extension', client_mobile = '$mobile', client_email = '$email', client_website = '$website', client_net_terms = $net_terms, client_hours = '$hours', client_company_size = '$company_size', client_notes = '$notes', client_updated_at = NOW() WHERE client_id = $client_id AND company_id = $session_company_id"); + mysqli_query($mysqli,"UPDATE clients SET client_name = '$name', client_type = '$type', client_country = '$country', client_address = '$address', client_city = '$city', client_state = '$state', client_zip = '$zip', client_contact = '$contact', client_phone = '$phone', client_extension = '$extension', client_mobile = '$mobile', client_email = '$email', client_website = '$website', client_net_terms = $net_terms, client_hours = '$hours', client_company_size = '$company_size', client_notes = '$notes', client_updated_at = NOW() WHERE client_id = $client_id AND company_id = $session_company_id"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Client', log_action = 'Modified', log_description = '$name', log_created_at = NOW(), client_id = $client_id, company_id = $session_company_id, user_id = $session_user_id"); @@ -815,6 +820,7 @@ if(isset($_POST['add_vendor'])){ $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])); $description = strip_tags(mysqli_real_escape_string($mysqli,$_POST['description'])); $account_number = strip_tags(mysqli_real_escape_string($mysqli,$_POST['account_number'])); + $country = strip_tags(mysqli_real_escape_string($mysqli,$_POST['country'])); $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'])); @@ -827,7 +833,7 @@ if(isset($_POST['add_vendor'])){ $website = strip_tags(mysqli_real_escape_string($mysqli,$_POST['website'])); $notes = strip_tags(mysqli_real_escape_string($mysqli,$_POST['notes'])); - mysqli_query($mysqli,"INSERT INTO vendors SET vendor_name = '$name', vendor_description = '$description', vendor_address = '$address', vendor_city = '$city', vendor_state = '$state', vendor_zip = '$zip', vendor_contact_name = '$contact_name', vendor_phone = '$phone', vendor_extension = '$extension', vendor_email = '$email', vendor_website = '$website', vendor_account_number = '$account_number', vendor_notes = '$notes', vendor_created_at = NOW(), client_id = $client_id, company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO vendors SET vendor_name = '$name', vendor_description = '$description', vendor_country = '$country', vendor_address = '$address', vendor_city = '$city', vendor_state = '$state', vendor_zip = '$zip', vendor_contact_name = '$contact_name', vendor_phone = '$phone', vendor_extension = '$extension', vendor_email = '$email', vendor_website = '$website', vendor_account_number = '$account_number', vendor_notes = '$notes', vendor_created_at = NOW(), client_id = $client_id, company_id = $session_company_id"); $vendor_id = mysqli_insert_id($mysqli); @@ -846,6 +852,7 @@ if(isset($_POST['edit_vendor'])){ $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])); $description = strip_tags(mysqli_real_escape_string($mysqli,$_POST['description'])); $account_number = strip_tags(mysqli_real_escape_string($mysqli,$_POST['account_number'])); + $country = strip_tags(mysqli_real_escape_string($mysqli,$_POST['country'])); $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'])); @@ -858,7 +865,7 @@ if(isset($_POST['edit_vendor'])){ $website = strip_tags(mysqli_real_escape_string($mysqli,$_POST['website'])); $notes = strip_tags(mysqli_real_escape_string($mysqli,$_POST['notes'])); - mysqli_query($mysqli,"UPDATE vendors SET vendor_name = '$name', vendor_description = '$description', vendor_address = '$address', vendor_city = '$city', vendor_state = '$state', vendor_zip = '$zip', vendor_contact_name = '$contact_name', vendor_phone = '$phone', vendor_extension = '$extension', vendor_email = '$email', vendor_website = '$website', vendor_account_number = '$account_number', vendor_notes = '$notes', vendor_updated_at = NOW() WHERE vendor_id = $vendor_id AND company_id = $session_company_id"); + mysqli_query($mysqli,"UPDATE vendors SET vendor_name = '$name', vendor_description = '$description', vendor_country = '$country', vendor_address = '$address', vendor_city = '$city', vendor_state = '$state', vendor_zip = '$zip', vendor_contact_name = '$contact_name', vendor_phone = '$phone', vendor_extension = '$extension', vendor_email = '$email', vendor_website = '$website', vendor_account_number = '$account_number', vendor_notes = '$notes', vendor_updated_at = NOW() WHERE vendor_id = $vendor_id AND company_id = $session_company_id"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Vendor', log_action = 'Modified', log_description = '$name', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id"); @@ -2986,6 +2993,7 @@ if(isset($_POST['add_location'])){ $client_id = intval($_POST['client_id']); $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])); + $country = strip_tags(mysqli_real_escape_string($mysqli,$_POST['country'])); $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'])); @@ -3007,7 +3015,7 @@ if(isset($_POST['add_location'])){ move_uploaded_file($_FILES['file']['tmp_name'], $path); } - mysqli_query($mysqli,"INSERT INTO locations SET location_name = '$name', location_address = '$address', location_city = '$city', location_state = '$state', location_zip = '$zip', location_phone = '$phone', location_hours = '$hours', location_photo = '$path', location_notes = '$notes', contact_id = $contact, location_created_at = NOW(), client_id = $client_id, company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO locations SET location_name = '$name', location_country = '$country', location_address = '$address', location_city = '$city', location_state = '$state', location_zip = '$zip', location_phone = '$phone', location_hours = '$hours', location_photo = '$path', location_notes = '$notes', contact_id = $contact, location_created_at = NOW(), client_id = $client_id, company_id = $session_company_id"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Location', log_action = 'Created', log_description = '$name', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id"); @@ -3022,6 +3030,7 @@ if(isset($_POST['edit_location'])){ $location_id = intval($_POST['location_id']); $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])); + $country = strip_tags(mysqli_real_escape_string($mysqli,$_POST['country'])); $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'])); @@ -3045,7 +3054,7 @@ if(isset($_POST['edit_location'])){ move_uploaded_file($_FILES['file']['tmp_name'], $path); } - mysqli_query($mysqli,"UPDATE locations SET location_name = '$name', location_address = '$address', location_city = '$city', location_state = '$state', location_zip = '$zip', location_phone = '$phone', location_hours = '$hours', location_photo = '$path', location_notes = '$notes', contact_id = $contact, location_updated_at = NOW() WHERE location_id = $location_id AND company_id = $session_company_id"); + mysqli_query($mysqli,"UPDATE locations SET location_name = '$name', location_country = '$country', location_address = '$address', location_city = '$city', location_state = '$state', location_zip = '$zip', location_phone = '$phone', location_hours = '$hours', location_photo = '$path', location_notes = '$notes', contact_id = $contact, location_updated_at = NOW() WHERE location_id = $location_id AND company_id = $session_company_id"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Location', log_action = 'Modified', log_description = '$name', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id"); diff --git a/settings-company.php b/settings-company.php index 811adad8..965d9da5 100644 --- a/settings-company.php +++ b/settings-company.php @@ -18,6 +18,21 @@
+
+ +
+
+ +
+ +
+
+
@@ -59,7 +74,7 @@
- +
diff --git a/setup.php b/setup.php index 58c9599e..6d13436b 100644 --- a/setup.php +++ b/setup.php @@ -11,6 +11,11 @@ if($config_enable_setup == 0){ header("Location: login.php"); } +$countries_array = array( + 'USA', + 'Canada' +); + $states_array = array( 'AL'=>'Alabama', 'AK'=>'Alaska', @@ -62,7 +67,17 @@ $states_array = array( 'WA'=>'Washington', 'WV'=>'West Virginia', 'WI'=>'Wisconsin', - 'WY'=>'Wyoming' + 'WY'=>'Wyoming', + 'ON'=>'Ontario', + 'QC'=>'Quebec', + 'NS'=>'Nova Scotia', + 'NB'=>'New Brunswick', + 'MB'=>'Manitoba', + 'BC'=>'British Columbia', + 'PE'=>'Prince Edward Island', + 'SK'=>'Saskatchewan', + 'AB'=>'Alberta', + 'NL'=>'Newfoundland and Labrador' ); if(isset($_POST['add_database'])){ @@ -162,6 +177,7 @@ if(isset($_POST['add_company_settings'])){ $user_id = $row['user_id']; $config_company_name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_name'])); + $config_company_country = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_country'])); $config_company_address = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_address'])); $config_company_city = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_city'])); $config_company_state = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_state'])); @@ -182,7 +198,7 @@ if(isset($_POST['add_company_settings'])){ mysqli_query($mysqli,"INSERT INTO user_companies SET user_id = $user_id, company_id = $company_id"); - mysqli_query($mysqli,"INSERT INTO settings SET company_id = $company_id, config_company_name = '$config_company_name', config_company_address = '$config_company_address', config_company_city = '$config_company_city', config_company_state = '$config_company_state', config_company_zip = '$config_company_zip', config_company_phone = '$config_company_phone', config_company_site = '$config_company_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"); + mysqli_query($mysqli,"INSERT INTO settings SET company_id = $company_id, config_company_name = '$config_company_name', config_company_country = '$config_company_country', config_company_address = '$config_company_address', config_company_city = '$config_company_city', config_company_state = '$config_company_state', config_company_zip = '$config_company_zip', config_company_phone = '$config_company_phone', config_company_site = '$config_company_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"); //Create Some Data @@ -456,6 +472,21 @@ if(isset($_POST['add_company_settings'])){
+ +
+ +
+
+ +
+ +
+
@@ -498,7 +529,7 @@ if(isset($_POST['add_company_settings'])){
- +
diff --git a/vendors.php b/vendors.php index a9abde05..cfdf4c84 100644 --- a/vendors.php +++ b/vendors.php @@ -88,6 +88,7 @@ $vendor_name = $row['vendor_name']; $vendor_description = $row['vendor_description']; $vendor_account_number = $row['vendor_account_number']; + $vendor_country = $row['vendor_country']; $vendor_address = $row['vendor_address']; $vendor_city = $row['vendor_city']; $vendor_state = $row['vendor_state'];