diff --git a/ajax/ajax_invoice_apply_credit.php b/ajax/ajax_invoice_apply_credit.php new file mode 100644 index 00000000..5e80e474 --- /dev/null +++ b/ajax/ajax_invoice_apply_credit.php @@ -0,0 +1,88 @@ + + +
+
: Apply Credit (Balance: )
+ +
+
+ + + +
+ +
+ +
+
+ +
+ +
+
+ + + +
+ +
+ + +
+
+ + + +
+ +
+ + +
+
+ + -
+
: Make Payment
diff --git a/clients.php b/clients.php index c294cb55..5e7dcfc8 100644 --- a/clients.php +++ b/clients.php @@ -80,38 +80,38 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> -
-
-

-
- = 2) { ?> -
- - -
- - Import - -
- - Export - -
+
+
+

+
+ = 2) { ?> +
+ + +
+ + Import + +
+ + Export +
- -
+
+
- -
-
- - -
-
-
+
+
+ + + +
+
+
+
" autofocus>
@@ -119,440 +119,450 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
-
- ">Clients - ">Leads -
+
+
+
+
+ ">Clients + ">Leads +
-
- "> - Archived - -
-
- " - id="advancedFilter" - > -
-
-
- - -
+
+
+ " + id="advancedFilter" + > +
+
+
+ +
-
-
- - -
+
+
+
+ +
-
-
- - -
+
+
+
+ +
-
+
+
+
-
- - + 0 OR tags.tag_id IN ($tag_filter) + "); + while ($row = mysqli_fetch_array($sql_tags_filter)) { + $tag_id = intval($row['tag_id']); + $tag_name = nullable_htmlentities($row['tag_name']); ?> - + - - -
+ +
-
-
- - + - - - + + + - -
+
-
-
- - + - - - + + + - -
+
- -
-
- -
- - text-nowrap"> + + + + + + +
+
+ text-nowrap bg-light"> + + + + + + = 1) && $config_module_enable_accounting == 1) { ?> + = 2) { ?> + + + + $location_address
$location_city $location_state $location_zip
$location_country"; + } + $contact_id = intval($row['contact_id']); + $contact_name = nullable_htmlentities($row['contact_name']); + $contact_title = nullable_htmlentities($row['contact_title']); + $contact_phone_country_code = nullable_htmlentities($row['contact_phone_country_code']); + $contact_phone = nullable_htmlentities(formatPhoneNumber($row['contact_phone'], $contact_phone_country_code)); + $contact_extension = nullable_htmlentities($row['contact_extension']); + $contact_mobile_country_code = nullable_htmlentities($row['contact_mobile_country_code']); + $contact_mobile = nullable_htmlentities(formatPhoneNumber($row['contact_mobile'], $contact_mobile_country_code)); + $contact_email = nullable_htmlentities($row['contact_email']); + $client_website = nullable_htmlentities($row['client_website']); + $client_rate = floatval($row['client_rate']); + $client_currency_code = nullable_htmlentities($row['client_currency_code']); + $client_net_terms = intval($row['client_net_terms']); + $client_tax_id_number = nullable_htmlentities($row['client_tax_id_number']); + $client_referral = nullable_htmlentities($row['client_referral']); + $client_abbreviation = nullable_htmlentities($row['client_abbreviation']); + $client_notes = nullable_htmlentities($row['client_notes']); + $client_created_at = date('Y-m-d', strtotime($row['client_created_at'])); + $client_updated_at = nullable_htmlentities($row['client_updated_at']); + $client_archived_at = nullable_htmlentities($row['client_archived_at']); + $client_is_lead = intval($row['client_lead']); + + // Abbreviation + if (empty($client_abbreviation)) { + $client_abbreviation = shortenClient($client_name); + } + + // Client Tags + + $client_tag_name_display_array = array(); + $client_tag_id_array = array(); + $sql_client_tags = mysqli_query($mysqli, "SELECT * FROM client_tags LEFT JOIN tags ON client_tags.tag_id = tags.tag_id WHERE client_id = $client_id ORDER BY tag_name ASC"); + while ($row = mysqli_fetch_array($sql_client_tags)) { + + $client_tag_id = intval($row['tag_id']); + $client_tag_name = nullable_htmlentities($row['tag_name']); + $client_tag_color = nullable_htmlentities($row['tag_color']); + if (empty($client_tag_color)) { + $client_tag_color = "dark"; + } + $client_tag_icon = nullable_htmlentities($row['tag_icon']); + if (empty($client_tag_icon)) { + $client_tag_icon = "tag"; + } + + $client_tag_id_array[] = $client_tag_id; + $client_tag_name_display_array[] = "$client_tag_name"; + } + $client_tags_display = implode('', $client_tag_name_display_array); + + //Add up all the payments for the invoice and get the total amount paid to the invoice + $sql_invoice_amounts = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $client_id AND invoice_status != 'Draft' AND invoice_status != 'Cancelled' AND invoice_status != 'Non-Billable' "); + $row = mysqli_fetch_array($sql_invoice_amounts); + + $invoice_amounts = floatval($row['invoice_amounts']); + + $sql_amount_paid = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS amount_paid FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id"); + $row = mysqli_fetch_array($sql_amount_paid); + + $amount_paid = floatval($row['amount_paid']); + + $balance = $invoice_amounts - $amount_paid; + //set Text color on balance + if ($balance > 0) { + $balance_text_color = "text-danger font-weight-bold"; + } else { + $balance_text_color = ""; + } + + // Get Credit Balance + $sql_credit_balance = mysqli_query($mysqli, "SELECT SUM(credit_amount) AS credit_balance FROM credits WHERE credit_client_id = $client_id"); + $row = mysqli_fetch_array($sql_credit_balance); + + $credit_balance = floatval($row['credit_balance']); + + //Get Monthly Recurring Total + $sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_monthly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'month' AND recurring_invoice_client_id = $client_id"); + $row = mysqli_fetch_array($sql_recurring_monthly_total); + + $recurring_monthly_total = floatval($row['recurring_monthly_total']); + + //Get Yearly Recurring Total + $sql_recurring_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_yearly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'year' AND recurring_invoice_client_id = $client_id"); + $row = mysqli_fetch_array($sql_recurring_yearly_total); + + $recurring_yearly_total = floatval($row['recurring_yearly_total']) / 12; + + $recurring_monthly = $recurring_monthly_total + $recurring_yearly_total; + + ?> - - - - - = 1) && $config_module_enable_accounting == 1) { ?> - = 2) { ?> - - - - + - while ($row = mysqli_fetch_array($sql)) { - $client_id = intval($row['client_id']); - $client_name = nullable_htmlentities($row['client_name']); - $client_type = nullable_htmlentities($row['client_type']); - $location_id = intval($row['location_id']); - $location_country = nullable_htmlentities($row['location_country']); - $location_address = nullable_htmlentities($row['location_address']); - $location_city = nullable_htmlentities($row['location_city']); - $location_state = nullable_htmlentities($row['location_state']); - $location_zip = nullable_htmlentities($row['location_zip']); - if (empty($location_address) && empty($location_city) && empty($location_state) && empty($location_zip)) { - $location_address_display = "-"; - } else { - $location_address_display = "$location_address
$location_city $location_state $location_zip
$location_country"; - } - $contact_id = intval($row['contact_id']); - $contact_name = nullable_htmlentities($row['contact_name']); - $contact_title = nullable_htmlentities($row['contact_title']); - $contact_phone_country_code = nullable_htmlentities($row['contact_phone_country_code']); - $contact_phone = nullable_htmlentities(formatPhoneNumber($row['contact_phone'], $contact_phone_country_code)); - $contact_extension = nullable_htmlentities($row['contact_extension']); - $contact_mobile_country_code = nullable_htmlentities($row['contact_mobile_country_code']); - $contact_mobile = nullable_htmlentities(formatPhoneNumber($row['contact_mobile'], $contact_mobile_country_code)); - $contact_email = nullable_htmlentities($row['contact_email']); - $client_website = nullable_htmlentities($row['client_website']); - $client_rate = floatval($row['client_rate']); - $client_currency_code = nullable_htmlentities($row['client_currency_code']); - $client_net_terms = intval($row['client_net_terms']); - $client_tax_id_number = nullable_htmlentities($row['client_tax_id_number']); - $client_referral = nullable_htmlentities($row['client_referral']); - $client_abbreviation = nullable_htmlentities($row['client_abbreviation']); - $client_notes = nullable_htmlentities($row['client_notes']); - $client_created_at = date('Y-m-d', strtotime($row['client_created_at'])); - $client_updated_at = nullable_htmlentities($row['client_updated_at']); - $client_archived_at = nullable_htmlentities($row['client_archived_at']); - $client_is_lead = intval($row['client_lead']); + +
+ +
+ + +
+ +
+ +
+ Abbreviation:
+ Created:
+
- // Abbreviation - if (empty($client_abbreviation)) { - $client_abbreviation = shortenClient($client_name); - } - - // Client Tags - - $client_tag_name_display_array = array(); - $client_tag_id_array = array(); - $sql_client_tags = mysqli_query($mysqli, "SELECT * FROM client_tags LEFT JOIN tags ON client_tags.tag_id = tags.tag_id WHERE client_id = $client_id ORDER BY tag_name ASC"); - while ($row = mysqli_fetch_array($sql_client_tags)) { - - $client_tag_id = intval($row['tag_id']); - $client_tag_name = nullable_htmlentities($row['tag_name']); - $client_tag_color = nullable_htmlentities($row['tag_color']); - if (empty($client_tag_color)) { - $client_tag_color = "dark"; - } - $client_tag_icon = nullable_htmlentities($row['tag_icon']); - if (empty($client_tag_icon)) { - $client_tag_icon = "tag"; + + + - $amount_paid = floatval($row['amount_paid']); - - $balance = $invoice_amounts - $amount_paid; - //set Text color on balance - if ($balance > 0) { - $balance_text_color = "text-danger font-weight-bold"; - } else { - $balance_text_color = ""; - } - - //Get Monthly Recurring Total - $sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_monthly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'month' AND recurring_invoice_client_id = $client_id"); - $row = mysqli_fetch_array($sql_recurring_monthly_total); - - $recurring_monthly_total = floatval($row['recurring_monthly_total']); - - //Get Yearly Recurring Total - $sql_recurring_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_yearly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'year' AND recurring_invoice_client_id = $client_id"); - $row = mysqli_fetch_array($sql_recurring_yearly_total); - - $recurring_yearly_total = floatval($row['recurring_yearly_total']) / 12; - - $recurring_monthly = $recurring_monthly_total + $recurring_yearly_total; - - ?> - - + + + + = 2) { ?> - - + + - - = 1) && $config_module_enable_accounting == 1) { ?> - - + - - = 2) { ?> - - - - - - - -
+
+ +
+ 		+ + Client Name + + + + Primary Location + + + + Primary Contact + + + Billing Action
+
- +
- - Client Name - - - - Primary Location - - - - Primary Contact - - - Billing Action
+ $client_tag_name"; - } - $client_tags_display = implode('', $client_tag_name_display_array); + if (!empty($contact_name)) { ?> +
+ + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
-
- + + = 1) && $config_module_enable_accounting == 1) { ?> +
+
+ Balance +
+
+ Paid +
+
+ Credit +
+
+ Monthly +
+
+ Hourly Rate
- - - -
- -
- - -
- -
- -
- Abbreviation:
- Created:
-
- - 		- -
- + +
+ - -
- "> + Edit + - if (!empty($contact_phone)) { ?> -
- + +
+ + Restore + + +
+ + Archive + +
- -
- -
- -
- -
- +
-
- Balance -
-
- Paid -
-
- Monthly -
-
- Hourly Rate -
- 		-
- -
- - Edit - - - -
- - Restore - - -
- - Archive - - -
-
-
-
- - - -
-
+ + +
+ + + + + +
diff --git a/database_updates.php b/database_updates.php index e2d800c4..990e6993 100644 --- a/database_updates.php +++ b/database_updates.php @@ -3768,8 +3768,39 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.3'"); } - /* 2025-07-21 - JQ For next release Pauyment Provider Switch Over if (CURRENT_DATABASE_VERSION == '2.2.3') { + + mysqli_query($mysqli, "CREATE TABLE `credits` ( + `credit_id` INT(11) NOT NULL AUTO_INCREMENT, + `credit_amount` DECIMAL(15,2) NOT NULL, + `credit_reference` VARCHAR(250) DEFAULT NULL, + `credit_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP(), + `credit_created_by` INT(11) NOT NULL, + `credit_expire_at` DATE DEFAULT NULL, + `credit_client_id` INT(11) NOT NULL, + PRIMARY KEY (`credit_id`) + )"); + + mysqli_query($mysqli, "ALTER TABLE `invoices` ADD `invoice_credit_amount` DECIMAL(15,2) NOT NULL DEFAULT 0.00 AFTER `invoice_discount_amount`"); + + mysqli_query($mysqli, "CREATE TABLE `discount_codes` ( + `discount_code_id` INT(11) NOT NULL AUTO_INCREMENT, + `discount_code_description` VARCHAR(250) DEFAULT NULL, + `discount_code_amount` DECIMAL(15,2) NOT NULL, + `discount_code` VARCHAR(200) NOT NULL, + `discount_code_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP(), + `discount_code_created_by` INT(11) NOT NULL, + `discount_code_updated_at` DATETIME NULL ON UPDATE CURRENT_TIMESTAMP, + `discount_code_archived_at` DATETIME NULL DEFAULT NULL, + `discount_code_expire_at` DATE DEFAULT NULL, + PRIMARY KEY (`discount_code_id`) + )"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.4'"); + } + + /* 2025-07-21 - JQ For next release Pauyment Provider Switch Over + if (CURRENT_DATABASE_VERSION == '2.2.4') { // Delete all Recurring Payments that are Stripe mysqli_query($mysqli, "DELETE FROM recurring_payments WHERE recurring_payment_method = 'Stripe'"); @@ -3794,14 +3825,14 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { DROP `config_ai_api_key` "); - mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.4'"); + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.5'"); } - /* + */ - // if (CURRENT_DATABASE_VERSION == '2.2.4') { - // // Insert queries here required to update to DB version 2.2.5 + // if (CURRENT_DATABASE_VERSION == '2.2.5') { + // // Insert queries here required to update to DB version 2.2.6 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.5'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.6'"); // } } else { diff --git a/db.sql b/db.sql index 82716e33..3e8e88d4 100644 --- a/db.sql +++ b/db.sql @@ -838,6 +838,25 @@ CREATE TABLE `credentials` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `credits` +-- + +DROP TABLE IF EXISTS `credits`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `credits` ( + `credit_id` int(11) NOT NULL AUTO_INCREMENT, + `credit_amount` decimal(15,2) NOT NULL, + `credit_reference` varchar(250) DEFAULT NULL, + `credit_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `credit_created_by` int(11) NOT NULL, + `credit_expire_at` date DEFAULT NULL, + `credit_client_id` int(11) NOT NULL, + PRIMARY KEY (`credit_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `custom_fields` -- @@ -894,6 +913,27 @@ CREATE TABLE `custom_values` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `discount_codes` +-- + +DROP TABLE IF EXISTS `discount_codes`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `discount_codes` ( + `discount_code_id` int(11) NOT NULL AUTO_INCREMENT, + `discount_code_description` varchar(250) DEFAULT NULL, + `discount_code_amount` decimal(15,2) NOT NULL, + `discount_code` varchar(200) NOT NULL, + `discount_code_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `discount_code_created_by` int(11) NOT NULL, + `discount_code_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + `discount_code_archived_at` datetime DEFAULT NULL, + `discount_code_expire_at` date DEFAULT NULL, + PRIMARY KEY (`discount_code_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `document_files` -- @@ -1190,6 +1230,7 @@ CREATE TABLE `invoices` ( `invoice_date` date NOT NULL, `invoice_due` date NOT NULL, `invoice_discount_amount` decimal(15,2) NOT NULL DEFAULT 0.00, + `invoice_credit_amount` decimal(15,2) NOT NULL DEFAULT 0.00, `invoice_amount` decimal(15,2) NOT NULL DEFAULT 0.00, `invoice_currency_code` varchar(200) NOT NULL, `invoice_note` text DEFAULT NULL, @@ -2718,4 +2759,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2025-07-08 14:06:43 +-- Dump completed on 2025-07-24 11:29:27 diff --git a/includes/database_version.php b/includes/database_version.php index e9eef2e5..e2bfd96b 100644 --- a/includes/database_version.php +++ b/includes/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "2.2.3"); +DEFINE("LATEST_DATABASE_VERSION", "2.2.4"); diff --git a/includes/filter_footer.php b/includes/filter_footer.php index 4a4d821c..a19cdb19 100644 --- a/includes/filter_footer.php +++ b/includes/filter_footer.php @@ -15,19 +15,21 @@ if ($total_found_rows > 5) { ?> -
+
-
+
- +
+ +
@@ -50,16 +52,13 @@ if ($total_found_rows > 5) { // Now output something like "Showing X to Y of Z records" ?> -
+

Showing to of records

- -
-
- +
    5) {
+
-"> +">
diff --git a/includes/inc_all_client.php b/includes/inc_all_client.php index 666767f5..40cccea6 100644 --- a/includes/inc_all_client.php +++ b/includes/inc_all_client.php @@ -131,6 +131,12 @@ if (isset($_GET['client_id'])) { $recurring_monthly = $recurring_monthly_total + $recurring_yearly_total; + // Get Credit Balance + $sql_credit_balance = mysqli_query($mysqli, "SELECT SUM(credit_amount) AS credit_balance FROM credits WHERE credit_client_id = $client_id"); + $row = mysqli_fetch_array($sql_credit_balance); + + $credit_balance = floatval($row['credit_balance']); + // Badge Counts $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('contact_id') AS num FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id")); diff --git a/includes/inc_client_top_head.php b/includes/inc_client_top_head.php index e4ed3c16..91add034 100644 --- a/includes/inc_client_top_head.php +++ b/includes/inc_client_top_head.php @@ -1,176 +1,179 @@
-
-
-
-

-
-
- = 2) { ?> -
- -
- - Edit Client - - = 3) { ?> -
- - Export Data - - - - -
- - Archive Client - - -
- - Unarchive Client - - - - = 3 && $client_archived_at) { ?> +
+
+

+
+
+ = 2) { ?> +
+
+ +
+ + Edit Client + + = 2) { ?>
- - Delete Client + + Add Credit - + + = 3) { ?> +
+ + Export Data + + + + +
+ + Archive Client + + +
+ + Unarchive Client + + + + = 3 && $client_archived_at) { ?> +
+ + Delete Client + + -
-
+ +
+
-
" id="clientHeader"> - -
- -
-
Primary Location
- +
" id="clientHeader"> + +
+
+
Primary Location
+ + - -
-
Primary Contact
-
- +
- -
- -
- -
- - - x$contact_extension"; - } - ?> -
- -
- -
- - +
+ = 1 && $config_module_enable_accounting == 1) { ?> -
-
Billing
-
Hourly Rate - -
-
Paid - -
-
Balance - float-right"> -
-
Monthly Recurring - -
-
Net Terms - Days -
- -
Tax ID - -
- + if (!empty($location_phone)) { ?> +
+
- +
+ +
+ +
+ +
+ +
+
Primary Contact
+ +
+ +
+ +
+ +
+ +
+ - = 1 && $config_module_enable_ticketing == 1) { ?> -
-
Support
-
Open Tickets - -
-
Closed Tickets - -
-
- - + if (!empty($contact_extension)) { + echo "x$contact_extension"; + } + ?>
- + +
+ +
+ +
+ + = 1 && $config_module_enable_accounting == 1) { ?> + +
+
Billing
+
Hourly Rate + +
+
Paid + +
+
Balance + float-right"> +
+ +
Credit + +
+ +
Monthly Recurring + +
+
Net Terms + Days +
+ +
Tax ID + +
+ +
+ + + = 1 && $config_module_enable_ticketing == 1) { ?> +
+
Support
+
Open Tickets + +
+
Closed Tickets +
+ +
+ + Apply Credit (Balance: ) + ">Enter Card Manually 0) { ?> @@ -543,6 +553,16 @@ if (isset($_GET['invoice_id'])) { + 0) { + ?> + + Credit: + - + + 0) { ?> Tax: diff --git a/modals/client_add_modal.php b/modals/client_add_modal.php index b7b15ba0..6dd6491b 100644 --- a/modals/client_add_modal.php +++ b/modals/client_add_modal.php @@ -7,32 +7,31 @@ ×
+ + +
- - -
-
@@ -373,7 +372,7 @@
- +
diff --git a/modals/client_credit_add_modal.php b/modals/client_credit_add_modal.php new file mode 100644 index 00000000..770ae17f --- /dev/null +++ b/modals/client_credit_add_modal.php @@ -0,0 +1,82 @@ + diff --git a/post/user/credit.php b/post/user/credit.php new file mode 100644 index 00000000..4acdbb97 --- /dev/null +++ b/post/user/credit.php @@ -0,0 +1,29 @@ + $invoice_balance) { + $_SESSION['alert_message'] = "Credit is more than the balance"; + header("Location: " . $_SERVER["HTTP_REFERER"]); + } else { + mysqli_query($mysqli,"UPDATE invoices SET invoice_credit_amount = $amount WHERE invoice_id = $invoice_id"); + + /* + //Add up all the payments for the invoice and get the total amount paid to the invoice + $sql_total_payments_amount = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS payments_amount FROM payments WHERE payment_invoice_id = $invoice_id"); + $row = mysqli_fetch_array($sql_total_payments_amount); + $total_payments_amount = floatval($row['payments_amount']); + + //Get the invoice total + $sql = mysqli_query($mysqli,"SELECT * FROM invoices + LEFT JOIN clients ON invoice_client_id = client_id + LEFT JOIN contacts ON clients.client_id = contacts.contact_client_id AND contact_primary = 1 + WHERE invoice_id = $invoice_id" + ); + + $row = mysqli_fetch_array($sql); + $invoice_amount = floatval($row['invoice_amount']); + $invoice_prefix = sanitizeInput($row['invoice_prefix']); + $invoice_number = intval($row['invoice_number']); + $invoice_url_key = sanitizeInput($row['invoice_url_key']); + $invoice_currency_code = sanitizeInput($row['invoice_currency_code']); + $client_id = intval($row['client_id']); + $client_name = sanitizeInput($row['client_name']); + $contact_name = sanitizeInput($row['contact_name']); + $contact_email = sanitizeInput($row['contact_email']); + $contact_phone = sanitizeInput(formatPhoneNumber($row['contact_phone'], $row['contact_phone_country_code'])); + $contact_extension = preg_replace("/[^0-9]/", '',$row['contact_extension']); + $contact_mobile = sanitizeInput(formatPhoneNumber($row['contact_mobile'], $row['contact_mobile_country_code'])); + + $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1"); + $row = mysqli_fetch_array($sql); + + $company_name = sanitizeInput($row['company_name']); + $company_country = sanitizeInput($row['company_country']); + $company_address = sanitizeInput($row['company_address']); + $company_city = sanitizeInput($row['company_city']); + $company_state = sanitizeInput($row['company_state']); + $company_zip = sanitizeInput($row['company_zip']); + $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code'])); + $company_email = sanitizeInput($row['company_email']); + $company_website = sanitizeInput($row['company_website']); + $company_logo = sanitizeInput($row['company_logo']); + + // Sanitize Config vars from get_settings.php + $config_invoice_from_name = sanitizeInput($config_invoice_from_name); + $config_invoice_from_email = sanitizeInput($config_invoice_from_email); + + //Calculate the Invoice balance + $invoice_balance = $invoice_amount - $total_payments_amount; + + $email_data = []; + + //Determine if invoice has been paid then set the status accordingly + if ($invoice_balance == 0) { + + $invoice_status = "Paid"; + + if ($email_receipt == 1) { + + $subject = "Payment Received - Invoice $invoice_prefix$invoice_number"; + $body = "Hello $contact_name,

We have received your payment in full for the amount of " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . " for invoice $invoice_prefix$invoice_number. Please keep this email as a receipt for your records.

Amount Paid: " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . "
Payment Method: $payment_method
Payment Reference: $reference

Thank you for your business!


--
$company_name - Billing Department
$config_invoice_from_email
$company_phone"; + + // Queue Mail + $email = [ + 'from' => $config_invoice_from_email, + 'from_name' => $config_invoice_from_name, + 'recipient' => $contact_email, + 'recipient_name' => $contact_name, + 'subject' => $subject, + 'body' => $body + ]; + + $email_data[] = $email; + + // Add email to queue + if (!empty($email)) { + addToMailQueue($email_data); + } + + // Get Email ID for reference + $email_id = mysqli_insert_id($mysqli); + + // Email Logging + mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Payment Receipt sent to mail queue ID: $email_id!', history_invoice_id = $invoice_id"); + logAction("Invoice", "Payment", "Payment receipt for invoice $invoice_prefix$invoice_number queued to $contact_email Email ID: $email_id", $client_id, $invoice_id); + + } + + } else { + + $invoice_status = "Partial"; + + if ($email_receipt == 1) { + + $subject = "Partial Payment Received - Invoice $invoice_prefix$invoice_number"; + $body = "Hello $contact_name,

We have received partial payment in the amount of " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . " and it has been applied to invoice $invoice_prefix$invoice_number. Please keep this email as a receipt for your records.

Amount Paid: " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . "
Payment Method: $payment_method
Payment Reference: $reference
Invoice Balance: " . numfmt_format_currency($currency_format, $invoice_balance, $invoice_currency_code) . "

Thank you for your business!


~
$company_name - Billing
$config_invoice_from_email
$company_phone"; + + // Queue Mail + $email = [ + 'from' => $config_invoice_from_email, + 'from_name' => $config_invoice_from_name, + 'recipient' => $contact_email, + 'recipient_name' => $contact_name, + 'subject' => $subject, + 'body' => $body + ]; + + $email_data[] = $email; + + // Add email to queue + if (!empty($email)) { + addToMailQueue($email_data); + } + + // Get Email ID for reference + $email_id = mysqli_insert_id($mysqli); + + // Email Logging + mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Payment Receipt sent to mail queue ID: $email_id!', history_invoice_id = $invoice_id"); + logAction("Invoice", "Payment", "Payment receipt for invoice $invoice_prefix$invoice_number queued to $contact_email Email ID: $email_id", $client_id, $invoice_id); + + } + + } + + //Update Invoice Status + mysqli_query($mysqli,"UPDATE invoices SET invoice_status = '$invoice_status' WHERE invoice_id = $invoice_id"); + + */ + + //Add Payment to History + mysqli_query($mysqli,"INSERT INTO history SET history_status = '$invoice_status', history_description = 'Credit applied', history_invoice_id = $invoice_id"); + + // Logging + logAction("Invoice", "Payment", "Credit" . numfmt_format_currency($currency_format, $amount, $session_company_currency) . " added to invoice $invoice_prefix$invoice_number", $client_id, $invoice_id); + + customAction('invoice_pay', $invoice_id); + + $_SESSION['alert_message'] .= "Credit amount " . numfmt_format_currency($currency_format, $amount, $session_company_currency) . " applied"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + } +} + if (isset($_GET['add_payment_stripe'])) { enforceUserPermission('module_sales', 2);