diff --git a/add_invoice_modal.php b/add_invoice_modal.php index a48e9c89..15098154 100644 --- a/add_invoice_modal.php +++ b/add_invoice_modal.php @@ -49,16 +49,6 @@ " required> - -
- -
-
- -
- -
-
@@ -83,6 +73,17 @@
+ +
+ +
+
+ +
+ +
+
+
diff --git a/client_invoices.php b/client_invoices.php index db72d26d..cbdf8ae1 100644 --- a/client_invoices.php +++ b/client_invoices.php @@ -43,7 +43,7 @@ if(isset($_GET['o'])){ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM invoices, categories WHERE invoices.client_id = $client_id AND invoices.category_id = categories.category_id - AND (invoice_number LIKE '%$q%' OR category_name LIKE '%$q%' OR invoice_status LIKE '%$q%') + AND (invoice_number LIKE '%$q%' OR invoice_scope LIKE '%$q%' OR category_name LIKE '%$q%' OR invoice_status LIKE '%$q%') ORDER BY $sb $o LIMIT $record_from, $record_to"); $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); @@ -74,6 +74,7 @@ $total_pages = ceil($total_found_rows / 10); "> Number + Scope Amount Date Due @@ -88,6 +89,7 @@ $total_pages = ceil($total_found_rows / 10); while($row = mysqli_fetch_array($sql)){ $invoice_id = $row['invoice_id']; $invoice_number = $row['invoice_number']; + $invoice_scope = $row['invoice_scope']; $invoice_status = $row['invoice_status']; $invoice_date = $row['invoice_date']; $invoice_due = $row['invoice_due']; @@ -121,6 +123,7 @@ $total_pages = ceil($total_found_rows / 10); + $
diff --git a/edit_invoice_modal.php b/edit_invoice_modal.php index 7bd6d83e..c62959d3 100644 --- a/edit_invoice_modal.php +++ b/edit_invoice_modal.php @@ -55,6 +55,17 @@
+ +
+ +
+
+ +
+ +
+
+
diff --git a/invoice.php b/invoice.php index 711488d1..fbbb811a 100644 --- a/invoice.php +++ b/invoice.php @@ -19,6 +19,7 @@ if(isset($_GET['invoice_id'])){ $row = mysqli_fetch_array($sql); $invoice_id = $row['invoice_id']; $invoice_number = $row['invoice_number']; + $invoice_scope = $row['invoice_scope']; $invoice_status = $row['invoice_status']; $invoice_date = $row['invoice_date']; $invoice_due = $row['invoice_due']; diff --git a/invoices.php b/invoices.php index 40da8708..eef6b86b 100644 --- a/invoices.php +++ b/invoices.php @@ -105,7 +105,7 @@ AND invoices.category_id = categories.category_id AND invoices.company_id = $session_company_id AND DATE(invoice_date) BETWEEN '$dtf' AND '$dtt' - AND (invoice_number LIKE '%$q%' OR client_name LIKE '%$q%' OR invoice_status LIKE '%$q%') + AND (invoice_number LIKE '%$q%' OR invoice_scope LIKE '%$q%' OR client_name LIKE '%$q%' OR invoice_status 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()")); @@ -193,6 +193,7 @@ "> Number + Scope Client Amount Invoice Date @@ -208,6 +209,7 @@ while($row = mysqli_fetch_array($sql)){ $invoice_id = $row['invoice_id']; $invoice_number = $row['invoice_number']; + $invoice_scope = $row['invoice_scope']; $invoice_status = $row['invoice_status']; $invoice_date = $row['invoice_date']; $invoice_due = $row['invoice_due']; @@ -247,6 +249,7 @@ + $ diff --git a/post.php b/post.php index 88266fb9..29e1a888 100644 --- a/post.php +++ b/post.php @@ -1352,6 +1352,7 @@ if(isset($_POST['add_invoice'])){ $client = intval($_POST['client']); $date = strip_tags(mysqli_real_escape_string($mysqli,$_POST['date'])); $category = intval($_POST['category']); + $scope = strip_tags(mysqli_real_escape_string($mysqli,$_POST['scope'])); //Get Net Terms $sql = mysqli_query($mysqli,"SELECT client_net_terms FROM clients WHERE client_id = $client AND company_id = $session_company_id"); @@ -1366,7 +1367,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_number = '$invoice_number', invoice_date = '$date', invoice_due = DATE_ADD('$date', INTERVAL $client_net_terms day), category_id = $category, invoice_status = 'Draft', invoice_url_key = '$url_key', invoice_created_at = NOW(), client_id = $client, company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO invoices SET invoice_number = '$invoice_number', invoice_scope = '$scope', invoice_date = '$date', invoice_due = DATE_ADD('$date', INTERVAL $client_net_terms day), category_id = $category, invoice_status = 'Draft', invoice_url_key = '$url_key', invoice_created_at = NOW(), 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(), invoice_id = $invoice_id, company_id = $session_company_id"); @@ -1385,8 +1386,9 @@ if(isset($_POST['edit_invoice'])){ $date = strip_tags(mysqli_real_escape_string($mysqli,$_POST['date'])); $due = strip_tags(mysqli_real_escape_string($mysqli,$_POST['due'])); $category = intval($_POST['category']); + $scope = strip_tags(mysqli_real_escape_string($mysqli,$_POST['scope'])); - mysqli_query($mysqli,"UPDATE invoices SET invoice_date = '$date', invoice_due = '$due', invoice_updated_at = NOW(), category_id = $category WHERE invoice_id = $invoice_id AND company_id = $session_company_id"); + mysqli_query($mysqli,"UPDATE invoices SET invoice_scope = '$scope', invoice_date = '$date', invoice_due = '$due', invoice_updated_at = NOW(), category_id = $category WHERE invoice_id = $invoice_id AND company_id = $session_company_id"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Invoice', log_action = 'Modified', log_description = '$invoice_id', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id"); @@ -1413,6 +1415,7 @@ if(isset($_POST['add_invoice_copy'])){ $sql = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_id = $invoice_id AND company_id = $session_company_id"); $row = mysqli_fetch_array($sql); + $invoice_scope = $row['invoice_scope']; $invoice_amount = $row['invoice_amount']; $invoice_note = mysqli_real_escape_string($mysqli,$row['invoice_note']); $client_id = $row['client_id']; @@ -1421,7 +1424,7 @@ if(isset($_POST['add_invoice_copy'])){ //Generate a unique URL key for clients to access $url_key = keygen(); - mysqli_query($mysqli,"INSERT INTO invoices SET invoice_number = '$invoice_number', invoice_date = '$date', invoice_due = DATE_ADD('$date', INTERVAL $client_net_terms day), category_id = $category_id, invoice_status = 'Draft', invoice_amount = '$invoice_amount', invoice_note = '$invoice_note', invoice_url_key = '$url_key', invoice_created_at = NOW(), client_id = $client_id, company_id = $session_company_id") or die(mysql_error()); + mysqli_query($mysqli,"INSERT INTO invoices SET invoice_number = '$invoice_number', invoice_scope = '$invoice_scope', invoice_date = '$date', invoice_due = DATE_ADD('$date', INTERVAL $client_net_terms day), category_id = $category_id, invoice_status = 'Draft', invoice_amount = '$invoice_amount', invoice_note = '$invoice_note', invoice_url_key = '$url_key', invoice_created_at = NOW(), client_id = $client_id, company_id = $session_company_id") or die(mysql_error()); $new_invoice_id = mysqli_insert_id($mysqli);