From 209bd7da4d01df86e8d6d7c71b356dcffa5259a2 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sun, 29 Aug 2021 22:07:46 -0400 Subject: [PATCH] Remove Currency Selection from invoice, quote and recurring as this will be determined by your company currency in settings, the payment is what matters as this is where it will be converted --- add_asset_modal.php | 2 +- add_invoice_modal.php | 15 --------------- add_login_modal.php | 2 +- add_quote_modal.php | 15 --------------- add_recurring_modal.php | 15 --------------- add_software_modal.php | 2 +- add_vendor_modal.php | 2 +- check_login.php | 1 + edit_asset_modal.php | 2 +- edit_login_modal.php | 2 +- edit_software_modal.php | 2 +- edit_vendor_modal.php | 2 +- post.php | 7 +++---- 13 files changed, 12 insertions(+), 57 deletions(-) diff --git a/add_asset_modal.php b/add_asset_modal.php index dde24331..52647a10 100644 --- a/add_asset_modal.php +++ b/add_asset_modal.php @@ -277,7 +277,7 @@
- +
diff --git a/add_invoice_modal.php b/add_invoice_modal.php index 76b5d980..b1a9e2ed 100644 --- a/add_invoice_modal.php +++ b/add_invoice_modal.php @@ -77,21 +77,6 @@ -
- -
-
- -
- -
-
-
diff --git a/add_login_modal.php b/add_login_modal.php index a8fb4109..53fc4d48 100644 --- a/add_login_modal.php +++ b/add_login_modal.php @@ -163,7 +163,7 @@
- +
diff --git a/add_quote_modal.php b/add_quote_modal.php index 7fff6659..284ea9b6 100644 --- a/add_quote_modal.php +++ b/add_quote_modal.php @@ -78,21 +78,6 @@
-
- -
-
- -
- -
-
-
diff --git a/add_recurring_modal.php b/add_recurring_modal.php index e868439a..bbef7d4e 100644 --- a/add_recurring_modal.php +++ b/add_recurring_modal.php @@ -92,21 +92,6 @@
-
- -
-
- -
- -
-
-
diff --git a/add_software_modal.php b/add_software_modal.php index 956ee43d..10ef8ddd 100644 --- a/add_software_modal.php +++ b/add_software_modal.php @@ -68,7 +68,7 @@
- +
diff --git a/add_vendor_modal.php b/add_vendor_modal.php index b924ceef..3acdd626 100644 --- a/add_vendor_modal.php +++ b/add_vendor_modal.php @@ -184,7 +184,7 @@
- +
diff --git a/check_login.php b/check_login.php index 67be845f..247bb1c5 100644 --- a/check_login.php +++ b/check_login.php @@ -45,6 +45,7 @@ $row = mysqli_fetch_array($sql); $session_company_name = $row['company_name']; + $session_company_currency = $row['company_currency']; include("get_settings.php"); diff --git a/edit_asset_modal.php b/edit_asset_modal.php index 1fa60546..35808a12 100644 --- a/edit_asset_modal.php +++ b/edit_asset_modal.php @@ -277,7 +277,7 @@
- +
diff --git a/edit_login_modal.php b/edit_login_modal.php index ab576a1e..8f56bfdf 100644 --- a/edit_login_modal.php +++ b/edit_login_modal.php @@ -172,7 +172,7 @@
- +
diff --git a/edit_software_modal.php b/edit_software_modal.php index 56517cc8..aec746e2 100644 --- a/edit_software_modal.php +++ b/edit_software_modal.php @@ -68,7 +68,7 @@
- +
diff --git a/edit_vendor_modal.php b/edit_vendor_modal.php index 5391c781..afdf9de7 100644 --- a/edit_vendor_modal.php +++ b/edit_vendor_modal.php @@ -182,7 +182,7 @@
- +
diff --git a/post.php b/post.php index f6795ba8..26098231 100644 --- a/post.php +++ b/post.php @@ -1732,7 +1732,6 @@ if(isset($_POST['add_invoice'])){ $client = intval($_POST['client']); $date = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['date']))); $category = intval($_POST['category']); - $currency_code = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['currency_code']))); $scope = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['scope']))); //Get Net Terms @@ -1748,7 +1747,7 @@ if(isset($_POST['add_invoice'])){ //Generate a unique URL key for clients to access $url_key = keygen(); - mysqli_query($mysqli,"INSERT INTO invoices SET invoice_prefix = '$config_invoice_prefix', invoice_number = $invoice_number, invoice_scope = '$scope', invoice_date = '$date', invoice_due = DATE_ADD('$date', INTERVAL $client_net_terms day), invoice_currency_code = '$currency_code', invoice_category_id = $category, invoice_status = 'Draft', invoice_url_key = '$url_key', invoice_created_at = NOW(), invoice_client_id = $client, company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO invoices SET invoice_prefix = '$config_invoice_prefix', invoice_number = $invoice_number, invoice_scope = '$scope', invoice_date = '$date', invoice_due = DATE_ADD('$date', INTERVAL $client_net_terms day), invoice_currency_code = '$config_default_currency', invoice_category_id = $category, invoice_status = 'Draft', invoice_url_key = '$url_key', invoice_created_at = NOW(), invoice_client_id = $client, company_id = $session_company_id"); $invoice_id = mysqli_insert_id($mysqli); mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Draft', history_description = 'INVOICE added!', history_created_at = NOW(), history_invoice_id = $invoice_id, company_id = $session_company_id"); @@ -1903,7 +1902,7 @@ if(isset($_POST['add_quote'])){ //Generate a unique URL key for clients to access $quote_url_key = keygen(); - mysqli_query($mysqli,"INSERT INTO quotes SET quote_prefix = '$config_quote_prefix', quote_number = $quote_number, quote_scope = '$scope', quote_date = '$date', quote_currency_code = '$currency_code', quote_category_id = $category, quote_status = 'Draft', quote_url_key = '$quote_url_key', quote_created_at = NOW(), quote_client_id = $client, company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO quotes SET quote_prefix = '$config_quote_prefix', quote_number = $quote_number, quote_scope = '$scope', quote_date = '$date', quote_currency_code = '$config_default_currency', quote_category_id = $category, quote_status = 'Draft', quote_url_key = '$quote_url_key', quote_created_at = NOW(), quote_client_id = $client, company_id = $session_company_id"); $quote_id = mysqli_insert_id($mysqli); @@ -2322,7 +2321,7 @@ if(isset($_POST['add_recurring'])){ $new_config_recurring_next_number = $config_recurring_next_number + 1; mysqli_query($mysqli,"UPDATE settings SET config_recurring_next_number = $new_config_recurring_next_number WHERE company_id = $session_company_id"); - mysqli_query($mysqli,"INSERT INTO recurring SET recurring_prefix = '$config_recurring_prefix', recurring_number = $recurring_number, recurring_scope = '$scope', recurring_frequency = '$frequency', recurring_next_date = '$start_date', recurring_category_id = $category, recurring_status = 1, recurring_currency_code = '$currency_code', recurring_created_at = NOW(), recurring_client_id = $client, company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO recurring SET recurring_prefix = '$config_recurring_prefix', recurring_number = $recurring_number, recurring_scope = '$scope', recurring_frequency = '$frequency', recurring_next_date = '$start_date', recurring_category_id = $category, recurring_status = 1, recurring_currency_code = '$config_default_currency', recurring_created_at = NOW(), recurring_client_id = $client, company_id = $session_company_id"); $recurring_id = mysqli_insert_id($mysqli);