diff --git a/add_recurring_modal.php b/add_recurring_modal.php index 15f3505c..7f3c6bd2 100644 --- a/add_recurring_modal.php +++ b/add_recurring_modal.php @@ -89,6 +89,17 @@ + +
+ +
+
+ +
+ +
+
+
diff --git a/client_recurring.php b/client_recurring.php index f0d82bca..83c6c720 100644 --- a/client_recurring.php +++ b/client_recurring.php @@ -43,7 +43,7 @@ if(isset($_GET['o'])){ $sql = mysqli_query($mysqli,"SELECT * FROM recurring, categories WHERE recurring.client_id = $client_id AND recurring.category_id = categories.category_id - AND (recurring_frequency LIKE '%$q%' OR category_name LIKE '%$q%') + AND (recurring_frequency LIKE '%$q%' OR recurring_scope 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()")); @@ -73,6 +73,7 @@ $total_pages = ceil($total_found_rows / 10); "> + @@ -87,6 +88,7 @@ $total_pages = ceil($total_found_rows / 10); while($row = mysqli_fetch_array($sql)){ $recurring_id = $row['recurring_id']; + $recurring_scope = $row['recurring_scope']; $recurring_frequency = $row['recurring_frequency']; $recurring_status = $row['recurring_status']; $recurring_last_sent = $row['recurring_last_sent']; @@ -108,6 +110,7 @@ $total_pages = ceil($total_found_rows / 10); ?> + diff --git a/cron.php b/cron.php index f8d06d36..10682210 100644 --- a/cron.php +++ b/cron.php @@ -169,6 +169,7 @@ while($row = mysqli_fetch_array($sql_companies)){ while($row = mysqli_fetch_array($sql_recurring)){ $recurring_id = $row['recurring_id']; + $recurring_scope = $row['recurring_scope']; $recurring_frequency = $row['recurring_frequency']; $recurring_status = $row['recurring_status']; $recurring_last_sent = $row['recurring_last_sent']; @@ -192,7 +193,7 @@ while($row = mysqli_fetch_array($sql_companies)){ //Generate a unique URL key for clients to access $url_key = keygen(); - mysqli_query($mysqli,"INSERT INTO invoices SET invoice_number = '$new_invoice_number', invoice_date = CURDATE(), invoice_due = DATE_ADD(CURDATE(), INTERVAL $client_net_terms day), invoice_amount = '$recurring_amount', invoice_note = '$recurring_note', category_id = $category_id, invoice_status = 'Sent', invoice_url_key = '$url_key', invoice_created_at = NOW(), client_id = $client_id, company_id = $company_id"); + mysqli_query($mysqli,"INSERT INTO invoices SET invoice_number = '$new_invoice_number', invoice_scope = '$recurring_scope', invoice_date = CURDATE(), invoice_due = DATE_ADD(CURDATE(), INTERVAL $client_net_terms day), invoice_amount = '$recurring_amount', invoice_note = '$recurring_note', category_id = $category_id, invoice_status = 'Sent', invoice_url_key = '$url_key', invoice_created_at = NOW(), client_id = $client_id, company_id = $company_id"); $new_invoice_id = mysqli_insert_id($mysqli); diff --git a/post.php b/post.php index ce681023..2cea5de1 100644 --- a/post.php +++ b/post.php @@ -1462,11 +1462,12 @@ if(isset($_POST['add_invoice_recurring'])){ $row = mysqli_fetch_array($sql); $invoice_date = $row['invoice_date']; $invoice_amount = $row['invoice_amount']; + $invoice_scope = mysqli_real_escape_string($mysqli,$row['invoice_scope']); $invoice_note = mysqli_real_escape_string($mysqli,$row['invoice_note']); //SQL Escape in case notes have , them $client_id = $row['client_id']; $category_id = $row['category_id']; - mysqli_query($mysqli,"INSERT INTO recurring SET recurring_frequency = '$recurring_frequency', recurring_next_date = DATE_ADD('$invoice_date', INTERVAL 1 $recurring_frequency), recurring_status = 1, recurring_amount = '$invoice_amount', recurring_note = '$invoice_note', recurring_created_at = NOW(), category_id = $category_id, client_id = $client_id, company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO recurring SET recurring_scope = '$invoice_scope', recurring_frequency = '$recurring_frequency', recurring_next_date = DATE_ADD('$invoice_date', INTERVAL 1 $recurring_frequency), recurring_status = 1, recurring_amount = '$invoice_amount', recurring_note = '$invoice_note', recurring_created_at = NOW(), category_id = $category_id, client_id = $client_id, company_id = $session_company_id"); $recurring_id = mysqli_insert_id($mysqli); @@ -2097,8 +2098,9 @@ if(isset($_POST['add_recurring'])){ $frequency = strip_tags(mysqli_real_escape_string($mysqli,$_POST['frequency'])); $start_date = strip_tags(mysqli_real_escape_string($mysqli,$_POST['start_date'])); $category = intval($_POST['category']); + $scope = strip_tags(mysqli_real_escape_string($mysqli,$_POST['scope'])); - mysqli_query($mysqli,"INSERT INTO recurring SET recurring_frequency = '$frequency', recurring_next_date = '$start_date', category_id = $category, recurring_status = 1, recurring_created_at = NOW(), client_id = $client, company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO recurring SET recurring_scope = '$scope', recurring_frequency = '$frequency', recurring_next_date = '$start_date', category_id = $category, recurring_status = 1, recurring_created_at = NOW(), client_id = $client, company_id = $session_company_id"); $recurring_id = mysqli_insert_id($mysqli); @@ -3624,6 +3626,7 @@ if(isset($_GET['force_recurring'])){ $row = mysqli_fetch_array($sql_recurring); $recurring_id = $row['recurring_id']; + $recurring_scope = $row['recurring_scope']; $recurring_frequency = $row['recurring_frequency']; $recurring_status = $row['recurring_status']; $recurring_last_sent = $row['recurring_last_sent']; @@ -3642,7 +3645,7 @@ if(isset($_GET['force_recurring'])){ //Generate a unique URL key for clients to access $url_key = keygen(); - mysqli_query($mysqli,"INSERT INTO invoices SET invoice_number = '$new_invoice_number', invoice_date = CURDATE(), invoice_due = DATE_ADD(CURDATE(), INTERVAL $client_net_terms day), invoice_amount = '$recurring_amount', invoice_note = '$recurring_note', category_id = $category_id, invoice_status = 'Sent', invoice_url_key = '$url_key', invoice_created_at = NOW(), client_id = $client_id, company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO invoices SET invoice_number = '$new_invoice_number', invoice_scope = '$recurring_scope', invoice_date = CURDATE(), invoice_due = DATE_ADD(CURDATE(), INTERVAL $client_net_terms day), invoice_amount = '$recurring_amount', invoice_note = '$recurring_note', category_id = $category_id, invoice_status = 'Sent', invoice_url_key = '$url_key', invoice_created_at = NOW(), client_id = $client_id, company_id = $session_company_id"); $new_invoice_id = mysqli_insert_id($mysqli); @@ -3676,6 +3679,7 @@ if(isset($_GET['force_recurring'])){ $row = mysqli_fetch_array($sql); $invoice_number = $row['invoice_number']; + $invoice_scope = $row['invoice_scope']; $invoice_date = $row['invoice_date']; $invoice_due = $row['invoice_due']; $invoice_amount = $row['invoice_amount']; diff --git a/recurring.php b/recurring.php index 631ea836..1151c0c7 100644 --- a/recurring.php +++ b/recurring.php @@ -44,7 +44,7 @@ WHERE recurring.client_id = clients.client_id AND recurring.category_id = categories.category_id AND recurring.company_id = $session_company_id - AND (recurring_frequency LIKE '%$q%' OR client_name LIKE '%$q%' OR category_name LIKE '%$q%') + AND (recurring_frequency LIKE '%$q%' OR recurring_scope LIKE '%$q%' OR client_name 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()")); @@ -73,6 +73,7 @@ "> + @@ -88,6 +89,7 @@ while($row = mysqli_fetch_array($sql)){ $recurring_id = $row['recurring_id']; + $recurring_scope = $row['recurring_scope']; $recurring_frequency = $row['recurring_frequency']; $recurring_status = $row['recurring_status']; $recurring_last_sent = $row['recurring_last_sent']; @@ -112,6 +114,7 @@ + diff --git a/recurring_invoice.php b/recurring_invoice.php index e1f555ee..ea067cef 100644 --- a/recurring_invoice.php +++ b/recurring_invoice.php @@ -13,6 +13,7 @@ if(isset($_GET['recurring_id'])){ $row = mysqli_fetch_array($sql); $recurring_id = $row['recurring_id']; + $recurring_scope = $row['recurring_scope']; $recurring_frequency = $row['recurring_frequency']; $recurring_status = $row['recurring_status']; $recurring_start_date = $row['recurring_start_date'];
Scope Frequency Amount Last Sent
ly $
Next DateScope Frequency Client Amount
ly $