From 889a749d8872d4cd64241e60e4766b34a05227d9 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 25 May 2019 21:14:08 -0400 Subject: [PATCH] Added alert feedback boxes, little ui fixes for quote invoice and recurring added rejected instead of cancelled for quotes, and other little ui cleanups --- add_user_modal.php | 25 +++ check_login.php | 1 - client_contacts.php | 14 +- client_invoices.php | 2 +- client_quotes.php | 15 +- edit_contact_modal.php | 11 +- edit_invoice_modal.php | 6 +- edit_user_modal.php | 7 + functions.php | 2 + header.php | 19 ++- invoice.php | 379 +++++++++++++++++++++-------------------- invoices.php | 2 + js/app.js | 6 + post.php | 297 ++++++++++++++++---------------- quote.php | 348 ++++++++++++++++++------------------- quotes.php | 4 +- recurring_invoice.php | 325 +++++++++++++++++------------------ settings-carddav.php | 58 +++++++ settings-nav.php | 8 + users.php | 12 +- 20 files changed, 847 insertions(+), 694 deletions(-) create mode 100644 settings-carddav.php diff --git a/add_user_modal.php b/add_user_modal.php index 78c86d21..a61c90b9 100644 --- a/add_user_modal.php +++ b/add_user_modal.php @@ -9,6 +9,31 @@
+ +
+ +
+
+ +
+ +
+
+
diff --git a/check_login.php b/check_login.php index 96c0b85f..bdd2b301 100644 --- a/check_login.php +++ b/check_login.php @@ -14,7 +14,6 @@ $session_name = $row['name']; $session_avatar = $row['avatar']; - //Detects if using an apple device and uses apple maps instead of google $iPod = stripos($_SERVER['HTTP_USER_AGENT'],"iPod"); $iPhone = stripos($_SERVER['HTTP_USER_AGENT'],"iPhone"); diff --git a/client_contacts.php b/client_contacts.php index 4d295ce8..f0210233 100644 --- a/client_contacts.php +++ b/client_contacts.php @@ -33,21 +33,23 @@ ?> - + + -
- - - + + +
+ +
- + diff --git a/client_invoices.php b/client_invoices.php index 4ce5b7e8..da07ec5a 100644 --- a/client_invoices.php +++ b/client_invoices.php @@ -34,7 +34,7 @@ $invoice_date = $row['invoice_date']; $invoice_due = $row['invoice_due']; $invoice_amount = $row['invoice_amount']; - $invoice_category_id = $row['category_id']; + $category_id = $row['category_id']; $category_name = $row['category_name']; $now = time(); diff --git a/client_quotes.php b/client_quotes.php index 3cf9054b..7b838f8e 100644 --- a/client_quotes.php +++ b/client_quotes.php @@ -40,7 +40,7 @@ $quote_badge_color = "primary"; }elseif($quote_status == "Approved"){ $quote_badge_color = "success"; - }elseif($quote_status == "Cancelled"){ + }elseif($quote_status == "Rejected"){ $quote_badge_color = "danger"; }else{ $quote_badge_color = "secondary"; @@ -64,8 +64,10 @@
- Edit - Copy + Edit + Copy + Send + Approve PDF Delete
@@ -74,9 +76,10 @@ diff --git a/edit_contact_modal.php b/edit_contact_modal.php index 43a1d3cf..69a0617c 100644 --- a/edit_contact_modal.php +++ b/edit_contact_modal.php @@ -10,7 +10,16 @@
-
+
+ + + + + + + + +
diff --git a/edit_invoice_modal.php b/edit_invoice_modal.php index 24178332..a29519ad 100644 --- a/edit_invoice_modal.php +++ b/edit_invoice_modal.php @@ -44,10 +44,10 @@ $sql_income_category = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income'"); while($row = mysqli_fetch_array($sql_income_category)){ - $category_id = $row['category_id']; - $category_name = $row['category_name']; + $category_id_select= $row['category_id']; + $category_name_select = $row['category_name']; ?> - + ">
+ + + + + + +
diff --git a/functions.php b/functions.php index a380c476..31f5de23 100644 --- a/functions.php +++ b/functions.php @@ -1,5 +1,7 @@ -
\ No newline at end of file +
+ + +
+ + +
+ \ No newline at end of file diff --git a/invoice.php b/invoice.php index b3f50af8..644af160 100644 --- a/invoice.php +++ b/invoice.php @@ -84,206 +84,209 @@ if(isset($_GET['invoice_id'])){ -
-
-
-
-
- -
- Edit - Copy - Recurring - Send - Mark Sent - Add Payment - Print - PDF - - Cancel - -
-
-
-
-
-
-
-
- From -
-
-
    -
    • -
    • -
    • -
    • -
    • -
-
-
-
-
-
-
- Bill To -
-
-
    -
    • -
    • -
    • -
    • -
    • -
-
-
-
-
-
-
- Details -
-
-
    -
  • Invoice Number:
    INV-
    • -
  • Invoice Date:
    • -
  • Payment Due:
    • -
-
-
-
-
- - -
-
-
-
- Items + + +
+
+ +
+
+
+ +
+ Edit + Copy + Recurring + Send + Mark Sent + Add Payment + Print + PDF + + Cancel + +
+
+
+ +
+
+
+
+ From +
+
+
    +
    • +
    • +
    • +
    • +
    • +
+
+
+
+
+
+
+ Bill To +
+
+
    +
    • +
    • +
    • +
    • +
    • +
+
+
+
+
+
+
+ Details +
+
+
    +
  • Invoice Number:
    INV-
    • +
  • Invoice Date:
    • +
  • Payment Due:
    • +
+
+
+
+
+ + + +
+
+
+
+ Items +
+ + + + + + + + + + + + + + + - - - - - - - - - + while($row = mysqli_fetch_array($sql_invoice_items)){ + $item_id = $row['item_id']; + $item_name = $row['item_name']; + $item_description = $row['item_description']; + $item_quantity = $row['item_quantity']; + $item_price = $row['item_price']; + $item_subtotal = $row['item_price']; + $item_tax = $row['item_tax']; + $item_total = $row['item_total']; + $total_tax = $item_tax + $total_tax; + $sub_total = $item_price * $item_quantity + $sub_total; + + ?> + + + + + + + + + + + + + + + + + + + + + + + + +
ProductDescriptionQtyPriceTaxTotal
ItemDescriptionUnit CostQuantityTaxLine Total
$$$
+ +
+
+
+
+ +
+
+
+
+ Notes +
+
+
+ + + +
+
+
+
+ + + + + - - - - - - - - - - - - + 0){ ?> + + + - - - - - - - - - - - - - - + + 0){ ?> + + + + + + 0){ ?> + + + + + + + +
Subtotal$
$$$
Discount$
- -
Tax$
Paid to Date
$
Balance Due$
-
-
-
-
-
- Notes -
-
-
-
- - - -
-
-
-
-
- - - - - - - 0){ ?> - - - - - - 0){ ?> - - - - - - 0){ ?> - - - - - - - - - - -
Subtotal$
Discount$
Tax$
Paid to Date
$
Balance Due$
-
-
+
diff --git a/invoices.php b/invoices.php index 3267d4ce..3437574b 100644 --- a/invoices.php +++ b/invoices.php @@ -176,6 +176,7 @@
+ Edit Copy Send PDF @@ -188,6 +189,7 @@ diff --git a/js/app.js b/js/app.js index 1e736489..b058b35e 100644 --- a/js/app.js +++ b/js/app.js @@ -25,6 +25,12 @@ $(function () { }); }); + +//Slide alert up after 2 secs +$("#alert").fadeTo(2000, 500).slideUp(500, function(){ + $("#alert").slideUp(500); +}); + new EasyMDE({ autoDownloadFontAwesome: false, element: document.getElementById('addClientNote') diff --git a/post.php b/post.php index cfc6257a..8be670bf 100644 --- a/post.php +++ b/post.php @@ -161,8 +161,6 @@ if(isset($_POST['add_user'])){ $avatar_path = "uploads/user_avatars/"; $avatar_path = $avatar_path . $user_id . '_' . time() . '_' . basename( $_FILES['avatar']['name']); move_uploaded_file($_FILES['avatar']['tmp_name'], $avatar_path); - }else{ - $avatar_path = "img/default_user_avatar.png"; } mysqli_query($mysqli,"UPDATE users SET avatar = '$avatar_path' WHERE user_id = $user_id"); @@ -884,6 +882,49 @@ if(isset($_POST['add_quote'])){ } +if(isset($_POST['save_quote'])){ + + $quote_id = intval($_POST['quote_id']); + + if(isset($_POST['name'])){ + $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])); + $description = strip_tags(mysqli_real_escape_string($mysqli,$_POST['description'])); + $qty = $_POST['qty']; + $price = $_POST['price']; + $tax = $_POST['tax']; + + $subtotal = $price * $qty; + $tax = $subtotal * $tax; + $total = $subtotal + $tax; + + mysqli_query($mysqli,"INSERT INTO invoice_items SET item_name = '$name', item_description = '$description', item_quantity = $qty, item_price = '$price', item_subtotal = '$subtotal', item_tax = '$tax', item_total = '$total', quote_id = $quote_id"); + + //Update Invoice Balances + + $sql = mysqli_query($mysqli,"SELECT * FROM quotes WHERE quote_id = $quote_id"); + $row = mysqli_fetch_array($sql); + + $new_quote_amount = $row['quote_amount'] + $total; + + mysqli_query($mysqli,"UPDATE quotes SET quote_amount = '$new_quote_amount' WHERE quote_id = $quote_id"); + + $_SESSION['alert_message'] = "Item added"; + + } + + + if(isset($_POST['quote_note'])){ + $quote_note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['quote_note'])); + + mysqli_query($mysqli,"UPDATE quotes SET quote_note = '$quote_note' WHERE quote_id = $quote_id"); + + $_SESSION['alert_message'] = "Notes added"; + } + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + if(isset($_POST['edit_quote'])){ $quote_id = intval($_POST['quote_id']); @@ -1010,36 +1051,6 @@ if(isset($_POST['add_quote_to_invoice'])){ } -if(isset($_POST['add_quote_item'])){ - - $quote_id = intval($_POST['quote_id']); - $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])); - $description = strip_tags(mysqli_real_escape_string($mysqli,$_POST['description'])); - $qty = $_POST['qty']; - $price = $_POST['price']; - $tax = $_POST['tax']; - - $subtotal = $price * $qty; - $tax = $subtotal * $tax; - $total = $subtotal + $tax; - - mysqli_query($mysqli,"INSERT INTO invoice_items SET item_name = '$name', item_description = '$description', item_quantity = $qty, item_price = '$price', item_subtotal = '$subtotal', item_tax = '$tax', item_total = '$total', quote_id = $quote_id"); - - //Update Invoice Balances - - $sql = mysqli_query($mysqli,"SELECT * FROM quotes WHERE quote_id = $quote_id"); - $row = mysqli_fetch_array($sql); - - $new_quote_amount = $row['quote_amount'] + $total; - - mysqli_query($mysqli,"UPDATE quotes SET quote_amount = '$new_quote_amount' WHERE quote_id = $quote_id"); - - $_SESSION['alert_message'] = "Item added"; - - header("Location: " . $_SERVER["HTTP_REFERER"]); - -} - if(isset($_GET['delete_quote_item'])){ $item_id = intval($_GET['delete_quote_item']); @@ -1065,19 +1076,6 @@ if(isset($_GET['delete_quote_item'])){ } -if(isset($_POST['edit_quote_note'])){ - - $quote_id = intval($_POST['quote_id']); - $quote_note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['quote_note'])); - - mysqli_query($mysqli,"UPDATE quotes SET quote_note = '$quote_note' WHERE quote_id = $quote_id"); - - $_SESSION['alert_message'] = "Notes added"; - - header("Location: " . $_SERVER["HTTP_REFERER"]); - -} - if(isset($_GET['approve_quote'])){ $quote_id = intval($_GET['approve_quote']); @@ -1092,15 +1090,15 @@ if(isset($_GET['approve_quote'])){ } -if(isset($_GET['cancel_quote'])){ +if(isset($_GET['reject_quote'])){ - $quote_id = intval($_GET['cancel_quote']); + $quote_id = intval($_GET['reject_quote']); - mysqli_query($mysqli,"UPDATE quotes SET quote_status = 'Cancelled' WHERE quote_id = $quote_id"); + mysqli_query($mysqli,"UPDATE quotes SET quote_status = 'Rejected' WHERE quote_id = $quote_id"); - mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Cancelled', history_description = 'Quote cancelled!', quote_id = $quote_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Cancelled', history_description = 'Quote rejected!', quote_id = $quote_id"); - $_SESSION['alert_message'] = "Quote cancelled"; + $_SESSION['alert_message'] = "Quote rejected"; header("Location: " . $_SERVER["HTTP_REFERER"]); @@ -1155,8 +1153,8 @@ if(isset($_GET['pdf_quote'])){ $item_name $item_description - $$item_price $item_quantity + $$item_price $$item_tax $$item_total @@ -1229,12 +1227,12 @@ if(isset($_GET['pdf_quote'])){ - - - - - - + + + + + + @@ -1260,8 +1258,8 @@ if(isset($_GET['pdf_quote'])){ '; $mpdf = new \Mpdf\Mpdf([ - 'margin_left' => 20, - 'margin_right' => 15, + 'margin_left' => 5, + 'margin_right' => 5, 'margin_top' => 48, 'margin_bottom' => 25, 'margin_header' => 10, @@ -1328,8 +1326,8 @@ if(isset($_GET['email_quote'])){ - + @@ -1402,12 +1400,12 @@ if(isset($_GET['email_quote'])){
ItemDescriptionUnit CostQuantityTaxLine TotalProductDescriptionQtyPriceTaxTotal
$item_name $item_description$$item_price $item_quantity$$item_price $$item_tax $$item_total
- - - - - - + + + + + + @@ -1433,8 +1431,8 @@ if(isset($_GET['email_quote'])){ '; $mpdf = new \Mpdf\Mpdf([ - 'margin_left' => 20, - 'margin_right' => 15, + 'margin_left' => 5, + 'margin_right' => 5, 'margin_top' => 48, 'margin_bottom' => 25, 'margin_header' => 10, @@ -1548,19 +1546,6 @@ if(isset($_GET['delete_recurring'])){ } -if(isset($_POST['edit_recurring_note'])){ - - $recurring_id = intval($_POST['recurring_id']); - $recurring_note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['recurring_note'])); - - mysqli_query($mysqli,"UPDATE recurring SET recurring_note = '$recurring_note' WHERE recurring_id = $recurring_id"); - - $_SESSION['alert_message'] = "Notes added"; - - header("Location: " . $_SERVER["HTTP_REFERER"]); - -} - if(isset($_GET['recurring_activate'])){ $recurring_id = intval($_GET['recurring_activate']); @@ -1585,32 +1570,46 @@ if(isset($_GET['recurring_deactivate'])){ } -if(isset($_POST['add_recurring_item'])){ +if(isset($_POST['save_recurring'])){ $recurring_id = intval($_POST['recurring_id']); - $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])); - $description = strip_tags(mysqli_real_escape_string($mysqli,$_POST['description'])); - $qty = $_POST['qty']; - $price = $_POST['price']; - $tax = $_POST['tax']; - $subtotal = $price * $qty; - $tax = $subtotal * $tax; - $total = $subtotal + $tax; + if(isset($_POST['name'])){ + $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])); + $description = strip_tags(mysqli_real_escape_string($mysqli,$_POST['description'])); + $qty = $_POST['qty']; + $price = $_POST['price']; + $tax = $_POST['tax']; + + $subtotal = $price * $qty; + $tax = $subtotal * $tax; + $total = $subtotal + $tax; - mysqli_query($mysqli,"INSERT INTO invoice_items SET item_name = '$name', item_description = '$description', item_quantity = $qty, item_price = '$price', item_subtotal = '$subtotal', item_tax = '$tax', item_total = '$total', recurring_id = $recurring_id"); + mysqli_query($mysqli,"INSERT INTO invoice_items SET item_name = '$name', item_description = '$description', item_quantity = $qty, item_price = '$price', item_subtotal = '$subtotal', item_tax = '$tax', item_total = '$total', recurring_id = $recurring_id"); - //Update Invoice Balances + //Update Invoice Balances - $sql = mysqli_query($mysqli,"SELECT * FROM recurring WHERE recurring_id = $recurring_id"); - $row = mysqli_fetch_array($sql); + $sql = mysqli_query($mysqli,"SELECT * FROM recurring WHERE recurring_id = $recurring_id"); + $row = mysqli_fetch_array($sql); - $new_recurring_amount = $row['recurring_amount'] + $total; + $new_recurring_amount = $row['recurring_amount'] + $total; - mysqli_query($mysqli,"UPDATE recurring SET recurring_amount = '$new_recurring_amount' WHERE recurring_id = $recurring_id"); + mysqli_query($mysqli,"UPDATE recurring SET recurring_amount = '$new_recurring_amount' WHERE recurring_id = $recurring_id"); + + $_SESSION['alert_message'] = "Item added"; + + } + + if(isset($_POST['recurring_note'])){ + + $recurring_note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['recurring_note'])); + + mysqli_query($mysqli,"UPDATE recurring SET recurring_note = '$recurring_note' WHERE recurring_id = $recurring_id"); + + $_SESSION['alert_message'] = "Notes added"; + + } - $_SESSION['alert_message'] = "Item added"; - header("Location: " . $_SERVER["HTTP_REFERER"]); } @@ -1701,32 +1700,47 @@ if(isset($_GET['delete_invoice'])){ } -if(isset($_POST['add_invoice_item'])){ +if(isset($_POST['save_invoice'])){ $invoice_id = intval($_POST['invoice_id']); - $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])); - $description = strip_tags(mysqli_real_escape_string($mysqli,$_POST['description'])); - $qty = $_POST['qty']; - $price = $_POST['price']; - $tax = $_POST['tax']; - $subtotal = $price * $qty; - $tax = $subtotal * $tax; - $total = $subtotal + $tax; + if(isset($_POST['name'])){ + $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])); + $description = strip_tags(mysqli_real_escape_string($mysqli,$_POST['description'])); + $qty = $_POST['qty']; + $price = $_POST['price']; + $tax = $_POST['tax']; + + $subtotal = $price * $qty; + $tax = $subtotal * $tax; + $total = $subtotal + $tax; - mysqli_query($mysqli,"INSERT INTO invoice_items SET item_name = '$name', item_description = '$description', item_quantity = $qty, item_price = '$price', item_subtotal = '$subtotal', item_tax = '$tax', item_total = '$total', invoice_id = $invoice_id"); + mysqli_query($mysqli,"INSERT INTO invoice_items SET item_name = '$name', item_description = '$description', item_quantity = $qty, item_price = '$price', item_subtotal = '$subtotal', item_tax = '$tax', item_total = '$total', invoice_id = $invoice_id"); - //Update Invoice Balances + //Update Invoice Balances - $sql = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql); + $sql = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_id = $invoice_id"); + $row = mysqli_fetch_array($sql); - $new_invoice_amount = $row['invoice_amount'] + $total; + $new_invoice_amount = $row['invoice_amount'] + $total; - mysqli_query($mysqli,"UPDATE invoices SET invoice_amount = '$new_invoice_amount' WHERE invoice_id = $invoice_id"); + mysqli_query($mysqli,"UPDATE invoices SET invoice_amount = '$new_invoice_amount' WHERE invoice_id = $invoice_id"); + + $_SESSION['alert_message'] = "Item added"; + + } + + + if(isset($_POST['invoice_note'])){ + + $invoice_note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['invoice_note'])); + + mysqli_query($mysqli,"UPDATE invoices SET invoice_note = '$invoice_note' WHERE invoice_id = $invoice_id"); + + $_SESSION['alert_message'] = "Notes added"; + + } - $_SESSION['alert_message'] = "Item added"; - header("Location: " . $_SERVER["HTTP_REFERER"]); } @@ -1985,8 +1999,8 @@ if(isset($_GET['email_invoice'])){ - + @@ -2060,12 +2074,12 @@ if(isset($_GET['email_invoice'])){
ItemDescriptionUnit CostQuantityTaxLine TotalProductDescriptionQtyPriceTaxTotal
$item_name $item_description$$item_price $item_quantity$$item_price $$item_tax $$item_total
- - - - - - + + + + + + @@ -2088,7 +2102,7 @@ if(isset($_GET['email_invoice'])){ - + @@ -2099,8 +2113,8 @@ if(isset($_GET['email_invoice'])){ '; $mpdf = new \Mpdf\Mpdf([ - 'margin_left' => 20, - 'margin_right' => 15, + 'margin_left' => 5, + 'margin_right' => 5, 'margin_top' => 48, 'margin_bottom' => 25, 'margin_header' => 10, @@ -2239,8 +2253,8 @@ if(isset($_GET['pdf_invoice'])){ - + @@ -2314,12 +2328,12 @@ if(isset($_GET['pdf_invoice'])){
ItemDescriptionUnit CostQuantityTaxLine TotalProductDescriptionQtyPriceTaxTotal
$ '.number_format($amount_paid,2).'
Balance due:Balance: $ '.number_format($balance,2).'
$item_name $item_description$$item_price $item_quantity$$item_price $$item_tax $$item_total
- - - - - - + + + + + + @@ -2342,7 +2356,7 @@ if(isset($_GET['pdf_invoice'])){ - + @@ -2353,8 +2367,8 @@ if(isset($_GET['pdf_invoice'])){ '; $mpdf = new \Mpdf\Mpdf([ - 'margin_left' => 20, - 'margin_right' => 15, + 'margin_left' => 5, + 'margin_right' => 5, 'margin_top' => 48, 'margin_bottom' => 25, 'margin_header' => 10, @@ -2376,19 +2390,6 @@ if(isset($_GET['pdf_invoice'])){ } -if(isset($_POST['edit_invoice_note'])){ - - $invoice_id = intval($_POST['invoice_id']); - $invoice_note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['invoice_note'])); - - mysqli_query($mysqli,"UPDATE invoices SET invoice_note = '$invoice_note' WHERE invoice_id = $invoice_id"); - - $_SESSION['alert_message'] = "Notes added"; - - header("Location: " . $_SERVER["HTTP_REFERER"]); - -} - if(isset($_POST['add_contact'])){ $client_id = intval($_POST['client_id']); diff --git a/quote.php b/quote.php index dcf27169..42172002 100644 --- a/quote.php +++ b/quote.php @@ -61,197 +61,197 @@ if(isset($_GET['quote_id'])){ -
-
-
- -
- Edit - Copy - Quote > Invoice - Approve - Cancel - Send Email - Mark Sent - Print - PDF - Delete +
+ +
+
+ +
+
+
+ +
+ Edit + Copy + Quote > Invoice + Approve + Reject + Send Email + Mark Sent + Print + PDF + Delete +
-
-
+
-
-
-
-
- From +
+
+
+
+ From +
+
+
    +
    • +
    • +
    • +
    • +
    • +
+
-
-
    -
    • -
    • -
    • -
    • -
    • -
+
+
+
+
+ Quote To +
+
+
    +
    • +
    • +
    • +
    • +
    • +
+
+
+
+
+
+
+ Details +
+
+
    +
  • Quote Number:
    QUO-
    • +
  • Quote Date:
    • +
+
-
-
-
- Quote To -
-
-
    -
    • -
    • -
    • -
    • -
    • -
-
-
-
-
-
-
- Details -
-
-
    -
  • Quote Number:
    QUO-
    • -
  • Quote Date:
    • -
-
-
-
-
- + -
-
-
-
- Items -
+
+
+
+
+ Items +
+ +
ItemDescriptionUnit CostQuantityTaxLine TotalProductDescriptionQtyPriceTaxTotal
$ '.number_format($amount_paid,2).'
Balance due:Balance: $ '.number_format($balance,2).'
+ + + + + + + + + + + + + - - - - - - - - - + while($row = mysqli_fetch_array($sql_items)){ + $item_id = $row['item_id']; + $item_name = $row['item_name']; + $item_description = $row['item_description']; + $item_quantity = $row['item_quantity']; + $item_price = $row['item_price']; + $item_subtotal = $row['item_price']; + $item_tax = $row['item_tax']; + $item_total = $row['item_total']; + $total_tax = $item_tax + $invoice_tax; + $sub_total = $item_price * $item_quantity + $sub_total; + + ?> + + + + + + + + + + + + + + + + + + + + + + + + +
ProductDescriptionQtyPriceTaxTotal
ItemDescriptionUnit CostQuantityTaxLine Total
$$$
+ +
+
+
+
+ +
+
+
+
+ Notes +
+
+
+ +
+
+
+ +
+ + + + + - - - - - - - - - - - - + 0){ ?> + + + - - - - - - - - - - - - - - + + 0){ ?> + + + + + + + +
Subtotal$
$$$
Discount$
- -
Tax$
Total$
-
- -
-
-
-
- Notes -
-
-
-
- - - -
-
-
-
- -
- - - - - - - 0){ ?> - - - - - - 0){ ?> - - - - - - - - - - -
Subtotal$
Discount$
Tax$
Total$
-
-
+
diff --git a/quotes.php b/quotes.php index 16507bca..43e5c65b 100644 --- a/quotes.php +++ b/quotes.php @@ -51,7 +51,7 @@ $quote_badge_color = "primary"; }elseif($quote_status == "Approved"){ $quote_badge_color = "success"; - }elseif($quote_status == "Cancelled"){ + }elseif($quote_status == "Rejected"){ $quote_badge_color = "danger"; }else{ $quote_badge_color = "secondary"; @@ -89,7 +89,7 @@ "> -
-
-
- -
- Edit - - Deactivate - - Activate - - Delete -
-
-
-
-
-
-
-
- From -
-
-
    -
    • -
    • -
    • -
    • -
    • -
+
+ +
+
+ +
+
+
+ +
+ Edit + + Deactivate + + Activate + + Delete +
-
-
-
-
- Bill To -
-
-
    -
    • -
    • -
    • -
    • -
    • -
-
-
-
-
-
-
- Details -
-
-
    -
  • Frequency:
    ly
    • -
  • Start Date:
    • -
  • Next Date:
    • -
  • Last Sent:
    • -
  • Net Terms:
    Day
    • -
-
-
-
-
+
- - -
-
-
-
- Items +
+
+
+
+ From +
+
+
    +
    • +
    • +
    • +
    • +
    • +
+
+
+
+
+
+ Bill To +
+
+
    +
    • +
    • +
    • +
    • +
    • +
+
+
+
+
+
+
+ Details +
+
+
    +
  • Frequency:
    ly
    • +
  • Start Date:
    • +
  • Next Date:
    • +
  • Last Sent:
    • +
  • Net Terms:
    Day
    • +
+
+
+
+
+ + + +
+
+
+
+ Items +
+ + + + + + + + + + + + + + + - - - - - - - - - - - - - + ?> - - - - - - - - - + + + + + + + + + - + ?> - - - + + - + - + + +
ProductDescriptionQtyPriceTaxTotal
ItemDescriptionUnit CostQuantityTaxLine Total
$$$
$$$
+
+
+
+ +
+
+
+
+ Notes +
+
+
+ +
+
+
+
+ + + + + + + 0){ ?> + + + + + + 0){ ?> + + + + + + + +
Subtotal$
Discount$
Tax$
Amount$
-
- -
-
-
-
- Notes -
-
-
-
- - - -
-
-
-
-
- - - - - - - 0){ ?> - - - - - - 0){ ?> - - - - - - - - - - -
Subtotal$
Discount$
Tax$
Amount$
-
-
+
diff --git a/settings-carddav.php b/settings-carddav.php new file mode 100644 index 00000000..7ecf6c3a --- /dev/null +++ b/settings-carddav.php @@ -0,0 +1,58 @@ + + + + +
+
+
CardDAV Settings
+
+
+
+
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ + +
+
+
+ + +
  • + " + href="settings-carddav.php"> +
    + CardDAV +     +
    • +
  • " href="settings-invoice.php"> diff --git a/users.php b/users.php index 498bb378..aaa4743a 100644 --- a/users.php +++ b/users.php @@ -27,11 +27,21 @@ $email = $row['email']; $password = $row['password']; $avatar = $row['avatar']; + $initials = initials($name); ?> - "> + + + + + + + +
    + +