diff --git a/client_contact_add_modal.php b/client_contact_add_modal.php index 26f76ba7..ba87dbd6 100644 --- a/client_contact_add_modal.php +++ b/client_contact_add_modal.php @@ -8,6 +8,12 @@
+ + + + + +
@@ -120,8 +126,8 @@ $location_name = htmlentities($row['location_name']); ?> - +
diff --git a/client_contact_edit_modal.php b/client_contact_edit_modal.php index 81047b99..a86ed394 100644 --- a/client_contact_edit_modal.php +++ b/client_contact_edit_modal.php @@ -8,6 +8,12 @@ + + + + + + @@ -122,8 +128,8 @@ $location_name_select = htmlentities($row['location_name']); ?> - + diff --git a/guest_header.php b/guest_header.php index 54132776..141bb1bf 100644 --- a/guest_header.php +++ b/guest_header.php @@ -24,8 +24,6 @@ $user_agent = strip_tags(mysqli_real_escape_string($mysqli, $_SERVER['HTTP_USER_ - - diff --git a/invoices.php b/invoices.php index 6d5ae4e9..c74f5859 100644 --- a/invoices.php +++ b/invoices.php @@ -1,125 +1,125 @@ CURDATE() AND company_id = $session_company_id")); - $overdue_count = $row['num']; +$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_due > CURDATE() AND company_id = $session_company_id")); +$overdue_count = $row['num']; - $sql_total_draft = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS total_draft FROM invoices WHERE invoice_status = 'Draft' AND company_id = $session_company_id"); - $row = mysqli_fetch_array($sql_total_draft); - $total_draft = $row['total_draft']; +$sql_total_draft = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_draft FROM invoices WHERE invoice_status = 'Draft' AND company_id = $session_company_id"); +$row = mysqli_fetch_array($sql_total_draft); +$total_draft = $row['total_draft']; - $sql_total_sent = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS total_sent FROM invoices WHERE invoice_status = 'Sent' AND company_id = $session_company_id"); - $row = mysqli_fetch_array($sql_total_sent); - $total_sent = $row['total_sent']; +$sql_total_sent = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_sent FROM invoices WHERE invoice_status = 'Sent' AND company_id = $session_company_id"); +$row = mysqli_fetch_array($sql_total_sent); +$total_sent = $row['total_sent']; - $sql_total_viewed = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS total_viewed FROM invoices WHERE invoice_status = 'Viewed' AND company_id = $session_company_id"); - $row = mysqli_fetch_array($sql_total_viewed); - $total_viewed = $row['total_viewed']; +$sql_total_viewed = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_viewed FROM invoices WHERE invoice_status = 'Viewed' AND company_id = $session_company_id"); +$row = mysqli_fetch_array($sql_total_viewed); +$total_viewed = $row['total_viewed']; - $sql_total_cancelled = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS total_cancelled FROM invoices WHERE invoice_status = 'Cancelled' AND company_id = $session_company_id"); - $row = mysqli_fetch_array($sql_total_cancelled); - $total_cancelled = $row['total_cancelled']; +$sql_total_cancelled = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_cancelled FROM invoices WHERE invoice_status = 'Cancelled' AND company_id = $session_company_id"); +$row = mysqli_fetch_array($sql_total_cancelled); +$total_cancelled = $row['total_cancelled']; - $sql_total_partial = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS total_partial FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_status = 'Partial' AND invoices.company_id = $session_company_id"); - $row = mysqli_fetch_array($sql_total_partial); - $total_partial = $row['total_partial']; - $total_partial_count = mysqli_num_rows($sql_total_partial); +$sql_total_partial = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_partial FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_status = 'Partial' AND invoices.company_id = $session_company_id"); +$row = mysqli_fetch_array($sql_total_partial); +$total_partial = $row['total_partial']; +$total_partial_count = mysqli_num_rows($sql_total_partial); - $sql_total_overdue_partial = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_overdue_partial FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_status = 'Partial' AND invoice_due < CURDATE() AND invoices.company_id = $session_company_id"); - $row = mysqli_fetch_array($sql_total_overdue_partial); - $total_overdue_partial = $row['total_overdue_partial']; +$sql_total_overdue_partial = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_overdue_partial FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_status = 'Partial' AND invoice_due < CURDATE() AND invoices.company_id = $session_company_id"); +$row = mysqli_fetch_array($sql_total_overdue_partial); +$total_overdue_partial = $row['total_overdue_partial']; - $sql_total_overdue = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS total_overdue FROM invoices WHERE invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Paid' AND invoice_due < CURDATE() AND invoices.company_id = $session_company_id"); - $row = mysqli_fetch_array($sql_total_overdue); - $total_overdue = $row['total_overdue']; +$sql_total_overdue = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_overdue FROM invoices WHERE invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Paid' AND invoice_due < CURDATE() AND invoices.company_id = $session_company_id"); +$row = mysqli_fetch_array($sql_total_overdue); +$total_overdue = $row['total_overdue']; - $real_overdue_amount = $total_overdue - $total_overdue_partial; +$real_overdue_amount = $total_overdue - $total_overdue_partial; - if (!empty($_GET['sb'])) { +if (!empty($_GET['sb'])) { $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb'])); - }else{ +} else { $sb = "invoice_number"; - } +} - // Reverse default sort - if (!isset($_GET['o'])) { +// Reverse default sort +if (!isset($_GET['o'])) { $o = "DESC"; $disp = "ASC"; - } +} - if (empty($_GET['canned_date'])) { +if (empty($_GET['canned_date'])) { //Prevents lots of undefined variable errors. // $dtf and $dtt will be set by the below else to 0000-00-00 / 9999-00-00 $_GET['canned_date'] = 'custom'; - } +} - //Invoice status from GET - if (isset($_GET['status']) && ($_GET['status']) == 'Draft') { +//Invoice status from GET +if (isset($_GET['status']) && ($_GET['status']) == 'Draft') { $status_query = 'Draft'; - }elseif (isset($_GET['status']) && ($_GET['status']) == 'Sent') { +} elseif (isset($_GET['status']) && ($_GET['status']) == 'Sent') { $status_query = 'Sent'; - }elseif (isset($_GET['status']) && ($_GET['status']) == 'Viewed') { +} elseif (isset($_GET['status']) && ($_GET['status']) == 'Viewed') { $status_query = 'Viewed'; - }elseif (isset($_GET['status']) && ($_GET['status']) == 'Partial') { +} elseif (isset($_GET['status']) && ($_GET['status']) == 'Partial') { $status_query = 'Partial'; - }else{ +} else { $status_query = '%'; - } +} - //Date Filter - if ($_GET['canned_date'] == "custom" && !empty($_GET['dtf'])) { +//Date Filter +if ($_GET['canned_date'] == "custom" && !empty($_GET['dtf'])) { $dtf = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtf'])); $dtt = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtt'])); - }elseif ($_GET['canned_date'] == "today") { +} elseif ($_GET['canned_date'] == "today") { $dtf = date('Y-m-d'); $dtt = date('Y-m-d'); - }elseif ($_GET['canned_date'] == "yesterday") { +} elseif ($_GET['canned_date'] == "yesterday") { $dtf = date('Y-m-d',strtotime("yesterday")); $dtt = date('Y-m-d',strtotime("yesterday")); - }elseif ($_GET['canned_date'] == "thisweek") { +} elseif ($_GET['canned_date'] == "thisweek") { $dtf = date('Y-m-d',strtotime("monday this week")); $dtt = date('Y-m-d'); - }elseif ($_GET['canned_date'] == "lastweek") { +} elseif ($_GET['canned_date'] == "lastweek") { $dtf = date('Y-m-d',strtotime("monday last week")); $dtt = date('Y-m-d',strtotime("sunday last week")); - }elseif ($_GET['canned_date'] == "thismonth") { +} elseif ($_GET['canned_date'] == "thismonth") { $dtf = date('Y-m-01'); $dtt = date('Y-m-d'); - }elseif ($_GET['canned_date'] == "lastmonth") { +} elseif ($_GET['canned_date'] == "lastmonth") { $dtf = date('Y-m-d',strtotime("first day of last month")); $dtt = date('Y-m-d',strtotime("last day of last month")); - }elseif ($_GET['canned_date'] == "thisyear") { +} elseif ($_GET['canned_date'] == "thisyear") { $dtf = date('Y-01-01'); $dtt = date('Y-m-d'); - }elseif ($_GET['canned_date'] == "lastyear") { +} elseif ($_GET['canned_date'] == "lastyear") { $dtf = date('Y-m-d',strtotime("first day of january last year")); $dtt = date('Y-m-d',strtotime("last day of december last year")); - }else{ +} else { $dtf = "0000-00-00"; $dtt = "9999-00-00"; - } +} - //Rebuild URL - $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o))); +//Rebuild URL +$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o))); - $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM invoices +$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM invoices LEFT JOIN clients ON invoice_client_id = client_id LEFT JOIN categories ON invoice_category_id = category_id WHERE invoices.company_id = $session_company_id @@ -128,235 +128,231 @@ 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%') ORDER BY $sb $o LIMIT $record_from, $record_to"); - $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); +$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> -
-
- - -
-

-

Draft

-
-
- -
- -
- - -
- - -
-

-

Sent

-
-
- -
- -
- - -
- - -
-

-

Viewed

-
-
- -
- -
- - -
- - -
-

-

Partial

-
-
- -
- -
- - -
- -
-
-

Invoices

-
- -
-
- -
- - -
-
-
- -
- - -
-
-
-
-
" id="advancedFilter"> -
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- -
-
- - "> - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ +
+ + + - + + +
+

+

Sent

+
+
+ +
+ + + +
+ + +
+

+

Viewed

+
+
+ +
+ +
+ - include("invoice_edit_modal.php"); - include("invoice_copy_modal.php"); +
+ + +
+

+

Partial

+
+
+ +
+ +
+ - } - - ?> - - -
NumberScopeClientAmountDateDueCategoryStatusAction
- - - - -
- -
- Edit - Copy -
- - Send -
- - Delete +
+
+ + +
+

+

Draft

-
-
- -
-
+ +
+
+

Invoices

+
+ +
+
+ +
+
+ +
+
+
+ +
+ + +
+
+
+
+
" id="advancedFilter"> +
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+
+ + "> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NumberScopeClientAmountDateDueCategoryStatusAction
+ + + + +
+ +
+ Edit + Copy +
+ + Send +
+ + Delete +
+
+
+
+ +
+
+require_once("invoice_add_modal.php"); +require_once("category_quick_add_modal.php"); +require_once("footer.php");