diff --git a/client_invoices.php b/client_invoices.php deleted file mode 100644 index be3c5cc0..00000000 --- a/client_invoices.php +++ /dev/null @@ -1,230 +0,0 @@ - - -
-
-

Invoices

-
-
- - 0) { ?> - -
- - Export - -
- -
-
-
-
-
- -
- -
-
- -
- -
-
-
- -
-
-
- 0) { ?> - - -
-
-
- -
-
-
-
- - "> - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - Number - - - - Scope - - - - Amount - - - - Date - - - - Due - - - - Category - - - - Status - - Action
-
- 		- - - - -
- -
- - - Send - -
- - - Edit - - - Copy - -
- - Delete - -
-
-
-
- -
-
- -= 1) { ?>
  • - "> + ">

    Invoices diff --git a/invoice.php b/invoice.php index 5c67f8d7..be355fcb 100644 --- a/invoice.php +++ b/invoice.php @@ -164,14 +164,14 @@ if (isset($_GET['invoice_id'])) {

  • - Invoices + Invoices
  • Invoices
  • - +
    • diff --git a/invoices.php b/invoices.php index 03e3dc89..69143f14 100644 --- a/invoices.php +++ b/invoices.php @@ -4,55 +4,62 @@ $sort = "invoice_number"; $order = "DESC"; -require_once "includes/inc_all.php"; +// If client_id is in URI then show client Side Bar and client header +if (isset($_GET['client_id'])) { + require_once "includes/inc_all_client.php"; + $client_query = "AND invoice_client_id = $client_id"; +} else { + require_once "includes/inc_all.php"; + $client_query = ''; +} // Perms enforceUserPermission('module_sales'); -$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Sent'")); +$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Sent' $client_query")); $sent_count = $row['num']; -$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Viewed'")); +$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Viewed' $client_query")); $viewed_count = $row['num']; -$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Partial'")); +$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Partial' $client_query")); $partial_count = $row['num']; -$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Draft'")); +$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Draft' $client_query")); $draft_count = $row['num']; -$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Cancelled'")); +$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Cancelled' $client_query")); $cancelled_count = $row['num']; -$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Paid' AND invoice_status NOT LIKE 'Cancelled' AND invoice_due < CURDATE()")); +$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Paid' AND invoice_status NOT LIKE 'Cancelled' AND invoice_due < CURDATE() $client_query")); $overdue_count = $row['num']; -$sql_total_draft_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_draft_amount FROM invoices WHERE invoice_status = 'Draft'"); +$sql_total_draft_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_draft_amount FROM invoices WHERE invoice_status = 'Draft' $client_query"); $row = mysqli_fetch_array($sql_total_draft_amount); $total_draft_amount = floatval($row['total_draft_amount']); -$sql_total_sent_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_sent_amount FROM invoices WHERE invoice_status = 'Sent'"); +$sql_total_sent_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_sent_amount FROM invoices WHERE invoice_status = 'Sent' $client_query"); $row = mysqli_fetch_array($sql_total_sent_amount); $total_sent_amount = floatval($row['total_sent_amount']); -$sql_total_viewed_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_viewed_amount FROM invoices WHERE invoice_status = 'Viewed'"); +$sql_total_viewed_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_viewed_amount FROM invoices WHERE invoice_status = 'Viewed' $client_query"); $row = mysqli_fetch_array($sql_total_viewed_amount); $total_viewed_amount = floatval($row['total_viewed_amount']); -$sql_total_cancelled_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_cancelled_amount FROM invoices WHERE invoice_status = 'Cancelled'"); +$sql_total_cancelled_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_cancelled_amount FROM invoices WHERE invoice_status = 'Cancelled' $client_query"); $row = mysqli_fetch_array($sql_total_cancelled_amount); $total_cancelled_amount = floatval($row['total_cancelled_amount']); -$sql_total_partial_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_partial_amount FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_status = 'Partial'"); +$sql_total_partial_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_partial_amount FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_status = 'Partial' $client_query"); $row = mysqli_fetch_array($sql_total_partial_amount); $total_partial_amount = floatval($row['total_partial_amount']); $total_partial_count = mysqli_num_rows($sql_total_partial_amount); -$sql_total_overdue_partial_amount = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_overdue_partial_amount FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_status = 'Partial' AND invoice_due < CURDATE()"); +$sql_total_overdue_partial_amount = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_overdue_partial_amount FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_status = 'Partial' AND invoice_due < CURDATE() $client_query"); $row = mysqli_fetch_array($sql_total_overdue_partial_amount); $total_overdue_partial_amount = floatval($row['total_overdue_partial_amount']); -$sql_total_overdue_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_overdue_amount FROM invoices WHERE invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Paid' AND invoice_status NOT LIKE 'Cancelled' AND invoice_due < CURDATE()"); +$sql_total_overdue_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_overdue_amount FROM invoices WHERE invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Paid' AND invoice_status NOT LIKE 'Cancelled' AND invoice_due < CURDATE() $client_query"); $row = mysqli_fetch_array($sql_total_overdue_amount); $total_overdue_amount = floatval($row['total_overdue_amount']); @@ -85,6 +92,7 @@ $sql = mysqli_query( $overdue_query AND DATE(invoice_date) BETWEEN '$dtf' AND '$dtt' AND (CONCAT(invoice_prefix,invoice_number) LIKE '%$q%' OR invoice_scope LIKE '%$q%' OR client_name LIKE '%$q%' OR invoice_status LIKE '%$q%' OR invoice_amount LIKE '%$q%' OR category_name LIKE '%$q%') + $client_query ORDER BY $sort $order LIMIT $record_from, $record_to" ); @@ -156,6 +164,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    + + +
    @@ -219,11 +230,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Scope + Client + Amount @@ -297,7 +310,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - + + + diff --git a/modals/client_invoice_export_modal.php b/modals/client_invoice_export_modal.php deleted file mode 100644 index 5b9b1694..00000000 --- a/modals/client_invoice_export_modal.php +++ /dev/null @@ -1,22 +0,0 @@ - diff --git a/modals/invoice_export_modal.php b/modals/invoice_export_modal.php index 930dc762..efe941fb 100644 --- a/modals/invoice_export_modal.php +++ b/modals/invoice_export_modal.php @@ -8,6 +8,9 @@
    + + +
    diff --git a/post/user/invoice.php b/post/user/invoice.php index 6237c6d5..4d16e35b 100644 --- a/post/user/invoice.php +++ b/post/user/invoice.php @@ -1594,54 +1594,14 @@ if (isset($_GET['force_recurring'])) { } -if (isset($_POST['export_client_invoices_csv'])) { - $client_id = intval($_POST['client_id']); - - //get records from database - $sql = mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $client_id"); - $row = mysqli_fetch_array($sql); - - $client_name = $row['client_name']; - - $sql = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_client_id = $client_id ORDER BY invoice_number ASC"); - - $num_rows = mysqli_num_rows($sql); - - if ($num_rows > 0) { - $delimiter = ","; - $filename = $client_name . "-Invoices-" . date('Y-m-d') . ".csv"; - - //create a file pointer - $f = fopen('php://memory', 'w'); - - //set column headers - $fields = array('Invoice Number', 'Scope', 'Amount', 'Issued Date', 'Due Date', 'Status'); - fputcsv($f, $fields, $delimiter); - - //output each row of the data, format line as csv and write to file pointer - while($row = $sql->fetch_assoc()) { - $lineData = array($row['invoice_prefix'] . $row['invoice_number'], $row['invoice_scope'], $row['invoice_amount'], $row['invoice_date'], $row['invoice_due'], $row['invoice_status']); - fputcsv($f, $lineData, $delimiter); - } - - //move back to beginning of file - fseek($f, 0); - - //set headers to download file rather than displayed - header('Content-Type: text/csv'); - header('Content-Disposition: attachment; filename="' . $filename . '";'); - - //output all remaining data on a file pointer - fpassthru($f); +if (isset($_POST['export_invoices_csv'])) { + if (isset($_POST['client_id'])) { + $client_id = intval($_POST['client_id']); + $client_query = "AND invoice_client_id = $client_id"; + } else { + $client_query = ''; } - logAction("Invoice", "Export", "$session_name exported $num_rows invoices to CSV file", $client_id); - - exit; - -} - -if (isset($_POST['export_invoices_csv'])) { $date_from = sanitizeInput($_POST['date_from']); $date_to = sanitizeInput($_POST['date_to']); if (!empty($date_from) && !empty($date_to)) { @@ -1652,7 +1612,7 @@ if (isset($_POST['export_invoices_csv'])) { $file_name_date = date('Y-m-d'); } - $sql = mysqli_query($mysqli,"SELECT * FROM invoices LEFT JOIN clients ON invoice_client_id = client_id WHERE $date_query ORDER BY invoice_number ASC"); + $sql = mysqli_query($mysqli,"SELECT * FROM invoices LEFT JOIN clients ON invoice_client_id = client_id WHERE $date_query $client_query ORDER BY invoice_number ASC"); $row = mysqli_fetch_array($sql); $client_name = $row['client_name'];