diff --git a/report_income_by_client.php b/report_income_by_client.php index cd4686cb..74de7436 100644 --- a/report_income_by_client.php +++ b/report_income_by_client.php @@ -11,8 +11,6 @@ if (isset($_GET['year'])) { $sql_payment_years = mysqli_query($mysqli, "SELECT DISTINCT YEAR(payment_date) AS payment_year FROM payments WHERE company_id = $session_company_id UNION SELECT DISTINCT YEAR(revenue_date) AS payment_year FROM revenues WHERE company_id = $session_company_id ORDER BY payment_year DESC"); -$sql_clients = mysqli_query($mysqli, "SELECT * FROM clients WHERE company_id = $session_company_id"); - ?>
@@ -37,6 +35,19 @@ $sql_clients = mysqli_query($mysqli, "SELECT * FROM clients WHERE company_id = $ + 599 + ORDER BY amount_paid DESC" + ); + ?> +
@@ -50,23 +61,17 @@ $sql_clients = mysqli_query($mysqli, "SELECT * FROM clients WHERE company_id = $ while ($row = mysqli_fetch_array($sql_clients)) { $client_id = intval($row['client_id']); $client_name = htmlentities($row['client_name']); - - $sql_amount_paid = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS amount_paid FROM payments, invoices WHERE payment_invoice_id = invoice_id AND YEAR(payment_date) = $year AND invoice_client_id = $client_id"); - $row = mysqli_fetch_array($sql_amount_paid); - $amount_paid = floatval($row['amount_paid']); - if ($amount_paid > 599) { + ?> - ?> - - - - - - + + + +
diff --git a/report_recurring_by_client.php b/report_recurring_by_client.php index e242e51a..d1a48b09 100644 --- a/report_recurring_by_client.php +++ b/report_recurring_by_client.php @@ -54,7 +54,7 @@ $sql = mysqli_query($mysqli, " ?> - Total + Total Monthly Income